diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 73f8c96ebc..71370e3296 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -69,18 +69,18 @@ body:
       description:  |
         Trigger the defect, then click on the menu from the room list then "Report a bug". Describe the issue, mentioning that you have also filed a bug (it's helpful if you can include a link to the bug). Send the report to submit anonymous logs to the developers.
       options:
-        - 'Yes'
         - 'No'
+        - 'Yes'
     validations:
       required: true
   - type: dropdown
     id: pr
     attributes:
-      label: Are you willing to provide a PR?
+      label: Will you submit a Pull Request?
       description:  |
-        Providing a PR can drastically speed up the process of fixing this bug. Don't worry, it's still OK to answer 'No' :).
+        Submitting a Pull Request can drastically speed up the process of fixing this bug. Don't worry, it's still OK to answer 'No' :).
       options:
-        - 'Yes'
         - 'No'
+        - 'Yes'
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 114bc2bc65..d2715e6e8b 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,11 +1,11 @@
 name: Enhancement request
-description: Do you have a suggestion or feature request?
+description: Do you have a suggestion or feature request? Please open issue on the repo element-hq/element-meta if the request is global to all Element clients.
 labels: [T-Enhancement]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/element-hq/element-meta/discussions/new?category=ideas).
+        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please open an issue on the [element-meta repository](https://github.com/element-hq/element-meta/issues/new?template=enhancement.yml) instead.
   - type: textarea
     id: usecase
     attributes:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 95f322a2e4..9ed1919e0e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -52,6 +52,7 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 <!-- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked. -->
 
+- [ ] I am aware of the [etiquette](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#etiquette).
 - This PR was made with the help of AI:
     - [ ] Yes. In this case, please request a review by Copilot.
     - [ ] No.
diff --git a/.github/release.yml b/.github/release.yml
index 17090ec328..8f1d04ac9d 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -28,6 +28,10 @@ changelog:
       labels:
         - PR-Dependencies
 
+    - title: 💼 Element Pro
+      labels:
+        - PR-Element-Pro
+
     - title: Others
       labels:
         - PR-misc
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 17e1fa0f1c..c16310cf43 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -34,6 +34,13 @@
         "/^org.jetbrains.kotlinx:kotlinx-datetime/",
       ],
     },
+    {
+      // Keep Guava on the Android variant and ignore jre-only upgrades.
+      "matchPackageNames": [
+        "com.google.guava:guava",
+      ],
+      "allowedVersions": "/-android$/",
+    },
     {
       // Limit PostHog Android upgrade to one PR per month, the first day of the month
       "matchPackageNames": [
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e33ba607e..69152b7e2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,19 +44,19 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug APKs
@@ -74,13 +74,13 @@ jobs:
         run: ./gradlew :app:assembleGplayDebug app:assembleFDroidDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
       - name: Upload debug APKs
         if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-debug
           path: |
             app/build/outputs/apk/gplay/debug/*-universal-debug.apk
             app/build/outputs/apk/fdroid/debug/*-universal-debug.apk
-      - uses: rnkdsh/action-upload-diawi@4e1421305be7cfc510d05f47850262eeaf345108 # v1.5.12
+      - uses: rnkdsh/action-upload-diawi@76778fcd1f9f589efaaa62f63d5f03430bbb1306 # v1.5.13
         id: diawi
         # Do not fail the whole build if Diawi upload fails
         continue-on-error: true
@@ -104,7 +104,18 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Compile release sources
         if: ${{ matrix.variant == 'release' }}
-        run: ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
+        run: |
+          ./gradlew assembleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
+      - name: Run aapt dump
+        if: ${{ matrix.variant == 'release' }}
+        run: |
+          $ANDROID_HOME/build-tools/37.0.0/aapt dump badging \
+            ./app/build/outputs/apk/gplay/release/app-gplay-universal-release.apk \
+            > /tmp/currentAaptDump.txt
+      - name: Check manifest has not changed
+        if: ${{ matrix.variant == 'release' }}
+        run: diff /tmp/currentAaptDump.txt ./tools/manifest/gplay/release/aaptDump.txt
       - name: Compile nightly sources
         if: ${{ matrix.variant == 'nightly' }}
         run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
diff --git a/.github/workflows/build_enterprise.yml b/.github/workflows/build_enterprise.yml
index b7912b2b72..f2658bb342 100644
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -43,7 +43,7 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -56,12 +56,12 @@ jobs:
       - name: Clone submodules
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug Gplay Enterprise APK
@@ -79,7 +79,7 @@ jobs:
         run: ./gradlew :app:assembleGplayDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
       - name: Upload debug Enterprise APKs
         if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-enterprise-debug
           path: |
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 4bb51d05b5..531771e0b1 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
     # Skip in forks, it doesn't work even with the fallback token
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Add SSH private keys for submodule repositories
@@ -24,7 +24,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
+        uses: danger/danger-js@e9b58820039524318198d8059ec98b0c02b7875c # 13.0.10
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:
diff --git a/.github/workflows/fork-pr-notice.yml b/.github/workflows/fork-pr-notice.yml
index af3e4a3006..3e67d97eac 100644
--- a/.github/workflows/fork-pr-notice.yml
+++ b/.github/workflows/fork-pr-notice.yml
@@ -20,7 +20,7 @@ jobs:
     if: github.event.pull_request.base.repo.full_name != github.event.pull_request.head.repo.full_name
     steps:
       - name: Add auto-generated commit warning
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             github.rest.issues.createComment({
diff --git a/.github/workflows/generate_github_pages.yml b/.github/workflows/generate_github_pages.yml
index e4fedf76ac..45e886f904 100644
--- a/.github/workflows/generate_github_pages.yml
+++ b/.github/workflows/generate_github_pages.yml
@@ -1,9 +1,10 @@
 name: Generate GitHub Pages
 on:
   workflow_dispatch:
-  schedule:
-    # At 00:00 on every Tuesday UTC
-    - cron: '0 0 * * 2'
+# Disabled for now, as we don't want to generate GitHub Pages on every push to main anymore
+#  schedule:
+#    # At 00:00 on every Tuesday UTC
+#    - cron: '0 0 * * 2'
 
 permissions: {}
 
@@ -12,20 +13,22 @@ jobs:
     runs-on: ubuntu-latest
     # Skip in forks
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
+    permissions:
+      contents: write
     steps:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Set up Python 3.12
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.14
       - name: Run World screenshots generation script
@@ -34,7 +37,7 @@ jobs:
           mkdir -p screenshots/en
           cp tests/uitests/src/test/snapshots/images/* screenshots/en
       - name: Deploy GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
+        uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./screenshots
diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index 66078b7b4b..6b64a731d7 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -13,12 +13,11 @@ jobs:
     # Skip in forks
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         name: Use JDK 21
-        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
diff --git a/.github/workflows/maestro-local.yml b/.github/workflows/maestro-local.yml
index f320230584..198b462349 100644
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -38,19 +38,19 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.ref }}
           persist-credentials: false
-      - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         name: Use JDK 21
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Assemble debug APK
@@ -60,7 +60,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
       - name: Upload APK as artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-apk-maestro
           path: |
@@ -78,7 +78,7 @@ jobs:
     concurrency:
       group: maestro-test
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
@@ -98,7 +98,7 @@ jobs:
         run: curl -fsSL "https://get.maestro.mobile.dev" | bash
       - name: Run Maestro tests in emulator
         id: maestro_test
-        uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
+        uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0
         continue-on-error: true
         env:
           MAESTRO_USERNAME: maestroelement
@@ -119,7 +119,7 @@ jobs:
           script: |
             .github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh app-gplay-x86_64-debug.apk
       - name: Upload test results
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: test-results
           path: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 31a8806a85..9beab4e01c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -32,11 +32,11 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
diff --git a/.github/workflows/nightlyReports.yml b/.github/workflows/nightlyReports.yml
index ae5c72a3d9..23cfffc265 100644
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -34,16 +34,16 @@ jobs:
           swap-storage: false
 
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
 
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
 
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: false
 
@@ -58,7 +58,7 @@ jobs:
 
       - name: ✅ Upload kover report
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: kover-results
           path: |
@@ -76,23 +76,23 @@ jobs:
     name: Dependency analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Dependency analysis
         run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
       - name: Upload dependency analysis
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: dependency-analysis
           path: build/reports/dependency-check-report.html
diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
index 5349a678bc..6efeff17be 100644
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Trigger pipeline
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           github-token: ${{ secrets.ENTERPRISE_ACTIONS_TOKEN }}
           script: |
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d90cf07e50..e24847280e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -17,7 +17,7 @@ jobs:
       pull-requests: read
     steps:
       - name: Add notice
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         if: contains(github.event.pull_request.labels.*.name, 'X-Blocked')
         with:
           script: |
@@ -32,7 +32,7 @@ jobs:
     steps:
       - name: Check membership
         if: github.event.pull_request.user.login != 'renovate[bot]'
-        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 # v3
+        uses: tspascoal/get-user-teams-membership@b2546c5affc730fd8e3d8483ae9ad3621938c2f9 # v4.0.2
         id: teams
         with:
           username: ${{ github.event.pull_request.user.login }}
@@ -41,7 +41,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN_READ_ORG }}
       - name: Add label
         if: steps.teams.outputs.isTeamMember == 'false'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             github.rest.issues.addLabels({
@@ -63,7 +63,7 @@ jobs:
       github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - name: Close pull request
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             github.rest.issues.createComment({
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 7845be8323..e72ae0b4d1 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -33,7 +33,7 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Add SSH private keys for submodule repositories
@@ -51,11 +51,11 @@ jobs:
     name: Search for invalid screenshot files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Set up Python 3.12
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.14
       - name: Search for invalid screenshot files
@@ -65,20 +65,20 @@ jobs:
     name: Search for invalid dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Set up Python 3.12
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.14
       - name: Search for invalid dependencies
@@ -93,7 +93,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-konsist-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-konsist-develop-{0}', github.sha) || format('check-konsist-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -108,19 +108,19 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run Konsist tests
         run: ./gradlew :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES --no-daemon
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: konsist-report
           path: |
@@ -134,7 +134,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-compose-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-compose-develop-{0}', github.sha) || format('check-compose-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -149,12 +149,12 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run compose tests
@@ -168,7 +168,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-lint-develop-{0}', github.sha) || format('check-lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -183,12 +183,12 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Build Gplay Debug
@@ -199,7 +199,7 @@ jobs:
         run: ./gradlew :app:lintGplayDebug :app:lintFdroidDebug lintDebug $CI_GRADLE_ARG_PROPERTIES --continue
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: linting-report
           path: |
@@ -213,7 +213,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-detekt-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-detekt-develop-{0}', github.sha) || format('check-detekt-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -228,19 +228,19 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run Detekt
         run: ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES --no-daemon
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: detekt-report
           path: |
@@ -254,7 +254,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-ktlint-develop-{0}', github.sha) || format('check-ktlint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -269,19 +269,19 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Run Ktlint check
         run: ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: ktlint-report
           path: |
@@ -295,7 +295,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-docs-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-docs-develop-{0}', github.sha) || format('check-docs-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -319,7 +319,7 @@ jobs:
     name: Check shell scripts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Run shellcheck
@@ -333,10 +333,10 @@ jobs:
     permissions:
       security-events: write # Required for upload-sarif (used by zizmor-action) to upload SARIF files.
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2
+      - uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
 
   upload_reports:
     name: Project Check Suite
@@ -344,7 +344,7 @@ jobs:
     needs: [konsist, lint, ktlint, detekt]
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -360,7 +360,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
+        uses: danger/danger-js@e9b58820039524318198d8059ec98b0c02b7875c # 13.0.10
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:
diff --git a/.github/workflows/recordScreenshots.yml b/.github/workflows/recordScreenshots.yml
index 189ae26cf3..00502d9612 100644
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -17,6 +17,7 @@ jobs:
     permissions:
       # Need write permissions on PRs to remove the label "Record-Screenshots"
       pull-requests: write
+      contents: write
     name: Record screenshots on branch ${{ github.event.pull_request.head.ref || github.ref_name }}
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Record-Screenshots'
@@ -43,23 +44,23 @@ jobs:
           labels: Record-Screenshots
       - name: ⏬ Checkout with LFS (PR)
         if: github.event.label.name == 'Record-Screenshots'
-        uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
         with:
           persist-credentials: false
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref }}
       - name: ⏬ Checkout with LFS (Branch)
         if: github.event_name == 'workflow_dispatch'
-        uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
         with:
           persist-credentials: false
       - name: ☕️ Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       # Add gradle cache, this should speed up the process
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6f9df37160..4bc71a02ff 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,16 +34,16 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
       - name: Create app bundle
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
@@ -57,7 +57,7 @@ jobs:
           ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
         run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload bundle as artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-app-gplay-bundle-unsigned
           path: |
@@ -71,7 +71,7 @@ jobs:
       group: ${{ format('build-release-main-enterprise-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Add SSH private keys for submodule repositories
@@ -82,12 +82,12 @@ jobs:
       - name: Clone submodules
         run: git submodule update --init --recursive
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
       - name: Create Enterprise app bundle
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
@@ -95,7 +95,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
         run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload bundle as artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-enterprise-app-gplay-bundle-unsigned
           path: |
@@ -122,16 +122,16 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
       - name: Create APKs
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
@@ -139,7 +139,7 @@ jobs:
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
         run: ./gradlew assembleFdroidRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload apks as artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: elementx-app-fdroid-apks-unsigned
           path: |
diff --git a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
index 51a968fdec..4ee021c316 100755
--- a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
+++ b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
@@ -19,6 +19,9 @@ adb install -r $1
 echo "Starting the screen recording..."
 adb push .github/workflows/scripts/maestro/local-recording.sh /data/local/tmp/
 adb shell "chmod +x /data/local/tmp/local-recording.sh"
+mkdir -p ~/.maestro/tests
+# Start logcat in the background and save the output to a file, use `org.matrix.rust.sdk` tag since the SDK handles the logging
+adb logcat 'org.matrix.rust.sdk:D *:S' > ~/.maestro/tests/logcat.txt &
 adb shell "/data/local/tmp/local-recording.sh & echo \$! > /data/local/tmp/screenrecord_pid.txt" &
 set +e
 ~/.maestro/bin/maestro test .maestro/allTests.yaml
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index d945b18f5c..6d9a62a2d1 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -38,19 +38,19 @@ jobs:
           docker-images: true
           swap-storage: false
 
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Build debug code and test fixtures
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index 1958e80083..d8f57e3355 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
         with:
           only-labels: "X-Needs-Info"
           days-before-issue-stale: 30
diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml
index 914bf4b35c..61b4a8d521 100644
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -13,20 +13,20 @@ jobs:
     # Skip in forks
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Set up Python 3.12
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.14
       - name: Setup Localazy
@@ -39,8 +39,9 @@ jobs:
           ./tools/localazy/downloadStrings.sh --all
           ./tools/localazy/importSupportedLocalesFromLocalazy.py
           ./tools/test/generateAllScreenshots.py
+          ./tools/manifest/aaptDump.sh
       - name: Create Pull Request for Strings
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           commit-message: Sync Strings from Localazy
diff --git a/.github/workflows/sync-sas-strings.yml b/.github/workflows/sync-sas-strings.yml
index 7f9dbdee0d..7ed0b60243 100644
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -14,11 +14,11 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Set up Python 3.12
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.14
       - name: Install Prerequisite dependencies
@@ -27,7 +27,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/sas/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
+        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 602ad1e18e..5ee7f5065d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ permissions: {}
 # Enrich gradle.properties for CI/CD
 env:
   GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx7g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options=-Xmx2g -XX:+UseG1GC
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace --no-daemon -Dsonar.gradle.skipCompile=true --no-configuration-cache
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -Dsonar.gradle.skipCompile=true --no-configuration-cache
 
 jobs:
   tests:
@@ -49,7 +49,7 @@ jobs:
           sudo swapon /mnt/swapfile
           sudo swapon --show
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+        uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -63,25 +63,31 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         run: git submodule update --init --recursive
       - name: ☕️ Use JDK 21
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+        uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Configure gradle
-        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
-      - name: ⚙️ Check coverage for debug variant (includes unit & screenshot tests)
-        run: ./gradlew testDebugUnitTest :tests:uitests:verifyPaparazziDebug :koverXmlReportMerged :koverHtmlReportMerged :koverVerifyAll $CI_GRADLE_ARG_PROPERTIES
+      - name: ⚙️ Run unit tests
+        run: ./gradlew :app:testGplayDebugUnitTest testDebugUnitTest -x :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES
+
+      - name: ⚙️ Run screenshot tests
+        run: ./gradlew :tests:uitests:verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
+
+      - name: ⚙️ Generate kover coverage report
+        run: ./gradlew :koverXmlReportMerged :koverHtmlReportMerged :koverVerifyAll -x testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES
 
       - name: 🚫 Upload kover failed coverage reports
         if: failure()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: kover-error-report
           path: |
-            app/build/reports/kover
+            build/reports/kover
 
       - name: ✅ Upload kover report (disabled)
         if: always()
@@ -89,7 +95,7 @@ jobs:
 
       - name: 🚫 Upload test results on error
         if: failure()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: tests-and-screenshot-tests-results
           path: |
@@ -108,7 +114,7 @@ jobs:
 
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 8e8d03c9c4..b93ea81403 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -10,7 +10,7 @@ jobs:
   triage-new-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/91
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 3ec20f332b..0b587369ed 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -14,7 +14,7 @@ jobs:
     if: >
       github.repository == 'element-hq/element-x-android'
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/43
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -23,7 +23,7 @@ jobs:
     name: Move triaged needs info issues on board
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         id: addItem
         with:
           project-url: https://github.com/orgs/element-hq/projects/91
@@ -47,7 +47,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/73
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -58,7 +58,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/57
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -70,7 +70,7 @@ jobs:
       contains(github.event.issue.labels.*.name, 'Team: QA') ||
       contains(github.event.issue.labels.*.name, 'X-Needs-Signoff')
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/69
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -81,7 +81,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'X-Needs-Signoff')
     steps:
-      - uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
+      - uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2
         with:
           project-url: https://github.com/orgs/element-hq/projects/89
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/validate-lfs.yml b/.github/workflows/validate-lfs.yml
index c3158291c3..027c7d68e9 100644
--- a/.github/workflows/validate-lfs.yml
+++ b/.github/workflows/validate-lfs.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Validate
     steps:
-      - uses: nschloe/action-cached-lfs-checkout@1c185ad576953eab13e35ffe1bffef437d97e9d2 # v1.2.4
+      - uses: nschloe/action-cached-lfs-checkout@385a8ecc719e50b8c71af6ab01a624b486b7c3bc # v1.2.5
 
       - run: |
           ./tools/git/validate_lfs.sh
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cdef735570..8151cb4ea3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,39 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 76f6344777..cc87bc5140 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.3.20" />
+    <option name="externalSystemId" value="Gradle" />
+    <option name="version" value="2.4.10" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.maestro/tests/account/logout.yaml b/.maestro/tests/account/logout.yaml
index f27f5dada3..a276182825 100644
--- a/.maestro/tests/account/logout.yaml
+++ b/.maestro/tests/account/logout.yaml
@@ -2,14 +2,14 @@ appId: ${MAESTRO_APP_ID}
 ---
 - tapOn:
     id: "home_screen-settings"
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 # Ensure cancel cancels
 - tapOn:
     id: "dialog-negative"
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml
diff --git a/.maestro/tests/account/verifySession.yaml b/.maestro/tests/account/verifySession.yaml
index 20b3d1b8ac..456627f742 100644
--- a/.maestro/tests/account/verifySession.yaml
+++ b/.maestro/tests/account/verifySession.yaml
@@ -16,4 +16,4 @@ appId: ${MAESTRO_APP_ID}
       - extendedWaitUntil:
           visible: "Device verified"
           timeout: 30000
-- tapOn: "Continue"
+- tapOn: "Done"
diff --git a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
index fff0fe7b32..d2160e0934 100644
--- a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
+++ b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
@@ -1,5 +1,5 @@
 appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
-    visible: "Confirm your identity"
+    visible: "Confirm your digital identity"
     timeout: 60000
diff --git a/.maestro/tests/roomList/cleanUpRoomList.yaml b/.maestro/tests/roomList/cleanUpRoomList.yaml
new file mode 100644
index 0000000000..3d9fb3d6e4
--- /dev/null
+++ b/.maestro/tests/roomList/cleanUpRoomList.yaml
@@ -0,0 +1,21 @@
+appId: ${MAESTRO_APP_ID}
+---
+# Clean up the room list if it was left in a bad state by previous tests
+- runFlow:
+    when:
+      visible: 'aRoomName'
+    commands:
+      - longPressOn: 'aRoomName'
+      - tapOn:
+          text: "Leave room"
+          index: 0
+      - tapOn: "Leave"
+- runFlow:
+    when:
+      visible: ${MAESTRO_INVITEE1_MXID}
+    commands:
+      - longPressOn: ${MAESTRO_INVITEE1_MXID}
+      - tapOn:
+          text: "Leave room"
+          index: 0
+      - tapOn: "Leave"
diff --git a/.maestro/tests/roomList/createAndDeleteDM.yaml b/.maestro/tests/roomList/createAndDeleteDM.yaml
index e80dc377b5..8372d6dbc9 100644
--- a/.maestro/tests/roomList/createAndDeleteDM.yaml
+++ b/.maestro/tests/roomList/createAndDeleteDM.yaml
@@ -1,13 +1,22 @@
 appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a DM room.
-- tapOn: "Create a new conversation or room"
+- tapOn: "Create room"
 - tapOn: "Search for someone"
 - inputText: ${MAESTRO_INVITEE1_MXID}
 - tapOn:
     text: ${MAESTRO_INVITEE1_MXID}
     index: 1
-- tapOn: "Send invite"
+- runFlow:
+    when:
+      visible: 'Start a chat with this new contact?'
+    commands:
+      - tapOn: 'Continue'
+- runFlow:
+    when:
+      visible: 'Send invite?'
+    commands:
+      - tapOn: 'Send invite'
 - takeScreenshot: build/maestro/330-createAndDeleteDM
 - tapOn: "maestroelement2"
 - scroll
diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index d0b17133d5..6b4d745fae 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -1,7 +1,7 @@
 appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a room
-- tapOn: "Create a new conversation or room"
+- tapOn: "Create room"
 - tapOn: "New room"
 - tapOn: "Add name…"
 - inputText: "aRoomName"
@@ -15,6 +15,12 @@ appId: ${MAESTRO_APP_ID}
     text: ${MAESTRO_INVITEE1_MXID}
     index: 1
 - tapOn: "Finish"
+- runFlow:
+    when:
+      visible: 'Invite new contact to this room?'
+    commands:
+      - tapOn:
+          id: "confirm_invite_unknown"
 - tapOn: "aRoomName"
 - tapOn: "Invite"
 # assert there's 1 member and 1 invitee
@@ -23,9 +29,17 @@ appId: ${MAESTRO_APP_ID}
 - tapOn:
     text: ${MAESTRO_INVITEE2_MXID}
     index: 1
+# Hide keyboard by tapping on an external element in case it's displayed, otherwise it will 'eat' the back button press
+- tapOn:
+    # Navigation title
+    text: "Invite people"
 - tapOn: "Invite"
-- tapOn: "Back"
-- tapOn: "aRoomName"
+- runFlow:
+    when:
+      visible: 'Invite new contact to this room?'
+    commands:
+      - tapOn:
+          id: "confirm_invite_unknown"
 - scrollUntilVisible:
     direction: DOWN
     element:
diff --git a/.maestro/tests/roomList/roomList.yaml b/.maestro/tests/roomList/roomList.yaml
index 5cc9e269c5..704d983b7d 100644
--- a/.maestro/tests/roomList/roomList.yaml
+++ b/.maestro/tests/roomList/roomList.yaml
@@ -1,5 +1,6 @@
 appId: ${MAESTRO_APP_ID}
 ---
+- runFlow: cleanUpRoomList.yaml
 - runFlow: searchRoomList.yaml
 - takeScreenshot: build/maestro/300-RoomList
 - runFlow: timeline/timeline.yaml
diff --git a/.maestro/tests/roomList/timeline/messages/location.yaml b/.maestro/tests/roomList/timeline/messages/location.yaml
index c9382bd30c..863a699fd9 100644
--- a/.maestro/tests/roomList/timeline/messages/location.yaml
+++ b/.maestro/tests/roomList/timeline/messages/location.yaml
@@ -2,6 +2,6 @@ appId: ${MAESTRO_APP_ID}
 ---
 - takeScreenshot: build/maestro/520-Timeline
 - tapOn: "Add attachment"
-- tapOn: "Location"
-- tapOn: "Share my location"
+- tapOn: "Share location"
+- tapOn: "Share selected location"
 - takeScreenshot: build/maestro/521-Timeline
diff --git a/AGENTS.md b/AGENTS.md
index 454c347a9f..d206be98c6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -44,11 +44,14 @@ PRs must meet these rules.
 
 ## Pull Request Guidelines
 
-- Use sentence-style commit/PR messages (no conventional commits).
-- Apply exactly **one** `PR-` label for changelog categorization.
-- PR title = changelog entry — make it descriptive; no "Fixes #…" prefixes.
-- Include screenshots or screen recordings for any UI changes.
-- Keep PRs focused; split changes over 1000 lines.
+- Sentence-style titles (no conventional commits).
+- Exactly one `pr-` label (see `.github/release.yml`).
+- Title = changelog entry — descriptive, no "Fixes #…".
+- Leave description template for the developer. Redirect them to the [contributing etiquette](CONTRIBUTING.md#etiquette).
+- Screenshots/videos for visual changes.
+- 500 additions max — split large changes.
+- Commits need a title and description; no tiny or massive commits.
+- No history rewrites.
 
 ---
 
diff --git a/CHANGES.md b/CHANGES.md
index 1b002992fb..3f7360a338 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,748 @@
+Changes in Element X v26.08.0
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.08.0 -->
+
+## What's Changed
+### ✨ Features
+* feat(call): Active call timeline rendering by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/7051
+### 🙌 Improvements
+* Announce expanded/collapsed state on the timeline group header by @unclejay80 in https://github.com/element-hq/element-x-android/pull/7226
+* Allow adding extra elements to the developer settings from external modules by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7230
+* Update keyboard visibility to track hasFocus by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/7284
+### 🐛 Bugfixes
+* Live location sharing timeout by @ganfra in https://github.com/element-hq/element-x-android/pull/7184
+* Fix logging via QR code when using MDM-configured homeserver by @mxandreas in https://github.com/element-hq/element-x-android/pull/7228
+* Fix #7181: Remove back arrow from device verified screen and use 'Done' text by @thirumani-vihaan in https://github.com/element-hq/element-x-android/pull/7222
+* Fix padding for captions of media in 'not found' state by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7247
+* Fix banned mime type errors in `DefaultContentScannerService` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7255
+* Fix `ContentErrorView` not calculating its text size synchronously by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7281
+* Fix media viewer for medias not related to events displaying invalid state by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7280
+* Try making `HeaderFooterView` more robust by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7267
+* Fix insets in several screens by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7285
+### ⚠️ API Changes
+* Add a password strength estimator wrapping the SDK zxcvbn API by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/7186
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/7277
+### 🧱 Build
+* CI: fix 'Update Gradle Wrapper' by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7238
+* Update Gradle Wrapper from 9.5.1 to 9.6.1 by @ElementBot in https://github.com/element-hq/element-x-android/pull/7240
+* Localazy: improve search, parallelize checks by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7261
+* Run `Konsist` tests sequentially by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7293
+### 📄 Documentation
+* Group Element Pro changes into a dedicated release notes section by @manuroe in https://github.com/element-hq/element-x-android/pull/7236
+### 🚧 In development 🚧
+* Plug emoji picker for custom user status by @ganfra in https://github.com/element-hq/element-x-android/pull/7257
+* WIP : display user status by @ganfra in https://github.com/element-hq/element-x-android/pull/7232
+### Dependency upgrades
+* Update roborazzi to v1.67.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7188
+* Update dependency io.sentry:sentry-android to v8.48.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7217
+* Update dependency com.google.crypto.tink:tink-android to v1.23.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7229
+* Update kotlin to v2.3.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7234
+* Update dependency net.zetetic:sqlcipher-android to v4.17.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7218
+* Update dependency com.google.firebase:firebase-bom to v34.16.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7237
+* Update dependencyAnalysis to v3.16.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7212
+* Update actions/setup-java action to v5.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7214
+* Update dependency io.element.android:element-call-embedded to v0.22.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7161
+* Update kotlin to v2.4.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7244
+* Update roborazzi to v1.68.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7245
+* Update metro to v1.3.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7243
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.07.22 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7258
+* Update zizmorcore/zizmor-action action to v0.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7256
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.07.23 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7262
+* Update dependency io.sentry:sentry-android to v8.49.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7263
+* Update dependencyAnalysis to v3.17.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7265
+* Update actions/setup-java action to v5.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7268
+* Update dependency org.jetbrains.kotlinx:kover-gradle-plugin to v0.9.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7273
+* Update actions/setup-python action to v7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7278
+* Update roborazzi to v1.70.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7274
+* Update actions/checkout action to v7.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7282
+* Import Compound tokens from `v10.2.3` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7272
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.07.28 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7287
+* Update dependency org.maplibre.gl:android-sdk to v13.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7290
+### 💼 Element Pro
+* Content scanner (Element Pro): scan timeline events for unsafe content by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7159
+* Add content scanner support to media gallery and viewer (Element Pro) by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7233
+* Enforce HS disabling E2EE in DM creation too (Element Pro) by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7292
+* Allow adding a path suffix to the OAuth client URI by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7286
+### Others
+* [A11y] Improve rendering on focused UI items by @bmarty in https://github.com/element-hq/element-x-android/pull/7182
+* Add a button role to clickable icons and text on the login/onboarding screens by @unclejay80 in https://github.com/element-hq/element-x-android/pull/7225
+* Expose formatting toggle state to TalkBack by @unclejay80 in https://github.com/element-hq/element-x-android/pull/7227
+* Add warning to the 'Scan QR code' screen by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7264
+* Refactor SearchBarResultState.Initial/NoResultsFound to data objects by @ganfra in https://github.com/element-hq/element-x-android/pull/7266
+* Remove no longer temporary strings by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7260
+* Use the right insets in the home screen UI by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7271
+* Make settings section separators visible in black theme by @mvanhorn in https://github.com/element-hq/element-x-android/pull/7039
+
+## New Contributors
+* @thirumani-vihaan made their first contribution in https://github.com/element-hq/element-x-android/pull/7222
+* @mvanhorn made their first contribution in https://github.com/element-hq/element-x-android/pull/7039
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.07.1...v26.08.0
+
+Changes in Element X v26.07.1
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.07.1 -->
+
+## What's Changed
+### ✨ Features
+* Scroll to unread messages by @bmarty in https://github.com/element-hq/element-x-android/pull/7024
+### 🙌 Improvements
+* Collapse runs of deleted messages in the timeline by @manfrommedan in https://github.com/element-hq/element-x-android/pull/7195
+* Allow homeserver to disable encryption in Element Pro by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7198
+### 🐛 Bugfixes
+* Fix jump-to-unread requiring two taps for an out-of-window read marker by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/6943
+* Add content description to video preview for screen readers by @bmarty in https://github.com/element-hq/element-x-android/pull/7137
+* Fix accessibility for message composer input and read receipts button by @bmarty in https://github.com/element-hq/element-x-android/pull/7135
+* Add accessibility label to search input by @bmarty in https://github.com/element-hq/element-x-android/pull/7133
+* Fix timeline reading order distorted when TalkBack is active by @bmarty in https://github.com/element-hq/element-x-android/pull/7138
+* Add programmatic label and focus indicator to PIN entry field by @bmarty in https://github.com/element-hq/element-x-android/pull/7132
+* Fix timelines not loading after marking a room as read from notification when app was killed by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7202
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/7192
+### 🧱 Build
+* Bump the default Gradle daemon heap to match what CI already uses by @PolynomialDivision in https://github.com/element-hq/element-x-android/pull/7152
+* Update screenshots by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7155
+* Update GitHub templates by @bmarty in https://github.com/element-hq/element-x-android/pull/7170
+* Add check on merged manifest by @bmarty in https://github.com/element-hq/element-x-android/pull/7172
+* Fix AAPT dump missing and reordering some permissions by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7193
+* Try fixing DM creation in Maestro by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7204
+### 🚧 In development 🚧
+* Support gallery messages by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6519
+* Support gallery messages by @bmarty in https://github.com/element-hq/element-x-android/pull/7112
+* Initial content scanner integration by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7139
+* WIP : Set user status by @ganfra in https://github.com/element-hq/element-x-android/pull/7094
+### Dependency upgrades
+* Update dependency io.sentry:sentry-android to v8.44.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7093
+* Update dependency org.maplibre.gl:android-sdk to v13.3.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7129
+* Update actions/setup-java action to v5.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7143
+* Update danger/danger-js action to v13.0.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7142
+* Update dependency io.sentry:sentry-android to v8.46.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7140
+* Update dependencyAnalysis to v3.16.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7144
+* Update plugin gms_google_services to v4.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7086
+* Update dependency androidx.compose.material3:material3 to v1.5.0-alpha21 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7007
+* Update dependency androidx.compose.material3:material3 to v1.5.0-alpha22 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7158
+* Update metro to v1.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7168
+* Update dependency io.sentry:sentry-android to v8.47.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7178
+* Update dependency androidx.compose:compose-bom to v2026.06.01 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7174
+* Update dependency org.jetbrains.kotlinx:kotlinx-collections-immutable to v0.5.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7180
+* Update dependency io.github.sergio-sastre.ComposablePreviewScanner:android to v0.9.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7201
+* Update dependency io.github.zxing-cpp:android to v3.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7206
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.07.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7194
+* Update dependency androidx.sqlite:sqlite-ktx to v2.7.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7177
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.07.15 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7216
+### Others
+* Timeline: jump-to-unread FAB and mark-as-read shortcut by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/6694
+* Iterate on visual list by @bmarty in https://github.com/element-hq/element-x-android/pull/7141
+* Fix wrong avatar shown in the thread list's top bar by @bxdxnn in https://github.com/element-hq/element-x-android/pull/7044
+* Update onboarding screen text style by @bmarty in https://github.com/element-hq/element-x-android/pull/7157
+* Add full SVG support by @bxdxnn in https://github.com/element-hq/element-x-android/pull/7020
+* Add skin tone picker to the emoji picker by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6917
+* Fix the message edit being lost when attaching media by @manfrommedan in https://github.com/element-hq/element-x-android/pull/7090
+* Cleanup AndroidManifest.xml files. by @bmarty in https://github.com/element-hq/element-x-android/pull/7171
+* Handle local network permission - Android 17 by @ganfra in https://github.com/element-hq/element-x-android/pull/7165
+* Add item count text as the placeholder for in reply to box for galleries by @bxdxnn in https://github.com/element-hq/element-x-android/pull/7176
+* Default to dark theme for EC by @toger5 in https://github.com/element-hq/element-x-android/pull/7162
+
+## New Contributors
+* @PolynomialDivision made their first contribution in https://github.com/element-hq/element-x-android/pull/7152
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.07.0...v26.07.1
+
+Changes in Element X v26.07.0
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.07.0 -->
+
+## What's Changed
+### ✨ Features
+* Add read all messages feature by @hghgrtut in https://github.com/element-hq/element-x-android/pull/7049
+### 🐛 Bugfixes
+* Detect RTL text in events and adjust the text rendering by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6994
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/7071
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/7115
+### 🧱 Build
+* Fix Sonar with AGP 9 (some workarounds) by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7055
+* Disable periodically generating the screenshot gallery by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7110
+* Try a different workaround for flaky `ScanQrCodeViewTest` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7109
+### 🚧 In development 🚧
+* Protect link new device by @bmarty in https://github.com/element-hq/element-x-android/pull/6992
+### Dependency upgrades
+* Update metro to v1.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7057
+* Update gradle/actions action to v6.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7063
+* Update roborazzi to v1.64.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7068
+* Update rnkdsh/action-upload-diawi action to v1.5.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7067
+* Update dependency io.element.android:element-call-embedded to v0.20.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7075
+* Update dependency com.github.matrix-org:matrix-analytics-events to v0.37.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7079
+* Update actions/setup-java action to v5.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7088
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.06.18 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7052
+* Update firebaseAppDistribution to v5.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7096
+* Update dependency com.google.firebase:firebase-bom to v34.15.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7089
+* Update dependency com.google.crypto.tink:tink-android to v1.22.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7105
+* Update actions/checkout action to v7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7098
+* Update lifecycle to v2.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7097
+* Update danger/danger-js action to v13.0.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7104
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.06.25 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7107
+* Update dependency androidx.compose:compose-bom to v2026.06.00 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7095
+* Update dependency io.element.android:element-call-embedded to v0.20.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7117
+* Update zizmorcore/zizmor-action action to v0.5.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7116
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.06.30 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7127
+* Update dependency com.posthog:posthog-android to v3.51.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7128
+### Others
+* Fix small code smell by @bmarty in https://github.com/element-hq/element-x-android/pull/7058
+* Hide message notification content when the app is locked by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6902
+
+## New Contributors
+* @hghgrtut made their first contribution in https://github.com/element-hq/element-x-android/pull/7049
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.06.4...v26.07.0
+
+Changes in Element X v26.06.4
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.06.4 -->
+
+## What's Changed
+### ✨ Features
+* Add well-known parsing and extension seam for custom recovery passphrase by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/6944
+### 🙌 Improvements
+* Add ability to forward a message to several rooms. by @bmarty in https://github.com/element-hq/element-x-android/pull/7013
+### 🐛 Bugfixes
+* `screen_custom_recovery_key_input_notice` is now a plurals. by @bmarty in https://github.com/element-hq/element-x-android/pull/7045
+* Replace `ContentResolver.delete` usage with a backwards-compatible version by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7053
+### Dependency upgrades
+* Update kotlin to v0.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7036
+* Update gradle/actions action to v6.1.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7037
+* Update jna monorepo to v5.19.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7026
+* Update coil to v3.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7043
+* Update metro to v1.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7048
+* Update dependency io.sentry:sentry-android to v8.43.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7047
+* Update dependencyAnalysis to v3.15.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7050
+* Compile with sdk37 and target API 37 by @bmarty in https://github.com/element-hq/element-x-android/pull/7041
+### Others
+* call: Remove deprecated web<->EX api calls, use the new ones by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6628
+* Fix deprecation warning by @bmarty in https://github.com/element-hq/element-x-android/pull/7042
+* Let Divider use our theme color. by @bmarty in https://github.com/element-hq/element-x-android/pull/7054
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.06.3...v26.06.4
+
+Changes in Element X v26.06.3
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.06.3 -->
+
+## What's Changed
+### ✨ Features
+* Click on avatar in moderation bottom sheet opens avatar preview by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6991
+### 🙌 Improvements
+* Change: hide UserLocationPuck when sharing from current device by @ganfra in https://github.com/element-hq/element-x-android/pull/6955
+* Replace "Edit" button with Crop icon. by @bmarty in https://github.com/element-hq/element-x-android/pull/6953
+* change(location): ensure permissions are always requested at least once by @ganfra in https://github.com/element-hq/element-x-android/pull/6996
+* Refactor: replace client-side event filtering for public rooms with SDK by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7025
+### 🐛 Bugfixes
+* Ensure the video preview can be played several times. by @bmarty in https://github.com/element-hq/element-x-android/pull/6964
+* Fix "Sent" checkmark disappearing when the message is read and "Share presence" is disabled by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6985
+* Make `BaseRoom.getDirectRoomMember` change when `roomInfo.isDm` changes by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6989
+* Fix invites not being sent during the room creation by @bxdxnn in https://github.com/element-hq/element-x-android/pull/7018
+* Fix sharing media inside the app by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7016
+* Fix ANRs when calculating DB sizes for Sentry by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7017
+* Fix thread list not loading older threads by @bxdxnn in https://github.com/element-hq/element-x-android/pull/7034
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6986
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/7021
+### 🧱 Build
+* Try fixing flaky screenshots for location timeline items by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6954
+* `ScanQrCodeViewTest`: try fixing broken test in CI by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7027
+### 🚧 In development 🚧
+* Ensure that the application rotate the QrCode if one day the SDK emits the `.Expired` error. by @bmarty in https://github.com/element-hq/element-x-android/pull/6993
+### Dependency upgrades
+* Update dependency androidx.javascriptengine:javascriptengine to v1.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6785
+* Update dependency com.google.firebase:firebase-bom to v34.14.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6967
+* Update dependency com.github.matrix-org:matrix-analytics-events to v0.36.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6963
+* Update dependencyAnalysis to v3.14.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6892
+* Update dependency io.element.android:element-call-embedded to v0.20.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6988
+* Update dependency io.mockk:mockk to v1.14.11 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6977
+* Update zizmorcore/zizmor-action action to v0.5.6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6845
+* deps(codecov) :  bumps to v7.0.0 to unblock CI by @ganfra in https://github.com/element-hq/element-x-android/pull/7002
+* Update wysiwyg to v2.42.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7009
+* Update actions/checkout action to v6.0.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6997
+* fix(deps): update android.gradle.plugin to v9 (major) by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6021
+* Update dependencyAnalysis to v3.14.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6995
+* Update dependency io.sentry:sentry-android to v8.43.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6895
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.06.11 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7014
+* Update dependency org.maplibre.gl:android-sdk to v13.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7022
+* Update dependency com.google.firebase:firebase-bom to v34.14.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7029
+* Update okhttp monorepo to v5.4.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/7031
+### Others
+* Fix some string mappings for link new device errors by @hughns in https://github.com/element-hq/element-x-android/pull/6675
+* Fallback to the default push gateway on error by @p1gp1g in https://github.com/element-hq/element-x-android/pull/5742
+* Fix some string mappings for link new device errors by @bmarty in https://github.com/element-hq/element-x-android/pull/6958
+* Add `/myroomnick` slash command to change your display name in the current room by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6865
+* Update release notes for `v26.05.1` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6990
+* Fix message drafts not being saved in Threads by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6984
+* build-rust-sdk: allow skipping git update for kotlin components by @richvdh in https://github.com/element-hq/element-x-android/pull/7012
+* Fix broken screenshot tests by @jmartinesp in https://github.com/element-hq/element-x-android/pull/7038
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.06.2...v26.06.3
+
+Changes in Element X v26.06.2
+=============================
+
+Security fixes 🔐
+-----------------
+- Fixed an issue with OIDC callback URLs that could cause the app to crash [(GHSA-r4f9-46vw-v7g3)](https://github.com/element-hq/element-x-android/security/advisories/GHSA-r4f9-46vw-v7g3).
+
+Changes in Element X v26.06.1
+=============================
+
+The release of `v26.06.0` was cancelled because it contained some changes that would prevent some users with devices having no Vulkan support from being able to install the app. This release contains the same changes as `v26.06.0` but with the Vulkan requirement removed.
+
+## What's Changed
+### ✨ Features
+* Image edition before sending: crop and rotate. by @bmarty in https://github.com/element-hq/element-x-android/pull/6842
+* Use a raw key for the SDK stores for new sessions by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6835
+* Notification settings: pick custom sounds for messages and call ringtones by @bmarty in https://github.com/element-hq/element-x-android/pull/6897
+### 🙌 Improvements
+* Do not show membership/profile events in public rooms by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6360
+* Use `runBlocking` for the token refresh logic by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6863
+* Move empty day separator filtering to a timeline post-processor by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6866
+* Add better logs to track token update failures by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6859
+* Read map tiler custom style from matrix .well-known file by @bmarty in https://github.com/element-hq/element-x-android/pull/6886
+* change(permissions) : allow to change ShareLiveLocation permission by @ganfra in https://github.com/element-hq/element-x-android/pull/6890
+* Avoid SQLCipher key derivation by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6774
+* change: replace the maplibre-compose UserLocationState to a simpler one by @ganfra in https://github.com/element-hq/element-x-android/pull/6913
+* Change : location provider by @ganfra in https://github.com/element-hq/element-x-android/pull/6935
+* Add flip actions to image edition by @bmarty in https://github.com/element-hq/element-x-android/pull/6949
+* Remove the `FloatingDateBadge` feature flag by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6950
+### 🐛 Bugfixes
+* Fix media viewer flickering by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6800
+* Fix 'Conversation label cannot be empty' error by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6823
+* Release proximity wakelock on Element Call when call ends by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6825
+* Hide edit pencil from accessibility by @bmarty in https://github.com/element-hq/element-x-android/pull/6826
+* Don't compress images sent through the Files attachment picker by @cizra in https://github.com/element-hq/element-x-android/pull/6755
+* [a11y] Improve accessibility of video and audio player by @bmarty in https://github.com/element-hq/element-x-android/pull/6830
+* [a11y] Improve accessibility of screen headers. by @bmarty in https://github.com/element-hq/element-x-android/pull/6827
+* Add mark as read / unread in room details by @bmarty in https://github.com/element-hq/element-x-android/pull/6818
+* Fix formatting inconsistencies in latest event summaries by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6855
+* Fix public read receipts being sent by mistake by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6838
+* Fix app having a pink top bar in the recent app list when PIN lock is setup by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6903
+* Create log messages from `WebView` just once by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6923
+* Use secondary color icon for leading icons by @bmarty in https://github.com/element-hq/element-x-android/pull/6926
+* Use reverse ordering for `FilterEmptyDayPostProcessor` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6927
+* Make Vulkan a *not required* feature by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6961
+### 🗣 Translations
+* Sync Strings - new translations to Catalan by @ElementBot in https://github.com/element-hq/element-x-android/pull/6856
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6921
+### 🧱 Build
+* Remove DI-generated code from Kover reports by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6834
+* Disable cron jobs and private SSH key jobs in forks by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6821
+* Revert "Disable cron jobs and private SSH key jobs in forks" by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6905
+* Downgrade detekt compose rules by @bmarty in https://github.com/element-hq/element-x-android/pull/6846
+* Add Stefan's etiquette to the project. by @bmarty in https://github.com/element-hq/element-x-android/pull/6909
+### 🚧 In development 🚧
+* [Link new device] Rotate QrCode instead of showing an error by @bmarty in https://github.com/element-hq/element-x-android/pull/6817
+* Fix image resizing behavior. by @bmarty in https://github.com/element-hq/element-x-android/pull/6924
+### Dependency upgrades
+* Update dependency net.zetetic:sqlcipher-android to v4.16.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6819
+* Update dependencyAnalysis to v3.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6813
+* Update metro to v1.1.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6832
+* Update dependency io.element.android:element-call-embedded to v0.19.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6833
+* Update kotlin to v2.3.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6822
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.20 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6831
+* Update media3 to v1.10.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6816
+* Update peaceiris/actions-gh-pages action to v4.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6820
+* Update dependencyAnalysis to v3.12.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6840
+* Update codecov/codecov-action action to v6.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6864
+* Update dependency io.element.android:element-call-embedded to v0.20.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6876
+* Update roborazzi to v1.62.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6858
+* Update dependency androidx.compose:compose-bom to v2026.05.01 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6888
+* Update roborazzi to v1.63.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6893
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.26 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6885
+* Update dependency org.maplibre.compose:maplibre-compose to v0.13.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6891
+* Update actions/stale action to v10.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6904
+* Update tspascoal/get-user-teams-membership action to v4.0.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6900
+* Update dependency org.maplibre.gl:android-sdk to v13.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6930
+* Update dependency org.unifiedpush.android:connector to v3.3.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6937
+* Update kotlin to v2.3.9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6946
+* Update dependency com.posthog:posthog-android to v3.47.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6920
+* Import compound token from release 10.2.1 https://github.com/element-hq/compound-design-tokens/releases/tag/v10.2.1 by @bmarty in https://github.com/element-hq/element-x-android/pull/6942
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.06.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6947
+* Update dependency com.github.matrix-org:matrix-analytics-events to v0.36.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6939
+### Others
+* Make the avatar in the room member moderation bottom sheet clickable by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6705
+* Do not hide your own media for "Show media in timeline" by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6898
+* Report problem: add an optional TextField to provide a GitHub issue number. by @bmarty in https://github.com/element-hq/element-x-android/pull/6911
+* Fix read receipts not shown for calls by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6889
+* Reorder room detail items by @bmarty in https://github.com/element-hq/element-x-android/pull/6929
+* [Media viewer] File preview improvement by @bmarty in https://github.com/element-hq/element-x-android/pull/6933
+* [Media bottom sheet] UI iteration by @bmarty in https://github.com/element-hq/element-x-android/pull/6938
+* Add unread count to the room unread indicator by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6887
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.05.2...v26.06.1
+
+Changes in Element X v26.05.2
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.05.2 -->
+
+## What's Changed
+### ✨ Features
+* Remove SignInWithClassic FeatureFlag to enable the feature. by @bmarty in https://github.com/element-hq/element-x-android/pull/6698
+* Create a new room when inviting people in a DM by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6756
+* Remove LiveLocationSharing feature flag by @ganfra in https://github.com/element-hq/element-x-android/pull/6811
+### 🙌 Improvements
+* Disable biometric unlock when we disable pin code unlock by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6781
+### 🐛 Bugfixes
+* Fix room list duplicate-detection telemetry crashing before it can report by @jennaharris7 in https://github.com/element-hq/element-x-android/pull/6791
+* Only load full media on media viewer when it's the visible item by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6794
+* Attempt to fix room list item duplicates at midnight by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6793
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6798
+### 🧱 Build
+* Fix Maestro again after changes to the invite flow by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6796
+* Renovate: Keep Guava on the Android variant and ignore jre-only upgrades by @bmarty in https://github.com/element-hq/element-x-android/pull/6776
+### Dependency upgrades
+* Update dependency androidx.compose:compose-bom to v2026.05.00 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6784
+* Update dependency io.sentry:sentry-android to v8.41.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6787
+* Update kotlin by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6790
+* Update camera to v1.6.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6783
+* Update dependency androidx.webkit:webkit to v1.16.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6786
+* Update dependency com.google.firebase:firebase-bom to v34.13.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6789
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.18 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6805
+### Others
+* Add MIDI playback by @cizra in https://github.com/element-hq/element-x-android/pull/6770
+* Show error message when using "Sign in with QR code" with a QR from a device that is also not signed in by @hughns in https://github.com/element-hq/element-x-android/pull/6802
+
+## New Contributors
+* @jennaharris7 made their first contribution in https://github.com/element-hq/element-x-android/pull/6791
+* @cizra made their first contribution in https://github.com/element-hq/element-x-android/pull/6770
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.05.1...v26.05.2
+
+Changes in Element X v26.05.1
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.05.1 -->
+
+Security fixes 🔐
+-----------------
+
+This release contains some important security fixes:
+
+- Check the user ID in the `sender_device_keys` property of Olm-encrypted to-device events to prevent sender spoofing by homeserver owners. ([#6553](https://github.com/matrix-org/matrix-rust-sdk/pull/6553), High, [CVE-2026-45056](https://www.cve.org/CVERecord?id=CVE-2026-45056), [GHSA-wfq4-36m3-9g42](https://github.com/matrix-org/matrix-rust-sdk/security/advisories/GHSA-wfq4-36m3-9g42))
+- Reject invalid edits as candidates for timeline updates. ([#6454](https://github.com/matrix-org/matrix-rust-sdk/pull/6454), Moderate, [CVE-2026-45057](https://www.cve.org/CVERecord?id=CVE-2026-45057), [GHSA-h97m-27fx-42rx](https://github.com/matrix-org/matrix-rust-sdk/security/advisories/GHSA-h97m-27fx-42rx))
+
+## What's Changed
+### ✨ Features
+* Make Element Call screen work edge-to-edge by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6634
+### 🙌 Improvements
+* Stop removing the `logs` dir when clearing cache by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6765
+* Adapt to new DM definition changes in the SDK by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6748
+* feat: Update call started timeline item + declined support by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6649
+### 🐛 Bugfixes
+* Improve pin code UX by @bmarty in https://github.com/element-hq/element-x-android/pull/6744
+* Use just the other user's avatar for DM details by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6738
+* Improve `FetchPushForegroundService`'s reliability by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6757
+* Prevent user from starting Live Location Sharing in thread by @bmarty in https://github.com/element-hq/element-x-android/pull/6767
+* Fix media playback from the timeline broken when exiting a thread by @bmarty in https://github.com/element-hq/element-x-android/pull/6771
+* Pin code: remove the key if there is no pin code by @bmarty in https://github.com/element-hq/element-x-android/pull/6780
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6761
+### 🚧 In development 🚧
+* Feature : share live location by @ganfra in https://github.com/element-hq/element-x-android/pull/6741
+### Dependency upgrades
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6746
+* Update actions/add-to-project action to v2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6758
+* Update dependency io.github.sergio-sastre.ComposablePreviewScanner:android to v0.9.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6759
+* Update dependency io.element.android:element-call-embedded to v0.19.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6766
+* Update metro to v1 (major) by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6720
+* Update tspascoal/get-user-teams-membership action to v4.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6750
+* Update plugin sonarqube to v7.3.0.8198 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6743
+* Update plugin dependencycheck to v12.2.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6760
+* Update dependency com.google.guava:guava to v33.6.0-android by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6646
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6779
+### Others
+* Render media captions formatting in the media viewer by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6729
+* Reduce FeatureFlag `Knock` effect on room creation and room edition forms by @bmarty in https://github.com/element-hq/element-x-android/pull/6768
+* Use the right analytics span as a parent in `checkNetworkConnection` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6751
+* Add missing strings `theme.black` by @bmarty in https://github.com/element-hq/element-x-android/pull/6772
+* Map back button in web view to esc (revive fixed version of: https://github.com/element-hq/element-x-android/pull/6724) by @toger5 in https://github.com/element-hq/element-x-android/pull/6725
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.05.0...v26.05.1
+
+Changes in Element X v26.05.0
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.05.0 -->
+
+## What's Changed
+### ✨ Features
+* Add flag for automatic back pagination feature by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6637
+* Promote "history sharing on invite" out of developer options by @richvdh in https://github.com/element-hq/element-x-android/pull/6647
+* Remove RoomDirectorySearch feature flag — always enable the feature by @Copilot in https://github.com/element-hq/element-x-android/pull/6736
+### 🙌 Improvements
+* Change native back button behavior in EC view (close settings in EC with os native back) by @toger5 in https://github.com/element-hq/element-x-android/pull/6642
+* Revert PR #6642 by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6724
+* Use 'Report a problem' string instead of 'Report bug' by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6735
+### 🐛 Bugfixes
+* Remove distributed tracing of the 'timeline loading' flow by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6644
+* Set max lines for 'in reply to' view conditionally by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6612
+* Mention pill cut off by @bmarty in https://github.com/element-hq/element-x-android/pull/6651
+* Ensure that bottom sheet can scroll by @bmarty in https://github.com/element-hq/element-x-android/pull/6661
+* Remove legacy `mx-reply` from `toPlainText` formatted event contents by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6683
+* Fix ANRs when receiving push notifications by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6696
+* Mitigate a deadlock when loading room timelines by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6674
+* Fix calls on Huawei devices: skip addWebMessageListener on Chromium < 119 by @manfrommedan in https://github.com/element-hq/element-x-android/pull/6640
+* Allow cancelling room loading in Home screen by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6723
+* Let our Json parser accept comments and trailing comma. by @bmarty in https://github.com/element-hq/element-x-android/pull/6700
+* Fix low width image message  by @krbns in https://github.com/element-hq/element-x-android/pull/6692
+* Make icons in the Chat screen top bar 16dp by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6733
+* Fix back button sometimes not working after exiting a thread by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6732
+* Make send event state UI easier to click by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6739
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6658
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6716
+### 🧱 Build
+* Fix record screenshots action permissions by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6679
+* Fix dependency error by @bmarty in https://github.com/element-hq/element-x-android/pull/6697
+### 🚧 In development 🚧
+* [Link new device] Add missing screen to render digits that the user has to type on the other device by @bmarty in https://github.com/element-hq/element-x-android/pull/6680
+### Dependency upgrades
+* Update dependency io.nlopez.compose.rules:detekt to v0.5.7 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6594
+* Update zizmorcore/zizmor-action action to v0.5.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6630
+* Update dependency io.sentry:sentry-android to v8.38.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6597
+* fix(deps): update camera to v1.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6514
+* Update dependency io.sentry:sentry-android to v8.39.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6648
+* Update dependency io.element.android:element-call-embedded to v0.19.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6662
+* Update dependencyAnalysis to v3.9.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6657
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.04.27 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6666
+* Update dependency io.sentry:sentry-android to v8.40.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6691
+* Update dependency org.jsoup:jsoup to v1.22.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6660
+* Update kotlin by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6687
+* Update dependency androidx.compose:compose-bom to v2026.04.01 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6693
+* Update dependency io.nlopez.compose.rules:detekt to v0.5.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6711
+* Update dependency com.posthog:posthog-android to v3.43.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6704
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6718
+* Update roborazzi to v1.60.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6722
+* Update dependency net.zetetic:sqlcipher-android to v4.15.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6727
+* Update dependency org.maplibre.gl:android-sdk to v13.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6731
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.05.6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6734
+* Update dependencyAnalysis to v3.10.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6742
+* Update tspascoal/get-user-teams-membership action to v4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6747
+### Others
+* devx: fix build sdk script options for macos by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6636
+* PR:Fix mention pill cut off by @krbns in https://github.com/element-hq/element-x-android/pull/6622
+* Update media viewer UI by @bmarty in https://github.com/element-hq/element-x-android/pull/6643
+* Strip formatting from media captions in room summary by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6670
+* Update error mappings for Link new device flow by @hughns in https://github.com/element-hq/element-x-android/pull/6677
+* Rename `OIDC` components and variables to `OAuth` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6686
+* [Link new device] Add missing error case "already signed in" by @bmarty in https://github.com/element-hq/element-x-android/pull/6688
+* Improve detection of completion for Link new device flow by @hughns in https://github.com/element-hq/element-x-android/pull/6681
+* Remove external call support by @bmarty in https://github.com/element-hq/element-x-android/pull/6668
+* [a11y] Fix a set of issues by @bmarty in https://github.com/element-hq/element-x-android/pull/6650
+* Add clipping to RoomSummaryRow by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6654
+* Fix media viewer flickering and crashing by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6715
+* Rename verification methods by @bmarty in https://github.com/element-hq/element-x-android/pull/6726
+* Add a way to tweak MAS url. by @bmarty in https://github.com/element-hq/element-x-android/pull/6682
+* Fix 2 x Crash the app in Developer Options - Update AppDeveloperSettingsView.kt by @escix in https://github.com/element-hq/element-x-android/pull/6708
+* Introduce UI sample by @bmarty in https://github.com/element-hq/element-x-android/pull/6740
+
+## New Contributors
+* @krbns made their first contribution in https://github.com/element-hq/element-x-android/pull/6622
+* @toger5 made their first contribution in https://github.com/element-hq/element-x-android/pull/6642
+* @manfrommedan made their first contribution in https://github.com/element-hq/element-x-android/pull/6640
+* @Copilot made their first contribution in https://github.com/element-hq/element-x-android/pull/6736
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.04.4...v26.05.0
+
+Changes in Element X v26.04.4
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.04.4 -->
+
+## What's Changed
+### 🙌 Improvements
+* Natural media viewer swiping order by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6431
+* Replace `rustls-platform-verifier-android.aar` with single class by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6610
+* Cleanup FetchPushForegroundService by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6577
+* cleaning: Remove join button from call notify timelineItemView by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6603
+### 🐛 Bugfixes
+* Fix crash when going back to threads list by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6620
+* audio: Let EC decide alone what communication device to use by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6609
+* Fix media viewer bottom sheets not being scrollable by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6631
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6626
+### 📄 Documentation
+* Updates to new features and some refactoring. by @mxandreas in https://github.com/element-hq/element-x-android/pull/6591
+### 🚧 In development 🚧
+* WIP : live location rendering by @ganfra in https://github.com/element-hq/element-x-android/pull/6611
+### Dependency upgrades
+* Update dependency io.element.android:element-call-embedded to v0.19.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6593
+* Update dependency androidx.annotation:annotation-jvm to v1.10.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6596
+* Update dependency org.jetbrains.kotlinx:kotlinx-serialization-json to v1.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6605
+* Update dependency com.google.firebase:firebase-bom to v34.12.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6604
+* Update actions/upload-artifact action to v7.0.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6614
+* Update plugin dependencycheck to v12.2.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6621
+* Update actions/github-script action to v9 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6606
+* Update peter-evans/create-pull-request action to v8.1.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6615
+* Update dependencyAnalysis to v3.7.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6616
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.04.21 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6635
+### Others
+* Settings UI update. by @bmarty in https://github.com/element-hq/element-x-android/pull/6602
+* Support replying to messages with voice recordings by @kalix127 in https://github.com/element-hq/element-x-android/pull/6464
+* Add Black theme option for battery saving on OLED displays by @timurgilfanov in https://github.com/element-hq/element-x-android/pull/6441
+* Fix | When selecting earpiece twice in a row the proximity sensor get wrongly disabled by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6627
+* Update wording of deactivate account screen by @bmarty in https://github.com/element-hq/element-x-android/pull/6633
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.04.3...v26.04.4
+
+Changes in Element X v26.04.3
+=============================
+
+<!-- Release notes generated using configuration in .github/release.yml at v26.04.3 -->
+
+## What's Changed
+### ✨ Features
+* Sign in with element classic final by @bmarty in https://github.com/element-hq/element-x-android/pull/6296
+* Take into account homeserver capabilities by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6507
+### 🙌 Improvements
+* feat: Default to camera muted when joining ongoing voice call by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/6574
+### 🐛 Bugfixes
+* Fix crash in FetchPushForegroundService: No super method onTimeout by @bmarty in https://github.com/element-hq/element-x-android/pull/6547
+* Ensure mark as fully read is called only once when leaving the timeline by @bmarty in https://github.com/element-hq/element-x-android/pull/6550
+* Fix `isInAirGappedEnvironment` check for older APIs by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6573
+* Fix loading initial items of non-live timelines by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6598
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6537
+* Sync Strings - new translations in Japanese and Vietnamese by @ElementBot in https://github.com/element-hq/element-x-android/pull/6568
+### 🧱 Build
+* Fix module dependencies by @bmarty in https://github.com/element-hq/element-x-android/pull/6559
+### 🚧 In development 🚧
+* Add confirmation dialog when inviting users with unknown identities by @kaylendog in https://github.com/element-hq/element-x-android/pull/6523
+* Feature: add room threads list by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6575
+### Dependency upgrades
+* fix(deps): update media3 to v1.10.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6529
+* fix(deps): update dependency io.github.sergio-sastre.composablepreviewscanner:android to v0.8.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6525
+* fix(deps): update metro to v0.12.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6543
+* fix(deps): update kotlinpoet to v2.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6528
+* Sync compound tokens https://github.com/element-hq/compound-design-tokens/releases/tag/v10.0.0 by @bmarty in https://github.com/element-hq/element-x-android/pull/6517
+* fix(deps): update dependency io.sentry:sentry-android to v8.37.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6508
+* fix(deps): update dependency org.maplibre.gl:android-sdk to v13.0.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6546
+* Update codecov/codecov-action action to v6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6521
+* Update telephoto to v0.19.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6558
+* Update dependency net.zetetic:sqlcipher-android to v4.14.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6552
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.04.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6553
+* Update gradle/actions action to v6.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6562
+* Update metro to v0.13.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6565
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.04.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6570
+* Update wysiwyg to v2.41.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6572
+* Update dependency com.google.testparameterinjector:test-parameter-injector to v1.22 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6576
+* Use `Coil3` for `ZoomableAsyncImage` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6582
+* Update dependency org.matrix.rustcomponents:sdk-android to v26.04.15 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6595
+* Update nschloe/action-cached-lfs-checkout action to v1.2.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6600
+### Others
+* Fix portrait image metadata when uploading without media optimization by @kalix127 in https://github.com/element-hq/element-x-android/pull/6362
+* Fix Threads not tappable in pinned messages list by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6535
+* Reduce log level of activity lifecycle from warning to debug. by @bmarty in https://github.com/element-hq/element-x-android/pull/6548
+* Remove spaces features flags by @bmarty in https://github.com/element-hq/element-x-android/pull/6560
+* Remove space announcement by @bmarty in https://github.com/element-hq/element-x-android/pull/6561
+* Update metro to v0.13.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6571
+* Take into account the value of FeatureFlags.SignInWithClassic by @bmarty in https://github.com/element-hq/element-x-android/pull/6586
+* Add extra logs for timeline pagination by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6589
+* Scrollable media caption - tweaks by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6583
+* Split developer settings into 2 screens to be able to access global settings when no logged in. by @bmarty in https://github.com/element-hq/element-x-android/pull/6587
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.04.2...v26.04.3
+
+Changes in Element X v26.04.2
+=============================
+
+## What's Changed
+### 🐛 Bugfixes
+* Restore enterprise submodule. by @bmarty in https://github.com/element-hq/element-x-android/pull/6541
+### Dependency upgrades
+* fix(deps): update dependency io.element.android:element-call-embedded to v0.19.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6538
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.04.1...v26.04.2
+
+Changes in Element X v26.04.1
+=============================
+
+## What's Changed
+### ✨ Features
+* Add support for slash commands (under Feature Flag) by @bmarty in https://github.com/element-hq/element-x-android/pull/6482
+### Dependency upgrades
+* chore(deps): update gradle/actions action to v6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6489
+* fix(deps): update dependency androidx.work:work-runtime-ktx to v2.11.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6479
+* fix(deps): update dependency net.zetetic:sqlcipher-android to v4.14.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6460
+* fix(deps): update metro to v0.12.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6503
+* fix(deps): update dependency androidx.compose:compose-bom to v2026.03.01 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6511
+* fix(deps): update dependency org.jetbrains.kotlinx:kover-gradle-plugin to v0.9.8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6513
+* fix(deps): update dependency androidx.browser:browser to v1.10.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6515
+* fix(deps): update dependency io.element.android:emojibase-bindings to v1.5.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6493
+* fix(deps): update core to v1.18.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6328
+### Others
+* Tentative fix for `ForegroundServiceStartNotAllowedException` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6509
+* Fix a missing : in build-rust-sdk by @andybalaam in https://github.com/element-hq/element-x-android/pull/6522
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.04.0...v26.04.1
+
+Changes in Element X v26.04.0
+=============================
+
+## What's Changed
+### ✨ Features
+* Add floating/sticky date badge in the timeline by @kalix127 in https://github.com/element-hq/element-x-android/pull/6496
+### 🐛 Bugfixes
+* Fix `ForegroundServiceDidNotStartInTimeException` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6470
+* Fix media cover placeholder floating by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6484
+* Try handling `ForegroundServiceStartNotAllowedException` better by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6483
+* Fix crash when using `View.hideKeyboardAndAwaitAnimation` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6502
+* Fix content scrolling not working in the RTE by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6492
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/6486
+### 🧱 Build
+* Add instructions for AI by @bmarty in https://github.com/element-hq/element-x-android/pull/6468
+* Fix permissions to publish GitHub pages. by @bmarty in https://github.com/element-hq/element-x-android/pull/6500
+* Try fixing location pin previews by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6495
+* CI: yet another Maestro fix by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6505
+### 📄 Documentation
+* Add some instructions for features to the community PR notice message by @jmartinesp in https://github.com/element-hq/element-x-android/pull/6465
+### 🚧 In development 🚧
+* Setup live location sharing feature by @ganfra in https://github.com/element-hq/element-x-android/pull/6342
+### Dependency upgrades
+* Update dependency io.sentry:sentry-android to v8.36.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6461
+* Update metro to v0.11.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6448
+* Sync compound tokens https://github.com/element-hq/compound-design-tokens/releases/tag/v8.0.0 by @bmarty in https://github.com/element-hq/element-x-android/pull/6459
+* Update sqldelight to v2.3.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6449
+* Update nschloe/action-cached-lfs-checkout action to v1.2.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6442
+* Update kotlin to v2.3.20 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6437
+* Update dependency io.element.android:element-call-embedded to v0.18.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6358
+* fix(deps): update dependency io.element.android:emojibase-bindings to v1.5.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6474
+* fix(deps): update dependency com.google.firebase:firebase-bom to v34.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6478
+* fix(deps): update dependency io.element.android:emojibase-bindings to v1.5.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6487
+* fix(deps): update dependency com.google.crypto.tink:tink-android to v1.21.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6499
+* fix(deps): update dependency com.posthog:posthog-android to v3.39.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6504
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v26.03.31 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/6494
+### Others
+* Iterate on space header by @bmarty in https://github.com/element-hq/element-x-android/pull/6456
+* Add margin after bullet points by @bxdxnn in https://github.com/element-hq/element-x-android/pull/6446
+* chore: update the build-rust-sdk script by @bnjbvr in https://github.com/element-hq/element-x-android/pull/6476
+* Update replied message UI by @bmarty in https://github.com/element-hq/element-x-android/pull/6472
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v26.03.4...v26.04.0
+
 Changes in Element X v26.03.4
 =============================
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f0191d43e0..ec131aa65f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,16 +2,17 @@
 
 <!--- TOC -->
 
-* [Developer onboarding](#developer-onboarding)
-* [Contributing code to Matrix](#contributing-code-to-matrix)
-* [Android Studio settings](#android-studio-settings)
-* [Compilation](#compilation)
-* [Strings](#strings)
-  * [I want to add new strings to the project](#i-want-to-add-new-strings-to-the-project)
+* [Contributing to Element](#contributing-to-element)
   * [I want to help translating Element](#i-want-to-help-translating-element)
+  * [I want to fix a bug](#i-want-to-fix-a-bug)
+  * [I want to add a new feature or enhancement](#i-want-to-add-a-new-feature-or-enhancement)
+  * [Etiquette](#etiquette)
+  * [Developer onboarding](#developer-onboarding)
+  * [Submitting the PRs](#submitting-the-prs)
+  * [Android Studio settings](#android-studio-settings)
+  * [Compilation](#compilation)
+  * [Strings](#strings)
   * [Element X Android Gallery](#element-x-android-gallery)
-* [I want to add a new feature to Element X Android](#i-want-to-add-a-new-feature-to-element-x-android)
-* [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
   * [Kotlin](#kotlin)
   * [Changelog](#changelog)
   * [Code quality](#code-quality)
@@ -29,69 +30,87 @@
 
 <!--- END -->
 
-## Developer onboarding
-
-For a detailed overview of the project, see [Developer Onboarding](./docs/_developer_onboarding.md).
-
-## Contributing code to Matrix
-
-If instead of contributing to the Element X Android project, you want to contribute to Synapse, the homeserver implementation, please read the [Synapse contribution guide](https://element-hq.github.io/synapse/latest/development/contributing_guide.html).
+## Contributing to Element
 
 Element X Android support can be found in this room: [![Element X Android Matrix room #element-x-android:matrix.org](https://img.shields.io/matrix/element-x-android:matrix.org.svg?label=%23element-x-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-x-android:matrix.org).
 
 The rest of the document contains specific rules for Matrix Android projects.
 
-## Android Studio settings
-
-Please set the "hard wrap" setting of Android Studio to 160 chars, this is the setting we use internally to format the source code (Menu `Settings/Editor/Code Style` then `Hard wrap at`).
-Please ensure that you're using the project formatting rules (which are in the project at .idea/codeStyles/), and format the file before committing them.
-
-## Compilation
-
-This project should compile without any special action. Just clone it and open it with Android Studio, or compile from command line using `gradlew`.
-
-## Strings
-
-The strings of the project are managed externally using [https://localazy.com](https://localazy.com) and shared with Element X iOS.
-
-### I want to add new strings to the project
-
-Only the core team can modify or add English strings to Localazy. As an external contributor, if you want to add new strings, feel free to add an Android resource file to the project (for instance a file named `temporary.xml`), with a note in the description of the PR for the reviewer to integrate the String into `Localazy`. If accepted, the reviewer will add the String(s) for you, and then you can download them on your branch (following these [instructions](./tools/localazy/README.md#download-translations)) and remove the temporary file.
-
-Please follow the naming rules for the key. More details in [the dedicated section in this README.md](./tools/localazy/README.md#key-naming-rules)
-
 ### I want to help translating Element
 
 To help translating, please go to [https://localazy.com/p/element](https://localazy.com/p/element).
 
-- If you want to fix an issue with an English string, please open an issue on the github project of Element X (Android or iOS). Only the core team can modify or add English strings.
 - If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please go to [https://localazy.com/p/element](https://localazy.com/p/element).
-
-More information can be found [in this README.md](./tools/localazy/README.md).
+- If you want to fix an issue with an English string, please open an issue on the github project of Element X (Android or iOS). Only the core team can modify or add English strings. As an external contributor, if you want to add new strings, feel free to add an Android resource file to the project (for instance a file named `temporary.xml`), with a note in the description of the PR for the reviewer to integrate the String into `Localazy`. If accepted, the reviewer will add the String(s) for you, and then you can download them on your branch (following these [instructions](./tools/localazy/README.md#download-translations)) and remove the temporary file. Please follow the naming rules for the key. More details in [the dedicated section in this README.md](./tools/localazy/README.md#key-naming-rules) More information can be found [in this README.md](./tools/localazy/README.md).
 
 Once a language is sufficiently translated, it will be added to the app. The core team will decide when a language is sufficiently translated.
 
+### I want to fix a bug
+
+Please check if a corresponding issue exists, if not please create one. In both cases, let us know in the comment that you've started working on it.
+
+### I want to add a new feature or enhancement
+
+To make a great product with a great user experience, all the small efforts need to go in the same direction and be aligned and consistent with each other.
+
+Before making your contribution, please consider the following:
+
+* One product can’t do everything well. Element is focusing on private end-to-end encrypted messaging and voice - this can either be for consumers (e.g. friends and family) or for professional teams and organizations. Public forums and other types of chats without E2EE remain supported but are not the primary use case in case UX compromises need to be made.
+* There are 3 platforms - Android, [iOS](https://github.com/element-hq/element-x-ios) and [Web/Desktop](https://github.com/element-hq/element-web). These platforms need to have feature parity and design consistency. For some features, supporting all platforms is a must have, in some cases exceptions can be made to have it on one platform only.
+* To make sure your idea fits both from a design/solution and use case perspective, please open a new issue (or find an existing issue) in [element-meta](https://github.com/element-hq/element-meta/issues) repository describing the use case and how you plan to tackle it. Do not just describe what feature is missing, explain why the users need it with a couple of real life examples from the field.
+  * In case of an existing issue, please comment that you're planning to contribute. If you create a new issue, please specify that in the issue. In such a case we will try to review the issue ASAP and provide you with initial feedback so you can be confident if and at which conditions your contributions will be accepted.
+
+Once we know that you want to contribute and have confirmed that the new feature is overall aligned with the product direction, the designers of the core team will help you with the designs and any other type of guidance when it comes to the user experience. We will try to unblock you as quickly as we can, but it may not be instant. Having a clear understanding of the use case and the impact of the feature will help us with the prioritization and faster responses.
+
+Only once all of the above is met should you open a PR with your proposed changes.
+
+### Etiquette
+
+* As stated above all significant changes should be communicated through an issue before opening a PR
+* We are happy to receive contributions but features always require maintenance, so depending on the change we might not be willing to accept it
+* We are also fine with AI led contributions within reasonable bounds
+    * You are completely responsible for the quality of the PR
+    * If the PR doesn't show minimal effort (code does not compile, code does not work as expected, etc.) on your part it will be closed
+    * Please write the description yourself, we don't have the bandwidth to read LLM essays. The code needs to speak for itself.
+* We use git for version control and GitHub for reviews, so in order to make everybody's life easier please:
+    * Keep the existing pull request template
+    * Don't submit large PRs, especially if not previously talked about. Anything above 200 lines is large (excluding generated code e.g. tests, translations, mocks)
+    * Please don't open unfinished PRs and expect us to fill in the details
+    * If you would like our opinion/direction on unfinished code please link your branch or idea in the ticket
+    * Please limit the number of commits in a single PR. We are perfectly happy with splitting work across multiple sessions as long as they're logically independant and show promise of progress (ideally expressed through a ticket)
+    * Each and every commit should stand on its own, clearly explaining what it does and why
+* Once a PR goes into review please don't rewrite the history unless agreed so with the reviewer.
+    * Tweaks and fixes following review can be directly committed (to be interactively rebased later) or as fixups
+
+*The reviewer's response time will generally match yours. Switching contexts is very hard so please act accordingly. You are responsible for making the reviewers job enjoyable!*
+
+### Developer onboarding
+
+For a detailed overview of the project, see [Developer Onboarding](./docs/_developer_onboarding.md).
+
+### Submitting the PRs
+
+Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
+
+### Android Studio settings
+
+Please set the "hard wrap" setting of Android Studio to 160 chars, this is the setting we use internally to format the source code (Menu `Settings/Editor/Code Style` then `Hard wrap at`).
+Please ensure that you're using the project formatting rules (which are in the project at .idea/codeStyles/), and format the file before committing them.
+
+### Compilation
+
+This project should compile without any special action. Just clone it and open it with Android Studio, or compile from command line using `gradlew`.
+
+### Strings
+
+The strings of the project are managed externally using [https://localazy.com](https://localazy.com) and shared with Element X iOS.
+
 ### Element X Android Gallery
 
 Once added to Localazy, translations can be checked screen per screen using our tool Element X Android Gallery, available at https://element-hq.github.io/element-x-android/.
 
 Localazy syncs occur every Monday and the screenshots on this page are generated every Tuesday, so you'll have to wait to see your change appearing on Element X Android Gallery.
 
-## I want to add a new feature to Element X Android
-
-Thank you for contributing to the project! Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
-
-Also, please keep in mind that any feature added to Element X Android needs to be added to [the iOS client](https://github.com/element-hq/element-x-ios) too, unless it's related to an Android OS only behaviour.
-
-**IMPORTANT:** if you are adding new screens or modifying existing ones, this needs acceptance from the product and design teams before being merged. For this, it's better to start with a [feature request issue](https://github.com/element-hq/element-x-android/issues/new?template=enhancement.yml) describing the change you want to make and the motivation behind it instead of directly creating a pull request. This will allow the product and design teams to give feedback on the change before you start working on it, and avoid you doing work that might end up being rejected.
-
-## I want to submit a PR to fix an issue
-
-Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
-
-Please check if a corresponding issue exists. If yes, please let us know in a comment that you're working on it.
-If an issue does not exist yet, it may be relevant to open a new issue and let us know that you're implementing it.
-
 ### Kotlin
 
 This project is full Kotlin. Please do not write Java classes.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a4ee1c8459..ecd5ed8e7b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,11 +24,11 @@ import extension.buildConfigFieldStr
 import extension.locales
 import extension.setupDependencyInjection
 import extension.testCommonDependencies
+import org.sonarqube.gradle.SonarResolverTask
 import java.util.Locale
 
 plugins {
     id("io.element.android-compose-application")
-    alias(libs.plugins.kotlin.android)
     // When using precompiled plugins, we need to apply the firebase plugin like this
     id(libs.plugins.firebaseAppDistribution.get().pluginId)
     id("kotlin-parcelize")
@@ -103,13 +103,13 @@ android {
     logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName) [$buildType]")
 
     buildTypes {
-        val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
+        val oAuthRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
         getByName("debug") {
             resValue("string", "app_name", "$baseAppName dbg")
             resValue(
                 "string",
                 "login_redirect_scheme",
-                "$oidcRedirectSchemeBase.debug",
+                "$oAuthRedirectSchemeBase.debug",
             )
             applicationIdSuffix = ".debug"
             signingConfig = signingConfigs.getByName("debug")
@@ -120,7 +120,7 @@ android {
             resValue(
                 "string",
                 "login_redirect_scheme",
-                oidcRedirectSchemeBase,
+                oAuthRedirectSchemeBase,
             )
             signingConfig = signingConfigs.getByName("debug")
 
@@ -157,7 +157,7 @@ android {
             resValue(
                 "string",
                 "login_redirect_scheme",
-                "$oidcRedirectSchemeBase.nightly",
+                "$oAuthRedirectSchemeBase.nightly",
             )
             matchingFallbacks += listOf("release")
             signingConfig = signingConfigs.getByName("nightly")
@@ -189,6 +189,7 @@ android {
 
     buildFeatures {
         buildConfig = true
+        resValues = true
     }
     flavorDimensions += "store"
     productFlavors {
@@ -245,6 +246,11 @@ androidComponents {
     configureLicensesTasks(reportingExtension)
 }
 
+// Configure the SonarQube plugin to wait for the resource generation tasks to complete before running the analysis.
+tasks.withType<SonarResolverTask>().configureEach {
+    dependsOn("generateGplayDebugResValues", "generateGplayDebugAndroidTestResValues")
+}
+
 setupDependencyInjection()
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6041fbb118..f6a3225cb8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- To be able to install APK from the application -->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <application
         android:name=".ElementXApplication"
         android:allowBackup="false"
@@ -75,7 +72,7 @@
                     android:scheme="elementx" />
             </intent-filter>
             <!--
-              Oidc redirection
+              OAuth redirection
             -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
index b522edd137..a882dd8769 100644
--- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainActivity.kt
@@ -52,7 +52,7 @@ class MainActivity : NodeActivity() {
     private lateinit var appBindings: AppBindings
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Timber.tag(loggerTag.value).w("onCreate, with savedInstanceState: ${savedInstanceState != null}")
+        Timber.tag(loggerTag.value).d("onCreate, with savedInstanceState: ${savedInstanceState != null}")
         installSplashScreen()
         super.onCreate(savedInstanceState)
         appBindings = bindings()
@@ -71,6 +71,7 @@ class MainActivity : NodeActivity() {
         }.collectAsState(SemanticColorsLightDark.default)
         ElementThemeApp(
             appPreferencesStore = appBindings.preferencesStore(),
+            featureFlagService = appBindings.featureFlagService(),
             compoundLight = colors.light,
             compoundDark = colors.dark,
             buildMeta = appBindings.buildMeta()
@@ -108,7 +109,7 @@ class MainActivity : NodeActivity() {
                 plugins = listOf(
                     object : NodeReadyObserver<MainNode> {
                         override fun init(node: MainNode) {
-                            Timber.tag(loggerTag.value).w("onMainNodeInit")
+                            Timber.tag(loggerTag.value).d("onMainNodeInit")
                             mainNode = node
                             mainNode.handleIntent(intent)
                         }
@@ -144,7 +145,7 @@ class MainActivity : NodeActivity() {
      */
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        Timber.tag(loggerTag.value).w("onNewIntent")
+        Timber.tag(loggerTag.value).d("onNewIntent")
         // If the mainNode is not init yet, keep the intent for later.
         // It can happen when the activity is killed by the system. The methods are called in this order :
         // onCreate(savedInstanceState=true) -> onNewIntent -> onResume -> onMainNodeInit
@@ -157,16 +158,16 @@ class MainActivity : NodeActivity() {
 
     override fun onPause() {
         super.onPause()
-        Timber.tag(loggerTag.value).w("onPause")
+        Timber.tag(loggerTag.value).d("onPause")
     }
 
     override fun onResume() {
         super.onResume()
-        Timber.tag(loggerTag.value).w("onResume")
+        Timber.tag(loggerTag.value).d("onResume")
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        Timber.tag(loggerTag.value).w("onDestroy")
+        Timber.tag(loggerTag.value).d("onDestroy")
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
index 87d0ece7a1..7564db5d95 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -28,8 +28,6 @@ import io.element.android.libraries.di.BaseDirectory
 import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.recentemojis.api.EmojibaseProvider
-import io.element.android.libraries.recentemojis.impl.DefaultEmojibaseProvider
 import io.element.android.x.BuildConfig
 import io.element.android.x.R
 import kotlinx.coroutines.CoroutineName
@@ -115,10 +113,4 @@ object AppModule {
     fun provideSnackbarDispatcher(): SnackbarDispatcher {
         return SnackbarDispatcher()
     }
-
-    @Provides
-    @SingleIn(AppScope::class)
-    fun providesEmojibaseProvider(@ApplicationContext context: Context): EmojibaseProvider {
-        return DefaultEmojibaseProvider(context)
-    }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt
index 9631713bb6..5bfe082ffe 100644
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.MatrixClient
 
 @ContributesBinding(AppScope::class)
 class DefaultSessionGraphFactory(
-    private val appGraph: AppGraph
+    private val appGraph: AppGraph,
 ) : SessionGraphFactory {
     override fun create(client: MatrixClient): Any {
         return appGraph.sessionGraphFactory.create(client)
diff --git a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProvider.kt
similarity index 82%
rename from app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
rename to app/src/main/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProvider.kt
index ad4f9a47b2..16db564aaf 100644
--- a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProvider.kt
@@ -10,14 +10,14 @@ package io.element.android.x.oidc
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
+import io.element.android.libraries.matrix.api.auth.OAuthRedirectUrlProvider
 import io.element.android.services.toolbox.api.strings.StringProvider
 import io.element.android.x.R
 
 @ContributesBinding(AppScope::class)
-class DefaultOidcRedirectUrlProvider(
+class DefaultOAuthRedirectUrlProvider(
     private val stringProvider: StringProvider,
-) : OidcRedirectUrlProvider {
+) : OAuthRedirectUrlProvider {
     override fun provide() = buildString {
         append(stringProvider.getString(R.string.login_redirect_scheme))
         append(":/")
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index af159a0b11..2e610fc0c7 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -11,7 +11,14 @@
         <item name="windowSplashScreenBackground">@color/splashscreen_bg_dark</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
         <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
+        <item name="android:windowBackground">@color/splashscreen_bg_dark</item>
+        <item name="android:statusBarColor">@color/splashscreen_bg_dark</item>
+        <item name="android:navigationBarColor">@color/splashscreen_bg_dark</item>
     </style>
 
-    <style name="Theme.ElementX" parent="Theme.Material3.Dark.NoActionBar" />
+    <style name="Theme.ElementX" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="android:windowBackground">@color/splashscreen_bg_dark</item>
+        <item name="android:statusBarColor">@color/splashscreen_bg_dark</item>
+        <item name="android:navigationBarColor">@color/splashscreen_bg_dark</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4190fd84f2..26cb0a56bd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,8 +10,14 @@
         <item name="windowSplashScreenBackground">@color/splashscreen_bg_light</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
         <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
+        <item name="android:windowBackground">@color/splashscreen_bg_light</item>
+        <item name="android:statusBarColor">@color/splashscreen_bg_light</item>
+        <item name="android:navigationBarColor">@color/splashscreen_bg_light</item>
     </style>
     <style name="Theme.ElementX" parent="Theme.Material3.Light.NoActionBar">
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+        <item name="android:windowBackground">@color/splashscreen_bg_light</item>
+        <item name="android:statusBarColor">@color/splashscreen_bg_light</item>
+        <item name="android:navigationBarColor">@color/splashscreen_bg_light</item>
     </style>
 </resources>
diff --git a/app/src/main/res/xml/file_providers.xml b/app/src/main/res/xml/file_providers.xml
index ac74590cba..330a2e0c3f 100644
--- a/app/src/main/res/xml/file_providers.xml
+++ b/app/src/main/res/xml/file_providers.xml
@@ -7,4 +7,5 @@
   -->
 <paths>
     <cache-path name="cache" path="." />
+    <files-path name="notification_sounds" path="notification_sounds/" />
 </paths>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index a171646bad..a77f42817d 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -2,6 +2,7 @@
 <locale-config xmlns:android="http://schemas.android.com/apk/res/android">
     <locale android:name="be"/>
     <locale android:name="bg"/>
+    <locale android:name="ca"/>
     <locale android:name="cs"/>
     <locale android:name="cy"/>
     <locale android:name="da"/>
@@ -19,6 +20,7 @@
     <locale android:name="hu"/>
     <locale android:name="in"/>
     <locale android:name="it"/>
+    <locale android:name="ja"/>
     <locale android:name="ka"/>
     <locale android:name="ko"/>
     <locale android:name="lt"/>
@@ -35,6 +37,7 @@
     <locale android:name="uk"/>
     <locale android:name="ur"/>
     <locale android:name="uz"/>
+    <locale android:name="vi"/>
     <locale android:name="zh-CN"/>
     <locale android:name="zh-TW"/>
 </locale-config>
diff --git a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt b/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
index 4598a74e51..be059ed2a8 100644
--- a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
+++ b/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
@@ -24,14 +24,12 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.x.MainActivity
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultIntentProviderTest {
+class DefaultIntentProviderTest : RobolectricTest() {
     @Test
     fun `test getViewRoomIntent with data`() {
         val deepLinkCreator = lambdaRecorder<SessionId, RoomId?, ThreadId?, EventId?, String> { _, _, _, _ -> "deepLinkCreatorResult" }
diff --git a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProviderTest.kt
similarity index 89%
rename from app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
rename to app/src/test/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProviderTest.kt
index 18567355d2..c26e3dc692 100644
--- a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
+++ b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOAuthRedirectUrlProviderTest.kt
@@ -13,13 +13,13 @@ import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.x.R
 import org.junit.Test
 
-class DefaultOidcRedirectUrlProviderTest {
+class DefaultOAuthRedirectUrlProviderTest {
     @Test
     fun `test provide`() {
         val stringProvider = FakeStringProvider(
             defaultResult = "str"
         )
-        val sut = DefaultOidcRedirectUrlProvider(
+        val sut = DefaultOAuthRedirectUrlProvider(
             stringProvider = stringProvider,
         )
         val result = sut.provide()
diff --git a/appconfig/build.gradle.kts b/appconfig/build.gradle.kts
index 45496acb77..64b9b76a14 100644
--- a/appconfig/build.gradle.kts
+++ b/appconfig/build.gradle.kts
@@ -48,6 +48,8 @@ android {
 }
 
 dependencies {
+    implementation(libs.coroutines.core)
     implementation(libs.androidx.annotationjvm)
+    implementation(libs.androidx.corektx)
     implementation(projects.libraries.matrix.api)
 }
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/ProtectionConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/ProtectionConfig.kt
new file mode 100644
index 0000000000..f6ad71eeb1
--- /dev/null
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/ProtectionConfig.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.appconfig
+
+object ProtectionConfig {
+    /**
+     * The maximum length of a room name, to limit attack vectors in room invite.
+     */
+    const val MAX_ROOM_NAME_LENGTH = 128
+}
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt
index d4fe7d1fc5..7e5f064ef4 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/TimelineConfig.kt
@@ -18,7 +18,6 @@ object TimelineConfig {
      */
     val excludedEvents = listOf(
         StateEventType.CallMember,
-        StateEventType.RoomAliases,
         StateEventType.RoomCanonicalAlias,
         StateEventType.RoomGuestAccess,
         StateEventType.RoomHistoryVisibility,
diff --git a/appnav/build.gradle.kts b/appnav/build.gradle.kts
index ecac391216..ce9764360b 100644
--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@@ -33,13 +33,15 @@ dependencies {
     implementation(projects.libraries.deeplink.api)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.api)
-    implementation(projects.libraries.oidc.api)
+    implementation(projects.libraries.oauth.api)
+    implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.push.api)
     implementation(projects.libraries.pushproviders.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.uiCommon)
     implementation(projects.libraries.uiStrings)
     implementation(projects.features.login.api)
@@ -51,7 +53,7 @@ dependencies {
     implementation(projects.features.linknewdevice.api)
     implementation(projects.features.share.api)
 
-    implementation(projects.services.apperror.impl)
+    implementation(projects.services.apperror.api)
     implementation(projects.services.appnavstate.api)
     implementation(projects.services.analytics.api)
 
@@ -59,7 +61,8 @@ dependencies {
     testImplementation(projects.features.login.test)
     testImplementation(projects.features.share.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.oidc.test)
+    testImplementation(projects.libraries.oauth.test)
+    testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.pushproviders.test)
@@ -67,8 +70,7 @@ dependencies {
     testImplementation(projects.features.messages.test)
     testImplementation(projects.features.networkmonitor.test)
     testImplementation(projects.features.rageshake.test)
-    testImplementation(projects.services.appnavstate.impl)
+    testImplementation(projects.services.apperror.test)
     testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.analytics.test)
-    testImplementation(projects.services.toolbox.test)
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index a676df1d32..14230d7c5a 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -54,6 +54,7 @@ import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.features.linknewdevice.api.LinkNewDeviceEntryPoint
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.networkmonitor.api.ui.ConnectivityIndicatorContainer
@@ -77,6 +78,7 @@ import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -144,11 +146,13 @@ class LoggedInFlowNode(
     private val syncService: SyncService,
     private val enterpriseService: EnterpriseService,
     private val appPreferencesStore: AppPreferencesStore,
+    private val featureFlagService: FeatureFlagService,
     private val buildMeta: BuildMeta,
     snackbarDispatcher: SnackbarDispatcher,
     private val analyticsService: AnalyticsService,
     private val analyticsRoomListStateWatcher: AnalyticsRoomListStateWatcher,
     private val createRoomEntryPoint: CreateRoomEntryPoint,
+    private val activeLiveLocationShareManager: ActiveLiveLocationShareManager,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Placeholder,
@@ -209,6 +213,7 @@ class LoggedInFlowNode(
         super.onBuilt()
         lifecycleScope.launch {
             sessionEnterpriseService.init()
+            activeLiveLocationShareManager.setup()
         }
         lifecycle.subscribe(
             onCreate = {
@@ -217,7 +222,6 @@ class LoggedInFlowNode(
                 loggedInFlowProcessor.observeEvents(sessionCoroutineScope)
                 matrixClient.sessionVerificationService.setListener(verificationListener)
                 mediaPreviewConfigMigration()
-
                 sessionCoroutineScope.launch {
                     // Wait for the network to be connected before pre-fetching the max file upload size
                     networkMonitor.connectivity.first { networkStatus -> networkStatus == NetworkStatus.Connected }
@@ -378,9 +382,13 @@ class LoggedInFlowNode(
             }
             is NavTarget.Room -> {
                 val joinedRoomCallback = object : JoinedRoomLoadedFlowNode.Callback {
-                    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+
+                    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean) {
                         lifecycleScope.launch {
-                            attachRoom(roomIdOrAlias = roomId.toRoomIdOrAlias(), serverNames = serverNames, clearBackstack = false)
+                            attachRoom(roomIdOrAlias = roomId.toRoomIdOrAlias(), serverNames = serverNames, clearBackstack = clearBackStack)
                         }
                     }
 
@@ -422,6 +430,10 @@ class LoggedInFlowNode(
                     override fun navigateToGlobalNotificationSettings() {
                         backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))
                     }
+
+                    override fun navigateToDeveloperSettings() {
+                        backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.DeveloperSettings))
+                    }
                 }
                 val inputs = RoomFlowNode.Inputs(
                     roomIdOrAlias = navTarget.roomIdOrAlias,
@@ -667,6 +679,7 @@ class LoggedInFlowNode(
         }.collectAsState(SemanticColorsLightDark.default)
         ElementThemeApp(
             appPreferencesStore = appPreferencesStore,
+            featureFlagService = featureFlagService,
             compoundLight = colors.light,
             compoundDark = colors.dark,
             buildMeta = buildMeta,
@@ -744,11 +757,11 @@ private class AttachRoomOperation(
                     }
                 } + // Always create a new element, otherwise we wouldn't be navigating to the target event id or child node
                     BackStackElement(
-                    key = NavKey(roomTarget),
-                    fromState = CREATED,
-                    targetState = ACTIVE,
-                    operation = this
-                )
+                        key = NavKey(roomTarget),
+                        fromState = CREATED,
+                        targetState = ACTIVE,
+                        operation = this
+                    )
             } else {
                 // Otherwise, just push the new node to the end of the backstack
                 Push<LoggedInFlowNode.NavTarget>(roomTarget).invoke(currentElements)
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 745ab390b2..acf7b66db9 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -63,8 +63,8 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.asEventId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
 import io.element.android.libraries.sessionstorage.api.LoggedInState
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.ui.common.nodes.emptyNode
@@ -95,7 +95,7 @@ class RootFlowNode(
     private val signedOutEntryPoint: SignedOutEntryPoint,
     private val accountSelectEntryPoint: AccountSelectEntryPoint,
     private val intentResolver: IntentResolver,
-    private val oidcActionFlow: OidcActionFlow,
+    private val oAuthActionFlow: OAuthActionFlow,
     private val featureFlagService: FeatureFlagService,
     private val announcementService: AnnouncementService,
     private val analyticsService: AnalyticsService,
@@ -252,7 +252,8 @@ class RootFlowNode(
             val transitionHandler = rememberDelegateTransitionHandler<NavTarget, BackStack.State> { navTarget ->
                 when (navTarget) {
                     is NavTarget.SplashScreen,
-                    is NavTarget.LoggedInFlow -> backstackFader
+                    is NavTarget.LoggedInFlow,
+                    is NavTarget.NotLoggedInFlow -> backstackFader
                     else -> backstackSlider
                 }
             }
@@ -391,7 +392,7 @@ class RootFlowNode(
                 navigateTo(resolvedIntent.deeplinkData)
             }
             is ResolvedIntent.Login -> onLoginLink(resolvedIntent.params)
-            is ResolvedIntent.Oidc -> onOidcAction(resolvedIntent.oidcAction)
+            is ResolvedIntent.OAuth -> onOAuthAction(resolvedIntent.oAuthAction)
             is ResolvedIntent.Permalink -> navigateTo(resolvedIntent.permalinkData)
             is ResolvedIntent.IncomingShare -> onIncomingShare(resolvedIntent.shareIntentData)
         }
@@ -528,8 +529,8 @@ class RootFlowNode(
         }
     }
 
-    private fun onOidcAction(oidcAction: OidcAction) {
-        oidcActionFlow.post(oidcAction)
+    private fun onOAuthAction(oAuthAction: OAuthAction) {
+        oAuthActionFlow.post(oAuthAction)
     }
 
     private suspend fun attachSession(sessionId: SessionId): LoggedInFlowNode {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt
index 9b1bbd1b81..1ce423a569 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt
@@ -89,16 +89,14 @@ class SyncOrchestrator(
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal fun observeStates() = coroutineScope.launch {
         Timber.tag(tag).d("start observing the app and network state")
-
-        val isAppActiveFlow = combine(
+        val isAppActiveFlows = listOf(
             appForegroundStateService.isInForeground,
             appForegroundStateService.isInCall,
             appForegroundStateService.isSyncingNotificationEvent,
             appForegroundStateService.hasRingingCall,
-        ) { isInForeground, isInCall, isSyncingNotificationEvent, hasRingingCall ->
-            isInForeground || isInCall || isSyncingNotificationEvent || hasRingingCall
-        }
-
+            appForegroundStateService.isSharingLiveLocation
+        )
+        val isAppActiveFlow = combine(isAppActiveFlows) { actives -> actives.any { it } }
         combine(
             // small debounce to avoid spamming startSync when the state is changing quickly in case of error.
             syncService.syncState.debounce(100.milliseconds),
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
index 6844db3ed6..ee316f00aa 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
@@ -18,13 +18,13 @@ import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.deeplink.api.DeeplinkParser
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcIntentResolver
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthIntentResolver
 import timber.log.Timber
 
 sealed interface ResolvedIntent {
     data class Navigation(val deeplinkData: DeeplinkData) : ResolvedIntent
-    data class Oidc(val oidcAction: OidcAction) : ResolvedIntent
+    data class OAuth(val oAuthAction: OAuthAction) : ResolvedIntent
     data class Permalink(val permalinkData: PermalinkData) : ResolvedIntent
     data class Login(val params: LoginParams) : ResolvedIntent
     data class IncomingShare(val shareIntentData: ShareIntentData) : ResolvedIntent
@@ -34,7 +34,7 @@ sealed interface ResolvedIntent {
 class IntentResolver(
     private val deeplinkParser: DeeplinkParser,
     private val loginIntentResolver: LoginIntentResolver,
-    private val oidcIntentResolver: OidcIntentResolver,
+    private val oAuthIntentResolver: OAuthIntentResolver,
     private val permalinkParser: PermalinkParser,
     private val shareIntentHandler: ShareIntentHandler,
 ) {
@@ -45,9 +45,9 @@ class IntentResolver(
         val deepLinkData = deeplinkParser.getFromIntent(intent)
         if (deepLinkData != null) return ResolvedIntent.Navigation(deepLinkData)
 
-        // Coming during login using Oidc?
-        val oidcAction = oidcIntentResolver.resolve(intent)
-        if (oidcAction != null) return ResolvedIntent.Oidc(oidcAction)
+        // Coming during login using OAuth?
+        val oAuthAction = oAuthIntentResolver.resolve(intent)
+        if (oAuthAction != null) return ResolvedIntent.OAuth(oAuthAction)
 
         val actionViewData = intent
             .takeIf { it.action == Intent.ACTION_VIEW }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt
index d2a9c9298e..66fffce9e8 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt
@@ -12,4 +12,7 @@ sealed interface LoggedInEvents {
     data class CloseErrorDialog(val doNotShowAgain: Boolean) : LoggedInEvents
     data object CheckSlidingSyncProxyAvailability : LoggedInEvents
     data object LogoutAndMigrateToNativeSlidingSync : LoggedInEvents
+    data object DismissLocalNetworkPermissionPrompt : LoggedInEvents
+
+    data object RequestLocationNetworkPermission : LoggedInEvents
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
index 757dd73395..0723ad4606 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.appnav.loggedin
 
+import android.Manifest
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
@@ -15,12 +16,15 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CryptoSessionStateChange
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.features.networkmonitor.api.NetworkMonitor
+import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -29,12 +33,15 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
+import io.element.android.libraries.permissions.api.PermissionsEvent
+import io.element.android.libraries.permissions.api.PermissionsPresenter
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.services.analytics.api.AnalyticsService
@@ -56,7 +63,13 @@ class LoggedInPresenter(
     private val analyticsService: AnalyticsService,
     private val encryptionService: EncryptionService,
     private val buildMeta: BuildMeta,
+    private val networkMonitor: NetworkMonitor,
+    private val localNetworkPermissionAdvisor: LocalNetworkPermissionAdvisor,
+    permissionsPresenterFactory: PermissionsPresenter.Factory,
 ) : Presenter<LoggedInState> {
+    private val localNetworkPermissionsPresenter: PermissionsPresenter =
+        permissionsPresenterFactory.create(Manifest.permission.ACCESS_LOCAL_NETWORK)
+
     @Composable
     override fun present(): LoggedInState {
         val coroutineScope = rememberCoroutineScope()
@@ -107,6 +120,29 @@ class LoggedInPresenter(
             }.launchIn(this)
         }
 
+        val networkConnectivity by networkMonitor.connectivity.collectAsState()
+        LaunchedEffect(networkConnectivity) {
+            if (networkConnectivity == NetworkStatus.Connected) {
+                // Refresh homeserver capabilities when the network is back
+                matrixClient.homeserverCapabilities().refresh()
+            }
+        }
+
+        val localNetworkPermissionState = localNetworkPermissionsPresenter.present()
+        var localNetworkPromptDismissedThisSession by remember { mutableStateOf(false) }
+        val advisorRequestsPrompt by produceState(initialValue = false, localNetworkPermissionState.permissionGranted) {
+            value = localNetworkPermissionAdvisor.shouldRequestPermissionFor(matrixClient.homeserverUrl)
+        }
+        LaunchedEffect(localNetworkPermissionState.permissionGranted) {
+            if (localNetworkPermissionState.permissionGranted) localNetworkPromptDismissedThisSession = false
+        }
+        val localNetworkPermissionDialog = when {
+            !advisorRequestsPrompt -> LocalNetworkPermissionDialog.None
+            localNetworkPromptDismissedThisSession -> LocalNetworkPermissionDialog.None
+            localNetworkPermissionState.shouldShowRationale -> LocalNetworkPermissionDialog.Rationale
+            else -> LocalNetworkPermissionDialog.Settings
+        }
+
         fun handleEvent(event: LoggedInEvents) {
             when (event) {
                 is LoggedInEvents.CloseErrorDialog -> {
@@ -124,6 +160,17 @@ class LoggedInPresenter(
                     // Force the logout since Native Sliding Sync is already enforced by the SDK
                     matrixClient.logout(userInitiated = true, ignoreSdkError = true)
                 }
+                LoggedInEvents.DismissLocalNetworkPermissionPrompt -> {
+                    localNetworkPromptDismissedThisSession = true
+                }
+                LoggedInEvents.RequestLocationNetworkPermission -> {
+                    if (localNetworkPermissionDialog == LocalNetworkPermissionDialog.Settings) {
+                        localNetworkPermissionState.eventSink(PermissionsEvent.OpenSystemSettingAndCloseDialog)
+                    } else {
+                        localNetworkPermissionState.eventSink(PermissionsEvent.RequestPermissions)
+                    }
+                    localNetworkPromptDismissedThisSession = true
+                }
             }
         }
 
@@ -133,6 +180,7 @@ class LoggedInPresenter(
             ignoreRegistrationError = ignoreRegistrationError,
             forceNativeSlidingSyncMigration = forceNativeSlidingSyncMigration,
             appName = buildMeta.applicationName,
+            localNetworkPermissionDialog = localNetworkPermissionDialog,
             eventSink = ::handleEvent,
         )
     }
@@ -166,7 +214,6 @@ class LoggedInPresenter(
     }
 
     private fun CoroutineScope.preloadAccountManagementUrl() = launch {
-        matrixClient.getAccountManagementUrl(AccountManagementAction.Profile)
-        matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList)
+        matrixClient.getAccountManagementUrl(null)
     }
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInState.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInState.kt
index b066f9f867..edc12383bf 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInState.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInState.kt
@@ -9,6 +9,7 @@
 package io.element.android.appnav.loggedin
 
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
 
 data class LoggedInState(
     val showSyncSpinner: Boolean,
@@ -16,5 +17,6 @@ data class LoggedInState(
     val ignoreRegistrationError: Boolean,
     val forceNativeSlidingSyncMigration: Boolean,
     val appName: String,
+    val localNetworkPermissionDialog: LocalNetworkPermissionDialog,
     val eventSink: (LoggedInEvents) -> Unit,
 )
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt
index b2f5407519..67fcb95c2c 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt
@@ -10,6 +10,7 @@ package io.element.android.appnav.loggedin
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
 import io.element.android.libraries.push.api.PusherRegistrationFailure
 
 open class LoggedInStateProvider : PreviewParameterProvider<LoggedInState> {
@@ -19,6 +20,8 @@ open class LoggedInStateProvider : PreviewParameterProvider<LoggedInState> {
             aLoggedInState(showSyncSpinner = true),
             aLoggedInState(pusherRegistrationState = AsyncData.Failure(PusherRegistrationFailure.NoDistributorsAvailable())),
             aLoggedInState(forceNativeSlidingSyncMigration = true),
+            aLoggedInState(localNetworkPermissionDialog = LocalNetworkPermissionDialog.Rationale),
+            aLoggedInState(localNetworkPermissionDialog = LocalNetworkPermissionDialog.Settings),
         )
 }
 
@@ -27,11 +30,13 @@ fun aLoggedInState(
     pusherRegistrationState: AsyncData<Unit> = AsyncData.Uninitialized,
     forceNativeSlidingSyncMigration: Boolean = false,
     appName: String = "Element X",
+    localNetworkPermissionDialog: LocalNetworkPermissionDialog = LocalNetworkPermissionDialog.None,
 ) = LoggedInState(
     showSyncSpinner = showSyncSpinner,
     pusherRegistrationState = pusherRegistrationState,
     ignoreRegistrationError = false,
     forceNativeSlidingSyncMigration = forceNativeSlidingSyncMigration,
     appName = appName,
+    localNetworkPermissionDialog = localNetworkPermissionDialog,
     eventSink = {},
 )
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInView.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInView.kt
index 62d8de8c29..e57d378da4 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInView.kt
@@ -25,6 +25,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.matrix.api.exception.isNetworkError
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
 import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -82,6 +83,12 @@ fun LoggedInView(
             }
         )
     }
+
+    LocalNetworkPermissionDialogView(
+        dialog = state.localNetworkPermissionDialog,
+        onSubmit = { state.eventSink(LoggedInEvents.RequestLocationNetworkPermission) },
+        onDismiss = { state.eventSink(LoggedInEvents.DismissLocalNetworkPermissionPrompt) },
+    )
 }
 
 private fun Throwable.getReason(): String? {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index d0d3df590d..dbe53b75ac 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -82,9 +82,11 @@ class JoinedRoomLoadedFlowNode(
     plugins = plugins,
 ), DependencyInjectionGraphOwner {
     interface Callback : Plugin {
-        fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
+        fun onDone()
+        fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean = false)
         fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun navigateToGlobalNotificationSettings()
+        fun navigateToDeveloperSettings()
     }
 
     data class Inputs(
@@ -141,11 +143,19 @@ class JoinedRoomLoadedFlowNode(
 
     private fun createRoomDetailsNode(buildContext: BuildContext, initialTarget: RoomDetailsEntryPoint.InitialTarget): Node {
         val callback = object : RoomDetailsEntryPoint.Callback {
+            override fun onDone() {
+                callback.onDone()
+            }
+
             override fun navigateToGlobalNotificationSettings() {
                 callback.navigateToGlobalNotificationSettings()
             }
 
-            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
+            override fun navigateToDeveloperSettings() {
+                callback.navigateToDeveloperSettings()
+            }
+
+            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean) {
                 callback.navigateToRoom(roomId, serverNames)
             }
 
@@ -252,6 +262,10 @@ class JoinedRoomLoadedFlowNode(
             override fun navigateToRoom(roomId: RoomId) {
                 callback.navigateToRoom(roomId, emptyList())
             }
+
+            override fun navigateToDeveloperSettings() {
+                callback.navigateToDeveloperSettings()
+            }
         }
         val params = MessagesEntryPoint.Params(
             MessagesEntryPoint.InitialTarget.Messages(navTarget.focusedEventId)
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt
index 32c8e52084..19aa820433 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootView.kt
@@ -22,7 +22,7 @@ import io.element.android.features.rageshake.api.detection.RageshakeDetectionVie
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.services.apperror.impl.AppErrorView
+import io.element.android.services.apperror.api.AppErrorView
 
 @Composable
 fun RootView(
diff --git a/appnav/src/main/res/values-ca/translations.xml b/appnav/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..d251b3a6b1
--- /dev/null
+++ b/appnav/src/main/res/values-ca/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"Tanca sessió i actualitza"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s ja no admet el protocol antic. Tanca sessió i torna a entrar per continuar utilitzant l\'aplicació."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"El servidor utilitzat ja no admet el protocol antic. Tanca sessió i torna-la a iniciar per continuar utilitzant l\'aplicació."</string>
+</resources>
diff --git a/appnav/src/main/res/values-ja/translations.xml b/appnav/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..3405cc1d68
--- /dev/null
+++ b/appnav/src/main/res/values-ja/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"ログアウトしてアップグレード"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s は古いプロトコルに非対応になりました。アプリを引き続き使用するには、ログアウトしてから再度ログインしてください。"</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"使用しているホームサーバーは古いプロトコルに非対応になりました。アプリケーションを引き続き使用するには、ログアウトしてから再度ログインしてください。"</string>
+</resources>
diff --git a/appnav/src/main/res/values-vi/translations.xml b/appnav/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..8fa3a7ee30
--- /dev/null
+++ b/appnav/src/main/res/values-vi/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"Đăng xuất &amp; Nâng cấp"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s không còn hỗ trợ giao thức cũ. Vui lòng đăng xuất và đăng nhập lại để tiếp tục sử dụng ứng dụng."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Homeserver của bạn không còn hỗ trợ giao thức cũ. Vui lòng đăng xuất và đăng nhập lại để tiếp tục sử dụng ứng dụng."</string>
+</resources>
diff --git a/appnav/src/main/res/values-zh/translations.xml b/appnav/src/main/res/values-zh/translations.xml
index 406471196e..f6eac30310 100644
--- a/appnav/src/main/res/values-zh/translations.xml
+++ b/appnav/src/main/res/values-zh/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="banner_migrate_to_native_sliding_sync_action">"登出并升级"</string>
+  <string name="banner_migrate_to_native_sliding_sync_action">"注销并升级"</string>
   <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s 不再支持旧协议。请注销并重新登录以继续使用该应用程序。"</string>
-  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"您的服务器不再支持旧协议。请登出并重新登录以继续使用此应用。"</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"你的主服务器不再支持旧协议。请注销并重新登录以继续使用此 app。"</string>
 </resources>
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
index 8d514a2c0f..5ef3d8cd70 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
@@ -43,17 +43,15 @@ import io.element.android.services.analytics.api.watchers.AnalyticsSendMessageWa
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.analytics.test.watchers.FakeAnalyticsSendMessageWatcher
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
-import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
+import io.element.android.services.appnavstate.test.FakeActiveRoomsHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class JoinedRoomLoadedFlowNodeTest {
+class JoinedRoomLoadedFlowNodeTest : RobolectricTest() {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
@@ -128,7 +126,7 @@ class JoinedRoomLoadedFlowNodeTest {
         roomDetailsEntryPoint: RoomDetailsEntryPoint = FakeRoomDetailsEntryPoint(),
         spaceEntryPoint: SpaceEntryPoint = FakeSpaceEntryPoint(),
         forwardEntryPoint: ForwardEntryPoint = FakeForwardEntryPoint(),
-        activeRoomsHolder: ActiveRoomsHolder = DefaultActiveRoomsHolder(),
+        activeRoomsHolder: ActiveRoomsHolder = FakeActiveRoomsHolder(),
         matrixClient: FakeMatrixClient = FakeMatrixClient(),
     ) = JoinedRoomLoadedFlowNode(
         buildContext = BuildContext.root(savedStateMap = null),
@@ -213,7 +211,7 @@ class JoinedRoomLoadedFlowNodeTest {
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
         val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
-        val activeRoomsHolder = DefaultActiveRoomsHolder()
+        val activeRoomsHolder = FakeActiveRoomsHolder()
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
             plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
             messagesEntryPoint = fakeMessagesEntryPoint,
@@ -236,7 +234,7 @@ class JoinedRoomLoadedFlowNodeTest {
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
         val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
-        val activeRoomsHolder = DefaultActiveRoomsHolder().apply {
+        val activeRoomsHolder = FakeActiveRoomsHolder().apply {
             addRoom(room)
         }
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
index 73d55135fb..9ba98a3f72 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
@@ -19,8 +19,7 @@ import io.element.android.libraries.matrix.test.FakeSdkMetadata
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.apperror.api.AppErrorState
 import io.element.android.services.apperror.api.AppErrorStateService
-import io.element.android.services.apperror.impl.DefaultAppErrorStateService
-import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import io.element.android.services.apperror.test.FakeAppErrorStateService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -44,10 +43,16 @@ class RootPresenterTest {
     @Test
     fun `present - passes app error state`() = runTest {
         val presenter = createRootPresenter(
-            appErrorService = DefaultAppErrorStateService(
-                stringProvider = FakeStringProvider(),
-            ).apply {
-                showError("Bad news", "Something bad happened")
+            appErrorService = FakeAppErrorStateService().apply {
+                setAppErrorState(
+                    AppErrorState.Error(
+                        title = "Bad news",
+                        body = "Something bad happened",
+                        dismiss = {
+                            setAppErrorState(AppErrorState.NoError)
+                        }
+                    )
+                )
             }
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -65,9 +70,7 @@ class RootPresenterTest {
     }
 
     private fun createRootPresenter(
-        appErrorService: AppErrorStateService = DefaultAppErrorStateService(
-            stringProvider = FakeStringProvider(),
-        ),
+        appErrorService: AppErrorStateService = FakeAppErrorStateService(),
     ): RootPresenter {
         return RootPresenter(
             crashDetectionPresenter = { aCrashDetectionState() },
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
index 576e1aaea6..841f79678b 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
@@ -26,16 +26,14 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.test.FakeOidcIntentResolver
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.test.FakeOAuthIntentResolver
 import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class IntentResolverTest {
+class IntentResolverTest : RobolectricTest() {
     @Test
     fun `resolve launcher intent should return null`() {
         val sut = createIntentResolver()
@@ -170,9 +168,9 @@ class IntentResolverTest {
     }
 
     @Test
-    fun `test resolve oidc`() {
+    fun `test resolve OAuth`() {
         val sut = createIntentResolver(
-            oidcIntentResolverResult = { OidcAction.GoBack() },
+            oAuthIntentResolverResult = { OAuthAction.GoBack() },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -180,8 +178,8 @@ class IntentResolverTest {
         }
         val result = sut.resolve(intent)
         assertThat(result).isEqualTo(
-            ResolvedIntent.Oidc(
-                oidcAction = OidcAction.GoBack()
+            ResolvedIntent.OAuth(
+                oAuthAction = OAuthAction.GoBack()
             )
         )
     }
@@ -194,7 +192,7 @@ class IntentResolverTest {
         val sut = createIntentResolver(
             loginIntentResolverResult = { null },
             permalinkParserResult = { permalinkData },
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -213,7 +211,7 @@ class IntentResolverTest {
         val sut = createIntentResolver(
             permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
             loginIntentResolverResult = { null },
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -230,7 +228,7 @@ class IntentResolverTest {
         )
         val sut = createIntentResolver(
             permalinkParserResult = { permalinkData },
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_BATTERY_LOW
@@ -244,7 +242,7 @@ class IntentResolverTest {
     fun `test incoming share simple`() {
         val shareIntentData = ShareIntentData.PlainText("Hello")
         val sut = createIntentResolver(
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
             onIncomingShareIntent = { shareIntentData },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
@@ -260,7 +258,7 @@ class IntentResolverTest {
         val fileUri = "content://com.example.app/file1.jpg".toUri()
         val shareIntentData = ShareIntentData.Uris(text = "Hello", uris = listOf(UriToShare(fileUri, "image/jpg")))
         val sut = createIntentResolver(
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
             onIncomingShareIntent = { shareIntentData },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
@@ -277,7 +275,7 @@ class IntentResolverTest {
         val sut = createIntentResolver(
             permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
             loginIntentResolverResult = { null },
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -292,7 +290,7 @@ class IntentResolverTest {
         val aLoginParams = LoginParams("accountProvider", null)
         val sut = createIntentResolver(
             loginIntentResolverResult = { aLoginParams },
-            oidcIntentResolverResult = { null },
+            oAuthIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -306,7 +304,7 @@ class IntentResolverTest {
         deeplinkParserResult: DeeplinkData? = null,
         permalinkParserResult: (String) -> PermalinkData = { lambdaError() },
         loginIntentResolverResult: (String) -> LoginParams? = { lambdaError() },
-        oidcIntentResolverResult: (Intent) -> OidcAction? = { lambdaError() },
+        oAuthIntentResolverResult: (Intent) -> OAuthAction? = { lambdaError() },
         onIncomingShareIntent: (Intent) -> ShareIntentData? = { null },
     ): IntentResolver {
         return IntentResolver(
@@ -314,8 +312,8 @@ class IntentResolverTest {
             loginIntentResolver = FakeLoginIntentResolver(
                 parseResult = loginIntentResolverResult,
             ),
-            oidcIntentResolver = FakeOidcIntentResolver(
-                resolveResult = oidcIntentResolverResult,
+            oAuthIntentResolver = FakeOAuthIntentResolver(
+                resolveResult = oAuthIntentResolverResult,
             ),
             permalinkParser = FakePermalinkParser(
                 result = permalinkParserResult
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
index f1759eab3e..faa19d9e61 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
@@ -14,12 +14,14 @@ import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.CryptoSessionStateChange
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.features.networkmonitor.api.NetworkStatus
+import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncState
@@ -27,12 +29,15 @@ import io.element.android.libraries.matrix.api.verification.SessionVerificationS
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.FakeHomeserverCapabilitiesProvider
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
+import io.element.android.libraries.permissions.test.FakeLocalNetworkPermissionAdvisor
+import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
 import io.element.android.libraries.push.api.PushService
 import io.element.android.libraries.push.api.PusherRegistrationFailure
 import io.element.android.libraries.push.test.FakePushService
@@ -68,7 +73,7 @@ class LoggedInPresenterTest {
     }
 
     @Test
-    fun `present - ensure that account urls are preloaded`() = runTest {
+    fun `present - ensure that account url is preloaded`() = runTest {
         val accountManagementUrlResult = lambdaRecorder<AccountManagementAction?, Result<String?>> { Result.success("aUrl") }
         val matrixClient = FakeMatrixClient(
             accountManagementUrlResult = accountManagementUrlResult,
@@ -78,11 +83,8 @@ class LoggedInPresenterTest {
         ).test {
             awaitItem()
             advanceUntilIdle()
-            accountManagementUrlResult.assertions().isCalledExactly(2)
-                .withSequence(
-                    listOf(value(AccountManagementAction.Profile)),
-                    listOf(value(AccountManagementAction.DevicesList)),
-                )
+            accountManagementUrlResult.assertions().isCalledOnce()
+                .with(value(null))
         }
     }
 
@@ -109,6 +111,7 @@ class LoggedInPresenterTest {
         val verificationService = FakeSessionVerificationService()
         val encryptionService = FakeEncryptionService()
         val buildMeta = aBuildMeta()
+        val networkMonitor = FakeNetworkMonitor()
         LoggedInPresenter(
             matrixClient = FakeMatrixClient(
                 roomListService = roomListService,
@@ -122,6 +125,9 @@ class LoggedInPresenterTest {
             analyticsService = analyticsService,
             encryptionService = encryptionService,
             buildMeta = buildMeta,
+            networkMonitor = networkMonitor,
+            localNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(),
+            permissionsPresenterFactory = FakePermissionsPresenterFactory(),
         ).test {
             encryptionService.emitRecoveryState(RecoveryState.UNKNOWN)
             encryptionService.emitRecoveryState(RecoveryState.INCOMPLETE)
@@ -319,6 +325,27 @@ class LoggedInPresenterTest {
         }
     }
 
+    @Test
+    fun `present - refreshes homeserver capabilities when network is back`() = runTest {
+        val refreshLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val matrixClient = FakeMatrixClient(
+            homeserverCapabilitiesProvider = FakeHomeserverCapabilitiesProvider(refresh = refreshLambda),
+            accountManagementUrlResult = { Result.success(null) },
+        )
+        val networkMonitor = FakeNetworkMonitor()
+        createLoggedInPresenter(
+            matrixClient = matrixClient,
+            networkMonitor = networkMonitor,
+        ).test {
+            awaitItem()
+            networkMonitor.connectivity.value = NetworkStatus.Connected
+
+            advanceUntilIdle()
+
+            refreshLambda.assertions().isCalledOnce()
+        }
+    }
+
     private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
         skipItems(1)
         return awaitItem()
@@ -334,6 +361,7 @@ class LoggedInPresenterTest {
             accountManagementUrlResult = { Result.success(null) },
         ),
         buildMeta: BuildMeta = aBuildMeta(),
+        networkMonitor: FakeNetworkMonitor = FakeNetworkMonitor(),
     ): LoggedInPresenter {
         return LoggedInPresenter(
             matrixClient = matrixClient,
@@ -343,6 +371,9 @@ class LoggedInPresenterTest {
             analyticsService = analyticsService,
             encryptionService = encryptionService,
             buildMeta = buildMeta,
+            networkMonitor = networkMonitor,
+            localNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(),
+            permissionsPresenterFactory = FakePermissionsPresenterFactory(),
         )
     }
 }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
index 40778ae353..ec36f3d32d 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
@@ -13,7 +13,9 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeJoinedRoomLoadedFlowNodeCallback : JoinedRoomLoadedFlowNode.Callback {
-    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
+    override fun onDone() = lambdaError()
+    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean) = lambdaError()
     override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
     override fun navigateToGlobalNotificationSettings() = lambdaError()
+    override fun navigateToDeveloperSettings() = lambdaError()
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index f699378d54..0e0df9dbc6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,7 +30,7 @@ tasks.register<Delete>("clean").configure {
     delete(rootProject.layout.buildDirectory)
 }
 
-private val ktLintVersion = the<LibrariesForLibs>().versions.ktlint.get()
+private val catalog = the<LibrariesForLibs>()
 
 allprojects {
     // Detekt
@@ -46,12 +46,15 @@ allprojects {
         config.from(files("$rootDir/tools/detekt/detekt.yml"))
     }
     dependencies {
-        detektPlugins("io.nlopez.compose.rules:detekt:0.5.6")
+        detektPlugins(catalog.detekt.compose.rules)
         detektPlugins(project(":tests:detekt-rules"))
     }
 
     tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
         exclude("io/element/android/tests/konsist/failures/**")
+
+        // This file comes from another project and we want to keep it as close to the original as possible
+        exclude("org/rustls/platformverifier/**")
     }
 
     // KtLint
@@ -61,7 +64,7 @@ allprojects {
 
     // See https://github.com/JLLeitschuh/ktlint-gradle#configuration
     configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
-        version = ktLintVersion
+        version = catalog.versions.ktlint.get()
         android = true
         ignoreFailures = false
         enableExperimentalRules = true
@@ -79,6 +82,9 @@ allprojects {
 
             // This file comes from another project and we want to keep it as close to the original as possible
             exclude("**/SafeChildrenTransitionScope.kt")
+
+            // This file comes from another project and we want to keep it as close to the original as possible
+            exclude("org/rustls/platformverifier/**")
         }
     }
     // Dependency check
@@ -100,8 +106,6 @@ allprojects {
             // Fix compilation warning for annotations
             // See https://youtrack.jetbrains.com/issue/KT-73255/Change-defaulting-rule-for-annotations for more details
             freeCompilerArgs.add("-Xannotation-default-target=first-only")
-            // Opt-in to context receivers
-            freeCompilerArgs.add("-Xcontext-parameters")
         }
     }
 }
diff --git a/docs/_developer_onboarding.md b/docs/_developer_onboarding.md
index a264bfec63..74020ead98 100644
--- a/docs/_developer_onboarding.md
+++ b/docs/_developer_onboarding.md
@@ -144,6 +144,11 @@ Prerequisites:
   export ANDROID_HOME=$HOME/android/sdk
   ```
 
+* On macos ensure gnu-getopt is installed
+  ```
+  brew install gnu-getopt
+  ```
+
 You can then build the Rust SDK by running the script
 [`tools/sdk/build-rust-sdk`](../tools/sdk/build-rust-sdk). Type
 `./tools/sdk/build-rust-sdk --help` for help.
diff --git a/docs/oidc.md b/docs/oauth.md
similarity index 81%
rename from docs/oidc.md
rename to docs/oauth.md
index 23709b608c..1080c64b0e 100644
--- a/docs/oidc.md
+++ b/docs/oauth.md
@@ -1,4 +1,4 @@
-This file contains some rough notes about Oidc implementation, with some examples of actual data.
+This file contains some rough notes about OAuth implementation, with some examples of actual data.
 
 [ios implementation](https://github.com/element-hq/element-x-ios/compare/develop...doug/oidc-temp)
 
@@ -25,7 +25,7 @@ tosUri = "https://element.io/user-terms-of-service",
 policyUri = "https://element.io/privacy"
 
 
-Example of OidcData (from presentUrl callback):
+Example of OAuthData (from presentUrl callback):
 url: https://auth-oidc.lab.element.dev/authorize?response_type=code&client_id=01GYCAGG3PA70CJ97ZVP0WFJY3&redirect_uri=io.element%3A%2Fcallback&scope=openid+urn%3Amatrix%3Aorg.matrix.msc2967.client%3Aapi%3A*+urn%3Amatrix%3Aorg.matrix.msc2967.client%3Adevice%3AYAgcPW4mcG&state=ex6mNJVFZ5jn9wL8&nonce=NZ93DOyIGQd9exPQ&code_challenge_method=S256&code_challenge=FFRcPALNSPCh-ZgpyTRFu_h8NZJVncfvihbfT9CyX8U&prompt=consent
 
 Formatted url:
@@ -43,8 +43,8 @@ https://auth-oidc.lab.element.dev/authorize?
 state: ex6mNJVFZ5jn9wL8
 
 
-Oidc client example: https://github.com/matrix-org/matrix-rust-sdk/blob/39ad8a46801fb4317a777ebf895822b3675b709c/examples/oidc_cli/src/main.rs
-Oidc sdk doc: https://github.com/matrix-org/matrix-rust-sdk/blob/39ad8a46801fb4317a777ebf895822b3675b709c/crates/matrix-sdk/src/oidc.rs
+OAuth client example: https://github.com/matrix-org/matrix-rust-sdk/blob/39ad8a46801fb4317a777ebf895822b3675b709c/examples/oidc_cli/src/main.rs
+OAuth sdk doc: https://github.com/matrix-org/matrix-rust-sdk/blob/39ad8a46801fb4317a777ebf895822b3675b709c/crates/matrix-sdk/src/oidc.rs
 
 
 Test server:
diff --git a/enterprise b/enterprise
index cdde60c158..029db99513 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit cdde60c158ecd0987a3ba6fd79a4617551aff463
+Subproject commit 029db99513d569b715ad3bb24145b3c2ac9c14cc
diff --git a/fastlane/metadata/android/en-US/changelogs/202604000.txt b/fastlane/metadata/android/en-US/changelogs/202604000.txt
new file mode 100644
index 0000000000..26b1479a0d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202604000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes for crashes from the SDK and notifications and UI improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202604010.txt b/fastlane/metadata/android/en-US/changelogs/202604010.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202604010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202604020.txt b/fastlane/metadata/android/en-US/changelogs/202604020.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202604020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202604030.txt b/fastlane/metadata/android/en-US/changelogs/202604030.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202604030.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202604040.txt b/fastlane/metadata/android/en-US/changelogs/202604040.txt
new file mode 100644
index 0000000000..cbb77b7606
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202604040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: several bug fixes.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202605000.txt b/fastlane/metadata/android/en-US/changelogs/202605000.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202605000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202605010.txt b/fastlane/metadata/android/en-US/changelogs/202605010.txt
new file mode 100644
index 0000000000..0ad08f5b4d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202605010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: improvements in Element Call, room knocking and room directory are now available, improvements on DMs.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202605020.txt b/fastlane/metadata/android/en-US/changelogs/202605020.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202605020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202606000.txt b/fastlane/metadata/android/en-US/changelogs/202606000.txt
new file mode 100644
index 0000000000..6c68999e99
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202606000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: added image editing before sending and an option for custom notification sounds, improved start times, several other bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202606010.txt b/fastlane/metadata/android/en-US/changelogs/202606010.txt
new file mode 100644
index 0000000000..08c06cf192
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202606010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: fixed an issue with devices not supporting Vulkan, added image editing before sending and an option for custom notification sounds, improved start times, several other bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202606030.txt b/fastlane/metadata/android/en-US/changelogs/202606030.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202606030.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202606040.txt b/fastlane/metadata/android/en-US/changelogs/202606040.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202606040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202607000.txt b/fastlane/metadata/android/en-US/changelogs/202607000.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202607000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/202607010.txt b/fastlane/metadata/android/en-US/changelogs/202607010.txt
new file mode 100644
index 0000000000..5ffe3749c2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202607010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements, including fixing the local network permission usage in Android 17.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/202608000.txt b/fastlane/metadata/android/en-US/changelogs/202608000.txt
new file mode 100644
index 0000000000..a4b397f1bb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202608000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
\ No newline at end of file
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
index e91c77079f..1158b57673 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesView.kt
@@ -39,7 +39,7 @@ fun AnalyticsPreferencesView(
     )
     Column(modifier) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(stringResource(id = R.string.screen_analytics_settings_share_data))
             },
             supportingContent = {
diff --git a/features/analytics/api/src/main/res/values-ca/translations.xml b/features/analytics/api/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..9f352d28ce
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Comparteix dades d\'ús anònimes per ajudar-nos a identificar problemes."</string>
+  <string name="screen_analytics_settings_read_terms">"Pots llegir tots els nostres termes %1$s."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"aquí"</string>
+  <string name="screen_analytics_settings_share_data">"Comparteix dades analítiques"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-ja/translations.xml b/features/analytics/api/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..e1495271d3
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-ja/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"改善のため、匿名の使用データの共有にご協力ください。"</string>
+  <string name="screen_analytics_settings_read_terms">"規約の全文は%1$sから確認することができます。"</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"こちら"</string>
+  <string name="screen_analytics_settings_share_data">"使用データを共有"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-lt/translations.xml b/features/analytics/api/src/main/res/values-lt/translations.xml
index 08dd155332..004b20d79d 100644
--- a/features/analytics/api/src/main/res/values-lt/translations.xml
+++ b/features/analytics/api/src/main/res/values-lt/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_analytics_settings_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
+  <string name="screen_analytics_settings_help_us_improve">"Bendrinkite anoniminius naudojimo duomenis, kad padėtumėte mums nustatyti problemas."</string>
   <string name="screen_analytics_settings_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"čia"</string>
-  <string name="screen_analytics_settings_share_data">"Dalytis analitiniais duomenimis"</string>
+  <string name="screen_analytics_settings_share_data">"Bendrinti analitinius duomenis"</string>
 </resources>
diff --git a/features/analytics/api/src/main/res/values-vi/translations.xml b/features/analytics/api/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..0dc02d79d6
--- /dev/null
+++ b/features/analytics/api/src/main/res/values-vi/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Chia sẻ dữ liệu sử dụng ẩn danh để giúp chúng tôi xác định vấn đề."</string>
+  <string name="screen_analytics_settings_read_terms">"Bạn có thể xem tất cả điều khoản của chúng tôi tại %1$s"</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"tại đây"</string>
+  <string name="screen_analytics_settings_share_data">"Chia sẻ dữ liệu phân tích"</string>
+</resources>
diff --git a/features/analytics/api/src/main/res/values-zh/translations.xml b/features/analytics/api/src/main/res/values-zh/translations.xml
index e5f9fccd66..8f1c1699d9 100644
--- a/features/analytics/api/src/main/res/values-zh/translations.xml
+++ b/features/analytics/api/src/main/res/values-zh/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"共享匿名使用数据以帮助我们排查问题。"</string>
-  <string name="screen_analytics_settings_read_terms">"您可以阅读我们的所有条款 %1$s。"</string>
+  <string name="screen_analytics_settings_read_terms">"你可以点击 %1$s 阅读我们的所有条款。"</string>
   <string name="screen_analytics_settings_read_terms_content_link">"此处"</string>
   <string name="screen_analytics_settings_share_data">"共享分析数据"</string>
 </resources>
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
index 4fc9ce5c6b..c05edd825c 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
@@ -31,12 +31,12 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.background.OnboardingBackground
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.ClickableLinkText
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
@@ -129,22 +129,21 @@ private fun AnalyticsOptInContent() {
             verticalBias = -0.4f
         )
     ) {
-        InfoListOrganism(
+        VisualList(
             items = persistentListOf(
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_data_usage),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_third_party_sharing),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_analytics_prompt_settings),
                     iconVector = CompoundIcons.CheckCircle(),
                 ),
             ),
-            textStyle = ElementTheme.typography.fontBodyLgMedium,
             iconTint = ElementTheme.colors.iconSuccessPrimary,
         )
     }
diff --git a/features/analytics/impl/src/main/res/values-ca/translations.xml b/features/analytics/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..5a2b633075
--- /dev/null
+++ b/features/analytics/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"No registrarem ni elaborarem perfils de cap dada personal"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Comparteix dades d\'ús anònimes per ajudar-nos a identificar problemes."</string>
+  <string name="screen_analytics_prompt_read_terms">"Pots llegir tots els nostres termes %1$s."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"aquí"</string>
+  <string name="screen_analytics_prompt_settings">"Ho pots desactivar en qualsevol moment"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"No compartirem les teves dades amb tercers"</string>
+  <string name="screen_analytics_prompt_title">"Ajuda\'ns a millorar %1$s"</string>
+</resources>
diff --git a/features/analytics/impl/src/main/res/values-ja/translations.xml b/features/analytics/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..162e01ecb0
--- /dev/null
+++ b/features/analytics/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"いかなる個人情報も記録, 分析されることはありません"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"改善のため、匿名の使用データの共有にご協力ください。"</string>
+  <string name="screen_analytics_prompt_read_terms">"規約の全文は%1$sから確認することができます。"</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"こちら"</string>
+  <string name="screen_analytics_prompt_settings">"いつでも設定は変更できます"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"情報が第三者に共有されることはありません"</string>
+  <string name="screen_analytics_prompt_title">"%1$s の改善にご協力ください"</string>
+</resources>
diff --git a/features/analytics/impl/src/main/res/values-lt/translations.xml b/features/analytics/impl/src/main/res/values-lt/translations.xml
index 11f2cbc74e..4f7c70dd6d 100644
--- a/features/analytics/impl/src/main/res/values-lt/translations.xml
+++ b/features/analytics/impl/src/main/res/values-lt/translations.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_analytics_prompt_data_usage">"Mes nekaupsime ir neprofiliuosime jokių asmens duomenų"</string>
-  <string name="screen_analytics_prompt_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
+  <string name="screen_analytics_prompt_data_usage">"Mes neįrašysime ar neprofiliuosime jokių asmeninių duomenų."</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Bendrinkite anoniminius naudojimo duomenis, kad padėtumėte mums nustatyti problemas."</string>
   <string name="screen_analytics_prompt_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"čia"</string>
-  <string name="screen_analytics_prompt_settings">"Tai galite bet kada išjungti"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"Mes nesidalinsime Jūsų duomenimis su trečiosiomis šalimis"</string>
-  <string name="screen_analytics_prompt_title">"Padėkite pagerinti %1$s"</string>
+  <string name="screen_analytics_prompt_settings">"Tai galite išjungti bet kuriuo metu."</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Mes nebendrinsime jūsų duomenų su trečiosiomis šalimis."</string>
+  <string name="screen_analytics_prompt_title">"Padėkite patobulinti „%1$s“"</string>
 </resources>
diff --git a/features/analytics/impl/src/main/res/values-vi/translations.xml b/features/analytics/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..205a52c296
--- /dev/null
+++ b/features/analytics/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"Chúng tôi sẽ không ghi lại hoặc lập hồ sơ bất kỳ dữ liệu cá nhân nào."</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Chia sẻ dữ liệu sử dụng ẩn danh để giúp chúng tôi xác định vấn đề."</string>
+  <string name="screen_analytics_prompt_read_terms">"Bạn có thể xem tất cả điều khoản của chúng tôi tại %1$s"</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"tại đây"</string>
+  <string name="screen_analytics_prompt_settings">"Bạn có thể tắt tính năng này bất cứ lúc nào"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Chúng tôi sẽ không chia sẻ dữ liệu của bạn với bên thứ ba."</string>
+  <string name="screen_analytics_prompt_title">"Giúp cải thiện %1$s"</string>
+</resources>
diff --git a/features/analytics/impl/src/main/res/values-zh/translations.xml b/features/analytics/impl/src/main/res/values-zh/translations.xml
index d18650654b..678d506287 100644
--- a/features/analytics/impl/src/main/res/values-zh/translations.xml
+++ b/features/analytics/impl/src/main/res/values-zh/translations.xml
@@ -2,9 +2,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_data_usage">"我们不会记录或分析任何个人数据"</string>
   <string name="screen_analytics_prompt_help_us_improve">"共享匿名使用数据以帮助我们排查问题。"</string>
-  <string name="screen_analytics_prompt_read_terms">"您可以阅读我们的所有条款 %1$s。"</string>
+  <string name="screen_analytics_prompt_read_terms">"你可以点击 %1$s 阅读我们的所有条款。"</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"此处"</string>
   <string name="screen_analytics_prompt_settings">"可以随时关闭此功能"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"我们不会与第三方共享您的数据"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"我们不会与第三方共享你的数据"</string>
   <string name="screen_analytics_prompt_title">"帮助改进 %1$s"</string>
 </resources>
diff --git a/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt b/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt
index 0bf35650a0..d743ae4cd6 100644
--- a/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt
+++ b/features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt
@@ -8,7 +8,13 @@
 
 package io.element.android.features.announcement.api
 
-enum class Announcement {
-    Space,
-    NewNotificationSound,
+import androidx.compose.runtime.Immutable
+
+@Immutable
+sealed interface Announcement {
+    enum class Fullscreen : Announcement {
+        Space,
+    }
+
+    data object NewNotificationSound : Announcement
 }
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementEvent.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementEvent.kt
new file mode 100644
index 0000000000..947a3ceeba
--- /dev/null
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementEvent.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.announcement.impl
+
+import io.element.android.features.announcement.api.Announcement
+
+sealed interface AnnouncementEvent {
+    data class Continue(
+        val announcement: Announcement.Fullscreen,
+    ) : AnnouncementEvent
+}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt
index 508f1e44a0..bd45ddb956 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt
@@ -12,12 +12,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.libraries.architecture.Presenter
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 
 @Inject
 class AnnouncementPresenter(
@@ -25,13 +29,39 @@ class AnnouncementPresenter(
 ) : Presenter<AnnouncementState> {
     @Composable
     override fun present(): AnnouncementState {
-        val showSpaceAnnouncement by remember {
-            announcementStore.announcementStatusFlow(Announcement.Space).map {
-                it == AnnouncementStatus.Show
+        val coroutineScope = rememberCoroutineScope()
+
+        val fullscreenAnnouncementToShow by remember {
+            combine(
+                flowOf(Unit),
+                announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).map {
+                    it == AnnouncementStatus.Show
+                },
+                // Add other announcements here when needed
+            ) { _, showFullscreenSpace ->
+                when {
+                    showFullscreenSpace -> Announcement.Fullscreen.Space
+                    else -> {
+                        null
+                    }
+                }
             }
-        }.collectAsState(false)
+        }.collectAsState(null)
+
+        fun handle(event: AnnouncementEvent) {
+            when (event) {
+                is AnnouncementEvent.Continue -> coroutineScope.launch {
+                    announcementStore.setAnnouncementStatus(
+                        announcement = event.announcement,
+                        status = AnnouncementStatus.Shown,
+                    )
+                }
+            }
+        }
+
         return AnnouncementState(
-            showSpaceAnnouncement = showSpaceAnnouncement,
+            announcement = fullscreenAnnouncementToShow,
+            eventSink = ::handle,
         )
     }
 }
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementState.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementState.kt
index e762dd607f..fb0732450d 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementState.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementState.kt
@@ -8,12 +8,9 @@
 
 package io.element.android.features.announcement.impl
 
-data class AnnouncementState(
-    val showSpaceAnnouncement: Boolean,
-)
+import io.element.android.features.announcement.api.Announcement
 
-fun anAnnouncementState(
-    showSpaceAnnouncement: Boolean = false,
-) = AnnouncementState(
-    showSpaceAnnouncement = showSpaceAnnouncement,
+data class AnnouncementState(
+    val announcement: Announcement.Fullscreen?,
+    val eventSink: (AnnouncementEvent) -> Unit,
 )
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementStateProvider.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementStateProvider.kt
new file mode 100644
index 0000000000..2412fee167
--- /dev/null
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementStateProvider.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.announcement.impl
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.announcement.api.Announcement
+
+open class AnnouncementStateProvider : PreviewParameterProvider<AnnouncementState> {
+    override val values: Sequence<AnnouncementState>
+        get() = sequenceOf(
+            anAnnouncementState(),
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+            ),
+        )
+}
+
+fun anAnnouncementState(
+    announcement: Announcement.Fullscreen? = null,
+    eventSink: (AnnouncementEvent) -> Unit = {},
+) = AnnouncementState(
+    announcement = announcement,
+    eventSink = eventSink,
+)
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt
index 0e5c30178c..adb81db61a 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt
@@ -8,35 +8,28 @@
 
 package io.element.android.features.announcement.impl
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementView
+import io.element.android.features.announcement.impl.fullscreen.FullscreenAnnouncementView
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.libraries.architecture.Presenter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
 
 @ContributesBinding(AppScope::class)
 class DefaultAnnouncementService(
     private val announcementStore: AnnouncementStore,
-    private val announcementPresenter: Presenter<AnnouncementState>,
-    private val spaceAnnouncementPresenter: Presenter<SpaceAnnouncementState>,
+    private val announcementPresenter: AnnouncementPresenter,
 ) : AnnouncementService {
     override suspend fun showAnnouncement(announcement: Announcement) {
         when (announcement) {
-            Announcement.Space -> showSpaceAnnouncement()
+            is Announcement.Fullscreen -> showFullscreenAnnouncement(announcement)
             Announcement.NewNotificationSound -> {
                 announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Show)
             }
@@ -49,13 +42,10 @@ class DefaultAnnouncementService(
 
     override fun announcementsToShowFlow(): Flow<List<Announcement>> {
         return combine(
-            announcementStore.announcementStatusFlow(Announcement.Space),
+            flowOf(Unit),
             announcementStore.announcementStatusFlow(Announcement.NewNotificationSound),
-        ) { spaceAnnouncementStatus, newNotificationSoundStatus ->
+        ) { _, newNotificationSoundStatus ->
             buildList {
-                if (spaceAnnouncementStatus == AnnouncementStatus.Show) {
-                    add(Announcement.Space)
-                }
                 if (newNotificationSoundStatus == AnnouncementStatus.Show) {
                     add(Announcement.NewNotificationSound)
                 }
@@ -63,27 +53,19 @@ class DefaultAnnouncementService(
         }
     }
 
-    private suspend fun showSpaceAnnouncement() {
-        val currentValue = announcementStore.announcementStatusFlow(Announcement.Space).first()
+    private suspend fun showFullscreenAnnouncement(announcement: Announcement.Fullscreen) {
+        val currentValue = announcementStore.announcementStatusFlow(announcement).first()
         if (currentValue == AnnouncementStatus.NeverShown) {
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
+            announcementStore.setAnnouncementStatus(announcement, AnnouncementStatus.Show)
         }
     }
 
     @Composable
     override fun Render(modifier: Modifier) {
         val announcementState = announcementPresenter.present()
-        Box(modifier = modifier.fillMaxSize()) {
-            AnimatedVisibility(
-                visible = announcementState.showSpaceAnnouncement,
-                enter = fadeIn(),
-                exit = fadeOut(),
-            ) {
-                val spaceAnnouncementState = spaceAnnouncementPresenter.present()
-                SpaceAnnouncementView(
-                    state = spaceAnnouncementState,
-                )
-            }
-        }
+        FullscreenAnnouncementView(
+            state = announcementState,
+            modifier = modifier,
+        )
     }
 }
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/di/AnnouncementModule.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/di/AnnouncementModule.kt
deleted file mode 100644
index 4cfc073271..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/di/AnnouncementModule.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.di
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.BindingContainer
-import dev.zacsweers.metro.Binds
-import dev.zacsweers.metro.ContributesTo
-import io.element.android.features.announcement.impl.AnnouncementPresenter
-import io.element.android.features.announcement.impl.AnnouncementState
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementPresenter
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.libraries.architecture.Presenter
-
-@ContributesTo(AppScope::class)
-@BindingContainer
-interface AnnouncementModule {
-    @Binds
-    fun bindAnnouncementPresenter(presenter: AnnouncementPresenter): Presenter<AnnouncementState>
-
-    @Binds
-    fun bindSpaceAnnouncementPresenter(presenter: SpaceAnnouncementPresenter): Presenter<SpaceAnnouncementState>
-}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
new file mode 100644
index 0000000000..5f7778900b
--- /dev/null
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementView.kt
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.announcement.impl.fullscreen
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.announcement.api.Announcement
+import io.element.android.features.announcement.impl.AnnouncementEvent
+import io.element.android.features.announcement.impl.AnnouncementState
+import io.element.android.features.announcement.impl.AnnouncementStateProvider
+import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+/**
+ * Ref: https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Spaces-on-Element-X?node-id=4593-40181
+ */
+@Composable
+fun FullscreenAnnouncementView(
+    state: AnnouncementState,
+    modifier: Modifier = Modifier,
+) {
+    // Ensure that the content stays visible during the exit animation
+    var fullscreenAnnouncement by remember { mutableStateOf<Announcement.Fullscreen?>(null) }
+    if (state.announcement != null) {
+        fullscreenAnnouncement = state.announcement
+    }
+    Box(modifier = modifier.fillMaxSize()) {
+        AnimatedVisibility(
+            visible = state.announcement != null,
+            enter = fadeIn(),
+            exit = fadeOut(),
+        ) {
+            fullscreenAnnouncement?.let {
+                FullscreenAnnouncementView(
+                    announcement = it,
+                    eventSink = state.eventSink,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun FullscreenAnnouncementView(
+    announcement: Announcement.Fullscreen,
+    eventSink: (AnnouncementEvent) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    fun onContinue() {
+        eventSink(AnnouncementEvent.Continue(announcement))
+    }
+
+    BackHandler(onBack = ::onContinue)
+    HeaderFooterPage(
+        modifier = modifier,
+        isScrollable = true,
+        contentPadding = PaddingValues(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 24.dp),
+        header = {
+            FullscreenAnnouncementHeader(announcement)
+        },
+        content = {
+            FullscreenAnnouncementContent(
+                modifier = Modifier.padding(horizontal = 8.dp),
+                announcement = announcement,
+            )
+        },
+        footer = {
+            FullscreenAnnouncementFooter(
+                onContinue = ::onContinue,
+            )
+        }
+    )
+}
+
+@Composable
+private fun FullscreenAnnouncementHeader(
+    announcement: Announcement.Fullscreen,
+    modifier: Modifier = Modifier,
+) {
+    IconTitleSubtitleMolecule(
+        modifier = modifier.padding(top = 16.dp, bottom = 16.dp),
+        title = announcement.title(),
+        showBetaLabel = true,
+        subTitle = announcement.subtitle(),
+        iconStyle = BigIcon.Style.Default(
+            vectorIcon = announcement.icon(),
+            usePrimaryTint = true,
+        ),
+    )
+}
+
+@Composable
+private fun FullscreenAnnouncementContent(
+    announcement: Announcement.Fullscreen,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+    ) {
+        VisualList(
+            modifier = Modifier.fillMaxWidth(),
+            items = announcement.items(),
+            iconSize = 24.dp
+        )
+        announcement.notice()?.let { notice ->
+            Text(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 16.dp),
+                text = notice,
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}
+
+@Composable
+private fun FullscreenAnnouncementFooter(
+    onContinue: () -> Unit,
+) {
+    ButtonColumnMolecule(
+        modifier = Modifier.padding(bottom = 8.dp)
+    ) {
+        Button(
+            text = stringResource(id = CommonStrings.action_continue),
+            onClick = onContinue,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun Announcement.Fullscreen.title() = when (this) {
+    Announcement.Fullscreen.Space -> "Introducing Spaces"
+}
+
+@Composable
+private fun Announcement.Fullscreen.subtitle() = when (this) {
+    Announcement.Fullscreen.Space -> "Welcome to the beta version of Spaces! With this first version you can:"
+}
+
+@Composable
+private fun Announcement.Fullscreen.icon() = when (this) {
+    Announcement.Fullscreen.Space -> CompoundIcons.SpaceSolid()
+}
+
+@Composable
+private fun Announcement.Fullscreen.items(): ImmutableList<VisualListItemData> = when (this) {
+    Announcement.Fullscreen.Space -> persistentListOf(
+        VisualListItemData(
+            message = "View spaces you\'ve created or joined",
+            iconVector = CompoundIcons.VisibilityOn(),
+        ),
+        VisualListItemData(
+            message = "Accept or decline invites to spaces",
+            iconVector = CompoundIcons.Email(),
+        ),
+        VisualListItemData(
+            message = "Discover any rooms you can join in your spaces",
+            iconVector = CompoundIcons.Search(),
+        ),
+        VisualListItemData(
+            message = "Join public spaces",
+            iconVector = CompoundIcons.Explore(),
+        ),
+        VisualListItemData(
+            message = "Leave any spaces you’ve joined",
+            iconVector = CompoundIcons.Leave(),
+        ),
+    )
+}
+
+@Composable
+private fun Announcement.Fullscreen.notice(): String? = when (this) {
+    Announcement.Fullscreen.Space -> "Filtering, creating and managing spaces is coming soon."
+}
+
+@PreviewsDayNight
+@Composable
+internal fun FullscreenAnnouncementViewPreview(@PreviewParameter(AnnouncementStateProvider::class) state: AnnouncementState) = ElementPreview {
+    FullscreenAnnouncementView(
+        state = state,
+    )
+}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementEvents.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementEvents.kt
deleted file mode 100644
index 3b968d09a6..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementEvents.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-sealed interface SpaceAnnouncementEvents {
-    data object Continue : SpaceAnnouncementEvents
-}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenter.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenter.kt
deleted file mode 100644
index 7c4bc7b5eb..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import dev.zacsweers.metro.Inject
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.store.AnnouncementStatus
-import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.libraries.architecture.Presenter
-import kotlinx.coroutines.launch
-
-@Inject
-class SpaceAnnouncementPresenter(
-    private val announcementStore: AnnouncementStore,
-) : Presenter<SpaceAnnouncementState> {
-    @Composable
-    override fun present(): SpaceAnnouncementState {
-        val localCoroutineScope = rememberCoroutineScope()
-
-        fun handleEvent(event: SpaceAnnouncementEvents) {
-            when (event) {
-                SpaceAnnouncementEvents.Continue -> localCoroutineScope.launch {
-                    announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
-                }
-            }
-        }
-
-        return SpaceAnnouncementState(
-            eventSink = ::handleEvent,
-        )
-    }
-}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementState.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementState.kt
deleted file mode 100644
index 9407fad872..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementState.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-data class SpaceAnnouncementState(
-    val eventSink: (SpaceAnnouncementEvents) -> Unit
-)
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementStateProvider.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementStateProvider.kt
deleted file mode 100644
index 27f48cc7ed..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementStateProvider.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-
-open class SpaceAnnouncementStateProvider : PreviewParameterProvider<SpaceAnnouncementState> {
-    override val values: Sequence<SpaceAnnouncementState>
-        get() = sequenceOf(
-            aSpaceAnnouncementState(),
-        )
-}
-
-fun aSpaceAnnouncementState(
-    eventSink: (SpaceAnnouncementEvents) -> Unit = {},
-) = SpaceAnnouncementState(
-    eventSink = eventSink,
-)
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt
deleted file mode 100644
index 3fe6ec4456..0000000000
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementView.kt
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.announcement.impl.R
-import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
-import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
-import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
-import io.element.android.libraries.designsystem.components.BigIcon
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Button
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.collections.immutable.persistentListOf
-
-/**
- * Ref: https://www.figma.com/design/kcnHxunG1LDWXsJhaNuiHz/ER-145--Spaces-on-Element-X?node-id=4593-40181
- */
-@Composable
-fun SpaceAnnouncementView(
-    state: SpaceAnnouncementState,
-    modifier: Modifier = Modifier,
-) {
-    val eventSink = state.eventSink
-
-    fun onContinue() {
-        eventSink(SpaceAnnouncementEvents.Continue)
-    }
-
-    BackHandler(onBack = ::onContinue)
-    HeaderFooterPage(
-        modifier = modifier,
-        isScrollable = true,
-        contentPadding = PaddingValues(top = 24.dp, start = 16.dp, end = 16.dp, bottom = 24.dp),
-        header = {
-            SpaceAnnouncementHeader()
-        },
-        content = {
-            SpaceAnnouncementContent(
-                modifier = Modifier.padding(horizontal = 8.dp),
-            )
-        },
-        footer = {
-            SpaceAnnouncementFooter(
-                onContinue = ::onContinue,
-            )
-        }
-    )
-}
-
-@Composable
-private fun SpaceAnnouncementHeader(
-    modifier: Modifier = Modifier,
-) {
-    IconTitleSubtitleMolecule(
-        modifier = modifier.padding(top = 16.dp, bottom = 16.dp),
-        title = stringResource(id = R.string.screen_space_announcement_title),
-        showBetaLabel = true,
-        subTitle = stringResource(id = R.string.screen_space_announcement_subtitle),
-        iconStyle = BigIcon.Style.Default(
-            vectorIcon = CompoundIcons.SpaceSolid(),
-            usePrimaryTint = true,
-        ),
-    )
-}
-
-@Composable
-private fun SpaceAnnouncementContent(
-    modifier: Modifier = Modifier,
-) {
-    Column(
-        modifier = modifier.fillMaxSize(),
-    ) {
-        InfoListOrganism(
-            modifier = Modifier.fillMaxWidth(),
-            items = persistentListOf(
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item1),
-                    iconVector = CompoundIcons.VisibilityOn(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item2),
-                    iconVector = CompoundIcons.Email(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item3),
-                    iconVector = CompoundIcons.Search(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item4),
-                    iconVector = CompoundIcons.Explore(),
-                ),
-                InfoListItem(
-                    message = stringResource(id = R.string.screen_space_announcement_item5),
-                    iconVector = CompoundIcons.Leave(),
-                ),
-            ),
-            textStyle = ElementTheme.typography.fontBodyLgMedium,
-            iconTint = ElementTheme.colors.iconSecondary,
-            iconSize = 24.dp
-        )
-        Text(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 16.dp),
-            text = stringResource(id = R.string.screen_space_announcement_notice),
-            style = ElementTheme.typography.fontBodyMdRegular,
-            color = ElementTheme.colors.textSecondary,
-            textAlign = TextAlign.Center,
-        )
-    }
-}
-
-@Composable
-private fun SpaceAnnouncementFooter(
-    onContinue: () -> Unit,
-) {
-    ButtonColumnMolecule(
-        modifier = Modifier.padding(bottom = 8.dp)
-    ) {
-        Button(
-            text = stringResource(id = CommonStrings.action_continue),
-            onClick = onContinue,
-            modifier = Modifier.fillMaxWidth(),
-        )
-    }
-}
-
-@PreviewsDayNight
-@Composable
-internal fun SpaceAnnouncementViewPreview(@PreviewParameter(SpaceAnnouncementStateProvider::class) state: SpaceAnnouncementState) = ElementPreview {
-    SpaceAnnouncementView(
-        state = state,
-    )
-}
diff --git a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt
index ad166e4ef5..2093baa8b3 100644
--- a/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt
+++ b/features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt
@@ -35,9 +35,11 @@ class DefaultAnnouncementStore(
 
     override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStatus> {
         val key = announcement.toKey()
-        // For NewNotificationSound, a migration will set it to Show on application upgrade (see AppMigration08)
+        // Default-status convention: Shown for one-shot intro/feature announcements that should
+        // NOT replay on first launch (Fullscreen.Space is disabled; NewNotificationSound is opted
+        // in by AppMigration08).
         val defaultStatus = when (announcement) {
-            Announcement.Space -> AnnouncementStatus.NeverShown
+            Announcement.Fullscreen.Space -> AnnouncementStatus.Shown
             Announcement.NewNotificationSound -> AnnouncementStatus.Shown
         }
         return store.data.map { prefs ->
@@ -52,6 +54,6 @@ class DefaultAnnouncementStore(
 }
 
 private fun Announcement.toKey() = when (this) {
-    Announcement.Space -> spaceAnnouncementKey
+    Announcement.Fullscreen.Space -> spaceAnnouncementKey
     Announcement.NewNotificationSound -> newNotificationSoundKey
 }
diff --git a/features/announcement/impl/src/main/res/values-bg/translations.xml b/features/announcement/impl/src/main/res/values-bg/translations.xml
deleted file mode 100644
index 853cf5f027..0000000000
--- a/features/announcement/impl/src/main/res/values-bg/translations.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item4">"Присъединете се към обществени пространства"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-cs/translations.xml b/features/announcement/impl/src/main/res/values-cs/translations.xml
deleted file mode 100644
index cf7ead1962..0000000000
--- a/features/announcement/impl/src/main/res/values-cs/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Zobrazit prostory, které jste vytvořili nebo ke kterým jste se připojili"</string>
-  <string name="screen_space_announcement_item2">"Přijmout nebo odmítnout pozvánky do prostorů"</string>
-  <string name="screen_space_announcement_item3">"Objevte všechny místnosti, do kterých můžete vstoupit ve svých prostorech"</string>
-  <string name="screen_space_announcement_item4">"Připojit se k veřejným prostorům"</string>
-  <string name="screen_space_announcement_item5">"Opustit všechny prostory, ke kterým jste se připojili"</string>
-  <string name="screen_space_announcement_notice">"Filtrování, vytváření a správa prostorů bude brzy k dispozici."</string>
-  <string name="screen_space_announcement_subtitle">"Vítejte v beta verzi prostorů! S touto první verzí můžete:"</string>
-  <string name="screen_space_announcement_title">"Představujeme prostory"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-da/translations.xml b/features/announcement/impl/src/main/res/values-da/translations.xml
deleted file mode 100644
index 76540962e1..0000000000
--- a/features/announcement/impl/src/main/res/values-da/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Se klynger, du har oprettet eller tilmeldt dig"</string>
-  <string name="screen_space_announcement_item2">"Acceptere eller afvise invitationer til klynger"</string>
-  <string name="screen_space_announcement_item3">"Finde alle rum, du kan deltage i, i dine klynger"</string>
-  <string name="screen_space_announcement_item4">"Deltage i offentlige klynger"</string>
-  <string name="screen_space_announcement_item5">"Forlade de klynger, du har tilsluttet dig"</string>
-  <string name="screen_space_announcement_notice">"Filtrering, oprettelse og administration af klynger kommer snart."</string>
-  <string name="screen_space_announcement_subtitle">"Velkommen til betaversionen af Klynger! Med denne første version kan du:"</string>
-  <string name="screen_space_announcement_title">"Introduktion til Klynger"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-de/translations.xml b/features/announcement/impl/src/main/res/values-de/translations.xml
deleted file mode 100644
index 11f5f3a99c..0000000000
--- a/features/announcement/impl/src/main/res/values-de/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Von dir erstellte oder beigetretene Spaces anzeigen"</string>
-  <string name="screen_space_announcement_item2">"Einladungen zu Spaces annehmen oder ablehnen"</string>
-  <string name="screen_space_announcement_item3">"Chats innerhalb deiner Spaces entdecken, um ihnen beizutreten"</string>
-  <string name="screen_space_announcement_item4">"Öffentlichen Spaces beitreten"</string>
-  <string name="screen_space_announcement_item5">"Spaces verlassen, bei denen du Mitglied bist"</string>
-  <string name="screen_space_announcement_notice">"Das Filtern, Erstellen und Verwalten von Spaces ist bald verfügbar."</string>
-  <string name="screen_space_announcement_subtitle">"Willkommen bei der Beta-Version von Spaces! Mit dieser ersten Version kannst du:"</string>
-  <string name="screen_space_announcement_title">"Einführung in Spaces"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-el/translations.xml b/features/announcement/impl/src/main/res/values-el/translations.xml
deleted file mode 100644
index bdeb821efb..0000000000
--- a/features/announcement/impl/src/main/res/values-el/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Δείτε τους χώρους που έχετε δημιουργήσει ή στους οποίους έχετε εγγραφεί"</string>
-  <string name="screen_space_announcement_item2">"Να αποδεχθείτε ή να απορρίψετε προσκλήσεις σε χώρους"</string>
-  <string name="screen_space_announcement_item3">"Να ανακαλύψτε όλες τις αίθουσες που μπορείτε να συμμετάσχετε στους χώρους σας"</string>
-  <string name="screen_space_announcement_item4">"Να συμμετάσχετε σε δημόσιους χώρους"</string>
-  <string name="screen_space_announcement_item5">"Να αποχωρήστε από χώρους στους οποίους έχετε συμμετάσχει"</string>
-  <string name="screen_space_announcement_notice">"Το φιλτράρισμα, η δημιουργία και η διαχείριση χώρων θα είναι σύντομα διαθέσιμα."</string>
-  <string name="screen_space_announcement_subtitle">"Καλώς ορίσατε στην δοκιμαστική έκδοση των Χώρων! Με αυτήν την πρώτη έκδοση μπορείτε:"</string>
-  <string name="screen_space_announcement_title">"Παρουσιάζοντας τους Χώρους"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-et/translations.xml b/features/announcement/impl/src/main/res/values-et/translations.xml
deleted file mode 100644
index ee2ba9c3b4..0000000000
--- a/features/announcement/impl/src/main/res/values-et/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Vaadata kogukondi, mille oled loonud või millega oled liitunud"</string>
-  <string name="screen_space_announcement_item2">"Nõustuda kutsetega liitumiseks kogukonnaga või sellest keelduda"</string>
-  <string name="screen_space_announcement_item3">"Uurida neis kogukondades leiduvaid jututube ning nendega liituda"</string>
-  <string name="screen_space_announcement_item4">"Liituda avalike kogukondadega"</string>
-  <string name="screen_space_announcement_item5">"Lahkuda kogukonnast, millega oled liitunud"</string>
-  <string name="screen_space_announcement_notice">"Kogukondade filtreerimine, loomine ja haldamine lisandub peagi"</string>
-  <string name="screen_space_announcement_subtitle">"Tere tulemast kasutama kogukondade beetaversiooni! Selles esimeses versioonis saad sa:"</string>
-  <string name="screen_space_announcement_title">"Võtame kasutusele kogukonnad"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-fa/translations.xml b/features/announcement/impl/src/main/res/values-fa/translations.xml
deleted file mode 100644
index 2e8902ae23..0000000000
--- a/features/announcement/impl/src/main/res/values-fa/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"دیدن فضاهایی که ساخته یا پیوسته‌اید"</string>
-  <string name="screen_space_announcement_item2">"پذیرش یا رد دعوت‌ها به فضاها"</string>
-  <string name="screen_space_announcement_item3">"کشف تمامی اتاق‌هایی که می‌توانید در فضاهایتان بپیوندید"</string>
-  <string name="screen_space_announcement_item4">"پیوستن به فضاهای عمومی"</string>
-  <string name="screen_space_announcement_item5">"ترک هر فضایی که پیوسته‌اید"</string>
-  <string name="screen_space_announcement_notice">"پالایش، ایجاد و مدیریت کردن فضاها به زودی."</string>
-  <string name="screen_space_announcement_subtitle">"به نگارش آزمایشی فضاها خوش آمدید! در این نگارش می‌توانید:"</string>
-  <string name="screen_space_announcement_title">"معرّفی فضاها"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-fi/translations.xml b/features/announcement/impl/src/main/res/values-fi/translations.xml
deleted file mode 100644
index 8e7674487f..0000000000
--- a/features/announcement/impl/src/main/res/values-fi/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Nähdä luomasi tai liittymäsi tilat"</string>
-  <string name="screen_space_announcement_item2">"Hyväksyä tai hylätä kutsuja tiloihin"</string>
-  <string name="screen_space_announcement_item3">"Löytää kaikki huoneet, joihin voit liittyä tiloissasi"</string>
-  <string name="screen_space_announcement_item4">"Liittyä julkisiin tiloihin"</string>
-  <string name="screen_space_announcement_item5">"Poistua mistä tahansa tilasta, johon olet liittynyt"</string>
-  <string name="screen_space_announcement_notice">"Tilojen suodatus, luominen ja hallinta on tulossa pian."</string>
-  <string name="screen_space_announcement_subtitle">"Tervetuloa tilojen beetaversioon! Tämän ensimmäisen version avulla voit:"</string>
-  <string name="screen_space_announcement_title">"Esittelyssä tilat"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-fr/translations.xml b/features/announcement/impl/src/main/res/values-fr/translations.xml
deleted file mode 100644
index 7e042c65ff..0000000000
--- a/features/announcement/impl/src/main/res/values-fr/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Voir les espaces que vous avez créés ou rejoints"</string>
-  <string name="screen_space_announcement_item2">"Accepter ou refuser les invitations aux espaces"</string>
-  <string name="screen_space_announcement_item3">"Découvrir les salons que vous pouvez joindre depuis vos espaces"</string>
-  <string name="screen_space_announcement_item4">"Rejoindre les espaces publics"</string>
-  <string name="screen_space_announcement_item5">"Quitter les espaces dont vous êtes membre."</string>
-  <string name="screen_space_announcement_notice">"Le filtrage, la création et la gestion des espaces seront bientôt disponibles."</string>
-  <string name="screen_space_announcement_subtitle">"Bienvenue dans la version bêta des espaces! Avec cette première version, vous pourrez :"</string>
-  <string name="screen_space_announcement_title">"Ajout des espaces"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-hr/translations.xml b/features/announcement/impl/src/main/res/values-hr/translations.xml
deleted file mode 100644
index e78f29f19a..0000000000
--- a/features/announcement/impl/src/main/res/values-hr/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Pregledajte prostore koje ste stvorili ili kojima ste se pridružili"</string>
-  <string name="screen_space_announcement_item2">"Prihvatite ili odbijte pozivnice za prostore"</string>
-  <string name="screen_space_announcement_item3">"Otkrijte sve sobe kojima se možete pridružiti u svojim prostorima"</string>
-  <string name="screen_space_announcement_item4">"Pridružite se javnim prostorima"</string>
-  <string name="screen_space_announcement_item5">"Napustite sve prostore kojima ste se pridružili"</string>
-  <string name="screen_space_announcement_notice">"Uskoro stiže filtriranje i stvaranje prostora te upravljanje njima."</string>
-  <string name="screen_space_announcement_subtitle">"Dobrodošli u beta inačicu prostora! S ovom prvom inačicom možete:"</string>
-  <string name="screen_space_announcement_title">"Predstavljamo prostore"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-hu/translations.xml b/features/announcement/impl/src/main/res/values-hu/translations.xml
deleted file mode 100644
index b09f70419b..0000000000
--- a/features/announcement/impl/src/main/res/values-hu/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Az Ön által létrehozott vagy csatlakozott térek megtekintése"</string>
-  <string name="screen_space_announcement_item2">"A meghívások elfogadására vagy elutasítására a terekhez"</string>
-  <string name="screen_space_announcement_item3">"Szobák felfedezése a terekben, amelyekhez csatlakozhat"</string>
-  <string name="screen_space_announcement_item4">"Csatlakozás nyilvános terekhez"</string>
-  <string name="screen_space_announcement_item5">"Terek elhagyása"</string>
-  <string name="screen_space_announcement_notice">"Terek szűrése, készítése és kezelése hamarosan érkezik."</string>
-  <string name="screen_space_announcement_subtitle">"Üdvözöljük a tér béta verziójában! Ezzel az első verzióval a következőket teheti:"</string>
-  <string name="screen_space_announcement_title">"Bemutatkoznak a terek"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-it/translations.xml b/features/announcement/impl/src/main/res/values-it/translations.xml
deleted file mode 100644
index 584ddcdf21..0000000000
--- a/features/announcement/impl/src/main/res/values-it/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Visualizza gli spazi che hai creato o a cui partecipi"</string>
-  <string name="screen_space_announcement_item2">"Accetta o rifiuta gli inviti agli spazi"</string>
-  <string name="screen_space_announcement_item3">"Scopri tutte le stanze a cui puoi partecipare nei tuoi spazi"</string>
-  <string name="screen_space_announcement_item4">"Unisciti agli spazi pubblici"</string>
-  <string name="screen_space_announcement_item5">"Lascia tutti gli spazi a cui ti sei unito"</string>
-  <string name="screen_space_announcement_notice">"A breve saranno disponibili le funzionalità di filtraggio, creazione e gestione degli spazi."</string>
-  <string name="screen_space_announcement_subtitle">"Benvenuti alla versione beta degli Spazi! Con questa prima versione potrete:"</string>
-  <string name="screen_space_announcement_title">"Ti presentiamo gli Spazi"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-ko/translations.xml b/features/announcement/impl/src/main/res/values-ko/translations.xml
deleted file mode 100644
index 3fbf2b953c..0000000000
--- a/features/announcement/impl/src/main/res/values-ko/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"직접 만들거나 참여 중인 스페이스 보기"</string>
-  <string name="screen_space_announcement_item2">"스페이스 초대 수락 또는 거절"</string>
-  <string name="screen_space_announcement_item3">"참여 가능한 스페이스 내 모든 방 탐색"</string>
-  <string name="screen_space_announcement_item4">"공개 스페이스 참여"</string>
-  <string name="screen_space_announcement_item5">"참여 중인 스페이스 나가기"</string>
-  <string name="screen_space_announcement_notice">"스페이스 필터링, 생성 및 관리 기능이 곧 추가될 예정입니다."</string>
-  <string name="screen_space_announcement_subtitle">"스페이스 베타 버전에 오신 것을 환영합니다! 이번 첫 번째 버전에서는 다음과 같은 기능을 이용하실 수 있습니다.:"</string>
-  <string name="screen_space_announcement_title">"스페이스 소개"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-nb/translations.xml b/features/announcement/impl/src/main/res/values-nb/translations.xml
deleted file mode 100644
index 553ff9f997..0000000000
--- a/features/announcement/impl/src/main/res/values-nb/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Se områder du har opprettet eller blitt med i"</string>
-  <string name="screen_space_announcement_item2">"Godta eller avslå invitasjoner til områder"</string>
-  <string name="screen_space_announcement_item3">"Oppdag alle rom du kan bli med i i dine områder"</string>
-  <string name="screen_space_announcement_item4">"Bli med i offentlige områder"</string>
-  <string name="screen_space_announcement_item5">"Forlat områder du har blitt med i"</string>
-  <string name="screen_space_announcement_notice">"Oppretting, filtrering og administrasjon av områder kommer snart."</string>
-  <string name="screen_space_announcement_subtitle">"Velkommen til betaversjonen av Områder! Med denne første versjonen kan du:"</string>
-  <string name="screen_space_announcement_title">"Vi introduserer Områder"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-pl/translations.xml b/features/announcement/impl/src/main/res/values-pl/translations.xml
deleted file mode 100644
index 4308bdd81d..0000000000
--- a/features/announcement/impl/src/main/res/values-pl/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Wyświetlić przestrzenie, które stworzyłeś lub do których dołączyłeś"</string>
-  <string name="screen_space_announcement_item2">"Akceptować lub odrzucać zaproszenia"</string>
-  <string name="screen_space_announcement_item3">"Odkrywać wszystkie pokoje, do których możesz dołączyć w swoich przestrzeniach"</string>
-  <string name="screen_space_announcement_item4">"Dołączać do przestrzeni publicznych"</string>
-  <string name="screen_space_announcement_item5">"Opuszczać jakąkolwiek przestrzeń, do której dołączyłeś"</string>
-  <string name="screen_space_announcement_notice">"Filtrowanie, tworzenie i zarządzanie przestrzeniami pojawi się wkrótce."</string>
-  <string name="screen_space_announcement_subtitle">"Witamy w wersji beta przestrzeni! W tej wersji możesz:"</string>
-  <string name="screen_space_announcement_title">"Przedstawiamy przestrzenie"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml b/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml
deleted file mode 100644
index 32a9bf85af..0000000000
--- a/features/announcement/impl/src/main/res/values-pt-rBR/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Visualizar espaços que criou ou entrou"</string>
-  <string name="screen_space_announcement_item2">"Aceitar ou recusar convites aos espaços"</string>
-  <string name="screen_space_announcement_item3">"Descobrir quaisquer salas que você pode entrar nos espaços"</string>
-  <string name="screen_space_announcement_item4">"Entrar espaços públicos"</string>
-  <string name="screen_space_announcement_item5">"Sair de quaisquer espaços que entrou"</string>
-  <string name="screen_space_announcement_notice">"Filtrar, criar, e gerenciar espaços virão em breve."</string>
-  <string name="screen_space_announcement_subtitle">"Boas-vindas à versão beta dos Espaços! Com essa primeira versão, você pode:"</string>
-  <string name="screen_space_announcement_title">"Apresentando Espaços"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-pt/translations.xml b/features/announcement/impl/src/main/res/values-pt/translations.xml
deleted file mode 100644
index 744ac74bd3..0000000000
--- a/features/announcement/impl/src/main/res/values-pt/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Ver espaços que criaste ou nos quais entraste"</string>
-  <string name="screen_space_announcement_item2">"Aceitar ou recusar convites para espaços"</string>
-  <string name="screen_space_announcement_item3">"Descobrir todas as salas dos seus espaços nas quais podes entrar"</string>
-  <string name="screen_space_announcement_item4">"Entrar em espaços públicos"</string>
-  <string name="screen_space_announcement_item5">"Deixar todos os espaços em que entraste"</string>
-  <string name="screen_space_announcement_notice">"Em breve, será possível filtrar, criar e gerir espaços."</string>
-  <string name="screen_space_announcement_subtitle">"Eis a versão beta dos Espaços! Nesta primeira versão, podes:"</string>
-  <string name="screen_space_announcement_title">"Apresentamos os Espaços"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-ro/translations.xml b/features/announcement/impl/src/main/res/values-ro/translations.xml
deleted file mode 100644
index 716f1faeb2..0000000000
--- a/features/announcement/impl/src/main/res/values-ro/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Vizualizați spațiile pe care le-ați creat sau la care v-ați alăturat"</string>
-  <string name="screen_space_announcement_item2">"Acceptați sau refuzați invitațiile la spații"</string>
-  <string name="screen_space_announcement_item3">"Descoperiți toate camerele la care vă puteți alătura în spațiile dumneavoastră."</string>
-  <string name="screen_space_announcement_item4">"Alăturați-vă spațiilor publice"</string>
-  <string name="screen_space_announcement_item5">"Părăsiți spațiile la care v-ați alăturat."</string>
-  <string name="screen_space_announcement_notice">"Filtrarea, crearea și gestionarea spațiilor vor fi disponibile în curând."</string>
-  <string name="screen_space_announcement_subtitle">"Bun venit la versiunea beta a Spațiilor! Cu această primă versiune puteți:"</string>
-  <string name="screen_space_announcement_title">"Vă prezentăm Spații"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-ru/translations.xml b/features/announcement/impl/src/main/res/values-ru/translations.xml
deleted file mode 100644
index 46d005c8cd..0000000000
--- a/features/announcement/impl/src/main/res/values-ru/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Просматривать пространства, которые вы создали или к которым присоединились"</string>
-  <string name="screen_space_announcement_item2">"Принимать или отклонять приглашения в пространства"</string>
-  <string name="screen_space_announcement_item3">"Находить все комнаты, к которым можно присоединиться в ваших пространствах"</string>
-  <string name="screen_space_announcement_item4">"Присоединяться к публичным пространствам"</string>
-  <string name="screen_space_announcement_item5">"Покидать все пространства, к которым вы присоединились"</string>
-  <string name="screen_space_announcement_notice">"Фильтровать, создавать пространства и управлять ими можно будет позже."</string>
-  <string name="screen_space_announcement_subtitle">"Добро пожаловать в бета-версию пространств! Сейчас вы сможете:"</string>
-  <string name="screen_space_announcement_title">"Представляем пространства"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-sk/translations.xml b/features/announcement/impl/src/main/res/values-sk/translations.xml
deleted file mode 100644
index 0b305499a7..0000000000
--- a/features/announcement/impl/src/main/res/values-sk/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Zobraziť priestory, ktoré ste vytvorili alebo ku ktorým ste sa pripojili"</string>
-  <string name="screen_space_announcement_item2">"Prijímať alebo odmietať pozvánky do priestorov"</string>
-  <string name="screen_space_announcement_item3">"Objaviť všetky miestnosti, do ktorých sa môžete pripojiť vo svojich priestoroch"</string>
-  <string name="screen_space_announcement_item4">"Pripojiť sa k verejnému priestoru"</string>
-  <string name="screen_space_announcement_item5">"Opustiť akékoľvek priestory, ku ktorým ste sa pridali"</string>
-  <string name="screen_space_announcement_notice">"Filtrovanie, vytváranie a správa priestorov bude čoskoro k dispozícii."</string>
-  <string name="screen_space_announcement_subtitle">"Vitajte v beta verzii priestorov! S touto prvou verziou môžete:"</string>
-  <string name="screen_space_announcement_title">"Predstavujeme priestory"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-tr/translations.xml b/features/announcement/impl/src/main/res/values-tr/translations.xml
deleted file mode 100644
index 8551dbb02b..0000000000
--- a/features/announcement/impl/src/main/res/values-tr/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Oluşturduğunuz veya katıldığınız alanları görüntüleyin"</string>
-  <string name="screen_space_announcement_item2">"Alan davetlerini kabul edin veya reddedin"</string>
-  <string name="screen_space_announcement_item3">"Alanlarınızdaki katılabileceğiniz odaları keşfedin"</string>
-  <string name="screen_space_announcement_item4">"Herkese açık alanlara katılın"</string>
-  <string name="screen_space_announcement_item5">"Katıldığınız alanlardan ayrılın"</string>
-  <string name="screen_space_announcement_notice">"Alanları filtreleme, oluşturma ve yönetme yakında geliyor."</string>
-  <string name="screen_space_announcement_subtitle">"Alanlar’ın beta sürümüne hoş geldiniz! Bu ilk sürümle şunları yapabilirsiniz:"</string>
-  <string name="screen_space_announcement_title">"Alanlar ile tanışın"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-uk/translations.xml b/features/announcement/impl/src/main/res/values-uk/translations.xml
deleted file mode 100644
index de3c1b0324..0000000000
--- a/features/announcement/impl/src/main/res/values-uk/translations.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item3">"Знаходьте у своїх просторах кімнати, до яких можна приєднатися"</string>
-  <string name="screen_space_announcement_notice">"Фільтрування, створення та керування просторами стане доступним найближчим часом."</string>
-  <string name="screen_space_announcement_subtitle">"Ласкаво просимо до бета-версії Просторів! У цій першій версії ви можете:"</string>
-  <string name="screen_space_announcement_title">"Представляємо Простори"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-uz/translations.xml b/features/announcement/impl/src/main/res/values-uz/translations.xml
deleted file mode 100644
index 12356160b8..0000000000
--- a/features/announcement/impl/src/main/res/values-uz/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"Siz yaratgan yoki qo‘shilgan maydonlarni ko‘rish"</string>
-  <string name="screen_space_announcement_item2">"Maydonlarga takliflarni qabul qilish yoki rad etish"</string>
-  <string name="screen_space_announcement_item3">"Maydonlaringizga qo‘shilishingiz mumkin bo‘lgan xonalarni kashf eting"</string>
-  <string name="screen_space_announcement_item4">"Jamoat maydonlariga qo‘shilish"</string>
-  <string name="screen_space_announcement_item5">"Kirgan maydonlaringizni tark eting"</string>
-  <string name="screen_space_announcement_notice">"Maydonlarni filtrlash, yaratish va boshqarish tez orada amalga oshiriladi."</string>
-  <string name="screen_space_announcement_subtitle">"Maydonlar beta versiyasiga xush kelibsiz! Bu birinchi versiya bilan siz:"</string>
-  <string name="screen_space_announcement_title">"Maydonlar bilan tanishish"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-zh-rTW/translations.xml b/features/announcement/impl/src/main/res/values-zh-rTW/translations.xml
deleted file mode 100644
index a5b82752bc..0000000000
--- a/features/announcement/impl/src/main/res/values-zh-rTW/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"檢視您建立或加入的空間"</string>
-  <string name="screen_space_announcement_item2">"接受或拒絕空間邀請"</string>
-  <string name="screen_space_announcement_item3">"探索空間內您可以加入的任何聊天室"</string>
-  <string name="screen_space_announcement_item4">"加入公開空間"</string>
-  <string name="screen_space_announcement_item5">"離開任何您已加入的空間"</string>
-  <string name="screen_space_announcement_notice">"篩選、建立與管理空間功能即將推出。"</string>
-  <string name="screen_space_announcement_subtitle">"歡迎使用空間的測試版！此初始版本可讓您："</string>
-  <string name="screen_space_announcement_title">"介紹空間"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values-zh/translations.xml b/features/announcement/impl/src/main/res/values-zh/translations.xml
deleted file mode 100644
index e01e63b2ae..0000000000
--- a/features/announcement/impl/src/main/res/values-zh/translations.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"查看您创建或加入的空间"</string>
-  <string name="screen_space_announcement_item2">"接受或拒绝空间邀请"</string>
-  <string name="screen_space_announcement_item3">"发现您可以加入空间的所有房间"</string>
-  <string name="screen_space_announcement_item4">"加入公共空间"</string>
-  <string name="screen_space_announcement_item5">"离开你加入的所有空间"</string>
-  <string name="screen_space_announcement_notice">"筛选、创建及管理空间功能即将上线。"</string>
-  <string name="screen_space_announcement_subtitle">"欢迎使用 Spaces 测试版！使用首个版本，您可以："</string>
-  <string name="screen_space_announcement_title">"Spaces 简介"</string>
-</resources>
diff --git a/features/announcement/impl/src/main/res/values/localazy.xml b/features/announcement/impl/src/main/res/values/localazy.xml
deleted file mode 100644
index 5e7b8a6713..0000000000
--- a/features/announcement/impl/src/main/res/values/localazy.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_space_announcement_item1">"View spaces you\'ve created or joined"</string>
-  <string name="screen_space_announcement_item2">"Accept or decline invites to spaces"</string>
-  <string name="screen_space_announcement_item3">"Discover any rooms you can join in your spaces"</string>
-  <string name="screen_space_announcement_item4">"Join public spaces"</string>
-  <string name="screen_space_announcement_item5">"Leave any spaces you’ve joined"</string>
-  <string name="screen_space_announcement_notice">"Filtering, creating and managing spaces is coming soon."</string>
-  <string name="screen_space_announcement_subtitle">"Welcome to the beta version of Spaces! With this first version you can:"</string>
-  <string name="screen_space_announcement_title">"Introducing Spaces"</string>
-</resources>
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenterTest.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenterTest.kt
index 18deb8b2fd..c37f49fad8 100644
--- a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenterTest.kt
+++ b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenterTest.kt
@@ -14,6 +14,7 @@ import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
 import io.element.android.tests.testutils.test
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -23,25 +24,47 @@ class AnnouncementPresenterTest {
         val presenter = createAnnouncementPresenter()
         presenter.test {
             val state = awaitItem()
-            assertThat(state.showSpaceAnnouncement).isFalse()
+            assertThat(state.announcement).isNull()
         }
     }
 
     @Test
-    fun `present - showSpaceAnnouncement value depends on the value in the store`() = runTest {
+    fun `present - showFullscreen value depends on the value in the store`() = runTest {
         val store = InMemoryAnnouncementStore()
         val presenter = createAnnouncementPresenter(
             announcementStore = store,
         )
         presenter.test {
             val state = awaitItem()
-            assertThat(state.showSpaceAnnouncement).isFalse()
-            store.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
+            assertThat(state.announcement).isNull()
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Show)
             val updatedState = awaitItem()
-            assertThat(updatedState.showSpaceAnnouncement).isTrue()
-            store.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
+            assertThat(updatedState.announcement).isEqualTo(Announcement.Fullscreen.Space)
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Shown)
             val finalState = awaitItem()
-            assertThat(finalState.showSpaceAnnouncement).isFalse()
+            assertThat(finalState.announcement).isNull()
+        }
+    }
+
+    @Test
+    fun `present - continue event will mark the announcement as Shown`() = runTest {
+        val store = InMemoryAnnouncementStore()
+        val presenter = createAnnouncementPresenter(
+            announcementStore = store,
+        )
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.announcement).isNull()
+            store.setAnnouncementStatus(Announcement.Fullscreen.Space, AnnouncementStatus.Show)
+            val statusShow = store.announcementStatusFlow(Announcement.Fullscreen.Space).first()
+            assertThat(statusShow).isEqualTo(AnnouncementStatus.Show)
+            val updatedState = awaitItem()
+            assertThat(updatedState.announcement).isEqualTo(Announcement.Fullscreen.Space)
+            updatedState.eventSink(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+            val statusShown = store.announcementStatusFlow(Announcement.Fullscreen.Space).first()
+            assertThat(statusShown).isEqualTo(AnnouncementStatus.Shown)
+            val finalState = awaitItem()
+            assertThat(finalState.announcement).isNull()
         }
     }
 }
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt
index e16619129c..c72d147c1d 100644
--- a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt
+++ b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt
@@ -11,31 +11,28 @@ package io.element.android.features.announcement.impl
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
-import io.element.android.features.announcement.impl.spaces.aSpaceAnnouncementState
 import io.element.android.features.announcement.impl.store.AnnouncementStatus
 import io.element.android.features.announcement.impl.store.AnnouncementStore
 import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
-import io.element.android.libraries.architecture.Presenter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class DefaultAnnouncementServiceTest {
     @Test
-    fun `when showing Space announcement, space announcement is set to show only if it was never shown`() = runTest {
+    fun `when showing Fullscreen announcement, Fullscreen announcement is set to show only if it was never shown`() = runTest {
         val announcementStore = InMemoryAnnouncementStore()
         val sut = createDefaultAnnouncementService(
             announcementStore = announcementStore,
         )
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
-        sut.showAnnouncement(Announcement.Space)
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Show)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
+        sut.showAnnouncement(Announcement.Fullscreen.Space)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.Show)
         // Simulate user close the announcement
-        sut.onAnnouncementDismissed(Announcement.Space)
+        sut.onAnnouncementDismissed(Announcement.Fullscreen.Space)
         // Entering again the space tab should not change the value
-        sut.showAnnouncement(Announcement.Space)
-        assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Shown)
+        sut.showAnnouncement(Announcement.Fullscreen.Space)
+        assertThat(announcementStore.announcementStatusFlow(Announcement.Fullscreen.Space).first()).isEqualTo(AnnouncementStatus.Shown)
     }
 
     @Test
@@ -62,11 +59,7 @@ class DefaultAnnouncementServiceTest {
         )
         sut.announcementsToShowFlow().test {
             assertThat(awaitItem()).isEmpty()
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Show)
-            assertThat(awaitItem()).containsExactly(Announcement.Space)
             announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Show)
-            assertThat(awaitItem()).containsExactly(Announcement.Space, Announcement.NewNotificationSound)
-            announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStatus.Shown)
             assertThat(awaitItem()).containsExactly(Announcement.NewNotificationSound)
             announcementStore.setAnnouncementStatus(Announcement.NewNotificationSound, AnnouncementStatus.Shown)
             assertThat(awaitItem()).isEmpty()
@@ -75,11 +68,9 @@ class DefaultAnnouncementServiceTest {
 
     private fun createDefaultAnnouncementService(
         announcementStore: AnnouncementStore = InMemoryAnnouncementStore(),
-        announcementPresenter: Presenter<AnnouncementState> = Presenter { anAnnouncementState() },
-        spaceAnnouncementPresenter: Presenter<SpaceAnnouncementState> = Presenter { aSpaceAnnouncementState() },
+        announcementPresenter: AnnouncementPresenter = AnnouncementPresenter(announcementStore),
     ) = DefaultAnnouncementService(
         announcementStore = announcementStore,
         announcementPresenter = announcementPresenter,
-        spaceAnnouncementPresenter = spaceAnnouncementPresenter,
     )
 }
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementViewTest.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementViewTest.kt
new file mode 100644
index 0000000000..e049935212
--- /dev/null
+++ b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/fullscreen/FullscreenAnnouncementViewTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.features.announcement.impl.fullscreen
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.announcement.api.Announcement
+import io.element.android.features.announcement.impl.AnnouncementEvent
+import io.element.android.features.announcement.impl.AnnouncementState
+import io.element.android.features.announcement.impl.anAnnouncementState
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+
+class FullscreenAnnouncementViewTest : RobolectricTest() {
+    @Test
+    fun `clicking on back sends a AnnouncementEvent`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AnnouncementEvent>()
+        setFullscreenAnnouncementView(
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+                eventSink = eventsRecorder,
+            ),
+        )
+        pressBackKey()
+        eventsRecorder.assertSingle(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+    }
+
+    @Test
+    fun `clicking on Continue sends a AnnouncementEvent`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AnnouncementEvent>()
+        setFullscreenAnnouncementView(
+            anAnnouncementState(
+                announcement = Announcement.Fullscreen.Space,
+                eventSink = eventsRecorder,
+            ),
+        )
+        clickOn(CommonStrings.action_continue)
+        eventsRecorder.assertSingle(AnnouncementEvent.Continue(Announcement.Fullscreen.Space))
+    }
+}
+
+private fun AndroidComposeUiTest<ComponentActivity>.setFullscreenAnnouncementView(
+    state: AnnouncementState,
+) {
+    setContent {
+        FullscreenAnnouncementView(
+            state = state,
+        )
+    }
+}
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenterTest.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenterTest.kt
deleted file mode 100644
index 672f677407..0000000000
--- a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenterTest.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.impl.store.AnnouncementStatus
-import io.element.android.features.announcement.impl.store.AnnouncementStore
-import io.element.android.features.announcement.impl.store.InMemoryAnnouncementStore
-import io.element.android.tests.testutils.test
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-
-class SpaceAnnouncementPresenterTest {
-    @Test
-    fun `present - when user continues, the store is updated`() = runTest {
-        val store = InMemoryAnnouncementStore()
-        val presenter = createSpaceAnnouncementPresenter(
-            announcementStore = store,
-        )
-        presenter.test {
-            assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.NeverShown)
-            val state = awaitItem()
-            state.eventSink(SpaceAnnouncementEvents.Continue)
-            assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStatus.Shown)
-        }
-    }
-}
-
-private fun createSpaceAnnouncementPresenter(
-    announcementStore: AnnouncementStore = InMemoryAnnouncementStore(),
-) = SpaceAnnouncementPresenter(
-    announcementStore = announcementStore,
-)
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementViewTest.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementViewTest.kt
deleted file mode 100644
index ad3d83f1b5..0000000000
--- a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementViewTest.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.announcement.impl.spaces
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.tests.testutils.EventsRecorder
-import io.element.android.tests.testutils.clickOn
-import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class SpaceAnnouncementViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun `clicking on back sends a SpaceAnnouncementEvents`() {
-        val eventsRecorder = EventsRecorder<SpaceAnnouncementEvents>()
-        rule.setSpaceAnnouncementView(
-            aSpaceAnnouncementState(
-                eventSink = eventsRecorder,
-            ),
-        )
-        rule.pressBackKey()
-        eventsRecorder.assertSingle(SpaceAnnouncementEvents.Continue)
-    }
-
-    @Test
-    fun `clicking on Continue sends a SpaceAnnouncementEvents`() {
-        val eventsRecorder = EventsRecorder<SpaceAnnouncementEvents>()
-        rule.setSpaceAnnouncementView(
-            aSpaceAnnouncementState(
-                eventSink = eventsRecorder,
-            ),
-        )
-        rule.clickOn(CommonStrings.action_continue)
-        eventsRecorder.assertSingle(SpaceAnnouncementEvents.Continue)
-    }
-}
-
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpaceAnnouncementView(
-    state: SpaceAnnouncementState,
-) {
-    setContent {
-        SpaceAnnouncementView(
-            state = state,
-        )
-    }
-}
diff --git a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt
index ab3e85124f..ed6dfec850 100644
--- a/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt
+++ b/features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt
@@ -14,10 +14,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 
 class InMemoryAnnouncementStore(
-    initialSpaceAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
+    initialFullscreenAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
     initialNewNotificationSoundAnnouncementStatus: AnnouncementStatus = AnnouncementStatus.NeverShown,
 ) : AnnouncementStore {
-    private val spaceAnnouncement = MutableStateFlow(initialSpaceAnnouncementStatus)
+    private val fullScreenAnnouncement = MutableStateFlow(initialFullscreenAnnouncementStatus)
     private val newNotificationSoundAnnouncement = MutableStateFlow(initialNewNotificationSoundAnnouncementStatus)
 
     override suspend fun setAnnouncementStatus(announcement: Announcement, status: AnnouncementStatus) {
@@ -29,12 +29,12 @@ class InMemoryAnnouncementStore(
     }
 
     override suspend fun reset() {
-        spaceAnnouncement.value = AnnouncementStatus.NeverShown
+        fullScreenAnnouncement.value = AnnouncementStatus.NeverShown
         newNotificationSoundAnnouncement.value = AnnouncementStatus.NeverShown
     }
 
     private fun Announcement.toMutableStateFlow() = when (this) {
-        Announcement.Space -> spaceAnnouncement
+        is Announcement.Fullscreen -> fullScreenAnnouncement
         Announcement.NewNotificationSound -> newNotificationSoundAnnouncement
     }
 }
diff --git a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallData.kt
similarity index 50%
rename from features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt
rename to features/call/api/src/main/kotlin/io/element/android/features/call/api/CallData.kt
index 4b09813418..c1dcf573c6 100644
--- a/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallType.kt
+++ b/features/call/api/src/main/kotlin/io/element/android/features/call/api/CallData.kt
@@ -14,22 +14,9 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.parcelize.Parcelize
 
-sealed interface CallType : NodeInputs, Parcelable {
-    @Parcelize
-    data class ExternalUrl(val url: String) : CallType {
-        override fun toString(): String {
-            return "ExternalUrl"
-        }
-    }
-
-    @Parcelize
-    data class RoomCall(
-        val sessionId: SessionId,
-        val roomId: RoomId,
-        val isAudioCall: Boolean
-    ) : CallType {
-        override fun toString(): String {
-            return "RoomCall(sessionId=$sessionId, roomId=$roomId, isAudioCall=$isAudioCall)"
-        }
-    }
-}
+@Parcelize
+data class CallData(
+    val sessionId: SessionId,
+    val roomId: RoomId,
+    val isAudioCall: Boolean
+) : NodeInputs, Parcelable
diff --git a/features/call/api/src/main/kotlin/io/element/android/features/call/api/ElementCallEntryPoint.kt b/features/call/api/src/main/kotlin/io/element/android/features/call/api/ElementCallEntryPoint.kt
index caa557f4de..2976635ee2 100644
--- a/features/call/api/src/main/kotlin/io/element/android/features/call/api/ElementCallEntryPoint.kt
+++ b/features/call/api/src/main/kotlin/io/element/android/features/call/api/ElementCallEntryPoint.kt
@@ -17,13 +17,13 @@ import io.element.android.libraries.matrix.api.core.UserId
 interface ElementCallEntryPoint {
     /**
      * Start a call of the given type.
-     * @param callType The type of call to start.
+     * @param callData The data of call to start.
      */
-    fun startCall(callType: CallType)
+    fun startCall(callData: CallData)
 
     /**
      * Handle an incoming call.
-     * @param callType The type of call.
+     * @param callData The data of call.
      * @param eventId The event id of the event that started the call.
      * @param senderId The user id of the sender of the event that started the call.
      * @param roomName The name of the room the call is in.
@@ -35,7 +35,7 @@ interface ElementCallEntryPoint {
      * @param textContent The text content of the notification. If null the default content from the system will be used.
      */
     suspend fun handleIncomingCall(
-        callType: CallType.RoomCall,
+        callData: CallData,
         eventId: EventId,
         senderId: UserId,
         roomName: String?,
diff --git a/features/call/impl/build.gradle.kts b/features/call/impl/build.gradle.kts
index e77c09e19a..d01e31451e 100644
--- a/features/call/impl/build.gradle.kts
+++ b/features/call/impl/build.gradle.kts
@@ -73,7 +73,7 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
-    implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.network)
     implementation(projects.libraries.preferences.api)
@@ -84,7 +84,6 @@ dependencies {
     implementation(projects.services.toolbox.api)
     implementation(libs.androidx.webkit)
     implementation(libs.coil.compose)
-    implementation(libs.network.retrofit)
     implementation(libs.serialization.json)
     implementation(libs.element.call.embedded)
     api(projects.features.call.api)
diff --git a/features/call/impl/src/main/AndroidManifest.xml b/features/call/impl/src/main/AndroidManifest.xml
index daf1a910c9..f338b32b9e 100644
--- a/features/call/impl/src/main/AndroidManifest.xml
+++ b/features/call/impl/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -30,44 +31,10 @@
         <activity
             android:name=".ui.ElementCallActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
-            android:exported="true"
             android:label="@string/element_call"
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true"
-            android:taskAffinity="io.element.android.features.call">
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-
-                <!-- Matching asset file: https://call.element.io/.well-known/assetlinks.json -->
-                <data android:host="call.element.io" />
-            </intent-filter>
-            <!-- Custom scheme to handle urls from other domains in the format: element://call?url=https%3A%2F%2Felement.io -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="element" />
-                <data android:host="call" />
-            </intent-filter>
-            <!-- Custom scheme to handle urls from other domains in the format: io.element.call:/?url=https%3A%2F%2Felement.io -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="io.element.call" />
-            </intent-filter>
-
-        </activity>
+            android:taskAffinity="io.element.android.features.call" />
 
         <activity
             android:name=".ui.IncomingCallActivity"
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/DefaultElementCallEntryPoint.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/DefaultElementCallEntryPoint.kt
index 6006e2aff4..532db3305d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/DefaultElementCallEntryPoint.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/DefaultElementCallEntryPoint.kt
@@ -11,7 +11,7 @@ package io.element.android.features.call.impl
 import android.content.Context
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCallManager
@@ -30,12 +30,12 @@ class DefaultElementCallEntryPoint(
         const val REQUEST_CODE = 2255
     }
 
-    override fun startCall(callType: CallType) {
-        context.startActivity(IntentProvider.createIntent(context, callType))
+    override fun startCall(callData: CallData) {
+        context.startActivity(IntentProvider.createIntent(context, callData))
     }
 
     override suspend fun handleIncomingCall(
-        callType: CallType.RoomCall,
+        callData: CallData,
         eventId: EventId,
         senderId: UserId,
         roomName: String?,
@@ -47,8 +47,8 @@ class DefaultElementCallEntryPoint(
         textContent: String?,
     ) {
         val incomingCallNotificationData = CallNotificationData(
-            sessionId = callType.sessionId,
-            roomId = callType.roomId,
+            sessionId = callData.sessionId,
+            roomId = callData.roomId,
             eventId = eventId,
             senderId = senderId,
             roomName = roomName,
@@ -58,7 +58,7 @@ class DefaultElementCallEntryPoint(
             expirationTimestamp = expirationTimestamp,
             notificationChannelId = notificationChannelId,
             textContent = textContent,
-            audioOnly = callType.isAudioCall
+            audioOnly = callData.isAudioCall,
         )
         activeCallManager.registerIncomingCall(notificationData = incomingCallNotificationData)
     }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt
index 88ec94be10..647f5ebcfc 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/notifications/RingingCallNotificationCreator.kt
@@ -18,7 +18,7 @@ import androidx.core.app.PendingIntentCompat
 import androidx.core.app.Person
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.ElementCallConfig
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.receivers.DeclineCallBroadcastReceiver
 import io.element.android.features.call.impl.ui.IncomingCallActivity
 import io.element.android.features.call.impl.utils.IntentProvider
@@ -89,7 +89,14 @@ class RingingCallNotificationCreator(
             .setImportant(true)
             .build()
 
-        val answerIntent = IntentProvider.getPendingIntent(context, CallType.RoomCall(sessionId, roomId, isAudioCall = audioOnly))
+        val answerIntent = IntentProvider.getPendingIntent(
+            context,
+            CallData(
+                sessionId = sessionId,
+                roomId = roomId,
+                isAudioCall = audioOnly,
+            ),
+        )
         val notificationData = CallNotificationData(
             sessionId = sessionId,
             roomId = roomId,
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvents.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvent.kt
similarity index 75%
rename from features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvents.kt
rename to features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvent.kt
index 9522d44b22..1af13e148e 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvents.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureEvent.kt
@@ -10,8 +10,8 @@ package io.element.android.features.call.impl.pip
 
 import io.element.android.features.call.impl.utils.PipController
 
-sealed interface PictureInPictureEvents {
-    data class SetPipController(val pipController: PipController) : PictureInPictureEvents
-    data object EnterPictureInPicture : PictureInPictureEvents
-    data class OnPictureInPictureModeChanged(val isInPip: Boolean) : PictureInPictureEvents
+sealed interface PictureInPictureEvent {
+    data class SetPipController(val pipController: PipController) : PictureInPictureEvent
+    data object EnterPictureInPicture : PictureInPictureEvent
+    data class OnPictureInPictureModeChanged(val isInPip: Boolean) : PictureInPictureEvent
 }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt
index 5125b464dc..2dc16d7f26 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenter.kt
@@ -36,17 +36,17 @@ class PictureInPicturePresenter(
         var isInPictureInPicture by remember { mutableStateOf(false) }
         var pipController by remember { mutableStateOf<PipController?>(null) }
 
-        fun handleEvent(event: PictureInPictureEvents) {
+        fun handleEvent(event: PictureInPictureEvent) {
             when (event) {
-                is PictureInPictureEvents.SetPipController -> {
+                is PictureInPictureEvent.SetPipController -> {
                     pipController = event.pipController
                 }
-                PictureInPictureEvents.EnterPictureInPicture -> {
+                PictureInPictureEvent.EnterPictureInPicture -> {
                     coroutineScope.launch {
                         switchToPip(pipController)
                     }
                 }
-                is PictureInPictureEvents.OnPictureInPictureModeChanged -> {
+                is PictureInPictureEvent.OnPictureInPictureModeChanged -> {
                     Timber.tag(loggerTag.value).d("onPictureInPictureModeChanged: ${event.isInPip}")
                     isInPictureInPicture = event.isInPip
                     if (event.isInPip) {
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureState.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureState.kt
index b1fef4f28b..108589edb9 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureState.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureState.kt
@@ -11,5 +11,5 @@ package io.element.android.features.call.impl.pip
 data class PictureInPictureState(
     val supportPip: Boolean,
     val isInPictureInPicture: Boolean,
-    val eventSink: (PictureInPictureEvents) -> Unit,
+    val eventSink: (PictureInPictureEvent) -> Unit,
 )
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureStateProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureStateProvider.kt
index 6324820eec..f4a78294b6 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureStateProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/pip/PictureInPictureStateProvider.kt
@@ -11,7 +11,7 @@ package io.element.android.features.call.impl.pip
 fun aPictureInPictureState(
     supportPip: Boolean = false,
     isInPictureInPicture: Boolean = false,
-    eventSink: (PictureInPictureEvents) -> Unit = {},
+    eventSink: (PictureInPictureEvent) -> Unit = {},
 ): PictureInPictureState {
     return PictureInPictureState(
         supportPip = supportPip,
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt
index 179e6c2b22..bf27e8d39d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/receivers/DeclineCallBroadcastReceiver.kt
@@ -13,7 +13,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.IntentCompat
 import dev.zacsweers.metro.Inject
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.di.CallBindings
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCallManager
@@ -42,7 +42,7 @@ class DeclineCallBroadcastReceiver : BroadcastReceiver() {
         context.bindings<CallBindings>().inject(this)
         appCoroutineScope.launch {
             activeCallManager.hangUpCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = notificationData.sessionId,
                     roomId = notificationData.roomId,
                     isAudioCall = notificationData.audioOnly
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallNotificationDataProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallNotificationDataProvider.kt
index 3a51a014df..9e551b3e1b 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallNotificationDataProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallNotificationDataProvider.kt
@@ -9,6 +9,8 @@ package io.element.android.features.call.impl.ui
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.call.impl.notifications.CallNotificationData
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -34,8 +36,8 @@ internal fun aCallNotificationData(
         roomId = RoomId("!1234:matrix.org"),
         eventId = EventId("\$asdadadsad:matrix.org"),
         senderId = UserId("@bob:matrix.org"),
-        roomName = "A room",
-        senderName = "Bob",
+        roomName = ROOM_NAME,
+        senderName = USER_NAME_BOB,
         avatarUrl = null,
         notificationChannelId = "incoming_call",
         timestamp = 0L,
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenBackPressPolicy.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenBackPressPolicy.kt
new file mode 100644
index 0000000000..cd47cd8bb1
--- /dev/null
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenBackPressPolicy.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.call.impl.ui
+internal sealed interface CallScreenBackPressAction {
+    data object DispatchEscapeToWebView : CallScreenBackPressAction
+    data object EnterPictureInPicture : CallScreenBackPressAction
+}
+
+internal object CallScreenBackPressPolicy {
+    fun resolve(
+        supportPip: Boolean,
+        hasWebView: Boolean,
+        fromNative: Boolean,
+    ): CallScreenBackPressAction? {
+        return when {
+            hasWebView && fromNative -> CallScreenBackPressAction.DispatchEscapeToWebView
+            hasWebView && supportPip -> CallScreenBackPressAction.EnterPictureInPicture
+            else -> null
+        }
+    }
+}
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvents.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvent.kt
similarity index 78%
rename from features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvents.kt
rename to features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvent.kt
index 8fbbce896f..357559c3f9 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvents.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenEvent.kt
@@ -10,8 +10,8 @@ package io.element.android.features.call.impl.ui
 
 import io.element.android.features.call.impl.utils.WidgetMessageInterceptor
 
-sealed interface CallScreenEvents {
-    data object Hangup : CallScreenEvents
-    data class SetupMessageChannels(val widgetMessageInterceptor: WidgetMessageInterceptor) : CallScreenEvents
-    data class OnWebViewError(val description: String?) : CallScreenEvents
+sealed interface CallScreenEvent {
+    data object Hangup : CallScreenEvent
+    data class SetupMessageChannels(val widgetMessageInterceptor: WidgetMessageInterceptor) : CallScreenEvent
+    data class OnWebViewError(val description: String?) : CallScreenEvent
 }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
index da2c57c0ac..cc3468a845 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
@@ -22,8 +22,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.data.WidgetMessage
 import io.element.android.features.call.impl.utils.ActiveCallManager
 import io.element.android.features.call.impl.utils.CallWidgetProvider
@@ -52,7 +51,7 @@ import kotlin.time.Duration.Companion.seconds
 
 @AssistedInject
 class CallScreenPresenter(
-    @Assisted private val callType: CallType,
+    @Assisted private val callData: CallData,
     @Assisted private val navigator: CallScreenNavigator,
     private val callWidgetProvider: CallWidgetProvider,
     userAgentProvider: UserAgentProvider,
@@ -69,10 +68,9 @@ class CallScreenPresenter(
 ) : Presenter<CallScreenState> {
     @AssistedFactory
     interface Factory {
-        fun create(callType: CallType, navigator: CallScreenNavigator): CallScreenPresenter
+        fun create(callData: CallData, navigator: CallScreenNavigator): CallScreenPresenter
     }
 
-    private val isInWidgetMode = callType is CallType.RoomCall
     private val userAgent = userAgentProvider.provide()
 
     @Composable
@@ -85,14 +83,14 @@ class CallScreenPresenter(
         var ignoreWebViewError by rememberSaveable { mutableStateOf(false) }
         var webViewError by remember { mutableStateOf<String?>(null) }
         val languageTag = languageTagProvider.provideLanguageTag()
-        val theme = if (ElementTheme.isLightTheme) "light" else "dark"
+        val theme = "dark"
 
         DisposableEffect(Unit) {
             coroutineScope.launch {
                 // Sets the call as joined
-                activeCallManager.joinedCall(callType)
+                activeCallManager.joinedCall(callData)
                 fetchRoomCallUrl(
-                    inputs = callType,
+                    callData = callData,
                     urlState = urlState,
                     callWidgetDriver = callWidgetDriver,
                     languageTag = languageTag,
@@ -100,19 +98,10 @@ class CallScreenPresenter(
                 )
             }
             onDispose {
-                appCoroutineScope.launch { activeCallManager.hangUpCall(callType) }
+                appCoroutineScope.launch { activeCallManager.hangUpCall(callData) }
             }
         }
-
-        when (callType) {
-            is CallType.ExternalUrl -> {
-                // No analytics yet for external calls
-            }
-            is CallType.RoomCall -> {
-                screenTracker.TrackScreen(screen = MobileScreen.ScreenName.RoomCall)
-            }
-        }
-
+        screenTracker.TrackScreen(screen = MobileScreen.ScreenName.RoomCall)
         HandleMatrixClientSyncState()
 
         callWidgetDriver.value?.let { driver ->
@@ -149,25 +138,22 @@ class CallScreenPresenter(
                     .launchIn(this)
             }
 
-            if (callType is CallType.RoomCall) {
-                // Note: For external calls isWidgetLoaded will always be false
-                LaunchedEffect(Unit) {
-                    // Wait for the call to be joined, if it takes too long, we display an error
-                    delay(10.seconds)
+            LaunchedEffect(Unit) {
+                // Wait for the call to be joined, if it takes too long, we display an error
+                delay(10.seconds)
 
-                    if (!isWidgetLoaded) {
-                        Timber.w("The call took too long to load. Displaying an error before exiting.")
+                if (!isWidgetLoaded) {
+                    Timber.w("The call took too long to load. Displaying an error before exiting.")
 
-                        // This will display a simple 'Sorry, an error occurred' dialog and force the user to exit the call
-                        webViewError = ""
-                    }
+                    // This will display a simple 'Sorry, an error occurred' dialog and force the user to exit the call
+                    webViewError = ""
                 }
             }
         }
 
-        fun handleEvent(event: CallScreenEvents) {
+        fun handleEvent(event: CallScreenEvent) {
             when (event) {
-                is CallScreenEvents.Hangup -> {
+                is CallScreenEvent.Hangup -> {
                     val widgetId = callWidgetDriver.value?.id
                     val interceptor = messageInterceptor.value
                     if (widgetId != null && interceptor != null && isWidgetLoaded) {
@@ -187,10 +173,10 @@ class CallScreenPresenter(
                         }
                     }
                 }
-                is CallScreenEvents.SetupMessageChannels -> {
+                is CallScreenEvent.SetupMessageChannels -> {
                     messageInterceptor.value = event.widgetMessageInterceptor
                 }
-                is CallScreenEvents.OnWebViewError -> {
+                is CallScreenEvent.OnWebViewError -> {
                     if (!ignoreWebViewError) {
                         webViewError = event.description.orEmpty()
                     }
@@ -204,37 +190,29 @@ class CallScreenPresenter(
             webViewError = webViewError,
             userAgent = userAgent,
             isCallActive = isWidgetLoaded,
-            isInWidgetMode = isInWidgetMode,
             eventSink = ::handleEvent,
         )
     }
 
     private suspend fun fetchRoomCallUrl(
-        inputs: CallType,
+        callData: CallData,
         urlState: MutableState<AsyncData<String>>,
         callWidgetDriver: MutableState<MatrixWidgetDriver?>,
         languageTag: String?,
         theme: String?,
     ) {
         urlState.runCatchingUpdatingState {
-            when (inputs) {
-                is CallType.ExternalUrl -> {
-                    inputs.url
-                }
-                is CallType.RoomCall -> {
-                    val result = callWidgetProvider.getWidget(
-                        sessionId = inputs.sessionId,
-                        roomId = inputs.roomId,
-                        clientId = UUID.randomUUID().toString(),
-                        isAudioCall = inputs.isAudioCall,
-                        languageTag = languageTag,
-                        theme = theme,
-                    ).getOrThrow()
-                    callWidgetDriver.value = result.driver
-                    Timber.d("Call widget driver initialized for sessionId: ${inputs.sessionId}, roomId: ${inputs.roomId}")
-                    result.url
-                }
-            }
+            val result = callWidgetProvider.getWidget(
+                sessionId = callData.sessionId,
+                roomId = callData.roomId,
+                clientId = UUID.randomUUID().toString(),
+                isAudioCall = callData.isAudioCall,
+                languageTag = languageTag,
+                theme = theme,
+            ).getOrThrow()
+            callWidgetDriver.value = result.driver
+            Timber.d("Call widget driver initialized for sessionId: ${callData.sessionId}, roomId: ${callData.roomId}")
+            result.url
         }
     }
 
@@ -242,12 +220,11 @@ class CallScreenPresenter(
     private fun HandleMatrixClientSyncState() {
         val coroutineScope = rememberCoroutineScope()
         DisposableEffect(Unit) {
-            val roomCallType = callType as? CallType.RoomCall ?: return@DisposableEffect onDispose {}
-            val client = matrixClientsProvider.getOrNull(roomCallType.sessionId) ?: return@DisposableEffect onDispose {
-                Timber.w("No MatrixClient found for sessionId, can't send call notification: ${roomCallType.sessionId}")
+            val client = matrixClientsProvider.getOrNull(callData.sessionId) ?: return@DisposableEffect onDispose {
+                Timber.w("No MatrixClient found for sessionId, can't send call notification: ${callData.sessionId}")
             }
             coroutineScope.launch {
-                Timber.d("Observing sync state in-call for sessionId: ${roomCallType.sessionId}")
+                Timber.d("Observing sync state in-call for sessionId: ${callData.sessionId}")
                 client.syncService.syncState
                     .collect { state ->
                         if (state != SyncState.Running) {
@@ -256,7 +233,7 @@ class CallScreenPresenter(
                     }
             }
             onDispose {
-                Timber.d("Stopped observing sync state in-call for sessionId: ${roomCallType.sessionId}")
+                Timber.d("Stopped observing sync state in-call for sessionId: ${callData.sessionId}")
                 // Make sure we mark the call as ended in the app state
                 appForegroundStateService.updateIsInCallState(false)
             }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenState.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenState.kt
index c07594aebb..86b4cc439f 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenState.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenState.kt
@@ -15,6 +15,5 @@ data class CallScreenState(
     val webViewError: String?,
     val userAgent: String,
     val isCallActive: Boolean,
-    val isInWidgetMode: Boolean,
-    val eventSink: (CallScreenEvents) -> Unit,
+    val eventSink: (CallScreenEvent) -> Unit,
 )
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenStateProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenStateProvider.kt
index 3e72f96f87..155c5d3380 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenStateProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenStateProvider.kt
@@ -26,15 +26,13 @@ internal fun aCallScreenState(
     webViewError: String? = null,
     userAgent: String = "",
     isCallActive: Boolean = true,
-    isInWidgetMode: Boolean = false,
-    eventSink: (CallScreenEvents) -> Unit = {},
+    eventSink: (CallScreenEvent) -> Unit = {},
 ): CallScreenState {
     return CallScreenState(
         urlState = urlState,
         webViewError = webViewError,
         userAgent = userAgent,
         isCallActive = isCallActive,
-        isInWidgetMode = isInWidgetMode,
         eventSink = eventSink,
     )
 }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
index f8657a9ece..2537eb739c 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt
@@ -17,9 +17,10 @@ import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -33,7 +34,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.viewinterop.AndroidView
 import io.element.android.features.call.impl.R
-import io.element.android.features.call.impl.pip.PictureInPictureEvents
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
 import io.element.android.features.call.impl.pip.PictureInPictureState
 import io.element.android.features.call.impl.pip.aPictureInPictureState
 import io.element.android.features.call.impl.utils.InvalidAudioDeviceReason
@@ -45,7 +46,6 @@ import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings
 import timber.log.Timber
@@ -64,94 +64,93 @@ internal fun CallScreenView(
     requestPermissions: (Array<String>, RequestPermissionCallback) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    fun handleBack() {
-        if (pipState.supportPip) {
-            pipState.eventSink.invoke(PictureInPictureEvents.EnterPictureInPicture)
-        } else {
-            state.eventSink(CallScreenEvents.Hangup)
+    var callWebView by remember { mutableStateOf<WebView?>(null) }
+
+    fun handleBack(fromNative: Boolean = false) {
+        when (CallScreenBackPressPolicy.resolve(supportPip = pipState.supportPip, hasWebView = callWebView != null, fromNative)) {
+            CallScreenBackPressAction.EnterPictureInPicture ->
+                pipState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
+            CallScreenBackPressAction.DispatchEscapeToWebView ->
+                callWebView?.dispatchEscKeyEvent()
+            null -> Timber.d("Back press with unsupported pip is a no-op")
         }
     }
 
-    Scaffold(
-        modifier = modifier,
-    ) { padding ->
-        BackHandler {
-            handleBack()
+    BackHandler {
+        handleBack(fromNative = true)
+    }
+    if (state.webViewError != null) {
+        ErrorDialog(
+            content = buildString {
+                append(stringResource(CommonStrings.error_unknown))
+                state.webViewError.takeIf { it.isNotEmpty() }?.let { append("\n\n").append(it) }
+            },
+            onSubmit = { state.eventSink(CallScreenEvent.Hangup) },
+        )
+    } else {
+        var webViewAudioManager by remember { mutableStateOf<WebViewAudioManager?>(null) }
+        val coroutineScope = rememberCoroutineScope()
+
+        var invalidAudioDeviceReason by remember { mutableStateOf<InvalidAudioDeviceReason?>(null) }
+        invalidAudioDeviceReason?.let {
+            InvalidAudioDeviceDialog(invalidAudioDeviceReason = it) {
+                invalidAudioDeviceReason = null
+            }
         }
-        if (state.webViewError != null) {
-            ErrorDialog(
-                content = buildString {
-                    append(stringResource(CommonStrings.error_unknown))
-                    state.webViewError.takeIf { it.isNotEmpty() }?.let { append("\n\n").append(it) }
-                },
-                onSubmit = { state.eventSink(CallScreenEvents.Hangup) },
-            )
-        } else {
-            var webViewAudioManager by remember { mutableStateOf<WebViewAudioManager?>(null) }
-            val coroutineScope = rememberCoroutineScope()
 
-            var invalidAudioDeviceReason by remember { mutableStateOf<InvalidAudioDeviceReason?>(null) }
-            invalidAudioDeviceReason?.let {
-                InvalidAudioDeviceDialog(invalidAudioDeviceReason = it) {
-                    invalidAudioDeviceReason = null
-                }
+        CallWebView(
+            modifier = modifier.consumeWindowInsets(WindowInsets.systemBars).fillMaxSize(),
+            url = state.urlState,
+            userAgent = state.userAgent,
+            onPermissionsRequest = { request ->
+                val androidPermissions = mapWebkitPermissions(request.resources)
+                val callback: RequestPermissionCallback = { request.grant(it) }
+                requestPermissions(androidPermissions.toTypedArray(), callback)
+            },
+            onConsoleMessage = onConsoleMessage,
+            onCreateWebView = { webView ->
+                callWebView = webView
+                webView.addBackHandler(onBackPressed = ::handleBack)
+                val interceptor = WebViewWidgetMessageInterceptor(
+                    webView = webView,
+                    onUrlLoaded = { url ->
+                        webView.evaluateJavascript("controls.onBackButtonPressed = () => { backHandler.onBackPressed() }", null)
+                        if (webViewAudioManager?.isInCallMode?.get() == false) {
+                            Timber.d("URL $url is loaded, starting in-call audio mode")
+                            webViewAudioManager?.onCallStarted()
+                        } else {
+                            Timber.d("Can't start in-call audio mode since the app is already in it.")
+                        }
+                    },
+                    onError = { state.eventSink(CallScreenEvent.OnWebViewError(it)) },
+                )
+                webViewAudioManager = WebViewAudioManager(
+                    webView = webView,
+                    coroutineScope = coroutineScope,
+                    onInvalidAudioDeviceAdded = { invalidAudioDeviceReason = it },
+                )
+                state.eventSink(CallScreenEvent.SetupMessageChannels(interceptor))
+                val pipController = WebViewPipController(webView)
+                pipState.eventSink(PictureInPictureEvent.SetPipController(pipController))
+            },
+            onDestroyWebView = {
+                callWebView = null
+                // Reset audio mode
+                webViewAudioManager?.onCallStopped()
             }
-
-            CallWebView(
-                modifier = Modifier
-                    .padding(padding)
-                    .consumeWindowInsets(padding)
-                    .fillMaxSize(),
-                url = state.urlState,
-                userAgent = state.userAgent,
-                onPermissionsRequest = { request ->
-                    val androidPermissions = mapWebkitPermissions(request.resources)
-                    val callback: RequestPermissionCallback = { request.grant(it) }
-                    requestPermissions(androidPermissions.toTypedArray(), callback)
-                },
-                onConsoleMessage = onConsoleMessage,
-                onCreateWebView = { webView ->
-                    webView.addBackHandler(onBackPressed = ::handleBack)
-                    val interceptor = WebViewWidgetMessageInterceptor(
-                        webView = webView,
-                        onUrlLoaded = { url ->
-                            webView.evaluateJavascript("controls.onBackButtonPressed = () => { backHandler.onBackPressed() }", null)
-                            if (webViewAudioManager?.isInCallMode?.get() == false) {
-                                Timber.d("URL $url is loaded, starting in-call audio mode")
-                                webViewAudioManager?.onCallStarted()
-                            } else {
-                                Timber.d("Can't start in-call audio mode since the app is already in it.")
-                            }
-                        },
-                        onError = { state.eventSink(CallScreenEvents.OnWebViewError(it)) },
-                    )
-                    webViewAudioManager = WebViewAudioManager(
-                        webView = webView,
-                        coroutineScope = coroutineScope,
-                        onInvalidAudioDeviceAdded = { invalidAudioDeviceReason = it },
-                    )
-                    state.eventSink(CallScreenEvents.SetupMessageChannels(interceptor))
-                    val pipController = WebViewPipController(webView)
-                    pipState.eventSink(PictureInPictureEvents.SetPipController(pipController))
-                },
-                onDestroyWebView = {
-                    // Reset audio mode
-                    webViewAudioManager?.onCallStopped()
-                }
-            )
-            when (state.urlState) {
-                AsyncData.Uninitialized,
-                is AsyncData.Loading ->
-                    ProgressDialog(text = stringResource(id = CommonStrings.common_please_wait))
-                is AsyncData.Failure -> {
-                    Timber.e(state.urlState.error, "WebView failed to load URL: ${state.urlState.error.message}")
-                    ErrorDialog(
-                        content = state.urlState.error.message.orEmpty(),
-                        onSubmit = { state.eventSink(CallScreenEvents.Hangup) },
-                    )
-                }
-                is AsyncData.Success -> Unit
+        )
+        when (state.urlState) {
+            AsyncData.Uninitialized,
+            is AsyncData.Loading ->
+                ProgressDialog(text = stringResource(id = CommonStrings.common_please_wait))
+            is AsyncData.Failure -> {
+                Timber.e(state.urlState.error, "WebView failed to load URL: ${state.urlState.error.message}")
+                ErrorDialog(
+                    content = state.urlState.error.message.orEmpty(),
+                    onSubmit = { state.eventSink(CallScreenEvent.Hangup) },
+                )
             }
+            is AsyncData.Success -> Unit
         }
     }
 }
@@ -248,15 +247,16 @@ private fun WebView.setup(
 
 private fun WebView.addBackHandler(onBackPressed: () -> Unit) {
     addJavascriptInterface(
-        object {
-            @Suppress("unused")
-            @JavascriptInterface
-            fun onBackPressed() = onBackPressed()
-        },
+        JavascriptBackHandlerBridge(callback = onBackPressed),
         "backHandler"
     )
 }
 
+private fun WebView.dispatchEscKeyEvent() {
+    dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_ESCAPE))
+    dispatchKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_ESCAPE))
+}
+
 @PreviewsDayNight
 @Composable
 internal fun CallScreenViewPreview(
@@ -275,3 +275,12 @@ internal fun CallScreenViewPreview(
 internal fun InvalidAudioDeviceDialogPreview() = ElementPreview {
     InvalidAudioDeviceDialog(invalidAudioDeviceReason = InvalidAudioDeviceReason.BT_AUDIO_DEVICE_DISABLED) {}
 }
+
+internal class JavascriptBackHandlerBridge(
+    private val callback: () -> Unit,
+) {
+    @JavascriptInterface
+    fun onBackPressed() {
+        callback()
+    }
+}
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallTypeExtension.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallTypeExtension.kt
deleted file mode 100644
index 0c18c3e1a4..0000000000
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallTypeExtension.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.call.impl.ui
-
-import io.element.android.features.call.api.CallType
-import io.element.android.libraries.matrix.api.core.SessionId
-
-fun CallType.getSessionId(): SessionId? {
-    return when (this) {
-        is CallType.ExternalUrl -> null
-        is CallType.RoomCall -> sessionId
-    }
-}
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
index bf4f836294..9a093ff5a6 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
@@ -32,19 +32,21 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.content.IntentCompat
 import androidx.core.util.Consumer
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.Lifecycle
 import dev.zacsweers.metro.Inject
 import io.element.android.compound.colors.SemanticColorsLightDark
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.api.CallType.ExternalUrl
+import io.element.android.compound.theme.ForcedDarkElementTheme
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
-import io.element.android.features.call.impl.pip.PictureInPictureEvents
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
 import io.element.android.features.call.impl.pip.PictureInPicturePresenter
 import io.element.android.features.call.impl.pip.PictureInPictureState
 import io.element.android.features.call.impl.pip.PipView
 import io.element.android.features.call.impl.services.CallForegroundService
-import io.element.android.features.call.impl.utils.CallIntentDataParser
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.androidutils.browser.ConsoleMessageLogger
 import io.element.android.libraries.architecture.Presenter
@@ -54,6 +56,8 @@ import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
+import io.element.android.libraries.designsystem.utils.hasCompactHeightWindowSize
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import timber.log.Timber
 
@@ -63,9 +67,9 @@ class ElementCallActivity :
     AppCompatActivity(),
     CallScreenNavigator,
     PipView {
-    @Inject lateinit var callIntentDataParser: CallIntentDataParser
     @Inject lateinit var presenterFactory: CallScreenPresenter.Factory
     @Inject lateinit var appPreferencesStore: AppPreferencesStore
+    @Inject lateinit var featureFlagService: FeatureFlagService
     @Inject lateinit var enterpriseService: EnterpriseService
     @Inject lateinit var pictureInPicturePresenter: PictureInPicturePresenter
     @Inject lateinit var buildMeta: BuildMeta
@@ -78,9 +82,9 @@ class ElementCallActivity :
 
     private val requestPermissionsLauncher = registerPermissionResultLauncher()
 
-    private val webViewTarget = mutableStateOf<CallType?>(null)
+    private val webViewTarget = mutableStateOf<CallData?>(null)
 
-    private var eventSink: ((CallScreenEvents) -> Unit)? = null
+    private var eventSink: ((CallScreenEvent) -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -96,7 +100,7 @@ class ElementCallActivity :
             window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)
         }
 
-        setCallType(intent)
+        setCallData(intent)
         // If presenter is not created at this point, it means we have no call to display, the Activity is finishing, so return early
         if (!::presenter.isInitialized) {
             return
@@ -109,34 +113,59 @@ class ElementCallActivity :
         setContent {
             val pipState = pictureInPicturePresenter.present()
             ListenToAndroidEvents(pipState)
-            val colors by remember(webViewTarget.value?.getSessionId()) {
-                enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.getSessionId())
+            val colors by remember(webViewTarget.value?.sessionId) {
+                enterpriseService.semanticColorsFlow(sessionId = webViewTarget.value?.sessionId)
             }.collectAsState(SemanticColorsLightDark.default)
+
+            // When the height is compact, hide the system bars by default to maximize the space for the call, using immersive mode
+            val hasCompactHeight = hasCompactHeightWindowSize()
+            DisposableEffect(hasCompactHeight, pipState.isInPictureInPicture) {
+                if (hasCompactHeight && !pipState.isInPictureInPicture) {
+                    val window = this@ElementCallActivity.window ?: return@DisposableEffect onDispose {}
+                    val insetsController = WindowCompat.getInsetsController(window, window.decorView)
+                    val systemBarInsets = WindowInsetsCompat.Type.systemBars()
+                    insetsController.hide(systemBarInsets)
+
+                    insetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+
+                    onDispose {
+                        insetsController.show(systemBarInsets)
+                        insetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_DEFAULT
+                    }
+                } else {
+                    onDispose {}
+                }
+            }
+
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
+                featureFlagService = featureFlagService,
                 compoundLight = colors.light,
                 compoundDark = colors.dark,
                 buildMeta = buildMeta,
             ) {
-                val state = presenter.present()
-                eventSink = state.eventSink
-                LaunchedEffect(state.isCallActive, state.isInWidgetMode) {
-                    // Note when not in WidgetMode, isCallActive will never be true, so consider the call is active
-                    if (state.isCallActive || !state.isInWidgetMode) {
-                        setCallIsActive()
+                ForcedDarkElementTheme(
+                    colors = colors,
+                ) {
+                    val state = presenter.present()
+                    eventSink = state.eventSink
+                    LaunchedEffect(state.isCallActive) {
+                        if (state.isCallActive) {
+                            setCallIsActive()
+                        }
                     }
+                    CallScreenView(
+                        state = state,
+                        pipState = pipState,
+                        onConsoleMessage = {
+                            consoleMessageLogger.log("ElementCall", it)
+                        },
+                        requestPermissions = { permissions, callback ->
+                            requestPermissionCallback = callback
+                            requestPermissionsLauncher.launch(permissions)
+                        }
+                    )
                 }
-                CallScreenView(
-                    state = state,
-                    pipState = pipState,
-                    onConsoleMessage = {
-                        consoleMessageLogger.log("ElementCall", it)
-                    },
-                    requestPermissions = { permissions, callback ->
-                        requestPermissionCallback = callback
-                        requestPermissionsLauncher.launch(permissions)
-                    }
-                )
             }
         }
     }
@@ -160,7 +189,7 @@ class ElementCallActivity :
                 if (requestPermissionCallback != null) {
                     Timber.tag(loggerTag.value).w("Ignoring onUserLeaveHint event because user is asked to grant permissions")
                 } else {
-                    pipEventSink(PictureInPictureEvents.EnterPictureInPicture)
+                    pipEventSink(PictureInPictureEvent.EnterPictureInPicture)
                 }
             }
             addOnUserLeaveHintListener(listener)
@@ -170,10 +199,10 @@ class ElementCallActivity :
         }
         DisposableEffect(Unit) {
             val onPictureInPictureModeChangedListener = Consumer { _: PictureInPictureModeChangedInfo ->
-                pipEventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(isInPictureInPictureMode))
+                pipEventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(isInPictureInPictureMode))
                 if (!isInPictureInPictureMode && !lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                     Timber.tag(loggerTag.value).d("Exiting PiP mode: Hangup the call")
-                    eventSink?.invoke(CallScreenEvents.Hangup)
+                    eventSink?.invoke(CallScreenEvent.Hangup)
                 }
             }
             addOnPictureInPictureModeChangedListener(onPictureInPictureModeChangedListener)
@@ -185,7 +214,7 @@ class ElementCallActivity :
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        setCallType(intent)
+        setCallData(intent)
     }
 
     override fun onDestroy() {
@@ -204,25 +233,24 @@ class ElementCallActivity :
         finish()
     }
 
-    private fun setCallType(intent: Intent?) {
-        val callType = intent?.let {
-            IntentCompat.getParcelableExtra(intent, DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, CallType::class.java)
-                ?: intent.dataString?.let(::parseUrl)?.let(::ExternalUrl)
+    private fun setCallData(intent: Intent?) {
+        val callData = intent?.let {
+            IntentCompat.getParcelableExtra(intent, DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, CallData::class.java)
         }
-        val currentCallType = webViewTarget.value
-        if (currentCallType == null) {
-            if (callType == null) {
+        val currentCallData = webViewTarget.value
+        if (currentCallData == null) {
+            if (callData == null) {
                 Timber.tag(loggerTag.value).d("Re-opened the activity but we have no url to load or a cached one, finish the activity")
                 finish()
             } else {
                 Timber.tag(loggerTag.value).d("Set the call type and create the presenter")
-                webViewTarget.value = callType
-                presenter = presenterFactory.create(callType, this)
+                webViewTarget.value = callData
+                presenter = presenterFactory.create(callData, this)
             }
         } else {
-            if (callType == null) {
+            if (callData == null) {
                 Timber.tag(loggerTag.value).d("Coming back from notification, do nothing")
-            } else if (callType != currentCallType) {
+            } else if (callData != currentCallData) {
                 Timber.tag(loggerTag.value).d("User starts another call, restart the Activity")
                 setIntent(intent)
                 recreate()
@@ -233,8 +261,6 @@ class ElementCallActivity :
         }
     }
 
-    private fun parseUrl(url: String?): String? = callIntentDataParser.parse(url)
-
     private fun registerPermissionResultLauncher(): ActivityResultLauncher<Array<String>> {
         return registerForActivityResult(
             ActivityResultContracts.RequestMultiplePermissions()
@@ -284,7 +310,7 @@ class ElementCallActivity :
     }
 
     override fun hangUp() {
-        eventSink?.invoke(CallScreenEvents.Hangup)
+        eventSink?.invoke(CallScreenEvent.Hangup)
     }
 }
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt
index 73233fe453..1d6989fb3c 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt
@@ -19,7 +19,7 @@ import androidx.core.content.IntentCompat
 import androidx.lifecycle.lifecycleScope
 import dev.zacsweers.metro.Inject
 import io.element.android.compound.colors.SemanticColorsLightDark
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.call.impl.di.CallBindings
 import io.element.android.features.call.impl.notifications.CallNotificationData
@@ -30,6 +30,7 @@ import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.filter
@@ -57,6 +58,9 @@ class IncomingCallActivity : AppCompatActivity() {
     @Inject
     lateinit var appPreferencesStore: AppPreferencesStore
 
+    @Inject
+    lateinit var featureFlagService: FeatureFlagService
+
     @Inject
     lateinit var enterpriseService: EnterpriseService
 
@@ -88,6 +92,7 @@ class IncomingCallActivity : AppCompatActivity() {
                 }.collectAsState(SemanticColorsLightDark.default)
                 ElementThemeApp(
                     appPreferencesStore = appPreferencesStore,
+                    featureFlagService = featureFlagService,
                     compoundLight = colors.light,
                     compoundDark = colors.dark,
                     buildMeta = buildMeta,
@@ -113,10 +118,10 @@ class IncomingCallActivity : AppCompatActivity() {
 
     private fun onAnswer(notificationData: CallNotificationData) {
         elementCallEntryPoint.startCall(
-            CallType.RoomCall(
-                notificationData.sessionId,
-                notificationData.roomId,
-                isAudioCall = notificationData.audioOnly
+            CallData(
+                sessionId = notificationData.sessionId,
+                roomId = notificationData.roomId,
+                isAudioCall = notificationData.audioOnly,
             )
         )
     }
@@ -124,7 +129,7 @@ class IncomingCallActivity : AppCompatActivity() {
     private fun onCancel() {
         val activeCall = activeCallManager.activeCall.value ?: return
         appCoroutineScope.launch {
-            activeCallManager.hangUpCall(callType = activeCall.callType)
+            activeCallManager.hangUpCall(callData = activeCall.callData)
         }
     }
 }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
index 99679a8afb..685fc932fe 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
@@ -20,7 +20,7 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ElementCallConfig
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.notifications.RingingCallNotificationCreator
@@ -73,20 +73,20 @@ interface ActiveCallManager {
 
     /**
      * Called to hang up the active call. It will hang up the call and remove any existing UI and the active call.
-     * @param callType The type of call that the user hangs up, either an external url one or a room one.
+     * @param callData The data about the call.
      * @param notificationData The data for the incoming call notification.
      */
     suspend fun hangUpCall(
-        callType: CallType,
+        callData: CallData,
         notificationData: CallNotificationData? = null,
     )
 
     /**
      * Called after the user joined a call. It will remove any existing UI and set the call state as [CallState.InCall].
      *
-     * @param callType The type of call that the user joined, either an external url one or a room one.
+     * @param callData The data about the call.
      */
-    suspend fun joinedCall(callType: CallType)
+    suspend fun joinedCall(callData: CallData)
 }
 
 @SingleIn(AppScope::class)
@@ -143,7 +143,7 @@ class DefaultActiveCallManager(
                 return
             }
             activeCall.value = ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = notificationData.sessionId,
                     roomId = notificationData.roomId,
                     isAudioCall = notificationData.audioOnly,
@@ -198,17 +198,17 @@ class DefaultActiveCallManager(
     }
 
     override suspend fun hangUpCall(
-        callType: CallType,
+        callData: CallData,
         notificationData: CallNotificationData?,
     ) = mutex.withLock {
-        Timber.tag(tag).d("Hang up call: $callType")
+        Timber.tag(tag).d("Hang up call: $callData")
         cancelIncomingCallNotification()
         val currentActiveCall = activeCall.value ?: run {
             // activeCall.value can be null if the application has been killed while the call was ringing
             // Build a currentActiveCall with the provided parameters.
             notificationData?.let {
                 ActiveCall(
-                    callType = callType,
+                    callData = callData,
                     callState = CallState.Ringing(
                         notificationData = notificationData,
                     )
@@ -219,8 +219,8 @@ class DefaultActiveCallManager(
             return@withLock
         }
 
-        if (currentActiveCall.callType != callType) {
-            Timber.tag(tag).w("Call type $callType does not match the active call type, ignoring")
+        if (currentActiveCall.callData != callData) {
+            Timber.tag(tag).w("Call type $callData does not match the active call type, ignoring")
             return@withLock
         }
         if (currentActiveCall.callState is CallState.Ringing) {
@@ -244,8 +244,8 @@ class DefaultActiveCallManager(
         activeCall.value = null
     }
 
-    override suspend fun joinedCall(callType: CallType) = mutex.withLock {
-        Timber.tag(tag).d("Joined call: $callType")
+    override suspend fun joinedCall(callData: CallData) = mutex.withLock {
+        Timber.tag(tag).d("Joined call: $callData")
         cancelIncomingCallNotification()
         if (activeWakeLock?.isHeld == true) {
             Timber.tag(tag).d("Releasing partial wakelock after joining call")
@@ -254,7 +254,7 @@ class DefaultActiveCallManager(
         timedOutCallJob?.cancel()
 
         activeCall.value = ActiveCall(
-            callType = callType,
+            callData = callData,
             callState = CallState.InCall,
         )
     }
@@ -307,15 +307,15 @@ class DefaultActiveCallManager(
     private fun observeRingingCall() {
         activeCall
             .filterNotNull()
-            .filter { it.callState is CallState.Ringing && it.callType is CallType.RoomCall }
+            .filter { it.callState is CallState.Ringing }
             .flatMapLatest { activeCall ->
-                val callType = activeCall.callType as CallType.RoomCall
+                val callData = activeCall.callData
                 val ringingInfo = activeCall.callState as CallState.Ringing
-                val client = matrixClientProvider.getOrRestore(callType.sessionId).getOrNull() ?: run {
+                val client = matrixClientProvider.getOrRestore(callData.sessionId).getOrNull() ?: run {
                     Timber.tag(tag).d("Couldn't find session for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
-                val room = client.getRoom(callType.roomId) ?: run {
+                val room = client.getRoom(callData.roomId) ?: run {
                     Timber.tag(tag).d("Couldn't find room for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
@@ -346,17 +346,17 @@ class DefaultActiveCallManager(
         // has joined the call from another session.
         activeCall
             .filterNotNull()
-            .filter { it.callState is CallState.Ringing && it.callType is CallType.RoomCall }
+            .filter { it.callState is CallState.Ringing }
             .flatMapLatest { activeCall ->
-                val callType = activeCall.callType as CallType.RoomCall
+                val callData = activeCall.callData
                 // Get a flow of updated `hasRoomCall` and `activeRoomCallParticipants` values for the room
-                val room = matrixClientProvider.getOrRestore(callType.sessionId).getOrNull()?.getRoom(callType.roomId) ?: run {
+                val room = matrixClientProvider.getOrRestore(callData.sessionId).getOrNull()?.getRoom(callData.roomId) ?: run {
                     Timber.tag(tag).d("Couldn't find room for incoming call: $activeCall")
                     return@flatMapLatest flowOf()
                 }
                 room.roomInfoFlow.map {
                     Timber.tag(tag).d("Has room call status changed for ringing call: ${it.hasRoomCall}")
-                    it.hasRoomCall to (callType.sessionId in it.activeRoomCallParticipants)
+                    it.hasRoomCall to (callData.sessionId in it.activeRoomCallParticipants)
                 }
             }
             // We only want to check if the room active call status changes
@@ -388,10 +388,7 @@ class DefaultActiveCallManager(
                             // Nothing to do
                         }
                         is CallState.InCall -> {
-                            when (val callType = value.callType) {
-                                is CallType.ExternalUrl -> defaultCurrentCallService.onCallStarted(CurrentCall.ExternalUrl(callType.url))
-                                is CallType.RoomCall -> defaultCurrentCallService.onCallStarted(CurrentCall.RoomCall(callType.roomId))
-                            }
+                            defaultCurrentCallService.onCallStarted(CurrentCall.RoomCall(value.callData.roomId))
                         }
                     }
                 }
@@ -404,7 +401,7 @@ class DefaultActiveCallManager(
  * Represents an active call.
  */
 data class ActiveCall(
-    val callType: CallType,
+    val callData: CallData,
     val callState: CallState,
 )
 
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallIntentDataParser.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallIntentDataParser.kt
deleted file mode 100644
index f5433c15a0..0000000000
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallIntentDataParser.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.call.impl.utils
-
-import android.net.Uri
-import androidx.core.net.toUri
-import dev.zacsweers.metro.Inject
-
-@Inject
-class CallIntentDataParser {
-    private val validHttpSchemes = sequenceOf("https")
-    private val knownHosts = sequenceOf(
-        "call.element.io",
-    )
-
-    fun parse(data: String?): String? {
-        val parsedUrl = data?.toUri() ?: return null
-        val scheme = parsedUrl.scheme
-        return when {
-            scheme in validHttpSchemes -> parsedUrl
-            scheme == "element" && parsedUrl.host == "call" -> {
-                parsedUrl.getUrlParameter()
-            }
-            scheme == "io.element.call" && parsedUrl.host == null -> {
-                parsedUrl.getUrlParameter()
-            }
-            // This should never be possible, but we still need to take into account the possibility
-            else -> null
-        }
-            ?.takeIf { it.host in knownHosts }
-            ?.withCustomParameters()
-    }
-
-    private fun Uri.getUrlParameter(): Uri? {
-        return getQueryParameter("url")
-            ?.let { urlParameter ->
-                urlParameter.toUri().takeIf { uri ->
-                    uri.scheme in validHttpSchemes && !uri.host.isNullOrBlank()
-                }
-            }
-    }
-}
-
-/**
- * Ensure the uri has the following parameters and value in the fragment:
- * - appPrompt=false
- * - confineToRoom=true
- * to ensure that the rendering will bo correct on the embedded Webview.
- */
-private fun Uri.withCustomParameters(): String {
-    val builder = buildUpon()
-    // Remove the existing query parameters
-    builder.clearQuery()
-    queryParameterNames.forEach {
-        if (it == APP_PROMPT_PARAMETER || it == CONFINE_TO_ROOM_PARAMETER) return@forEach
-        builder.appendQueryParameter(it, getQueryParameter(it))
-    }
-    // Remove the existing fragment parameters, and build the new fragment
-    val currentFragment = fragment ?: ""
-    // Reset the current fragment
-    builder.fragment("")
-    val queryFragmentPosition = currentFragment.lastIndexOf("?")
-    val newFragment = if (queryFragmentPosition == -1) {
-        // No existing query, build it.
-        "$currentFragment?$APP_PROMPT_PARAMETER=false&$CONFINE_TO_ROOM_PARAMETER=true"
-    } else {
-        buildString {
-            append(currentFragment.substring(0, queryFragmentPosition + 1))
-            val queryFragment = currentFragment.substring(queryFragmentPosition + 1)
-            // Replace the existing parameters
-            val newQueryFragment = queryFragment
-                .replace("$APP_PROMPT_PARAMETER=true", "$APP_PROMPT_PARAMETER=false")
-                .replace("$CONFINE_TO_ROOM_PARAMETER=false", "$CONFINE_TO_ROOM_PARAMETER=true")
-            append(newQueryFragment)
-            // Ensure the parameters are there
-            if (!newQueryFragment.contains("$APP_PROMPT_PARAMETER=false")) {
-                if (newQueryFragment.isNotEmpty()) {
-                    append("&")
-                }
-                append("$APP_PROMPT_PARAMETER=false")
-            }
-            if (!newQueryFragment.contains("$CONFINE_TO_ROOM_PARAMETER=true")) {
-                append("&$CONFINE_TO_ROOM_PARAMETER=true")
-            }
-        }
-    }
-    // We do not want to encode the Fragment part, so append it manually
-    return builder.build().toString() + "#" + newFragment
-}
-
-private const val APP_PROMPT_PARAMETER = "appPrompt"
-private const val CONFINE_TO_ROOM_PARAMETER = "confineToRoom"
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
index b31b6152d0..8de7b81d6d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
@@ -14,7 +14,6 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.widget.CallWidgetSettingsProvider
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/IntentProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/IntentProvider.kt
index 0f74ba86d4..c6c607cbbc 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/IntentProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/IntentProvider.kt
@@ -12,21 +12,21 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.PendingIntentCompat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.ui.ElementCallActivity
 
 internal object IntentProvider {
-    fun createIntent(context: Context, callType: CallType): Intent = Intent(context, ElementCallActivity::class.java).apply {
-        putExtra(DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, callType)
+    fun createIntent(context: Context, callData: CallData): Intent = Intent(context, ElementCallActivity::class.java).apply {
+        putExtra(DefaultElementCallEntryPoint.EXTRA_CALL_TYPE, callData)
         addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
     }
 
-    fun getPendingIntent(context: Context, callType: CallType): PendingIntent {
+    fun getPendingIntent(context: Context, callData: CallData): PendingIntent {
         return PendingIntentCompat.getActivity(
             context,
             DefaultElementCallEntryPoint.REQUEST_CODE,
-            createIntent(context, callType),
+            createIntent(context, callData),
             PendingIntent.FLAG_CANCEL_CURRENT,
             false
         )!!
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt
index 0c1ecf83cb..e68e57118b 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt
@@ -64,6 +64,11 @@ class WebViewAudioManager(
      */
     private val isWebViewAudioEnabled = AtomicBoolean(true)
 
+    /**
+     * Store the device id requested by EC, and re-set it if something try to switch (only android S+).
+     */
+    private var ecRequestedDeviceId: String? = null
+
     /**
      * The list of device types that are considered as communication devices, sorted by likelihood of it being used for communication.
      */
@@ -113,22 +118,12 @@ class WebViewAudioManager(
     @get:RequiresApi(Build.VERSION_CODES.S)
     private val commsDeviceChangedListener by lazy {
         AudioManager.OnCommunicationDeviceChangedListener { device ->
-            if (device != null && device.id == expectedNewCommunicationDeviceId) {
-                expectedNewCommunicationDeviceId = null
-                Timber.d("Audio device changed, type: ${device.type}")
-                updateSelectedAudioDeviceInWebView(device.id.toString())
-            } else if (device != null && device.id != expectedNewCommunicationDeviceId) {
-                // We were expecting a device change but it didn't happen, so we should retry
-                val expectedDeviceId = expectedNewCommunicationDeviceId
-                if (expectedDeviceId != null) {
-                    // Remove the expected id so we only retry once
-                    expectedNewCommunicationDeviceId = null
-                    audioManager.selectAudioDevice(expectedDeviceId.toString())
-                }
-            } else {
-                Timber.d("Audio device cleared")
-                expectedNewCommunicationDeviceId = null
-                audioManager.selectAudioDevice(null)
+            Timber.d("Audio device changed, type: ${device?.id}")
+            val wantedDevice = this.ecRequestedDeviceId
+            if (wantedDevice != null && this.ecRequestedDeviceId != device?.id?.toString()) {
+                // We want to ensure that we stick to what EC selected even if it was changed outside
+                Timber.d("Audio device changed to unwanted device ${device?.id}, enforce using the expected device $wantedDevice")
+                audioManager.selectAudioDevice(wantedDevice)
             }
         }
     }
@@ -144,40 +139,15 @@ class WebViewAudioManager(
             // We need to calculate the available devices ourselves, since calling `listAudioDevices` will return an outdated list
             val audioDevices = (listAudioDevices() + validNewDevices).distinctBy { it.id }.sortedWith(audioDeviceComparator)
             setAvailableAudioDevices(audioDevices.map(SerializableAudioDevice::fromAudioDeviceInfo))
-            // This should automatically switch to a new device if it has a higher priority than the current one
-            selectDefaultAudioDevice(audioDevices)
         }
 
         override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>?) {
             // Update the available devices
+            // Element Call will then decide to switch devices if needed
             setAvailableAudioDevices()
-
-            // Unless the removed device is the current one, we don't need to do anything else
-            val removedCurrentDevice = removedDevices.orEmpty().any { it.id == currentDeviceId }
-            if (!removedCurrentDevice) return
-
-            val previousDevice = previousSelectedDevice
-            if (previousDevice != null) {
-                previousSelectedDevice = null
-                // If we have a previous device, we should select it again
-                audioManager.selectAudioDevice(previousDevice.id.toString())
-            } else {
-                // If we don't have a previous device, we should select the default one
-                selectDefaultAudioDevice()
-            }
         }
     }
 
-    /**
-     * The currently used audio device id.
-     */
-    private var currentDeviceId: Int? = null
-
-    /**
-     * When a new audio device is selected but not yet set as the communication device by the OS, this id is used to check if the device is the expected one.
-     */
-    private var expectedNewCommunicationDeviceId: Int? = null
-
     /**
      * Previously selected device, used to restore the selection when the selected device is removed.
      */
@@ -231,16 +201,12 @@ class WebViewAudioManager(
             return
         }
 
-        coroutineScope.launch {
-            proximitySensorMutex.withLock {
-                if (proximitySensorWakeLock?.isHeld == true) {
-                    proximitySensorWakeLock?.release()
-                }
-            }
+        // Since this should run when the call is no longer running, it should be OK to not use the mutex here
+        if (proximitySensorWakeLock?.isHeld == true) {
+            proximitySensorWakeLock?.release()
         }
 
         audioManager.mode = AudioManager.MODE_NORMAL
-
         if (!hasRegisteredCallbacks) {
             Timber.w("Audio: tried to disable webview in-call audio mode without registering callbacks")
             return
@@ -263,6 +229,7 @@ class WebViewAudioManager(
         val webViewAudioDeviceSelectedCallback = AndroidWebViewAudioBridge(
             onAudioDeviceSelected = { selectedDeviceId ->
                 previousSelectedDevice = listAudioDevices().find { it.id.toString() == selectedDeviceId }
+                this.ecRequestedDeviceId = selectedDeviceId
                 audioManager.selectAudioDevice(selectedDeviceId)
             },
             onAudioPlaybackStarted = {
@@ -297,8 +264,8 @@ class WebViewAudioManager(
     private fun setWebViewAndroidNativeBridge() {
         Timber.d("Adding callback in controls.onAudioPlaybackStarted")
         webView.evaluateJavascript("controls.onAudioPlaybackStarted = () => { androidNativeBridge.onTrackReady(); };", null)
-        Timber.d("Adding callback in controls.onOutputDeviceSelect")
-        webView.evaluateJavascript("controls.onOutputDeviceSelect = (id) => { androidNativeBridge.setOutputDevice(id); };", null)
+        Timber.d("Adding callback in controls.onAudioDeviceSelect")
+        webView.evaluateJavascript("controls.onAudioDeviceSelect = (id) => { androidNativeBridge.setAudioDevice(id); };", null)
     }
 
     /**
@@ -325,39 +292,11 @@ class WebViewAudioManager(
     ) {
         Timber.d("Updating available audio devices")
         val deviceList = json.encodeToString(devices)
-        webView.evaluateJavascript("controls.setAvailableOutputDevices($deviceList);", {
-            Timber.d("Audio: setAvailableOutputDevices result: $it")
+        webView.evaluateJavascript("controls.setAvailableAudioDevices($deviceList);", {
+            Timber.d("Audio: setAvailableAudioDevices result: $it")
         })
     }
 
-    /**
-     * Selects the default audio device based on the sorted available devices.
-     *
-     * @param availableDevices The list of available audio devices to select from. If not provided, it will use the current list of audio devices.
-     */
-    private fun selectDefaultAudioDevice(availableDevices: List<AudioDeviceInfo> = listAudioDevices()) {
-        val selectedDevice = availableDevices.firstOrNull()
-        expectedNewCommunicationDeviceId = selectedDevice?.id
-        audioManager.selectAudioDevice(selectedDevice)
-
-        selectedDevice?.let {
-            updateSelectedAudioDeviceInWebView(it.id.toString())
-        } ?: run {
-            Timber.w("Audio: unable to select default audio device")
-        }
-    }
-
-    /**
-     * Updates the WebView's UI to reflect the selected audio device.
-     *
-     * @param deviceId The id of the selected audio device.
-     */
-    private fun updateSelectedAudioDeviceInWebView(deviceId: String) {
-        coroutineScope.launch(Dispatchers.Main) {
-            webView.evaluateJavascript("controls.setOutputDevice('$deviceId');", null)
-        }
-    }
-
     /**
      * Selects the audio device on the OS based on the provided device id.
      *
@@ -381,14 +320,14 @@ class WebViewAudioManager(
      *
      * @param device The info of the audio device to select, or none to clear the selected device.
      */
-    @Suppress("DEPRECATION")
     private fun AudioManager.selectAudioDevice(device: AudioDeviceInfo?) {
-        currentDeviceId = device?.id
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             if (device != null) {
                 runCatchingExceptions {
                     Timber.d("Setting communication device: ${device.id} - ${deviceName(device.type, device.productName.toString())}")
-                    setCommunicationDevice(device)
+                    if (!setCommunicationDevice(device)) {
+                        Timber.w("Failed to setCommunication device")
+                    }
                 }.onFailure {
                     Timber.e(it, "Could not set communication device.")
                 }
@@ -402,6 +341,7 @@ class WebViewAudioManager(
         } else {
             // On Android 11 and lower, we don't have the concept of communication devices
             // We have to call the right methods based on the device type
+            @Suppress("DEPRECATION")
             if (device != null) {
                 if (device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO && disableBluetoothAudioDevices) {
                     Timber.w("Bluetooth audio devices are disabled on this Android version")
@@ -418,14 +358,14 @@ class WebViewAudioManager(
             }
         }
 
-        expectedNewCommunicationDeviceId = null
-
         coroutineScope.launch {
             proximitySensorMutex.withLock {
                 @Suppress("WakeLock", "WakeLockTimeout")
-                if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE && proximitySensorWakeLock?.isHeld == false) {
-                    // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
-                    proximitySensorWakeLock?.acquire()
+                if (device?.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) {
+                    if (proximitySensorWakeLock?.isHeld == false) {
+                        // If the device is the built-in earpiece, we need to acquire the proximity sensor wake lock
+                        proximitySensorWakeLock?.acquire()
+                    }
                 } else if (proximitySensorWakeLock?.isHeld == true) {
                     // If the device is no longer the earpiece, we need to release the wake lock
                     proximitySensorWakeLock?.release()
@@ -457,7 +397,7 @@ private class AndroidWebViewAudioBridge(
     private val onAudioPlaybackStarted: () -> Unit,
 ) {
     @JavascriptInterface
-    fun setOutputDevice(id: String) {
+    fun setAudioDevice(id: String) {
         Timber.d("Audio device selected in webview, id: $id")
         onAudioDeviceSelected(id)
     }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
index f7ab2c57af..c74ae90abd 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewWidgetMessageInterceptor.kt
@@ -140,26 +140,33 @@ class WebViewWidgetMessageInterceptor(
             }
         }
 
-        // Create a WebMessageListener, which will receive messages from the WebView and reply to them
-        val webMessageListener = WebViewCompat.WebMessageListener { _, message, _, _, _ ->
-            onMessageReceived(message.data)
-        }
+        // Always register JavascriptInterface as the baseline message channel.
+        // This works on all WebView implementations including Huawei.
+        webView.addJavascriptInterface(object {
+            @JavascriptInterface
+            fun postMessage(json: String?) {
+                onMessageReceived(json)
+            }
+        }, LISTENER_NAME)
 
-        // Use WebMessageListener if supported, otherwise use JavascriptInterface
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
+        // Additionally register WebMessageListener on WebViews that reliably support it.
+        // Huawei WebView (Chromium < 119) reports WEB_MESSAGE_LISTENER as supported
+        // but silently drops messages, so we only trust it on Chromium 119+.
+        // See: https://github.com/element-hq/element-x-android/issues/6632
+        val webViewVersionName = WebViewCompat.getCurrentWebViewPackage(webView.context)?.versionName.orEmpty()
+        Timber.d("Using WebView version: $webViewVersionName")
+        val webViewVersionCode = webViewVersionName.split(".").firstOrNull()?.toIntOrNull() ?: 0
+
+        if (webViewVersionCode >= 119 &&
+            WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
             WebViewCompat.addWebMessageListener(
                 webView,
                 LISTENER_NAME,
                 setOf("*"),
-                webMessageListener
-            )
-        } else {
-            webView.addJavascriptInterface(object {
-                @JavascriptInterface
-                fun postMessage(json: String?) {
-                    onMessageReceived(json)
+                WebViewCompat.WebMessageListener { _, message, _, _, _ ->
+                    onMessageReceived(message.data)
                 }
-            }, LISTENER_NAME)
+            )
         }
     }
 
diff --git a/features/call/impl/src/main/res/values-ca/translations.xml b/features/call/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..92c518dbee
--- /dev/null
+++ b/features/call/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Trucada en curs"</string>
+  <string name="call_foreground_service_message_android">"Toca per tornar a la trucada"</string>
+  <string name="call_foreground_service_title_android">"☎️ Trucada en curs"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call entrant"</string>
+</resources>
diff --git a/features/call/impl/src/main/res/values-et/translations.xml b/features/call/impl/src/main/res/values-et/translations.xml
index 16b72b8b97..fa0415a5f5 100644
--- a/features/call/impl/src/main/res/values-et/translations.xml
+++ b/features/call/impl/src/main/res/values-et/translations.xml
@@ -4,5 +4,5 @@
   <string name="call_foreground_service_message_android">"Kõne juurde naasmiseks klõpsa"</string>
   <string name="call_foreground_service_title_android">"☎️ Kõne on pooleli"</string>
   <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call ei võimalda selles Androidi versioonis Bluetoothi heliseadmete kasutamist. Palun vali mõni muu heliseade."</string>
-  <string name="screen_incoming_call_subtitle_android">"Sissetulev Element Calli kõne"</string>
+  <string name="screen_incoming_call_subtitle_android">"Saabuv Element Calli kõne"</string>
 </resources>
diff --git a/features/call/impl/src/main/res/values-ja/translations.xml b/features/call/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..18ee195d0f
--- /dev/null
+++ b/features/call/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"通話中"</string>
+  <string name="call_foreground_service_message_android">"タップして通話に戻る"</string>
+  <string name="call_foreground_service_title_android">"☎️ 通話中"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element CallはこのAndroidバージョンにおいて、Bluetoothオーディオデバイスの使用をサポートしていません。別のオーディオデバイスを選択してください。"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call の着信"</string>
+</resources>
diff --git a/features/call/impl/src/main/res/values-vi/translations.xml b/features/call/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..c88cf651e6
--- /dev/null
+++ b/features/call/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_foreground_service_channel_title_android">"Cuộc gọi đang diễn ra"</string>
+  <string name="call_foreground_service_message_android">"Nhấn để quay lại cuộc gọi."</string>
+  <string name="call_foreground_service_title_android">"☎️ Cuộc gọi đang diễn ra"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Ứng dụng Element Call không hỗ trợ sử dụng thiết bị âm thanh Bluetooth trên phiên bản Android này. Vui lòng chọn thiết bị âm thanh khác."</string>
+  <string name="screen_incoming_call_subtitle_android">"Cuộc gọi Element đến"</string>
+</resources>
diff --git a/features/call/impl/src/main/res/values-zh/translations.xml b/features/call/impl/src/main/res/values-zh/translations.xml
index 6192568a61..8b2ae7e56e 100644
--- a/features/call/impl/src/main/res/values-zh/translations.xml
+++ b/features/call/impl/src/main/res/values-zh/translations.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="call_foreground_service_channel_title_android">"通话进行中"</string>
-  <string name="call_foreground_service_message_android">"点按即可返回通话"</string>
+  <string name="call_foreground_service_channel_title_android">"正在进行的通话"</string>
+  <string name="call_foreground_service_message_android">"点击以返回通话"</string>
   <string name="call_foreground_service_title_android">"☎️ 通话中"</string>
-  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支持在此 Android 版本中使用蓝牙音频设备。请选择其他音频设备。"</string>
-  <string name="screen_incoming_call_subtitle_android">"Element 来电"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支持在此 Android 版本中使用蓝牙音频设备。请选择其它音频设备。"</string>
+  <string name="screen_incoming_call_subtitle_android">"Element Call 来电"</string>
 </resources>
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt
index 85cec8c586..9b2ee3d923 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt
@@ -11,7 +11,7 @@ package io.element.android.features.call
 import android.content.Intent
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.DefaultElementCallEntryPoint
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.ui.ElementCallActivity
@@ -21,23 +21,21 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.Shadows.shadowOf
 import kotlin.time.Duration.Companion.seconds
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultElementCallEntryPointTest {
+class DefaultElementCallEntryPointTest : RobolectricTest() {
     @Test
     fun `startCall - starts ElementCallActivity setup with the needed extras`() = runTest {
         val entryPoint = createEntryPoint()
-        entryPoint.startCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false))
+        entryPoint.startCall(CallData(A_SESSION_ID, A_ROOM_ID, isAudioCall = false))
 
         val expectedIntent = Intent(InstrumentationRegistry.getInstrumentation().targetContext, ElementCallActivity::class.java)
         val intent = shadowOf(RuntimeEnvironment.getApplication()).nextStartedActivity
@@ -53,7 +51,7 @@ class DefaultElementCallEntryPointTest {
         val entryPoint = createEntryPoint(activeCallManager = activeCallManager)
 
         entryPoint.handleIncomingCall(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, isAudioCall = false),
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID_2,
             roomName = "roomName",
diff --git a/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
similarity index 93%
rename from features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
rename to features/call/impl/src/test/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
index 387a77ef8b..1906aba551 100644
--- a/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/notifications/CallNotificationData.kt
@@ -6,9 +6,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.call.test
+package io.element.android.features.call.impl.notifications
 
-import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenterTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenterTest.kt
index c087fa3c35..c3d7fdf17b 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenterTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/impl/pip/PictureInPicturePresenterTest.kt
@@ -8,11 +8,9 @@
 
 package io.element.android.features.call.impl.pip
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -20,9 +18,7 @@ class PictureInPicturePresenterTest {
     @Test
     fun `when pip is not supported, the state value supportPip is false`() = runTest {
         val presenter = createPictureInPicturePresenter(supportPip = false)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.supportPip).isFalse()
         }
@@ -35,9 +31,7 @@ class PictureInPicturePresenterTest {
             supportPip = true,
             pipView = FakePipView(setPipParamsResult = { }),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.supportPip).isTrue()
         }
@@ -53,18 +47,16 @@ class PictureInPicturePresenterTest {
                 enterPipModeResult = enterPipModeResult,
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.isInPictureInPicture).isFalse()
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             enterPipModeResult.assertions().isCalledOnce()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(true))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(true))
             val pipState = awaitItem()
             assertThat(pipState.isInPictureInPicture).isTrue()
             // User stops pip
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(false))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(false))
             val finalState = awaitItem()
             assertThat(finalState.isInPictureInPicture).isFalse()
         }
@@ -80,12 +72,10 @@ class PictureInPicturePresenterTest {
                 handUpResult = handUpResult
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(PictureInPictureEvents.SetPipController(FakePipController(canEnterPipResult = { false })))
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.SetPipController(FakePipController(canEnterPipResult = { false })))
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             handUpResult.assertions().isCalledOnce()
         }
     }
@@ -102,12 +92,10 @@ class PictureInPicturePresenterTest {
                 enterPipModeResult = enterPipModeResult
             ),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             initialState.eventSink(
-                PictureInPictureEvents.SetPipController(
+                PictureInPictureEvent.SetPipController(
                     FakePipController(
                         canEnterPipResult = { true },
                         enterPipResult = enterPipResult,
@@ -115,16 +103,16 @@ class PictureInPicturePresenterTest {
                     )
                 )
             )
-            initialState.eventSink(PictureInPictureEvents.EnterPictureInPicture)
+            initialState.eventSink(PictureInPictureEvent.EnterPictureInPicture)
             enterPipModeResult.assertions().isCalledOnce()
             enterPipResult.assertions().isNeverCalled()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(true))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(true))
             val pipState = awaitItem()
             assertThat(pipState.isInPictureInPicture).isTrue()
             enterPipResult.assertions().isCalledOnce()
             // User stops pip
             exitPipResult.assertions().isNeverCalled()
-            initialState.eventSink(PictureInPictureEvents.OnPictureInPictureModeChanged(false))
+            initialState.eventSink(PictureInPictureEvent.OnPictureInPictureModeChanged(false))
             val finalState = awaitItem()
             assertThat(finalState.isInPictureInPicture).isFalse()
             exitPipResult.assertions().isCalledOnce()
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt
index c055b408dd..3f5c1c4e50 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt
@@ -23,13 +23,11 @@ import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.ui.media.test.FakeImageLoaderHolder
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class RingingCallNotificationCreatorTest {
+class RingingCallNotificationCreatorTest : RobolectricTest() {
     @Test
     fun `createNotification - with no associated MatrixClient does nothing`() = runTest {
         val notificationCreator = createRingingCallNotificationCreator(
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallDataTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallDataTest.kt
new file mode 100644
index 0000000000..f0cdd44082
--- /dev/null
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallDataTest.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.call.ui
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.call.api.CallData
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import org.junit.Test
+
+class CallDataTest {
+    @Test
+    fun `RoomCall stringification does not contain the URL`() {
+        assertThat(CallData(A_SESSION_ID, A_ROOM_ID, false).toString())
+            .isEqualTo("CallData(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID, isAudioCall=false)")
+    }
+}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenBackPressPolicyTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenBackPressPolicyTest.kt
new file mode 100644
index 0000000000..f07f7039d3
--- /dev/null
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenBackPressPolicyTest.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.call.ui
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.call.impl.ui.CallScreenBackPressAction
+import io.element.android.features.call.impl.ui.CallScreenBackPressPolicy
+import org.junit.Test
+
+class CallScreenBackPressPolicyTest {
+    @Test
+    fun `resolve returns dispatch escape when a web view is available and native button is pressed`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = true,
+            fromNative = true,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.DispatchEscapeToWebView)
+    }
+
+    @Test
+    fun `resolve dispatch escape when there is a web view and pip is supported on native button press`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = true,
+            fromNative = true,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.DispatchEscapeToWebView)
+    }
+
+    @Test
+    fun `resolve returns hangup when there is no web view and pip is not supported from native button`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = false,
+            fromNative = true,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `resolve returns hangup when there is no web view even though pip is supported from native button`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = false,
+            fromNative = true,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `resolve goes to pip if its not from native but from the webview`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = true,
+            fromNative = false,
+        )
+
+        assertThat(result).isEqualTo(CallScreenBackPressAction.EnterPictureInPicture)
+    }
+    @Test
+    fun `resolve hangs up if its not from native but from the webview and pip is not supported`() {
+        val result = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = true,
+            fromNative = false,
+        )
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    fun `invalid cases (event comes from webview but there is now webview) all result in hangup`() {
+        val withPipSupport = CallScreenBackPressPolicy.resolve(
+            supportPip = true,
+            hasWebView = false,
+            fromNative = false,
+        )
+        assertThat(withPipSupport).isNull()
+        val withOutPipSupport = CallScreenBackPressPolicy.resolve(
+            supportPip = false,
+            hasWebView = false,
+            fromNative = false,
+        )
+        assertThat(withOutPipSupport).isNull()
+    }
+}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
index b6b0120451..276e6670f1 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -13,8 +13,8 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.MobileScreen
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.impl.ui.CallScreenEvents
+import io.element.android.features.call.api.CallData
+import io.element.android.features.call.impl.ui.CallScreenEvent
 import io.element.android.features.call.impl.ui.CallScreenNavigator
 import io.element.android.features.call.impl.ui.CallScreenPresenter
 import io.element.android.features.call.impl.utils.WidgetMessageSerializer
@@ -39,6 +39,7 @@ import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.cancelAndJoin
@@ -59,46 +60,19 @@ class CallScreenPresenterTest {
     val warmUpRule = WarmUpRule()
 
     @Test
-    fun `present - with CallType ExternalUrl just loads the URL and sets the call as active`() = runTest {
-        val analyticsLambda = lambdaRecorder<MobileScreen.ScreenName, Unit> {}
-        val joinedCallLambda = lambdaRecorder<CallType, Unit> {}
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            screenTracker = FakeScreenTracker(analyticsLambda),
-            activeCallManager = FakeActiveCallManager(joinedCallResult = joinedCallLambda),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            advanceTimeBy(1.seconds)
-            skipItems(2)
-            val initialState = awaitItem()
-            assertThat(initialState.urlState).isEqualTo(AsyncData.Success("https://call.element.io"))
-            assertThat(initialState.webViewError).isNull()
-            assertThat(initialState.isInWidgetMode).isFalse()
-            assertThat(initialState.isCallActive).isFalse()
-            analyticsLambda.assertions().isNeverCalled()
-            joinedCallLambda.assertions().isCalledOnce()
-        }
-    }
-
-    @Test
-    fun `present - with CallType RoomCall sets call as active, loads URL and runs WidgetDriver`() = runTest {
+    fun `present - with CallData sets call as active, loads URL and runs WidgetDriver`() = runTest {
         val widgetDriver = FakeMatrixWidgetDriver()
         val widgetProvider = FakeCallWidgetProvider(widgetDriver)
         val analyticsLambda = lambdaRecorder<MobileScreen.ScreenName, Unit> {}
-        val joinedCallLambda = lambdaRecorder<CallType, Unit> {}
+        val joinedCallLambda = lambdaRecorder<CallData, Unit> {}
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             widgetProvider = widgetProvider,
             screenTracker = FakeScreenTracker(analyticsLambda),
             activeCallManager = FakeActiveCallManager(joinedCallResult = joinedCallLambda),
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Wait until the URL is loaded
             advanceTimeBy(1.seconds)
             skipItems(1)
@@ -107,7 +81,6 @@ class CallScreenPresenterTest {
             val initialState = awaitItem()
             assertThat(initialState.urlState).isInstanceOf(AsyncData.Loading::class.java)
             assertThat(initialState.isCallActive).isFalse()
-            assertThat(initialState.isInWidgetMode).isTrue()
             assertThat(widgetProvider.getWidgetCalled).isTrue()
             assertThat(widgetDriver.runCalledCount).isEqualTo(1)
             analyticsLambda.assertions().isCalledOnce().with(value(MobileScreen.ScreenName.RoomCall))
@@ -123,19 +96,17 @@ class CallScreenPresenterTest {
     fun `present - set message interceptor, send and receive messages`() = runTest {
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
             val initialState = awaitItem()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
             // And incoming message from the Widget Driver is passed to the WebView
             widgetDriver.givenIncomingMessage("A message")
@@ -154,24 +125,22 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
-            initialState.eventSink(CallScreenEvents.Hangup)
+            initialState.eventSink(CallScreenEvent.Hangup)
 
             // Let background coroutines run and the widget drive be received
             runCurrent()
@@ -188,22 +157,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
 
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
 
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
 
             messageInterceptor.givenInterceptedMessage("""{"action":"io.element.close","api":"fromWidget","widgetId":"1","requestId":"1"}""")
 
@@ -223,22 +190,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.isCallActive).isFalse()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
             messageInterceptor.givenInterceptedMessage(
                 """
                     {
@@ -260,22 +225,20 @@ class CallScreenPresenterTest {
         val navigator = FakeCallScreenNavigator()
         val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             screenTracker = FakeScreenTracker {},
         )
         val messageInterceptor = FakeWidgetMessageInterceptor()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             // Give it time to load the URL and WidgetDriver
             advanceTimeBy(1.seconds)
             skipItems(2)
             val initialState = awaitItem()
             assertThat(initialState.isCallActive).isFalse()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
+            initialState.eventSink(CallScreenEvent.SetupMessageChannels(messageInterceptor))
             skipItems(2)
 
             // Wait for the timeout to trigger
@@ -300,7 +263,7 @@ class CallScreenPresenterTest {
         val matrixClient = FakeMatrixClient(syncService = syncService)
         val appForegroundStateService = FakeAppForegroundStateService()
         val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
+            callData = CallData(A_SESSION_ID, A_ROOM_ID, false),
             widgetDriver = widgetDriver,
             navigator = navigator,
             dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -338,53 +301,8 @@ class CallScreenPresenterTest {
         }
     }
 
-    @Test
-    fun `present - error from WebView are updating the state`() = runTest {
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            activeCallManager = FakeActiveCallManager(),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            advanceTimeBy(1.seconds)
-            skipItems(2)
-            val initialState = awaitItem()
-            initialState.eventSink(CallScreenEvents.OnWebViewError("A Webview error"))
-            val finalState = awaitItem()
-            assertThat(finalState.webViewError).isEqualTo("A Webview error")
-        }
-    }
-
-    @Test
-    fun `present - error from WebView are ignored if Element Call is loaded`() = runTest {
-        val presenter = createCallScreenPresenter(
-            callType = CallType.ExternalUrl("https://call.element.io"),
-            activeCallManager = FakeActiveCallManager(),
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // Wait until the URL is loaded
-            skipItems(1)
-            val initialState = awaitItem()
-
-            val messageInterceptor = FakeWidgetMessageInterceptor()
-            initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
-            // Emit a message
-            messageInterceptor.givenInterceptedMessage("A message")
-            // WebView emits an error, but it will be ignored
-            initialState.eventSink(CallScreenEvents.OnWebViewError("A Webview error"))
-            val finalState = awaitItem()
-            assertThat(finalState.webViewError).isNull()
-
-            cancelAndIgnoreRemainingEvents()
-        }
-    }
-
     private fun TestScope.createCallScreenPresenter(
-        callType: CallType,
+        callData: CallData,
         navigator: CallScreenNavigator = FakeCallScreenNavigator(),
         widgetDriver: FakeMatrixWidgetDriver = FakeMatrixWidgetDriver(),
         widgetProvider: FakeCallWidgetProvider = FakeCallWidgetProvider(widgetDriver),
@@ -401,7 +319,7 @@ class CallScreenPresenterTest {
         }
         val clock = SystemClock { 0 }
         return CallScreenPresenter(
-            callType = callType,
+            callData = callData,
             navigator = navigator,
             callWidgetProvider = widgetProvider,
             userAgentProvider = userAgentProvider,
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenViewTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenViewTest.kt
new file mode 100644
index 0000000000..76ce8e8ede
--- /dev/null
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenViewTest.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.call.ui
+
+import android.view.KeyEvent
+import android.webkit.WebView
+import androidx.activity.ComponentActivity
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.call.impl.pip.PictureInPictureEvent
+import io.element.android.features.call.impl.pip.PictureInPictureState
+import io.element.android.features.call.impl.pip.aPictureInPictureState
+import io.element.android.features.call.impl.ui.CallScreenEvent
+import io.element.android.features.call.impl.ui.CallScreenState
+import io.element.android.features.call.impl.ui.CallScreenView
+import io.element.android.features.call.impl.ui.JavascriptBackHandlerBridge
+import io.element.android.features.call.impl.ui.aCallScreenState
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.Implementation
+import org.robolectric.annotation.Implements
+import org.robolectric.annotation.Resetter
+import org.robolectric.shadows.ShadowWebView
+
+@OptIn(ExperimentalTestApi::class)
+class CallScreenViewTest : RobolectricTest() {
+    @Test
+    fun `pressing back key triggers hangup when no web view is available and pip is unsupported`() = runAndroidComposeUiTest {
+        val callEvents = EventsRecorder<CallScreenEvent>()
+
+        setCallScreenView(
+            state = aCallScreenState(eventSink = callEvents),
+            useInspectionMode = true,
+        )
+
+        pressBackKey()
+
+        callEvents.assertEmpty()
+    }
+
+    @Config(shadows = [RecordingShadowWebView::class])
+    @Test
+    fun `pressing back key dispatches escape key events to web view when pip is unsupported`() = runAndroidComposeUiTest {
+        setCallScreenView(
+            state = aCallScreenState(),
+            useInspectionMode = false,
+            pipState = aPictureInPictureState(supportPip = false),
+        )
+
+        pressBackKey()
+
+        val dispatchedEvents = RecordingShadowWebView.dispatchedEvents
+        assertEquals(2, dispatchedEvents.size)
+        assertEquals(KeyEvent.ACTION_DOWN, dispatchedEvents[0].action)
+        assertEquals(KeyEvent.KEYCODE_ESCAPE, dispatchedEvents[0].keyCode)
+        assertEquals(KeyEvent.ACTION_UP, dispatchedEvents[1].action)
+        assertEquals(KeyEvent.KEYCODE_ESCAPE, dispatchedEvents[1].keyCode)
+    }
+
+    @Config(shadows = [RecordingShadowWebView::class])
+    @Test
+    fun `web view javascript back handler emits pip event when pip is supported`() = runAndroidComposeUiTest {
+        val pipEvents = EventsRecorder<PictureInPictureEvent>()
+
+        setCallScreenView(
+            state = aCallScreenState(),
+            useInspectionMode = false,
+            pipState = aPictureInPictureState(
+                supportPip = true,
+                eventSink = pipEvents,
+            ),
+        )
+
+        runOnIdle {
+            RecordingShadowWebView.invokeJavascriptBackHandler()
+        }
+
+        pipEvents.assertSize(2)
+        pipEvents.assertTrue(0) { it is PictureInPictureEvent.SetPipController }
+        pipEvents.assertTrue(1) { it is PictureInPictureEvent.EnterPictureInPicture }
+    }
+}
+
+@OptIn(ExperimentalTestApi::class)
+private fun <A : ComponentActivity> AndroidComposeUiTest<A>.setCallScreenView(
+    state: CallScreenState,
+    useInspectionMode: Boolean,
+    pipState: PictureInPictureState = aPictureInPictureState(supportPip = false),
+) {
+    setContent {
+        // Inspection mode disables AndroidView creation; keep it configurable per test.
+        CompositionLocalProvider(LocalInspectionMode provides useInspectionMode) {
+            CallScreenView(
+                state = state,
+                pipState = pipState,
+                onConsoleMessage = {},
+                requestPermissions = { _, _ -> },
+            )
+        }
+    }
+}
+
+@Implements(WebView::class)
+internal class RecordingShadowWebView : ShadowWebView() {
+    companion object {
+        val dispatchedEvents = mutableListOf<KeyEvent>()
+        private var backHandlerJavascriptInterface: JavascriptBackHandlerBridge? = null
+
+        @Resetter
+        @JvmStatic
+        @Suppress("unused")
+        fun resetRecordedEvents() {
+            dispatchedEvents.clear()
+            backHandlerJavascriptInterface = null
+        }
+
+        fun invokeJavascriptBackHandler() {
+            val backHandler = checkNotNull(backHandlerJavascriptInterface) { "Expected backHandler JavaScript interface to be registered" }
+            backHandler.onBackPressed()
+        }
+    }
+
+    @Implementation
+    protected override fun addJavascriptInterface(`object`: Any, name: String) {
+        super.addJavascriptInterface(`object`, name)
+        if (name == "backHandler") {
+            backHandlerJavascriptInterface = `object` as? JavascriptBackHandlerBridge
+        }
+    }
+
+    @Implementation
+    @Suppress("unused")
+    fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        dispatchedEvents += KeyEvent(event)
+        return false
+    }
+}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt
deleted file mode 100644
index c83408bd3b..0000000000
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.call.ui
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
-import io.element.android.features.call.impl.ui.getSessionId
-import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_SESSION_ID
-import org.junit.Test
-
-class CallTypeTest {
-    @Test
-    fun `getSessionId returns null for ExternalUrl`() {
-        assertThat(CallType.ExternalUrl("aURL").getSessionId()).isNull()
-    }
-
-    @Test
-    fun `getSessionId returns the sessionId for RoomCall`() {
-        assertThat(
-            CallType.RoomCall(
-                sessionId = A_SESSION_ID,
-                roomId = A_ROOM_ID,
-                isAudioCall = false,
-            ).getSessionId()
-        ).isEqualTo(A_SESSION_ID)
-    }
-
-    @Test
-    fun `ExternalUrl stringification does not contain the URL`() {
-        assertThat(CallType.ExternalUrl("aURL").toString()).isEqualTo("ExternalUrl")
-    }
-
-    @Test
-    fun `RoomCall stringification does not contain the URL`() {
-        assertThat(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false).toString())
-            .isEqualTo("RoomCall(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID, isAudioCall=false)")
-    }
-}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt
deleted file mode 100644
index 43f7f931f1..0000000000
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/CallIntentDataParserTest.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.call.utils
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.impl.utils.CallIntentDataParser
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import java.net.URLEncoder
-
-@RunWith(RobolectricTestRunner::class)
-class CallIntentDataParserTest {
-    private val callIntentDataParser = CallIntentDataParser()
-
-    @Test
-    fun `a null data returns null`() {
-        val url: String? = null
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `empty data returns null`() {
-        doTest("", null)
-    }
-
-    @Test
-    fun `invalid data returns null`() {
-        doTest("!", null)
-    }
-
-    @Test
-    fun `data with no scheme returns null`() {
-        doTest("test", null)
-    }
-
-    @Test
-    fun `Element Call http urls returns null`() {
-        doTest("http://call.element.io", null)
-        doTest("http://call.element.io/some-actual-call?with=parameters", null)
-    }
-
-    @Test
-    fun `Element Call urls with unknown host returns null`() {
-        // Check valid host first, should not return null
-        doTest("https://call.element.io", "https://call.element.io#?appPrompt=false&confineToRoom=true")
-        // Unknown host should return null
-        doTest("https://unknown.io", null)
-        doTest("https://call.unknown.io", null)
-        doTest("https://call.element.com", null)
-        doTest("https://call.element.io.tld", null)
-    }
-
-    @Test
-    fun `Element Call urls will be returned as is`() {
-        doTest(
-            url = "https://call.element.io",
-            expectedResult = "https://call.element.io#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url param gets url extracted`() {
-        doTest(
-            url = VALID_CALL_URL_WITH_PARAM,
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `HTTP and HTTPS urls that don't come from EC return null`() {
-        doTest("http://app.element.io", null)
-        doTest("https://app.element.io", null)
-        doTest("http://", null)
-        doTest("https://", null)
-    }
-
-    @Test
-    fun `Element Call url with no url returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "io.element.call:/?no_url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element scheme with no call host returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "element://no-call?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element scheme with no data returns null`() {
-        val url = "element://call?url="
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `Element Call url with no data returns null`() {
-        val url = "io.element.call:/?url="
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `element invalid scheme returns null`() {
-        val embeddedUrl = VALID_CALL_URL_WITH_PARAM
-        val encodedUrl = URLEncoder.encode(embeddedUrl, "utf-8")
-        val url = "bad.scheme:/?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(url)).isNull()
-    }
-
-    @Test
-    fun `Element Call url with url extra param appPrompt gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM&appPrompt=true",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment appPrompt gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&confineToRoom=true"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment appPrompt and other gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=true&otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?appPrompt=false&otherParam=maybe&confineToRoom=true"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param confineToRoom gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM&confineToRoom=false",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment confineToRoom gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&appPrompt=false"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url extra param in fragment confineToRoom and more gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=false&otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?confineToRoom=true&otherParam=maybe&appPrompt=false"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#fragment",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment with params gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#fragment?otherParam=maybe&$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with url fragment with other params gets url extracted`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?otherParam=maybe&$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with empty fragment`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    @Test
-    fun `Element Call url with empty fragment query`() {
-        doTest(
-            url = "$VALID_CALL_URL_WITH_PARAM#?",
-            expectedResult = "$VALID_CALL_URL_WITH_PARAM#?$EXTRA_PARAMS"
-        )
-    }
-
-    private fun doTest(url: String, expectedResult: String?) {
-        // Test direct parsing
-        assertThat(callIntentDataParser.parse(url)).isEqualTo(expectedResult)
-
-        // Test embedded url, scheme 1
-        val encodedUrl = URLEncoder.encode(url, "utf-8")
-        val urlScheme1 = "element://call?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(urlScheme1)).isEqualTo(expectedResult)
-
-        // Test embedded url, scheme 2
-        val urlScheme2 = "io.element.call:/?url=$encodedUrl"
-        assertThat(callIntentDataParser.parse(urlScheme2)).isEqualTo(expectedResult)
-    }
-
-    companion object {
-        const val VALID_CALL_URL_WITH_PARAM = "https://call.element.io/some-actual-call?with=parameters"
-        const val EXTRA_PARAMS = "appPrompt=false&confineToRoom=true"
-    }
-}
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
index 5650eaa47f..c95f8c5088 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
@@ -13,13 +13,13 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.notifications.RingingCallNotificationCreator
+import io.element.android.features.call.impl.notifications.aCallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCall
 import io.element.android.features.call.impl.utils.CallState
 import io.element.android.features.call.impl.utils.DefaultActiveCallManager
 import io.element.android.features.call.impl.utils.DefaultCurrentCallService
-import io.element.android.features.call.test.aCallNotificationData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -45,6 +45,7 @@ import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.plantTestTimber
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.mockk.coVerify
 import io.mockk.mockk
 import io.mockk.verify
@@ -54,12 +55,9 @@ import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultActiveCallManagerTest {
+class DefaultActiveCallManagerTest : RobolectricTest() {
     private val notificationId = NotificationIdProvider.getForegroundServiceNotificationId(ForegroundServiceType.INCOMING_CALL)
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -77,7 +75,7 @@ class DefaultActiveCallManagerTest {
 
         assertThat(manager.activeCall.value).isEqualTo(
             ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = callNotificationData.sessionId,
                     roomId = callNotificationData.roomId,
                     isAudioCall = false,
@@ -104,7 +102,7 @@ class DefaultActiveCallManagerTest {
 
         assertThat(manager.activeCall.value).isEqualTo(
             ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = callNotificationData.sessionId,
                     roomId = callNotificationData.roomId,
                     isAudioCall = true,
@@ -132,7 +130,7 @@ class DefaultActiveCallManagerTest {
         manager.registerIncomingCall(aCallNotificationData(roomId = A_ROOM_ID_2))
 
         assertThat(manager.activeCall.value).isEqualTo(activeCall)
-        assertThat((manager.activeCall.value?.callType as? CallType.RoomCall)?.roomId).isNotEqualTo(A_ROOM_ID_2)
+        assertThat(manager.activeCall.value?.callData?.roomId).isNotEqualTo(A_ROOM_ID_2)
 
         advanceTimeBy(1)
 
@@ -178,7 +176,7 @@ class DefaultActiveCallManagerTest {
     }
 
     @Test
-    fun `hangUpCall - removes existing call if the CallType matches`() = runTest {
+    fun `hangUpCall - removes existing call if the CallData matches`() = runTest {
         setupShadowPowerManager()
         val notificationManagerCompat = mockk<NotificationManagerCompat>(relaxed = true)
         val manager = createActiveCallManager(notificationManagerCompat = notificationManagerCompat)
@@ -188,7 +186,7 @@ class DefaultActiveCallManagerTest {
         assertThat(manager.activeCall.value).isNotNull()
         assertThat(manager.activeWakeLock?.isHeld).isTrue()
 
-        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false))
+        manager.hangUpCall(CallData(notificationData.sessionId, notificationData.roomId, false))
         assertThat(manager.activeCall.value).isNull()
         assertThat(manager.activeWakeLock?.isHeld).isFalse()
 
@@ -215,7 +213,7 @@ class DefaultActiveCallManagerTest {
         val notificationData = aCallNotificationData(roomId = A_ROOM_ID)
         manager.registerIncomingCall(notificationData)
 
-        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false))
+        manager.hangUpCall(CallData(notificationData.sessionId, notificationData.roomId, false))
 
         coVerify {
             room.declineCall(notificationEventId = notificationData.eventId)
@@ -242,7 +240,7 @@ class DefaultActiveCallManagerTest {
         val notificationData = aCallNotificationData(roomId = A_ROOM_ID)
         // Do not register the incoming call, so the manager doesn't know about it
         manager.hangUpCall(
-            callType = CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false),
+            callData = CallData(notificationData.sessionId, notificationData.roomId, false),
             notificationData = notificationData,
         )
         coVerify {
@@ -320,7 +318,7 @@ class DefaultActiveCallManagerTest {
     }
 
     @Test
-    fun `hangUpCall - does nothing if the CallType doesn't match`() = runTest {
+    fun `hangUpCall - does nothing if the CallData doesn't match`() = runTest {
         setupShadowPowerManager()
         val notificationManagerCompat = mockk<NotificationManagerCompat>(relaxed = true)
         val manager = createActiveCallManager(notificationManagerCompat = notificationManagerCompat)
@@ -329,7 +327,13 @@ class DefaultActiveCallManagerTest {
         assertThat(manager.activeCall.value).isNotNull()
         assertThat(manager.activeWakeLock?.isHeld).isTrue()
 
-        manager.hangUpCall(CallType.ExternalUrl("https://example.com"))
+        manager.hangUpCall(
+            CallData(
+                sessionId = A_SESSION_ID,
+                roomId = A_ROOM_ID_2,
+                isAudioCall = true,
+            )
+        )
         assertThat(manager.activeCall.value).isNotNull()
         assertThat(manager.activeWakeLock?.isHeld).isTrue()
 
@@ -344,10 +348,10 @@ class DefaultActiveCallManagerTest {
         val manager = createActiveCallManager(notificationManagerCompat = notificationManagerCompat)
         assertThat(manager.activeCall.value).isNull()
 
-        manager.joinedCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, true))
+        manager.joinedCall(CallData(A_SESSION_ID, A_ROOM_ID, true))
         assertThat(manager.activeCall.value).isEqualTo(
             ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = A_SESSION_ID,
                     roomId = A_ROOM_ID,
                     isAudioCall = true,
@@ -450,7 +454,7 @@ class DefaultActiveCallManagerTest {
 
         assertThat(manager.activeCall.value).isEqualTo(
             ActiveCall(
-                callType = CallType.RoomCall(
+                callData = CallData(
                     sessionId = callNotificationData.sessionId,
                     roomId = callNotificationData.roomId,
                     isAudioCall = false,
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeActiveCallManager.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeActiveCallManager.kt
index 2d0e126ab5..c2c38284a9 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeActiveCallManager.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeActiveCallManager.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.features.call.utils
 
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.impl.notifications.CallNotificationData
 import io.element.android.features.call.impl.utils.ActiveCall
 import io.element.android.features.call.impl.utils.ActiveCallManager
@@ -17,8 +17,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 class FakeActiveCallManager(
     var registerIncomingCallResult: (CallNotificationData) -> Unit = {},
-    var hangUpCallResult: (CallType, CallNotificationData?) -> Unit = { _, _ -> },
-    var joinedCallResult: (CallType) -> Unit = {},
+    var hangUpCallResult: (CallData, CallNotificationData?) -> Unit = { _, _ -> },
+    var joinedCallResult: (CallData) -> Unit = {},
 ) : ActiveCallManager {
     override val activeCall = MutableStateFlow<ActiveCall?>(null)
 
@@ -26,12 +26,12 @@ class FakeActiveCallManager(
         registerIncomingCallResult(notificationData)
     }
 
-    override suspend fun hangUpCall(callType: CallType, notificationData: CallNotificationData?) = simulateLongTask {
-        hangUpCallResult(callType, notificationData)
+    override suspend fun hangUpCall(callData: CallData, notificationData: CallNotificationData?) = simulateLongTask {
+        hangUpCallResult(callData, notificationData)
     }
 
-    override suspend fun joinedCall(callType: CallType) = simulateLongTask {
-        joinedCallResult(callType)
+    override suspend fun joinedCall(callData: CallData) = simulateLongTask {
+        joinedCallResult(callData)
     }
 
     fun setActiveCall(value: ActiveCall?) {
diff --git a/features/call/test/build.gradle.kts b/features/call/test/build.gradle.kts
index 76fbf9915e..f06c5ed16e 100644
--- a/features/call/test/build.gradle.kts
+++ b/features/call/test/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
     implementation(projects.libraries.core)
 
     api(projects.features.call.api)
-    implementation(projects.features.call.impl)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.test)
     implementation(projects.tests.testutils)
diff --git a/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeElementCallEntryPoint.kt b/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeElementCallEntryPoint.kt
index fdf3ca566b..13b61feacb 100644
--- a/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeElementCallEntryPoint.kt
+++ b/features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeElementCallEntryPoint.kt
@@ -8,16 +8,16 @@
 
 package io.element.android.features.call.test
 
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeElementCallEntryPoint(
-    var startCallResult: (CallType) -> Unit = { lambdaError() },
+    var startCallResult: (CallData) -> Unit = { lambdaError() },
     var handleIncomingCallResult: (
-        CallType.RoomCall,
+        CallData,
         EventId,
         UserId,
         String?,
@@ -27,12 +27,12 @@ class FakeElementCallEntryPoint(
         String?,
     ) -> Unit = { _, _, _, _, _, _, _, _ -> lambdaError() }
 ) : ElementCallEntryPoint {
-    override fun startCall(callType: CallType) {
-        startCallResult(callType)
+    override fun startCall(callData: CallData) {
+        startCallResult(callData)
     }
 
     override suspend fun handleIncomingCall(
-        callType: CallType.RoomCall,
+        callData: CallData,
         eventId: EventId,
         senderId: UserId,
         roomName: String?,
@@ -44,7 +44,7 @@ class FakeElementCallEntryPoint(
         textContent: String?,
     ) {
         handleIncomingCallResult(
-            callType,
+            callData,
             eventId,
             senderId,
             roomName,
diff --git a/features/contentscanner/api/build.gradle.kts b/features/contentscanner/api/build.gradle.kts
new file mode 100644
index 0000000000..0e3d592878
--- /dev/null
+++ b/features/contentscanner/api/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.contentscanner.api"
+}
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
+
+    testImplementation(libs.test.junit)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.truth)
+    testImplementation(libs.test.turbine)
+    testImplementation(projects.libraries.matrix.test)
+}
diff --git a/features/contentscanner/api/src/main/kotlin/io/element/android/features/contentscanner/api/ContentScannerService.kt b/features/contentscanner/api/src/main/kotlin/io/element/android/features/contentscanner/api/ContentScannerService.kt
new file mode 100644
index 0000000000..68f7af28f1
--- /dev/null
+++ b/features/contentscanner/api/src/main/kotlin/io/element/android/features/contentscanner/api/ContentScannerService.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.api
+
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+
+/**
+ * Service to perform security scans in the contents for a given media source.
+ *
+ * The default implementation (FOSS) always returns a valid state.
+ * This will only process media when a [ContentScanner] is provided when building the client in Pro.
+ */
+fun interface ContentScannerService {
+    fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState)
+}
diff --git a/libraries/recentemojis/impl/build.gradle.kts b/features/contentscanner/impl/build.gradle.kts
similarity index 66%
rename from libraries/recentemojis/impl/build.gradle.kts
rename to features/contentscanner/impl/build.gradle.kts
index a1a72c8672..34558a182e 100644
--- a/libraries/recentemojis/impl/build.gradle.kts
+++ b/features/contentscanner/impl/build.gradle.kts
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
@@ -14,18 +13,19 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.libraries.recentemojis.impl"
+    namespace = "io.element.android.features.contentscanner.impl"
 }
 
 setupDependencyInjection()
 
 dependencies {
-    api(projects.libraries.recentemojis.api)
+    api(projects.features.contentscanner.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
-    implementation(libs.kotlinx.collections.immutable)
-    implementation(libs.matrix.emojibase.bindings)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
 
-    testImplementation(projects.libraries.recentemojis.test)
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)
diff --git a/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerService.kt b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerService.kt
new file mode 100644
index 0000000000..8b75a79d2c
--- /dev/null
+++ b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerService.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl
+
+import io.element.android.features.contentscanner.api.ContentScannerService
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import java.io.IOException
+
+/**
+ * Default implementation of [ContentScannerService] that uses a [ContentScanner] to scan media sources.
+ */
+class DefaultContentScannerService(
+    private val contentScanner: ContentScanner,
+    private val coroutineScope: CoroutineScope,
+    coroutineDispatchers: CoroutineDispatchers,
+) : ContentScannerService {
+    private val dispatcher = coroutineDispatchers.io.limitedParallelism(4)
+
+    override fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
+        for (mediaSource in mediaSources) {
+            val url = mediaSource.safeUrl
+            val currentState = contentValidationState.getCurrentMediaState(url)
+            if (currentState != ContentValidationValue.Unknown) continue
+            contentValidationState.update(url, ContentValidationValue.Loading)
+
+            coroutineScope.launch(dispatcher) {
+                contentScanner.scan(mediaSource)
+                    .onSuccess { isValid ->
+                        val contentValidationValue = if (isValid) ContentValidationValue.Valid else ContentValidationValue.Invalid
+                        contentValidationState.update(url, contentValidationValue)
+                    }
+                    .onFailure { exception ->
+                        when (exception) {
+                            is IOException -> {
+                                // If it's an IO-related exception, we can retry later, so we don't store the error
+                                contentValidationState.update(url, ContentValidationValue.Unknown)
+                            }
+                            is ClientException.ContentScanner if exception.reason.isDangerous() -> {
+                                // It's a dangerous content (banned mime-type?), we mark it as invalid
+                                contentValidationState.update(url, ContentValidationValue.Invalid)
+                            }
+                            else -> {
+                                // For other exceptions, we cache the failure
+                                contentValidationState.update(url, ContentValidationValue.UnrecoverableError(exception))
+                            }
+                        }
+                    }
+            }
+        }
+    }
+}
diff --git a/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCache.kt b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCache.kt
new file mode 100644
index 0000000000..af4618dd28
--- /dev/null
+++ b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCache.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl
+
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+
+@SingleIn(RoomScope::class)
+@ContributesBinding(RoomScope::class)
+class DefaultEventContentValidationCache(
+    private val contentScanner: ContentScanner?,
+) : EventContentValidationCache {
+    private val cache = ConcurrentHashMap<EventId, ContentValidationState>()
+
+    override operator fun get(eventId: EventId): ContentValidationState {
+        return cache.getOrPut(eventId) {
+            if (contentScanner != null) {
+                DefaultContentValidationState()
+            } else {
+                Timber.v("Content scanner is not available, returning NoopContentValidationState for eventId: $eventId")
+                NoopContentValidationState()
+            }
+        }
+    }
+}
diff --git a/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/AlwaysValidContentScannerService.kt b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/AlwaysValidContentScannerService.kt
new file mode 100644
index 0000000000..cd96433ce4
--- /dev/null
+++ b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/AlwaysValidContentScannerService.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl.di
+
+import io.element.android.features.contentscanner.api.ContentScannerService
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+
+/**
+ * Noop implementation of [ContentScannerService] that always returns success.
+ *
+ * This is used when the content scanner feature is not enabled or available.
+ */
+class AlwaysValidContentScannerService : ContentScannerService {
+    override fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
+        // Always return success for the noop implementation
+        for (mediaSource in mediaSources) {
+            val url = mediaSource.safeUrl
+            contentValidationState.update(url, ContentValidationValue.Valid)
+        }
+    }
+}
diff --git a/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModule.kt b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModule.kt
new file mode 100644
index 0000000000..9446a603b2
--- /dev/null
+++ b/features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModule.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl.di
+
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.SingleIn
+import io.element.android.features.contentscanner.api.ContentScannerService
+import io.element.android.features.contentscanner.impl.DefaultContentScannerService
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.di.annotations.RoomCoroutineScope
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import kotlinx.coroutines.CoroutineScope
+
+@BindingContainer
+@ContributesTo(RoomScope::class)
+object ContentScannerModule {
+    @Provides
+    @SingleIn(RoomScope::class)
+    fun providesContentScannerService(
+        contentScanner: ContentScanner?,
+        @RoomCoroutineScope coroutineScope: CoroutineScope,
+        coroutineDispatchers: CoroutineDispatchers,
+    ): ContentScannerService {
+        return if (contentScanner != null) {
+            DefaultContentScannerService(
+                contentScanner = contentScanner,
+                coroutineScope = coroutineScope,
+                coroutineDispatchers = coroutineDispatchers,
+            )
+        } else {
+            AlwaysValidContentScannerService()
+        }
+    }
+}
diff --git a/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerServiceTest.kt b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerServiceTest.kt
new file mode 100644
index 0000000000..ecfdd9715d
--- /dev/null
+++ b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerServiceTest.kt
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.test.media.aMediaSource
+import io.element.android.libraries.matrix.test.scanner.FakeContentScanner
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import java.io.FileNotFoundException
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultContentScannerServiceTest {
+    @Test
+    fun `scan with no media sources returns unknown`() = runTest {
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.success(true) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+        createDefaultContentScannerService(
+            contentScanner = scanner,
+        ).scan(
+            mediaSources = emptyList(),
+            contentValidationState = contentValidationState,
+        )
+
+        scanLambda.assertions().isNeverCalled()
+        assertThat(contentValidationState.getCurrentOverallState()).isEqualTo(ContentValidationValue.Unknown)
+    }
+
+    @Test
+    fun `scan with single media source`() = runTest {
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.success(false) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+
+        val mediaSource = aMediaSource("https://example.com/media.jpg")
+        createDefaultContentScannerService(
+            contentScanner = scanner,
+        ).scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        scanLambda.assertions().isCalledOnce().with(value(mediaSource))
+        assertThat(contentValidationState.getCurrentOverallState()).isEqualTo(ContentValidationValue.Invalid)
+    }
+
+    @Test
+    fun `scan with several media sources`() = runTest {
+        val mediaSourceA = aMediaSource("https://example.com/mediaA.jpg")
+        val mediaSourceB = aMediaSource("https://example.com/mediaB.jpg")
+
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { source ->
+            when (source) {
+                mediaSourceA -> Result.success(true)
+                mediaSourceB -> Result.success(false)
+                else -> error("Unexpected media source: $source")
+            }
+        }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+
+        createDefaultContentScannerService(
+            contentScanner = scanner,
+        ).scan(
+            mediaSources = listOf(mediaSourceA, mediaSourceB),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        scanLambda.assertions().isCalledExactly(2)
+        assertThat(contentValidationState.getMediaStateFlow(mediaSourceA.safeUrl).first()).isEqualTo(ContentValidationValue.Valid)
+        assertThat(contentValidationState.getMediaStateFlow(mediaSourceB.safeUrl).first()).isEqualTo(ContentValidationValue.Invalid)
+        assertThat(contentValidationState.overallStateFlow.first()).isEqualTo(ContentValidationValue.Invalid)
+    }
+
+    @Test
+    fun `scan won't be repeated for sources which are already being scanned`() = runTest {
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.success(false) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+
+        val mediaSource = aMediaSource("https://example.com/media.jpg")
+        val service = createDefaultContentScannerService(
+            contentScanner = scanner,
+        )
+
+        // First scan attempt
+        service.scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        // Immediately after, a new scan attempt is made for the same media source
+        service.scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        // The scan action was done just once, and the overall state is invalid as expected
+        scanLambda.assertions().isCalledOnce().with(value(mediaSource))
+        assertThat(contentValidationState.getCurrentOverallState()).isEqualTo(ContentValidationValue.Invalid)
+    }
+
+    @Test
+    fun `scan won't be repeated for sources which already have a cached value`() = runTest {
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.success(false) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = NoopContentValidationState(ContentValidationValue.Valid)
+
+        val mediaSource = aMediaSource("https://example.com/media.jpg")
+        val service = createDefaultContentScannerService(
+            contentScanner = scanner,
+        )
+
+        service.scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        scanLambda.assertions().isNeverCalled()
+    }
+
+    @Test
+    fun `if a scan fails with a recoverable error, the content validation value will be back to Unknown`() = runTest {
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.failure(FileNotFoundException("Some IO exception")) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+
+        val mediaSource = aMediaSource("https://example.com/media.jpg")
+        val service = createDefaultContentScannerService(
+            contentScanner = scanner,
+        )
+
+        service.scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        scanLambda.assertions().isCalledOnce().with(value(mediaSource))
+        assertThat(contentValidationState.getCurrentMediaState(mediaSource.safeUrl)).isEqualTo(ContentValidationValue.Unknown)
+        assertThat(contentValidationState.getCurrentOverallState()).isEqualTo(ContentValidationValue.Unknown)
+    }
+
+    @Test
+    fun `if a scan fails with an unrecoverable error, the content validation value will be back to UnrecoverableError`() = runTest {
+        val error = OutOfMemoryError("BOOM")
+        val scanLambda = lambdaRecorder<MediaSource, Result<Boolean>> { Result.failure(error) }
+        val scanner = FakeContentScanner(scan = scanLambda)
+        val contentValidationState = DefaultContentValidationState()
+
+        val mediaSource = aMediaSource("https://example.com/media.jpg")
+        val service = createDefaultContentScannerService(
+            contentScanner = scanner,
+        )
+
+        service.scan(
+            mediaSources = listOf(mediaSource),
+            contentValidationState = contentValidationState,
+        )
+
+        runCurrent()
+
+        scanLambda.assertions().isCalledOnce().with(value(mediaSource))
+        assertThat(contentValidationState.getCurrentMediaState(mediaSource.safeUrl)).isEqualTo(ContentValidationValue.UnrecoverableError(error))
+        assertThat(contentValidationState.getCurrentOverallState()).isEqualTo(ContentValidationValue.UnrecoverableError(error))
+    }
+
+    private fun TestScope.createDefaultContentScannerService(
+        contentScanner: ContentScanner = FakeContentScanner(),
+        sessionCoroutineScope: CoroutineScope = backgroundScope,
+        coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
+    ): DefaultContentScannerService {
+        return DefaultContentScannerService(
+            contentScanner = contentScanner,
+            coroutineScope = sessionCoroutineScope,
+            coroutineDispatchers = coroutineDispatchers
+        )
+    }
+}
diff --git a/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCacheTest.kt b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCacheTest.kt
new file mode 100644
index 0000000000..5a7bfa07b9
--- /dev/null
+++ b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultEventContentValidationCacheTest.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.scanner.FakeContentScanner
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import org.junit.Test
+
+class DefaultEventContentValidationCacheTest {
+    @Test
+    fun `get returns NoopContentValidationState when ContentScanner is null`() {
+        // Given
+        val contentScanner: ContentScanner? = null
+        val cache = DefaultEventContentValidationCache(contentScanner)
+
+        // When
+        val state = cache[AN_EVENT_ID]
+
+        // Then
+        assertThat(state).isInstanceOf(NoopContentValidationState::class.java)
+    }
+
+    @Test
+    fun `get returns an actual DefaultContentValidationState when ContentScanner is not null`() {
+        // Given
+        val contentScanner: ContentScanner? = FakeContentScanner()
+        val cache = DefaultEventContentValidationCache(contentScanner)
+
+        // When
+        val state = cache[AN_EVENT_ID]
+
+        // Then
+        assertThat(state).isInstanceOf(DefaultContentValidationState::class.java)
+    }
+}
diff --git a/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModuleTest.kt b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModuleTest.kt
new file mode 100644
index 0000000000..8c3834d696
--- /dev/null
+++ b/features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/di/ContentScannerModuleTest.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.contentscanner.impl.di
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.contentscanner.impl.DefaultContentScannerService
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.test.scanner.FakeContentScanner
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class ContentScannerModuleTest {
+    @Test
+    fun `ContentScannerModule provides NoopContentScannerService when ContentScanner is null`() = runTest {
+        // Given
+        val contentScanner: ContentScanner? = null
+        val sessionCoroutineScope = backgroundScope
+        val coroutineDispatchers = testCoroutineDispatchers()
+
+        // When
+        val contentScannerService = ContentScannerModule.providesContentScannerService(
+            contentScanner = contentScanner,
+            coroutineScope = sessionCoroutineScope,
+            coroutineDispatchers = coroutineDispatchers,
+        )
+
+        // Then
+        assertThat(contentScannerService).isInstanceOf(AlwaysValidContentScannerService::class.java)
+    }
+
+    @Test
+    fun `ContentScannerModule provides DefaultContentScannerService when ContentScanner is not null`() = runTest {
+        // Given
+        val contentScanner: ContentScanner? = FakeContentScanner()
+        val sessionCoroutineScope = backgroundScope
+        val coroutineDispatchers = testCoroutineDispatchers()
+
+        // When
+        val contentScannerService = ContentScannerModule.providesContentScannerService(
+            contentScanner = contentScanner,
+            coroutineScope = sessionCoroutineScope,
+            coroutineDispatchers = coroutineDispatchers,
+        )
+
+        // Then
+        assertThat(contentScannerService).isInstanceOf(DefaultContentScannerService::class.java)
+    }
+}
diff --git a/features/createroom/impl/build.gradle.kts b/features/createroom/impl/build.gradle.kts
index 7201f7dc9c..2cd3961ead 100644
--- a/features/createroom/impl/build.gradle.kts
+++ b/features/createroom/impl/build.gradle.kts
@@ -39,11 +39,11 @@ dependencies {
     implementation(projects.libraries.mediaupload.api)
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.previewutils)
-    implementation(projects.libraries.usersearch.impl)
     implementation(projects.services.analytics.api)
     implementation(libs.coil.compose)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.features.invitepeople.api)
+    implementation(projects.features.enterprise.api)
     api(projects.features.createroom.api)
 
     testCommonDependencies(libs, true)
@@ -52,7 +52,7 @@ dependencies {
     testImplementation(projects.libraries.mediapickers.test)
     testImplementation(projects.libraries.mediaupload.test)
     testImplementation(projects.libraries.permissions.test)
-    testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.features.startchat.test)
     testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.features.enterprise.test)
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
index 0a7309a2b0..e03d36363d 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@@ -13,6 +13,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -36,6 +39,13 @@ fun AddPeopleView(
     modifier: Modifier = Modifier,
     invitePeopleView: @Composable () -> Unit,
 ) {
+    val currentOnFinish by rememberUpdatedState(onFinish)
+    LaunchedEffect(state.sendInvitesAction, state.createRoomFromDmAction) {
+        if (state.sendInvitesAction.isSuccess() || state.createRoomFromDmAction.isSuccess()) {
+            currentOnFinish()
+        }
+    }
+
     HeaderFooterPage(
         modifier = modifier,
         contentPadding = PaddingValues(0.dp),
@@ -47,7 +57,6 @@ fun AddPeopleView(
                 text = stringResource(CommonStrings.action_finish),
                 onClick = {
                     state.eventSink(InvitePeopleEvents.SendInvites)
-                    onFinish()
                 },
                 enabled = state.canInvite,
                 modifier = Modifier
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
index 38d6132e14..abedc2bd49 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
@@ -24,6 +24,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.CreatedRoom
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
@@ -73,6 +74,7 @@ class ConfigureRoomPresenter(
     private val featureFlagService: FeatureFlagService,
     private val roomAliasHelper: RoomAliasHelper,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
+    private val sessionEnterpriseService: SessionEnterpriseService,
 ) : Presenter<ConfigureRoomState> {
     @AssistedFactory
     interface Factory {
@@ -84,7 +86,6 @@ class ConfigureRoomPresenter(
 
     @Composable
     override fun present(): ConfigureRoomState {
-        val canAddRoomToSpace by featureFlagService.isFeatureEnabledFlow(FeatureFlags.CreateSpaces).collectAsState(false)
         val cameraPermissionState = cameraPermissionPresenter.present()
         val createRoomConfig by dataStore.getCreateRoomConfigFlow().collectAsState()
         val homeserverName = remember { matrixClient.userIdServerName() }
@@ -113,12 +114,8 @@ class ConfigureRoomPresenter(
         }
 
         var spaces by remember { mutableStateOf<ImmutableList<SpaceRoom>>(persistentListOf()) }
-        LaunchedEffect(canAddRoomToSpace) {
-            spaces = if (canAddRoomToSpace) {
-                matrixClient.spaceService.editableSpaces().getOrElse { emptyList() }.toImmutableList()
-            } else {
-                persistentListOf()
-            }
+        LaunchedEffect(Unit) {
+            spaces = matrixClient.spaceService.editableSpaces().getOrElse { emptyList() }.toImmutableList()
             val parentSpace = spaces.find { it.roomId == initialParentSpaceId }
             parentSpace?.let {
                 dataStore.setParentSpace(parentSpace = parentSpace, updateVisibility = true)
@@ -261,7 +258,7 @@ class ConfigureRoomPresenter(
                     CreateRoomParameters(
                         name = config.roomName,
                         topic = config.topic,
-                        isEncrypted = true,
+                        isEncrypted = !sessionEnterpriseService.isEncryptionDisabledByHomeserver(),
                         isDirect = false,
                         visibility = RoomVisibility.Private,
                         historyVisibilityOverride = RoomHistoryVisibility.Invited,
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
index 1ee4bcd2b5..c929060e13 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -312,7 +312,7 @@ private fun RoomJoinRuleOptions(
                         backgroundTint = Color.Transparent,
                     )
                 },
-                headlineContent = {
+                content = {
                     val title = when (item) {
                         JoinRuleItem.PublicVisibility.Public -> stringResource(R.string.screen_create_room_room_access_section_public_option_title)
                         is JoinRuleItem.PrivateVisibility.Restricted -> stringResource(R.string.screen_create_room_room_access_section_restricted_option_title)
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/SelectParentSpaceOptions.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/SelectParentSpaceOptions.kt
index 6b7b66b897..6389f920d5 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/SelectParentSpaceOptions.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/SelectParentSpaceOptions.kt
@@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -57,7 +58,7 @@ internal fun SelectParentSpaceOptions(
         modifier = modifier
     ) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = selectedSpace?.displayName
                         ?: stringResource(R.string.screen_create_room_space_selection_no_space_title),
@@ -85,9 +86,9 @@ internal fun SelectParentSpaceOptions(
         )
 
         if (displaySelectSpaceBottomSheet) {
-            val sheetState = rememberModalBottomSheetState(
-                skipPartiallyExpanded = true,
-                confirmValueChange = { true },
+            val sheetState = rememberBottomSheetState(
+                initialValue = SheetValue.Hidden,
+                enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
             )
             ModalBottomSheet(
                 sheetState = sheetState,
@@ -95,7 +96,8 @@ internal fun SelectParentSpaceOptions(
                     sheetState.hide(coroutineScope) {
                         displaySelectSpaceBottomSheet = false
                     }
-                }
+                },
+                scrollable = false,
             ) {
                 SelectParentSpaceBottomSheet(
                     spaces = spaces,
@@ -124,7 +126,7 @@ private fun SelectParentSpaceBottomSheet(
     LazyColumn(modifier = Modifier.fillMaxWidth()) {
         item {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(
                         text = stringResource(R.string.screen_create_room_space_selection_no_space_option),
                         maxLines = 1
@@ -139,7 +141,7 @@ private fun SelectParentSpaceBottomSheet(
         for (space in spaces) {
             item {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = space.displayName,
                             maxLines = 1
diff --git a/features/createroom/impl/src/main/res/values-be/translations.xml b/features/createroom/impl/src/main/res/values-be/translations.xml
index 9669bb9090..6b254003b7 100644
--- a/features/createroom/impl/src/main/res/values-be/translations.xml
+++ b/features/createroom/impl/src/main/res/values-be/translations.xml
@@ -3,9 +3,15 @@
   <string name="screen_create_room_action_create_room">"Новы пакой"</string>
   <string name="screen_create_room_add_people_title">"Запрасіць карыстальнікаў"</string>
   <string name="screen_create_room_error_creating_room">"Пры стварэнні пакоя адбылася памылка"</string>
+  <string name="screen_create_room_name_placeholder">"Дадаць імя…"</string>
+  <string name="screen_create_room_new_room_title">"Новы пакой"</string>
+  <string name="screen_create_room_new_space_title">"Новая прастора"</string>
   <string name="screen_create_room_private_option_description">"Толькі запрошаныя людзі могуць атрымаць доступ да гэтага пакоя. Усе паведамленні абаронены end-to-end шыфраваннем."</string>
   <string name="screen_create_room_public_option_description">"Любы можа знайсці гэты пакой. 
 Вы можаце змяніць гэта ў любы час у наладах пакоя."</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Папрасіце далучыцца"</string>
+  <string name="screen_create_room_room_address_section_title">"Адрас"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Дадаць у прастору"</string>
   <string name="screen_create_room_topic_label">"Тэма (неабавязкова)"</string>
+  <string name="screen_create_room_topic_placeholder">"Дадаць апісанне…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-ca/translations.xml b/features/createroom/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..f9e1dea0fc
--- /dev/null
+++ b/features/createroom/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"Sala nova"</string>
+  <string name="screen_create_room_add_people_title">"Convida persones"</string>
+  <string name="screen_create_room_error_creating_room">"S\'ha produït un error en crear la sala"</string>
+  <string name="screen_create_room_private_option_description">"Només s\'hi poden unir les persones convidades."</string>
+  <string name="screen_create_room_public_option_description">"Tothom pot trobar aquesta sala.
+Pots canviar-ho en qualsevol moment a la configuració de sala."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Qualsevol persona pot sol·licitar unir-s\'hi però un administrador o moderador l\'haurà d\'acceptar"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Permet sol·licituds d\'unió"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Tothom pot unir-s\'hi."</string>
+  <string name="screen_create_room_room_address_section_footer">"És necessària una adreça perquè sigui visible al directori públic."</string>
+  <string name="screen_create_room_room_address_section_title">"Adreça"</string>
+  <string name="screen_create_room_room_visibility_section_title">"Visibilitat de sala"</string>
+  <string name="screen_create_room_topic_label">"Tema (opcional)"</string>
+</resources>
diff --git a/features/createroom/impl/src/main/res/values-da/translations.xml b/features/createroom/impl/src/main/res/values-da/translations.xml
index 66c4f08b70..ab72755dcf 100644
--- a/features/createroom/impl/src/main/res/values-da/translations.xml
+++ b/features/createroom/impl/src/main/res/values-da/translations.xml
@@ -19,7 +19,7 @@ Du kan ændre dette når som helst i rummets indstillinger."</string>
   <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Anmod om at deltage"</string>
   <string name="screen_create_room_room_access_section_private_option_description">"Kun inviterede brugere kan deltage."</string>
   <string name="screen_create_room_room_access_section_private_option_title">"Privat"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Alle kan deltage i dette rum"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Alle kan deltage."</string>
   <string name="screen_create_room_room_access_section_public_option_title">"Offentlig"</string>
   <string name="screen_create_room_room_access_section_restricted_option_description">"Alle i %1$s kan deltage."</string>
   <string name="screen_create_room_room_access_section_restricted_option_title">"Standard"</string>
diff --git a/features/createroom/impl/src/main/res/values-de/translations.xml b/features/createroom/impl/src/main/res/values-de/translations.xml
index d1f5bfd283..c3f42ca287 100644
--- a/features/createroom/impl/src/main/res/values-de/translations.xml
+++ b/features/createroom/impl/src/main/res/values-de/translations.xml
@@ -8,15 +8,19 @@
   <string name="screen_create_room_new_room_title">"Neuer Chat"</string>
   <string name="screen_create_room_new_space_title">"Neuer Space"</string>
   <string name="screen_create_room_private_option_description">"Nur eingeladene Personen haben Zutritt zu diesem Chat."</string>
+  <string name="screen_create_room_private_option_title">"Privat"</string>
   <string name="screen_create_room_public_option_description">"Jeder kann diesen Chat finden.
 Du kannst dies jederzeit in den Einstellungen des Chats ändern."</string>
   <string name="screen_create_room_public_option_short_description">"Jeder kann beitreten."</string>
+  <string name="screen_create_room_public_option_title">"Öffentlich"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Jeder kann den Beitritt zum Chat erbitten, aber ein Admin oder Moderator muss die Anfrage akzeptieren."</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Anfrage zum Beitritt zulassen"</string>
   <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Jeder in %1$s kann beitreten, aber alle anderen müssen den Beitritt anfragen."</string>
   <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Beitritt anfragen"</string>
   <string name="screen_create_room_room_access_section_private_option_description">"Nur eingeladene Personen können beitreten."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Privat"</string>
   <string name="screen_create_room_room_access_section_public_option_description">"Jeder darf diesem Chat beitreten."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Öffentlich"</string>
   <string name="screen_create_room_room_access_section_restricted_option_description">"Jeder in %1$s kann beitreten."</string>
   <string name="screen_create_room_room_access_section_restricted_option_title">"Standard"</string>
   <string name="screen_create_room_room_access_section_title">"Wer hat Zugang"</string>
@@ -24,7 +28,8 @@ Du kannst dies jederzeit in den Einstellungen des Chats ändern."</string>
   <string name="screen_create_room_room_address_section_title">"Adresse"</string>
   <string name="screen_create_room_room_visibility_section_title">" Sichtbarkeit des Chats"</string>
   <string name="screen_create_room_space_selection_no_space_description">"(kein Space)"</string>
-  <string name="screen_create_room_space_selection_no_space_title">"Home"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Nicht zu einem Space hinzufügen"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Kein Space ausgewählt"</string>
   <string name="screen_create_room_space_selection_sheet_title">"Space hinzufügen"</string>
   <string name="screen_create_room_topic_label">"Thema (optional)"</string>
   <string name="screen_create_room_topic_placeholder">"Beschreibung hinzufügen…"</string>
diff --git a/features/createroom/impl/src/main/res/values-fa/translations.xml b/features/createroom/impl/src/main/res/values-fa/translations.xml
index 27542ccc19..821d55af67 100644
--- a/features/createroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fa/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_create_room_action_create_room">"اتاق جدید"</string>
   <string name="screen_create_room_add_people_title">"دعوت افراد"</string>
   <string name="screen_create_room_error_creating_room">"هنگام ایجاد اتاق خطایی رخ داد"</string>
-  <string name="screen_create_room_private_option_description">"تنها افراد دعوت شده می‌توانند به این اتاق دسترسی داشته باشند. همهٔ پیام‌ها رمزنگاری سرتاسری شده‌اند."</string>
+  <string name="screen_create_room_private_option_description">"تنها افراد دعوت شده می‌توانند بپیوندند."</string>
   <string name="screen_create_room_public_option_description">"هرکسی می‌تواند اتاق را بیابد.
 می‌توانید بعداً در تظیمات اتاق عوضش کنید."</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"درخواست دعوت"</string>
diff --git a/features/createroom/impl/src/main/res/values-hr/translations.xml b/features/createroom/impl/src/main/res/values-hr/translations.xml
index 81979e3f84..17336bebf2 100644
--- a/features/createroom/impl/src/main/res/values-hr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hr/translations.xml
@@ -3,15 +3,34 @@
   <string name="screen_create_room_action_create_room">"Nova soba"</string>
   <string name="screen_create_room_add_people_title">"Pozovi osobe"</string>
   <string name="screen_create_room_error_creating_room">"Došlo je do pogreške prilikom stvaranja sobe"</string>
+  <string name="screen_create_room_error_creating_space">"Prostor nije moguće stvoriti zbog nepoznate pogreške. Pokušajte ponovno kasnije."</string>
+  <string name="screen_create_room_name_placeholder">"Dodaj ime…"</string>
   <string name="screen_create_room_new_room_title">"Nova soba"</string>
-  <string name="screen_create_room_private_option_description">"Samo pozvane osobe mogu pristupiti ovoj sobi. Sve su poruke sveobuhvatno šifrirane."</string>
+  <string name="screen_create_room_new_space_title">"Novi prostor"</string>
+  <string name="screen_create_room_private_option_description">"Samo pozvane osobe mogu se pridružiti."</string>
+  <string name="screen_create_room_private_option_title">"Privatno"</string>
   <string name="screen_create_room_public_option_description">"Svatko može pronaći ovu sobu.
 To možete u svakom trenutku promijeniti u postavkama sobe."</string>
+  <string name="screen_create_room_public_option_short_description">"Svatko se može pridružiti."</string>
+  <string name="screen_create_room_public_option_title">"Javno"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Svatko može zatražiti pridruživanje sobi, ali administrator ili moderator morat će prihvatiti zahtjev."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Zatraži pridruživanje"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Svatko se može pridružiti ovoj sobi"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Dopusti traženje pridruživanja"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Svatko u %1$s može se pridružiti, ali svi ostali moraju zatražiti pristup."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Zatraži pridruživanje"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Samo pozvane osobe mogu pristupiti ovoj sobi. Sve su poruke sveobuhvatno šifrirane."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Privatno"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Svatko se može pridružiti."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Javno"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Svatko u %1$s može se pridružiti."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standard"</string>
+  <string name="screen_create_room_room_access_section_title">"Tko ima pristup"</string>
   <string name="screen_create_room_room_address_section_footer">"Da bi ova soba bila vidljiva u javnom direktoriju soba, trebat će vam adresa sobe."</string>
-  <string name="screen_create_room_room_address_section_title">"Adresa sobe"</string>
+  <string name="screen_create_room_room_address_section_title">"Adresa"</string>
   <string name="screen_create_room_room_visibility_section_title">"Vidljivost sobe"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(bez razmaka)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Ne dodavaj u prostor"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Nije odabran nijedan prostor"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Dodaj u prostor"</string>
   <string name="screen_create_room_topic_label">"Tema (neobavezno)"</string>
+  <string name="screen_create_room_topic_placeholder">"Dodaj opis…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-in/translations.xml b/features/createroom/impl/src/main/res/values-in/translations.xml
index 83c51e5a19..82132e8bbd 100644
--- a/features/createroom/impl/src/main/res/values-in/translations.xml
+++ b/features/createroom/impl/src/main/res/values-in/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"Ruangan baru"</string>
   <string name="screen_create_room_add_people_title">"Undang orang-orang"</string>
   <string name="screen_create_room_error_creating_room">"Terjadi kesalahan saat membuat ruangan"</string>
+  <string name="screen_create_room_error_creating_space">"Ruang tersebut tidak dapat dibuat karena kesalahan yang tidak diketahui. Coba lagi nanti."</string>
+  <string name="screen_create_room_name_placeholder">"Tambahkan nama…"</string>
+  <string name="screen_create_room_new_room_title">"Ruangan baru"</string>
+  <string name="screen_create_room_new_space_title">"Ruang baru"</string>
   <string name="screen_create_room_private_option_description">"Hanya orang-orang yang diundang dapat mengakses ruangan ini. Semua pesan terenkripsi secara ujung ke ujung."</string>
+  <string name="screen_create_room_private_option_title">"Pribadi"</string>
   <string name="screen_create_room_public_option_description">"Siapa pun dapat mencari ruangan ini.
 Anda dapat mengubah ini kapan pun dalam pengaturan ruangan."</string>
+  <string name="screen_create_room_public_option_short_description">"Siapa pun bisa bergabung."</string>
+  <string name="screen_create_room_public_option_title">"Umum"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Siapa pun dapat meminta untuk bergabung dengan ijin administrator atau moderator"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Minta untuk bergabung"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Siapa pun di %1$s dapat bergabung, tetapi semua orang lain harus meminta akses."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Ajukan permohonan untuk bergabung"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Hanya orang-orang yang diundang dapat mengakses ruangan ini. Semua pesan terenkripsi secara ujung ke ujung."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Pribadi"</string>
   <string name="screen_create_room_room_access_section_public_option_description">"Siapa pun dapat bergabung dengan ruangan ini"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Umum"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Siapa pun di %1$s dapat bergabung."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standar"</string>
+  <string name="screen_create_room_room_access_section_title">"Yang memiliki akses"</string>
   <string name="screen_create_room_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
   <string name="screen_create_room_room_address_section_title">"Alamat ruangan"</string>
   <string name="screen_create_room_room_visibility_section_title">"Keterlihatan ruangan"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(ruang sudah penuh)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Jangan menambahkan sesuatu ke ruang yang sudah ada."</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Tidak ada ruang yang dipilih"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Tambahkan ke ruang"</string>
   <string name="screen_create_room_topic_label">"Topik (opsional)"</string>
+  <string name="screen_create_room_topic_placeholder">"Tambahkan deskripsi…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-it/translations.xml b/features/createroom/impl/src/main/res/values-it/translations.xml
index ce8bca20e0..7a936f41a8 100644
--- a/features/createroom/impl/src/main/res/values-it/translations.xml
+++ b/features/createroom/impl/src/main/res/values-it/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"Nuova stanza"</string>
   <string name="screen_create_room_add_people_title">"Invita persone"</string>
   <string name="screen_create_room_error_creating_room">"Si è verificato un errore durante la creazione della stanza"</string>
-  <string name="screen_create_room_private_option_description">"Solo le persone invitate possono accedere a questa stanza. Tutti i messaggi sono cifrati end-to-end."</string>
+  <string name="screen_create_room_error_creating_space">"Non è stato possibile creare lo spazio a causa di un errore sconosciuto. Riprova più tardi."</string>
+  <string name="screen_create_room_name_placeholder">"Aggiungi nome…"</string>
+  <string name="screen_create_room_new_room_title">"Nuova stanza"</string>
+  <string name="screen_create_room_new_space_title">"Nuovo spazio"</string>
+  <string name="screen_create_room_private_option_description">"Possono partecipare solo le persone invitate."</string>
+  <string name="screen_create_room_private_option_title">"Privato"</string>
   <string name="screen_create_room_public_option_description">"Chiunque può trovare questa stanza.
 Puoi modificarlo in qualsiasi momento nelle impostazioni della stanza."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Chiedi di entrare"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Chiunque può entrare in questa stanza"</string>
-  <string name="screen_create_room_room_address_section_footer">"Affinché questa stanza sia visibile nell\'elenco delle stanze pubbliche, è necessario un indirizzo della stanza."</string>
-  <string name="screen_create_room_room_address_section_title">"Indirizzo della stanza"</string>
+  <string name="screen_create_room_public_option_short_description">"Chiunque può partecipare."</string>
+  <string name="screen_create_room_public_option_title">"Pubblico"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Chiunque può chiedere di partecipare, ma un amministratore o un moderatore deve accettare la richiesta."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Consenti di chiedere di partecipare"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Chiunque sia membro di %1$s può partecipare, mentre tutti gli altri devono richiedere l\'accesso."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Richiedi accesso"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Possono partecipare solo le persone invitate."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Privato"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Chiunque può partecipare."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Pubblico"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Chiunque in %1$s può unirsi."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standard"</string>
+  <string name="screen_create_room_room_access_section_title">"Chi ha accesso"</string>
+  <string name="screen_create_room_room_address_section_footer">"Avrai bisogno di un indirizzo per renderlo visibile nella directory pubblica."</string>
+  <string name="screen_create_room_room_address_section_title">"Indirizzo"</string>
   <string name="screen_create_room_room_visibility_section_title">"Visibilità della stanza"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(nessuno spazio)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Non aggiungere a uno spazio"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Nessuno spazio selezionato"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Aggiungi allo spazio"</string>
   <string name="screen_create_room_topic_label">"Argomento (facoltativo)"</string>
+  <string name="screen_create_room_topic_placeholder">"Aggiungi descrizione…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-ja/translations.xml b/features/createroom/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..3a51c63d61
--- /dev/null
+++ b/features/createroom/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"新しいルーム"</string>
+  <string name="screen_create_room_add_people_title">"ユーザーを招待"</string>
+  <string name="screen_create_room_error_creating_room">"ルームの作成中に問題が発生しました"</string>
+  <string name="screen_create_room_error_creating_space">"不明な問題のためスペースを作成できませんでした。再度お試しください。"</string>
+  <string name="screen_create_room_name_placeholder">"名前を追加…"</string>
+  <string name="screen_create_room_new_room_title">"新しいルーム"</string>
+  <string name="screen_create_room_new_space_title">"新しいスペース"</string>
+  <string name="screen_create_room_private_option_description">"招待されたユーザーのみ参加できます。"</string>
+  <string name="screen_create_room_private_option_title">"非公開"</string>
+  <string name="screen_create_room_public_option_description">"ルームは全世界に公開されます。
+ルーム設定でいつでも変更できます。"</string>
+  <string name="screen_create_room_public_option_short_description">"誰でも参加できます。"</string>
+  <string name="screen_create_room_public_option_title">"公開"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"誰でも参加できますが、管理者またはモデレーターの承認が必要です。"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"参加の要求を許可"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s にいる全員が参加することができますが、事前に参加の要求をする必要があります。"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"参加を要求"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"招待されたユーザーのみが参加できます。"</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"非公開"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"誰でも参加できます。"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"公開"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"%1$s にいる全員が参加することができます。"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"スタンダード"</string>
+  <string name="screen_create_room_room_access_section_title">"参加可能なユーザー"</string>
+  <string name="screen_create_room_room_address_section_footer">"公開ディレクトリで自分を見つけられるようにするには、アドレスが必要です。"</string>
+  <string name="screen_create_room_room_address_section_title">"アドレス"</string>
+  <string name="screen_create_room_room_visibility_section_title">"ルームの公開度"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(スペースなし)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"スペースに追加しない"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"スペースが選択されていません"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"スペースに追加"</string>
+  <string name="screen_create_room_topic_label">"トピック (任意)"</string>
+  <string name="screen_create_room_topic_placeholder">"説明を追加…"</string>
+</resources>
diff --git a/features/createroom/impl/src/main/res/values-pl/translations.xml b/features/createroom/impl/src/main/res/values-pl/translations.xml
index 0164225ea2..b602cb13d8 100644
--- a/features/createroom/impl/src/main/res/values-pl/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pl/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"Nowy pokój"</string>
   <string name="screen_create_room_add_people_title">"Zaproś znajomych"</string>
   <string name="screen_create_room_error_creating_room">"Wystąpił błąd w trakcie tworzenia pokoju"</string>
-  <string name="screen_create_room_private_option_description">"Tylko zaproszone osoby mogą dołączyć do tego pokoju. Wszystkie wiadomości są szyfrowane end-to-end."</string>
+  <string name="screen_create_room_error_creating_space">"Nie udało się utworzyć przestrzeni z powodu nieznanego błędu. Spróbuj ponownie później."</string>
+  <string name="screen_create_room_name_placeholder">"Dodaj nazwę…"</string>
+  <string name="screen_create_room_new_room_title">"Nowy pokój"</string>
+  <string name="screen_create_room_new_space_title">"Nowa przestrzeń"</string>
+  <string name="screen_create_room_private_option_description">"Dołączyć mogą tylko zaproszone osoby."</string>
+  <string name="screen_create_room_private_option_title">"Prywatny"</string>
   <string name="screen_create_room_public_option_description">"Każdy może znaleźć ten pokój.
 Możesz to zmienić w ustawieniach pokoju."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić prośbę"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Poproś o dołączenie"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Każdy może dołączyć do tego pokoju"</string>
-  <string name="screen_create_room_room_address_section_footer">"Aby ten pokój był widoczny w katalogu pomieszczeń publicznych, będziesz potrzebował adres pokoju."</string>
-  <string name="screen_create_room_room_address_section_title">"Adres pokoju"</string>
+  <string name="screen_create_room_public_option_short_description">"Każdy może dołączyć."</string>
+  <string name="screen_create_room_public_option_title">"Publiczny"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Każdy może poprosić o dołączenie, ale administrator lub moderator musi to zaakceptować."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Zezwól na prośbę o dołączenie"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Każdy w %1$s może dołączyć, ale wszyscy pozostali muszą poprosić o dostęp."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Poproś o dołączenie"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Dołączyć mogą tylko zaproszone osoby."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Prywatny"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Każdy może dołączyć."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Publiczny"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Każdy w %1$s może dołączyć."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standardowy"</string>
+  <string name="screen_create_room_room_access_section_title">"Kto ma dostęp"</string>
+  <string name="screen_create_room_room_address_section_footer">"Aby ten pokój był widoczny w katalogu pomieszczeń publicznych, potrzebny jest adres pokoju."</string>
+  <string name="screen_create_room_room_address_section_title">"Adres"</string>
   <string name="screen_create_room_room_visibility_section_title">"Widoczność pomieszczenia"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(brak przestrzeni)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Nie dodawaj do przestrzeni"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Nie wybrano przestrzeni"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Dodaj do przestrzeni"</string>
   <string name="screen_create_room_topic_label">"Temat (opcjonalnie)"</string>
+  <string name="screen_create_room_topic_placeholder">"Dodaj opis…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-ro/translations.xml b/features/createroom/impl/src/main/res/values-ro/translations.xml
index a46fd1a1c4..33a5351877 100644
--- a/features/createroom/impl/src/main/res/values-ro/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ro/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"Cameră nouă"</string>
   <string name="screen_create_room_add_people_title">"Invitați prieteni"</string>
   <string name="screen_create_room_error_creating_room">"A apărut o eroare la crearea camerei"</string>
-  <string name="screen_create_room_private_option_description">"Doar persoanele invitate pot accesa această cameră. Toate mesajele sunt criptate end-to-end."</string>
+  <string name="screen_create_room_error_creating_space">"Spațiul nu a putut fi creat din cauza unei erori necunoscute. Încercați din nou mai târziu."</string>
+  <string name="screen_create_room_name_placeholder">"Adăugați un nume…"</string>
+  <string name="screen_create_room_new_room_title">"Cameră nouă"</string>
+  <string name="screen_create_room_new_space_title">"Spațiu nou"</string>
+  <string name="screen_create_room_private_option_description">"Doar persoanele invitate se pot alătura."</string>
+  <string name="screen_create_room_private_option_title">"Privat"</string>
   <string name="screen_create_room_public_option_description">"Oricine poate găsi această cameră.
 Puteți modifica acest lucru oricând în setări."</string>
+  <string name="screen_create_room_public_option_short_description">"Oricine se poate alătura."</string>
+  <string name="screen_create_room_public_option_title">"Public"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Oricine poate cere să se alăture camerei, dar un administrator sau un moderator va trebui să accepte cererea"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Cereți să vă alăturați"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Permite solicitarea de alăturare"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Oricine din %1$s se poate alătura, dar oricine altcineva trebuie să solicite acces."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Solicitați să vă alăturați"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Doar persoanele invitate se pot alătura."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Privat"</string>
   <string name="screen_create_room_room_access_section_public_option_description">"Oricine se poate alătura acestei camere"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Public"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"Oricine din %1$s se poate alătura."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standard"</string>
+  <string name="screen_create_room_room_access_section_title">"Cine are acces"</string>
   <string name="screen_create_room_room_address_section_footer">"Pentru ca această cameră să fie vizibilă în directorul de camere publice, veți avea nevoie de o adresă de cameră."</string>
-  <string name="screen_create_room_room_address_section_title">"Adresa camerei"</string>
+  <string name="screen_create_room_room_address_section_title">"Adresă"</string>
   <string name="screen_create_room_room_visibility_section_title">"Vizibilitatea camerei"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(nicun spațiu)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Nu adăugați la un spațiu"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Niciun spațiu selectat"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Adăugați la spațiu"</string>
   <string name="screen_create_room_topic_label">"Subiect (opțional)"</string>
+  <string name="screen_create_room_topic_placeholder">"Adăugați o descriere…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-uk/translations.xml b/features/createroom/impl/src/main/res/values-uk/translations.xml
index d01da0dc35..6d43472217 100644
--- a/features/createroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uk/translations.xml
@@ -3,24 +3,34 @@
   <string name="screen_create_room_action_create_room">"Нова кімната"</string>
   <string name="screen_create_room_add_people_title">"Запросити людей"</string>
   <string name="screen_create_room_error_creating_room">"Під час створення кімнати сталася помилка"</string>
+  <string name="screen_create_room_error_creating_space">"Простір не вдалося створити через невідому помилку. Спробуйте ще раз пізніше."</string>
   <string name="screen_create_room_name_placeholder">"Додати назву…"</string>
   <string name="screen_create_room_new_room_title">"Нова кімната"</string>
   <string name="screen_create_room_new_space_title">"Новий простір"</string>
   <string name="screen_create_room_private_option_description">"Можуть приєднатися лише запрошені люди."</string>
+  <string name="screen_create_room_private_option_title">"Приватний"</string>
   <string name="screen_create_room_public_option_description">"Будь-хто може знайти цю кімнату. 
 Ви можете змінити це в будь-який час у налаштуваннях кімнати."</string>
   <string name="screen_create_room_public_option_short_description">"Приєднатися може будь-хто."</string>
+  <string name="screen_create_room_public_option_title">"Публічний"</string>
   <string name="screen_create_room_room_access_section_knocking_option_description">"Будь-хто може подати запит на приєднання, але адміністратор або модератор повинен схвалити запит."</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Дозволити запит на приєднання"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"Будь-хто з %1$s може приєднатися, але всі інші повинні подати запит на доступ."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Запит на приєднання"</string>
   <string name="screen_create_room_room_access_section_private_option_description">"Приєднатися можуть лише запрошені особи."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Приватний"</string>
   <string name="screen_create_room_room_access_section_public_option_description">"Приєднатися може будь-хто."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Публічний"</string>
   <string name="screen_create_room_room_access_section_restricted_option_description">"Приєднатися може будь-хто з %1$s."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Стандартний"</string>
   <string name="screen_create_room_room_access_section_title">"Хто має доступ"</string>
   <string name="screen_create_room_room_address_section_footer">"Вам знадобиться адреса, щоб зробити її видимою в загальнодоступному каталозі."</string>
   <string name="screen_create_room_room_address_section_title">"Адреса"</string>
   <string name="screen_create_room_room_visibility_section_title">"Видимість кімнати"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(без пробілу)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Не додавати до простору"</string>
   <string name="screen_create_room_space_selection_no_space_title">"Головна"</string>
   <string name="screen_create_room_space_selection_sheet_title">"Додати до простору"</string>
-  <string name="screen_create_room_topic_label">"Тема (необов\'язково)"</string>
+  <string name="screen_create_room_topic_label">"Тематика обговорень (необов’язково)"</string>
   <string name="screen_create_room_topic_placeholder">"Додати опис…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-uz/translations.xml b/features/createroom/impl/src/main/res/values-uz/translations.xml
index 98e246716d..88de696f64 100644
--- a/features/createroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uz/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"Yangi xona"</string>
   <string name="screen_create_room_add_people_title">"Odamlarni taklif qiling"</string>
   <string name="screen_create_room_error_creating_room">"Xonani yaratishda xatolik yuz berdi"</string>
+  <string name="screen_create_room_error_creating_space">"Noma’lum xatolik tufayli maydon yaratilmadi. Keyinroq qayta urining."</string>
+  <string name="screen_create_room_name_placeholder">"Ism qo‘shish…"</string>
+  <string name="screen_create_room_new_room_title">"Yangi xona"</string>
+  <string name="screen_create_room_new_space_title">"Yangi maydon"</string>
   <string name="screen_create_room_private_option_description">"Faqat taklif etilgan shaxslargina bu xonaga kira oladi. Barcha xabarlar boshdan-oxirigacha shifrlanadi."</string>
+  <string name="screen_create_room_private_option_title">"Maxfiy"</string>
   <string name="screen_create_room_public_option_description">"Bu xonani har kim topishi mumkin.
 Buni xona sozlamalaridan istalgan vaqtda oʻzgartirishingiz mumkin."</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Qo‘shilishni so‘rang"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"Bu xonaga istalgan kishi qo‘shilishi mumkin"</string>
-  <string name="screen_create_room_room_address_section_footer">"Ushbu xona ommaviy xonalar ro‘yxatida ko‘rinishi uchun sizga xona manzili kerak bo‘ladi."</string>
+  <string name="screen_create_room_public_option_short_description">"Istalgan kishi qo‘shilishi mumkin"</string>
+  <string name="screen_create_room_public_option_title">"Ommaviy"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Istalgan kishi qo‘shilishni so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Qo‘shilish uchun ruxsat so‘rash"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s ichidagi har kim kirishi mumkin, lekin boshqalar ruxsat so‘rashi kerak."</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"Qo‘shilish uchun so‘rash"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Faqat taklif qilinganlar qo‘shilishi mumkin."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Maxfiy"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Istalgan kishi qo‘shilishi mumkin"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Ommaviy"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"%1$s ichidagi har kim qo‘shilishi mumkin."</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"Standart"</string>
+  <string name="screen_create_room_room_access_section_title">"Kimning kirish huquqi bor"</string>
+  <string name="screen_create_room_room_address_section_footer">"Ommaviy katalogda ko‘rinadigan qilish uchun manzil kerak bo‘ladi."</string>
   <string name="screen_create_room_room_address_section_title">"Xona manzili"</string>
   <string name="screen_create_room_room_visibility_section_title">"Xonaning ko‘rinishi"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"(maydon yo‘q)"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"Maydonga kiritilmasin"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"Hech qanday maydon tanlanmagan"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"Maydonga qo‘shish"</string>
   <string name="screen_create_room_topic_label">"Mavzu (ixtiyoriy)"</string>
+  <string name="screen_create_room_topic_placeholder">"Tavsif kiritish…"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-vi/translations.xml b/features/createroom/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..cde672d7de
--- /dev/null
+++ b/features/createroom/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"Phòng mới"</string>
+  <string name="screen_create_room_add_people_title">"Mời ai đó"</string>
+  <string name="screen_create_room_error_creating_room">"Đã xảy ra lỗi khi tạo phòng."</string>
+  <string name="screen_create_room_private_option_description">"Chỉ những người được mời mới có thể tham gia."</string>
+  <string name="screen_create_room_private_option_title">"Riêng tư"</string>
+  <string name="screen_create_room_public_option_description">"Bất kỳ ai cũng có thể tìm thấy phòng này. 
+Bạn có thể thay đổi cài đặt phòng bất cứ lúc nào."</string>
+  <string name="screen_create_room_public_option_title">"Công cộng"</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Riêng tư"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Công cộng"</string>
+  <string name="screen_create_room_topic_label">"Chủ đề (tùy chọn)"</string>
+  <string name="screen_create_room_topic_placeholder">"Thêm mô tả…"</string>
+</resources>
diff --git a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
index 05495a0594..0899f065d7 100644
--- a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
@@ -3,14 +3,34 @@
   <string name="screen_create_room_action_create_room">"建立聊天室"</string>
   <string name="screen_create_room_add_people_title">"邀請夥伴"</string>
   <string name="screen_create_room_error_creating_room">"建立聊天室時發生錯誤"</string>
-  <string name="screen_create_room_private_option_description">"僅被邀請的人才能存取此聊天室。所有訊息均會端到端加密。"</string>
+  <string name="screen_create_room_error_creating_space">"因為未知錯誤，無法建立空間。請稍後再試。"</string>
+  <string name="screen_create_room_name_placeholder">"新增名稱……"</string>
+  <string name="screen_create_room_new_room_title">"新聊天室"</string>
+  <string name="screen_create_room_new_space_title">"新空間"</string>
+  <string name="screen_create_room_private_option_description">"僅被邀請的人才能加入。"</string>
+  <string name="screen_create_room_private_option_title">"私人"</string>
   <string name="screen_create_room_public_option_description">"任何人都可以找到此聊天室。
 您隨時都可以在聊天室設定中變更此設定。"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可以要求加入聊天室，但管理員或版主必須接受該請求"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"要求加入"</string>
-  <string name="screen_create_room_room_access_section_public_option_description">"任何人都可以加入此聊天室"</string>
-  <string name="screen_create_room_room_address_section_footer">"為了讓此聊天室在公開聊天室目錄中可見，您需要聊天室地址。"</string>
-  <string name="screen_create_room_room_address_section_title">"聊天室地址"</string>
+  <string name="screen_create_room_public_option_short_description">"任何人都可以加入。"</string>
+  <string name="screen_create_room_public_option_title">"公開"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可以要求加入，但管理員或版主必須接受該請求"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"允許要求加入"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"任何在 %1$s 中的人都可以加入，但其他人就必須申請存取權。"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"要求加入"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"僅被邀請的人才可以加入。"</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"私人"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"任何人都可以加入"</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"公開"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"在 %1$s 中的任何人都可以加入。"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_title">"標準"</string>
+  <string name="screen_create_room_room_access_section_title">"誰有權存取"</string>
+  <string name="screen_create_room_room_address_section_footer">"您需要地址才能讓該資訊在公開目錄中顯示。"</string>
+  <string name="screen_create_room_room_address_section_title">"地址"</string>
   <string name="screen_create_room_room_visibility_section_title">"聊天室能見度"</string>
+  <string name="screen_create_room_space_selection_no_space_description">"（沒有空間）"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"不要新增至空間"</string>
+  <string name="screen_create_room_space_selection_no_space_title">"未選取空間"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"新增至空間"</string>
   <string name="screen_create_room_topic_label">"主題（非必填）"</string>
+  <string name="screen_create_room_topic_placeholder">"新增描述……"</string>
 </resources>
diff --git a/features/createroom/impl/src/main/res/values-zh/translations.xml b/features/createroom/impl/src/main/res/values-zh/translations.xml
index 46d9654fbf..1ba1036634 100644
--- a/features/createroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh/translations.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_create_room_action_create_room">"新聊天室"</string>
-  <string name="screen_create_room_add_people_title">"邀请朋友"</string>
-  <string name="screen_create_room_error_creating_room">"创建聊天室时出错"</string>
+  <string name="screen_create_room_action_create_room">"新房间"</string>
+  <string name="screen_create_room_add_people_title">"邀请人员"</string>
+  <string name="screen_create_room_error_creating_room">"创建房间时出错"</string>
   <string name="screen_create_room_error_creating_space">"由于未知错误，空间创建失败。请稍后再试。"</string>
   <string name="screen_create_room_name_placeholder">"添加名称…"</string>
-  <string name="screen_create_room_new_room_title">"新聊天室"</string>
+  <string name="screen_create_room_new_room_title">"新房间"</string>
   <string name="screen_create_room_new_space_title">"新空间"</string>
-  <string name="screen_create_room_private_option_description">"仅限受邀者加入。"</string>
+  <string name="screen_create_room_private_option_description">"仅限受邀人员加入。"</string>
   <string name="screen_create_room_private_option_title">"私密"</string>
-  <string name="screen_create_room_public_option_description">"任何人都能找到此聊天室。
-你可以随时在聊天室设置中更改。"</string>
-  <string name="screen_create_room_public_option_short_description">"任何人都可以找到并加入"</string>
+  <string name="screen_create_room_public_option_description">"任何人都能找到此房间。
+你可以随时在房间设置中更改。"</string>
+  <string name="screen_create_room_public_option_short_description">"任何人都可以加入"</string>
   <string name="screen_create_room_public_option_title">"公共"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可申请加入，但需由管理员或版主批准请求。"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"请求加入"</string>
-  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s 中的任何人都可加入，但其他人必须申请访问权限。"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可申请加入，但需由管理员或协管员批准申请。"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"申请加入"</string>
+  <string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s 中的任何人都可以加入，但其他人必须申请访问。"</string>
   <string name="screen_create_room_room_access_section_knocking_restricted_option_title">"申请加入"</string>
-  <string name="screen_create_room_room_access_section_private_option_description">"仅限受邀者加入。"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"仅限受邀人员加入。"</string>
   <string name="screen_create_room_room_access_section_private_option_title">"私密"</string>
   <string name="screen_create_room_room_access_section_public_option_description">"任何人都可以加入。"</string>
   <string name="screen_create_room_room_access_section_public_option_title">"公共"</string>
-  <string name="screen_create_room_room_access_section_restricted_option_description">"%1$s 中的任何人可加入。"</string>
+  <string name="screen_create_room_room_access_section_restricted_option_description">"%1$s 中的任何人都可以加入。"</string>
   <string name="screen_create_room_room_access_section_restricted_option_title">"标准"</string>
   <string name="screen_create_room_room_access_section_title">"谁有权访问此房间"</string>
-  <string name="screen_create_room_room_address_section_footer">"要使该聊天室在公共目录中可见，您需要一个聊天室地址。"</string>
+  <string name="screen_create_room_room_address_section_footer">"要使该房间在公共目录中可见，你需要一个地址。"</string>
   <string name="screen_create_room_room_address_section_title">"地址"</string>
   <string name="screen_create_room_room_visibility_section_title">"房间可见性"</string>
   <string name="screen_create_room_space_selection_no_space_description">"(无空间)"</string>
-  <string name="screen_create_room_space_selection_no_space_option">"请勿添加至空间"</string>
+  <string name="screen_create_room_space_selection_no_space_option">"不要添加到空间"</string>
   <string name="screen_create_room_space_selection_no_space_title">"未选择空间"</string>
-  <string name="screen_create_room_space_selection_sheet_title">"添加至空间"</string>
+  <string name="screen_create_room_space_selection_sheet_title">"添加到空间"</string>
   <string name="screen_create_room_topic_label">"主题（可选）"</string>
   <string name="screen_create_room_topic_placeholder">"添加描述…"</string>
 </resources>
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt
index fcedcb2367..046d00a5c6 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/ConfigureRoomPresenterTest.kt
@@ -20,11 +20,13 @@ import io.element.android.features.createroom.impl.configureroom.CreateRoomConfi
 import io.element.android.features.createroom.impl.configureroom.JoinRuleItem
 import io.element.android.features.createroom.impl.configureroom.RoomAddress
 import io.element.android.features.createroom.impl.configureroom.RoomVisibilityState
+import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
@@ -56,6 +58,8 @@ import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.matching
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.test
 import io.mockk.mockk
 import kotlinx.collections.immutable.persistentMapOf
@@ -66,8 +70,6 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import java.io.File
 import java.util.Optional
 
@@ -75,8 +77,7 @@ private const val AN_URI_FROM_CAMERA = "content://uri_from_camera"
 private const val AN_URI_FROM_CAMERA_2 = "content://uri_from_camera_2"
 private const val AN_URI_FROM_GALLERY = "content://uri_from_gallery"
 
-@RunWith(RobolectricTestRunner::class)
-class ConfigureRoomPresenterTest {
+class ConfigureRoomPresenterTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -301,7 +302,9 @@ class ConfigureRoomPresenterTest {
                     roomName = 0,
                     roomAvatar = 0,
                     roomTopic = 0,
-                    spaceChild = 0
+                    spaceChild = 0,
+                    beacon = 0,
+                    beaconInfo = 0,
                 ),
                 users = persistentMapOf(),
             )
@@ -517,6 +520,30 @@ class ConfigureRoomPresenterTest {
         }
     }
 
+    @Test
+    fun `present - creating a private room when encryption is disabled by the HS creates it unencrypted`() = runTest {
+        val sessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { true })
+        val createRoomLambda = lambdaRecorder<CreateRoomParameters, Result<RoomId>> { Result.success(A_ROOM_ID) }
+        val matrixClient = createMatrixClient().apply {
+            createRoomResult = createRoomLambda
+        }
+        val presenter = createConfigureRoomPresenter(
+            matrixClient = matrixClient,
+            sessionEnterpriseService = sessionEnterpriseService,
+        )
+        presenter.test {
+            val initialState = initialState()
+
+            initialState.eventSink(ConfigureRoomEvents.JoinRuleChanged(JoinRuleItem.PrivateVisibility.Private))
+            initialState.eventSink(ConfigureRoomEvents.CreateRoom)
+
+            assertThat(awaitItem().createRoomAction.isLoading()).isTrue()
+            assertThat(awaitItem().createRoomAction.isSuccess()).isTrue()
+
+            createRoomLambda.assertions().isCalledOnce().with(matching<CreateRoomParameters> { !it.isEncrypted })
+        }
+    }
+
     private suspend fun TurbineTestContext<ConfigureRoomState>.initialState(): ConfigureRoomState {
         skipItems(1)
         return awaitItem()
@@ -552,6 +579,7 @@ class ConfigureRoomPresenterTest {
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         isKnockFeatureEnabled: Boolean = true,
         mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+        sessionEnterpriseService: FakeSessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { false }),
     ) = ConfigureRoomPresenter(
         isSpace = isSpace,
         initialParentSpaceId = initialParenSpaceId,
@@ -566,5 +594,6 @@ class ConfigureRoomPresenterTest {
             mapOf(FeatureFlags.Knock.key to isKnockFeatureEnabled)
         ),
         mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
+        sessionEnterpriseService = sessionEnterpriseService,
     )
 }
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
index c0d625a45e..738046b3a3 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.features.logout.impl
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -49,17 +48,18 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.deactivation.impl.R
 import io.element.android.features.logout.impl.ui.AccountDeactivationActionDialog
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.components.list.SwitchListItem
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
 import io.element.android.libraries.designsystem.modifiers.onTabOrEnterKeyFocusNext
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.buildAnnotatedStringWithStyledPart
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.PasswordVisibilityToggle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextField
@@ -135,7 +135,7 @@ private fun ColumnScope.Buttons(
 ) {
     val logoutAction = state.accountDeactivationAction
     Button(
-        text = stringResource(CommonStrings.action_deactivate),
+        text = stringResource(CommonStrings.action_delete),
         showProgress = logoutAction is AsyncAction.Loading,
         destructive = true,
         enabled = state.submitEnabled,
@@ -175,9 +175,9 @@ private fun Content(
             style = ElementTheme.typography.fontBodyMdRegular,
             color = ElementTheme.colors.textSecondary,
         )
-        InfoListOrganism(
+        VisualList(
             items = persistentListOf(
-                InfoListItem(
+                VisualListItemData(
                     message = buildAnnotatedStringWithStyledPart(
                         R.string.screen_deactivate_account_list_item_1,
                         R.string.screen_deactivate_account_list_item_1_bold_part,
@@ -194,7 +194,7 @@ private fun Content(
                         )
                     },
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_deactivate_account_list_item_2),
                     iconComposable = {
                         Icon(
@@ -205,7 +205,7 @@ private fun Content(
                         )
                     },
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_deactivate_account_list_item_3),
                     iconComposable = {
                         Icon(
@@ -216,7 +216,7 @@ private fun Content(
                         )
                     },
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_deactivate_account_list_item_4),
                     iconComposable = {
                         Icon(
@@ -280,14 +280,10 @@ private fun Content(
                 placeholder = stringResource(CommonStrings.common_password),
                 visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
                 trailingIcon = {
-                    val image =
-                        if (passwordVisible) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff()
-                    val description =
-                        if (passwordVisible) stringResource(CommonStrings.a11y_hide_password) else stringResource(CommonStrings.a11y_show_password)
-
-                    Box(modifier = Modifier.clickable { passwordVisible = !passwordVisible }) {
-                        Icon(imageVector = image, description)
-                    }
+                    PasswordVisibilityToggle(
+                        visible = passwordVisible,
+                        onToggle = { passwordVisible = !passwordVisible },
+                    )
                 },
                 keyboardOptions = KeyboardOptions(
                     keyboardType = KeyboardType.Password,
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
index 905112a78d..ab9d87c543 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
@@ -22,7 +22,7 @@ fun AccountDeactivationConfirmationDialog(
     ConfirmationDialog(
         title = stringResource(id = R.string.screen_deactivate_account_title),
         content = stringResource(R.string.screen_deactivate_account_confirmation_dialog_content),
-        submitText = stringResource(id = CommonStrings.action_deactivate),
+        submitText = stringResource(id = CommonStrings.action_delete),
         onSubmitClick = onSubmitClick,
         onDismiss = onDismiss,
         destructiveSubmit = true,
diff --git a/features/deactivation/impl/src/main/res/values-bg/translations.xml b/features/deactivation/impl/src/main/res/values-bg/translations.xml
index 34ad5b4772..936e4726a5 100644
--- a/features/deactivation/impl/src/main/res/values-bg/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-bg/translations.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_deactivate_account_confirmation_dialog_content">"Моля, потвърдете, че искате да деактивирате акаунта си. Това действие не може да бъде отменено."</string>
-  <string name="screen_deactivate_account_title">"Деактивиране на акаунта"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-ca/translations.xml b/features/deactivation/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..c8ad39f7ae
--- /dev/null
+++ b/features/deactivation/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Si us plau, confirma que vols desactivar el teu compte. Aquesta acció no es pot desfer."</string>
+  <string name="screen_deactivate_account_delete_all_messages">"Elimina tots els meus missatges"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Avís: els futurs usuaris podrien veure converses incompletes."</string>
+  <string name="screen_deactivate_account_description">"La desactivació del compte és %1$s, implica:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"irreversible"</string>
+  <string name="screen_deactivate_account_list_item_1">"%1$s el compte (no podràs tornar a iniciar sessió i el teu ID no es podrà reutilitzar)."</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Desactiva permanentment"</string>
+  <string name="screen_deactivate_account_list_item_2">"Se t\'eliminarà de totes les sales o xats."</string>
+  <string name="screen_deactivate_account_list_item_3">"S\'eliminarà la informació del compte del nostre servidor d\'identitat."</string>
+  <string name="screen_deactivate_account_list_item_4">"Els teus missatges continuaran sent visibles per als usuaris registrats, però no estaran disponibles per a usuaris nous o no registrats si decideixes eliminar-los."</string>
+</resources>
diff --git a/features/deactivation/impl/src/main/res/values-cs/translations.xml b/features/deactivation/impl/src/main/res/values-cs/translations.xml
index e0f4fd14c7..13659e1a75 100644
--- a/features/deactivation/impl/src/main/res/values-cs/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-cs/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Potvrďte prosím, že chcete svůj účet deaktivovat. Tuto akci nelze vrátit zpět."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Potvrďte prosím, že chcete smazat svůj účet. Tuto akci nelze vrátit zpět."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Smazat všechny mé zprávy"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Upozornění: Budoucí uživatelé mohou vidět neúplné konverzace."</string>
-  <string name="screen_deactivate_account_description">"Deaktivace vašeho účtu je %1$s, což způsobí:"</string>
+  <string name="screen_deactivate_account_description">"Smazání účtu je %1$s, dojde k:"</string>
   <string name="screen_deactivate_account_description_bold_part">"nezvratná"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s váš účet (nemůžete se znovu přihlásit a vaše ID nelze znovu použít)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Trvale zakázat"</string>
   <string name="screen_deactivate_account_list_item_2">"Odebere vás ze všech chatovacích místností."</string>
   <string name="screen_deactivate_account_list_item_3">"Odstraní informace o vašem účtu z našeho serveru identit."</string>
   <string name="screen_deactivate_account_list_item_4">"Vaše zprávy budou stále viditelné registrovaným uživatelům, ale nebudou dostupné novým ani neregistrovaným uživatelům, pokud se rozhodnete je smazat."</string>
-  <string name="screen_deactivate_account_title">"Deaktivovat účet"</string>
+  <string name="screen_deactivate_account_title">"Smazat účet"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-da/translations.xml b/features/deactivation/impl/src/main/res/values-da/translations.xml
index c6dcb1710a..f434547b8a 100644
--- a/features/deactivation/impl/src/main/res/values-da/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-da/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Bekræft venligst, at du vil deaktivere din konto. Denne handling kan ikke fortrydes."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Bekræft venligst, at du ønsker at slette din konto. Denne handling kan ikke fortrydes."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Slet alle mine beskeder"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Advarsel: Fremtidige brugere kan muligvis se ufuldstændige samtaler."</string>
-  <string name="screen_deactivate_account_description">"Deaktivering af din konto er %1$s, det vil:"</string>
+  <string name="screen_deactivate_account_description">"Sletning af din konto er %1$s, det vil:"</string>
   <string name="screen_deactivate_account_description_bold_part">"irreversibel"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s din konto (du kan ikke logge ind igen, og dit ID kan ikke genbruges)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Permanent deaktivere"</string>
   <string name="screen_deactivate_account_list_item_2">"Fjerne dig fra alle samtaler"</string>
   <string name="screen_deactivate_account_list_item_3">"Slette dine kontooplysninger fra vores identitetsserver."</string>
   <string name="screen_deactivate_account_list_item_4">"Dine beskeder vil stadig være synlige for registrerede brugere, men vil ikke være tilgængelige for nye eller uregistrerede brugere, hvis du vælger at slette dem."</string>
-  <string name="screen_deactivate_account_title">"Deaktiver konto"</string>
+  <string name="screen_deactivate_account_title">"Slet konto"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-de/translations.xml b/features/deactivation/impl/src/main/res/values-de/translations.xml
index 1aec7495a1..8430134d00 100644
--- a/features/deactivation/impl/src/main/res/values-de/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-de/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Bitte bestätige, dass du dein Konto deaktivieren möchtest. Dies kann nicht rückgängig gemacht werden."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Bitte bestätige, dass du dein Konto löschen möchtest. Diese Aktion kann nicht rückgängig gemacht werden."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Lösche alle meine Nachrichten"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Warnung: Künftigen Nutzern werden möglicherweise unvollständige Konversationen angezeigt."</string>
-  <string name="screen_deactivate_account_description">"Dein Konto zu deaktivieren ist %1$s. Folgendes wird passieren:"</string>
+  <string name="screen_deactivate_account_description">"Das Löschen deines Kontos ist %1$s. Es wird:"</string>
   <string name="screen_deactivate_account_description_bold_part">"irreversibel"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s dein Konto (du kannst dich nicht erneut anmelden und deine ID kann nicht wiederverwendet werden)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Dauerhaft deaktivieren"</string>
   <string name="screen_deactivate_account_list_item_2">"Du wirst aus allen Chats entfernt."</string>
   <string name="screen_deactivate_account_list_item_3">"Lösche deine Kontoinformationen von unserem Identitätsserver."</string>
   <string name="screen_deactivate_account_list_item_4">"Deine Nachrichten werden für bereits registrierte Nutzer weiterhin sichtbar sein. Für neue oder unregistrierte Nutzer sind sie nicht verfügbar, wenn du sie löschen solltest."</string>
-  <string name="screen_deactivate_account_title">"Nutzerkonto deaktivieren"</string>
+  <string name="screen_deactivate_account_title">"Konto löschen"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-el/translations.xml b/features/deactivation/impl/src/main/res/values-el/translations.xml
index ac645f3063..b6a359abbf 100644
--- a/features/deactivation/impl/src/main/res/values-el/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-el/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Παρακαλώ επιβεβαίωσε ότι θες να απενεργοποιήσεις τον λογαριασμό σου. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Επιβεβαιώστε ότι θέλετε να διαγράψετε τον λογαριασμό σας. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Διαγραφή όλων των μηνυμάτων μου"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Προειδοποίηση: Οι μελλοντικοί χρήστες ενδέχεται να βλέπουν ελλιπείς συνομιλίες."</string>
-  <string name="screen_deactivate_account_description">"Η απενεργοποίηση του λογαριασμού σας είναι %1$s, θα:"</string>
+  <string name="screen_deactivate_account_description">"Η διαγραφή του λογαριασμού σας είναι %1$s, και θα:"</string>
   <string name="screen_deactivate_account_description_bold_part">"μη αναστρέψιμο"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s τον λογαριασμό σου (δεν μπορείς να συνδεθείς ξανά και το αναγνωριστικό σου δεν μπορεί να επαναχρησιμοποιηθεί)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Μόνιμη απενεργοποίηση"</string>
   <string name="screen_deactivate_account_list_item_2">"Αποχώρησή σας από όλες τις αίθουσες συνομιλίας."</string>
   <string name="screen_deactivate_account_list_item_3">"Διαγράψει τα στοιχεία του λογαριασμού σου από τον διακομιστή ταυτότητάς μας."</string>
   <string name="screen_deactivate_account_list_item_4">"Τα μηνύματά σου θα εξακολουθούν να είναι ορατά στους εγγεγραμμένους χρήστες, αλλά δεν θα είναι διαθέσιμα σε νέους ή μη εγγεγραμμένους χρήστες εάν επιλέξεις να τα διαγράψεις."</string>
-  <string name="screen_deactivate_account_title">"Απενεργοποίηση λογαριασμού"</string>
+  <string name="screen_deactivate_account_title">"Διαγραφή λογαριασμού"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-es/translations.xml b/features/deactivation/impl/src/main/res/values-es/translations.xml
index cd0757ba3e..17ae73d6c8 100644
--- a/features/deactivation/impl/src/main/res/values-es/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-es/translations.xml
@@ -10,5 +10,4 @@
   <string name="screen_deactivate_account_list_item_2">"Te eliminará de todas las salas de chat."</string>
   <string name="screen_deactivate_account_list_item_3">"Eliminará la información de tu cuenta de nuestro servidor de identidad."</string>
   <string name="screen_deactivate_account_list_item_4">"Tus mensajes seguirán siendo visibles para los usuarios registrados, pero no estarán disponibles para los usuarios nuevos o no registrados si decides eliminarlos."</string>
-  <string name="screen_deactivate_account_title">"Desactivar cuenta"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-et/translations.xml b/features/deactivation/impl/src/main/res/values-et/translations.xml
index 95695fef16..bfb41d7665 100644
--- a/features/deactivation/impl/src/main/res/values-et/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-et/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Palun kinnita uuesti, et soovid eemaldada oma konto kasutusest"</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Palun kinnita uuesti, et soovid kustutada oma kasutajakonto. Seda tegevust ei saa tagasi pöörata."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Kustuta kõik minu sõnumid"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Hoiatus: tulevased kasutajad võivad näha poolikuid vestlusi."</string>
-  <string name="screen_deactivate_account_description">"Sinu konto kasutusest eemaldamine on %1$s ja sellega:"</string>
+  <string name="screen_deactivate_account_description">"Sinu konto kustutamine on %1$s ja sellega:"</string>
   <string name="screen_deactivate_account_description_bold_part">"pöördumatu"</string>
   <string name="screen_deactivate_account_list_item_1">"Sinu kasutajakonto %1$s (sa ei saa enam sellega võrku logida ning kasutajatunnust ei saa enam pruukida)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"jäädavalt eemaldatakse kasutusest"</string>
   <string name="screen_deactivate_account_list_item_2">"Sind logitakse välja kõikidest jututubadest."</string>
   <string name="screen_deactivate_account_list_item_3">"Kustutatakse sinu andmed meie isikutuvastusserverist."</string>
   <string name="screen_deactivate_account_list_item_4">"Sinu sõnumid on jätkuvalt nähtavad registreeritud kasutajatele, kuid kui otsustad sõnumid kustutada, siis nad nad pole nähtavad uutele ja registreerimata kasutajatele."</string>
-  <string name="screen_deactivate_account_title">"Eemalda konto kasutusest"</string>
+  <string name="screen_deactivate_account_title">"Kustuta kasutajakonto"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-fi/translations.xml b/features/deactivation/impl/src/main/res/values-fi/translations.xml
index df2543be70..148fe3d610 100644
--- a/features/deactivation/impl/src/main/res/values-fi/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-fi/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Vahvista, että haluat deaktivoida tilisi. Tätä ei voi perua."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Vahvista, että haluat poistaa tilisi. Tätä ei voi perua."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Poista kaikki viestini"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Varoitus: Tulevaisuudessa muut voivat nähdä puutteellisia keskusteluja."</string>
-  <string name="screen_deactivate_account_description">"Tilisi deaktivointia %1$s. Jos teet sen:"</string>
+  <string name="screen_deactivate_account_description">"Tilisi poistamista %1$s. Jos teet sen:"</string>
   <string name="screen_deactivate_account_description_bold_part">"ei voi peruuttaa"</string>
   <string name="screen_deactivate_account_list_item_1">"Tilisi %1$s (et voi kirjautua takaisin sisään, eikä tunnustasi voi käyttää uudelleen)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"poistetaan käytöstä pysyvästi"</string>
   <string name="screen_deactivate_account_list_item_2">"Sinut poistetaan kaikista keskusteluhuoneista."</string>
   <string name="screen_deactivate_account_list_item_3">"Tilitietosi poistetaan identiteettipalvelimeltamme."</string>
   <string name="screen_deactivate_account_list_item_4">"Viestisi näkyvät edelleen rekisteröityneille käyttäjille, mutta ne eivät ole uusien tai rekisteröimättömien käyttäjien saatavilla, jos päätät poistaa ne."</string>
-  <string name="screen_deactivate_account_title">"Deaktivoi tili"</string>
+  <string name="screen_deactivate_account_title">"Poista tili"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-fr/translations.xml b/features/deactivation/impl/src/main/res/values-fr/translations.xml
index 675ac1e1e0..cf69cb3275 100644
--- a/features/deactivation/impl/src/main/res/values-fr/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-fr/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Veuillez confirmer que vous souhaitez désactiver votre compte. Cette action ne peut pas être annulée."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Veuillez confirmer que vous souhaitez supprimer votre compte. Cette action ne peut pas être annulée."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Supprimer tous mes messages"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Attention : les futurs utilisateurs pourraient voir des conversations incomplètes."</string>
-  <string name="screen_deactivate_account_description">"La désactivation de votre compte est %1$s, cela va :"</string>
+  <string name="screen_deactivate_account_description">"La suppression de votre compte est %1$s, cela va :"</string>
   <string name="screen_deactivate_account_description_bold_part">"irréversible"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s votre compte (vous ne pourrez plus vous reconnecter et votre identifiant ne pourra pas être réutilisé)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Désactiver définitivement"</string>
   <string name="screen_deactivate_account_list_item_2">"Vous retirer de tous les salons et toutes les discussions."</string>
   <string name="screen_deactivate_account_list_item_3">"Supprimer les informations de votre compte du serveur d’identité."</string>
   <string name="screen_deactivate_account_list_item_4">"Rendre vos messages invisibles aux futurs membres des salons si vous choisissez de les supprimer. Vos messages seront toujours visibles pour les utilisateurs qui les ont déjà récupérés."</string>
-  <string name="screen_deactivate_account_title">"Désactiver le compte"</string>
+  <string name="screen_deactivate_account_title">"Supprimer le compte"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-hr/translations.xml b/features/deactivation/impl/src/main/res/values-hr/translations.xml
index 04148fdc48..1d8a02a08c 100644
--- a/features/deactivation/impl/src/main/res/values-hr/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-hr/translations.xml
@@ -10,5 +10,5 @@
   <string name="screen_deactivate_account_list_item_2">"Ukloniti vas iz svih soba za razgovore."</string>
   <string name="screen_deactivate_account_list_item_3">"Izbrisati podatke o vašem računu s našeg poslužitelja identiteta."</string>
   <string name="screen_deactivate_account_list_item_4">"Vaše će poruke i dalje biti vidljive registriranim korisnicima, ali neće biti dostupne novim ili neregistriranim korisnicima ako ih odlučite izbrisati."</string>
-  <string name="screen_deactivate_account_title">"Deaktiviraj račun"</string>
+  <string name="screen_deactivate_account_title">"Izbriši račun"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-hu/translations.xml b/features/deactivation/impl/src/main/res/values-hu/translations.xml
index 3d3722b8ef..2c3f51ed7a 100644
--- a/features/deactivation/impl/src/main/res/values-hu/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-hu/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Erősítse meg, hogy deaktiválja a fiókját. Ez a művelet nem vonható vissza."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Erősítse meg a fiókja törlését. Ez a művelet nem vonható vissza."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Összes saját üzenet törlése"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Figyelmeztetés: A jövőbeli felhasználók hiányos beszélgetéseket láthatnak."</string>
-  <string name="screen_deactivate_account_description">"A fiók deaktiválása %1$s, a következőket okozza:"</string>
+  <string name="screen_deactivate_account_description">"Fiókjának törlése: %1$s, ez a következőket eredményezi:"</string>
   <string name="screen_deactivate_account_description_bold_part">"visszafordíthatatlan"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s a fiókját (nem fog tudni újra bejelentkezni, és az azonosítója nem használható újra)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Véglegesen letiltja"</string>
   <string name="screen_deactivate_account_list_item_2">"Eltávolításra kerül az összes csevegőszobából."</string>
   <string name="screen_deactivate_account_list_item_3">"Törlésre kerülnek a fiókadatai az azonosítási kiszolgálónkról."</string>
   <string name="screen_deactivate_account_list_item_4">"Üzenetei továbbra is láthatóak maradnak a regisztrált felhasználók számára, de nem lesznek elérhetőek az új vagy nem regisztrált felhasználók számára, ha úgy dönt, hogy törli őket."</string>
-  <string name="screen_deactivate_account_title">"Fiók deaktiválása"</string>
+  <string name="screen_deactivate_account_title">"Fiók törlése"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-it/translations.xml b/features/deactivation/impl/src/main/res/values-it/translations.xml
index 3fbc9d536b..e3de1ec8bb 100644
--- a/features/deactivation/impl/src/main/res/values-it/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-it/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Conferma di voler disattivare il tuo account. Questa azione è irreversibile."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Conferma di voler eliminare il tuo account. Questa azione è irreversibile."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Elimina tutti i miei messaggi"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Attenzione: gli utenti futuri potrebbero vedere conversazioni incomplete."</string>
-  <string name="screen_deactivate_account_description">"La disattivazione del tuo account è %1$s , quindi:"</string>
+  <string name="screen_deactivate_account_description">"L\'eliminazione del tuo account è %1$s, e comporterà:"</string>
   <string name="screen_deactivate_account_description_bold_part">"irreversibile"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s il tuo account (non puoi riaccedere e il tuo ID non può essere riutilizzato)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Disattiva permanentemente"</string>
   <string name="screen_deactivate_account_list_item_2">"Ti rimuove da tutte le stanze di chat."</string>
   <string name="screen_deactivate_account_list_item_3">"Elimina le informazioni del tuo account dal nostro server di identità."</string>
   <string name="screen_deactivate_account_list_item_4">"I tuoi messaggi saranno ancora visibili agli utenti registrati, ma non saranno disponibili per gli utenti nuovi o non registrati se decidi di eliminarli."</string>
-  <string name="screen_deactivate_account_title">"Disattiva account"</string>
+  <string name="screen_deactivate_account_title">"Elimina account"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-ja/translations.xml b/features/deactivation/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..53893a594f
--- /dev/null
+++ b/features/deactivation/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_deactivate_account_confirmation_dialog_content">"アカウントを削除しようとしていることを確認しています。この操作は元に戻せません。"</string>
+  <string name="screen_deactivate_account_delete_all_messages">"メッセージをすべて削除"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"注意: 新しいユーザーには断片的な会話が表示されます"</string>
+  <string name="screen_deactivate_account_description">"アカウントを削除することは %1$s であり、次の変化が生じます:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"不可逆"</string>
+  <string name="screen_deactivate_account_list_item_1">"アカウントを %1$s (再度ログイン不可, 同一のIDを再利用不可)"</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"恒久的に無効化する"</string>
+  <string name="screen_deactivate_account_list_item_2">"すべてのチャットルームから退出します。"</string>
+  <string name="screen_deactivate_account_list_item_3">"アカウント提供元サーバーからアカウント情報を削除します。"</string>
+  <string name="screen_deactivate_account_list_item_4">"あなたの会話は、既存ユーザーには引き続き表示されますが、新規ユーザーには表示されなくなります。"</string>
+  <string name="screen_deactivate_account_title">"アカウントを削除"</string>
+</resources>
diff --git a/features/deactivation/impl/src/main/res/values-ko/translations.xml b/features/deactivation/impl/src/main/res/values-ko/translations.xml
index 6b7953a4a5..83eaf7ff21 100644
--- a/features/deactivation/impl/src/main/res/values-ko/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ko/translations.xml
@@ -3,12 +3,12 @@
   <string name="screen_deactivate_account_confirmation_dialog_content">"계정을 비활성화하시겠습니까? 이 작업은 되돌릴 수 없습니다."</string>
   <string name="screen_deactivate_account_delete_all_messages">"모든 내 메시지 삭제"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"경고: 향후 사용자는 불완전한 대화 내용을 볼 수 있습니다."</string>
-  <string name="screen_deactivate_account_description">"계정을 비활성화하는 것은 %1$s 이며, 다음과 같은 조치를 취합니다:"</string>
+  <string name="screen_deactivate_account_description">"계정을 삭제하면 %1$s, 다음과 같이 처리됩니다:"</string>
   <string name="screen_deactivate_account_description_bold_part">"불가역적"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s 귀하의 계정 (로그인할 수 없으며, 귀하의 ID는 재사용할 수 없습니다)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"영구적으로 비활성화"</string>
   <string name="screen_deactivate_account_list_item_2">"모든 채팅방에서 자신을 제거하세요."</string>
   <string name="screen_deactivate_account_list_item_3">"당사의 신원 서버에서 귀하의 계정 정보를 삭제하세요."</string>
   <string name="screen_deactivate_account_list_item_4">"메시지는 등록된 사용자에게는 계속 표시되지만, 삭제하면 신규 또는 미등록 사용자는 볼 수 없게 됩니다."</string>
-  <string name="screen_deactivate_account_title">"계정 비활성화"</string>
+  <string name="screen_deactivate_account_title">"계정 삭제"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-nb/translations.xml b/features/deactivation/impl/src/main/res/values-nb/translations.xml
index cdff7f886d..6245c8b484 100644
--- a/features/deactivation/impl/src/main/res/values-nb/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-nb/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Bekreft at du vil deaktivere kontoen din. Denne handlingen kan ikke angres."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Bekreft at du vil slette kontoen din. Denne handlingen kan ikke angres."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Slett alle meldingene mine"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Advarsel: Fremtidige brukere vil kunne se ufullstendige samtaler."</string>
-  <string name="screen_deactivate_account_description">"Deaktivering av kontoen din er %1$s , det vil:"</string>
+  <string name="screen_deactivate_account_description">"Hvis %1$s sletter kontoen din, vil følgende skje:"</string>
   <string name="screen_deactivate_account_description_bold_part">"irreversibel"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s kontoen din (du kan ikke logge på igjen, og ID-en din kan ikke brukes på nytt)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Deaktiver permanent"</string>
   <string name="screen_deactivate_account_list_item_2">"Fjern deg fra alle chatterom."</string>
   <string name="screen_deactivate_account_list_item_3">"Slett kontoinformasjonen din fra vår identitetsserver."</string>
   <string name="screen_deactivate_account_list_item_4">"Meldingene dine vil fortsatt være synlige for registrerte brukere, men vil ikke være tilgjengelige for nye eller uregistrerte brukere hvis du velger å slette dem."</string>
-  <string name="screen_deactivate_account_title">"Deaktiver kontoen"</string>
+  <string name="screen_deactivate_account_title">"Slett kontoen"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-pl/translations.xml b/features/deactivation/impl/src/main/res/values-pl/translations.xml
index bddb6a9037..5778123aa5 100644
--- a/features/deactivation/impl/src/main/res/values-pl/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-pl/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Potwierdź dezaktywacje konta. Tej akcji nie można cofnąć."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Potwierdź usunięcie konta. Tej akcji nie można cofnąć."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Usuń wszystkie moje wiadomości"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Ostrzeżenie: Przyszli użytkownicy mogą zobaczyć niekompletne rozmowy."</string>
-  <string name="screen_deactivate_account_description">"Dezaktywacja konta jest %1$s, zostanie:"</string>
+  <string name="screen_deactivate_account_description">"Usunięcie konta jest %1$s, co spowoduje:"</string>
   <string name="screen_deactivate_account_description_bold_part">"nieodwracalna"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s twoje konto (nie będziesz mógł się zalogować, a twoje ID przepadnie)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Permanentnie wyłączy"</string>
   <string name="screen_deactivate_account_list_item_2">"Usunie Ciebie ze wszystkich pokoi rozmów."</string>
   <string name="screen_deactivate_account_list_item_3">"Usunięte wszystkie dane konta z naszego serwera tożsamości."</string>
   <string name="screen_deactivate_account_list_item_4">"Twoje wiadomości wciąż będą widoczne dla zarejestrowanych użytkowników, ale nie będą dostępne dla nowych lub niezarejestrowanych użytkowników, jeśli je usuniesz."</string>
-  <string name="screen_deactivate_account_title">"Dezaktywuj konto"</string>
+  <string name="screen_deactivate_account_title">"Usuń konto"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml b/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
index 7000a65d47..a986b18a7c 100644
--- a/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
@@ -10,5 +10,4 @@
   <string name="screen_deactivate_account_list_item_2">"Te remover de todas as salas de conversa."</string>
   <string name="screen_deactivate_account_list_item_3">"Apague as informações da sua conta do nosso servidor de identidade."</string>
   <string name="screen_deactivate_account_list_item_4">"Suas mensagens ainda estarão visíveis para os usuários registrados, mas não estarão disponíveis para usuários novos ou não registrados se você optar por apagá-las."</string>
-  <string name="screen_deactivate_account_title">"Desativar conta"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-ro/translations.xml b/features/deactivation/impl/src/main/res/values-ro/translations.xml
index acd4c0747d..6176b4584e 100644
--- a/features/deactivation/impl/src/main/res/values-ro/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ro/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Vă rugăm să confirmați că doriți să vă dezactivați contul. Această acțiune nu poate fi anulată."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Vă rugăm să confirmați că doriți să vă ștergeți contul. Această acțiune nu poate fi anulată."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Ștergeți toate mesajele mele"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Avertisment: este posibil ca viitorii utilizatori să vadă conversații incomplete."</string>
-  <string name="screen_deactivate_account_description">"Dezactivarea contului dumneavoastră este %1$s, acesta va:"</string>
+  <string name="screen_deactivate_account_description">"Ștergerea contului dumneavoastră este %1$s, acesta va:"</string>
   <string name="screen_deactivate_account_description_bold_part">"ireversibilă"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s contul dumneavoastră (nu vă puteți conecta din nou, iar ID-ul dvs. nu poate fi reutilizat)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Dezactivați permanent"</string>
   <string name="screen_deactivate_account_list_item_2">"Îndepărta din toate camerele de chat."</string>
   <string name="screen_deactivate_account_list_item_3">"Șterge informațiile contului dumneavoastră de pe serverul nostru de identitate."</string>
   <string name="screen_deactivate_account_list_item_4">"Mesajele dumneavoastră vor fi în continuare vizibile pentru utilizatorii înregistrați, dar nu vor fi disponibile pentru utilizatorii noi sau neînregistrați dacă alegeți să le ștergeți."</string>
-  <string name="screen_deactivate_account_title">"Dezactivați contul"</string>
+  <string name="screen_deactivate_account_title">"Ștergeți contul"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-ru/translations.xml b/features/deactivation/impl/src/main/res/values-ru/translations.xml
index 6f595cde29..17a5158f44 100644
--- a/features/deactivation/impl/src/main/res/values-ru/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ru/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Вы уверены, что хотите отключить свою учётную запись? Данное действие необратимо."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Вы уверены, что хотите удалить свою учётную запись? Данное действие необратимо."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Удалить все мои сообщения"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Внимание: в будущем пользователи могут видеть неполные переписки."</string>
-  <string name="screen_deactivate_account_description">"Деактивация вашего аккаунта %1$s и означает следующее:"</string>
+  <string name="screen_deactivate_account_description">"Удаление вашего аккаунта %1$s, это означает следующее:"</string>
   <string name="screen_deactivate_account_description_bold_part">"необратимо"</string>
   <string name="screen_deactivate_account_list_item_1">"Ваша учётная запись будет %1$s (вы не сможете войти в неё снова, и другие пользователи не смогут использовать ваше имя пользователя)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Отключить навсегда"</string>
   <string name="screen_deactivate_account_list_item_2">"Вы будете удалены из всех чатов."</string>
   <string name="screen_deactivate_account_list_item_3">"Данные Вашего аккаунта будут удалены с нашего сервера идентификации."</string>
-  <string name="screen_deactivate_account_list_item_4">"Ваши сообщения по-прежнему будут видны зарегистрированным пользователям, но не будут доступны новым или незарегистрированным пользователям, если вы решите удалить их."</string>
-  <string name="screen_deactivate_account_title">"Отключить учётную запись"</string>
+  <string name="screen_deactivate_account_list_item_4">"Ваши сообщения по-прежнему будут видны зарегистрированным пользователям, но не будут доступны новым или незарегистрированным пользователям, если Вы решите удалить их."</string>
+  <string name="screen_deactivate_account_title">"Удалить аккаунт"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-uk/translations.xml b/features/deactivation/impl/src/main/res/values-uk/translations.xml
index 04b32df8b2..0f99817462 100644
--- a/features/deactivation/impl/src/main/res/values-uk/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-uk/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Будь ласка, підтвердіть, що ви хочете деактивувати свій обліковий запис. Ця дія не може бути скасована."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Підтвердьте, що хочете видалити свій обліковий запис. Цю дію неможливо скасувати."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Видалити всі мої повідомлення"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Попередження: майбутні користувачі можуть бачити неповні розмови."</string>
-  <string name="screen_deactivate_account_description">"Деактивація вашого облікового запису%1$s , це буде:"</string>
+  <string name="screen_deactivate_account_description">"Видалення вашого облікового запису %1$s призведе до:"</string>
   <string name="screen_deactivate_account_description_bold_part">"незворотні"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$sваш обліковий запис (ви не можете знову увійти, а ваш ідентифікатор не може бути використаний повторно)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Назавжди відключити"</string>
-  <string name="screen_deactivate_account_list_item_2">"Видалити вас з усіх чатів."</string>
+  <string name="screen_deactivate_account_list_item_2">"Вилучити вас з усіх бесід."</string>
   <string name="screen_deactivate_account_list_item_3">"Видаліть інформацію свого облікового запису з нашого сервера ідентифікації."</string>
   <string name="screen_deactivate_account_list_item_4">"Ваші повідомлення залишатимуться видимими для зареєстрованих користувачів, але недоступними для нових або незареєстрованих користувачів, якщо ви вирішите їх видалити."</string>
-  <string name="screen_deactivate_account_title">"Деактивувати обліковий запис"</string>
+  <string name="screen_deactivate_account_title">"Видалити обліковий запис"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-ur/translations.xml b/features/deactivation/impl/src/main/res/values-ur/translations.xml
index 297b29c519..3cad49aeb3 100644
--- a/features/deactivation/impl/src/main/res/values-ur/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ur/translations.xml
@@ -10,5 +10,4 @@
   <string name="screen_deactivate_account_list_item_2">"آپ کو تمام چیت رومز سے ہٹا دے گا۔"</string>
   <string name="screen_deactivate_account_list_item_3">"ہمارے شناختی سرور سے اپنے اکاؤنٹ کی معلومات کو حذف کریں۔"</string>
   <string name="screen_deactivate_account_list_item_4">"آپ کے پیغامات اب بھی رجسٹرڈ صارفین کو نظر آئیں گے لیکن اگر آپ انہیں حذف کرنے کا انتخاب کرتے ہیں تو نئے یا غیر رجسٹرڈ صارفین کے لیے دستیاب نہیں ہوں گے۔"</string>
-  <string name="screen_deactivate_account_title">"اکاؤنٹ کو غیر فعال کریں"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-uz/translations.xml b/features/deactivation/impl/src/main/res/values-uz/translations.xml
index 19a70bb149..8d8579178d 100644
--- a/features/deactivation/impl/src/main/res/values-uz/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-uz/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Iltimos, hisobingizni o‘chirishni xohlayotganingizni tasdiqlang. Bu amalni qaytarib bo‘lmaydi."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Iltimos, hisobingizni oʻchirishni xohlayotganingizni tasdiqlang. Bu amalni qaytarib boʻlmaydi."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Barcha xabarlarimni o‘chirib tashlang"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Ogohlantirish: Kelgusi foydalanuvchilar chala suhbatlarni ko‘rishi mumkin."</string>
   <string name="screen_deactivate_account_description">"Hisobingiz %1$s faolsizlantirilmoqda, u quyidagilarni bajaradi:"</string>
@@ -10,5 +10,5 @@
   <string name="screen_deactivate_account_list_item_2">"Sizni barcha chat xonalaridan olib tashlash."</string>
   <string name="screen_deactivate_account_list_item_3">"Hisobingiz haqidagi axborotni identifikatsiya serverimizdan o‘chirib tashlang."</string>
   <string name="screen_deactivate_account_list_item_4">"Xabarlaringiz ro‘yxatdan o‘tgan foydalanuvchilarga ko‘rinadi, lekin ularni o‘chirishni tanlasangiz, yangi yoki ro‘yxatdan o‘tmagan foydalanuvchilarga ko‘rinmaydi."</string>
-  <string name="screen_deactivate_account_title">"Hisobni faolsizlantirish"</string>
+  <string name="screen_deactivate_account_title">"Akkauntni o‘chirish"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-vi/translations.xml b/features/deactivation/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..f3b48163ed
--- /dev/null
+++ b/features/deactivation/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Vui lòng xác nhận rằng bạn muốn vô hiệu hóa tài khoản của mình. Hành động này không thể hoàn tác."</string>
+  <string name="screen_deactivate_account_delete_all_messages">"Xóa tất cả tin nhắn của tôi"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Cảnh báo: Người dùng sau này có thể thấy các cuộc trò chuyện chưa hoàn chỉnh."</string>
+  <string name="screen_deactivate_account_description">"Việc vô hiệu hóa tài khoản của bạn là %1$s , nó sẽ:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"không thể đảo ngược"</string>
+  <string name="screen_deactivate_account_list_item_1">"%1$s Tài khoản của bạn (bạn không thể đăng nhập lại và ID của bạn không thể được sử dụng lại)."</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Vô hiệu hóa vĩnh viễn"</string>
+  <string name="screen_deactivate_account_list_item_2">"Loại bỏ bạn khỏi tất cả các phòng chat."</string>
+  <string name="screen_deactivate_account_list_item_3">"Xóa thông tin tài khoản của bạn khỏi máy chủ nhận dạng của chúng tôi."</string>
+  <string name="screen_deactivate_account_list_item_4">"Tin nhắn của bạn vẫn sẽ hiển thị cho người dùng đã đăng ký nhưng sẽ không hiển thị cho người dùng mới hoặc chưa đăng ký nếu bạn chọn xóa chúng."</string>
+</resources>
diff --git a/features/deactivation/impl/src/main/res/values-zh/translations.xml b/features/deactivation/impl/src/main/res/values-zh/translations.xml
index ca24375d66..3916921652 100644
--- a/features/deactivation/impl/src/main/res/values-zh/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-zh/translations.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"请确认您要停用您的账户。此操作无法撤消。"</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"请确认要删除的账户。此操作无法撤消。"</string>
   <string name="screen_deactivate_account_delete_all_messages">"删除我的所有消息"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"警告：未来的用户可能会看到不完整的对话。"</string>
-  <string name="screen_deactivate_account_description">"停用您的帐户是%1$s，它将："</string>
-  <string name="screen_deactivate_account_description_bold_part">"不可逆转的"</string>
-  <string name="screen_deactivate_account_list_item_1">"%1$s您的账户（您无法登录回来，并且您的ID无法重复使用）。"</string>
+  <string name="screen_deactivate_account_description">"正在删除的账户为 %1$s，它将："</string>
+  <string name="screen_deactivate_account_description_bold_part">"不可逆"</string>
+  <string name="screen_deactivate_account_list_item_1">"你的账户 %1$s（将无法再登录，并且 ID 无法重复使用）。"</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"永久禁用"</string>
-  <string name="screen_deactivate_account_list_item_2">"将您从所有聊天房间中移除。"</string>
-  <string name="screen_deactivate_account_list_item_3">"从我们的身份服务器中删除您的账户信息。"</string>
-  <string name="screen_deactivate_account_list_item_4">"注册用户仍可看到您的消息，但如果您选择删除它们，新用户或未注册用户将无法看到您的消息。"</string>
-  <string name="screen_deactivate_account_title">"停用账户"</string>
+  <string name="screen_deactivate_account_list_item_2">"将你从所有聊天房间中移除。"</string>
+  <string name="screen_deactivate_account_list_item_3">"从我们的身份服务器中删除你的账户信息。"</string>
+  <string name="screen_deactivate_account_list_item_4">"注册用户仍可看到你的消息，但如果选择删除它们，新用户或未注册用户将无法看到你的消息。"</string>
+  <string name="screen_deactivate_account_title">"删除账户"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values/localazy.xml b/features/deactivation/impl/src/main/res/values/localazy.xml
index 0380cf1c94..fc12c7d2f8 100644
--- a/features/deactivation/impl/src/main/res/values/localazy.xml
+++ b/features/deactivation/impl/src/main/res/values/localazy.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_deactivate_account_confirmation_dialog_content">"Please confirm that you want to deactivate your account. This action cannot be undone."</string>
+  <string name="screen_deactivate_account_confirmation_dialog_content">"Please confirm that you want to delete your account. This action cannot be undone."</string>
   <string name="screen_deactivate_account_delete_all_messages">"Delete all my messages"</string>
   <string name="screen_deactivate_account_delete_all_messages_notice">"Warning: Future users may see incomplete conversations."</string>
-  <string name="screen_deactivate_account_description">"Deactivating your account is %1$s, it will:"</string>
+  <string name="screen_deactivate_account_description">"Deleting your account is %1$s, it will:"</string>
   <string name="screen_deactivate_account_description_bold_part">"irreversible"</string>
   <string name="screen_deactivate_account_list_item_1">"%1$s your account (you can\'t log back in, and your ID can\'t be reused)."</string>
   <string name="screen_deactivate_account_list_item_1_bold_part">"Permanently disable"</string>
   <string name="screen_deactivate_account_list_item_2">"Remove you from all chat rooms."</string>
   <string name="screen_deactivate_account_list_item_3">"Delete your account information from our identity server."</string>
   <string name="screen_deactivate_account_list_item_4">"Your messages will still be visible to registered users but won’t be available to new or unregistered users if you choose to delete them."</string>
-  <string name="screen_deactivate_account_title">"Deactivate account"</string>
+  <string name="screen_deactivate_account_title">"Delete account"</string>
 </resources>
diff --git a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
index eff479d21c..caf4c0384f 100644
--- a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
+++ b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.logout.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.deactivation.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
@@ -26,33 +28,28 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressTag
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class AccountDeactivationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class AccountDeactivationViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setAccountDeactivationView(
+            setAccountDeactivationView(
                 state = anAccountDeactivationState(eventSink = eventsRecorder),
                 onBackClick = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on Deactivate emits the expected Event`() {
+    fun `clicking on Deactivate emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
                     password = A_PASSWORD,
@@ -60,14 +57,14 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_deactivate)
+        clickOn(CommonStrings.action_delete)
         eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
     }
 
     @Test
-    fun `clicking on Deactivate on the confirmation dialog emits the expected Event`() {
+    fun `clicking on Deactivate on the confirmation dialog emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
                     password = A_PASSWORD,
@@ -76,14 +73,14 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
     }
 
     @Test
-    fun `clicking on retry on the confirmation dialog emits the expected Event`() {
+    fun `clicking on retry on the confirmation dialog emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
                     password = A_PASSWORD,
@@ -92,26 +89,26 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_retry)
+        clickOn(CommonStrings.action_retry)
         eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(true))
     }
 
     @Test
-    fun `switching on the erase all switch emits the expected Event`() {
+    fun `switching on the erase all switch emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_deactivate_account_delete_all_messages)
+        clickOn(R.string.screen_deactivate_account_delete_all_messages)
         eventsRecorder.assertSingle(AccountDeactivationEvents.SetEraseData(true))
     }
 
     @Test
-    fun `switching off the erase all switch emits the expected Event`() {
+    fun `switching off the erase all switch emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
                     eraseData = true,
@@ -119,15 +116,15 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_deactivate_account_delete_all_messages)
+        clickOn(R.string.screen_deactivate_account_delete_all_messages)
         eventsRecorder.assertSingle(AccountDeactivationEvents.SetEraseData(false))
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `typing text in the password field emits the expected Event`() {
+    fun `typing text in the password field emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AccountDeactivationEvents>()
-        rule.setAccountDeactivationView(
+        setAccountDeactivationView(
             state = anAccountDeactivationState(
                 deactivateFormState = aDeactivateFormState(
                     password = A_PASSWORD,
@@ -135,12 +132,12 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithTag(TestTags.loginPassword.value).performTextInput("A")
+        onNodeWithTag(TestTags.loginPassword.value).performTextInput("A")
         eventsRecorder.assertSingle(AccountDeactivationEvents.SetPassword("A$A_PASSWORD"))
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAccountDeactivationView(
+private fun AndroidComposeUiTest<ComponentActivity>.setAccountDeactivationView(
     state: AccountDeactivationState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/enterprise/api/build.gradle.kts b/features/enterprise/api/build.gradle.kts
index 1c541c5080..5e7f81e4b4 100644
--- a/features/enterprise/api/build.gradle.kts
+++ b/features/enterprise/api/build.gradle.kts
@@ -17,4 +17,5 @@ dependencies {
     implementation(projects.libraries.compound)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.wellknown.api)
 }
diff --git a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt
index 65fe3fe087..7b595966d4 100644
--- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt
+++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt
@@ -11,11 +11,13 @@ package io.element.android.features.enterprise.api
 import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.wellknown.api.ElementWellKnown
 import kotlinx.coroutines.flow.Flow
 
 interface EnterpriseService {
     val isEnterpriseBuild: Boolean
     suspend fun isEnterpriseUser(sessionId: SessionId): Boolean
+    suspend fun tweakMasUrl(url: String, homeserver: String): String
     fun defaultHomeserverList(): List<String>
     suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String): Boolean
 
@@ -40,6 +42,11 @@ interface EnterpriseService {
      */
     fun getNoisyNotificationChannelId(sessionId: SessionId): String?
 
+    /**
+     * Gets the overridden Element Well-Known data if it has been set, or null if not set.
+     */
+    fun overriddenElementWellKnown(): ElementWellKnown?
+
     companion object {
         const val ANY_ACCOUNT_PROVIDER = "*"
     }
diff --git a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/SessionEnterpriseService.kt b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/SessionEnterpriseService.kt
index 6bd6c78de5..ee005a0b6b 100644
--- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/SessionEnterpriseService.kt
+++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/SessionEnterpriseService.kt
@@ -10,6 +10,9 @@ package io.element.android.features.enterprise.api
 
 interface SessionEnterpriseService {
     suspend fun isElementCallAvailable(): Boolean
+    suspend fun tweakMasUrl(url: String): String
+
+    suspend fun isEncryptionDisabledByHomeserver(): Boolean
 
     suspend fun init()
 }
diff --git a/features/enterprise/impl-foss/build.gradle.kts b/features/enterprise/impl-foss/build.gradle.kts
index f0c63f5655..a45c8ae167 100644
--- a/features/enterprise/impl-foss/build.gradle.kts
+++ b/features/enterprise/impl-foss/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     api(projects.features.enterprise.api)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.wellknown.api)
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)
diff --git a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
index 932d082fd9..bc2a3f1bf1 100644
--- a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
+++ b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
@@ -15,6 +15,7 @@ import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.wellknown.api.ElementWellKnown
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
@@ -23,7 +24,7 @@ class DefaultEnterpriseService : EnterpriseService {
     override val isEnterpriseBuild = false
 
     override suspend fun isEnterpriseUser(sessionId: SessionId) = false
-
+    override suspend fun tweakMasUrl(url: String, homeserver: String) = url
     override fun defaultHomeserverList(): List<String> = emptyList()
     override suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String) = true
 
@@ -45,4 +46,6 @@ class DefaultEnterpriseService : EnterpriseService {
     }
 
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? = null
+
+    override fun overriddenElementWellKnown(): ElementWellKnown? = null
 }
diff --git a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
index 3441063a8a..3ac10d8a08 100644
--- a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
+++ b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultSessionEnterpriseService.kt
@@ -15,5 +15,7 @@ import io.element.android.libraries.di.SessionScope
 @ContributesBinding(SessionScope::class)
 class DefaultSessionEnterpriseService : SessionEnterpriseService {
     override suspend fun init() = Unit
+    override suspend fun tweakMasUrl(url: String): String = url
     override suspend fun isElementCallAvailable(): Boolean = true
+    override suspend fun isEncryptionDisabledByHomeserver(): Boolean = false
 }
diff --git a/features/enterprise/test/build.gradle.kts b/features/enterprise/test/build.gradle.kts
index 542e73717a..99dbe733dd 100644
--- a/features/enterprise/test/build.gradle.kts
+++ b/features/enterprise/test/build.gradle.kts
@@ -15,7 +15,9 @@ android {
 
 dependencies {
     api(projects.features.enterprise.api)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.compound)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.wellknown.api)
     implementation(projects.tests.testutils)
 }
diff --git a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt
index 3c17a4de7c..f6379bef30 100644
--- a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt
+++ b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt
@@ -13,6 +13,7 @@ import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.wellknown.api.ElementWellKnown
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 import kotlinx.coroutines.flow.Flow
@@ -30,6 +31,8 @@ class FakeEnterpriseService(
     private val firebasePushGatewayResult: () -> String? = { lambdaError() },
     private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() },
     private val getNoisyNotificationChannelIdResult: (SessionId?) -> String? = { lambdaError() },
+    private val tweakMasUrlResult: (String, String) -> String = { _, _ -> lambdaError() },
+    private val overrideWellKnownResult: () -> ElementWellKnown? = { lambdaError() },
 ) : EnterpriseService {
     private val brandColorState = MutableStateFlow(initialBrandColor)
     private val semanticColorsState = MutableStateFlow(initialSemanticColors)
@@ -38,6 +41,10 @@ class FakeEnterpriseService(
         isEnterpriseUserResult(sessionId)
     }
 
+    override suspend fun tweakMasUrl(url: String, homeserver: String): String = simulateLongTask {
+        tweakMasUrlResult(url, homeserver)
+    }
+
     override fun defaultHomeserverList(): List<String> {
         return defaultHomeserverListResult()
     }
@@ -74,4 +81,8 @@ class FakeEnterpriseService(
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? {
         return getNoisyNotificationChannelIdResult(sessionId)
     }
+
+    override fun overriddenElementWellKnown(): ElementWellKnown? {
+        return overrideWellKnownResult()
+    }
 }
diff --git a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeSessionEnterpriseService.kt b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeSessionEnterpriseService.kt
index 3914c60155..e198fca867 100644
--- a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeSessionEnterpriseService.kt
+++ b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeSessionEnterpriseService.kt
@@ -14,11 +14,21 @@ import io.element.android.tests.testutils.simulateLongTask
 
 class FakeSessionEnterpriseService(
     private val isElementCallAvailableResult: () -> Boolean = { lambdaError() },
+    private val tweakMasUrlResult: (String) -> String = { lambdaError() },
+    private val isEncryptionDisabledResult: () -> Boolean = { lambdaError() },
 ) : SessionEnterpriseService {
     override suspend fun init() {
     }
 
+    override suspend fun tweakMasUrl(url: String): String = simulateLongTask {
+        tweakMasUrlResult(url)
+    }
+
     override suspend fun isElementCallAvailable(): Boolean = simulateLongTask {
         isElementCallAvailableResult()
     }
+
+    override suspend fun isEncryptionDisabledByHomeserver(): Boolean {
+        return isEncryptionDisabledResult()
+    }
 }
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
index eb085d19c5..1c565a390a 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
@@ -74,7 +74,10 @@ class ForwardMessagesNode(
         return roomSelectEntryPoint.createNode(
             parentNode = this,
             buildContext = buildContext,
-            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward),
+            params = RoomSelectEntryPoint.Params(
+                mode = RoomSelectMode.Forward,
+                maxNumberOfRooms = RoomSelectEntryPoint.DEFAULT_MAX_NUMBER_OF_ROOMS,
+            ),
             callback = callback,
         )
     }
diff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
index f1e9bd8fc6..a73478479e 100644
--- a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.forward.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
@@ -21,34 +23,29 @@ import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressTag
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ForwardMessagesViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ForwardMessagesViewTest : RobolectricTest() {
     @Test
-    fun `cancel error emits the expected event`() {
+    fun `cancel error emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ForwardMessagesEvents>()
-        rule.setForwardMessagesView(
+        setForwardMessagesView(
             aForwardMessagesState(
                 forwardAction = AsyncAction.Failure(AN_EXCEPTION),
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(ForwardMessagesEvents.ClearError)
     }
 
     @Test
-    fun `success invokes onForwardSuccess`() {
+    fun `success invokes onForwardSuccess`() = runAndroidComposeUiTest {
         val data = listOf(A_ROOM_ID)
         val eventsRecorder = EventsRecorder<ForwardMessagesEvents>(expectEvents = false)
         ensureCalledOnceWithParam<List<RoomId>?>(data) { callback ->
-            rule.setForwardMessagesView(
+            setForwardMessagesView(
                 aForwardMessagesState(
                     forwardAction = AsyncAction.Success(data),
                     eventSink = eventsRecorder
@@ -59,7 +56,7 @@ class ForwardMessagesViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setForwardMessagesView(
+private fun AndroidComposeUiTest<ComponentActivity>.setForwardMessagesView(
     state: ForwardMessagesState,
     onForwardSuccess: (List<RoomId>) -> Unit = EnsureNeverCalledWithParam(),
 ) {
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt
index 0ca25c9455..1bfa10daf2 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt
@@ -19,6 +19,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -90,7 +93,11 @@ fun ChooseSelfVerificationModeView(
             Text(
                 modifier = Modifier
                     .clickable(onClick = onLearnMore)
-                    .padding(vertical = 4.dp, horizontal = 16.dp),
+                    .padding(vertical = 4.dp, horizontal = 16.dp)
+                    .semantics {
+                        // Note: there is no Role.Link, so we use Role.Button for better accessibility support
+                        role = Role.Button
+                    },
                 text = stringResource(CommonStrings.action_learn_more),
                 style = ElementTheme.typography.fontBodyLgMedium
             )
diff --git a/features/ftue/impl/src/main/res/values-ca/translations.xml b/features/ftue/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..1b645dd5eb
--- /dev/null
+++ b/features/ftue/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"No pots confirmar-la?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Crea nova clau de recuperació"</string>
+  <string name="screen_identity_confirmation_subtitle">"Verifica aquest dispositiu per configurar missatges segurs."</string>
+  <string name="screen_identity_confirmation_title">"Confirma la teva identitat"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Utilitza un altre dispositiu"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Utilitza clau de recuperació"</string>
+  <string name="screen_identity_confirmed_subtitle">"Ara pots llegir o enviar missatges de manera segura, i qualsevol persona amb qui xategis també confiarà en aquest dispositiu."</string>
+  <string name="screen_identity_confirmed_title">"Dispositiu verificat"</string>
+  <string name="screen_identity_use_another_device">"Utilitza un altre dispositiu"</string>
+  <string name="screen_identity_waiting_on_other_device">"Esperant un altre dispositiu…"</string>
+  <string name="screen_notification_optin_subtitle">"Pots canviar la configuració més tard."</string>
+  <string name="screen_notification_optin_title">"Permet les notificacions i no perdis cap missatge"</string>
+</resources>
diff --git a/features/ftue/impl/src/main/res/values-cs/translations.xml b/features/ftue/impl/src/main/res/values-cs/translations.xml
index 30d6998ac6..0937e7ed14 100644
--- a/features/ftue/impl/src/main/res/values-cs/translations.xml
+++ b/features/ftue/impl/src/main/res/values-cs/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nemůžete potvrdit?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Vytvoření nového klíče pro obnovení"</string>
-  <string name="screen_identity_confirmation_subtitle">"Ověřte toto zařízení a nastavte zabezpečené zasílání zpráv."</string>
-  <string name="screen_identity_confirmation_title">"Potvrďte, že jste to vy"</string>
+  <string name="screen_identity_confirmation_subtitle">"Vyberte způsob ověření pro nastavení zabezpečeného zasílání zpráv."</string>
+  <string name="screen_identity_confirmation_title">"Potvrďte svou digitální identitu"</string>
   <string name="screen_identity_confirmation_use_another_device">"Použít jiné zařízení"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Použít klíč pro obnovení"</string>
   <string name="screen_identity_confirmed_subtitle">"Nyní můžete bezpečně číst nebo odesílat zprávy, a kdokoli, s kým chatujete, může tomuto zařízení důvěřovat."</string>
diff --git a/features/ftue/impl/src/main/res/values-da/translations.xml b/features/ftue/impl/src/main/res/values-da/translations.xml
index 9c3720ac00..473c8a9c73 100644
--- a/features/ftue/impl/src/main/res/values-da/translations.xml
+++ b/features/ftue/impl/src/main/res/values-da/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kan ikke bekræfte?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Opret en ny gendannelsesnøgle"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verificér denne enhed for at konfigurere sikre meddelelser."</string>
-  <string name="screen_identity_confirmation_title">"Bekræft din identitet"</string>
+  <string name="screen_identity_confirmation_subtitle">"Vælg, hvordan du vil verificere dig for at konfigurere sikre beskeder."</string>
+  <string name="screen_identity_confirmation_title">"Bekræft din digitale identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Brug en anden enhed"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Brug gendannelsesnøgle"</string>
   <string name="screen_identity_confirmed_subtitle">"Nu kan du læse eller sende beskeder sikkert, og enhver du samtaler med kan også stole på denne enhed."</string>
diff --git a/features/ftue/impl/src/main/res/values-de/translations.xml b/features/ftue/impl/src/main/res/values-de/translations.xml
index 474d085df0..0e83b29e35 100644
--- a/features/ftue/impl/src/main/res/values-de/translations.xml
+++ b/features/ftue/impl/src/main/res/values-de/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Bestätigung unmöglich?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Erstelle einen neuen Wiederherstellungsschlüssel"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifiziere dieses Gerät, um sichere Chats einzurichten."</string>
-  <string name="screen_identity_confirmation_title">"Bestätige deine Identität"</string>
+  <string name="screen_identity_confirmation_subtitle">"Wähle eine Verifizierungsmethode, um den sicheren Nachrichtenversand einzurichten."</string>
+  <string name="screen_identity_confirmation_title">"Bestätige deine digitale Identität"</string>
   <string name="screen_identity_confirmation_use_another_device">"Ein anderes Gerät verwenden"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Wiederherstellungsschlüssel verwenden"</string>
   <string name="screen_identity_confirmed_subtitle">"Du kannst jetzt verschlüsselte Nachrichten lesen und versenden. Dein Chatpartner vertraut nun diesem Gerät."</string>
diff --git a/features/ftue/impl/src/main/res/values-et/translations.xml b/features/ftue/impl/src/main/res/values-et/translations.xml
index 4790fdb716..c013556568 100644
--- a/features/ftue/impl/src/main/res/values-et/translations.xml
+++ b/features/ftue/impl/src/main/res/values-et/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kas kinnitamine pole võimalik?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Loo uus taastevõti"</string>
-  <string name="screen_identity_confirmation_subtitle">"Krüptitud sõnumivahetuse tagamiseks verifitseeri see seade."</string>
-  <string name="screen_identity_confirmation_title">"Kinnita, et see oled sina"</string>
+  <string name="screen_identity_confirmation_subtitle">"Turvalise sõnumside seadistamiseks vali verifitseerimise viis."</string>
+  <string name="screen_identity_confirmation_title">"Kinnita oma digitaalne identiteet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Kasuta teist seadet"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Kasuta taastevõtit"</string>
   <string name="screen_identity_confirmed_subtitle">"Nüüd saad saata või lugeda sõnumeid turvaliselt ning kõik sinu vestluspartnerid võivad usaldada seda seadet."</string>
diff --git a/features/ftue/impl/src/main/res/values-fa/translations.xml b/features/ftue/impl/src/main/res/values-fa/translations.xml
index d41e2e26f1..f87297bc2c 100644
--- a/features/ftue/impl/src/main/res/values-fa/translations.xml
+++ b/features/ftue/impl/src/main/res/values-fa/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"نمی‌توانید تأیید کنید؟"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"ایجاد کلید بازیابی جدید"</string>
-  <string name="screen_identity_confirmation_subtitle">"تأیید این افزاره برای برپایی پیام‌رسانی امن."</string>
-  <string name="screen_identity_confirmation_title">"تأیید هویتتان"</string>
+  <string name="screen_identity_confirmation_subtitle">"گزینش چگونگی تأیید برای برپایی پیام‌رسانی امن."</string>
+  <string name="screen_identity_confirmation_title">"تأیید هویت دیجیتالیتان"</string>
   <string name="screen_identity_confirmation_use_another_device">"استفاده از افزاره‌ای دیگر"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"استفاده از کلید بازیابی"</string>
   <string name="screen_identity_confirmed_subtitle">"اکنون می‌توانید پیام‌ها را به صورت امن فرستاده و بگیرید و هرکسی که با او گپ می‌زنید نیز می‌تواند به این افزاره اعتماد کند."</string>
diff --git a/features/ftue/impl/src/main/res/values-hr/translations.xml b/features/ftue/impl/src/main/res/values-hr/translations.xml
index d535c660a2..f5aeb642b1 100644
--- a/features/ftue/impl/src/main/res/values-hr/translations.xml
+++ b/features/ftue/impl/src/main/res/values-hr/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Ne možete potvrditi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Izradi novi ključ za oporavak"</string>
-  <string name="screen_identity_confirmation_subtitle">"Potvrdite ovaj uređaj kako biste postavili sigurnu razmjenu poruka."</string>
-  <string name="screen_identity_confirmation_title">"Potvrdite svoj identitet"</string>
+  <string name="screen_identity_confirmation_subtitle">"Odaberite način potvrde za postavljanje sigurne razmjene poruka."</string>
+  <string name="screen_identity_confirmation_title">"Potvrdite svoj digitalni identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Upotrijebite drugi uređaj"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Upotrijebi ključ za oporavak"</string>
   <string name="screen_identity_confirmed_subtitle">"Sada možete sigurno čitati ili slati poruke, a svatko s kim razgovarate također može vjerovati ovom uređaju."</string>
diff --git a/features/ftue/impl/src/main/res/values-in/translations.xml b/features/ftue/impl/src/main/res/values-in/translations.xml
index 0255251f97..007ae0a4bc 100644
--- a/features/ftue/impl/src/main/res/values-in/translations.xml
+++ b/features/ftue/impl/src/main/res/values-in/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Tidak dapat mengonfirmasi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Buat kunci pemulihan baru"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifikasi perangkat ini untuk menyiapkan perpesanan aman."</string>
+  <string name="screen_identity_confirmation_subtitle">"Pilih cara verifikasi untuk mengatur pengiriman pesan yang aman."</string>
   <string name="screen_identity_confirmation_title">"Konfirmasi bahwa ini Anda"</string>
   <string name="screen_identity_confirmation_use_another_device">"Gunakan perangkat lain"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Gunakan kunci pemulihan"</string>
diff --git a/features/ftue/impl/src/main/res/values-it/translations.xml b/features/ftue/impl/src/main/res/values-it/translations.xml
index 25ba544d00..8aa9132732 100644
--- a/features/ftue/impl/src/main/res/values-it/translations.xml
+++ b/features/ftue/impl/src/main/res/values-it/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Non puoi confermare?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Crea una nuova chiave di recupero"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifica questo dispositivo per segnare i tuoi messaggi come sicuri."</string>
-  <string name="screen_identity_confirmation_title">"Conferma la tua identità"</string>
+  <string name="screen_identity_confirmation_subtitle">"Scegli come effettuare la verifica per configurare la messaggistica sicura."</string>
+  <string name="screen_identity_confirmation_title">"Conferma la tua identità digitale"</string>
   <string name="screen_identity_confirmation_use_another_device">"Usa un altro dispositivo"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Usa la chiave di recupero"</string>
   <string name="screen_identity_confirmed_subtitle">"Ora puoi leggere o inviare messaggi in tutta sicurezza e anche chi chatta con te può fidarsi di questo dispositivo."</string>
diff --git a/features/ftue/impl/src/main/res/values-ja/translations.xml b/features/ftue/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..9a87a3dcfa
--- /dev/null
+++ b/features/ftue/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"認証できませんか？"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"回復鍵を新規作成します"</string>
+  <string name="screen_identity_confirmation_subtitle">"安全なメッセージを設定するための検証方法を選択してください。"</string>
+  <string name="screen_identity_confirmation_title">"デジタルIDの認証"</string>
+  <string name="screen_identity_confirmation_use_another_device">"他の端末を使用"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"回復鍵を使用"</string>
+  <string name="screen_identity_confirmed_subtitle">"メッセージのやり取りを安全に行えるようになりました。他のユーザーはこの端末を信頼できます。"</string>
+  <string name="screen_identity_confirmed_title">"検証済みの端末"</string>
+  <string name="screen_identity_use_another_device">"他の端末を使用"</string>
+  <string name="screen_identity_waiting_on_other_device">"一方の端末を待機中…"</string>
+  <string name="screen_notification_optin_subtitle">"設定は後で変更することができます。"</string>
+  <string name="screen_notification_optin_title">"メッセージを見逃さないために通知を許可しましょう"</string>
+</resources>
diff --git a/features/ftue/impl/src/main/res/values-nb/translations.xml b/features/ftue/impl/src/main/res/values-nb/translations.xml
index 407e49c2e1..98e5ed7e39 100644
--- a/features/ftue/impl/src/main/res/values-nb/translations.xml
+++ b/features/ftue/impl/src/main/res/values-nb/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kan du ikke bekrefte?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Opprett en ny gjenopprettingsnøkkel"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifiser denne enheten for å sette opp sikker meldingsutveksling."</string>
+  <string name="screen_identity_confirmation_subtitle">"Velg hvordan du vil verifisere deg for å sette opp sikker meldingsutveksling."</string>
   <string name="screen_identity_confirmation_title">"Bekreft din digitale identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Bruk en annen enhet"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Bruk gjenopprettingsnøkkel"</string>
diff --git a/features/ftue/impl/src/main/res/values-pl/translations.xml b/features/ftue/impl/src/main/res/values-pl/translations.xml
index 5d77c57994..45ca82ede6 100644
--- a/features/ftue/impl/src/main/res/values-pl/translations.xml
+++ b/features/ftue/impl/src/main/res/values-pl/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nie możesz potwierdzić?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Utwórz nowy klucz przywracania"</string>
-  <string name="screen_identity_confirmation_subtitle">"Zweryfikuj to urządzenie, aby skonfigurować bezpieczne przesyłanie wiadomości."</string>
-  <string name="screen_identity_confirmation_title">"Potwierdź, że to Ty"</string>
+  <string name="screen_identity_confirmation_subtitle">"Wybierz sposób weryfikacji, aby skonfigurować bezpieczne wiadomości."</string>
+  <string name="screen_identity_confirmation_title">"Potwierdź swoją tożsamość cyfrową"</string>
   <string name="screen_identity_confirmation_use_another_device">"Użyj innego urządzenia"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Użyj klucza przywracania"</string>
   <string name="screen_identity_confirmed_subtitle">"Teraz możesz bezpiecznie czytać i wysyłać wiadomości, każdy z kim czatujesz również może ufać temu urządzeniu."</string>
diff --git a/features/ftue/impl/src/main/res/values-pt/translations.xml b/features/ftue/impl/src/main/res/values-pt/translations.xml
index 5b6729f04e..34f39c7bdb 100644
--- a/features/ftue/impl/src/main/res/values-pt/translations.xml
+++ b/features/ftue/impl/src/main/res/values-pt/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_identity_confirmation_cannot_confirm">"Não é possível confirmar?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Criar uma nova chave de recuperação"</string>
   <string name="screen_identity_confirmation_subtitle">"Verifica este dispositivo para configurar o envio seguro de mensagens."</string>
-  <string name="screen_identity_confirmation_title">"Confirma que és tu"</string>
+  <string name="screen_identity_confirmation_title">"Confirma a tua identidade digital"</string>
   <string name="screen_identity_confirmation_use_another_device">"Utilizar outro dispositivo"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Utilizar chave de recuperação"</string>
   <string name="screen_identity_confirmed_subtitle">"Agora podes ler ou enviar mensagens de forma segura, e qualquer pessoa com quem converses também pode confiar neste dispositivo."</string>
diff --git a/features/ftue/impl/src/main/res/values-ro/translations.xml b/features/ftue/impl/src/main/res/values-ro/translations.xml
index abf72140e8..85b151faa8 100644
--- a/features/ftue/impl/src/main/res/values-ro/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ro/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nu puteți confirma?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Creați o nouă cheie de recuperare"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verificați acest dispozitiv pentru a configura mesagerie securizată."</string>
-  <string name="screen_identity_confirmation_title">"Confirmați că sunteți dumneavoastră"</string>
+  <string name="screen_identity_confirmation_subtitle">"Alegeți cum doriți să vă verificați pentru a configura mesageria securizată."</string>
+  <string name="screen_identity_confirmation_title">"Confirmați-vă identitatea digitală"</string>
   <string name="screen_identity_confirmation_use_another_device">"Utilizați un alt dispozitiv"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Utilizați cheia de recuperare"</string>
   <string name="screen_identity_confirmed_subtitle">"Acum puteți citi sau trimite mesaje în siguranță, iar oricine cu care conversați poate avea încredere în acest dispozitiv."</string>
diff --git a/features/ftue/impl/src/main/res/values-ru/translations.xml b/features/ftue/impl/src/main/res/values-ru/translations.xml
index b2f0925813..b7c0055b73 100644
--- a/features/ftue/impl/src/main/res/values-ru/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ru/translations.xml
@@ -2,11 +2,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Не можете подтвердить?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Создайте новый ключ восстановления"</string>
-  <string name="screen_identity_confirmation_subtitle">"Подтвердите это устройство, чтобы настроить безопасный обмен сообщениями."</string>
+  <string name="screen_identity_confirmation_subtitle">"Выберите способ подтверждения для настройки защищенного обмена сообщениями."</string>
   <string name="screen_identity_confirmation_title">"Подтвердите личность"</string>
   <string name="screen_identity_confirmation_use_another_device">"Использовать другое устройство"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Использовать ключ восстановления"</string>
-  <string name="screen_identity_confirmed_subtitle">"Теперь вы можете безопасно читать и отправлять сообщения, и все, с кем вы общаетесь в чате, также могут доверять этому устройству."</string>
+  <string name="screen_identity_confirmed_subtitle">"Теперь Вы можете безопасно читать и отправлять сообщения, и все, с кем Вы общаетесь в чате, также могут доверять этому устройству."</string>
   <string name="screen_identity_confirmed_title">"Устройство проверено"</string>
   <string name="screen_identity_use_another_device">"Использовать другое устройство"</string>
   <string name="screen_identity_waiting_on_other_device">"Ожидание другого устройства…"</string>
diff --git a/features/ftue/impl/src/main/res/values-uk/translations.xml b/features/ftue/impl/src/main/res/values-uk/translations.xml
index eb00ebf09d..f466bee82d 100644
--- a/features/ftue/impl/src/main/res/values-uk/translations.xml
+++ b/features/ftue/impl/src/main/res/values-uk/translations.xml
@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Не можете підтвердити?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Створити новий ключ відновлення"</string>
-  <string name="screen_identity_confirmation_subtitle">"Верифікуйте цей пристрій, щоб налаштувати безпечний обмін повідомленнями."</string>
-  <string name="screen_identity_confirmation_title">"Підтвердьте, що це ви"</string>
+  <string name="screen_identity_confirmation_subtitle">"Виберіть спосіб звіряння, щоб налаштувати безпечний обмін повідомленнями."</string>
+  <string name="screen_identity_confirmation_title">"Підтвердьте свою цифрову ідентичність"</string>
   <string name="screen_identity_confirmation_use_another_device">"Використовуйте інший пристрій"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Використовуйте ключ відновлення"</string>
   <string name="screen_identity_confirmed_subtitle">"Тепер ви можете безпечно читати або надсилати повідомлення, і кожен, з ким ви спілкуєтесь, також може довіряти цьому пристрою."</string>
-  <string name="screen_identity_confirmed_title">"Пристрій перевірено"</string>
+  <string name="screen_identity_confirmed_title">"Пристрій звірено"</string>
   <string name="screen_identity_use_another_device">"Використовуйте інший пристрій"</string>
   <string name="screen_identity_waiting_on_other_device">"Чекає на інше пристрій…"</string>
   <string name="screen_notification_optin_subtitle">"Ви можете змінити свої налаштування пізніше."</string>
diff --git a/features/ftue/impl/src/main/res/values-uz/translations.xml b/features/ftue/impl/src/main/res/values-uz/translations.xml
index 8edff2c305..2279bb6c92 100644
--- a/features/ftue/impl/src/main/res/values-uz/translations.xml
+++ b/features/ftue/impl/src/main/res/values-uz/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Tasdiqlay olmayapsizmi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Yangi tiklash kalitini yarating"</string>
-  <string name="screen_identity_confirmation_subtitle">"Xavfsiz xabarlashuvni sozlash uchun ushbu qurilmani tasdiqlang."</string>
-  <string name="screen_identity_confirmation_title">"Shaxsingizni tasdiqlang"</string>
+  <string name="screen_identity_confirmation_subtitle">"Xavfsiz xabar almashinuvni sozlash uchun tasdiqlash usulini tanlang."</string>
+  <string name="screen_identity_confirmation_title">"Raqamli shaxsingizni tasdiqlang"</string>
   <string name="screen_identity_confirmation_use_another_device">"Boshqa qurilmadan foydalanish"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Qayta tiklash kalitidan foydalaning"</string>
   <string name="screen_identity_confirmed_subtitle">"Endi xabarlarni xavfsiz tarzda o‘qish yoki yuborish imkoniyatiga egasiz, shuningdek, siz bilan muloqot qilayotgan har qanday kishi ham bu qurilmaga ishonch bildirishi mumkin."</string>
diff --git a/features/ftue/impl/src/main/res/values-vi/translations.xml b/features/ftue/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..6ea7d8bf91
--- /dev/null
+++ b/features/ftue/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Không thể xác nhận?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Tạo khóa khôi phục mới"</string>
+  <string name="screen_identity_confirmation_subtitle">"Chọn phương thức xác minh để bật nhắn tin bảo mật."</string>
+  <string name="screen_identity_confirmation_title">"Xác nhận danh tính kỹ thuật số của bạn"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Dùng thiết bị khác"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Sử dụng khóa khôi phục"</string>
+  <string name="screen_identity_confirmed_subtitle">"Giờ đây bạn có thể đọc và gửi tin nhắn một cách an toàn, và những người bạn trò chuyện cũng có thể tin tưởng thiết bị này."</string>
+  <string name="screen_identity_confirmed_title">"Thiết bị được xác thực"</string>
+  <string name="screen_identity_use_another_device">"Dùng thiết bị khác"</string>
+  <string name="screen_identity_waiting_on_other_device">"Đang chờ trên thiết bị khác…"</string>
+  <string name="screen_notification_optin_subtitle">"Bạn có thể thay đổi cài đặt sau."</string>
+  <string name="screen_notification_optin_title">"Cho phép thông báo để không bỏ lỡ bất kỳ tin nhắn nào"</string>
+</resources>
diff --git a/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml b/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml
index 6340efdbc3..9bad2d1705 100644
--- a/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/ftue/impl/src/main/res/values-zh-rTW/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"無法確認？"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"建立新的復原金鑰"</string>
-  <string name="screen_identity_confirmation_subtitle">"驗證這部裝置以設定安全通訊。"</string>
-  <string name="screen_identity_confirmation_title">"確認這是你本人"</string>
+  <string name="screen_identity_confirmation_subtitle">"選擇驗證方式以設定安全訊息傳遞。"</string>
+  <string name="screen_identity_confirmation_title">"確認您的數位身份"</string>
   <string name="screen_identity_confirmation_use_another_device">"使用另一部裝置"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"使用復原金鑰"</string>
   <string name="screen_identity_confirmed_subtitle">"您可以安全地讀取和發送訊息了，與您聊天的人也可以信任這部裝置。"</string>
diff --git a/features/ftue/impl/src/main/res/values-zh/translations.xml b/features/ftue/impl/src/main/res/values-zh/translations.xml
index 669a316243..f9171c9879 100644
--- a/features/ftue/impl/src/main/res/values-zh/translations.xml
+++ b/features/ftue/impl/src/main/res/values-zh/translations.xml
@@ -2,14 +2,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"无法确认？"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"创建新的恢复密钥"</string>
-  <string name="screen_identity_confirmation_subtitle">"验证此设备以开始安全地收发消息。"</string>
-  <string name="screen_identity_confirmation_title">"确认这是你"</string>
-  <string name="screen_identity_confirmation_use_another_device">"使用其他设备"</string>
+  <string name="screen_identity_confirmation_subtitle">"选择验证方式以设置安全的消息传输。"</string>
+  <string name="screen_identity_confirmation_title">"确认你的数字身份"</string>
+  <string name="screen_identity_confirmation_use_another_device">"使用其它设备"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"使用恢复密钥"</string>
-  <string name="screen_identity_confirmed_subtitle">"现在，您可以安全地阅读或发送消息，与您聊天的人也会信任此设备。"</string>
+  <string name="screen_identity_confirmed_subtitle">"现在你可以安全地读取或发送消息，并且与你聊天的任何人也可以信任此设备。"</string>
   <string name="screen_identity_confirmed_title">"设备已验证"</string>
-  <string name="screen_identity_use_another_device">"使用其他设备"</string>
-  <string name="screen_identity_waiting_on_other_device">"正在等待其他设备……"</string>
-  <string name="screen_notification_optin_subtitle">"您可以稍后更改设置。"</string>
+  <string name="screen_identity_use_another_device">"使用其它设备"</string>
+  <string name="screen_identity_waiting_on_other_device">"正在等待其它设备…"</string>
+  <string name="screen_notification_optin_subtitle">"你可以稍后更改设置。"</string>
   <string name="screen_notification_optin_title">"允许通知，绝不错过任何消息"</string>
 </resources>
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt
index 521bf91b37..66e2eb38fe 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt
@@ -6,77 +6,74 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.ftue.impl.sessionverification.choosemode
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.ftue.impl.R
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class ChooseSessionVerificationModeViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class ChooseSessionVerificationModeViewTest : RobolectricTest() {
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on learn more invokes the expected callback`() {
+    fun `clicking on learn more invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setChooseSelfVerificationModeView(
+            setChooseSelfVerificationModeView(
                 aChooseSelfVerificationModeState(),
                 onLearnMoreClick = callback,
             )
-            rule.clickOn(CommonStrings.action_learn_more)
+            clickOn(CommonStrings.action_learn_more)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on use another device calls the callback`() {
+    fun `clicking on use another device calls the callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setChooseSelfVerificationModeView(
+            setChooseSelfVerificationModeView(
                 aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseAnotherDevice = true))),
                 onUseAnotherDevice = callback,
             )
-            rule.clickOn(R.string.screen_identity_use_another_device)
+            clickOn(R.string.screen_identity_use_another_device)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on enter recovery key calls the callback`() {
+    fun `clicking on enter recovery key calls the callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setChooseSelfVerificationModeView(
+            setChooseSelfVerificationModeView(
                 aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseRecoveryKey = true))),
                 onEnterRecoveryKey = callback,
             )
-            rule.clickOn(R.string.screen_identity_confirmation_use_recovery_key)
+            clickOn(R.string.screen_identity_confirmation_use_recovery_key)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on cannot confirm calls the reset keys callback`() {
+    fun `clicking on cannot confirm calls the reset keys callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setChooseSelfVerificationModeView(
+            setChooseSelfVerificationModeView(
                 aChooseSelfVerificationModeState(),
                 onResetKey = callback,
             )
-            rule.clickOn(R.string.screen_identity_confirmation_cannot_confirm)
+            clickOn(R.string.screen_identity_confirmation_cannot_confirm)
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChooseSelfVerificationModeView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setChooseSelfVerificationModeView(
         state: ChooseSelfVerificationModeState,
         onLearnMoreClick: () -> Unit = EnsureNeverCalled(),
         onUseAnotherDevice: () -> Unit = EnsureNeverCalled(),
diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index b36ee6aed2..efdc545e61 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -46,6 +46,7 @@ dependencies {
     implementation(projects.libraries.permissions.noop)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.push.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.features.announcement.api)
     implementation(projects.features.invite.api)
     implementation(projects.features.networkmonitor.api)
@@ -56,6 +57,7 @@ dependencies {
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.haze)
     implementation(libs.haze.materials)
+    implementation(projects.features.preferences.impl)
     implementation(projects.features.reportroom.api)
     implementation(projects.features.rolesandpermissions.api)
     implementation(projects.libraries.previewutils)
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
index 81e7969080..00f285e3f4 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
 import com.bumble.appyx.core.lifecycle.subscribe
@@ -171,6 +172,7 @@ class HomeFlowNode(
             if (loadingJoinedRoomJob.value.isLoading()) {
                 DelayedVisibility(duration = 400.milliseconds) {
                     ProgressDialog(
+                        properties = DialogProperties(dismissOnBackPress = true, dismissOnClickOutside = true),
                         onDismissRequest = {
                             loadingJoinedRoomJob.value.dataOrNull()?.cancel()
                             loadingJoinedRoomJob.value = AsyncData.Uninitialized
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt
index 6878f4d53c..1e49b1aa70 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomePresenter.kt
@@ -19,8 +19,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.roomlist.RoomListState
 import io.element.android.features.home.impl.spaces.HomeSpacesState
 import io.element.android.features.logout.api.direct.DirectLogoutState
@@ -47,7 +45,6 @@ class HomePresenter(
     private val logoutPresenter: Presenter<DirectLogoutState>,
     private val rageshakeFeatureAvailability: RageshakeFeatureAvailability,
     private val sessionStore: SessionStore,
-    private val announcementService: AnnouncementService,
 ) : Presenter<HomeState> {
     private val currentUserWithNeighborsBuilder = CurrentUserWithNeighborsBuilder()
 
@@ -82,10 +79,7 @@ class HomePresenter(
 
         fun handleEvent(event: HomeEvent) {
             when (event) {
-                is HomeEvent.SelectHomeNavigationBarItem -> coroutineState.launch {
-                    if (event.item == HomeNavigationBarItem.Spaces) {
-                        announcementService.showAnnouncement(Announcement.Space)
-                    }
+                is HomeEvent.SelectHomeNavigationBarItem -> {
                     currentHomeNavigationBarItemOrdinal = event.item.ordinal
                 }
                 is HomeEvent.SwitchToAccount -> coroutineState.launch {
@@ -94,12 +88,6 @@ class HomePresenter(
             }
         }
 
-        LaunchedEffect(homeSpacesState.canCreateSpaces, homeSpacesState.spaceRooms.isEmpty()) {
-            // If the flag to create spaces is disabled and the last space is left, ensure that the Chat view is rendered.
-            if (!homeSpacesState.canCreateSpaces && homeSpacesState.spaceRooms.isEmpty()) {
-                currentHomeNavigationBarItemOrdinal = HomeNavigationBarItem.Chats.ordinal
-            }
-        }
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
         return HomeState(
             currentUserAndNeighbors = currentUserAndNeighbors,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeState.kt
index 934dac831e..ae59ef8eb9 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeState.kt
@@ -34,5 +34,4 @@ data class HomeState(
 ) {
     val isBackHandlerEnabled = currentHomeNavigationBarItem != HomeNavigationBarItem.Chats || roomListState.spaceFiltersState is SpaceFiltersState.Selected
     val displayRoomListFilters = currentHomeNavigationBarItem == HomeNavigationBarItem.Chats && roomListState.displayFilters
-    val showNavigationBar = homeSpacesState.canCreateSpaces || homeSpacesState.spaceRooms.isNotEmpty()
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
index ddf8b1c499..f5a2400f2f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeView.kt
@@ -14,11 +14,15 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -65,6 +69,8 @@ import io.element.android.libraries.designsystem.theme.components.HorizontalFloa
 import io.element.android.libraries.designsystem.theme.components.HorizontalFloatingToolbarSeparator
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -199,51 +205,53 @@ private fun HomeScaffold(
             )
         },
         floatingActionButton = {
-            if (state.showNavigationBar) {
-                val coroutineScope = rememberCoroutineScope()
-                HomeBottomBar(
-                    currentHomeNavigationBarItem = state.currentHomeNavigationBarItem,
-                    onItemClick = { item ->
-                        // scroll to top if selecting the same item
-                        if (item == state.currentHomeNavigationBarItem) {
-                            val lazyListStateTarget = when (item) {
-                                HomeNavigationBarItem.Chats -> roomsLazyListState
-                                HomeNavigationBarItem.Spaces -> spacesLazyListState
-                            }
-                            coroutineScope.launch {
-                                if (lazyListStateTarget.firstVisibleItemIndex > 10) {
-                                    lazyListStateTarget.scrollToItem(10)
-                                }
-                                // Also reset the scrollBehavior height offset as it's not triggered by programmatic scrolls
-                                scrollBehavior.state.heightOffset = 0f
-                                lazyListStateTarget.animateScrollToItem(0)
-                            }
-                        } else {
-                            state.eventSink(HomeEvent.SelectHomeNavigationBarItem(item))
+            val coroutineScope = rememberCoroutineScope()
+            HomeBottomBar(
+                // The Scaffold uses top-only insets so the scrollable content can go edge-to-edge behind the
+                // navigation bar, so the floating toolbar has to apply the bottom inset itself to avoid overlapping it.
+                modifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars),
+                currentHomeNavigationBarItem = state.currentHomeNavigationBarItem,
+                onItemClick = { item ->
+                    // scroll to top if selecting the same item
+                    if (item == state.currentHomeNavigationBarItem) {
+                        val lazyListStateTarget = when (item) {
+                            HomeNavigationBarItem.Chats -> roomsLazyListState
+                            HomeNavigationBarItem.Spaces -> spacesLazyListState
                         }
-                    },
-                    floatingActionButton = when (state.currentHomeNavigationBarItem) {
+                        coroutineScope.launch {
+                            if (lazyListStateTarget.firstVisibleItemIndex > 10) {
+                                lazyListStateTarget.scrollToItem(10)
+                            }
+                            // Also reset the scrollBehavior height offset as it's not triggered by programmatic scrolls
+                            scrollBehavior.state.heightOffset = 0f
+                            lazyListStateTarget.animateScrollToItem(0)
+                        }
+                    } else {
+                        state.eventSink(HomeEvent.SelectHomeNavigationBarItem(item))
+                    }
+                },
+                floatingActionButton = {
+                    when (state.currentHomeNavigationBarItem) {
                         HomeNavigationBarItem.Chats -> {
-                            {
-                                HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
-                            }
+                            HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
                         }
-                        HomeNavigationBarItem.Spaces -> if (state.homeSpacesState.canCreateSpaces) {
-                            {
-                                HomeFloatingActionButton(onCreateSpaceClick, CommonStrings.action_create_space)
-                            }
-                        } else {
-                            // No FAB for spaces if we cannot create spaces
-                            null
+                        HomeNavigationBarItem.Spaces -> {
+                            HomeFloatingActionButton(onCreateSpaceClick, CommonStrings.action_create_space)
                         }
-                    },
-                )
-            } else {
-                HomeFloatingActionButton(onStartChatClick, CommonStrings.action_create_room)
-            }
+                    }
+                },
+            )
         },
-        floatingActionButtonPosition = if (state.showNavigationBar) FabPosition.Center else FabPosition.End,
+        floatingActionButtonPosition = FabPosition.Center,
+        contentWindowInsets = scaffoldScrollableContentInsets,
         content = { padding ->
+            val outerPadding = PaddingValues(
+                start = padding.calculateStartPadding(LocalLayoutDirection.current),
+                end = padding.calculateEndPadding(LocalLayoutDirection.current),
+                // Remove these two lines once https://issuetracker.google.com/issues/436432313 has been fixed
+                bottom = padding.calculateBottomPadding(),
+                top = padding.calculateTopPadding()
+            )
             val contentPadding = PaddingValues(
                 bottom = 96.dp,
             )
@@ -260,18 +268,10 @@ private fun HomeScaffold(
                         onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
                         onRoomClick = ::onRoomClick,
                         onCreateRoomClick = onStartChatClick,
-                        contentPadding = contentPadding,
+                        contentPadding = lazyColumnContentPadding + contentPadding,
                         modifier = Modifier
-                            .padding(
-                                PaddingValues(
-                                    start = padding.calculateStartPadding(LocalLayoutDirection.current),
-                                    end = padding.calculateEndPadding(LocalLayoutDirection.current),
-                                    // Remove these two lines once https://issuetracker.google.com/issues/436432313 has been fixed
-                                    bottom = padding.calculateBottomPadding(),
-                                    top = padding.calculateTopPadding()
-                                )
-                            )
-                            .consumeWindowInsets(padding)
+                            .padding(outerPadding)
+                            .consumeWindowInsets(outerPadding)
                             .hazeSource(state = hazeState)
                     )
                     SpaceFiltersView(roomListState.spaceFiltersState)
@@ -280,10 +280,10 @@ private fun HomeScaffold(
                     HomeSpacesView(
                         modifier = Modifier
                             .fillMaxSize()
-                            .padding(padding)
-                            .consumeWindowInsets(padding)
+                            .padding(outerPadding)
+                            .consumeWindowInsets(outerPadding)
                             .hazeSource(state = hazeState),
-                        contentPadding = contentPadding,
+                        contentPadding = lazyColumnContentPadding + contentPadding,
                         state = state.homeSpacesState,
                         lazyListState = spacesLazyListState,
                         onSpaceClick = { spaceId ->
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
index ff0fc00496..8163d29d92 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/HomeTopBar.kt
@@ -10,9 +10,14 @@ package io.element.android.features.home.impl.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.pager.VerticalPager
 import androidx.compose.foundation.pager.rememberPagerState
@@ -57,6 +62,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.backgroundVerticalGradient
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.DropdownMenu
 import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
@@ -65,8 +71,8 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.testtags.TestTags
@@ -94,13 +100,15 @@ fun HomeTopBar(
     spaceFiltersState: SpaceFiltersState,
     modifier: Modifier = Modifier,
 ) {
+    val contentPadding = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()
     Column(modifier) {
         TopAppBar(
             modifier = Modifier
                 .backgroundVerticalGradient(
                     isVisible = !areSearchResultsDisplayed,
                 )
-                .statusBarsPadding(),
+                .statusBarsPadding()
+                .padding(contentPadding),
             colors = TopAppBarDefaults.topAppBarColors(
                 containerColor = Color.Transparent,
                 scrolledContainerColor = Color.Transparent,
@@ -151,7 +159,7 @@ fun HomeTopBar(
             TopAppBarScrollBehaviorLayout(scrollBehavior = scrollBehavior) {
                 RoomListFiltersView(
                     state = filtersState,
-                    modifier = Modifier.padding(bottom = 16.dp)
+                    modifier = Modifier.padding(bottom = 16.dp).padding(contentPadding)
                 )
             }
         }
@@ -159,7 +167,7 @@ fun HomeTopBar(
 }
 
 @Composable
-private fun RoomListMenuItems(
+private fun RowScope.RoomListMenuItems(
     onToggleSearch: () -> Unit,
     onMenuActionClick: (RoomListMenuAction) -> Unit,
     canReportBug: Boolean,
@@ -237,6 +245,7 @@ private fun SpaceFilterButton(
             else -> Unit
         }
     }
+
     val isSelected = spaceFiltersState is SpaceFiltersState.Selected
     IconButton(
         onClick = ::onClick,
@@ -320,7 +329,15 @@ private fun AccountIcon(
             Avatar(
                 avatarData = avatarData,
                 avatarType = AvatarType.User,
-                contentDescription = if (isCurrentAccount) stringResource(CommonStrings.common_settings) else null,
+                contentDescription = if (isCurrentAccount) {
+                    if (showAvatarIndicator) {
+                        stringResource(CommonStrings.a11y_settings_with_required_action)
+                    } else {
+                        stringResource(CommonStrings.common_settings)
+                    }
+                } else {
+                    null
+                },
             )
             if (showAvatarIndicator) {
                 RedIndicatorAtom(
@@ -337,7 +354,7 @@ private fun AccountIcon(
 internal fun HomeTopBarPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -358,7 +375,7 @@ internal fun HomeTopBarPreview() = ElementPreview {
 internal fun HomeTopBarSpaceFiltersSelectedPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -379,7 +396,7 @@ internal fun HomeTopBarSpaceFiltersSelectedPreview() = ElementPreview {
 internal fun HomeTopBarSpacesPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Spaces,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = false,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
@@ -400,7 +417,7 @@ internal fun HomeTopBarSpacesPreview() = ElementPreview {
 internal fun HomeTopBarWithIndicatorPreview() = ElementPreview {
     HomeTopBar(
         selectedNavigationItem = HomeNavigationBarItem.Chats,
-        currentUserAndNeighbors = persistentListOf(MatrixUser(UserId("@id:domain"), "Alice")),
+        currentUserAndNeighbors = persistentListOf(aMatrixUser(id = "@id:domain", displayName = USER_NAME_ALICE)),
         showAvatarIndicator = true,
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()),
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt
index a03399baf7..266b6f5a59 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListContentView.kt
@@ -245,19 +245,25 @@ private fun RoomsViewList(
                     )
                 }
             }
-            SecurityBannerState.None -> if (state.fullScreenIntentPermissionsState.shouldDisplayBanner) {
-                item {
-                    FullScreenIntentPermissionBanner(state = state.fullScreenIntentPermissionsState)
+            // Banner precedence (top-to-bottom): full-screen-intent > battery-optimization >
+            // new-notification-sound > sound-unavailable. At most one renders at a time.
+            SecurityBannerState.None -> when {
+                state.fullScreenIntentPermissionsState.shouldDisplayBanner -> {
+                    item {
+                        FullScreenIntentPermissionBanner(state = state.fullScreenIntentPermissionsState)
+                    }
                 }
-            } else if (state.batteryOptimizationState.shouldDisplayBanner) {
-                item {
-                    BatteryOptimizationBanner(state = state.batteryOptimizationState)
+                state.batteryOptimizationState.shouldDisplayBanner -> {
+                    item {
+                        BatteryOptimizationBanner(state = state.batteryOptimizationState)
+                    }
                 }
-            } else if (state.showNewNotificationSoundBanner) {
-                item {
-                    NewNotificationSoundBanner(
-                        onDismissClick = { eventSink(RoomListEvent.DismissNewNotificationSoundBanner) },
-                    )
+                state.showNewNotificationSoundBanner -> {
+                    item {
+                        NewNotificationSoundBanner(
+                            onDismissClick = { eventSink(RoomListEvent.DismissNewNotificationSoundBanner) },
+                        )
+                    }
                 }
             }
         }
@@ -273,6 +279,7 @@ private fun RoomsViewList(
                 hideInviteAvatars = hideInvitesAvatars,
                 isInviteSeen = room.displayType == RoomSummaryDisplayType.INVITE &&
                     state.seenRoomInvites.contains(room.roomId),
+                showUnreadCount = state.showUnreadCount,
                 onClick = onRoomClick,
                 eventSink = eventSink,
             )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index e2598a9e1c..2a21518e83 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -60,7 +61,10 @@ import io.element.android.libraries.designsystem.theme.roomListRoomMessage
 import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate
 import io.element.android.libraries.designsystem.theme.roomListRoomName
 import io.element.android.libraries.designsystem.theme.unreadIndicator
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.components.InviteSenderView
 import io.element.android.libraries.matrix.ui.model.InviteSender
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -74,8 +78,9 @@ internal fun RoomSummaryRow(
     hideInviteAvatars: Boolean,
     isInviteSeen: Boolean,
     onClick: (RoomListRoomSummary) -> Unit,
-    eventSink: (RoomListEvent) -> Unit,
     modifier: Modifier = Modifier,
+    showUnreadCount: Boolean = false,
+    eventSink: (RoomListEvent) -> Unit,
 ) {
     Box(modifier = modifier) {
         when (room.displayType) {
@@ -123,9 +128,10 @@ internal fun RoomSummaryRow(
                     NameAndTimestampRow(
                         name = room.name,
                         timestamp = room.timestamp,
-                        isHighlighted = room.isHighlighted
+                        isHighlighted = room.isHighlighted,
+                        dmUserStatus = room.dmUserStatus,
                     )
-                    MessagePreviewAndIndicatorRow(room = room)
+                    MessagePreviewAndIndicatorRow(room = room, showUnreadCount = showUnreadCount)
                 }
             }
             RoomSummaryDisplayType.KNOCKED -> {
@@ -139,7 +145,8 @@ internal fun RoomSummaryRow(
                     NameAndTimestampRow(
                         name = room.name,
                         timestamp = null,
-                        isHighlighted = room.isHighlighted
+                        isHighlighted = room.isHighlighted,
+                        dmUserStatus = null,
                     )
                     if (room.canonicalAlias != null) {
                         Text(
@@ -215,26 +222,22 @@ private fun NameAndTimestampRow(
     name: String?,
     timestamp: String?,
     isHighlighted: Boolean,
+    dmUserStatus: DisplayedStatus?,
     modifier: Modifier = Modifier
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),
         horizontalArrangement = spacedBy(16.dp)
     ) {
-        Row(
+        val displayName = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name)
+        DisplayNameWithStatus(
+            name = displayName,
+            status = dmUserStatus,
             modifier = Modifier.weight(1f),
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            // Name
-            Text(
-                style = ElementTheme.typography.fontBodyLgMedium,
-                text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
-                fontStyle = FontStyle.Italic.takeIf { name == null },
-                color = ElementTheme.colors.roomListRoomName,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
+            style = ElementTheme.typography.fontBodyLgMedium,
+            nameColor = ElementTheme.colors.roomListRoomName,
+            nameFontStyle = FontStyle.Italic.takeIf { name == null },
+        )
         // Timestamp
         Text(
             text = timestamp ?: "",
@@ -261,12 +264,12 @@ private fun InviteSubtitle(
     }
     if (subtitle != null) {
         Text(
+            modifier = modifier.clipToBounds(),
             text = subtitle,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
             style = ElementTheme.typography.fontBodyMdRegular,
             color = ElementTheme.colors.roomListRoomMessage,
-            modifier = modifier,
         )
     }
 }
@@ -274,6 +277,7 @@ private fun InviteSubtitle(
 @Composable
 private fun MessagePreviewAndIndicatorRow(
     room: RoomListRoomSummary,
+    showUnreadCount: Boolean,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -325,7 +329,9 @@ private fun MessagePreviewAndIndicatorRow(
                 val messagePreview = room.latestEvent.content()
                 val annotatedMessagePreview = messagePreview as? AnnotatedString ?: AnnotatedString(text = messagePreview.orEmpty().toString())
                 Text(
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .clipToBounds(),
                     text = annotatedMessagePreview,
                     color = ElementTheme.colors.roomListRoomMessage,
                     style = ElementTheme.typography.fontBodyMdRegular,
@@ -349,6 +355,7 @@ private fun MessagePreviewAndIndicatorRow(
             if (room.hasRoomCall) {
                 OnGoingCallIcon(
                     color = tint,
+                    isAudio = room.activeCallIntent == CallIntent.AUDIO
                 )
             }
             if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
@@ -358,8 +365,18 @@ private fun MessagePreviewAndIndicatorRow(
             }
             if (room.hasNewContent) {
                 val contentDescription = stringResource(CommonStrings.a11y_notifications_new_messages)
+                val count = if (showUnreadCount) {
+                    if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
+                        room.numberOfUnreadMessages
+                    } else {
+                        room.numberOfUnreadNotifications
+                    }
+                } else {
+                    null
+                }
                 UnreadIndicatorAtom(
                     color = tint,
+                    count = count,
                     contentDescription = contentDescription,
                 )
             }
@@ -379,7 +396,9 @@ private fun InviteNameAndIndicatorRow(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
-            modifier = Modifier.weight(1f),
+            modifier = Modifier
+                .weight(1f)
+                .clipToBounds(),
             style = ElementTheme.typography.fontBodyLgMedium,
             text = name?.toSafeLength(ellipsize = true) ?: stringResource(id = CommonStrings.common_no_room_name),
             fontStyle = FontStyle.Italic.takeIf { name == null },
@@ -398,10 +417,11 @@ private fun InviteNameAndIndicatorRow(
 @Composable
 private fun OnGoingCallIcon(
     color: Color,
+    isAudio: Boolean
 ) {
     Icon(
         modifier = Modifier.size(16.dp),
-        imageVector = CompoundIcons.VideoCallSolid(),
+        imageVector = if (isAudio) CompoundIcons.VoiceCallSolid() else CompoundIcons.VideoCallSolid(),
         contentDescription = stringResource(CommonStrings.a11y_notifications_ongoing_call),
         tint = color,
     )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt
index 3ff4339bb2..56b2c1ade4 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSource.kt
@@ -83,8 +83,8 @@ class RoomListDataSource(
 
     val loadingState = roomList.loadingState
 
-    fun launchIn(coroutineScope: CoroutineScope) {
-        roomList
+    fun launchIn(coroutineScope: CoroutineScope): Job {
+        return roomList
             .summaries
             .onEach { roomSummaries ->
                 replaceWith(roomSummaries)
@@ -212,6 +212,7 @@ class RoomListDataSource(
     private suspend fun rebuildAllRoomSummaries() {
         lock.withLock {
             roomList.summaries.replayCache.firstOrNull()?.let { roomSummaries ->
+                diffCacheUpdater.updateWith(roomSummaries)
                 buildAndEmitAllRooms(roomSummaries, useCache = false)
             }
         }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
index d723d1a424..96e9f9344b 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/datasource/RoomListRoomSummaryFactory.kt
@@ -17,10 +17,11 @@ import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
+import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.ui.model.dmUserStatus
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.toInviteSender
 import kotlinx.collections.immutable.toImmutableList
@@ -50,6 +51,11 @@ class RoomListRoomSummaryFactory(
             avatarData = avatarData,
             userDefinedNotificationMode = roomInfo.userDefinedNotificationMode,
             hasRoomCall = roomInfo.hasRoomCall,
+            activeCallIntent = when (val consensus = roomInfo.activeCallIntentConsensus) {
+                is CallIntentConsensus.Full -> consensus.callIntent
+                is CallIntentConsensus.Partial -> consensus.callIntent
+                CallIntentConsensus.None -> null
+            },
             isDirect = roomInfo.isDirect,
             isFavorite = roomInfo.isFavorite,
             inviteSender = roomInfo.inviter?.toInviteSender(),
@@ -71,6 +77,7 @@ class RoomListRoomSummaryFactory(
             }.toImmutableList(),
             isTombstoned = roomInfo.successorRoom != null,
             isSpace = roomInfo.isSpace,
+            dmUserStatus = roomInfo.dmUserStatus(),
         )
     }
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
index a59e444455..3ad568abb6 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummary.kt
@@ -13,7 +13,9 @@ import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.model.InviteSender
 import kotlinx.collections.immutable.ImmutableList
 
@@ -33,6 +35,7 @@ data class RoomListRoomSummary(
     val avatarData: AvatarData,
     val userDefinedNotificationMode: RoomNotificationMode?,
     val hasRoomCall: Boolean,
+    val activeCallIntent: CallIntent?,
     val isDirect: Boolean,
     val isDm: Boolean,
     val isFavorite: Boolean,
@@ -40,6 +43,7 @@ data class RoomListRoomSummary(
     val isTombstoned: Boolean,
     val heroes: ImmutableList<AvatarData>,
     val isSpace: Boolean,
+    val dmUserStatus: DisplayedStatus?,
 ) {
     val isHighlighted = userDefinedNotificationMode != RoomNotificationMode.MUTE &&
         (numberOfUnreadNotifications > 0 || numberOfUnreadMentions > 0) ||
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
index 400decff6f..2e75858e3e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryProvider.kt
@@ -11,10 +11,16 @@ package io.element.android.features.home.impl.model
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.LAST_MESSAGE
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.model.InviteSender
 import kotlinx.collections.immutable.toImmutableList
 
@@ -84,16 +90,16 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@alice:matrix.org"),
-                        displayName = "Alice",
+                        displayName = USER_NAME_ALICE,
                     ),
                     canonicalAlias = RoomAlias("#alias:matrix.org"),
                 ),
                 aRoomListRoomSummary(
-                    name = "Bob",
+                    name = USER_NAME_BOB,
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                     isDm = true,
                 ),
@@ -102,7 +108,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                 ),
                 aRoomListRoomSummary(
@@ -110,7 +116,7 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                     displayType = RoomSummaryDisplayType.INVITE,
                     inviteSender = anInviteSender(
                         userId = UserId("@bob:matrix.org"),
-                        displayName = "Bob",
+                        displayName = USER_NAME_BOB,
                     ),
                     isSpace = true
                 ),
@@ -132,13 +138,21 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
             listOf(
                 aRoomListRoomSummary(latestEvent = LatestEvent.Sending("A sending message")),
                 aRoomListRoomSummary(latestEvent = LatestEvent.Error),
+            ),
+            listOf(
+                aRoomListRoomSummary(
+                    name = "Active voice call",
+                    latestEvent = LatestEvent.Synced("No activity, call"),
+                    hasRoomCall = true,
+                    activeCallIntent = CallIntent.AUDIO
+                ),
             )
         ).flatten()
 }
 
 internal fun anInviteSender(
     userId: UserId = UserId("@bob:domain"),
-    displayName: String = "Bob",
+    displayName: String = USER_NAME_BOB,
     avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
 ) = InviteSender(
     userId = userId,
@@ -149,15 +163,16 @@ internal fun anInviteSender(
 
 internal fun aRoomListRoomSummary(
     id: String = "!roomId:domain",
-    name: String? = "Room name",
+    name: String? = ROOM_NAME,
     numberOfUnreadMessages: Long = 0,
     numberOfUnreadMentions: Long = 0,
     numberOfUnreadNotifications: Long = 0,
     isMarkedUnread: Boolean = false,
-    latestEvent: LatestEvent = LatestEvent.Synced("Last message"),
+    latestEvent: LatestEvent = LatestEvent.Synced(LAST_MESSAGE),
     timestamp: String? = latestEvent.takeIf { it !is LatestEvent.None }?.let { "88:88" },
     notificationMode: RoomNotificationMode? = null,
     hasRoomCall: Boolean = false,
+    activeCallIntent: CallIntent? = null,
     avatarData: AvatarData = AvatarData(id, name, size = AvatarSize.RoomListItem),
     isDirect: Boolean = false,
     isDm: Boolean = false,
@@ -168,6 +183,7 @@ internal fun aRoomListRoomSummary(
     heroes: List<AvatarData> = emptyList(),
     isTombstoned: Boolean = false,
     isSpace: Boolean = false,
+    dmUserStatus: DisplayedStatus? = null,
 ) = RoomListRoomSummary(
     id = id,
     roomId = RoomId(id),
@@ -181,6 +197,7 @@ internal fun aRoomListRoomSummary(
     avatarData = avatarData,
     userDefinedNotificationMode = notificationMode,
     hasRoomCall = hasRoomCall,
+    activeCallIntent = activeCallIntent,
     isDirect = isDirect,
     isDm = isDm,
     isFavorite = isFavorite,
@@ -189,5 +206,6 @@ internal fun aRoomListRoomSummary(
     canonicalAlias = canonicalAlias,
     heroes = heroes.toImmutableList(),
     isTombstoned = isTombstoned,
-    isSpace = isSpace
+    isSpace = isSpace,
+    dmUserStatus = dmUserStatus,
 )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContentStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContentStateProvider.kt
index c79e79be73..0ac2b7bf62 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContentStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContentStateProvider.kt
@@ -36,6 +36,7 @@ open class RoomListContentStateProvider : PreviewParameterProvider<RoomListConte
 internal fun aRoomsContentState(
     securityBannerState: SecurityBannerState = SecurityBannerState.None,
     showNewNotificationSoundBanner: Boolean = false,
+    showUnreadCount: Boolean = false,
     summaries: ImmutableList<RoomListRoomSummary> = aRoomListRoomSummaryList(),
     fullScreenIntentPermissionsState: FullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(),
     batteryOptimizationState: BatteryOptimizationState = aBatteryOptimizationState(),
@@ -43,6 +44,7 @@ internal fun aRoomsContentState(
 ) = RoomListContentState.Rooms(
     securityBannerState = securityBannerState,
     showNewNotificationSoundBanner = showNewNotificationSoundBanner,
+    showUnreadCount = showUnreadCount,
     fullScreenIntentPermissionsState = fullScreenIntentPermissionsState,
     batteryOptimizationState = batteryOptimizationState,
     summaries = summaries,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
index 30e3aaf0b7..bfa6962e8b 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenu.kt
@@ -11,6 +11,8 @@ package io.element.android.features.home.impl.roomlist
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -43,6 +45,7 @@ fun RoomListContextMenu(
 ) {
     ModalBottomSheet(
         onDismissRequest = { eventSink(RoomListEvent.HideContextMenu) },
+        scrollable = false,
     ) {
         RoomListModalBottomSheetContent(
             contextMenu = contextMenu,
@@ -66,10 +69,6 @@ fun RoomListContextMenu(
             onFavoriteChange = { isFavorite ->
                 eventSink(RoomListEvent.SetRoomIsFavorite(contextMenu.roomId, isFavorite))
             },
-            onClearCacheRoomClick = {
-                eventSink(RoomListEvent.HideContextMenu)
-                eventSink(RoomListEvent.ClearCacheOfRoom(contextMenu.roomId))
-            },
             onReportRoomClick = {
                 eventSink(RoomListEvent.HideContextMenu)
                 onReportRoomClick(contextMenu.roomId)
@@ -87,14 +86,15 @@ private fun RoomListModalBottomSheetContent(
     onFavoriteChange: (isFavorite: Boolean) -> Unit,
     onRoomMarkReadClick: () -> Unit,
     onRoomMarkUnreadClick: () -> Unit,
-    onClearCacheRoomClick: () -> Unit,
     onReportRoomClick: () -> Unit,
 ) {
     Column(
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
+            .verticalScroll(rememberScrollState())
     ) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = contextMenu.roomName ?: stringResource(id = CommonStrings.common_no_room_name),
                     style = ElementTheme.typography.fontBodyLgMedium,
@@ -104,9 +104,9 @@ private fun RoomListModalBottomSheetContent(
         )
         if (contextMenu.hasNewContent) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(
-                        text = stringResource(id = R.string.screen_roomlist_mark_as_read),
+                        text = stringResource(id = CommonStrings.action_mark_as_read),
                         style = MaterialTheme.typography.bodyLarge,
                     )
                 },
@@ -114,11 +114,10 @@ private fun RoomListModalBottomSheetContent(
                 leadingContent = ListItemContent.Icon(
                     iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())
                 ),
-                style = ListItemStyle.Primary,
             )
         } else {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(
                         text = stringResource(id = R.string.screen_roomlist_mark_as_unread),
                         style = MaterialTheme.typography.bodyLarge,
@@ -128,7 +127,6 @@ private fun RoomListModalBottomSheetContent(
                 leadingContent = ListItemContent.Icon(
                     iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())
                 ),
-                style = ListItemStyle.Primary,
             )
         }
         val (textResId, icon) = if (contextMenu.isFavorite) {
@@ -137,7 +135,7 @@ private fun RoomListModalBottomSheetContent(
             CommonStrings.common_favourite to CompoundIcons.Favourite()
         }
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = stringResource(id = textResId),
                     style = MaterialTheme.typography.bodyLarge,
@@ -154,10 +152,9 @@ private fun RoomListModalBottomSheetContent(
             onClick = {
                 onFavoriteChange(!contextMenu.isFavorite)
             },
-            style = ListItemStyle.Primary,
         )
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = stringResource(id = CommonStrings.common_settings),
                     style = MaterialTheme.typography.bodyLarge,
@@ -169,11 +166,10 @@ private fun RoomListModalBottomSheetContent(
                     CompoundIcons.Settings(),
                 )
             ),
-            style = ListItemStyle.Primary,
         )
         if (canReportRoom) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(text = stringResource(CommonStrings.action_report_room))
                 },
                 modifier = Modifier.clickable { onReportRoomClick() },
@@ -186,7 +182,7 @@ private fun RoomListModalBottomSheetContent(
             )
         }
         ListItem(
-            headlineContent = {
+            content = {
                 Text(text = stringResource(CommonStrings.action_leave_room))
             },
             modifier = Modifier.clickable { onLeaveRoomClick() },
@@ -197,38 +193,19 @@ private fun RoomListModalBottomSheetContent(
             ),
             style = ListItemStyle.Destructive,
         )
-        if (contextMenu.displayClearRoomCacheAction) {
-            ListItem(
-                headlineContent = {
-                    Text(text = "Clear cache for this room")
-                },
-                modifier = Modifier.clickable { onClearCacheRoomClick() },
-                leadingContent = ListItemContent.Icon(
-                    iconSource = IconSource.Vector(CompoundIcons.Delete())
-                ),
-                style = ListItemStyle.Primary,
-            )
-        }
     }
 }
 
-// TODO This component should be seen in [RoomListView] @Preview but it doesn't show up.
-// see: https://issuetracker.google.com/issues/283843380
-// Remove this preview when the issue is fixed.
 @PreviewsDayNight
 @Composable
-internal fun RoomListModalBottomSheetContentPreview(
+internal fun RoomListContextMenuPreview(
     @PreviewParameter(RoomListStateContextMenuShownProvider::class) contextMenu: RoomListState.ContextMenu.Shown
-) = ElementPreview {
-    RoomListModalBottomSheetContent(
+) = ElementPreview(fillMaxSize = true) {
+    RoomListContextMenu(
         contextMenu = contextMenu,
         canReportRoom = true,
-        onRoomMarkReadClick = {},
-        onRoomMarkUnreadClick = {},
         onRoomSettingsClick = {},
-        onLeaveRoomClick = {},
-        onFavoriteChange = {},
-        onClearCacheRoomClick = {},
         onReportRoomClick = {},
+        eventSink = {},
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt
index 523e677a57..0a7a29ebc2 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenu.kt
@@ -13,16 +13,21 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.appconfig.ProtectionConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.home.impl.R
 import io.element.android.features.home.impl.model.RoomListRoomSummary
+import io.element.android.libraries.core.extensions.toSafeLength
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
@@ -42,9 +47,14 @@ fun RoomListDeclineInviteMenu(
 ) {
     ModalBottomSheet(
         onDismissRequest = { eventSink(RoomListEvent.HideDeclineInviteMenu) },
+        scrollable = false,
     ) {
         RoomListDeclineInviteMenuContent(
-            roomName = menu.roomSummary.name ?: menu.roomSummary.roomId.value,
+            roomName = menu.roomSummary.name?.toSafeLength(
+                maxLength = ProtectionConfig.MAX_ROOM_NAME_LENGTH,
+                ellipsize = true,
+            )
+                ?: menu.roomSummary.roomId.value,
             onDeclineClick = {
                 eventSink(RoomListEvent.HideDeclineInviteMenu)
                 eventSink(RoomListEvent.DeclineInvite(menu.roomSummary, false))
@@ -74,7 +84,8 @@ private fun RoomListDeclineInviteMenuContent(
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(all = 16.dp),
+            .padding(all = 16.dp)
+            .verticalScroll(rememberScrollState()),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(
@@ -112,16 +123,15 @@ private fun RoomListDeclineInviteMenuContent(
     }
 }
 
-// TODO This component should be seen in [RoomListView] @Preview but it doesn't show up.
-// see: https://issuetracker.google.com/issues/283843380
-// Remove this preview when the issue is fixed.
 @PreviewsDayNight
 @Composable
-internal fun RoomListDeclineInviteMenuContentPreview() = ElementPreview {
-    RoomListDeclineInviteMenuContent(
-        roomName = "Room name",
-        onCancelClick = {},
-        onDeclineClick = {},
+internal fun RoomListDeclineInviteMenuPreview(
+    @PreviewParameter(RoomListStateDeclineInviteMenuShownProvider::class) menu: RoomListState.DeclineInviteMenu.Shown,
+) = ElementPreview {
+    RoomListDeclineInviteMenu(
+        menu = menu,
+        canReportRoom = false,
         onDeclineAndBlockClick = {},
+        eventSink = {},
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvent.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvent.kt
index 3e82ff9809..49d033682f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvent.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListEvent.kt
@@ -30,5 +30,4 @@ sealed interface RoomListEvent {
     data class MarkAsRead(val roomId: RoomId) : ContextMenuEvent
     data class MarkAsUnread(val roomId: RoomId) : ContextMenuEvent
     data class SetRoomIsFavorite(val roomId: RoomId, val isFavorite: Boolean) : ContextMenuEvent
-    data class ClearCacheOfRoom(val roomId: RoomId) : ContextMenuEvent
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
index 2010555cd7..fe09bd7cd1 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt
@@ -28,7 +28,6 @@ import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.features.announcement.api.Announcement
 import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.datasource.RoomListDataSource
-import io.element.android.features.home.impl.filters.RoomListFilter.Rooms
 import io.element.android.features.home.impl.filters.RoomListFiltersState
 import io.element.android.features.home.impl.filters.into
 import io.element.android.features.home.impl.search.RoomListSearchEvent
@@ -42,20 +41,19 @@ import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteE
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
+import io.element.android.features.preferences.impl.tasks.MarkRoomAsRead
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.encryption.RecoveryState
 import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar
-import io.element.android.libraries.preferences.api.store.AppPreferencesStore
-import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.push.api.battery.BatteryOptimizationState
-import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.api.watchers.AnalyticsColdStartWatcher
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
@@ -65,7 +63,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -79,17 +76,16 @@ class RoomListPresenter(
     private val roomListDataSource: RoomListDataSource,
     private val filtersPresenter: Presenter<RoomListFiltersState>,
     private val searchPresenter: Presenter<RoomListSearchState>,
-    private val sessionPreferencesStore: SessionPreferencesStore,
     private val analyticsService: AnalyticsService,
     private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
     private val fullScreenIntentPermissionsPresenter: Presenter<FullScreenIntentPermissionsState>,
     private val batteryOptimizationPresenter: Presenter<BatteryOptimizationState>,
-    private val notificationCleaner: NotificationCleaner,
-    private val appPreferencesStore: AppPreferencesStore,
+    private val markRoomAsRead: MarkRoomAsRead,
     private val seenInvitesStore: SeenInvitesStore,
     private val announcementService: AnnouncementService,
     private val coldStartWatcher: AnalyticsColdStartWatcher,
     private val spaceFiltersPresenter: Presenter<SpaceFiltersState>,
+    private val featureFlagService: FeatureFlagService,
 ) : Presenter<RoomListState> {
     private val encryptionService = client.encryptionService
 
@@ -154,7 +150,6 @@ class RoomListPresenter(
                 }
                 is RoomListEvent.ShowDeclineInviteMenu -> declineInviteMenu.value = RoomListState.DeclineInviteMenu.Shown(event.roomSummary)
                 RoomListEvent.HideDeclineInviteMenu -> declineInviteMenu.value = RoomListState.DeclineInviteMenu.Hidden
-                is RoomListEvent.ClearCacheOfRoom -> coroutineScope.clearCacheOfRoom(event.roomId)
             }
         }
 
@@ -165,13 +160,17 @@ class RoomListPresenter(
             roomListDataSource.updateFilter(allFilters)
         }
 
+        val canReportRoom by produceState(false) { value = client.canReportRoom() }
+        val showUnreadCount by produceState(false) {
+            value = featureFlagService.isFeatureEnabled(FeatureFlags.UnreadIndicatorCount)
+        }
+
         val contentState = roomListContentState(
             securityBannerDismissed,
             showNewNotificationSoundBanner,
+            showUnreadCount,
         )
 
-        val canReportRoom by produceState(false) { value = client.canReportRoom() }
-
         return RoomListState(
             contextMenu = contextMenu.value,
             declineInviteMenu = declineInviteMenu.value,
@@ -226,6 +225,7 @@ class RoomListPresenter(
     private fun roomListContentState(
         securityBannerDismissed: Boolean,
         showNewNotificationSoundBanner: Boolean,
+        showUnreadCount: Boolean,
     ): RoomListContentState {
         val roomSummaries by produceState(initialValue = AsyncData.Loading()) {
             roomListDataSource.roomSummariesFlow.collect { value = AsyncData.Success(it) }
@@ -254,6 +254,7 @@ class RoomListPresenter(
                 RoomListContentState.Rooms(
                     securityBannerState = securityBannerState,
                     showNewNotificationSoundBanner = showNewNotificationSoundBanner,
+                    showUnreadCount = showUnreadCount,
                     fullScreenIntentPermissionsState = fullScreenIntentPermissionsPresenter.present(),
                     batteryOptimizationState = batteryOptimizationPresenter.present(),
                     summaries = roomSummaries.dataOrNull().orEmpty().toImmutableList(),
@@ -271,7 +272,6 @@ class RoomListPresenter(
             isDm = event.roomSummary.isDm,
             isFavorite = event.roomSummary.isFavorite,
             hasNewContent = event.roomSummary.hasNewContent,
-            displayClearRoomCacheAction = appPreferencesStore.isDeveloperModeEnabledFlow().first(),
         )
         contextMenuState.value = initialState
 
@@ -304,19 +304,10 @@ class RoomListPresenter(
     }
 
     private fun CoroutineScope.markAsRead(roomId: RoomId) = launch {
-        notificationCleaner.clearMessagesForRoom(client.sessionId, roomId)
-        client.getRoom(roomId)?.use { room ->
-            room.setUnreadFlag(isUnread = false)
-            val receiptType = if (sessionPreferencesStore.isSendPublicReadReceiptsEnabled().first()) {
-                ReceiptType.READ
-            } else {
-                ReceiptType.READ_PRIVATE
+        markRoomAsRead(roomId)
+            .onSuccess {
+                analyticsService.captureInteraction(name = Interaction.Name.MobileRoomListRoomContextMenuUnreadToggle)
             }
-            room.markAsRead(receiptType)
-                .onSuccess {
-                    analyticsService.captureInteraction(name = Interaction.Name.MobileRoomListRoomContextMenuUnreadToggle)
-                }
-        }
     }
 
     private fun CoroutineScope.markAsUnread(roomId: RoomId) = launch {
@@ -327,10 +318,4 @@ class RoomListPresenter(
                 }
         }
     }
-
-    private fun CoroutineScope.clearCacheOfRoom(roomId: RoomId) = launch {
-        client.getRoom(roomId)?.use { room ->
-            room.clearEventCacheStorage()
-        }
-    }
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
index e0f4943621..e184a5a57f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListState.kt
@@ -44,7 +44,6 @@ data class RoomListState(
             val isDm: Boolean,
             val isFavorite: Boolean,
             val hasNewContent: Boolean,
-            val displayClearRoomCacheAction: Boolean,
         ) : ContextMenu
     }
 
@@ -72,6 +71,7 @@ sealed interface RoomListContentState {
         val fullScreenIntentPermissionsState: FullScreenIntentPermissionsState,
         val batteryOptimizationState: BatteryOptimizationState,
         val showNewNotificationSoundBanner: Boolean,
+        val showUnreadCount: Boolean,
         val summaries: ImmutableList<RoomListRoomSummary>,
         val seenRoomInvites: ImmutableSet<RoomId>,
     ) : RoomListContentState
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
index a1624e4917..eca1b63d7d 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateContextMenuShownProvider.kt
@@ -31,5 +31,4 @@ internal fun aContextMenuShown(
     isDm = isDm,
     hasNewContent = hasNewContent,
     isFavorite = isFavorite,
-    displayClearRoomCacheAction = false,
 )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateDeclineInviteMenuShownProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateDeclineInviteMenuShownProvider.kt
new file mode 100644
index 0000000000..73d4785e96
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListStateDeclineInviteMenuShownProvider.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.roomlist
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
+import io.element.android.features.home.impl.model.RoomListRoomSummary
+import io.element.android.features.home.impl.model.aRoomListRoomSummary
+
+open class RoomListStateDeclineInviteMenuShownProvider : PreviewParameterProvider<RoomListState.DeclineInviteMenu.Shown> {
+    override val values: Sequence<RoomListState.DeclineInviteMenu.Shown>
+        get() = sequenceOf(
+            aDeclineInviteMenuShown(),
+            aDeclineInviteMenuShown(
+                aRoomListRoomSummary(
+                    name = LoremIpsum(500).values.first(),
+                )
+            ),
+            aDeclineInviteMenuShown(
+                aRoomListRoomSummary(
+                    name = null,
+                )
+            ),
+        )
+}
+
+internal fun aDeclineInviteMenuShown(
+    roomSummary: RoomListRoomSummary = aRoomListRoomSummary(),
+) = RoomListState.DeclineInviteMenu.Shown(
+    roomSummary = roomSummary,
+)
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt
index 942e924820..0535ded5c5 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt
@@ -13,9 +13,15 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -33,6 +39,8 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -112,10 +120,12 @@ private fun RoomListSearchContent(
                 title = {
                     // The stateSaver will keep the selection state when returning to this UI
                     val focusRequester = remember { FocusRequester() }
+                    val searchLabel = stringResource(CommonStrings.action_search)
                     FilledTextField(
                         modifier = Modifier
                             .fillMaxWidth()
-                            .focusRequester(focusRequester),
+                            .focusRequester(focusRequester)
+                            .semantics { contentDescription = searchLabel },
                         state = state.query,
                         lineLimits = TextFieldLineLimits.SingleLine,
                         colors = TextFieldDefaults.colors(
@@ -132,7 +142,7 @@ private fun RoomListSearchContent(
                                 IconButton(onClick = { state.eventSink(RoomListSearchEvent.ClearQuery) }) {
                                     Icon(
                                         imageVector = CompoundIcons.Close(),
-                                        contentDescription = stringResource(CommonStrings.action_cancel)
+                                        contentDescription = stringResource(CommonStrings.a11y_clear_search_field)
                                     )
                                 }
                             }
@@ -149,7 +159,8 @@ private fun RoomListSearchContent(
                     }
                 },
             )
-        }
+        },
+        contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom),
     ) { padding ->
         Column(
             modifier = Modifier
@@ -163,6 +174,7 @@ private fun RoomListSearchContent(
             LazyColumn(
                 state = lazyListState,
                 modifier = Modifier.weight(1f),
+                contentPadding = WindowInsets.navigationBars.asPaddingValues(),
             ) {
                 items(
                     items = state.results,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenter.kt
index 9813732bdb..76fce9bfec 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenter.kt
@@ -17,8 +17,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
 import kotlinx.collections.immutable.persistentListOf
@@ -27,20 +25,15 @@ import kotlinx.coroutines.flow.map
 
 @Inject
 class SpaceFiltersPresenter(
-    private val featureFlagService: FeatureFlagService,
     private val matrixClient: MatrixClient,
 ) : Presenter<SpaceFiltersState> {
     @Composable
     override fun present(): SpaceFiltersState {
-        val isFeatureEnabled by featureFlagService
-            .isFeatureEnabledFlow(FeatureFlags.RoomListSpaceFilters)
-            .collectAsState(initial = false)
-
         val availableFilters by remember {
             matrixClient.spaceService.spaceFiltersFlow.map { it.toImmutableList() }
         }.collectAsState(initial = persistentListOf())
 
-        if (!isFeatureEnabled || availableFilters.isEmpty()) {
+        if (availableFilters.isEmpty()) {
             return SpaceFiltersState.Disabled
         }
 
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersView.kt
index fb77c74203..280f41b909 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersView.kt
@@ -15,16 +15,14 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetValue
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -45,9 +43,12 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
 import io.element.android.libraries.designsystem.theme.components.SearchField
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.spaces.SpaceServiceFilter
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -56,8 +57,9 @@ fun SpaceFiltersView(
     modifier: Modifier = Modifier
 ) {
     val isSelecting by rememberUpdatedState(state is SpaceFiltersState.Selecting)
-    val sheetState = rememberModalBottomSheetState(
-        skipPartiallyExpanded = true,
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
         confirmValueChange = { sheetValueTarget ->
             // This ensures the hide animation is not cancelled
             when (sheetValueTarget) {
@@ -73,15 +75,15 @@ fun SpaceFiltersView(
     }
     if (sheetState.isVisible || isSelecting) {
         ModalBottomSheet(
-            modifier = modifier
-                .systemBarsPadding()
-                .navigationBarsPadding(),
+            modifier = modifier,
             sheetState = sheetState,
             onDismissRequest = {
                 if (state is SpaceFiltersState.Selecting) {
                     state.eventSink(SpaceFiltersEvent.Selecting.Cancel)
                 }
-            }
+            },
+            scrollable = false,
+            contentWindowInsets = { scaffoldScrollableContentInsets },
         ) {
             Box(
                 modifier = Modifier
@@ -92,7 +94,7 @@ fun SpaceFiltersView(
                     SpaceFiltersBottomSheetContent(
                         filters = state.visibleFilters,
                         searchQuery = state.searchQuery,
-                        onFilterSelected = { filter ->
+                        onSelectFilter = { filter ->
                             state.eventSink(SpaceFiltersEvent.Selecting.SelectFilter(filter))
                         }
                     )
@@ -104,13 +106,13 @@ fun SpaceFiltersView(
 
 @Composable
 private fun SpaceFiltersBottomSheetContent(
-    filters: List<SpaceServiceFilter>,
+    filters: ImmutableList<SpaceServiceFilter>,
     searchQuery: TextFieldState,
-    onFilterSelected: (SpaceServiceFilter) -> Unit,
+    onSelectFilter: (SpaceServiceFilter) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(
-        modifier = modifier.padding(vertical = 16.dp)
+        modifier = modifier.padding(top = 16.dp)
     ) {
         Text(
             text = stringResource(R.string.screen_roomlist_your_spaces),
@@ -128,11 +130,13 @@ private fun SpaceFiltersBottomSheetContent(
             placeholder = stringResource(CommonStrings.action_search),
         )
         Spacer(modifier = Modifier.height(16.dp))
-        LazyColumn {
+        LazyColumn(
+            contentPadding = lazyColumnContentPadding,
+        ) {
             items(filters) { filter ->
                 SpaceFilterItem(
                     filter = filter,
-                    onClick = { onFilterSelected(filter) }
+                    onClick = { onSelectFilter(filter) }
                 )
             }
         }
@@ -185,6 +189,6 @@ private fun SpaceFilterItem(
 
 @PreviewsDayNight
 @Composable
-internal fun SpaceFiltersViewPreview(@PreviewParameter(SpaceFiltersStateProvider::class) state: SpaceFiltersState) = ElementPreview {
+internal fun SpaceFiltersViewPreview(@PreviewParameter(SpaceFiltersStateProvider::class) state: SpaceFiltersState) = ElementPreview(fillMaxSize = true) {
     SpaceFiltersView(state = state)
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt
index 707ac73261..b758a1e593 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenter.kt
@@ -15,8 +15,6 @@ import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.safety.rememberHideInvitesAvatar
 import kotlinx.collections.immutable.persistentListOf
@@ -29,11 +27,9 @@ import kotlinx.coroutines.flow.map
 class HomeSpacesPresenter(
     private val client: MatrixClient,
     private val seenInvitesStore: SeenInvitesStore,
-    private val featureFlagsService: FeatureFlagService,
 ) : Presenter<HomeSpacesState> {
     @Composable
     override fun present(): HomeSpacesState {
-        val canCreateSpaces by featureFlagsService.isFeatureEnabledFlow(FeatureFlags.CreateSpaces).collectAsState(false)
         val hideInvitesAvatar by client.rememberHideInvitesAvatar()
         val spaceRooms by remember {
             client.spaceService.topLevelSpacesFlow.map { it.toImmutableList() }
@@ -52,7 +48,6 @@ class HomeSpacesPresenter(
             spaceRooms = spaceRooms,
             seenSpaceInvites = seenSpaceInvites,
             hideInvitesAvatar = hideInvitesAvatar,
-            canCreateSpaces = canCreateSpaces,
             // TODO enable once we can link to the screen to explore public spaces
             canExploreSpaces = false,
             eventSink = ::handleEvent,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt
index 84b2dc7f52..e93f04291e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesState.kt
@@ -18,7 +18,6 @@ data class HomeSpacesState(
     val spaceRooms: ImmutableList<SpaceRoom>,
     val seenSpaceInvites: ImmutableSet<RoomId>,
     val hideInvitesAvatar: Boolean,
-    val canCreateSpaces: Boolean,
     val canExploreSpaces: Boolean,
     val eventSink: (HomeSpacesEvents) -> Unit,
 )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt
index a65f29cc2f..17f2cbad31 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesStateProvider.kt
@@ -30,17 +30,9 @@ open class HomeSpacesStateProvider : PreviewParameterProvider<HomeSpacesState> {
                 ),
                 spaceRooms = aListOfSpaceRooms(),
             ),
-            aHomeSpacesState(
-                space = CurrentSpace.Space(
-                    spaceRoom = aSpaceRoom(roomId = RoomId("!mySpace:example.com"))
-                ),
-                spaceRooms = aListOfSpaceRooms(),
-                canCreateSpaces = false,
-            ),
             aHomeSpacesState(
                 space = CurrentSpace.Root,
                 spaceRooms = emptyList(),
-                canCreateSpaces = true,
             ),
         )
 }
@@ -50,7 +42,6 @@ internal fun aHomeSpacesState(
     spaceRooms: List<SpaceRoom> = aListOfSpaceRooms(),
     seenSpaceInvites: Set<RoomId> = emptySet(),
     hideInvitesAvatar: Boolean = false,
-    canCreateSpaces: Boolean = true,
     canExploreSpaces: Boolean = true,
     eventSink: (HomeSpacesEvents) -> Unit = {},
 ) = HomeSpacesState(
@@ -58,7 +49,6 @@ internal fun aHomeSpacesState(
     spaceRooms = spaceRooms.toImmutableList(),
     seenSpaceInvites = seenSpaceInvites.toImmutableSet(),
     hideInvitesAvatar = hideInvitesAvatar,
-    canCreateSpaces = canCreateSpaces,
     canExploreSpaces = canExploreSpaces,
     eventSink = eventSink,
 )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
index c563e6eb26..9125912bf0 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
@@ -55,7 +55,7 @@ fun HomeSpacesView(
     onExploreClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    if (state.canCreateSpaces && state.spaceRooms.isEmpty()) {
+    if (state.spaceRooms.isEmpty()) {
         EmptySpaceHomeView(
             modifier = modifier.padding(contentPadding),
             onCreateSpaceClick = onCreateSpaceClick,
diff --git a/features/home/impl/src/main/res/values-ca/translations.xml b/features/home/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..e37db27f23
--- /dev/null
+++ b/features/home/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_battery_optimization_content_android">"Desactiva l\'optimització de bateria d\'aquesta aplicació per assegurar-te de rebre totes les notificacions."</string>
+  <string name="banner_battery_optimization_title_android">"No arriben les notificacions?"</string>
+  <string name="banner_set_up_recovery_content">"Recupera la teva identitat criptogràfica i l\'historial de missatges amb una clau de recuperació si has perdut l\'accés a tots els teus dispositius existents."</string>
+  <string name="banner_set_up_recovery_submit">"Configura la recuperació"</string>
+  <string name="banner_set_up_recovery_title">"Configura la recuperació per protegir el teu compte"</string>
+  <string name="confirm_recovery_key_banner_message">"Confirma la clau de recuperació per mantenir l\'accés a l\'emmagatzematge de claus i a l\'historial de missatges."</string>
+  <string name="confirm_recovery_key_banner_primary_button_title">"Introdueix clau de recuperació"</string>
+  <string name="confirm_recovery_key_banner_secondary_button_title">"Has oblidat la clau de recuperació?"</string>
+  <string name="confirm_recovery_key_banner_title">"L\'emmagatzematge de claus no està sincronitzat"</string>
+  <string name="full_screen_intent_banner_message">"Per assegurar que mai et perdis una trucada important, canvia la configuració per permetre les notificacions en pantalla completa quan el telèfon està bloquejat."</string>
+  <string name="full_screen_intent_banner_title">"Millora l\'experiència de les trucades"</string>
+  <string name="screen_home_tab_chats">"Xats"</string>
+  <string name="screen_invites_decline_chat_message">"Segur que vols rebutjar la invitació per unir-te a %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Rebutja invitació"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Segur que vols rebutjar el xat privat amb %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Rebutja xat"</string>
+  <string name="screen_invites_empty_list">"Sense invitacions"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) t\'ha convidat"</string>
+  <string name="screen_migration_message">"Aquest procés només s\'ha de fer una vegada, gràcies per esperar."</string>
+  <string name="screen_migration_title">"Configurant compte."</string>
+  <string name="screen_roomlist_a11y_create_message">"Crea un nou xat o sala"</string>
+  <string name="screen_roomlist_empty_message">"Comença enviant un missatge a algú."</string>
+  <string name="screen_roomlist_empty_title">"Encara no hi ha xats."</string>
+  <string name="screen_roomlist_filter_favourites">"Preferits"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Pots afegir un xat a preferits a la configuració del xat.
+De moment, pots desseleccionar els filtres per veure tots els xats."</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"Encara no tens cap xat preferit"</string>
+  <string name="screen_roomlist_filter_invites">"Invitacions"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"No tens cap invitació pendent."</string>
+  <string name="screen_roomlist_filter_low_priority">"Prioritat baixa"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Pots desseleccionar els filtres per veure els altres xats"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"Cap xats per a aquesta selecció"</string>
+  <string name="screen_roomlist_filter_people">"Persones"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"Encara no tens cap xat directe"</string>
+  <string name="screen_roomlist_filter_rooms">"Sales"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"Encara no pertanys a cap sala"</string>
+  <string name="screen_roomlist_filter_unreads">"No llegits"</string>
+  <string name="screen_roomlist_filter_unreads_empty_state_title">"Enhorabona!
+No tens missatges sense llegir!"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"Sol·licitud d\'unió enviada"</string>
+  <string name="screen_roomlist_main_space_title">"Xats"</string>
+  <string name="screen_roomlist_mark_as_read">"Marca com a llegit"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marca com a no llegit"</string>
+  <string name="screen_roomlist_tombstoned_room_description">"La sala ha estat actualitzada"</string>
+  <string name="session_verification_banner_message">"Sembla que estàs utilitzant un dispositiu nou. Verifica\'l amb un altre dispositiu per accedir als teus missatges xifrats."</string>
+  <string name="session_verification_banner_title">"Verifica que ets tu"</string>
+</resources>
diff --git a/features/home/impl/src/main/res/values-cs/translations.xml b/features/home/impl/src/main/res/values-cs/translations.xml
index 16f9e6b801..0276db1fbe 100644
--- a/features/home/impl/src/main/res/values-cs/translations.xml
+++ b/features/home/impl/src/main/res/values-cs/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Nepřicházejí vám oznámení?"</string>
   <string name="banner_new_sound_message">"Váš zvuk oznámení byl aktualizován – je jasnější, rychlejší a méně rušivý."</string>
   <string name="banner_new_sound_title">"Aktualizovali jsme vaše zvuky"</string>
-  <string name="banner_set_up_recovery_content">"Vygenerujte nový klíč pro obnovení, který lze použít k obnovení historie šifrovaných zpráv v případě, že ztratíte přístup ke svým zařízením."</string>
-  <string name="banner_set_up_recovery_submit">"Nastavení obnovy"</string>
-  <string name="banner_set_up_recovery_title">"Nastavení obnovy"</string>
+  <string name="banner_set_up_recovery_content">"Vaše chaty jsou automaticky zálohovány pomocí koncového šifrování. Chcete-li tuto zálohu obnovit a zachovat si svou digitální identitu v případě, že ztratíte přístup ke všem svým zařízením, budete potřebovat svůj klíč pro obnovení."</string>
+  <string name="banner_set_up_recovery_submit">"Získat klíč pro obnovení"</string>
+  <string name="banner_set_up_recovery_title">"Zálohujte své chaty"</string>
   <string name="confirm_recovery_key_banner_message">"Potvrďte klíč pro obnovení, abyste zachovali přístup k úložišti klíčů a historii zpráv."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Zadejte klíč pro obnovení"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Zapomněli jste klíč pro obnovení?"</string>
diff --git a/features/home/impl/src/main/res/values-da/translations.xml b/features/home/impl/src/main/res/values-da/translations.xml
index cd9ec06ada..fab528ce71 100644
--- a/features/home/impl/src/main/res/values-da/translations.xml
+++ b/features/home/impl/src/main/res/values-da/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Modtager du ikke notifikationer?"</string>
   <string name="banner_new_sound_message">"Dit notifikationsping er blevet opdateret – tydeligere, hurtigere og mindre forstyrrende."</string>
   <string name="banner_new_sound_title">"Vi har opdateret dine lyde"</string>
-  <string name="banner_set_up_recovery_content">"Gendan din kryptografiske identitet og meddelelseshistorik med en gendannelsesnøgle, hvis du har mistet alle dine eksisterende enheder."</string>
-  <string name="banner_set_up_recovery_submit">"Opsæt gendannelse"</string>
-  <string name="banner_set_up_recovery_title">"Konfigurer gendannelse for at beskytte din konto"</string>
+  <string name="banner_set_up_recovery_content">"Dine chats sikkerhedskopieres automatisk med end-to-end-kryptering. For at kunne gendanne denne sikkerhedskopi og bevare din digitale identitet, hvis du mister adgang til alle dine enheder, får du brug for din gendannelsesnøgle."</string>
+  <string name="banner_set_up_recovery_submit">"Hent gendannelsesnøgle"</string>
+  <string name="banner_set_up_recovery_title">"Sikkerhedskopier dine samtaler"</string>
   <string name="confirm_recovery_key_banner_message">"Bekræft din gendannelsesnøgle for at bevare adgangen til nøglelager og meddelelseshistorik."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Indtast din gendannelsesnøgle"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Har du glemt din gendannelsesnøgle?"</string>
diff --git a/features/home/impl/src/main/res/values-de/translations.xml b/features/home/impl/src/main/res/values-de/translations.xml
index f504d5c8e1..ee6cef29de 100644
--- a/features/home/impl/src/main/res/values-de/translations.xml
+++ b/features/home/impl/src/main/res/values-de/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Kommen die Benachrichtigungen nicht an?"</string>
   <string name="banner_new_sound_message">"Dein Benachrichtigungs-Ping wurde aktualisiert – klarer, schneller und weniger störend."</string>
   <string name="banner_new_sound_title">"Wir haben deine Sounds aktualisiert"</string>
-  <string name="banner_set_up_recovery_content">"Stelle Deine kryptographische Identität und Deinen Nachrichtenverlauf mit Hilfe eines Wiederherstellungsschlüssels wieder her, falls du alle deine Geräte verloren haben solltest"</string>
-  <string name="banner_set_up_recovery_submit">"Wiederherstellung einrichten"</string>
-  <string name="banner_set_up_recovery_title">"Wiederherstellung einrichten"</string>
+  <string name="banner_set_up_recovery_content">"Deine Chats werden automatisch gesichert und mit einer Ende-zu-Ende-Verschlüsselung geschützt. Um dieses Backup wiederherzustellen und deine digitale Identität zu bewahren, falls du den Zugriff auf alle deine Geräte verlierst, benötigst du deinen Wiederherstellungsschlüssel."</string>
+  <string name="banner_set_up_recovery_submit">"Wiederherstellungsschlüssel einrichten"</string>
+  <string name="banner_set_up_recovery_title">"Sichere deine Chats"</string>
   <string name="confirm_recovery_key_banner_message">"Bestätige deinen Wiederherstellungsschlüssel, um weiterhin auf deinen Schlüsselspeicher und den Nachrichtenverlauf zugreifen zu können."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Gib deinen Wiederherstellungsschlüssel ein"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Hast du deinen Wiederherstellungsschlüssel vergessen?"</string>
diff --git a/features/home/impl/src/main/res/values-et/translations.xml b/features/home/impl/src/main/res/values-et/translations.xml
index c1f61bfa29..4ba1695d7e 100644
--- a/features/home/impl/src/main/res/values-et/translations.xml
+++ b/features/home/impl/src/main/res/values-et/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Sa ei näe kõiki teavitusi?"</string>
   <string name="banner_new_sound_message">"Sinu nutiseadme teavituste heli on uuenenud - see on nüüd selgem, kiirem ja vähem häiriv."</string>
   <string name="banner_new_sound_title">"Oleme sinu helisid värskendanud"</string>
-  <string name="banner_set_up_recovery_content">"Loo uus taastevõti, mida saad kasutada oma krüptitud sõnumite ajaloo taastamisel olukorras, kus kaotad ligipääsu oma seadmetele."</string>
-  <string name="banner_set_up_recovery_submit">"Seadista andmete taastamine"</string>
-  <string name="banner_set_up_recovery_title">"Seadista taastamine"</string>
+  <string name="banner_set_up_recovery_content">"Sinu vestlused on automaatselt varundatud kasutades läbivat krüptimist. Kui peaksid kaotama ligipääsu kõikidele oma seadmetele, siis selle varukoopia taastamiseks ja oma digitaalse identiteedi säilitamiseks, on vaja taastevõtit."</string>
+  <string name="banner_set_up_recovery_submit">"Seadista taastevõti"</string>
+  <string name="banner_set_up_recovery_title">"Varunda oma vestlused"</string>
   <string name="confirm_recovery_key_banner_message">"Säilitamaks ligipääsu vestluste ja krüptovõtmete varukoopiale, palun sisesta kinnituseks oma taastevõti."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Sisesta oma taastevõti"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Kas unustasid oma taastevõtme?"</string>
diff --git a/features/home/impl/src/main/res/values-fa/translations.xml b/features/home/impl/src/main/res/values-fa/translations.xml
index aec50309d8..b0c6a30bc4 100644
--- a/features/home/impl/src/main/res/values-fa/translations.xml
+++ b/features/home/impl/src/main/res/values-fa/translations.xml
@@ -4,7 +4,7 @@
   <string name="banner_battery_optimization_submit_android">"از کار انداختن بهینه سازی"</string>
   <string name="banner_battery_optimization_title_android">"آگاهی‌ها نمی‌رسند؟"</string>
   <string name="banner_set_up_recovery_content">"بازگردانی تاریخچهٔ پیام‌ها و هویت رمزنگاشته‌تان با کلید بازیابی در صورت از دست دادن همهٔ افزاره‌های موجودتان."</string>
-  <string name="banner_set_up_recovery_submit">"برپایی بازیابی"</string>
+  <string name="banner_set_up_recovery_submit">"دریافت کلید بازیابی"</string>
   <string name="banner_set_up_recovery_title">"برپایی بازیابی"</string>
   <string name="confirm_recovery_key_banner_message">"کلید بازیابی خود را تأیید کنید تا دسترسی به حافظه کلیدها و تاریخچه پیام‌هایتان حفظ شود ."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"ورود کلید بازیابیتان"</string>
@@ -25,6 +25,7 @@
   <string name="screen_roomlist_empty_message">"آغاز با پیام دادن به کسی."</string>
   <string name="screen_roomlist_empty_title">"هنوز گپی وجود ندارد."</string>
   <string name="screen_roomlist_filter_favourites">"علاقه‌مندی‌ها"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"می‌توانید در تنظیمات چت، یک چت را به موارد دلخواه خود اضافه کنید. فعلاً می‌توانید فیلترها را غیرفعال کنید تا چت‌های دیگر خود را ببینید."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"هنوز هیچ گپ مورد علاقه‌ای ندارید"</string>
   <string name="screen_roomlist_filter_invites">"دعوت‌ها"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"هیچ دعوت منتظری ندارید."</string>
diff --git a/features/home/impl/src/main/res/values-hr/translations.xml b/features/home/impl/src/main/res/values-hr/translations.xml
index 233cac78d8..eae429a0e5 100644
--- a/features/home/impl/src/main/res/values-hr/translations.xml
+++ b/features/home/impl/src/main/res/values-hr/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Obavijesti ne stižu?"</string>
   <string name="banner_new_sound_message">"Vaš je signal obavijesti ažuriran – jasniji je, brži i manje ometajući."</string>
   <string name="banner_new_sound_title">"Ažurirali smo vaše zvukove"</string>
-  <string name="banner_set_up_recovery_content">"Ako ste izgubili sve postojeće uređaje, oporavite svoj kriptografski identitet i povijest poruka pomoću ključa za oporavak."</string>
-  <string name="banner_set_up_recovery_submit">"Postavljanje oporavka"</string>
-  <string name="banner_set_up_recovery_title">"Postavite oporavak kako biste zaštitili svoj račun"</string>
+  <string name="banner_set_up_recovery_content">"Vaši se razgovori automatski sigurnosno kopiraju enkripcijom od početka do kraja. Da biste vratili ovu sigurnosnu kopiju i zadržali svoj digitalni identitet kada izgubite pristup svim svojim uređajima, trebat će vam ključ za oporavak."</string>
+  <string name="banner_set_up_recovery_submit">"ključ za oporavak"</string>
+  <string name="banner_set_up_recovery_title">"Napravite sigurnosnu kopiju svojih razgovora"</string>
   <string name="confirm_recovery_key_banner_message">"Potvrdite svoj ključ za oporavak kako biste zadržali pristup pohrani ključeva i povijesti poruka."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Unesite svoj ključ za oporavak"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Zaboravili ste ključ za oporavak?"</string>
@@ -50,6 +50,7 @@ Nemate nepročitanih poruka!"</string>
   <string name="screen_roomlist_mark_as_read">"Označi kao pročitano"</string>
   <string name="screen_roomlist_mark_as_unread">"Označi kao nepročitano"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Ova je soba nadograđena"</string>
+  <string name="screen_roomlist_your_spaces">"Vaši prostori"</string>
   <string name="session_verification_banner_message">"Izgleda da koristite novi uređaj. Izvršite provjeru drugim uređajem da biste pristupili svojim šifriranim porukama."</string>
   <string name="session_verification_banner_title">"Potvrdi identitet"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-in/translations.xml b/features/home/impl/src/main/res/values-in/translations.xml
index 6a822e3680..36512038ba 100644
--- a/features/home/impl/src/main/res/values-in/translations.xml
+++ b/features/home/impl/src/main/res/values-in/translations.xml
@@ -3,9 +3,11 @@
   <string name="banner_battery_optimization_content_android">"Nonaktifkan pengoptimalan baterai untuk aplikasi ini, untuk memastikan semua notifikasi diterima."</string>
   <string name="banner_battery_optimization_submit_android">"Nonaktifkan optimasi"</string>
   <string name="banner_battery_optimization_title_android">"Notifikasi tidak masuk?"</string>
+  <string name="banner_new_sound_message">"Pemberitahuan Anda telah diperbarui—lebih jelas, lebih cepat, dan tidak mengganggu."</string>
+  <string name="banner_new_sound_title">"Kami telah memperbarui suara Anda."</string>
   <string name="banner_set_up_recovery_content">"Buat kunci pemulihan baru yang dapat digunakan untuk memulihkan riwayat pesan terenkripsi Anda jika Anda kehilangan akses ke perangkat Anda."</string>
-  <string name="banner_set_up_recovery_submit">"Siapkan pemulihan"</string>
-  <string name="banner_set_up_recovery_title">"Siapkan pemulihan"</string>
+  <string name="banner_set_up_recovery_submit">"Siapkan Kunci pemulihan"</string>
+  <string name="banner_set_up_recovery_title">"Cadangkan obrolan Anda"</string>
   <string name="confirm_recovery_key_banner_message">"Konfirmasikan kunci pemulihan Anda untuk mempertahankan akses ke penyimpanan kunci dan riwayat pesan Anda."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Masukkan kunci pemulihan Anda"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Lupa kunci pemulihan Anda?"</string>
@@ -48,6 +50,7 @@ Anda tidak memiliki pesan yang belum dibaca!"</string>
   <string name="screen_roomlist_mark_as_read">"Tandai sebagai dibaca"</string>
   <string name="screen_roomlist_mark_as_unread">"Tandai sebagai belum dibaca"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Ruangan ini telah ditingkatkan"</string>
+  <string name="screen_roomlist_your_spaces">"Ruang Anda"</string>
   <string name="session_verification_banner_message">"Sepertinya Anda menggunakan perangkat baru. Verifikasi dengan perangkat lain untuk mengakses pesan terenkripsi Anda selanjutnya."</string>
   <string name="session_verification_banner_title">"Verifikasi bahwa ini Anda"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-it/translations.xml b/features/home/impl/src/main/res/values-it/translations.xml
index 932545c7b0..2c5461bfa8 100644
--- a/features/home/impl/src/main/res/values-it/translations.xml
+++ b/features/home/impl/src/main/res/values-it/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Le notifiche non arrivano?"</string>
   <string name="banner_new_sound_message">"Il ping delle notifiche è stato aggiornato: ora è più chiaro, più rapido e meno fastidioso."</string>
   <string name="banner_new_sound_title">"Abbiamo rinnovato i tuoi suoni"</string>
-  <string name="banner_set_up_recovery_content">"Recupera la tua identità crittografica e la cronologia dei messaggi con una chiave di recupero se hai perso tutti i tuoi dispositivi."</string>
-  <string name="banner_set_up_recovery_submit">"Configura il recupero"</string>
-  <string name="banner_set_up_recovery_title">"Configura il ripristino"</string>
+  <string name="banner_set_up_recovery_content">"Le tue conversazioni vengono automaticamente salvate con crittografia end-to-end. Per ripristinare questo backup e conservare la tua identità digitale quando perdi l\'accesso a tutti i tuoi dispositivi, avrai bisogno della tua chiave di recupero."</string>
+  <string name="banner_set_up_recovery_submit">"Ottieni la chiave di recupero"</string>
+  <string name="banner_set_up_recovery_title">"Esegui il backup delle tue conversazioni"</string>
   <string name="confirm_recovery_key_banner_message">"Conferma la chiave di recupero per mantenere l\'accesso all\'archiviazione delle chiavi e alla cronologia dei messaggi."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Inserisci la tua chiave di recupero"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Hai dimenticato la chiave di recupero?"</string>
@@ -50,6 +50,7 @@ Non hai messaggi non letti!"</string>
   <string name="screen_roomlist_mark_as_read">"Segna come letto"</string>
   <string name="screen_roomlist_mark_as_unread">"Segna come non letto"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Questa stanza è stata aggiornata"</string>
+  <string name="screen_roomlist_your_spaces">"I tuoi spazi"</string>
   <string name="session_verification_banner_message">"Sembra che tu stia usando un nuovo dispositivo. Verificati con un altro dispositivo per accedere ai tuoi messaggi cifrati."</string>
   <string name="session_verification_banner_title">"Verifica che sei tu"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-ja/translations.xml b/features/home/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..855bb14533
--- /dev/null
+++ b/features/home/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_battery_optimization_content_android">"すべての通知を確実に受信するために、このアプリのバッテリー最適化を無効にしてください。"</string>
+  <string name="banner_battery_optimization_submit_android">"無効にする"</string>
+  <string name="banner_battery_optimization_title_android">"通知が届いていませんか？"</string>
+  <string name="banner_new_sound_message">"通知音が更新され、より明確で速く、そして邪魔にならなくなりました。"</string>
+  <string name="banner_new_sound_title">"サウンドを刷新しました"</string>
+  <string name="banner_set_up_recovery_content">"あなたのチャットはエンドツーエンド暗号化を使用して自動的にバックアップされています。すべての端末を使用できない状況で、このバックアップからデジタルIDを復元するには、回復鍵が必要となります。"</string>
+  <string name="banner_set_up_recovery_submit">"回復鍵を作成"</string>
+  <string name="banner_set_up_recovery_title">"チャットをバックアップ"</string>
+  <string name="confirm_recovery_key_banner_message">"鍵の保管庫と過去のメッセージにアクセスするために、回復鍵を認証してください。"</string>
+  <string name="confirm_recovery_key_banner_primary_button_title">"回復鍵を入力してください"</string>
+  <string name="confirm_recovery_key_banner_secondary_button_title">"回復鍵を忘れましたか？"</string>
+  <string name="confirm_recovery_key_banner_title">"鍵の保管庫を同期できません。"</string>
+  <string name="full_screen_intent_banner_message">"重要な電話を確実に受け取るため、端末がロックされている状態での全画面通知を、設定から許可してください。"</string>
+  <string name="full_screen_intent_banner_title">"通話品質を高める"</string>
+  <string name="screen_home_tab_chats">"チャット"</string>
+  <string name="screen_home_tab_spaces">"スペース"</string>
+  <string name="screen_invites_decline_chat_message">"%1$sへの招待を本当に破棄しますか？"</string>
+  <string name="screen_invites_decline_chat_title">"招待を破棄"</string>
+  <string name="screen_invites_decline_direct_chat_message">"%1$sとのチャットを本当に拒否しますか？"</string>
+  <string name="screen_invites_decline_direct_chat_title">"チャットを拒否"</string>
+  <string name="screen_invites_empty_list">"招待はありません"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) があなたを招待しました"</string>
+  <string name="screen_migration_message">"一度限りの工程です。お待ちください。"</string>
+  <string name="screen_migration_title">"アカウントを設定しています。"</string>
+  <string name="screen_roomlist_a11y_create_message">"新しい会話またはルームを作成"</string>
+  <string name="screen_roomlist_clear_filters">"フィルターを解除"</string>
+  <string name="screen_roomlist_empty_message">"誰かにメッセージを送信しましょう。"</string>
+  <string name="screen_roomlist_empty_title">"まだチャットがありません。"</string>
+  <string name="screen_roomlist_filter_favourites">"お気に入り"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"チャットの設定からお気に入りに追加できます。
+現在は、フィルターの選択を解除することで他のチャットを表示できます。"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"お気に入りのチャットはまだありません"</string>
+  <string name="screen_roomlist_filter_invites">"招待"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"承認待ちの招待はありません"</string>
+  <string name="screen_roomlist_filter_low_priority">"低い優先度"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"低い優先度のチャットはまだありません"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"フィルターを解除して他のチャットを表示できます"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"この選択中にチャットがありません"</string>
+  <string name="screen_roomlist_filter_people">"ユーザー"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"まだダイレクトメッセージは届いていません"</string>
+  <string name="screen_roomlist_filter_rooms">"ルーム"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"まだルームに参加していません"</string>
+  <string name="screen_roomlist_filter_unreads">"未読"</string>
+  <string name="screen_roomlist_filter_unreads_empty_state_title">"やった！
+未読メッセージはありません。"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"参加リクエストを送信しました"</string>
+  <string name="screen_roomlist_main_space_title">"チャット"</string>
+  <string name="screen_roomlist_mark_as_read">"既読にする"</string>
+  <string name="screen_roomlist_mark_as_unread">"未読にする"</string>
+  <string name="screen_roomlist_tombstoned_room_description">"このルームはアップグレードされました"</string>
+  <string name="screen_roomlist_your_spaces">"あなたのスペース"</string>
+  <string name="session_verification_banner_message">"新しいデバイスをご利用のようです。暗号化されたメッセージにアクセスするには、別のデバイスで検証してください。"</string>
+  <string name="session_verification_banner_title">"本人確認"</string>
+</resources>
diff --git a/features/home/impl/src/main/res/values-nb/translations.xml b/features/home/impl/src/main/res/values-nb/translations.xml
index c7455c7c0b..1ff174dc25 100644
--- a/features/home/impl/src/main/res/values-nb/translations.xml
+++ b/features/home/impl/src/main/res/values-nb/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Kommer ikke varslene frem?"</string>
   <string name="banner_new_sound_message">"Varslingssignalet ditt er oppdatert – tydeligere, raskere og mindre forstyrrende."</string>
   <string name="banner_new_sound_title">"Vi har oppdatert lydene dine"</string>
-  <string name="banner_set_up_recovery_content">"Gjenopprett din kryptografiske identitet og meldingshistorikk med en gjenopprettingsnøkkel hvis du har mistet alle dine brukte enheter."</string>
+  <string name="banner_set_up_recovery_content">"Chattene dine sikkerhetskopieres automatisk med ende-til-ende-kryptering. For å gjenopprette denne sikkerhetskopien og beholde din digitale identitet når du mister tilgang til alle enhetene dine, trenger du gjenopprettingsnøkkelen din."</string>
   <string name="banner_set_up_recovery_submit">"Hent gjenopprettingsnøkkel"</string>
-  <string name="banner_set_up_recovery_title">"Konfigurer gjenoppretting for å beskytte kontoen din"</string>
+  <string name="banner_set_up_recovery_title">"Sikkerhetskopier chattene dine"</string>
   <string name="confirm_recovery_key_banner_message">"Verifiser gjenopprettingsnøkkelen for å opprettholde tilgangen til nøkkellageret og meldingshistorikken."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Skriv inn gjenopprettingsnøkkelen din"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Har du glemt din gjenopprettingsnøkkel?"</string>
diff --git a/features/home/impl/src/main/res/values-pl/translations.xml b/features/home/impl/src/main/res/values-pl/translations.xml
index 73e0b5e52e..0c1b07f27b 100644
--- a/features/home/impl/src/main/res/values-pl/translations.xml
+++ b/features/home/impl/src/main/res/values-pl/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Powiadomienia nie dochodzą?"</string>
   <string name="banner_new_sound_message">"Sygnał powiadomień został zaktualizowany — jest wyraźniejszy, szybszy i mniej uciążliwy."</string>
   <string name="banner_new_sound_title">"Odświeżyliśmy Twoje dźwięki"</string>
-  <string name="banner_set_up_recovery_content">"Wygeneruj nowy klucz przywracania, którego można użyć do przywrócenia historii wiadomości szyfrowanych w przypadku utraty dostępu do swoich urządzeń."</string>
-  <string name="banner_set_up_recovery_submit">"Skonfiguruj przywracanie"</string>
-  <string name="banner_set_up_recovery_title">"Skonfiguruj przywracanie"</string>
+  <string name="banner_set_up_recovery_content">"Twoje czaty są automatycznie archiwizowane za pomocą szyfrowania end-to-end. Aby przywrócić tę kopię zapasową i swoją tożsamość cyfrową, wymagany będzie klucz przywracania."</string>
+  <string name="banner_set_up_recovery_submit">"Uzyskaj klucz przywracania"</string>
+  <string name="banner_set_up_recovery_title">"Utwórz kopię zapasową swoich czatów"</string>
   <string name="confirm_recovery_key_banner_message">"Potwierdź klucz przywracania, aby zachować dostęp do magazynu kluczy i historii wiadomości."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Wprowadź klucz przywracania"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Zapomniałeś klucza przywracania?"</string>
@@ -50,6 +50,7 @@ Nie masz żadnych nieprzeczytanych wiadomości!"</string>
   <string name="screen_roomlist_mark_as_read">"Oznacz jako przeczytane"</string>
   <string name="screen_roomlist_mark_as_unread">"Oznacz jako nieprzeczytane"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Ten pokój został ulepszony"</string>
+  <string name="screen_roomlist_your_spaces">"Twoje przestrzenie"</string>
   <string name="session_verification_banner_message">"Wygląda na to, że używasz nowego urządzenia. Zweryfikuj się innym urządzeniem, aby uzyskać dostęp do zaszyfrowanych wiadomości."</string>
   <string name="session_verification_banner_title">"Potwierdź, że to Ty"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-pt-rBR/translations.xml b/features/home/impl/src/main/res/values-pt-rBR/translations.xml
index 575cfbf6b0..1189cd8e70 100644
--- a/features/home/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/home/impl/src/main/res/values-pt-rBR/translations.xml
@@ -6,7 +6,7 @@
   <string name="banner_new_sound_message">"O seu ping de notificação foi atualizado—mais suave, mais rápido, e menos disruptivo."</string>
   <string name="banner_new_sound_title">"Recarregamos seus sons"</string>
   <string name="banner_set_up_recovery_content">"Recupere sua identidade criptográfica e o histórico de mensagens com uma chave de recuperação caso você perda todos os dispositivos existentes."</string>
-  <string name="banner_set_up_recovery_submit">"Configurar a recuperação"</string>
+  <string name="banner_set_up_recovery_submit">"Receber chave de recuperação"</string>
   <string name="banner_set_up_recovery_title">"Configure a recuperação para proteger sua conta"</string>
   <string name="confirm_recovery_key_banner_message">"Confirme sua chave de recuperação para manter o acesso ao seu armazenamento de chaves e histórico de mensagens."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Digite sua chave de recuperação"</string>
diff --git a/features/home/impl/src/main/res/values-pt/translations.xml b/features/home/impl/src/main/res/values-pt/translations.xml
index 9870014904..6c6a72930e 100644
--- a/features/home/impl/src/main/res/values-pt/translations.xml
+++ b/features/home/impl/src/main/res/values-pt/translations.xml
@@ -6,7 +6,7 @@
   <string name="banner_new_sound_message">"O toque de notificação foi atualizado — mais claro, mais rápido e menos perturbador."</string>
   <string name="banner_new_sound_title">"Atualizámos os seus sons"</string>
   <string name="banner_set_up_recovery_content">"Recupera a tua identidade criptográfica e o histórico de mensagens com uma chave de recuperação se tiveres perdido todos os teus dispositivos existentes."</string>
-  <string name="banner_set_up_recovery_submit">"Configurar recuperação"</string>
+  <string name="banner_set_up_recovery_submit">"Chave de recuperação"</string>
   <string name="banner_set_up_recovery_title">"Configurar a recuperação"</string>
   <string name="confirm_recovery_key_banner_message">"Confirma a tua chave de recuperação para manteres o acesso ao teu armazenamento de chaves e ao histórico de mensagens."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Introduz a tua chave de recuperação"</string>
diff --git a/features/home/impl/src/main/res/values-ro/translations.xml b/features/home/impl/src/main/res/values-ro/translations.xml
index e4a80b4fb7..14cf100c22 100644
--- a/features/home/impl/src/main/res/values-ro/translations.xml
+++ b/features/home/impl/src/main/res/values-ro/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Nu primiți notificări?"</string>
   <string name="banner_new_sound_message">"Sunetul pentru notificări a fost actualizat — mai clar, mai rapid și mai puțin perturbatoar."</string>
   <string name="banner_new_sound_title">"Am reîmprospătat sunetele"</string>
-  <string name="banner_set_up_recovery_content">"Recuperați-vă identitatea criptografică și mesajele anterioare cu o cheie de recuperare dacă ați pierdut toate dispozitivele existente."</string>
-  <string name="banner_set_up_recovery_submit">"Configurați recuperarea"</string>
-  <string name="banner_set_up_recovery_title">"Configurați recuperarea pentru a vă proteja contul"</string>
+  <string name="banner_set_up_recovery_content">"Chaturile dumneavoastră sunt salvate automat cu criptare end-to-end. Pentru a restaura această copie de rezervă și a vă păstra identitatea digitală atunci când pierzdeți accesul la toate dispozitivele dumneavoastră, veți avea nevoie de cheia de recuperare."</string>
+  <string name="banner_set_up_recovery_submit">"Obțineți cheia de recuperare"</string>
+  <string name="banner_set_up_recovery_title">"Faceți un backup al mesajelor"</string>
   <string name="confirm_recovery_key_banner_message">"Backup-ul pentru chat nu este sincronizat. Trebuie să confirmați cheia de recuperare pentru a menține accesul la backup."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Introduceți cheia de recuperare"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Ați uitat cheia de recuperare?"</string>
@@ -50,6 +50,7 @@ Nu aveți mesaje necitite!"</string>
   <string name="screen_roomlist_mark_as_read">"Marcați ca citită"</string>
   <string name="screen_roomlist_mark_as_unread">"Marcați ca necitită"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Această cameră a fost modernizată."</string>
+  <string name="screen_roomlist_your_spaces">"Spațiile dumneavoastră"</string>
   <string name="session_verification_banner_message">"Se pare că folosiți un dispozitiv nou. Verificați-vă identitatea cu un alt dispozitiv pentru a accesa mesajele dumneavoastră criptate."</string>
   <string name="session_verification_banner_title">"Verificați că sunteți dumneavoastră"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-ru/translations.xml b/features/home/impl/src/main/res/values-ru/translations.xml
index d06c9a3854..84a604e184 100644
--- a/features/home/impl/src/main/res/values-ru/translations.xml
+++ b/features/home/impl/src/main/res/values-ru/translations.xml
@@ -5,7 +5,7 @@
   <string name="banner_battery_optimization_title_android">"Уведомления не приходят?"</string>
   <string name="banner_new_sound_message">"Ваши уведомления были обновлены — теперь они понятнее, быстрее и менее отвлекающие."</string>
   <string name="banner_new_sound_title">"Мы обновили ваши звуки"</string>
-  <string name="banner_set_up_recovery_content">"Создайте новый ключ восстановления, который можно использовать для восстановления зашифрованной истории сообщений в случае потери доступа к своим устройствам."</string>
+  <string name="banner_set_up_recovery_content">"Ваши чаты автоматически резервируются с использованием сквозного шифрования. Для восстановления этой резервной копии и сохранения вашей цифровой личности в случае потери доступа ко всем вашим устройствам вам потребуется ключ восстановления."</string>
   <string name="banner_set_up_recovery_submit">"Получить ключ восстановления"</string>
   <string name="banner_set_up_recovery_title">"Сделайте резервную копию своих чатов."</string>
   <string name="confirm_recovery_key_banner_message">"Подтвердите ключ восстановления, чтобы сохранить доступ к хранилищу ключей и истории сообщений."</string>
@@ -21,7 +21,7 @@
   <string name="screen_invites_decline_direct_chat_message">"Вы уверены, что хотите отказаться от личного общения с %1$s?"</string>
   <string name="screen_invites_decline_direct_chat_title">"Отклонить чат"</string>
   <string name="screen_invites_empty_list">"Нет приглашений"</string>
-  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) вас"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) Вас"</string>
   <string name="screen_migration_message">"Это единоразовая процедура, спасибо, что подождали."</string>
   <string name="screen_migration_title">"Настройка Вашего аккаунта."</string>
   <string name="screen_roomlist_a11y_create_message">"Создать новую беседу или комнату"</string>
@@ -31,20 +31,20 @@
   <string name="screen_roomlist_filter_favourites">"Избранные"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Добавить чат в избранное можно в настройках чата.
 На данный момент вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
-  <string name="screen_roomlist_filter_favourites_empty_state_title">"У вас пока нет избранных чатов"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"У Вас пока нет избранных чатов"</string>
   <string name="screen_roomlist_filter_invites">"Приглашения"</string>
-  <string name="screen_roomlist_filter_invites_empty_state_title">"У вас нет приглашений."</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"У Вас нет приглашений."</string>
   <string name="screen_roomlist_filter_low_priority">"Низкий приоритет"</string>
-  <string name="screen_roomlist_filter_low_priority_empty_state_title">"У вас пока нет чатов с низким приоритетом."</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"У Вас пока нет чатов с низким приоритетом."</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
-  <string name="screen_roomlist_filter_mixed_empty_state_title">"У вас нет чатов, соответствующих фильтрам"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"У Вас нет чатов, соответствующих фильтрам"</string>
   <string name="screen_roomlist_filter_people">"Пользователи"</string>
-  <string name="screen_roomlist_filter_people_empty_state_title">"У вас пока нет личных сообщений"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"У Вас пока нет личных сообщений"</string>
   <string name="screen_roomlist_filter_rooms">"Комнаты"</string>
   <string name="screen_roomlist_filter_rooms_empty_state_title">"Вас пока нет ни в одной комнате"</string>
   <string name="screen_roomlist_filter_unreads">"Новые"</string>
   <string name="screen_roomlist_filter_unreads_empty_state_title">"Поздравляем!
-У вас нет непрочитанных сообщений!"</string>
+У Вас нет непрочитанных сообщений!"</string>
   <string name="screen_roomlist_knock_event_sent_description">"Запрос на присоединение отправлен"</string>
   <string name="screen_roomlist_main_space_title">"Чаты"</string>
   <string name="screen_roomlist_mark_as_read">"Пометить как прочитанное"</string>
diff --git a/features/home/impl/src/main/res/values-sk/translations.xml b/features/home/impl/src/main/res/values-sk/translations.xml
index 12e6284468..aab1f6dc1d 100644
--- a/features/home/impl/src/main/res/values-sk/translations.xml
+++ b/features/home/impl/src/main/res/values-sk/translations.xml
@@ -6,7 +6,7 @@
   <string name="banner_new_sound_message">"Vaše oznámenia boli aktualizované – sú prehľadnejšie, rýchlejšie a menej rušivé."</string>
   <string name="banner_new_sound_title">"Obnovili sme vaše zvuky"</string>
   <string name="banner_set_up_recovery_content">"Vytvorte nový kľúč na obnovenie, ktorý môžete použiť na obnovenie vašej histórie šifrovaných správ v prípade straty prístupu k vašim zariadeniam."</string>
-  <string name="banner_set_up_recovery_submit">"Nastaviť obnovenie"</string>
+  <string name="banner_set_up_recovery_submit">"Získať kľúč na obnovenie"</string>
   <string name="banner_set_up_recovery_title">"Nastaviť obnovenie"</string>
   <string name="confirm_recovery_key_banner_message">"Potvrďte svoj kľúč na obnovenie, aby ste zachovali prístup k úložisku kľúčov a histórii správ."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Zadajte kľúč na obnovenie"</string>
diff --git a/features/home/impl/src/main/res/values-uk/translations.xml b/features/home/impl/src/main/res/values-uk/translations.xml
index de30d201ca..38eeb47f56 100644
--- a/features/home/impl/src/main/res/values-uk/translations.xml
+++ b/features/home/impl/src/main/res/values-uk/translations.xml
@@ -5,15 +5,15 @@
   <string name="banner_battery_optimization_title_android">"Не надходять сповіщення?"</string>
   <string name="banner_new_sound_message">"Ваш сигнал сповіщень оновлено — він став чіткішим, швидшим і не таким надокучливим."</string>
   <string name="banner_new_sound_title">"Ми оновили ваші звуки"</string>
-  <string name="banner_set_up_recovery_content">"Відновіть свою криптографічну ідентичність та історію повідомлень за допомогою ключа відновлення, якщо ви втратили всі наявні пристрої."</string>
-  <string name="banner_set_up_recovery_submit">"Налаштувати відновлення"</string>
-  <string name="banner_set_up_recovery_title">"Налаштуйте відновлення для захисту свого облікового запису"</string>
+  <string name="banner_set_up_recovery_content">"Ваші бесіди автоматично резервуються з використанням наскрізного шифрування. Щоб відновити цю резервну копію та зберегти свою цифрову ідентичність у разі втрати доступу до всіх своїх пристроїв, вам знадобиться ключ відновлення."</string>
+  <string name="banner_set_up_recovery_submit">"Отримати ключ відновлення"</string>
+  <string name="banner_set_up_recovery_title">"Створити резервну копію своїх бесід"</string>
   <string name="confirm_recovery_key_banner_message">"Підтвердіть свій ключ відновлення, щоб мати доступ до сховища ключів та історії повідомлень."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Введіть ключ відновлення"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Забули ключ відновлення?"</string>
   <string name="confirm_recovery_key_banner_title">"Ваше сховище ключів не синхронізовано"</string>
   <string name="full_screen_intent_banner_message">"Щоб ніколи не пропустити важливий виклик, змініть налаштування, щоб увімкнути повноекранні сповіщення, коли телефон заблоковано."</string>
-  <string name="full_screen_intent_banner_title">"Покращуйте досвід дзвінків"</string>
+  <string name="full_screen_intent_banner_title">"Покращуйте якість викликів"</string>
   <string name="screen_home_tab_chats">"Бесіди"</string>
   <string name="screen_home_tab_spaces">"Простори"</string>
   <string name="screen_invites_decline_chat_message">"Ви впевнені, що хочете відхилити запрошення приєднатися до %1$s?"</string>
@@ -51,6 +51,6 @@
   <string name="screen_roomlist_mark_as_unread">"Позначити непрочитаним"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Цю кімнату оновлено"</string>
   <string name="screen_roomlist_your_spaces">"Ваші простори"</string>
-  <string name="session_verification_banner_message">"Схоже, ви використовуєте новий пристрій. Щоб отримати доступ до зашифрованих повідомлень, підтвердьте особу за допомогою іншого пристрою."</string>
+  <string name="session_verification_banner_message">"Здається, ви використовуєте новий пристрій. Звірте його за допомогою іншого пристрою, щоб отримати доступ до своїх зашифрованих повідомлень."</string>
   <string name="session_verification_banner_title">"Підтвердьте, що це ви"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-uz/translations.xml b/features/home/impl/src/main/res/values-uz/translations.xml
index e5ef24e80a..6079389609 100644
--- a/features/home/impl/src/main/res/values-uz/translations.xml
+++ b/features/home/impl/src/main/res/values-uz/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"Bildirishnoma kelmayaptimi?"</string>
   <string name="banner_new_sound_message">"Xabarnoma signali yangilandi — endi u aniqroq, tezroq va kamroq halal beradigan bo‘ldi."</string>
   <string name="banner_new_sound_title">"Tovushlaringiz yangilandi"</string>
-  <string name="banner_set_up_recovery_content">"Mavjud barcha qurilmalarni yoʻqotgan boʻlsangiz, kriptografik kimligingizni va xabarlar tarixini qayta tiklovchi kalit bilan saqlab qoʻying."</string>
+  <string name="banner_set_up_recovery_content">"Chatlaringiz avtomatik ravishda boshidan oxirigacha shifrlash bilan zaxiralanadi. Bu zaxirani tiklash va barcha qurilmalaringizdan foydalana olmay qolganingizda raqamli identifikatoringizni saqlab qolish uchun sizga tiklash kaliti kerak bo‘ladi."</string>
   <string name="banner_set_up_recovery_submit">"Qayta tiklashni sozlang"</string>
-  <string name="banner_set_up_recovery_title">"Hisobingizni himoya qilish uchun tiklashni sozlang"</string>
+  <string name="banner_set_up_recovery_title">"Chatlaringizni zaxiralang"</string>
   <string name="confirm_recovery_key_banner_message">"Kalit saqlash joyingiz va xabarlar tarixingizga kirishni saqlab qolish uchun tiklash kalitingizni tasdiqlang."</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"Qayta tiklash kalitingizni kiriting"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"Tiklash kalitini unutdingizmi?"</string>
@@ -50,6 +50,7 @@ Sizda oʻqilmagan xabarlar yoʻq!"</string>
   <string name="screen_roomlist_mark_as_read">"Oʻqilgan deb belgilash"</string>
   <string name="screen_roomlist_mark_as_unread">"Oʻqilmagan deb belgilash"</string>
   <string name="screen_roomlist_tombstoned_room_description">"Bu xona yangilandi"</string>
+  <string name="screen_roomlist_your_spaces">"Maydonlaringiz"</string>
   <string name="session_verification_banner_message">"Siz yangi qurilmadan foydalanayotganga o‘xshaysiz. Shifrlangan xabarlaringizga kirish uchun boshqa qurilma bilan tasdiqlang."</string>
   <string name="session_verification_banner_title">"Siz ekanligingizni tasdiqlang"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-vi/translations.xml b/features/home/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..49fdaf46c9
--- /dev/null
+++ b/features/home/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_battery_optimization_content_android">"Tắt tính năng tối ưu hóa pin cho ứng dụng này để đảm bảo nhận được mọi thông báo."</string>
+  <string name="banner_battery_optimization_submit_android">"Tắt tối ưu hóa"</string>
+  <string name="banner_battery_optimization_title_android">"Có nhận được thông báo không?"</string>
+  <string name="banner_new_sound_message">"Thông báo của bạn đã được cập nhật — rõ ràng hơn, nhanh hơn và ít gây khó chịu hơn."</string>
+  <string name="banner_new_sound_title">"Chúng tôi đã làm mới âm thanh của bạn."</string>
+  <string name="banner_set_up_recovery_content">"Các cuộc trò chuyện của bạn được tự động sao lưu bằng mã hóa đầu cuối. Để khôi phục bản sao lưu này và giữ lại danh tính kỹ thuật số của bạn khi bạn mất quyền truy cập vào tất cả các thiết bị, bạn sẽ cần khóa khôi phục."</string>
+  <string name="banner_set_up_recovery_submit">"Lấy khóa khôi phục."</string>
+  <string name="banner_set_up_recovery_title">"Sao lưu tin nhắn của bạn"</string>
+  <string name="confirm_recovery_key_banner_message">"Xác nhận khóa khôi phục để không bị mất quyền truy cập vào tin nhắn."</string>
+  <string name="confirm_recovery_key_banner_primary_button_title">"Nhập khóa khôi phục của bạn."</string>
+  <string name="confirm_recovery_key_banner_secondary_button_title">"Bạn quên khóa khôi phục?”"</string>
+  <string name="confirm_recovery_key_banner_title">"Dữ liệu khóa của bạn không còn đồng bộ"</string>
+  <string name="full_screen_intent_banner_message">"Để đảm bảo bạn không bỏ lỡ bất kỳ cuộc gọi quan trọng nào, vui lòng thay đổi cài đặt để cho phép thông báo toàn màn hình khi điện thoại của bạn bị khóa."</string>
+  <string name="full_screen_intent_banner_title">"Nâng cao trải nghiệm cuộc gọi của bạn"</string>
+  <string name="screen_home_tab_chats">"Cuộc trò chuyện"</string>
+  <string name="screen_invites_decline_chat_message">"Bạn có chắc muốn từ chối lời mời tham gia %1$s không?"</string>
+  <string name="screen_invites_decline_chat_title">"Từ chối lời mời"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Bạn có chắc muốn từ chối cuộc trò chuyện riêng với %1$s không?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Từ chối trò chuyện"</string>
+  <string name="screen_invites_empty_list">"Không có lời mời"</string>
+  <string name="screen_invites_invited_you">"%1$s(%2$s ) đã mời bạn"</string>
+  <string name="screen_migration_message">"Quá trình này chỉ thực hiện một lần, cảm ơn bạn đã kiên nhẫn."</string>
+  <string name="screen_migration_title">"Đang thiết lập tài khoản của bạn."</string>
+  <string name="screen_roomlist_a11y_create_message">"Tạo một cuộc trò chuyện hoặc phòng mới"</string>
+  <string name="screen_roomlist_empty_message">"Bắt đầu bằng cách nhắn tin cho ai đó."</string>
+  <string name="screen_roomlist_empty_title">"Chưa có cuộc trò chuyện nào."</string>
+  <string name="screen_roomlist_filter_favourites">"Yêu thích"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Bạn có thể thêm cuộc trò chuyện vào mục yêu thích trong cài đặt chat.
+Hiện tại, bạn có thể bỏ chọn bộ lọc để xem các cuộc trò chuyện khác."</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"Bạn chưa có cuộc trò chuyện yêu thích nào."</string>
+  <string name="screen_roomlist_filter_invites">"Lời mời"</string>
+  <string name="screen_roomlist_filter_low_priority">"Ưu tiên thấp"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Bạn có thể bỏ chọn bộ lọc để xem các cuộc trò chuyện khác"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"Bạn không có cuộc trò chuyện nào cho lựa chọn này"</string>
+  <string name="screen_roomlist_filter_people">"Danh bạ"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"Bạn chưa có tin nhắn riêng nào cả"</string>
+  <string name="screen_roomlist_filter_rooms">"Phòng"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"Bạn chưa tham gia phòng nào"</string>
+  <string name="screen_roomlist_filter_unreads">"Chưa đọc"</string>
+  <string name="screen_roomlist_filter_unreads_empty_state_title">"Chúc mừng!
+Bạn không còn tin nhắn nào chưa đọc nữa!"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"Yêu cầu tham gia đã được gửi"</string>
+  <string name="screen_roomlist_main_space_title">"Cuộc trò chuyện"</string>
+  <string name="screen_roomlist_mark_as_read">"Đánh dấu đã đọc"</string>
+  <string name="screen_roomlist_mark_as_unread">"Đánh dấu chưa đọc"</string>
+  <string name="session_verification_banner_message">"Có vẻ như bạn đang sử dụng thiết bị mới. Hãy xác minh bằng một thiết bị khác để truy cập tin nhắn được mã hóa của bạn."</string>
+  <string name="session_verification_banner_title">"Xác thực danh tính của bạn"</string>
+</resources>
diff --git a/features/home/impl/src/main/res/values-zh-rTW/translations.xml b/features/home/impl/src/main/res/values-zh-rTW/translations.xml
index 20ee59da98..b52ac9ad8b 100644
--- a/features/home/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/home/impl/src/main/res/values-zh-rTW/translations.xml
@@ -5,9 +5,9 @@
   <string name="banner_battery_optimization_title_android">"沒收到通知？"</string>
   <string name="banner_new_sound_message">"您的通知提示音已更新，更清晰、更快、更不易分心。"</string>
   <string name="banner_new_sound_title">"我們已更新您的音效設定"</string>
-  <string name="banner_set_up_recovery_content">"若您遺失了所有現有裝置，則請使用復原金鑰以救援您的密碼學身份與訊息歷史紀錄。"</string>
-  <string name="banner_set_up_recovery_submit">"設定復原"</string>
-  <string name="banner_set_up_recovery_title">"設定備援以保護您的帳號"</string>
+  <string name="banner_set_up_recovery_content">"您的聊天會自動使用端到端加密備份。若您失去對您所有裝置的存取權，且要還原此備份並保留您的數位身份的話，您就會需要您的還原金鑰。"</string>
+  <string name="banner_set_up_recovery_submit">"取得還原金鑰"</string>
+  <string name="banner_set_up_recovery_title">"備份您的聊天"</string>
   <string name="confirm_recovery_key_banner_message">"確認您的復原金鑰以維持對金鑰儲存空間與訊息歷史紀錄的存取權。"</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"輸入您的復原金鑰"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"忘記了您的復原金鑰？"</string>
@@ -50,6 +50,7 @@
   <string name="screen_roomlist_mark_as_read">"標為已讀"</string>
   <string name="screen_roomlist_mark_as_unread">"標為未讀"</string>
   <string name="screen_roomlist_tombstoned_room_description">"此聊天室已升級"</string>
+  <string name="screen_roomlist_your_spaces">"您的空間"</string>
   <string name="session_verification_banner_message">"您似乎正在使用新的裝置。請使用另一個裝置進行驗證，以存取您的加密訊息。"</string>
   <string name="session_verification_banner_title">"驗證這是您本人"</string>
 </resources>
diff --git a/features/home/impl/src/main/res/values-zh/translations.xml b/features/home/impl/src/main/res/values-zh/translations.xml
index 1705569a49..575adc6bb9 100644
--- a/features/home/impl/src/main/res/values-zh/translations.xml
+++ b/features/home/impl/src/main/res/values-zh/translations.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="banner_battery_optimization_content_android">"请关闭本应用的电池优化设置，确保不错过任何消息通知。"</string>
+  <string name="banner_battery_optimization_content_android">"对此 app 禁用电池优化以确保不错过任何通知。"</string>
   <string name="banner_battery_optimization_submit_android">"禁用优化"</string>
   <string name="banner_battery_optimization_title_android">"通知未送达？"</string>
-  <string name="banner_new_sound_message">"您的通知提示音已升级 - 更清晰、更快速、干扰更少。"</string>
-  <string name="banner_new_sound_title">"我们已更新您的声音"</string>
-  <string name="banner_set_up_recovery_content">"生成新的恢复密钥，该密钥可用于在您无法访问设备时恢复加密的消息历史记录。"</string>
-  <string name="banner_set_up_recovery_submit">"设置恢复"</string>
-  <string name="banner_set_up_recovery_title">"设置恢复"</string>
+  <string name="banner_new_sound_message">"通知提示音已升级：更清晰、更快速、干扰更少。"</string>
+  <string name="banner_new_sound_title">"我们已更新提示音"</string>
+  <string name="banner_set_up_recovery_content">"你的聊天已被端到端加密自动备份。如果你无法访问所有设备，则需要使用恢复密钥并保留数字身份。"</string>
+  <string name="banner_set_up_recovery_submit">"获取恢复密钥"</string>
+  <string name="banner_set_up_recovery_title">"备份聊天"</string>
   <string name="confirm_recovery_key_banner_message">"确认恢复密钥，以保持对密钥存储和消息历史的访问。"</string>
   <string name="confirm_recovery_key_banner_primary_button_title">"输入恢复密钥"</string>
   <string name="confirm_recovery_key_banner_secondary_button_title">"忘记了恢复密钥？"</string>
   <string name="confirm_recovery_key_banner_title">"你的密钥存储已不同步"</string>
-  <string name="full_screen_intent_banner_message">"为确保您不会错过重要来电，请更改设置以允许锁屏时的全屏通知。"</string>
+  <string name="full_screen_intent_banner_message">"为确保你不会错过重要来电，请更改设置以允许锁屏时的全屏通知。"</string>
   <string name="full_screen_intent_banner_title">"提升通话体验"</string>
-  <string name="screen_home_tab_chats">"全部聊天"</string>
+  <string name="screen_home_tab_chats">"聊天"</string>
   <string name="screen_home_tab_spaces">"空间"</string>
-  <string name="screen_invites_decline_chat_message">"您确定要拒绝加入 %1$s 的邀请吗？"</string>
+  <string name="screen_invites_decline_chat_message">"你确定要拒绝加入 %1$s 的邀请？"</string>
   <string name="screen_invites_decline_chat_title">"拒绝邀请"</string>
-  <string name="screen_invites_decline_direct_chat_message">"您确定要拒绝与 %1$s 开始私聊吗？"</string>
+  <string name="screen_invites_decline_direct_chat_message">"你确定要拒绝与 %1$s 私聊？"</string>
   <string name="screen_invites_decline_direct_chat_title">"拒绝聊天"</string>
   <string name="screen_invites_empty_list">"没有邀请"</string>
-  <string name="screen_invites_invited_you">"%1$s （%2$s）邀请了你"</string>
-  <string name="screen_migration_message">"这是一个一次性的过程，感谢您的等待。"</string>
-  <string name="screen_migration_title">"设置您的账户。"</string>
-  <string name="screen_roomlist_a11y_create_message">"创建新的对话或聊天室"</string>
+  <string name="screen_invites_invited_you">"%1$s（%2$s）邀请了你"</string>
+  <string name="screen_migration_message">"此为一次性流程，感谢等待。"</string>
+  <string name="screen_migration_title">"设置账户。"</string>
+  <string name="screen_roomlist_a11y_create_message">"创建新的对话或房间"</string>
   <string name="screen_roomlist_clear_filters">"清除筛选条件"</string>
   <string name="screen_roomlist_empty_message">"通过向某人发送消息来开始。"</string>
-  <string name="screen_roomlist_empty_title">"还没有聊天。"</string>
-  <string name="screen_roomlist_filter_favourites">"收藏夹"</string>
-  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"可以在聊天设置里将聊天添加到收藏夹中。
-现在，可以取消选择过滤器以查看其他对话。"</string>
-  <string name="screen_roomlist_filter_favourites_empty_state_title">"您未收藏任何聊天"</string>
+  <string name="screen_roomlist_empty_title">"暂无聊天。"</string>
+  <string name="screen_roomlist_filter_favourites">"收藏"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"可以在聊天设置里将聊天添加到收藏夹。
+现在可以取消选择筛选器以查看其它对话。"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"你尚未收藏任何聊天"</string>
   <string name="screen_roomlist_filter_invites">"邀请"</string>
   <string name="screen_roomlist_filter_invites_empty_state_title">"没有待处理的邀请。"</string>
   <string name="screen_roomlist_filter_low_priority">"低优先级"</string>
-  <string name="screen_roomlist_filter_low_priority_empty_state_title">"您还没有任何低优先级聊天"</string>
-  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"您可以取消选择过滤器以查看其他对话"</string>
-  <string name="screen_roomlist_filter_mixed_empty_state_title">"您没有关于此选项的聊天"</string>
-  <string name="screen_roomlist_filter_people">"用户"</string>
-  <string name="screen_roomlist_filter_people_empty_state_title">"目前您还没有私信"</string>
-  <string name="screen_roomlist_filter_rooms">"聊天室"</string>
-  <string name="screen_roomlist_filter_rooms_empty_state_title">"您尚未进入任何聊天室"</string>
+  <string name="screen_roomlist_filter_low_priority_empty_state_title">"你暂无任何低优先级聊天"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"你可以取消选择筛选器以查看其它对话"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"你暂无适用于此选项的聊天"</string>
+  <string name="screen_roomlist_filter_people">"人员"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"你暂无任何私聊"</string>
+  <string name="screen_roomlist_filter_rooms">"房间"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"你尚未进入任何房间"</string>
   <string name="screen_roomlist_filter_unreads">"未读"</string>
   <string name="screen_roomlist_filter_unreads_empty_state_title">"恭喜！
 没有任何未读消息！"</string>
-  <string name="screen_roomlist_knock_event_sent_description">"加入请求已发送"</string>
-  <string name="screen_roomlist_main_space_title">"全部聊天"</string>
-  <string name="screen_roomlist_mark_as_read">"标记为已读"</string>
-  <string name="screen_roomlist_mark_as_unread">"标记为未读"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"加入申请已发送"</string>
+  <string name="screen_roomlist_main_space_title">"聊天"</string>
+  <string name="screen_roomlist_mark_as_read">"设为已读"</string>
+  <string name="screen_roomlist_mark_as_unread">"设为未读"</string>
   <string name="screen_roomlist_tombstoned_room_description">"此房间已升级"</string>
-  <string name="screen_roomlist_your_spaces">"您的空间"</string>
-  <string name="session_verification_banner_message">"您似乎正在使用新设备。使用另一台设备进行验证以访问您的加密消息。"</string>
+  <string name="screen_roomlist_your_spaces">"你的空间"</string>
+  <string name="session_verification_banner_message">"你似乎正在使用新设备。使用另一台设备进行验证以访问加密消息。"</string>
   <string name="session_verification_banner_title">"验证是你本人"</string>
 </resources>
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
index 582de66414..8eee8e1ee2 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.features.home.impl
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.api.HomeEntryPoint
@@ -18,12 +17,11 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultHomeEntryPointTest {
+class DefaultHomeEntryPointTest : RobolectricTest() {
     @Test
     fun `test node builder`() = runTest {
         val entryPoint = DefaultHomeEntryPoint()
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
index 4002844947..371a718523 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt
@@ -9,14 +9,11 @@
 package io.element.android.features.home.impl
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.announcement.api.Announcement
-import io.element.android.features.announcement.api.AnnouncementService
 import io.element.android.features.home.impl.roomlist.aRoomListState
 import io.element.android.features.home.impl.spaces.HomeSpacesState
 import io.element.android.features.home.impl.spaces.aHomeSpacesState
 import io.element.android.features.logout.api.direct.aDirectLogoutState
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
-import io.element.android.features.rageshake.test.logs.FakeAnnouncementService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.indicator.api.IndicatorService
@@ -33,10 +30,7 @@ import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
-import io.element.android.tests.testutils.MutablePresenter
 import io.element.android.tests.testutils.WarmUpRule
-import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
@@ -79,7 +73,6 @@ class HomePresenterTest {
                 MatrixUser(A_USER_ID, A_USER_NAME, AN_AVATAR_URL)
             )
             assertThat(withUserState.showAvatarIndicator).isFalse()
-            assertThat(withUserState.showNavigationBar).isTrue()
         }
     }
 
@@ -139,14 +132,10 @@ class HomePresenterTest {
 
     @Test
     fun `present - NavigationBar change`() = runTest {
-        val showAnnouncementResult = lambdaRecorder<Announcement, Unit> { }
         val presenter = createHomePresenter(
             sessionStore = InMemorySessionStore(
                 updateUserProfileResult = { _, _, _ -> },
             ),
-            announcementService = FakeAnnouncementService(
-                showAnnouncementResult = showAnnouncementResult,
-            )
         )
         presenter.test {
             val initialState = awaitItem()
@@ -154,38 +143,6 @@ class HomePresenterTest {
             initialState.eventSink(HomeEvent.SelectHomeNavigationBarItem(HomeNavigationBarItem.Spaces))
             val finalState = awaitItem()
             assertThat(finalState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Spaces)
-            showAnnouncementResult.assertions().isCalledOnce()
-                .with(value(Announcement.Space))
-        }
-    }
-
-    @Test
-    fun `present - NavigationBar is hidden when the last space is left when the user can't create new spaces`() = runTest {
-        val homeSpacesPresenter = MutablePresenter(aHomeSpacesState())
-        val presenter = createHomePresenter(
-            sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
-            ),
-            homeSpacesPresenter = homeSpacesPresenter,
-            announcementService = FakeAnnouncementService(
-                showAnnouncementResult = {},
-            )
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Chats)
-            assertThat(initialState.showNavigationBar).isTrue()
-            // User navigate to Spaces
-            initialState.eventSink(HomeEvent.SelectHomeNavigationBarItem(HomeNavigationBarItem.Spaces))
-            val spaceState = awaitItem()
-            assertThat(spaceState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Spaces)
-            // The last space is left
-            homeSpacesPresenter.updateState(aHomeSpacesState(spaceRooms = emptyList(), canCreateSpaces = false))
-            skipItems(1)
-            val finalState = awaitItem()
-            // We are back to Chats
-            assertThat(finalState.currentHomeNavigationBarItem).isEqualTo(HomeNavigationBarItem.Chats)
-            assertThat(finalState.showNavigationBar).isFalse()
         }
     }
 }
@@ -198,7 +155,6 @@ internal fun createHomePresenter(
     indicatorService: IndicatorService = FakeIndicatorService(),
     homeSpacesPresenter: Presenter<HomeSpacesState> = Presenter { aHomeSpacesState() },
     sessionStore: SessionStore = InMemorySessionStore(),
-    announcementService: AnnouncementService = FakeAnnouncementService(),
 ) = HomePresenter(
     client = client,
     syncService = syncService,
@@ -209,5 +165,4 @@ internal fun createHomePresenter(
     logoutPresenter = { aDirectLogoutState() },
     rageshakeFeatureAvailability = rageshakeFeatureAvailability,
     sessionStore = sessionStore,
-    announcementService = announcementService,
 )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt
index 1ce5061356..6df5e05df5 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/datasource/RoomListDataSourceTest.kt
@@ -14,6 +14,9 @@ import io.element.android.features.home.impl.FakeDateTimeObserver
 import io.element.android.libraries.androidutils.system.DateTimeObserver
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
+import io.element.android.libraries.matrix.test.A_ROOM_ID_3
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeDynamicRoomList
@@ -100,11 +103,169 @@ class RoomListDataSourceTest {
         }
     }
 
+    /**
+     * Tracking issue #4182: rooms duplicated in the room list around midnight.
+     *
+     * If the SDK ever leaks a list containing the same roomId twice (the suspected cause of #4182),
+     * the UI mapper's `distinctBy` safety net in [RoomListDataSource.buildAndEmitAllRooms] must
+     * remove the duplicate AND `analyticsService.trackError` must fire so the team can root-cause
+     * it via Sentry.
+     */
+    @Test
+    fun `when SDK summaries source contains duplicate roomIds, UI layer dedupes and reports trackError`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val duplicatedSummaries = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(roomId = A_ROOM_ID_2),
+        )
+        val roomList = FakeDynamicRoomList(summaries = MutableStateFlow(duplicatedSummaries))
+        val roomListService = FakeRoomListService(
+            createRoomListLambda = { roomList }
+        ).apply {
+            postState(RoomListService.State.Running)
+        }
+        val roomListDataSource = createRoomListDataSource(
+            roomListService = roomListService,
+            analyticsService = analyticsService,
+        )
+
+        roomListDataSource.roomSummariesFlow.test {
+            roomListDataSource.launchIn(backgroundScope)
+            val list = awaitItem()
+            assertThat(list.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+            assertThat(analyticsService.trackedErrors).hasSize(1)
+        }
+    }
+
+    /**
+     * Tracking issue #4182.
+     *
+     * Targeted scenario: a `DateChanged` tick fires after an initial SDK emit, then a follow-up
+     * SDK emit lands (mimicking "midnight, then a new message arrives"). Even though the diffCache
+     * is bypassed during the rebuild (`useCache = false`), the final state must contain each
+     * roomId exactly once and trackError must not fire on a happy path.
+     */
+    @Test
+    fun `interleaved date change and SDK update with overlapping content does not produce duplicates`() = runTest {
+        val analyticsService = FakeAnalyticsService()
+        val summariesFlow = MutableStateFlow(
+            listOf(
+                aRoomSummary(roomId = A_ROOM_ID),
+                aRoomSummary(roomId = A_ROOM_ID_2),
+            )
+        )
+        val roomList = FakeDynamicRoomList(summaries = summariesFlow)
+        val roomListService = FakeRoomListService(
+            createRoomListLambda = { roomList }
+        ).apply {
+            postState(RoomListService.State.Running)
+        }
+        val dateTimeObserver = FakeDateTimeObserver()
+        val roomListDataSource = createRoomListDataSource(
+            roomListService = roomListService,
+            dateTimeObserver = dateTimeObserver,
+            analyticsService = analyticsService,
+        )
+
+        roomListDataSource.roomSummariesFlow.test {
+            roomListDataSource.launchIn(backgroundScope)
+            val initial = awaitItem()
+            assertThat(initial.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+
+            // Midnight ticks while the cache holds [A_ROOM_ID, A_ROOM_ID_2]
+            dateTimeObserver.given(DateTimeObserver.Event.DateChanged(Instant.MIN, Instant.now()))
+            val afterMidnight = awaitItem()
+            assertThat(afterMidnight.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+
+            // A new message bumps A_ROOM_ID — different unread count makes the StateFlow see this
+            // as a new value
+            summariesFlow.value = listOf(
+                aRoomSummary(roomId = A_ROOM_ID, numUnreadMessages = 1),
+                aRoomSummary(roomId = A_ROOM_ID_2),
+            )
+            val afterMessage = awaitItem()
+            assertThat(afterMessage.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+            assertThat(afterMessage.map { it.roomId }.toSet()).hasSize(afterMessage.size)
+
+            // Second midnight rebuild after the new message
+            dateTimeObserver.given(DateTimeObserver.Event.DateChanged(Instant.MIN, Instant.now()))
+            val afterSecondMidnight = awaitItem()
+            assertThat(afterSecondMidnight.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+            assertThat(afterSecondMidnight.map { it.roomId }.toSet()).hasSize(afterSecondMidnight.size)
+
+            assertThat(analyticsService.trackedErrors).isEmpty()
+        }
+    }
+
+    @Test
+    fun `regression test for race with DateTimeObserver and new items`() = runTest {
+        val roomList = FakeDynamicRoomList(summaries = MutableStateFlow(listOf(aRoomSummary(), aRoomSummary(A_ROOM_ID_2))))
+        val roomListService = FakeRoomListService(
+            createRoomListLambda = { roomList }
+        ).apply {
+            postState(RoomListService.State.Running)
+        }
+        val dateTimeObserver = FakeDateTimeObserver()
+        var dateFormatterResult = "Today"
+        val dateFormatter = FakeDateFormatter({ _, _, _ -> dateFormatterResult })
+        val roomListDataSource = createRoomListDataSource(
+            roomListService = roomListService,
+            roomListRoomSummaryFactory = aRoomListRoomSummaryFactory(
+                dateFormatter = dateFormatter,
+            ),
+            dateTimeObserver = dateTimeObserver,
+        )
+        roomListDataSource.roomSummariesFlow.test {
+            // Observe room list items changes
+            val job = roomListDataSource.launchIn(backgroundScope)
+            // Get the initial room list
+            val initialRoomList = awaitItem()
+            assertThat(initialRoomList).hasSize(2)
+            assertThat(initialRoomList[0].roomId).isEqualTo(A_ROOM_ID)
+            assertThat(initialRoomList[0].timestamp).isEqualTo(dateFormatterResult)
+            assertThat(initialRoomList[1].roomId).isEqualTo(A_ROOM_ID_2)
+            assertThat(initialRoomList[1].timestamp).isEqualTo(dateFormatterResult)
+
+            // Stop processing room list updates so we can force a race condition with the date time observer updates
+            job.cancel()
+
+            // Trigger a date change and a new item at the same time
+            dateFormatterResult = "Yesterday"
+            roomList.summaries.tryEmit(listOf(aRoomSummary(roomId = A_ROOM_ID), aRoomSummary(roomId = A_ROOM_ID_3), aRoomSummary(roomId = A_ROOM_ID_2)))
+            dateTimeObserver.given(DateTimeObserver.Event.DateChanged(Instant.MIN, Instant.now()))
+
+            // The race condition would have caused the cache indices to be corrupted and only 2 items would be emitted
+            val rebuiltRoomList = awaitItem()
+            assertThat(rebuiltRoomList).hasSize(3)
+            assertThat(rebuiltRoomList[0].roomId).isEqualTo(A_ROOM_ID)
+            assertThat(rebuiltRoomList[0].timestamp).isEqualTo(dateFormatterResult)
+            assertThat(rebuiltRoomList[1].roomId).isEqualTo(A_ROOM_ID_3)
+            assertThat(rebuiltRoomList[1].timestamp).isEqualTo(dateFormatterResult)
+            assertThat(rebuiltRoomList[2].roomId).isEqualTo(A_ROOM_ID_2)
+            assertThat(rebuiltRoomList[2].timestamp).isEqualTo(dateFormatterResult)
+
+            // Restart processing room list updates
+            roomListDataSource.launchIn(backgroundScope)
+
+            // Check there is a new list and it's not the same as the previous one
+            val newRoomList = awaitItem()
+            assertThat(newRoomList).hasSize(3)
+            assertThat(newRoomList[0].roomId).isEqualTo(A_ROOM_ID)
+            assertThat(newRoomList[0].timestamp).isEqualTo(dateFormatterResult)
+            assertThat(newRoomList[1].roomId).isEqualTo(A_ROOM_ID_3)
+            assertThat(newRoomList[1].timestamp).isEqualTo(dateFormatterResult)
+            assertThat(newRoomList[2].roomId).isEqualTo(A_ROOM_ID_2)
+            assertThat(newRoomList[2].timestamp).isEqualTo(dateFormatterResult)
+        }
+    }
+
     private fun TestScope.createRoomListDataSource(
         roomListService: FakeRoomListService = FakeRoomListService(),
         roomListRoomSummaryFactory: RoomListRoomSummaryFactory = aRoomListRoomSummaryFactory(),
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
         dateTimeObserver: FakeDateTimeObserver = FakeDateTimeObserver(),
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ) = RoomListDataSource(
         roomListService = roomListService,
         roomListRoomSummaryFactory = roomListRoomSummaryFactory,
@@ -112,6 +273,6 @@ class RoomListDataSourceTest {
         notificationSettingsService = notificationSettingsService,
         sessionCoroutineScope = backgroundScope,
         dateTimeObserver = dateTimeObserver,
-        analyticsService = FakeAnalyticsService(),
+        analyticsService = analyticsService,
     )
 }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt
index 4c361b47f3..6d68491ad1 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt
@@ -6,34 +6,32 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.home.impl.filters
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.home.impl.R
 import io.element.android.features.home.impl.filters.selection.FilterSelectionState
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressTag
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomListFiltersViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomListFiltersViewTest : RobolectricTest() {
     @Test
-    fun `clicking on filters generates expected Event`() {
+    fun `clicking on filters generates expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListFiltersEvent>()
-        rule.setContent {
+        setContent {
             RoomListFiltersView(
                 state = aRoomListFiltersState(eventSink = eventsRecorder),
             )
         }
-        rule.clickOn(R.string.screen_roomlist_filter_rooms)
+        clickOn(R.string.screen_roomlist_filter_rooms)
         eventsRecorder.assertList(
             listOf(
                 RoomListFiltersEvent.ToggleFilter(RoomListFilter.Rooms),
@@ -42,9 +40,9 @@ class RoomListFiltersViewTest {
     }
 
     @Test
-    fun `clicking on clear filters generates expected Event`() {
+    fun `clicking on clear filters generates expected Event`() = runAndroidComposeUiTest<ComponentActivity> {
         val eventsRecorder = EventsRecorder<RoomListFiltersEvent>()
-        rule.setContent {
+        setContent {
             RoomListFiltersView(
                 state = aRoomListFiltersState(
                     filterSelectionStates = RoomListFilter.entries.map { FilterSelectionState(it, isSelected = true) },
@@ -52,7 +50,7 @@ class RoomListFiltersViewTest {
                 ),
             )
         }
-        rule.pressTag(TestTags.homeScreenClearFilters.value)
+        pressTag(TestTags.homeScreenClearFilters.value)
         eventsRecorder.assertList(
             listOf(
                 RoomListFiltersEvent.ClearSelectedFilters,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
index 28e7051a55..0e00f43712 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/model/RoomListBaseRoomSummaryTest.kt
@@ -12,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import kotlinx.collections.immutable.toImmutableList
@@ -87,6 +88,7 @@ internal fun createRoomListRoomSummary(
     timestamp: String? = null,
     isTombstoned: Boolean = false,
     isSpace: Boolean = false,
+    dmUserStatus: DisplayedStatus? = null,
 ) = RoomListRoomSummary(
     id = A_ROOM_ID.value,
     roomId = A_ROOM_ID,
@@ -101,6 +103,7 @@ internal fun createRoomListRoomSummary(
     displayType = displayType,
     userDefinedNotificationMode = userDefinedNotificationMode,
     hasRoomCall = false,
+    activeCallIntent = null,
     isDirect = false,
     isFavorite = isFavorite,
     canonicalAlias = null,
@@ -108,5 +111,6 @@ internal fun createRoomListRoomSummary(
     isDm = false,
     heroes = heroes.toImmutableList(),
     isTombstoned = isTombstoned,
-    isSpace = isSpace
+    isSpace = isSpace,
+    dmUserStatus = dmUserStatus,
 )
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/FakeMarkRoomAsRead.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/FakeMarkRoomAsRead.kt
new file mode 100644
index 0000000000..ace688e664
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/FakeMarkRoomAsRead.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.roomlist
+
+import io.element.android.features.preferences.impl.tasks.MarkRoomAsRead
+import io.element.android.libraries.matrix.api.core.RoomId
+
+class FakeMarkRoomAsRead(
+    private val invokeLambda: suspend (RoomId) -> Result<Unit> = { Result.success(Unit) },
+) : MarkRoomAsRead {
+    val invokedRoomIds = mutableListOf<RoomId>()
+
+    override suspend fun invoke(roomId: RoomId): Result<Unit> {
+        invokedRoomIds.add(roomId)
+        return invokeLambda(roomId)
+    }
+}
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenuTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenuTest.kt
index 6be5fe4c16..aa39962a2b 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenuTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListContextMenuTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.home.impl.roomlist
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.home.impl.R
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -19,24 +21,20 @@ import io.element.android.tests.testutils.EnsureCalledOnceWithParam
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomListContextMenuTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomListContextMenuTest : RobolectricTest() {
     @Test
-    fun `clicking on Mark as read generates expected Events`() {
+    fun `clicking on Mark as read generates expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown(hasNewContent = true)
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             eventSink = eventsRecorder,
         )
-        rule.clickOn(R.string.screen_roomlist_mark_as_read)
+        clickOn(CommonStrings.action_mark_as_read)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.HideContextMenu,
@@ -46,14 +44,14 @@ class RoomListContextMenuTest {
     }
 
     @Test
-    fun `clicking on Mark as unread generates expected Events`() {
+    fun `clicking on Mark as unread generates expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown(hasNewContent = false)
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             eventSink = eventsRecorder,
         )
-        rule.clickOn(R.string.screen_roomlist_mark_as_unread)
+        clickOn(R.string.screen_roomlist_mark_as_unread)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.HideContextMenu,
@@ -63,14 +61,14 @@ class RoomListContextMenuTest {
     }
 
     @Test
-    fun `clicking on Leave room generates expected Events`() {
+    fun `clicking on Leave room generates expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown(isDm = false)
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             eventSink = eventsRecorder,
         )
-        rule.clickOn(CommonStrings.action_leave_room)
+        clickOn(CommonStrings.action_leave_room)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.HideContextMenu,
@@ -80,48 +78,48 @@ class RoomListContextMenuTest {
     }
 
     @Test
-    fun `clicking on Report room invokes the expected callback and generates expected Event`() {
+    fun `clicking on Report room invokes the expected callback and generates expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown()
         val callback = EnsureCalledOnceWithParam(contextMenu.roomId, Unit)
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             canReportRoom = true,
             eventSink = eventsRecorder,
             onRoomSettingsClick = EnsureNeverCalledWithParam(),
             onReportRoomClick = callback,
         )
-        rule.clickOn(CommonStrings.action_report_room)
+        clickOn(CommonStrings.action_report_room)
         eventsRecorder.assertSingle(RoomListEvent.HideContextMenu)
         callback.assertSuccess()
     }
 
     @Test
-    fun `clicking on Settings invokes the expected callback and generates expected Event`() {
+    fun `clicking on Settings invokes the expected callback and generates expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown()
         val callback = EnsureCalledOnceWithParam(contextMenu.roomId, Unit)
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             eventSink = eventsRecorder,
             onRoomSettingsClick = callback,
         )
-        rule.clickOn(CommonStrings.common_settings)
+        clickOn(CommonStrings.common_settings)
         eventsRecorder.assertSingle(RoomListEvent.HideContextMenu)
         callback.assertSuccess()
     }
 
     @Test
-    fun `clicking on Favourites generates expected Event`() {
+    fun `clicking on Favourites generates expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val contextMenu = aContextMenuShown(isDm = false, isFavorite = false)
         val callback = EnsureNeverCalledWithParam<RoomId>()
-        rule.setRoomListContextMenu(
+        setRoomListContextMenu(
             contextMenu = contextMenu,
             eventSink = eventsRecorder,
             onRoomSettingsClick = callback,
         )
-        rule.clickOn(CommonStrings.common_favourite)
+        clickOn(CommonStrings.common_favourite)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.SetRoomIsFavorite(contextMenu.roomId, true),
@@ -129,7 +127,7 @@ class RoomListContextMenuTest {
         )
     }
 
-    private fun AndroidComposeTestRule<*, *>.setRoomListContextMenu(
+    private fun AndroidComposeUiTest<ComponentActivity>.setRoomListContextMenu(
         contextMenu: RoomListState.ContextMenu.Shown,
         canReportRoom: Boolean = false,
         eventSink: (RoomListEvent) -> Unit,
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenuTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenuTest.kt
index d7f509fda4..cb0226353b 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenuTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListDeclineInviteMenuTest.kt
@@ -6,31 +6,28 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.home.impl.roomlist
 
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.home.impl.model.aRoomListRoomSummary
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureCalledOnceWithParam
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomListDeclineInviteMenuTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomListDeclineInviteMenuTest : RobolectricTest() {
     @Test
-    fun `clicking on decline emits the expected Events`() {
+    fun `clicking on decline emits the expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
-        rule.setSafeContent {
+        setSafeContent {
             RoomListDeclineInviteMenu(
                 menu = menu,
                 canReportRoom = false,
@@ -38,7 +35,7 @@ class RoomListDeclineInviteMenuTest {
                 eventSink = eventsRecorder,
             )
         }
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.HideDeclineInviteMenu,
@@ -48,10 +45,10 @@ class RoomListDeclineInviteMenuTest {
     }
 
     @Test
-    fun `clicking on decline and block when canReportRoom=true, it emits the expected Events and callback`() {
+    fun `clicking on decline and block when canReportRoom=true, it emits the expected Events and callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
-        rule.setSafeContent {
+        setSafeContent {
             RoomListDeclineInviteMenu(
                 menu = menu,
                 canReportRoom = true,
@@ -59,16 +56,16 @@ class RoomListDeclineInviteMenuTest {
                 eventSink = eventsRecorder,
             )
         }
-        rule.clickOn(CommonStrings.action_decline_and_block)
+        clickOn(CommonStrings.action_decline_and_block)
         val expectedEvents = listOf(RoomListEvent.HideDeclineInviteMenu)
         eventsRecorder.assertList(expectedEvents)
     }
 
     @Test
-    fun `clicking on decline and block when canReportRoom=false, it emits the expected Events`() {
+    fun `clicking on decline and block when canReportRoom=false, it emits the expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
-        rule.setSafeContent {
+        setSafeContent {
             RoomListDeclineInviteMenu(
                 menu = menu,
                 canReportRoom = false,
@@ -76,7 +73,7 @@ class RoomListDeclineInviteMenuTest {
                 eventSink = eventsRecorder,
             )
         }
-        rule.clickOn(CommonStrings.action_decline_and_block)
+        clickOn(CommonStrings.action_decline_and_block)
         val expectedEvents = listOf(
             RoomListEvent.HideDeclineInviteMenu,
             RoomListEvent.DeclineInvite(menu.roomSummary, blockUser = true),
@@ -85,10 +82,10 @@ class RoomListDeclineInviteMenuTest {
     }
 
     @Test
-    fun `clicking on cancel emits the expected Event`() {
+    fun `clicking on cancel emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
-        rule.setSafeContent {
+        setSafeContent {
             RoomListDeclineInviteMenu(
                 menu = menu,
                 canReportRoom = false,
@@ -96,7 +93,7 @@ class RoomListDeclineInviteMenuTest {
                 eventSink = eventsRecorder,
             )
         }
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertList(listOf(RoomListEvent.HideDeclineInviteMenu))
     }
 }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
index 99a5550a08..64dfc46ee2 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt
@@ -30,12 +30,15 @@ import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInvit
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
+import io.element.android.features.preferences.impl.tasks.MarkRoomAsRead
 import io.element.android.features.rageshake.test.logs.FakeAnnouncementService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.eventformatter.api.RoomLatestEventFormatter
 import io.element.android.libraries.eventformatter.test.FakeRoomLatestEventFormatter
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -61,9 +64,7 @@ import io.element.android.libraries.matrix.test.roomlist.FakeDynamicRoomList
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
-import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
-import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.libraries.push.api.battery.aBatteryOptimizationState
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
@@ -89,6 +90,7 @@ import org.junit.Rule
 import org.junit.Test
 import kotlin.time.Duration.Companion.seconds
 
+@Suppress("LargeClass")
 class RoomListPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
@@ -227,7 +229,6 @@ class RoomListPresenterTest {
                             isDm = false,
                             isFavorite = false,
                             hasNewContent = false,
-                            displayClearRoomCacheAction = false,
                         )
                     )
             }
@@ -244,35 +245,6 @@ class RoomListPresenterTest {
                             isDm = false,
                             isFavorite = true,
                             hasNewContent = false,
-                            displayClearRoomCacheAction = false,
-                        )
-                    )
-            }
-        }
-    }
-
-    @Test
-    fun `present - show context menu with view source on`() = runTest {
-        val presenter = createRoomListPresenter(
-            appPreferencesStore = InMemoryAppPreferencesStore(
-                isDeveloperModeEnabled = true,
-            )
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            val summary = createRoomListRoomSummary()
-            initialState.eventSink(RoomListEvent.ShowContextMenu(summary))
-            awaitItem().also { state ->
-                assertThat(state.contextMenu)
-                    .isEqualTo(
-                        RoomListState.ContextMenu.Shown(
-                            roomId = summary.roomId,
-                            roomName = summary.name,
-                            isDm = false,
-                            isFavorite = false,
-                            // true here.
-                            hasNewContent = false,
-                            displayClearRoomCacheAction = true,
                         )
                     )
             }
@@ -300,7 +272,6 @@ class RoomListPresenterTest {
                         isDm = false,
                         isFavorite = false,
                         hasNewContent = false,
-                        displayClearRoomCacheAction = false,
                     )
                 )
 
@@ -457,11 +428,17 @@ class RoomListPresenterTest {
         val notificationCleaner = FakeNotificationCleaner(
             clearMessagesForRoomLambda = clearMessagesForRoomLambda,
         )
+        val markRoomAsRead = createTestMarkRoomAsRead(
+            client = matrixClient,
+            notificationCleaner = notificationCleaner,
+            sessionPreferencesStore = sessionPreferencesStore,
+        )
         val presenter = createRoomListPresenter(
             client = matrixClient,
             sessionPreferencesStore = sessionPreferencesStore,
             analyticsService = analyticsService,
             notificationCleaner = notificationCleaner,
+            markRoomAsRead = markRoomAsRead,
         )
         presenter.test {
             val initialState = awaitItem()
@@ -653,6 +630,24 @@ class RoomListPresenterTest {
         }
     }
 
+    private fun createTestMarkRoomAsRead(
+        client: MatrixClient,
+        notificationCleaner: NotificationCleaner,
+        sessionPreferencesStore: SessionPreferencesStore,
+    ): MarkRoomAsRead = FakeMarkRoomAsRead { roomId ->
+        notificationCleaner.clearMessagesForRoom(client.sessionId, roomId)
+        val room = client.getRoom(roomId) ?: return@FakeMarkRoomAsRead Result.failure(IllegalStateException("Room not found"))
+        room.use {
+            it.setUnreadFlag(isUnread = false)
+            val receiptType = if (sessionPreferencesStore.isSendPublicReadReceiptsEnabled().first()) {
+                ReceiptType.READ
+            } else {
+                ReceiptType.READ_PRIVATE
+            }
+            it.markAsRead(receiptType)
+        }
+    }
+
     private fun TestScope.createRoomListPresenter(
         client: MatrixClient = FakeMatrixClient(),
         leaveRoomState: LeaveRoomState = aLeaveRoomState(),
@@ -665,9 +660,10 @@ class RoomListPresenterTest {
         spaceFiltersPresenter: Presenter<SpaceFiltersState> = Presenter { aDisabledSpaceFiltersState() },
         acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
         notificationCleaner: NotificationCleaner = FakeNotificationCleaner(),
-        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
         seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
         announcementService: AnnouncementService = FakeAnnouncementService(),
+        featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
+        markRoomAsRead: MarkRoomAsRead? = null,
     ) = RoomListPresenter(
         client = client,
         leaveRoomPresenter = { leaveRoomState },
@@ -684,17 +680,20 @@ class RoomListPresenterTest {
             analyticsService = FakeAnalyticsService(),
         ),
         searchPresenter = searchPresenter,
-        sessionPreferencesStore = sessionPreferencesStore,
         filtersPresenter = filtersPresenter,
         spaceFiltersPresenter = spaceFiltersPresenter,
         analyticsService = analyticsService,
         acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
         fullScreenIntentPermissionsPresenter = { aFullScreenIntentPermissionsState() },
         batteryOptimizationPresenter = { aBatteryOptimizationState() },
-        notificationCleaner = notificationCleaner,
-        appPreferencesStore = appPreferencesStore,
+        markRoomAsRead = markRoomAsRead ?: createTestMarkRoomAsRead(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            sessionPreferencesStore = sessionPreferencesStore,
+        ),
         seenInvitesStore = seenInvitesStore,
         announcementService = announcementService,
         coldStartWatcher = FakeAnalyticsColdStartWatcher(),
+        featureFlagService = featureFlagService,
     )
 }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
index 8402a921ca..773f428917 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt
@@ -6,17 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.home.impl.roomlist
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.longClick
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.home.impl.HomeView
 import io.element.android.features.home.impl.R
 import io.element.android.features.home.impl.aHomeState
@@ -31,23 +33,17 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class RoomListViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class RoomListViewTest : RobolectricTest() {
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `displaying the view automatically sends a couple of UpdateVisibleRangeEvents`() {
+    fun `displaying the view automatically sends a couple of UpdateVisibleRangeEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
-        rule.setRoomListView(
+        setRoomListView(
             state = aRoomListState(
                 contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation),
                 eventSink = eventsRecorder,
@@ -62,9 +58,9 @@ class RoomListViewTest {
     }
 
     @Test
-    fun `clicking on close recovery key banner emits the expected Event`() {
+    fun `clicking on close recovery key banner emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
-        rule.setRoomListView(
+        setRoomListView(
             state = aRoomListState(
                 contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation),
                 eventSink = eventsRecorder,
@@ -74,15 +70,15 @@ class RoomListViewTest {
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        val close = rule.activity.getString(CommonStrings.action_close)
-        rule.onNodeWithContentDescription(close).performClick()
+        val close = activity!!.getString(CommonStrings.action_close)
+        onNodeWithContentDescription(close).performClick()
         eventsRecorder.assertSingle(RoomListEvent.DismissBanner)
     }
 
     @Test
-    fun `clicking on close setup key banner emits the expected Event`() {
+    fun `clicking on close setup key banner emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
-        rule.setRoomListView(
+        setRoomListView(
             state = aRoomListState(
                 contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SetUpRecovery),
                 eventSink = eventsRecorder,
@@ -92,16 +88,16 @@ class RoomListViewTest {
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        val close = rule.activity.getString(CommonStrings.action_close)
-        rule.onNodeWithContentDescription(close).performClick()
+        val close = activity!!.getString(CommonStrings.action_close)
+        onNodeWithContentDescription(close).performClick()
         eventsRecorder.assertSingle(RoomListEvent.DismissBanner)
     }
 
     @Test
-    fun `clicking on continue recovery key banner invokes the expected callback`() {
+    fun `clicking on continue recovery key banner invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         ensureCalledOnce { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = aRoomListState(
                     contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation),
                     eventSink = eventsRecorder,
@@ -112,17 +108,17 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.clickOn(CommonStrings.action_continue)
+            clickOn(CommonStrings.action_continue)
 
             eventsRecorder.assertEmpty()
         }
     }
 
     @Test
-    fun `clicking on continue setup key banner invokes the expected callback`() {
+    fun `clicking on continue setup key banner invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         ensureCalledOnce { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = aRoomListState(
                     contentState = aRoomsContentState(securityBannerState = SecurityBannerState.SetUpRecovery),
                     eventSink = eventsRecorder,
@@ -131,28 +127,28 @@ class RoomListViewTest {
             )
             // Remove automatic initial events
             eventsRecorder.clear()
-            rule.clickOn(R.string.banner_set_up_recovery_submit)
+            clickOn(R.string.banner_set_up_recovery_submit)
             eventsRecorder.assertEmpty()
         }
     }
 
     @Test
-    fun `clicking on start chat when the session has no room invokes the expected callback`() {
+    fun `clicking on start chat when the session has no room invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = aRoomListState(
                     eventSink = eventsRecorder,
                     contentState = anEmptyContentState(),
                 ),
                 onCreateRoomClick = callback,
             )
-            rule.clickOn(CommonStrings.action_start_chat)
+            clickOn(CommonStrings.action_start_chat)
         }
     }
 
     @Test
-    fun `clicking on a room invokes the expected callback`() {
+    fun `clicking on a room invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val state = aRoomListState(
             eventSink = eventsRecorder,
@@ -161,7 +157,7 @@ class RoomListViewTest {
             it.displayType == RoomSummaryDisplayType.ROOM
         }
         ensureCalledOnceWithParam(room0.roomId) { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = state,
                 onRoomClick = callback,
             )
@@ -169,14 +165,14 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.onNodeWithText(room0.latestEvent.content().toString()).performClick()
+            onNodeWithText(room0.latestEvent.content().toString()).performClick()
         }
 
         eventsRecorder.assertEmpty()
     }
 
     @Test
-    fun `clicking on a room twice invokes the expected callback only once`() {
+    fun `clicking on a room twice invokes the expected callback only once`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val state = aRoomListState(
             eventSink = eventsRecorder,
@@ -185,13 +181,13 @@ class RoomListViewTest {
             it.displayType == RoomSummaryDisplayType.ROOM
         }
         ensureCalledOnceWithParam(room0.roomId) { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = state,
                 onRoomClick = callback,
             )
             // Remove automatic initial events
             eventsRecorder.clear()
-            rule.onNodeWithText(room0.latestEvent.content().toString())
+            onNodeWithText(room0.latestEvent.content().toString())
                 .performClick()
                 .performClick()
         }
@@ -199,7 +195,7 @@ class RoomListViewTest {
     }
 
     @Test
-    fun `long clicking on a room emits the expected Event`() {
+    fun `long clicking on a room emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val state = aRoomListState(
             eventSink = eventsRecorder,
@@ -207,18 +203,18 @@ class RoomListViewTest {
         val room0 = state.contentAsRooms().summaries.first {
             it.displayType == RoomSummaryDisplayType.ROOM
         }
-        rule.setRoomListView(
+        setRoomListView(
             state = state,
         )
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        rule.onNodeWithText(room0.latestEvent.content().toString()).performTouchInput { longClick() }
+        onNodeWithText(room0.latestEvent.content().toString()).performTouchInput { longClick() }
         eventsRecorder.assertSingle(RoomListEvent.ShowContextMenu(room0))
     }
 
     @Test
-    fun `clicking on a room setting invokes the expected callback and emits expected Event`() {
+    fun `clicking on a room setting invokes the expected callback and emits expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val state = aRoomListState(
             contextMenu = aContextMenuShown(),
@@ -226,7 +222,7 @@ class RoomListViewTest {
         )
         val room0 = (state.contextMenu as RoomListState.ContextMenu.Shown).roomId
         ensureCalledOnceWithParam(room0) { callback ->
-            rule.setRoomListView(
+            setRoomListView(
                 state = state,
                 onRoomSettingsClick = callback,
             )
@@ -234,14 +230,14 @@ class RoomListViewTest {
             // Remove automatic initial events
             eventsRecorder.clear()
 
-            rule.clickOn(CommonStrings.common_settings)
+            clickOn(CommonStrings.common_settings)
         }
 
         eventsRecorder.assertSingle(RoomListEvent.HideContextMenu)
     }
 
     @Test
-    fun `clicking on accept and decline invite emits the expected Events`() {
+    fun `clicking on accept and decline invite emits the expected Events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomListEvent>()
         val state = aRoomListState(
             eventSink = eventsRecorder,
@@ -249,13 +245,13 @@ class RoomListViewTest {
         val invitedRoom = state.contentAsRooms().summaries.first {
             it.displayType == RoomSummaryDisplayType.INVITE
         }
-        rule.setRoomListView(state = state)
+        setRoomListView(state = state)
 
         // Remove automatic initial events
         eventsRecorder.clear()
 
-        rule.clickOn(CommonStrings.action_accept)
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_accept)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertList(
             listOf(
                 RoomListEvent.AcceptInvite(invitedRoom),
@@ -265,7 +261,7 @@ class RoomListViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomListView(
     state: RoomListState,
     onRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
     onSettingsClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenterTest.kt
index 278a268864..31a47d830f 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersPresenterTest.kt
@@ -8,8 +8,6 @@
 package io.element.android.features.home.impl.spacefilters
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceService
@@ -21,26 +19,9 @@ import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class SpaceFiltersPresenterTest {
-    @Test
-    fun `present - when feature flag is disabled returns Disabled state`() = runTest {
-        val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to false)
-            )
-        )
-        presenter.test {
-            val state = awaitItem()
-            assertThat(state).isEqualTo(SpaceFiltersState.Disabled)
-        }
-    }
-
     @Test
     fun `present - when available filters is empty returns Disabled state`() = runTest {
-        val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            )
-        )
+        val presenter = createSpaceFiltersPresenter()
         presenter.test {
             val state = awaitLastSequentialItem()
             assertThat(state).isEqualTo(SpaceFiltersState.Disabled)
@@ -48,15 +29,12 @@ class SpaceFiltersPresenterTest {
     }
 
     @Test
-    fun `present - when feature flag is enabled and filters exist returns Unselected state`() = runTest {
+    fun `present - when filters exist returns Unselected state`() = runTest {
         val spaceFilter = aSpaceServiceFilter(displayName = "Test Space")
         val spaceService = FakeSpaceService()
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -75,9 +53,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -99,9 +74,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -129,9 +101,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -159,9 +128,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -196,9 +162,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -224,9 +187,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -271,9 +231,6 @@ class SpaceFiltersPresenterTest {
         val matrixClient = FakeMatrixClient(spaceService = spaceService)
 
         val presenter = createSpaceFiltersPresenter(
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.RoomListSpaceFilters.key to true)
-            ),
             matrixClient = matrixClient,
         )
         presenter.test {
@@ -302,11 +259,9 @@ class SpaceFiltersPresenterTest {
     }
 
     private fun createSpaceFiltersPresenter(
-        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
         matrixClient: FakeMatrixClient = FakeMatrixClient(),
     ): SpaceFiltersPresenter {
         return SpaceFiltersPresenter(
-            featureFlagService = featureFlagService,
             matrixClient = matrixClient,
         )
     }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersViewTest.kt
index 5c1325b107..9c9d13d066 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersViewTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spacefilters/SpaceFiltersViewTest.kt
@@ -5,34 +5,30 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.home.impl.spacefilters
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.tests.testutils.EventsRecorder
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class SpaceFiltersViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class SpaceFiltersViewTest : RobolectricTest() {
     @Test
-    fun `clicking on a filter with alias shows display name and alias`() {
+    fun `clicking on a filter with alias shows display name and alias`() = runAndroidComposeUiTest {
         val filter = aSpaceServiceFilter(
             displayName = "Test Space",
             canonicalAlias = A_ROOM_ALIAS,
         )
         val eventsRecorder = EventsRecorder<SpaceFiltersEvent.Selecting>()
-        rule.setSpaceFiltersView(
+        setSpaceFiltersView(
             state = aSelectingSpaceFiltersState(
                 availableFilters = listOf(filter),
                 eventSink = eventsRecorder,
@@ -40,20 +36,20 @@ class SpaceFiltersViewTest {
         )
 
         // Both display name and alias should be visible
-        rule.onNodeWithText(filter.spaceRoom.displayName).assertExists()
-        rule.onNodeWithText(A_ROOM_ALIAS.value).assertExists()
+        onNodeWithText(filter.spaceRoom.displayName).assertExists()
+        onNodeWithText(A_ROOM_ALIAS.value).assertExists()
 
-        rule.onNodeWithText(filter.spaceRoom.displayName).performClick()
+        onNodeWithText(filter.spaceRoom.displayName).performClick()
 
         eventsRecorder.assertSingle(SpaceFiltersEvent.Selecting.SelectFilter(filter))
     }
 
     @Test
-    fun `multiple filters are displayed and clickable`() {
+    fun `multiple filters are displayed and clickable`() = runAndroidComposeUiTest {
         val filter1 = aSpaceServiceFilter(displayName = "Space One")
         val filter2 = aSpaceServiceFilter(displayName = "Space Two")
         val eventsRecorder = EventsRecorder<SpaceFiltersEvent.Selecting>()
-        rule.setSpaceFiltersView(
+        setSpaceFiltersView(
             state = aSelectingSpaceFiltersState(
                 availableFilters = listOf(filter1, filter2),
                 eventSink = eventsRecorder,
@@ -61,17 +57,17 @@ class SpaceFiltersViewTest {
         )
 
         // Both filters should be visible
-        rule.onNodeWithText(filter1.spaceRoom.displayName).assertExists()
-        rule.onNodeWithText(filter2.spaceRoom.displayName).assertExists()
+        onNodeWithText(filter1.spaceRoom.displayName).assertExists()
+        onNodeWithText(filter2.spaceRoom.displayName).assertExists()
 
         // Click on second filter
-        rule.onNodeWithText(filter2.spaceRoom.displayName).performClick()
+        onNodeWithText(filter2.spaceRoom.displayName).performClick()
 
         eventsRecorder.assertSingle(SpaceFiltersEvent.Selecting.SelectFilter(filter2))
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpaceFiltersView(
+private fun AndroidComposeUiTest<ComponentActivity>.setSpaceFiltersView(
     state: SpaceFiltersState,
 ) {
     setContent {
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenterTest.kt
index 43d3a8896d..c7608833ac 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesPresenterTest.kt
@@ -11,9 +11,6 @@ package io.element.android.features.home.impl.spaces
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.tests.testutils.test
@@ -26,25 +23,18 @@ class HomeSpacesPresenterTest {
         val presenter = createPresenter()
         presenter.test {
             val state = awaitItem()
-            // canCreateSpaces is initially false
-            assertThat(state.canCreateSpaces).isFalse()
             assertThat(state.space).isEqualTo(CurrentSpace.Root)
             assertThat(state.spaceRooms).isEmpty()
             assertThat(state.hideInvitesAvatar).isFalse()
             assertThat(state.seenSpaceInvites).isEmpty()
-
-            // It'll eventually be true
-            assertThat(awaitItem().canCreateSpaces).isTrue()
         }
     }
 
     private fun createPresenter(
         client: MatrixClient = FakeMatrixClient(),
         seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
-        featureFlagsService: FeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.CreateSpaces.key to true)),
     ) = HomeSpacesPresenter(
         client = client,
         seenInvitesStore = seenInvitesStore,
-        featureFlagsService = featureFlagsService,
     )
 }
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt
index 696e02a0d7..8bfea2c12c 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt
@@ -11,7 +11,6 @@ package io.element.android.features.invite.api
 import android.os.Parcelable
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import kotlinx.parcelize.Parcelize
diff --git a/features/invite/impl/build.gradle.kts b/features/invite/impl/build.gradle.kts
index 80b98464f7..e033f2740c 100644
--- a/features/invite/impl/build.gradle.kts
+++ b/features/invite/impl/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.uiStrings)
     implementation(projects.services.analytics.api)
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteStateProvider.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteStateProvider.kt
index 3f8bf93afa..db2e76c1c3 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteStateProvider.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteStateProvider.kt
@@ -15,6 +15,7 @@ import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInv
 import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.invite.impl.AcceptInvite
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.matrix.api.core.RoomId
 
 open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDeclineInviteState> {
@@ -26,7 +27,7 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
                     InviteData(
                         roomId = RoomId("!room:matrix.org"),
                         isDm = true,
-                        roomName = "Alice"
+                        roomName = ROOM_NAME,
                     ),
                     blockUser = false,
                 ),
@@ -36,7 +37,7 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
                     InviteData(
                         roomId = RoomId("!room:matrix.org"),
                         isDm = true,
-                        roomName = "Alice"
+                        roomName = ROOM_NAME,
                     ),
                     blockUser = true,
                 ),
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt
index 1028a4c142..1d14df024a 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt
@@ -81,7 +81,7 @@ fun DeclineAndBlockView(
         ) {
             ListItem(
                 modifier = Modifier.padding(end = 8.dp),
-                headlineContent = {
+                content = {
                     Text(text = stringResource(R.string.screen_decline_and_block_block_user_option_title))
                 },
                 supportingContent = {
@@ -96,7 +96,7 @@ fun DeclineAndBlockView(
             Spacer(modifier = Modifier.height(24.dp))
             ListItem(
                 modifier = Modifier.padding(end = 8.dp),
-                headlineContent = {
+                content = {
                     Text(text = stringResource(CommonStrings.action_report_room))
                 },
                 supportingContent = {
diff --git a/features/invite/impl/src/main/res/values-be/translations.xml b/features/invite/impl/src/main/res/values-be/translations.xml
index fca38b796a..3c17aa0cdb 100644
--- a/features/invite/impl/src/main/res/values-be/translations.xml
+++ b/features/invite/impl/src/main/res/values-be/translations.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_decline_and_block_block_user_option_title">"Заблакіраваць карыстальніка"</string>
+  <string name="screen_decline_and_block_title">"Адхіліць і заблакіраваць"</string>
   <string name="screen_invites_decline_chat_message">"Вы ўпэўненыя, што хочаце адхіліць запрашэнне ў %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Адхіліць запрашэнне"</string>
   <string name="screen_invites_decline_direct_chat_message">"Вы ўпэўненыя, што хочаце адмовіцца ад прыватных зносін з %1$s?"</string>
   <string name="screen_invites_decline_direct_chat_title">"Адхіліць чат"</string>
   <string name="screen_invites_empty_list">"Няма запрашэнняў"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) запрасіў(-ла) вас"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Адхіліць і заблакіраваць"</string>
 </resources>
diff --git a/features/invite/impl/src/main/res/values-ca/translations.xml b/features/invite/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..0dd3e42664
--- /dev/null
+++ b/features/invite/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"No veuràs cap missatge ni invitacions a sales d\'aquest usuari."</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Bloqueja usuari"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Denuncia aquesta sala al teu proveïdor de compte."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Descriu el motiu de la denúncia…"</string>
+  <string name="screen_decline_and_block_title">"Rebutja i bloqueja"</string>
+  <string name="screen_invites_decline_chat_message">"Segur que vols rebutjar la invitació per unir-te a %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Rebutja invitació"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Segur que vols rebutjar el xat privat amb %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Rebutja xat"</string>
+  <string name="screen_invites_empty_list">"Sense invitacions"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) t\'ha convidat"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Sí, rebutja i bloqueja"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Segur que vols rebutjar la invitació d\'unió a aquesta sala? Això també evitarà que %1$s et contacti i et convidi a sales."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Rebutja la invitació i bloqueja"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Rebutja i bloqueja"</string>
+</resources>
diff --git a/features/invite/impl/src/main/res/values-ja/translations.xml b/features/invite/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..5e1b527dd3
--- /dev/null
+++ b/features/invite/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"このユーザーからのメッセージと招待を非表示します"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"ユーザーをブロック"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"アカウント提供元にこのルームを報告"</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"報告の理由を説明してください…"</string>
+  <string name="screen_decline_and_block_title">"拒否してブロック"</string>
+  <string name="screen_invites_decline_chat_message">"%1$sへの招待を本当に破棄しますか？"</string>
+  <string name="screen_invites_decline_chat_title">"招待を破棄"</string>
+  <string name="screen_invites_decline_direct_chat_message">"%1$sとのチャットを本当に拒否しますか？"</string>
+  <string name="screen_invites_decline_direct_chat_title">"チャットを拒否"</string>
+  <string name="screen_invites_empty_list">"招待はありません"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) があなたを招待しました"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"拒否してブロックする"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"本当にこのルームへの参加の招待を拒否しますか？%1$s は、あなたと会話することやルームに招待することができなくなります。"</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"招待を拒否してブロック"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"拒否してブロック"</string>
+</resources>
diff --git a/features/invite/impl/src/main/res/values-ru/translations.xml b/features/invite/impl/src/main/res/values-ru/translations.xml
index 4e1104266e..8139beb885 100644
--- a/features/invite/impl/src/main/res/values-ru/translations.xml
+++ b/features/invite/impl/src/main/res/values-ru/translations.xml
@@ -10,7 +10,7 @@
   <string name="screen_invites_decline_direct_chat_message">"Вы уверены, что хотите отказаться от личного общения с %1$s?"</string>
   <string name="screen_invites_decline_direct_chat_title">"Отклонить чат"</string>
   <string name="screen_invites_empty_list">"Нет приглашений"</string>
-  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) вас"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) Вас"</string>
   <string name="screen_join_room_decline_and_block_alert_confirmation">"Да, отклонить и заблокировать"</string>
   <string name="screen_join_room_decline_and_block_alert_message">"Вы действительно хотите отклонить приглашение в комнату? Также %1$s больше не сможет связаться с вами или приглашать в комнаты."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Отклонить приглашение и заблокировать"</string>
diff --git a/features/invite/impl/src/main/res/values-vi/translations.xml b/features/invite/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..9b7784c25d
--- /dev/null
+++ b/features/invite/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Bạn sẽ không nhận được bất kỳ tin nhắn hoặc lời mời tham gia phòng nào từ người dùng này."</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Chặn người dùng"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Báo cáo phòng này cho nhà cung cấp tài khoản của bạn."</string>
+  <string name="screen_decline_and_block_title">"Từ chối và chặn"</string>
+  <string name="screen_invites_decline_chat_message">"Bạn có chắc muốn từ chối lời mời tham gia %1$s không?"</string>
+  <string name="screen_invites_decline_chat_title">"Từ chối lời mời"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Bạn có chắc muốn từ chối cuộc trò chuyện riêng với %1$s không?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Từ chối trò chuyện"</string>
+  <string name="screen_invites_empty_list">"Không có lời mời"</string>
+  <string name="screen_invites_invited_you">"%1$s(%2$s ) đã mời bạn"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Có, từ chối &amp; chặn"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Bạn có chắc muốn từ chối lời mời tham gia phòng này không? Điều này cũng sẽ ngăn %1$s liên hệ với bạn hoặc mời bạn vào các phòng."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Từ chối lời mời và chặn"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Từ chối và chặn"</string>
+</resources>
diff --git a/features/invite/impl/src/main/res/values-zh/translations.xml b/features/invite/impl/src/main/res/values-zh/translations.xml
index e7cf39a9c3..02825bca6d 100644
--- a/features/invite/impl/src/main/res/values-zh/translations.xml
+++ b/features/invite/impl/src/main/res/values-zh/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_decline_and_block_block_user_option_description">"您不会看到来自该用户的任何信息或房间邀请"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"封禁用户"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"向您的帐户提供商举报此房间。"</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"描述举报的原因…"</string>
+  <string name="screen_decline_and_block_block_user_option_description">"你将不会看到来自该用户的任何消息或房间邀请"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"屏蔽用户"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"向账户提供者举报此房间。"</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"描述举报的理由…"</string>
   <string name="screen_decline_and_block_title">"拒绝并屏蔽"</string>
-  <string name="screen_invites_decline_chat_message">"您确定要拒绝加入 %1$s 的邀请吗？"</string>
+  <string name="screen_invites_decline_chat_message">"你确定要拒绝加入 %1$s 的邀请？"</string>
   <string name="screen_invites_decline_chat_title">"拒绝邀请"</string>
-  <string name="screen_invites_decline_direct_chat_message">"您确定要拒绝与 %1$s 开始私聊吗？"</string>
+  <string name="screen_invites_decline_direct_chat_message">"你确定要拒绝与 %1$s 私聊？"</string>
   <string name="screen_invites_decline_direct_chat_title">"拒绝聊天"</string>
   <string name="screen_invites_empty_list">"没有邀请"</string>
-  <string name="screen_invites_invited_you">"%1$s （%2$s）邀请了你"</string>
-  <string name="screen_join_room_decline_and_block_alert_confirmation">"是的，拒绝并屏蔽"</string>
-  <string name="screen_join_room_decline_and_block_alert_message">"您确定要拒绝加入此房间的邀请吗？这也将阻止%1$s 与您联系或邀请您加入房间。"</string>
+  <string name="screen_invites_invited_you">"%1$s（%2$s）邀请了你"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"是，拒绝并屏蔽"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"你确定要拒绝此房间的加入邀请？这也将阻止 %1$s 与你联系或邀请你加入房间。"</string>
   <string name="screen_join_room_decline_and_block_alert_title">"拒绝邀请并屏蔽"</string>
   <string name="screen_join_room_decline_and_block_button_title">"拒绝并屏蔽"</string>
 </resources>
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt
index 299fec8565..55c31a09d2 100644
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.invite.impl.declineandblock
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.invite.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -21,98 +23,93 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DeclineAndBlockViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class DeclineAndBlockViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke the expected callback`() {
+    fun `clicking on back invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setDeclineAndBlockView(
+            setDeclineAndBlockView(
                 aDeclineAndBlockState(
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on decline when enabled emits the expected event`() {
+    fun `clicking on decline when enabled emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
-        rule.setDeclineAndBlockView(
+        setDeclineAndBlockView(
             aDeclineAndBlockState(
                 blockUser = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertSingle(DeclineAndBlockEvents.Decline)
     }
 
     @Test
-    fun `clicking on decline when disabled does not emit event`() {
+    fun `clicking on decline when disabled does not emit event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>(expectEvents = false)
-        rule.setDeclineAndBlockView(
+        setDeclineAndBlockView(
             aDeclineAndBlockState(
                 blockUser = false,
                 reportRoom = false,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertEmpty()
     }
 
     @Test
-    fun `clicking on block option emits the expected event`() {
+    fun `clicking on block option emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
-        rule.setDeclineAndBlockView(
+        setDeclineAndBlockView(
             aDeclineAndBlockState(
                 blockUser = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_decline_and_block_block_user_option_title)
+        clickOn(R.string.screen_decline_and_block_block_user_option_title)
         eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleBlockUser)
     }
 
     @Test
-    fun `clicking on report room option emits the expected event`() {
+    fun `clicking on report room option emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
-        rule.setDeclineAndBlockView(
+        setDeclineAndBlockView(
             aDeclineAndBlockState(
                 reportRoom = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_report_room)
+        clickOn(CommonStrings.action_report_room)
         eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleReportRoom)
     }
 
     @Test
-    fun `typing text in the reason field emits the expected Event`() {
+    fun `typing text in the reason field emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
-        rule.setDeclineAndBlockView(
+        setDeclineAndBlockView(
             aDeclineAndBlockState(
                 reportRoom = true,
                 reportReason = "",
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithText("").performTextInput("Spam!")
+        onNodeWithText("").performTextInput("Spam!")
         eventsRecorder.assertSingle(DeclineAndBlockEvents.UpdateReportReason("Spam!"))
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setDeclineAndBlockView(
+private fun AndroidComposeUiTest<ComponentActivity>.setDeclineAndBlockView(
     state: DeclineAndBlockState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/invite/test/build.gradle.kts b/features/invite/test/build.gradle.kts
index 2df267f155..080ed765bb 100644
--- a/features/invite/test/build.gradle.kts
+++ b/features/invite/test/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
 dependencies {
     implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.test)
     implementation(projects.tests.testutils)
diff --git a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleEvents.kt b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleEvents.kt
index 264aafd570..0422fac4f1 100644
--- a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleEvents.kt
+++ b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleEvents.kt
@@ -11,4 +11,5 @@ package io.element.android.features.invitepeople.api
 interface InvitePeopleEvents {
     data object SendInvites : InvitePeopleEvents
     data object CloseSearch : InvitePeopleEvents
+    data object ClearError : InvitePeopleEvents
 }
diff --git a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleState.kt b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleState.kt
index 9d342d191f..d14042cff7 100644
--- a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleState.kt
+++ b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleState.kt
@@ -9,10 +9,12 @@
 package io.element.android.features.invitepeople.api
 
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.RoomId
 
 interface InvitePeopleState {
     val canInvite: Boolean
     val isSearchActive: Boolean
     val sendInvitesAction: AsyncAction<Unit>
+    val createRoomFromDmAction: AsyncAction<RoomId>
     val eventSink: (InvitePeopleEvents) -> Unit
 }
diff --git a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleStateProvider.kt b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleStateProvider.kt
index ce30bcc1f6..b233ed07ef 100644
--- a/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleStateProvider.kt
+++ b/features/invitepeople/api/src/main/kotlin/io/element/android/features/invitepeople/api/InvitePeopleStateProvider.kt
@@ -10,6 +10,7 @@ package io.element.android.features.invitepeople.api
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.RoomId
 
 class InvitePeopleStateProvider : PreviewParameterProvider<InvitePeopleState> {
     override val values: Sequence<InvitePeopleState>
@@ -25,6 +26,7 @@ private data class PreviewInvitePeopleState(
     override val canInvite: Boolean,
     override val isSearchActive: Boolean,
     override val sendInvitesAction: AsyncAction<Unit>,
+    override val createRoomFromDmAction: AsyncAction<RoomId>,
     override val eventSink: (InvitePeopleEvents) -> Unit,
 ) : InvitePeopleState
 
@@ -32,10 +34,12 @@ private fun aPreviewInvitePeopleState(
     canInvite: Boolean = false,
     isSearchActive: Boolean = false,
     sendInvitesAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    createRoomFromDmAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
     eventSink: (InvitePeopleEvents) -> Unit = {},
 ) = PreviewInvitePeopleState(
     canInvite = canInvite,
     isSearchActive = isSearchActive,
     sendInvitesAction = sendInvitesAction,
+    createRoomFromDmAction = createRoomFromDmAction,
     eventSink = eventSink
 )
diff --git a/features/invitepeople/impl/build.gradle.kts b/features/invitepeople/impl/build.gradle.kts
index e2025405ff..2ab2fcb4a3 100644
--- a/features/invitepeople/impl/build.gradle.kts
+++ b/features/invitepeople/impl/build.gradle.kts
@@ -33,14 +33,18 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.androidutils)
-    implementation(projects.libraries.usersearch.impl)
+    implementation(projects.libraries.usersearch.api)
+    implementation(projects.libraries.testtags)
     implementation(libs.coil.compose)
     implementation(projects.services.apperror.api)
+    implementation(projects.libraries.featureflag.api)
     api(projects.features.invitepeople.api)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.services.apperror.test)
+    testImplementation(projects.libraries.featureflag.test)
 }
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/ConfirmingUnknownUserInvitation.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/ConfirmingUnknownUserInvitation.kt
new file mode 100644
index 0000000000..8f4d5e1510
--- /dev/null
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/ConfirmingUnknownUserInvitation.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.invitepeople.impl
+
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import kotlinx.collections.immutable.ImmutableList
+
+data class ConfirmingUnknownUserInvitation(
+    val users: ImmutableList<MatrixUser>
+) : AsyncAction.Confirming
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleEvents.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleEvents.kt
index b1f18b1df9..449d0ce6ac 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleEvents.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleEvents.kt
@@ -14,4 +14,6 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 sealed interface DefaultInvitePeopleEvents : InvitePeopleEvents {
     data class ToggleUser(val user: MatrixUser) : DefaultInvitePeopleEvents
     data class OnSearchActiveChanged(val active: Boolean) : DefaultInvitePeopleEvents
+    data object DismissUnknownUsersModal : DefaultInvitePeopleEvents
+    data object RemoveUnknownUsers : DefaultInvitePeopleEvents
 }
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenter.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenter.kt
index 3450587e82..79cd0c83be 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenter.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenter.kt
@@ -38,11 +38,17 @@ import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.createroom.CreateRoomParameters
+import io.element.android.libraries.matrix.api.createroom.RoomPreset
+import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.filterMembers
+import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.recent.getRecentDirectRooms
+import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.usersearch.api.UserRepository
@@ -50,6 +56,7 @@ import io.element.android.services.apperror.api.AppErrorStateService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.launchIn
@@ -81,11 +88,12 @@ class DefaultInvitePeoplePresenter(
     override fun present(): InvitePeopleState {
         val roomMembers = remember { mutableStateOf<AsyncData<ImmutableList<RoomMember>>>(AsyncData.Loading()) }
         val selectedUsers = remember { mutableStateOf<ImmutableList<MatrixUser>>(persistentListOf()) }
-        val searchResults = remember { mutableStateOf<SearchBarResultState<ImmutableList<InvitableUser>>>(SearchBarResultState.Initial()) }
+        val searchResults = remember { mutableStateOf<SearchBarResultState<ImmutableList<InvitableUser>>>(SearchBarResultState.Initial) }
         val queryState = rememberTextFieldState()
         var searchActive by rememberSaveable { mutableStateOf(false) }
         val showSearchLoader = rememberSaveable { mutableStateOf(false) }
         val sendInvitesAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
+        val createRoomFromDmAction = remember { mutableStateOf<AsyncAction<RoomId>>(AsyncAction.Uninitialized) }
 
         val recentDirectRooms by produceState(emptyList(), roomMembers.value) {
             if (roomMembers.value.isSuccess()) {
@@ -126,6 +134,35 @@ class DefaultInvitePeoplePresenter(
             }
         }
 
+        val selectedUserIdentities = produceState(
+            emptyMap<MatrixUser, IdentityState?>().toImmutableMap(),
+            selectedUsers.value,
+        ) {
+            val selected = selectedUsers.value
+
+            val cached = value
+                .filterKeys { it in selected }
+
+            val uncached = selected
+                .filterNot(cached::containsKey)
+                .associateWith { user ->
+                    matrixClient.encryptionService
+                        .getUserIdentity(user.userId, fallbackToServer = false)
+                        .getOrNull()
+                }
+
+            value = (cached + uncached).toImmutableMap()
+        }
+
+        val unknownUsers by remember {
+            derivedStateOf {
+                selectedUserIdentities.value
+                    .filterValues { it == null }
+                    .keys
+                    .toImmutableList()
+            }
+        }
+
         LaunchedEffect(room.isSuccess()) {
             room.dataOrNull()?.let {
                 fetchMembers(it, roomMembers)
@@ -144,27 +181,57 @@ class DefaultInvitePeoplePresenter(
 
         fun handleEvent(event: InvitePeopleEvents) {
             when (event) {
-                is DefaultInvitePeopleEvents.OnSearchActiveChanged -> {
-                    searchActive = event.active
-                    if (!event.active) {
-                        queryState.clearText()
+                // Dedicated `when` for exhaustivity.
+                is DefaultInvitePeopleEvents -> when (event) {
+                    is DefaultInvitePeopleEvents.OnSearchActiveChanged -> {
+                        searchActive = event.active
+                        if (!event.active) {
+                            queryState.clearText()
+                        }
+                    }
+
+                    is DefaultInvitePeopleEvents.ToggleUser -> {
+                        selectedUsers.toggleUser(event.user)
+                        searchResults.toggleUser(event.user)
+                        // suggestions will automatically update via derivedStateOf when selectedUsers changes
+                    }
+                    is DefaultInvitePeopleEvents.DismissUnknownUsersModal -> {
+                        sendInvitesAction.value = AsyncAction.Uninitialized
+                    }
+                    is DefaultInvitePeopleEvents.RemoveUnknownUsers -> {
+                        val usersToRemove = selectedUsers.value.filter { it in unknownUsers }
+                        usersToRemove.forEach { user ->
+                            selectedUsers.toggleUser(user)
+                            searchResults.toggleUser(user)
+                        }
+                        sendInvitesAction.value = AsyncAction.Uninitialized
                     }
                 }
-
-                is DefaultInvitePeopleEvents.ToggleUser -> {
-                    selectedUsers.toggleUser(event.user)
-                    searchResults.toggleUser(event.user)
-                    // suggestions will automatically update via derivedStateOf when selectedUsers changes
-                }
                 is InvitePeopleEvents.SendInvites -> {
-                    room.dataOrNull()?.let {
-                        sessionCoroutineScope.sendInvites(it, selectedUsers.value, sendInvitesAction)
+                    if (unknownUsers.isNotEmpty() && sendInvitesAction.value !is ConfirmingUnknownUserInvitation) {
+                        sendInvitesAction.value = ConfirmingUnknownUserInvitation(
+                            unknownUsers
+                        )
+                    } else {
+                        room.dataOrNull()?.let {
+                            sessionCoroutineScope.launch {
+                                if (it.isDm()) {
+                                    createRoomFromDm(it, selectedUsers.value, createRoomFromDmAction)
+                                } else {
+                                    sendInvites(it, selectedUsers.value, sendInvitesAction)
+                                }
+                            }
+                        }
                     }
                 }
                 is InvitePeopleEvents.CloseSearch -> {
                     searchActive = false
                     queryState.clearText()
                 }
+                is InvitePeopleEvents.ClearError -> {
+                    sendInvitesAction.value = AsyncAction.Uninitialized
+                    createRoomFromDmAction.value = AsyncAction.Uninitialized
+                }
             }
         }
 
@@ -177,6 +244,7 @@ class DefaultInvitePeoplePresenter(
             searchResults = searchResults.value,
             showSearchLoader = showSearchLoader.value,
             sendInvitesAction = sendInvitesAction.value,
+            createRoomFromDmAction = createRoomFromDmAction.value,
             suggestions = suggestions,
             eventSink = ::handleEvent,
         )
@@ -203,6 +271,35 @@ class DefaultInvitePeoplePresenter(
         }
     }
 
+    private fun CoroutineScope.createRoomFromDm(
+        currentRoom: JoinedRoom,
+        selectedUsers: List<MatrixUser>,
+        createRoomFromDmAction: MutableState<AsyncAction<RoomId>>,
+    ) = launch {
+        createRoomFromDmAction.runUpdatingState {
+            val currentUsers = currentRoom.getMembers(limit = 100).getOrNull().orEmpty()
+                .filter { it.membership.isActive() }
+            val invitees = (currentUsers.map { it.userId } + selectedUsers.map { it.userId })
+                .filter { it != matrixClient.sessionId }
+                .distinct()
+            matrixClient.createRoom(
+                CreateRoomParameters(
+                    name = null,
+                    topic = null,
+                    isEncrypted = true,
+                    isDirect = false,
+                    visibility = RoomVisibility.Private,
+                    preset = RoomPreset.PRIVATE_CHAT,
+                    invite = invitees,
+                    avatar = null,
+                    joinRuleOverride = JoinRule.Invite,
+                    historyVisibilityOverride = RoomHistoryVisibility.Invited,
+                    isSpace = false,
+                )
+            )
+        }
+    }
+
     @JvmName("toggleUserInSelectedUsers")
     private fun MutableState<ImmutableList<MatrixUser>>.toggleUser(user: MatrixUser) {
         value = if (value.contains(user)) {
@@ -235,15 +332,15 @@ class DefaultInvitePeoplePresenter(
         showSearchLoader: MutableState<Boolean>,
         searchQuery: String,
     ) = withContext(coroutineDispatchers.io) {
-        searchResults.value = SearchBarResultState.Initial()
+        searchResults.value = SearchBarResultState.Initial
         showSearchLoader.value = false
         val joinedMembers = roomMembers.value.dataOrNull().orEmpty()
 
         userRepository.search(searchQuery).onEach { state ->
             showSearchLoader.value = state.isSearching
             searchResults.value = when {
-                state.results.isEmpty() && state.isSearching -> SearchBarResultState.Initial()
-                state.results.isEmpty() && !state.isSearching -> SearchBarResultState.NoResultsFound()
+                state.results.isEmpty() && state.isSearching -> SearchBarResultState.Initial
+                state.results.isEmpty() && !state.isSearching -> SearchBarResultState.NoResultsFound
                 else -> SearchBarResultState.Results(state.results.map { result ->
                     val existingMembership = joinedMembers.firstOrNull { j -> j.userId == result.matrixUser.userId }?.membership
                     val isJoined = existingMembership == RoomMembershipState.JOIN
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleState.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleState.kt
index 842bcf1148..46e5d9f1a5 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleState.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleState.kt
@@ -14,6 +14,7 @@ import io.element.android.features.invitepeople.api.InvitePeopleState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
@@ -26,6 +27,7 @@ data class DefaultInvitePeopleState(
     val selectedUsers: ImmutableList<MatrixUser>,
     override val isSearchActive: Boolean,
     override val sendInvitesAction: AsyncAction<Unit>,
+    override val createRoomFromDmAction: AsyncAction<RoomId>,
     val suggestions: ImmutableList<InvitableUser>,
     override val eventSink: (InvitePeopleEvents) -> Unit
 ) : InvitePeopleState
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
index 15ded2ae3f..1e41114406 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeopleStateProvider.kt
@@ -12,7 +12,13 @@ import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
+import io.element.android.libraries.designsystem.preview.USER_NAME_JUSTIN
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
@@ -27,21 +33,21 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
             aDefaultInvitePeopleState(canInvite = true, selectedUsers = aMatrixUserList().toImmutableList()),
             aDefaultInvitePeopleState(isSearchActive = true, searchQuery = "some query"),
             aDefaultInvitePeopleState(isSearchActive = true, searchQuery = "some query", selectedUsers = aMatrixUserList().toImmutableList()),
-            aDefaultInvitePeopleState(isSearchActive = true, searchQuery = "some query", searchResults = SearchBarResultState.NoResultsFound()),
+            aDefaultInvitePeopleState(isSearchActive = true, searchQuery = "some query", searchResults = SearchBarResultState.NoResultsFound),
             aDefaultInvitePeopleState(
                 isSearchActive = true,
                 canInvite = true,
                 searchQuery = "some query",
                 selectedUsers = persistentListOf(
-                    aMatrixUser("@carol:server.org", "Carol")
+                    aMatrixUser(displayName = USER_NAME_CAROL)
                 ),
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        anInvitableUser(aMatrixUser("@alice:server.org")),
-                        anInvitableUser(aMatrixUser("@bob:server.org", "Bob")),
-                        anInvitableUser(aMatrixUser("@carol:server.org", "Carol"), isSelected = true),
-                        anInvitableUser(aMatrixUser("@eve:server.org", "Eve"), isSelected = true, isAlreadyJoined = true),
-                        anInvitableUser(aMatrixUser("@justin:server.org", "Justin"), isSelected = true, isAlreadyInvited = true),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_ALICE)),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_BOB)),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_CAROL), isSelected = true),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_EVE), isSelected = true, isAlreadyJoined = true),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_JUSTIN), isSelected = true, isAlreadyInvited = true),
                     )
                 )
             ),
@@ -50,12 +56,12 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 canInvite = true,
                 searchQuery = "@alice:server.org",
                 selectedUsers = persistentListOf(
-                    aMatrixUser("@carol:server.org", "Carol")
+                    aMatrixUser(displayName = USER_NAME_CAROL)
                 ),
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        anInvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
-                        anInvitableUser(aMatrixUser("@bob:server.org", "Bob")),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_ALICE), isUnresolved = true),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_BOB)),
                     )
                 )
             ),
@@ -65,7 +71,7 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 searchQuery = "@alice:server.org",
                 searchResults = SearchBarResultState.Results(
                     persistentListOf(
-                        anInvitableUser(aMatrixUser("@alice:server.org"), isUnresolved = true),
+                        anInvitableUser(aMatrixUser(displayName = USER_NAME_ALICE), isUnresolved = true),
                     )
                 ),
                 showSearchLoader = true,
@@ -76,6 +82,18 @@ internal class DefaultInvitePeopleStateProvider : PreviewParameterProvider<Defau
                 selectedUsers = aMatrixUserList().toImmutableList(),
                 sendInvitesAction = AsyncAction.Loading,
             ),
+            aDefaultInvitePeopleState(
+                sendInvitesAction = ConfirmingUnknownUserInvitation(
+                    persistentListOf(
+                        aMatrixUser(),
+                    )
+                )
+            ),
+            aDefaultInvitePeopleState(
+                sendInvitesAction = ConfirmingUnknownUserInvitation(
+                    aMatrixUserList().toImmutableList()
+                )
+            ),
         )
 }
 
@@ -97,11 +115,12 @@ private fun aDefaultInvitePeopleState(
     room: AsyncData<Unit> = AsyncData.Success(Unit),
     canInvite: Boolean = false,
     searchQuery: String = "",
-    searchResults: SearchBarResultState<ImmutableList<InvitableUser>> = SearchBarResultState.Initial(),
+    searchResults: SearchBarResultState<ImmutableList<InvitableUser>> = SearchBarResultState.Initial,
     selectedUsers: ImmutableList<MatrixUser> = persistentListOf(),
     isSearchActive: Boolean = false,
     showSearchLoader: Boolean = false,
     sendInvitesAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    createRoomFromDmAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
     suggestions: List<InvitableUser> = aMatrixUserList()
         .take(5)
         .map { user -> anInvitableUser(matrixUser = user, isSelected = user in selectedUsers) },
@@ -115,6 +134,7 @@ private fun aDefaultInvitePeopleState(
         isSearchActive = isSearchActive,
         showSearchLoader = showSearchLoader,
         sendInvitesAction = sendInvitesAction,
+        createRoomFromDmAction = createRoomFromDmAction,
         suggestions = suggestions.toImmutableList(),
         eventSink = {},
     )
diff --git a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
index 55c5dba030..0ee3559aa3 100644
--- a/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
+++ b/features/invitepeople/impl/src/main/kotlin/io/element/android/features/invitepeople/impl/InvitePeopleView.kt
@@ -14,36 +14,52 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.invitepeople.api.InvitePeopleEvents
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.atomic.molecules.ButtonRowMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.async.AsyncFailure
 import io.element.android.libraries.designsystem.components.async.AsyncLoading
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
+import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.SearchBar
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.CheckableUserRow
 import io.element.android.libraries.matrix.ui.components.CheckableUserRowData
+import io.element.android.libraries.matrix.ui.components.MatrixUserRow
 import io.element.android.libraries.matrix.ui.components.SelectedUsersRowList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.utils.strings.simplePluralStringResource
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -90,7 +106,7 @@ private fun InvitePeopleContentView(
         }
 
         InvitePeopleSearchBar(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.imePadding().fillMaxWidth(),
             queryState = state.searchQuery,
             showLoader = state.showSearchLoader,
             selectedUsers = state.selectedUsers,
@@ -143,6 +159,15 @@ private fun InvitePeopleContentView(
                 }
             }
         }
+
+        if (state.sendInvitesAction is ConfirmingUnknownUserInvitation) {
+            InvitePeopleConfirmModal(
+                users = state.sendInvitesAction.users,
+                onDismiss = { state.eventSink.invoke(DefaultInvitePeopleEvents.DismissUnknownUsersModal) },
+                onInvite = { state.eventSink.invoke(InvitePeopleEvents.SendInvites) },
+                onRemove = { state.eventSink.invoke(DefaultInvitePeopleEvents.RemoveUnknownUsers) }
+            )
+        }
     }
 }
 
@@ -230,6 +255,65 @@ private fun InvitePeopleSearchBar(
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun InvitePeopleConfirmModal(
+    users: ImmutableList<MatrixUser>,
+    onDismiss: () -> Unit,
+    onInvite: () -> Unit,
+    onRemove: () -> Unit
+) {
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        dragHandle = null,
+        scrollable = false,
+    ) {
+        IconTitleSubtitleMolecule(
+            title = simplePluralStringResource(
+                resIdForOne = R.string.screen_invite_users_confirm_dialog_title_one_user,
+                resIdForOthers = R.string.screen_invite_users_confirm_dialog_title_mutiple_users,
+                count = users.size,
+            ),
+            subTitle = simplePluralStringResource(
+                resIdForOne = R.string.screen_invite_users_confirm_dialog_subtitle_one_user,
+                resIdForOthers = R.string.screen_invite_users_confirm_dialog_subtitle_multiple_users,
+                count = users.size,
+            ),
+            iconStyle = BigIcon.Style.Default(CompoundIcons.UserAddSolid()),
+            modifier = Modifier.padding(
+                top = 32.dp,
+                bottom = 16.dp,
+                start = 16.dp,
+                end = 16.dp,
+            )
+        )
+
+        LazyColumn {
+            items(users) { user ->
+                MatrixUserRow(user)
+            }
+        }
+
+        ButtonRowMolecule(
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier.padding(16.dp)
+        ) {
+            OutlinedButton(
+                text = stringResource(CommonStrings.action_remove),
+                onClick = onRemove,
+                leadingIcon = IconSource.Vector(CompoundIcons.Close()),
+                modifier = Modifier.weight(1f),
+            )
+            Button(
+                text = stringResource(CommonStrings.action_invite),
+                onClick = onInvite,
+                leadingIcon = IconSource.Vector(CompoundIcons.Check()),
+                modifier = Modifier.weight(1f).testTag(TestTags.confirmInviteUnknown),
+            )
+        }
+    }
+}
+
 @PreviewsDayNight
 @Composable
 internal fun InvitePeopleViewPreview(@PreviewParameter(DefaultInvitePeopleStateProvider::class) state: DefaultInvitePeopleState) =
diff --git a/features/invitepeople/impl/src/main/res/values-ca/translations.xml b/features/invitepeople/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..294d04b4a3
--- /dev/null
+++ b/features/invitepeople/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invite_users_already_a_member">"Ja és membre"</string>
+  <string name="screen_invite_users_already_invited">"Ja s\'ha convidat"</string>
+</resources>
diff --git a/features/invitepeople/impl/src/main/res/values-cs/translations.xml b/features/invitepeople/impl/src/main/res/values-cs/translations.xml
index fa5b3aa9a9..c041433267 100644
--- a/features/invitepeople/impl/src/main/res/values-cs/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-cs/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Již členem"</string>
   <string name="screen_invite_users_already_invited">"Již pozván(a)"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Momentálně s těmito kontakty nemáte žádné chaty. Před pokračováním potvrďte jejich pozvání do této místnosti."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Momentálně s tímto kontaktem nemáte žádné chaty. Před pokračováním potvrďte pozvání do této místnosti."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Pozvat nové kontakty do této místnosti?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Pozvat nový kontakt do této místnosti?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-da/translations.xml b/features/invitepeople/impl/src/main/res/values-da/translations.xml
index fbb1814e9f..1754ef6e0d 100644
--- a/features/invitepeople/impl/src/main/res/values-da/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-da/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Allerede medlem"</string>
   <string name="screen_invite_users_already_invited">"Allerede inviteret"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Du har i øjeblikket ingen chats med disse kontakter. Bekræft deres invitation til dette rum, før du fortsætter."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Du har i øjeblikket ingen chats med denne kontakt. Bekræft deres invitation til dette rum, før du fortsætter."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Inviter nye kontakter til dette rum?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Inviter ny kontakt til dette rum?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-et/translations.xml b/features/invitepeople/impl/src/main/res/values-et/translations.xml
index 44484d23c3..1bdf5f780c 100644
--- a/features/invitepeople/impl/src/main/res/values-et/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-et/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Sa juba oled jututoa liige"</string>
   <string name="screen_invite_users_already_invited">"Sa juba oled kutse saanud"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Sul pole hetkel nende kontaktidega ühtegi vestlust. Enne jätkamist kinnita neile siia jututuppa kutse saatmine."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Sul pole hetkel selle kontaktiga ühtegi vestlust. Enne jätkamist kinnita talle siia jututuppa kutse saatmine."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Kas kutsud uued kontaktid siia jututuppa?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Kas kutsud uue kontakti siia jututuppa?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-fi/translations.xml b/features/invitepeople/impl/src/main/res/values-fi/translations.xml
index e347919719..d2283c7b2a 100644
--- a/features/invitepeople/impl/src/main/res/values-fi/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-fi/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"On jo jäsen"</string>
   <string name="screen_invite_users_already_invited">"On jo kutsuttu"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Sinulla ei ole tällä hetkellä keskusteluja näiden yhteystietojen kanssa. Vahvista kutsusi heille tähän huoneeseen ennen kuin jatkat."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Sinulla ei ole tällä hetkellä keskusteluja tämän yhteystiedon kanssa. Vahvista kutsusi hänelle tähän huoneeseen ennen kuin jatkat."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Kutsutaanko uusia yhteystietoja tähän huoneeseen?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Kutsutaanko uusi yhteystieto tähän huoneeseen?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-fr/translations.xml b/features/invitepeople/impl/src/main/res/values-fr/translations.xml
index dcc16f58cf..b5df870002 100644
--- a/features/invitepeople/impl/src/main/res/values-fr/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-fr/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Déjà membre"</string>
   <string name="screen_invite_users_already_invited">"Déjà invité(e)"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Vous n’avez actuellement aucune conversation avec ces contacts. Veuillez confirmer leur invitation à rejoindre ce salon avant de continuer."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Vous n’avez actuellement aucune conversation avec ce contact. Veuillez confirmer son invitation à rejoindre ce salon avant de continuer."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Inviter de nouveaux contacts dans ce salon ?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Inviter un nouveau contact dans ce salon ?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-hr/translations.xml b/features/invitepeople/impl/src/main/res/values-hr/translations.xml
index 66031c5fd7..471b79d709 100644
--- a/features/invitepeople/impl/src/main/res/values-hr/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-hr/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Već je član"</string>
   <string name="screen_invite_users_already_invited">"Već je pozvan/a"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Trenutno nemate razgovora s ovim kontaktima. Potvrdite da ih želite pozvati u ovu sobu prije nego što nastavite."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Trenutno nemate razgovora s ovim kontaktom. Potvrdite da ste ga pozvali u ovu sobu prije nego što nastavite."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Pozvati nove kontakte u ovu sobu?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Pozvati novi kontakt u ovu sobu?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-hu/translations.xml b/features/invitepeople/impl/src/main/res/values-hu/translations.xml
index 16f35b018c..de2cab0d73 100644
--- a/features/invitepeople/impl/src/main/res/values-hu/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-hu/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Már tag"</string>
   <string name="screen_invite_users_already_invited">"Már meghívták"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Jelenleg nincsenek csevegései ezekkel a kapcsolatokkal. Mielőtt továbbmenne, erősítse meg, hogy meghívja őket ebbe a szobába."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Jelenleg nincsenek beszélgetései ezzel a személlyel. A folytatás előtt erősítse meg, hogy meghívja ebbe a szobába."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Új személyeket hív meg ebbe a szobába?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Új személyt hív meg ebbe a szobába?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-in/translations.xml b/features/invitepeople/impl/src/main/res/values-in/translations.xml
index e112033a06..f8777bf055 100644
--- a/features/invitepeople/impl/src/main/res/values-in/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-in/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Sudah menjadi anggota"</string>
   <string name="screen_invite_users_already_invited">"Sudah diundang"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Saat ini Anda belum memiliki obrolan dengan kontak-kontak ini. Konfirmasikan undangan untuk mengundang mereka ke ruang obrolan ini sebelum melanjutkan."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Saat ini Anda belum memiliki obrolan apa pun dengan kontak ini. Konfirmasikan undangan ke ruang obrolan ini sebelum melanjutkan."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Ingin mengundang kontak baru ke ruang ini?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Ingin mengundang kontak baru ke ruang ini?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-it/translations.xml b/features/invitepeople/impl/src/main/res/values-it/translations.xml
index 979e42de1b..82dc6126f1 100644
--- a/features/invitepeople/impl/src/main/res/values-it/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-it/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Già membro"</string>
   <string name="screen_invite_users_already_invited">"Già invitato"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Al momento non hai conversazioni con questi contatti. Conferma di invitarli in questa stanza prima di continuare."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Al momento non hai converszioni con questo contatto. Conferma di invitarlo in questa stanza prima di continuare."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Invita nuovi contatti in questa stanza?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Invitare un nuovo contatto in questa stanza?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-ja/translations.xml b/features/invitepeople/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..db5b91ca2b
--- /dev/null
+++ b/features/invitepeople/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invite_users_already_a_member">"既に参加しています"</string>
+  <string name="screen_invite_users_already_invited">"既に招待しています"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"これらの人物とのチャットがありません。はじめに、招待の状況を確認してください。"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"この連絡先とのチャットがありません。はじめに、招待の状況を確認してください。"</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"このルームに新しい連絡先を招待しますか？"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"このルームに新しい連絡先を招待しますか？"</string>
+</resources>
diff --git a/features/invitepeople/impl/src/main/res/values-ko/translations.xml b/features/invitepeople/impl/src/main/res/values-ko/translations.xml
index 19214c5a79..421f6d5e02 100644
--- a/features/invitepeople/impl/src/main/res/values-ko/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-ko/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"이미 회원"</string>
   <string name="screen_invite_users_already_invited">"이미 초대됨"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"이 사용자들과의 대화 내역이 없습니다. 계속하려면 먼저 이 방으로의 초대를 확인해 주세요."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"이 사용자와의 대화 내역이 없습니다. 계속하려면 먼저 이 방으로의 초대를 확인해 주세요."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"이 방에 새 사용자를 초대할까요?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"이 방에 새 사용자를 초대할까요?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-nb/translations.xml b/features/invitepeople/impl/src/main/res/values-nb/translations.xml
index 617b9271d5..81f7db3a54 100644
--- a/features/invitepeople/impl/src/main/res/values-nb/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-nb/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Allerede medlem"</string>
   <string name="screen_invite_users_already_invited">"Allerede invitert"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Du har for øyeblikket ingen samtaler med disse kontaktene. Bekreft at du vil invitere dem til dette rommet før du fortsetter."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Du har for øyeblikket ingen samtaler med denne kontakten. Bekreft at du vil invitere vedkommende til dette rommet før du fortsetter."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Vil du invitere nye kontakter til dette rommet?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Vil du invitere en ny kontakt til dette rommet?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-pl/translations.xml b/features/invitepeople/impl/src/main/res/values-pl/translations.xml
index bfd537bb4b..3e8371c1ab 100644
--- a/features/invitepeople/impl/src/main/res/values-pl/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-pl/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Jest już członkiem"</string>
   <string name="screen_invite_users_already_invited">"Już zaproszony"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Obecnie nie prowadzisz żadnych czatów z tymi kontaktami. Potwierdź zaproszenie, zanim przejdziesz dalej."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Obecnie nie posiadasz żadnych czatów z tym kontaktem. Potwierdź zaproszenie, zanim przejdziesz dalej."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Zaprosić nowe kontakty do tego pokoju?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Zaprosić nowy kontakt do tego pokoju?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-ro/translations.xml b/features/invitepeople/impl/src/main/res/values-ro/translations.xml
index f03be4b263..40189e3186 100644
--- a/features/invitepeople/impl/src/main/res/values-ro/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-ro/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Deja membru"</string>
   <string name="screen_invite_users_already_invited">"Deja invitat"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"În prezent, nu aveți nicio conversație cu aceste contacte. Confirmați invitarea lor în această cameră înainte de a continua."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"În prezent, nu aveți nicio conversație cu acest contact. Confirmați invitarea acestuia în cameră înainte de a continua."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Invitați contactele noi în această cameră?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Invitați contactul nou în această cameră?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-ru/translations.xml b/features/invitepeople/impl/src/main/res/values-ru/translations.xml
index 45e650f081..651ec33626 100644
--- a/features/invitepeople/impl/src/main/res/values-ru/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-ru/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Уже участник"</string>
   <string name="screen_invite_users_already_invited">"Уже приглашен(а)"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"У тебя пока нет чатов с этими контактами. Подтверди приглашение в эту комнату, прежде чем продолжить."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"У Вас пока нет чатов с этим контактом. Подтвердите, что это действительно тот контакт, которого Вы хотите пригласить, прежде чем продолжить."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Пригласить новых участников в эту комнату?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Пригласить нового участника в эту комнату?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-uk/translations.xml b/features/invitepeople/impl/src/main/res/values-uk/translations.xml
index da3ac9fe5b..a1ebaf7854 100644
--- a/features/invitepeople/impl/src/main/res/values-uk/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-uk/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Уже учасник"</string>
   <string name="screen_invite_users_already_invited">"Уже запрошені"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Наразі у вас немає бесід з цими контактами. Підтвердьте запрошення їх до цієї кімнати, перш ніж продовжувати."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Наразі у вас немає бесід із цим контактом. Підтвердьте запрошення до цієї кімнати, перш ніж продовжувати."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Запросити нових контактів до цієї кімнати?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Запросити нового контакта до цієї кімнати?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-uz/translations.xml b/features/invitepeople/impl/src/main/res/values-uz/translations.xml
index 445a62d318..3828033b63 100644
--- a/features/invitepeople/impl/src/main/res/values-uz/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-uz/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Allaqachon a\'zo"</string>
   <string name="screen_invite_users_already_invited">"Allaqachon taklif qilingan"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"Hozirda ushbu kontaktlar bilan hech qanday chatingiz yoʻq. Davom etishdan oldin ularni ushbu xonaga taklif qilishni tasdiqlang."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"Hozirda bu kontakt bilan hech qanday chatingiz yoʻq. Davom etishdan oldin ularni ushbu xonaga taklif qilishni tasdiqlang."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Bu xonaga yangi kontaktlar taklif qilinsinmi?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Bu xonaga yangi kontakt taklif qilinsinmi?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values-vi/translations.xml b/features/invitepeople/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..934cb7d24f
--- /dev/null
+++ b/features/invitepeople/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invite_users_already_a_member">"Đã là thành viên"</string>
+  <string name="screen_invite_users_already_invited">"Đã được mời"</string>
+</resources>
diff --git a/features/invitepeople/impl/src/main/res/values-zh/translations.xml b/features/invitepeople/impl/src/main/res/values-zh/translations.xml
index b1e0e953f8..7b1bb29288 100644
--- a/features/invitepeople/impl/src/main/res/values-zh/translations.xml
+++ b/features/invitepeople/impl/src/main/res/values-zh/translations.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"已经是成员"</string>
   <string name="screen_invite_users_already_invited">"已邀请"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"你与这些联系人暂无任何聊天。请确认对方被邀请到此房间后再继续。"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"你与此人暂无任何聊天。请确认对方被邀请到此房间后再继续。"</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"邀请新联系人到此房间？"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"邀请新联系人到此房间？"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/main/res/values/localazy.xml b/features/invitepeople/impl/src/main/res/values/localazy.xml
index d89ae92e75..aae71fe4c2 100644
--- a/features/invitepeople/impl/src/main/res/values/localazy.xml
+++ b/features/invitepeople/impl/src/main/res/values/localazy.xml
@@ -2,4 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_invite_users_already_a_member">"Already a member"</string>
   <string name="screen_invite_users_already_invited">"Already invited"</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_multiple_users">"You currently don’t have any chats with these contacts. Confirm inviting them to this room before continuing."</string>
+  <string name="screen_invite_users_confirm_dialog_subtitle_one_user">"You currently don’t have any chats with this contact. Confirm inviting them to this room before continuing."</string>
+  <string name="screen_invite_users_confirm_dialog_title_mutiple_users">"Invite new contacts to this room?"</string>
+  <string name="screen_invite_users_confirm_dialog_title_one_user">"Invite new contact to this room?"</string>
 </resources>
diff --git a/features/invitepeople/impl/src/test/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenterTest.kt b/features/invitepeople/impl/src/test/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenterTest.kt
index ab9e20437e..922fa73060 100644
--- a/features/invitepeople/impl/src/test/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenterTest.kt
+++ b/features/invitepeople/impl/src/test/kotlin/io/element/android/features/invitepeople/impl/DefaultInvitePeoplePresenterTest.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.designsystem.theme.components.SearchBarResul
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembersState
@@ -28,6 +29,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
@@ -43,6 +45,7 @@ import io.element.android.libraries.usersearch.test.FakeUserRepository
 import io.element.android.services.apperror.api.AppErrorStateService
 import io.element.android.services.apperror.test.FakeAppErrorStateService
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -56,6 +59,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
+@Suppress("LargeClass")
 internal class DefaultInvitePeoplePresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
@@ -91,7 +95,7 @@ internal class DefaultInvitePeoplePresenterTest {
             resultState.searchQuery.setTextAndPlaceCursorAtEnd("some query")
             assertThat(awaitItemAsDefault().searchQuery.text.toString()).isEqualTo("some query")
             resultState.eventSink(InvitePeopleEvents.CloseSearch)
-            skipItems(2)
+            skipItems(1)
             awaitItemAsDefault().also {
                 assertThat(it.isSearchActive).isFalse()
                 assertThat(it.searchQuery.text.toString()).isEmpty()
@@ -112,7 +116,7 @@ internal class DefaultInvitePeoplePresenterTest {
             initialState.searchQuery.setTextAndPlaceCursorAtEnd("some query")
             assertThat(repository.providedQuery).isEqualTo("some query")
             repository.emitState(UserSearchResultState(results = emptyList(), isSearching = true))
-            skipItems(3)
+            skipItems(2)
             awaitItemAsDefault().also { state ->
                 assertThat(state.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
                 assertThat(state.showSearchLoader).isTrue()
@@ -141,7 +145,6 @@ internal class DefaultInvitePeoplePresenterTest {
 
             assertThat(repository.providedQuery).isEqualTo("some query")
             repository.emitStateWithUsers(users = aMatrixUserList())
-            skipItems(1)
 
             val resultState = awaitItemAsDefault()
             assertThat(resultState.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -194,7 +197,6 @@ internal class DefaultInvitePeoplePresenterTest {
 
             assertThat(repository.providedQuery).isEqualTo("some query")
             repository.emitStateWithUsers(users = aMatrixUserList())
-            skipItems(1)
 
             val resultState = awaitItemAsDefault()
             assertThat(resultState.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -261,7 +263,6 @@ internal class DefaultInvitePeoplePresenterTest {
                     it
                 )
             })
-            skipItems(1)
 
             val resultState = awaitItemAsDefault()
             assertThat(resultState.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -316,7 +317,7 @@ internal class DefaultInvitePeoplePresenterTest {
             val initialState = awaitItemAsDefault()
             skipItems(1)
 
-            val selectedUser = aMatrixUser()
+            val selectedUser = aMatrixUser(displayName = "John Doe")
 
             initialState.eventSink(DefaultInvitePeopleEvents.ToggleUser(selectedUser))
 
@@ -325,7 +326,7 @@ internal class DefaultInvitePeoplePresenterTest {
 
             assertThat(repository.providedQuery).isEqualTo("some query")
             repository.emitStateWithUsers(users = aMatrixUserList() + selectedUser)
-            skipItems(2)
+            skipItems(1)
 
             val resultState = awaitItemAsDefault()
             assertThat(resultState.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -354,7 +355,7 @@ internal class DefaultInvitePeoplePresenterTest {
             val initialState = awaitItemAsDefault()
             skipItems(1)
 
-            val selectedUser = aMatrixUser()
+            val selectedUser = aMatrixUser(displayName = "John Doe")
 
             // Given a query is made
             initialState.searchQuery.setTextAndPlaceCursorAtEnd("some query")
@@ -362,7 +363,6 @@ internal class DefaultInvitePeoplePresenterTest {
 
             assertThat(repository.providedQuery).isEqualTo("some query")
             repository.emitStateWithUsers(users = aMatrixUserList() + selectedUser)
-            skipItems(1)
             awaitItemAsDefault().also { state ->
                 // selectedUser is not selected
                 assertThat(state.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
@@ -398,10 +398,14 @@ internal class DefaultInvitePeoplePresenterTest {
         val inviteUserResult = lambdaRecorder<UserId, Result<Unit>> { userId: UserId ->
             Result.success(Unit)
         }
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = { _ -> Result.success(null) },
+        )
         val presenter = createDefaultInvitePeoplePresenter(
             userRepository = repository,
             inviteUserResult = inviteUserResult,
-            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
+            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
+            matrixClient = FakeMatrixClient(encryptionService = encryptionService),
         )
         presenter.test {
             val initialState = awaitItem()
@@ -444,13 +448,18 @@ internal class DefaultInvitePeoplePresenterTest {
             Result.failure(AN_EXCEPTION)
         }
         val showErrorResResult = lambdaRecorder<Int, Int, Unit> { _, _ -> }
+
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = { _ -> Result.success(null) },
+        )
         val presenter = createDefaultInvitePeoplePresenter(
             userRepository = repository,
             inviteUserResult = inviteUserResult,
             coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
             appErrorStateService = FakeAppErrorStateService(
                 showErrorResResult = showErrorResResult,
-            )
+            ),
+            matrixClient = FakeMatrixClient(encryptionService = encryptionService),
         )
         presenter.test {
             val initialState = awaitItem()
@@ -527,7 +536,7 @@ internal class DefaultInvitePeoplePresenterTest {
     }
 
     @Test
-    fun `present - suggestions are loaded from recent direct rooms`() = runTest {
+    fun `present - suggestions are loaded from recent DM rooms`() = runTest {
         val dmRoomId = RoomId("!dm_room:server.org")
         val otherUserId = UserId("@frank:server.org")
         val matrixClient = FakeMatrixClient(sessionId = A_USER_ID).apply {
@@ -541,7 +550,7 @@ internal class DefaultInvitePeoplePresenterTest {
                     roomId = dmRoomId,
                     initialRoomInfo = aRoomInfo(
                         id = dmRoomId,
-                        isDirect = true,
+                        isDm = true,
                         activeMembersCount = 2,
                         currentUserMembership = CurrentUserMembership.JOINED,
                     ),
@@ -578,7 +587,7 @@ internal class DefaultInvitePeoplePresenterTest {
                     roomId = dmRoomId,
                     initialRoomInfo = aRoomInfo(
                         id = dmRoomId,
-                        isDirect = true,
+                        isDm = true,
                         activeMembersCount = 2,
                         currentUserMembership = CurrentUserMembership.JOINED,
                     ),
@@ -605,6 +614,267 @@ internal class DefaultInvitePeoplePresenterTest {
         }
     }
 
+    @Test
+    fun `present - users are prompted for confirmation if they attempt to invite unknown users`() = runTest {
+        val alice = aMatrixUser("@alice:example.com")
+        val bob = aMatrixUser("@bob:example.com")
+        val charlie = aMatrixUser("@charlie:example.com")
+
+        val getUserIdentityResult = lambdaRecorder<UserId, Result<IdentityState?>> { userId ->
+            when (userId.value) {
+                alice.userId.value -> Result.success(IdentityState.Pinned)
+                bob.userId.value -> Result.success(null)
+                else -> Result.failure(AN_EXCEPTION)
+            }
+        }
+
+        val inviteUserResult = lambdaRecorder<UserId, Result<Unit>> { userId: UserId ->
+            Result.success(Unit)
+        }
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = getUserIdentityResult
+        )
+
+        val presenter = createDefaultInvitePeoplePresenter(
+            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
+            inviteUserResult = inviteUserResult,
+            matrixClient = FakeMatrixClient(encryptionService = encryptionService),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            skipItems(1)
+
+            // When we toggle a user not in the list, they are added, and we fetch their identity.
+            initialState.eventSink(DefaultInvitePeopleEvents.ToggleUser(alice))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(bob))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(charlie))
+            delay(100)
+
+            // If we do not have their identity cached, or fail to fetch it, we should mark them as unknown.
+            awaitItemAsDefault().run {
+                assertThat(selectedUsers).containsExactly(alice, bob, charlie)
+                eventSink(InvitePeopleEvents.SendInvites)
+            }
+
+            getUserIdentityResult.assertions().isCalledExactly(3).withSequence(
+                listOf(value(alice.userId)),
+                listOf(value(bob.userId)),
+                listOf(value(charlie.userId))
+            )
+
+            // When we then try to invite these users, we should prompt for confirmation first.
+            awaitItemAsDefault().run {
+                assertThat(sendInvitesAction).isInstanceOf(ConfirmingUnknownUserInvitation::class.java)
+                assertThat(canInvite).isTrue()
+                eventSink(InvitePeopleEvents.SendInvites)
+            }
+
+            delay(1_000)
+            inviteUserResult.assertions().isCalledExactly(3).withSequence(
+                listOf(value(alice.userId)),
+                listOf(value(bob.userId)),
+                listOf(value(charlie.userId))
+            )
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - selecting remove on confirmation prompt unselects unknown users`() = runTest {
+        val alice = aMatrixUser("@alice:example.com")
+        val bob = aMatrixUser("@bob:example.com")
+        val charlie = aMatrixUser("@charlie:example.com")
+
+        val repository = FakeUserRepository()
+
+        val getUserIdentityResult = lambdaRecorder<UserId, Result<IdentityState?>> { userId ->
+            when (userId.value) {
+                alice.userId.value -> Result.success(IdentityState.Pinned)
+                bob.userId.value -> Result.success(null)
+                else -> Result.failure(AN_EXCEPTION)
+            }
+        }
+
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = getUserIdentityResult
+        )
+
+        val presenter = createDefaultInvitePeoplePresenter(
+            userRepository = repository,
+            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
+            matrixClient = FakeMatrixClient(encryptionService = encryptionService),
+        )
+        presenter.test {
+            val initialState = awaitItemAsDefault()
+            skipItems(1)
+
+            // When we toggle a user not in the list, they are added, and we fetch their identity.
+            initialState.eventSink(DefaultInvitePeopleEvents.ToggleUser(alice))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(bob))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(charlie))
+            delay(100)
+
+            // And the search is matching Alice and Bob
+            initialState.searchQuery.setTextAndPlaceCursorAtEnd("some query")
+            assertThat(repository.providedQuery).isEqualTo("some query")
+            repository.emitState(
+                UserSearchResultState(
+                    results = listOf(UserSearchResult(alice), UserSearchResult(bob)),
+                    isSearching = true
+                )
+            )
+            skipItems(2)
+
+            awaitItemAsDefault().run {
+                assertThat(selectedUsers).containsExactly(alice, bob, charlie)
+
+                // Both Alice and Bob are selected in searchResults
+                assertThat(
+                    searchResults.users().map { Pair(it.matrixUser, it.isSelected) }
+                ).containsExactly(Pair(alice, true), Pair(bob, true))
+
+                eventSink(InvitePeopleEvents.SendInvites)
+            }
+
+            getUserIdentityResult.assertions().isCalledExactly(3).withSequence(
+                listOf(value(alice.userId)),
+                listOf(value(bob.userId)),
+                listOf(value(charlie.userId))
+            )
+
+            // When we then try to invite these user, we should prompt for confirmation first.
+            awaitItemAsDefault().run {
+                assertThat(sendInvitesAction).isInstanceOf(ConfirmingUnknownUserInvitation::class.java)
+                assertThat(canInvite).isTrue()
+                eventSink(DefaultInvitePeopleEvents.RemoveUnknownUsers)
+            }
+
+            // Selecting "remove" should remove all unknown users, but keeps those who are known.
+            (awaitLastSequentialItem() as DefaultInvitePeopleState).run {
+                assertThat(sendInvitesAction.isUninitialized()).isTrue()
+                assertThat(selectedUsers).containsExactly(alice)
+
+                // Bob is no longer selected in searchResults
+                assertThat(
+                    searchResults.users().map { Pair(it.matrixUser, it.isSelected) }
+                ).containsExactly(Pair(alice, true), Pair(bob, false))
+            }
+        }
+    }
+
+    @Test
+    fun `present - dismissing confirmation prompt does not affect selection`() = runTest {
+        val alice = aMatrixUser("@alice:example.com")
+        val bob = aMatrixUser("@bob:example.com")
+        val charlie = aMatrixUser("@charlie:example.com")
+
+        val getUserIdentityResult = lambdaRecorder<UserId, Result<IdentityState?>> { userId ->
+            when (userId.value) {
+                alice.userId.value -> Result.success(IdentityState.Pinned)
+                bob.userId.value -> Result.success(null)
+                else -> Result.failure(AN_EXCEPTION)
+            }
+        }
+
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = getUserIdentityResult
+        )
+
+        val presenter = createDefaultInvitePeoplePresenter(
+            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
+            matrixClient = FakeMatrixClient(encryptionService = encryptionService),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            skipItems(1)
+
+            // When we toggle a user not in the list, they are added, and we fetch their identity.
+            initialState.eventSink(DefaultInvitePeopleEvents.ToggleUser(alice))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(bob))
+            delay(100)
+            awaitItemAsDefault().eventSink(DefaultInvitePeopleEvents.ToggleUser(charlie))
+            delay(100)
+
+            awaitItemAsDefault().run {
+                assertThat(selectedUsers).containsExactly(alice, bob, charlie)
+                eventSink(InvitePeopleEvents.SendInvites)
+            }
+
+            getUserIdentityResult.assertions().isCalledExactly(3).withSequence(
+                listOf(value(alice.userId)),
+                listOf(value(bob.userId)),
+                listOf(value(charlie.userId))
+            )
+
+            // When we then try to invite these user, we should prompt for confirmation first.
+            awaitItemAsDefault().run {
+                assertThat(sendInvitesAction).isInstanceOf(ConfirmingUnknownUserInvitation::class.java)
+                assertThat(canInvite).isTrue()
+                eventSink(DefaultInvitePeopleEvents.DismissUnknownUsersModal)
+            }
+
+            // Dismissing should not modify the selection at all
+            (awaitLastSequentialItem() as DefaultInvitePeopleState).run {
+                assertThat(sendInvitesAction.isUninitialized()).isTrue()
+                assertThat(selectedUsers).containsExactly(alice, bob, charlie)
+            }
+        }
+    }
+
+    @Test
+    fun `present - inviting someone to a DM creates a new room`() = runTest {
+        val alice = aMatrixUser("@alice:example.com")
+
+        val matrixClient = FakeMatrixClient(
+            encryptionService = FakeEncryptionService(
+                getUserIdentityResult = lambdaRecorder { userId: UserId ->
+                    Result.success(IdentityState.Pinned)
+                }
+            )
+        )
+        val presenter = createDefaultInvitePeoplePresenter(
+            coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
+            matrixClient = matrixClient,
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    initialRoomInfo = aRoomInfo(isDm = true),
+                    getMembersResult = { Result.success(listOf(aRoomMember(userId = alice.userId, membership = RoomMembershipState.JOIN))) },
+                )
+            )
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            skipItems(1)
+
+            // We want to add a new user to a DM
+            initialState.eventSink(DefaultInvitePeopleEvents.ToggleUser(alice))
+
+            // And we send the invites
+            initialState.eventSink(InvitePeopleEvents.SendInvites)
+
+            skipItems(1)
+
+            awaitItemAsDefault().run {
+                assertThat(canInvite).isTrue()
+                assertThat(sendInvitesAction.isUninitialized()).isTrue()
+                // Inviting to a DM should trigger the creation of a new room
+                assertThat(createRoomFromDmAction.isLoading()).isTrue()
+            }
+
+            awaitItemAsDefault().run {
+                assertThat(sendInvitesAction.isUninitialized()).isTrue()
+                // Once the room is created, the action should be successful
+                assertThat(createRoomFromDmAction.isSuccess()).isTrue()
+            }
+        }
+    }
+
     private suspend fun FakeUserRepository.emitStateWithUsers(
         users: List<MatrixUser>,
         isSearching: Boolean = false
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
index 1e685d3f5a..d257952209 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
@@ -44,7 +44,6 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
 import io.element.android.libraries.matrix.api.room.RoomType
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
index 7e5142321a..4bfa741321 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
@@ -15,6 +15,9 @@ import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInvit
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
@@ -134,8 +137,8 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                     joinAuthorisationStatus = JoinAuthorisationStatus.IsBanned(
                         banSender = InviteSender(
                             userId = UserId("@alice:domain"),
-                            displayName = "Alice",
-                            avatarData = AvatarData("alice", "Alice", size = AvatarSize.InviteSender),
+                            displayName = USER_NAME_ALICE,
+                            avatarData = AvatarData("alice", USER_NAME_ALICE, size = AvatarSize.InviteSender),
                             membershipChangeReason = "spamming"
                         ),
                         reason = "spamming",
@@ -222,7 +225,7 @@ fun aJoinRoomState(
 
 internal fun anInviteSender(
     userId: UserId = UserId("@bob:domain"),
-    displayName: String = "Bob",
+    displayName: String = USER_NAME_BOB,
     avatarData: AvatarData = AvatarData(userId.value, displayName, size = AvatarSize.InviteSender),
     membershipChangeReason: String? = null,
 ) = InviteSender(
@@ -234,7 +237,7 @@ internal fun anInviteSender(
 
 internal fun anInviteData(
     roomId: RoomId = A_ROOM_ID,
-    roomName: String = "Room name",
+    roomName: String = ROOM_NAME,
     isDm: Boolean = false,
 ) = InviteData(
     roomId = roomId,
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
index 35cfbb1594..977308178d 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -609,6 +609,7 @@ private fun JoinRoomTopBar(
                 val roundedCornerShape = RoundedCornerShape(8.dp)
                 val titleModifier = Modifier
                     .clip(roundedCornerShape)
+                    .semantics { heading() }
                 if (contentState.name != null) {
                     Row(
                         modifier = titleModifier,
@@ -621,10 +622,7 @@ private fun JoinRoomTopBar(
                         )
                         Text(
                             modifier = Modifier
-                                .padding(horizontal = 8.dp)
-                                .semantics {
-                                    heading()
-                                },
+                                .padding(horizontal = 8.dp),
                             text = contentState.name,
                             style = ElementTheme.typography.fontBodyLgMedium,
                             maxLines = 1,
diff --git a/features/joinroom/impl/src/main/res/values-be/translations.xml b/features/joinroom/impl/src/main/res/values-be/translations.xml
index 1986a761b0..3f8e2bac2b 100644
--- a/features/joinroom/impl/src/main/res/values-be/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-be/translations.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"Так, адмяніць"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Адхіліць і заблакіраваць"</string>
   <string name="screen_join_room_join_action">"Далучыцца"</string>
   <string name="screen_join_room_knock_action">"Націсніце, каб далучыцца"</string>
   <string name="screen_join_room_space_not_supported_description">"%1$s пакуль не падтрымлівае прасторы. Вы можаце атрымаць доступ да прастор праз вэб-старонку."</string>
diff --git a/features/joinroom/impl/src/main/res/values-ca/translations.xml b/features/joinroom/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..e26c33d40f
--- /dev/null
+++ b/features/joinroom/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"Has estat bandejat per %1$s."</string>
+  <string name="screen_join_room_ban_message">"T\'han bandejat"</string>
+  <string name="screen_join_room_ban_reason">"Motiu: %1$s."</string>
+  <string name="screen_join_room_cancel_knock_action">"Cancel·la la sol·licitud"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"Sí, cancel·la"</string>
+  <string name="screen_join_room_cancel_knock_alert_description">"Segur que vols cancel·lar la teva sol·licitud d\'unió a aquesta sala?"</string>
+  <string name="screen_join_room_cancel_knock_alert_title">"Cancel·la la sol·licitud d\'unió"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Sí, rebutja i bloqueja"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Segur que vols rebutjar la invitació d\'unió a aquesta sala? Això també evitarà que %1$s et contacti i et convidi a sales."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Rebutja la invitació i bloqueja"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Rebutja i bloqueja"</string>
+  <string name="screen_join_room_fail_message">"Ha fallat la unió"</string>
+  <string name="screen_join_room_fail_reason">"O t\'han de convidar per unir-te o hi pot haver restriccions d\'accés."</string>
+  <string name="screen_join_room_forget_action">"Oblida"</string>
+  <string name="screen_join_room_invite_required_message">"Per unir-te, necessites una invitació"</string>
+  <string name="screen_join_room_join_action">"Uneix-te"</string>
+  <string name="screen_join_room_join_restricted_message">"Pot ser que t\'hagin de convidar o hagis de ser membre d\'un espai per unir-t\'hi."</string>
+  <string name="screen_join_room_knock_action">"Envia sol·licitud d\'unió"</string>
+  <string name="screen_join_room_knock_message_description">"Missatge (opcional)"</string>
+  <string name="screen_join_room_knock_sent_description">"Rebràs una invitació per unir-te a la sala si la teva sol·licitud és acceptada."</string>
+  <string name="screen_join_room_knock_sent_title">"Sol·licitud d\'unió enviada"</string>
+  <string name="screen_join_room_loading_alert_message">"No s\'ha pogut mostrar la vista prèvia de la sala. Pot ser degut a problemes de xarxa o del servidor."</string>
+  <string name="screen_join_room_loading_alert_title">"No s\'ha pogut mostrar la vista prèvia de la sala"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s encara no admet els espais. Pots accedir-hi a través del navegador web."</string>
+  <string name="screen_join_room_space_not_supported_title">"Espais encara no compatibles"</string>
+  <string name="screen_join_room_subtitle_knock">"Clic al botó següent i s\'avisarà a un administrador de sala. Podràs unir-te un cop t\'hagi aprovat."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Per poder veure l\'historial de missatges has de ser un membre de la sala."</string>
+  <string name="screen_join_room_title_knock">"Vols unir-te a aquesta sala?"</string>
+  <string name="screen_join_room_title_no_preview">"Vista prèvia no disponible"</string>
+</resources>
diff --git a/features/joinroom/impl/src/main/res/values-in/translations.xml b/features/joinroom/impl/src/main/res/values-in/translations.xml
index b144b7f010..399cf66a94 100644
--- a/features/joinroom/impl/src/main/res/values-in/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-in/translations.xml
@@ -15,6 +15,10 @@
   <string name="screen_join_room_fail_reason">"Ruangan ini hanya untuk undangan atau mungkin ada pembatasan akses pada tingkat space."</string>
   <string name="screen_join_room_forget_action">"Lupa"</string>
   <string name="screen_join_room_invite_required_message">"Anda memerlukan undangan untuk bergabung dalam ruangan ini"</string>
+  <string name="screen_join_room_invited_by">
+    "Diundang oleh "
+    <userName/>
+  </string>
   <string name="screen_join_room_join_action">"Gabung"</string>
   <string name="screen_join_room_join_restricted_message">"Anda mungkin perlu diundang atau menjadi anggota space untuk bergabung."</string>
   <string name="screen_join_room_knock_action">"Ketuk untuk bergabung"</string>
diff --git a/features/joinroom/impl/src/main/res/values-ja/translations.xml b/features/joinroom/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..f5bb2e3b66
--- /dev/null
+++ b/features/joinroom/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"%1$s があなたを追放しました。"</string>
+  <string name="screen_join_room_ban_message">"追放されました"</string>
+  <string name="screen_join_room_ban_reason">"理由: %1$s"</string>
+  <string name="screen_join_room_cancel_knock_action">"リクエストをキャンセル"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"キャンセルします"</string>
+  <string name="screen_join_room_cancel_knock_alert_description">"このルームへの参加のリクエストを本当にキャンセルしますか？"</string>
+  <string name="screen_join_room_cancel_knock_alert_title">"参加のリクエストをキャンセル"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"拒否してブロックする"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"本当にこのルームへの参加の招待を拒否しますか？%1$s は、あなたと会話することやルームに招待することができなくなります。"</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"招待を拒否してブロック"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"拒否してブロック"</string>
+  <string name="screen_join_room_fail_message">"参加に失敗"</string>
+  <string name="screen_join_room_fail_reason">"制限付きアクセスまたは招待制です。"</string>
+  <string name="screen_join_room_forget_action">"忘れる"</string>
+  <string name="screen_join_room_invite_required_message">"参加するには招待が必要です"</string>
+  <string name="screen_join_room_invited_by">"以下のユーザーからの招待"</string>
+  <string name="screen_join_room_join_action">"参加"</string>
+  <string name="screen_join_room_join_restricted_message">"参加するには、招待またはスペースのメンバーである必要があります。"</string>
+  <string name="screen_join_room_knock_action">"参加をリクエスト"</string>
+  <string name="screen_join_room_knock_message_characters_count">"文字数制限 %1$d/%2$d 字"</string>
+  <string name="screen_join_room_knock_message_description">"メッセージ (任意)"</string>
+  <string name="screen_join_room_knock_sent_description">"リクエストが承認された場合はルームへの招待が届きます。"</string>
+  <string name="screen_join_room_knock_sent_title">"参加リクエストを送信しました"</string>
+  <string name="screen_join_room_loading_alert_message">"ルームのプレビューを表示できません。サーバーまたはネットワークの問題の可能性があります。"</string>
+  <string name="screen_join_room_loading_alert_title">"ルームのプレビューを表示できません"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s はスペースに対応していません。Webからアクセスすることができます。"</string>
+  <string name="screen_join_room_space_not_supported_title">"まだスペースに対応していません"</string>
+  <string name="screen_join_room_subtitle_knock">"下のボタンを押すとルーム管理者に通知が届きます。承認の後、会話に参加することができます。"</string>
+  <string name="screen_join_room_subtitle_no_preview">"過去のメッセージを表示するには、このルームのメンバーである必要があります。"</string>
+  <string name="screen_join_room_title_knock">"ルームに参加しますか？"</string>
+  <string name="screen_join_room_title_no_preview">"プレビューは利用できません"</string>
+</resources>
diff --git a/features/joinroom/impl/src/main/res/values-ru/translations.xml b/features/joinroom/impl/src/main/res/values-ru/translations.xml
index 9add5f4790..eda089b5c2 100644
--- a/features/joinroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-ru/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"%1$s заблокировал(а) вас в комнате."</string>
+  <string name="screen_join_room_ban_by_message">"%1$s заблокировал(а) Вас в комнате."</string>
   <string name="screen_join_room_ban_message">"Вы были заблокированы в комнате"</string>
   <string name="screen_join_room_ban_reason">"Причина: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Отменить запрос"</string>
@@ -27,7 +27,7 @@
   <string name="screen_join_room_loading_alert_title">"Не удалось показать предпросмотр комнаты"</string>
   <string name="screen_join_room_space_not_supported_description">"%1$s еще не поддерживает пространства. Вы можете получить к ним доступ в веб-версии."</string>
   <string name="screen_join_room_space_not_supported_title">"Пространства пока не поддерживаются"</string>
-  <string name="screen_join_room_subtitle_knock">"Нажмите кнопку ниже и администратор комнаты получит уведомление. После одобрения вы сможете присоединиться к обсуждению."</string>
+  <string name="screen_join_room_subtitle_knock">"Нажмите кнопку ниже и администратор комнаты получит уведомление. После одобрения Вы сможете присоединиться к беседе."</string>
   <string name="screen_join_room_subtitle_no_preview">"Вы должны быть участником этой комнаты, чтобы просмотреть историю сообщений."</string>
   <string name="screen_join_room_title_knock">"Хотите присоединиться к этой комнате?"</string>
   <string name="screen_join_room_title_no_preview">"Предпросмотр недоступен"</string>
diff --git a/features/joinroom/impl/src/main/res/values-uk/translations.xml b/features/joinroom/impl/src/main/res/values-uk/translations.xml
index ec2a24950a..1a83a6ca8c 100644
--- a/features/joinroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-uk/translations.xml
@@ -15,6 +15,7 @@
   <string name="screen_join_room_fail_reason">"Вам потрібно отримати запрошення, щоб приєднатися, інакше доступ може бути обмежений."</string>
   <string name="screen_join_room_forget_action">"Забути"</string>
   <string name="screen_join_room_invite_required_message">"Вам потрібне запрошення, щоб приєднатися"</string>
+  <string name="screen_join_room_invited_by">"Запрошено користувачем"</string>
   <string name="screen_join_room_join_action">"Доєднатися"</string>
   <string name="screen_join_room_join_restricted_message">"Можливо, вам знадобиться отримати запрошення або стати учасником простору, щоб приєднатися."</string>
   <string name="screen_join_room_knock_action">"Постукати, щоб приєднатися"</string>
diff --git a/features/joinroom/impl/src/main/res/values-vi/translations.xml b/features/joinroom/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..bf5c33ba66
--- /dev/null
+++ b/features/joinroom/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"Bạn đã bị cấm bởi %1$s ."</string>
+  <string name="screen_join_room_ban_message">"Bạn đã bị cấm"</string>
+  <string name="screen_join_room_cancel_knock_action">"Hủy yêu cầu"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"Có, hủy"</string>
+  <string name="screen_join_room_cancel_knock_alert_description">"Bạn có chắc chắn muốn hủy yêu cầu tham gia phòng này không?"</string>
+  <string name="screen_join_room_cancel_knock_alert_title">"Hủy yêu cầu tham gia"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Có, từ chối &amp; chặn"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Bạn có chắc muốn từ chối lời mời tham gia phòng này không? Điều này cũng sẽ ngăn %1$s liên hệ với bạn hoặc mời bạn vào các phòng."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Từ chối lời mời và chặn"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Từ chối và chặn"</string>
+  <string name="screen_join_room_invited_by">"Được mời bởi"</string>
+  <string name="screen_join_room_join_action">"Tham gia"</string>
+  <string name="screen_join_room_knock_message_characters_count">"Số ký tự cho phép: %1$d / %2$d"</string>
+  <string name="screen_join_room_knock_message_description">"Lời nhắn (tùy chọn)"</string>
+  <string name="screen_join_room_knock_sent_description">"Bạn sẽ nhận được lời mời tham gia phòng nếu yêu cầu của bạn được chấp nhận."</string>
+  <string name="screen_join_room_knock_sent_title">"Yêu cầu tham gia đã được gửi"</string>
+  <string name="screen_join_room_loading_alert_message">"Không thể hiển thị bản xem trước của phòng. Có thể do lỗi mạng hoặc máy chủ."</string>
+  <string name="screen_join_room_loading_alert_title">"Không thể hiển thị bản xem trước của phòng này"</string>
+</resources>
diff --git a/features/joinroom/impl/src/main/res/values-zh/translations.xml b/features/joinroom/impl/src/main/res/values-zh/translations.xml
index 7bea362c81..e4de8dfec4 100644
--- a/features/joinroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-zh/translations.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"您已被禁止访问%1$s。"</string>
-  <string name="screen_join_room_ban_message">"你已被禁止访问"</string>
+  <string name="screen_join_room_ban_by_message">"你已被 %1$s 封禁。"</string>
+  <string name="screen_join_room_ban_message">"你已被此房间封禁"</string>
   <string name="screen_join_room_ban_reason">"理由：%1$s。"</string>
-  <string name="screen_join_room_cancel_knock_action">"取消请求"</string>
-  <string name="screen_join_room_cancel_knock_alert_confirmation">"是的，取消"</string>
-  <string name="screen_join_room_cancel_knock_alert_description">"您确定要取消加入此房间的请求吗？"</string>
+  <string name="screen_join_room_cancel_knock_action">"取消申请"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"是，取消"</string>
+  <string name="screen_join_room_cancel_knock_alert_description">"你确定要取消加入此房间的申请？"</string>
   <string name="screen_join_room_cancel_knock_alert_title">"取消加入申请"</string>
-  <string name="screen_join_room_decline_and_block_alert_confirmation">"是的，拒绝并屏蔽"</string>
-  <string name="screen_join_room_decline_and_block_alert_message">"您确定要拒绝加入此房间的邀请吗？这也将阻止%1$s 与您联系或邀请您加入房间。"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"是，拒绝并屏蔽"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"你确定要拒绝此房间的加入邀请？这也将阻止 %1$s 与你联系或邀请你加入房间。"</string>
   <string name="screen_join_room_decline_and_block_alert_title">"拒绝邀请并屏蔽"</string>
   <string name="screen_join_room_decline_and_block_button_title">"拒绝并屏蔽"</string>
   <string name="screen_join_room_fail_message">"加入失败"</string>
-  <string name="screen_join_room_fail_reason">"您需要被邀请加入，否则可能会受到访问限制。"</string>
+  <string name="screen_join_room_fail_reason">"你需要被邀请才能加入，否则可能会遭遇访问限制。"</string>
   <string name="screen_join_room_forget_action">"忘记"</string>
-  <string name="screen_join_room_invite_required_message">"您需要邀请才能加入"</string>
+  <string name="screen_join_room_invite_required_message">"你需要被邀请才能加入"</string>
   <string name="screen_join_room_invited_by">"受邀于"</string>
   <string name="screen_join_room_join_action">"加入"</string>
-  <string name="screen_join_room_join_restricted_message">"您可能需要受到邀请或成为某个空间的成员才能加入。"</string>
-  <string name="screen_join_room_knock_action">"加入聊天室"</string>
-  <string name="screen_join_room_knock_message_characters_count">"允许的字符数量 %2$d中的%1$d"</string>
+  <string name="screen_join_room_join_restricted_message">"你可能需要被邀请或成为某个空间的成员才能加入。"</string>
+  <string name="screen_join_room_knock_action">"加入房间"</string>
+  <string name="screen_join_room_knock_message_characters_count">"允许的字符数量共 %2$d 个，当前为 %1$d 个"</string>
   <string name="screen_join_room_knock_message_description">"消息（可选）"</string>
-  <string name="screen_join_room_knock_sent_description">"如果您的请求被接受，您将收到加入房间的邀请。"</string>
-  <string name="screen_join_room_knock_sent_title">"加入请求已发送"</string>
+  <string name="screen_join_room_knock_sent_description">"如果你的申请被批准，你将收到加入房间的邀请。"</string>
+  <string name="screen_join_room_knock_sent_title">"加入申请已发送"</string>
   <string name="screen_join_room_loading_alert_message">"无法显示房间预览。这可能是由于网络或服务器问题造成的。"</string>
   <string name="screen_join_room_loading_alert_title">"无法显示此房间预览"</string>
-  <string name="screen_join_room_space_not_supported_description">"%1$s 尚不支持空间。您可以通过 Web 端访问空间"</string>
-  <string name="screen_join_room_space_not_supported_title">"空间尚不支持"</string>
-  <string name="screen_join_room_subtitle_knock">"点击下面的按钮，系统将通知聊天室管理员。获得批准后将能够加入对话。"</string>
-  <string name="screen_join_room_subtitle_no_preview">"只有聊天室成员才能查看消息历史记录。"</string>
-  <string name="screen_join_room_title_knock">"想加入这个聊天室吗？"</string>
+  <string name="screen_join_room_space_not_supported_description">"%1$s 暂不支持空间。你可以通过 Web 客户端访问空间。"</string>
+  <string name="screen_join_room_space_not_supported_title">"空间尚未受到支持"</string>
+  <string name="screen_join_room_subtitle_knock">"点击以下按钮以通知房间管理员。获得批准后你将能加入对话。"</string>
+  <string name="screen_join_room_subtitle_no_preview">"只有房间成员才能查看消息历史。"</string>
+  <string name="screen_join_room_title_knock">"想加入此房间吗？"</string>
   <string name="screen_join_room_title_no_preview">"预览不可用"</string>
 </resources>
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
index 0a3b1ca3c6..0c510cacdb 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.joinroom.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.test.anInviteData
 import io.element.android.libraries.architecture.AsyncAction
@@ -26,116 +28,111 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class JoinRoomViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class JoinRoomViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke the expected callback`() {
+    fun `clicking on back invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setJoinRoomView(
+            setJoinRoomView(
                 aJoinRoomState(
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on Join room on CanJoin room emits the expected Event`() {
+    fun `clicking on Join room on CanJoin room emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_join_room_join_action)
+        clickOn(R.string.screen_join_room_join_action)
         eventsRecorder.assertSingle(JoinRoomEvents.JoinRoom)
     }
 
     @Test
-    fun `clicking on Knock room on CanKnock room emits the expected Event`() {
+    fun `clicking on Knock room on CanKnock room emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock),
                 knockMessage = "Knock knock",
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_join_room_knock_action)
+        clickOn(R.string.screen_join_room_knock_action)
         eventsRecorder.assertSingle(JoinRoomEvents.KnockRoom)
     }
 
     @Test
-    fun `clicking on closing Knock error emits the expected Event`() {
+    fun `clicking on closing Knock error emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock),
                 knockAction = AsyncAction.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(JoinRoomEvents.ClearActionStates)
     }
 
     @Test
-    fun `clicking on cancel knock request emit the expected Event`() {
+    fun `clicking on cancel knock request emit the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsKnocked),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_join_room_cancel_knock_action)
+        clickOn(R.string.screen_join_room_cancel_knock_action)
         eventsRecorder.assertSingle(JoinRoomEvents.CancelKnock(true))
     }
 
     @Test
-    fun `clicking on closing Cancel Knock error emits the expected Event`() {
+    fun `clicking on closing Cancel Knock error emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsKnocked),
                 cancelKnockAction = AsyncAction.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(JoinRoomEvents.ClearActionStates)
     }
 
     @Test
-    fun `clicking on closing Join error emits the expected Event`() {
+    fun `clicking on closing Join error emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanKnock),
                 joinAction = AsyncAction.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(JoinRoomEvents.ClearActionStates)
     }
 
     @Test
-    fun `when joining room is successful, the expected callback is invoked`() {
+    fun `when joining room is successful, the expected callback is invoked`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setJoinRoomView(
+            setJoinRoomView(
                 aJoinRoomState(
                     joinAction = AsyncAction.Success(Unit),
                     eventSink = eventsRecorder,
@@ -146,53 +143,55 @@ class JoinRoomViewTest {
     }
 
     @Test
-    fun `clicking on Accept when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
+    fun `clicking on Accept when JoinAuthorisationStatus is IsInvited emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
         val inviteData = anInviteData()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, null)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_accept)
+        clickOn(CommonStrings.action_accept)
         eventsRecorder.assertSingle(JoinRoomEvents.AcceptInvite(inviteData))
     }
 
     @Test
-    fun `clicking on Decline when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
+    fun `clicking on Decline when JoinAuthorisationStatus is IsInvited emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
         val inviteData = anInviteData()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, null)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(inviteData, false))
     }
 
     @Test
     fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited and can report room, the expected callback is invoked`() {
-        val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
-        val inviteData = anInviteData()
-        val joinRoomState = aJoinRoomState(
-            contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, aRoomMember().toInviteSender())),
-            canReportRoom = true,
-            eventSink = eventsRecorder,
-        )
-        ensureCalledOnceWithParam(inviteData) {
-            rule.setJoinRoomView(
-                state = joinRoomState,
-                onDeclineInviteAndBlockUser = it,
+        runAndroidComposeUiTest {
+            val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
+            val inviteData = anInviteData()
+            val joinRoomState = aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, aRoomMember().toInviteSender())),
+                canReportRoom = true,
+                eventSink = eventsRecorder,
             )
-            rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
+            ensureCalledOnceWithParam(inviteData) {
+                setJoinRoomView(
+                    state = joinRoomState,
+                    onDeclineInviteAndBlockUser = it,
+                )
+                clickOn(R.string.screen_join_room_decline_and_block_button_title)
+            }
         }
     }
 
     @Test
-    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited and cant report room, emits the expected Event`() {
+    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited and cant report room, emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
         val inviteData = anInviteData()
         val joinRoomState = aJoinRoomState(
@@ -200,29 +199,29 @@ class JoinRoomViewTest {
             canReportRoom = false,
             eventSink = eventsRecorder,
         )
-        rule.setJoinRoomView(state = joinRoomState)
-        rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
+        setJoinRoomView(state = joinRoomState)
+        clickOn(R.string.screen_join_room_decline_and_block_button_title)
         eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(inviteData, true))
     }
 
     @Test
-    fun `clicking on Retry when an error occurs emits the expected Event`() {
+    fun `clicking on Retry when an error occurs emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aFailureContentState(),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_retry)
+        clickOn(CommonStrings.action_retry)
         eventsRecorder.assertSingle(JoinRoomEvents.RetryFetchingContent)
     }
 
     @Test
-    fun `clicking on ok when user is unauthorized the expected callback`() {
+    fun `clicking on ok when user is unauthorized the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setJoinRoomView(
+            setJoinRoomView(
                 aJoinRoomState(
                     contentState = aLoadedContentState(),
                     joinAction = AsyncAction.Failure(JoinRoom.Failures.UnauthorizedJoin),
@@ -230,25 +229,25 @@ class JoinRoomViewTest {
                 ),
                 onBackClick = it
             )
-            rule.clickOn(CommonStrings.action_ok)
+            clickOn(CommonStrings.action_ok)
         }
     }
 
     @Test
-    fun `clicking on forget when user is banned invokes the expected callback`() {
+    fun `clicking on forget when user is banned invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
+        setJoinRoomView(
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsBanned(null, null)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_join_room_forget_action)
+        clickOn(R.string.screen_join_room_forget_action)
         eventsRecorder.assertSingle(JoinRoomEvents.ForgetRoom)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinRoomView(
+private fun AndroidComposeUiTest<ComponentActivity>.setJoinRoomView(
     state: JoinRoomState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onJoinSuccess: () -> Unit = EnsureNeverCalled(),
diff --git a/features/knockrequests/impl/build.gradle.kts b/features/knockrequests/impl/build.gradle.kts
index 6f030479f5..e6a1a30167 100644
--- a/features/knockrequests/impl/build.gradle.kts
+++ b/features/knockrequests/impl/build.gradle.kts
@@ -33,9 +33,7 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.featureflag.api)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.featureflag.test)
 }
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
index 67f1aaae8f..7210e783fe 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
@@ -11,6 +11,9 @@ package io.element.android.features.knockrequests.impl.banner
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
 import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CHARLIE
 import kotlinx.collections.immutable.toImmutableList
 
 class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsBannerState> {
@@ -29,15 +32,15 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             aKnockRequestsBannerState(
                 knockRequests = listOf(
                     aKnockRequestPresentable(),
-                    aKnockRequestPresentable(displayName = "Alice")
+                    aKnockRequestPresentable(displayName = USER_NAME_ALICE)
                 )
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
                     aKnockRequestPresentable(),
-                    aKnockRequestPresentable(displayName = "Alice"),
-                    aKnockRequestPresentable(displayName = "Bob"),
-                    aKnockRequestPresentable(displayName = "Charlie")
+                    aKnockRequestPresentable(displayName = USER_NAME_ALICE),
+                    aKnockRequestPresentable(displayName = USER_NAME_BOB),
+                    aKnockRequestPresentable(displayName = USER_NAME_CHARLIE)
                 )
             ),
             aKnockRequestsBannerState(
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
index b51b78f105..73e4a2ddeb 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
@@ -15,8 +15,6 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.api.knockRequestPermissions
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
 
@@ -25,14 +23,13 @@ import io.element.android.libraries.matrix.api.room.powerlevels.permissionsFlow
 object KnockRequestsModule {
     @Provides
     @SingleIn(RoomScope::class)
-    fun knockRequestsService(room: JoinedRoom, featureFlagService: FeatureFlagService): KnockRequestsService {
+    fun knockRequestsService(room: JoinedRoom): KnockRequestsService {
         return KnockRequestsService(
             knockRequestsFlow = room.knockRequestsFlow,
             permissionsFlow = room.permissionsFlow(KnockRequestPermissions.DEFAULT) { perms ->
                 perms.knockRequestPermissions()
             },
-            isKnockFeatureEnabledFlow = featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock),
-            coroutineScope = room.roomCoroutineScope
+            coroutineScope = room.roomCoroutineScope,
         )
     }
 }
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt
index 98570e6b28..00e0a30563 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt
@@ -12,7 +12,6 @@ import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -28,26 +27,20 @@ import kotlinx.coroutines.supervisorScope
 class KnockRequestsService(
     knockRequestsFlow: Flow<List<KnockRequest>>,
     permissionsFlow: Flow<KnockRequestPermissions>,
-    isKnockFeatureEnabledFlow: Flow<Boolean>,
     coroutineScope: CoroutineScope,
 ) {
     // Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them.
     private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet())
 
     val knockRequestsFlow = combine(
-        isKnockFeatureEnabledFlow,
         knockRequestsFlow,
         handledKnockRequestIds,
-    ) { isKnockEnabled, knockRequests, handledKnockIds ->
-        if (!isKnockEnabled) {
-            AsyncData.Success(persistentListOf())
-        } else {
-            val presentableKnockRequests = knockRequests
-                .filter { it.eventId !in handledKnockIds }
-                .map { inner -> KnockRequestWrapper(inner) }
-                .toImmutableList()
-            AsyncData.Success(presentableKnockRequests)
-        }
+    ) { knockRequests, handledKnockIds ->
+        val presentableKnockRequests = knockRequests
+            .filter { it.eventId !in handledKnockIds }
+            .map { inner -> KnockRequestWrapper(inner) }
+            .toImmutableList()
+        AsyncData.Success(presentableKnockRequests)
     }.stateIn(coroutineScope, SharingStarted.Lazily, AsyncData.Loading())
 
     val permissionsFlow = permissionsFlow.stateIn(
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt
index 1ccc0742d6..db40596892 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
@@ -73,6 +74,8 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 
@@ -94,7 +97,8 @@ fun KnockRequestsListView(
                     .padding(padding)
                     .consumeWindowInsets(padding),
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     )
 }
 
@@ -132,7 +136,7 @@ private fun KnockRequestsListContent(
                         onAcceptClick = ::onAcceptClick,
                         onDeclineClick = ::onDeclineClick,
                         onBanClick = ::onBanClick,
-                        contentPadding = PaddingValues(bottom = bottomPaddingInPixels.toDp()),
+                        contentPadding = lazyColumnContentPadding + PaddingValues(bottom = bottomPaddingInPixels.toDp()),
                     )
                 }
             }
diff --git a/features/knockrequests/impl/src/main/res/values-be/translations.xml b/features/knockrequests/impl/src/main/res/values-be/translations.xml
index e6f08bc320..5fcb54e9af 100644
--- a/features/knockrequests/impl/src/main/res/values-be/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-be/translations.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_decline_alert_title">"Адхіліць доступ"</string>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Паглядзець усе"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"Прыняць"</string>
 </resources>
diff --git a/features/knockrequests/impl/src/main/res/values-ca/translations.xml b/features/knockrequests/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..bdf1cac21b
--- /dev/null
+++ b/features/knockrequests/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"Sí, accepta-les totes"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"Segur que vols acceptar totes les sol·licituds d\'unió?"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"Accepta totes les sol·licituds"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Accepta-les totes"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"No s\'han pogut acceptar totes les sol·licituds. Vols tornar-ho a intentar?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"No s\'han pogut acceptar totes les sol·licituds"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"Acceptant totes les sol·licituds d\'unió"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"No s\'ha pogut acceptar la sol·licitud. Vols tornar-ho a intentar?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"No s\'ha pogut acceptar la sol·licitud"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"Acceptant sol·licitud d\'unió"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Sí, rebutja i bandeja"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Segur que vols rebutjar i bandejar %1$s? L\'usuari no podrà sol·licitar de nou l\'accés d\'unió a aquesta sala."</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"Rebutja i bandeja l\'accés"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"Rebutjant i bandejant l\'accés"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Sí, rebutja"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"Segur que vols rebutjar %1$s d\'unir-se a aquesta sala?"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"Rebutja l\'accés"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Rebutja i bandeja"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"No s\'ha pogut rebutjar la sol·licitud. Vols tornar-ho a intentar?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"No s\'ha pogut rebutjar la sol·licitud"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"Rebutjant sol·licitud d\'unió"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"Quan algú demani unir-se a la sala, aquí podràs veure la sol·licitud."</string>
+  <string name="screen_knock_requests_list_empty_state_title">"No hi ha sol·licituds d\'unió pendents"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"Carregant sol·licituds d\'unió…"</string>
+  <string name="screen_knock_requests_list_title">"Sol·licituds d\'unió"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="one">"%1$s +%2$d altre volen unir-se a la sala"</item>
+    <item quantity="other">"%1$s +%2$d altres volen unir-se a la sala"</item>
+  </plurals>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"Veure totes"</string>
+  <string name="screen_room_single_knock_request_accept_button_title">"Accepta"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s vol unir-se a aquesta sala"</string>
+</resources>
diff --git a/features/knockrequests/impl/src/main/res/values-ja/translations.xml b/features/knockrequests/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..d08d4f3c20
--- /dev/null
+++ b/features/knockrequests/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"すべて承認"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"本当にすべての参加リクエストを承認しますか？"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"すべてのリクエストを承認"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"すべて承認"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"リクエストの一部を承認できませんでした。もう一度試しますか？"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"リクエストの承認に一部失敗"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"すべてのリクエストを承認中"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"リクエストを承認できませんでした。もう一度試しますか？"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"リクエストの承認に失敗"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"リクエストを承認中"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"拒否して追放する"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"本当に %1$s を拒否して追放しますか？このユーザーが再度リクエストを送信することはできなくなります。"</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"拒否してアクセスから追放"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"拒否してアクセスから追放中"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"拒否する"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"本当に %1$s の参加リクエストを拒否しますか？"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"アクセスを拒否"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"拒否と追放"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"このリクエストを拒否できません。もう一度試しますか？"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"リクエストの拒否に失敗"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"参加リクエストを拒否中"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"ルームへの参加リクエストがある場合は、ここに表示されます。"</string>
+  <string name="screen_knock_requests_list_empty_state_title">"参加リクエストがありません"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"参加リクエストを読み込み中"</string>
+  <string name="screen_knock_requests_list_title">"参加のリクエスト"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="other">"%1$s 他 %2$d 人がルーム参加を希望"</item>
+  </plurals>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"すべて表示"</string>
+  <string name="screen_room_single_knock_request_accept_button_title">"承諾"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s がこのルームの参加を要求しています"</string>
+  <string name="screen_room_single_knock_request_view_button_title">"表示"</string>
+</resources>
diff --git a/features/knockrequests/impl/src/main/res/values-ru/translations.xml b/features/knockrequests/impl/src/main/res/values-ru/translations.xml
index 22d400cc50..ee3c31ebb3 100644
--- a/features/knockrequests/impl/src/main/res/values-ru/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-ru/translations.xml
@@ -4,10 +4,10 @@
   <string name="screen_knock_requests_list_accept_all_alert_description">"Вы действительно хотите принять все заявки на присоединение?"</string>
   <string name="screen_knock_requests_list_accept_all_alert_title">"Принять все запросы"</string>
   <string name="screen_knock_requests_list_accept_all_button_title">"Принять все"</string>
-  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Мы не смогли принять все запросы. Попробовать еще раз?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Мы не смогли принять все запросы. Попробовать ещё раз?"</string>
   <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Не удалось принять все запросы"</string>
   <string name="screen_knock_requests_list_accept_all_loading_title">"Принять все заявки на присоединение"</string>
-  <string name="screen_knock_requests_list_accept_failed_alert_description">"Мы не смогли принять этот запрос. Хотите попробовать еще раз?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Мы не смогли принять этот запрос. Хотите попробовать ещё раз?"</string>
   <string name="screen_knock_requests_list_accept_failed_alert_title">"Не удалось принять запрос"</string>
   <string name="screen_knock_requests_list_accept_loading_title">"Принятие заявки на присоединение"</string>
   <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Да, отклонить и запретить"</string>
@@ -18,7 +18,7 @@
   <string name="screen_knock_requests_list_decline_alert_description">"Вы уверены, что хотите отклонить запрос %1$s на присоединение к этой комнате?"</string>
   <string name="screen_knock_requests_list_decline_alert_title">"Отклонить доступ"</string>
   <string name="screen_knock_requests_list_decline_and_ban_action_title">"Отклонить и запретить"</string>
-  <string name="screen_knock_requests_list_decline_failed_alert_description">"Мы не смогли отклонить этот запрос. Попробовать еще раз?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Мы не смогли отклонить этот запрос. Попробовать ещё раз?"</string>
   <string name="screen_knock_requests_list_decline_failed_alert_title">"Не удалось отклонить запрос"</string>
   <string name="screen_knock_requests_list_decline_loading_title">"Отклонение заявки на присоединение"</string>
   <string name="screen_knock_requests_list_empty_state_description">"Вы сможете увидеть запрос, когда кто-то попросит присоединиться к комнате."</string>
diff --git a/features/knockrequests/impl/src/main/res/values-vi/translations.xml b/features/knockrequests/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..ab7c39c2ef
--- /dev/null
+++ b/features/knockrequests/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"Có, chấp nhận tất cả"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"Bạn có chắc chắn muốn chấp nhận tất cả các yêu cầu tham gia không?"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"Chấp nhận tất cả các yêu cầu"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"Chấp nhận tất cả"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Không thể chấp nhận tất cả yêu cầu. Bạn có muốn thử lại không?"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Chấp nhận tất cả yêu cầu thất bại"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"Đang duyệt tất cả yêu cầu tham gia"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Không thể chấp nhận yêu cầu này. Bạn có muốn thử lại không?"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"Chấp nhận yêu cầu thất bại"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"Đang duyệt yêu cầu tham gia"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Có, từ chối và cấm"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"Bạn có chắc muốn từ chối và cấm %1$s không? Người dùng này sẽ không thể yêu cầu tham gia phòng này nữa"</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"Từ chối và cấm truy cập"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"Đang từ chối và chặn truy cập"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"Có, từ chối"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"Bạn có chắc muốn từ chối yêu cầu tham gia phòng của %1$s không?"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"Từ chối truy cập"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"Từ chối và chặn"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Không thể từ chối yêu cầu. Bạn có muốn thử lại không?"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"Từ chối yêu cầu thất bại"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"Đang từ chối yêu cầu tham gia"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"Khi ai đó xin vào phòng, bạn sẽ thấy yêu cầu ở đây."</string>
+  <string name="screen_knock_requests_list_empty_state_title">"Không có yêu cầu tham gia nào đang chờ xử lý"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"Đang tải các yêu cầu tham gia…"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="other">"%1$s + %2$d người khác muốn tham gia phòng này"</item>
+  </plurals>
+  <string name="screen_room_single_knock_request_accept_button_title">"Đồng ý"</string>
+  <string name="screen_room_single_knock_request_view_button_title">"Xem"</string>
+</resources>
diff --git a/features/knockrequests/impl/src/main/res/values-zh/translations.xml b/features/knockrequests/impl/src/main/res/values-zh/translations.xml
index f568ee1120..d8b8f76b13 100644
--- a/features/knockrequests/impl/src/main/res/values-zh/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-zh/translations.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"是的，全部接受"</string>
-  <string name="screen_knock_requests_list_accept_all_alert_description">"您确定要接受所有加入请求吗？"</string>
-  <string name="screen_knock_requests_list_accept_all_alert_title">"接受所有请求"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"是，全部接受"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_description">"你确定要接受所有加入申请？"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"接受所有申请"</string>
   <string name="screen_knock_requests_list_accept_all_button_title">"全部接受"</string>
-  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"我们无法接受所有请求。是否要再试一次？"</string>
-  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"无法接受所有请求"</string>
-  <string name="screen_knock_requests_list_accept_all_loading_title">"接受所有加入请求"</string>
-  <string name="screen_knock_requests_list_accept_failed_alert_description">"我们无法接受此请求。是否要再试一次？"</string>
-  <string name="screen_knock_requests_list_accept_failed_alert_title">"无法接受请求"</string>
-  <string name="screen_knock_requests_list_accept_loading_title">"接受加入请求"</string>
-  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"是的，拒绝并禁止"</string>
-  <string name="screen_knock_requests_list_ban_alert_description">"您确定要拒绝并禁止吗%1$s？该用户将无法再次请求加入该房间。"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_description">"我们无法接受所有申请。是否重试？"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"无法接受所有申请"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"接受所有加入申请"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"我们无法接受此申请。是否重试？"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"无法接受申请"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"接受加入申请"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"是，拒绝并禁止"</string>
+  <string name="screen_knock_requests_list_ban_alert_description">"你确定要拒绝并封禁 %1$s？该用户将无法再次申请加入该房间。"</string>
   <string name="screen_knock_requests_list_ban_alert_title">"拒绝并禁止访问"</string>
   <string name="screen_knock_requests_list_ban_loading_title">"拒绝并禁止访问"</string>
-  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"是的，拒绝"</string>
-  <string name="screen_knock_requests_list_decline_alert_description">"您确定要拒绝 %1$s 加入此房间的请求吗？"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"是，拒绝"</string>
+  <string name="screen_knock_requests_list_decline_alert_description">"你确定要拒绝 %1$s 加入此房间的申请？"</string>
   <string name="screen_knock_requests_list_decline_alert_title">"拒绝访问"</string>
-  <string name="screen_knock_requests_list_decline_and_ban_action_title">"拒绝和禁止"</string>
-  <string name="screen_knock_requests_list_decline_failed_alert_description">"我们无法拒绝此请求。是否要再试一次？"</string>
-  <string name="screen_knock_requests_list_decline_failed_alert_title">"拒绝请求失败"</string>
-  <string name="screen_knock_requests_list_decline_loading_title">"拒绝加入请求"</string>
-  <string name="screen_knock_requests_list_empty_state_description">"当有人请求加入房间时，您将能够在这里看到他们的请求。"</string>
-  <string name="screen_knock_requests_list_empty_state_title">"没有待处理的加入请求"</string>
-  <string name="screen_knock_requests_list_initial_loading_title">"正在加载加入请求…"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"拒绝并封禁"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"我们无法拒绝此申请。是否重试？"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"拒绝申请失败"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"拒绝加入申请"</string>
+  <string name="screen_knock_requests_list_empty_state_description">"当有人申请加入房间时，你将能够在这里看到其申请。"</string>
+  <string name="screen_knock_requests_list_empty_state_title">"暂无待处理的加入申请"</string>
+  <string name="screen_knock_requests_list_initial_loading_title">"正在加载加入申请…"</string>
   <string name="screen_knock_requests_list_title">"申请加入"</string>
   <plurals name="screen_room_multiple_knock_requests_title">
-    <item quantity="other">"%1$s+ %2$d 其他人想加入这个房间"</item>
+    <item quantity="other">"%1$s、%2$d 及其他人想加入此房间"</item>
   </plurals>
   <string name="screen_room_multiple_knock_requests_view_all_button_title">"查看全部"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"接受"</string>
-  <string name="screen_room_single_knock_request_title">"%1$s想加入这个房间"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s 想加入此房间"</string>
   <string name="screen_room_single_knock_request_view_button_title">"查看"</string>
 </resources>
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt
index 3161d3e81f..1595fcdbd9 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt
@@ -28,18 +28,6 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class) class KnockRequestsBannerPresenterTest {
-    @Test
-    fun `present - when feature is disabled then the banner should be hidden`() = runTest {
-        val knockRequests = flowOf(listOf(FakeKnockRequest()))
-        val presenter = createKnockRequestsBannerPresenter(isFeatureEnabled = false, knockRequestsFlow = knockRequests)
-        presenter.test {
-            skipItems(1)
-            awaitItem().also { state ->
-                assertThat(state.isVisible).isFalse()
-            }
-        }
-    }
-
     @Test
     fun `present - when empty knock request list then the banner should be hidden`() = runTest {
         val knockRequests = flowOf(emptyList<KnockRequest>())
@@ -229,12 +217,10 @@ import org.junit.Test
 private fun TestScope.createKnockRequestsBannerPresenter(
     knockRequestsFlow: Flow<List<KnockRequest>> = flowOf(emptyList()),
     canAcceptKnockRequests: Boolean = true,
-    isFeatureEnabled: Boolean = true,
 ): KnockRequestsBannerPresenter {
     val knockRequestsService = KnockRequestsService(
         knockRequestsFlow = knockRequestsFlow,
         coroutineScope = backgroundScope,
-        isKnockFeatureEnabledFlow = flowOf(isFeatureEnabled),
         permissionsFlow = flowOf(KnockRequestPermissions(canAcceptKnockRequests, canAcceptKnockRequests, canAcceptKnockRequests)),
     )
     return KnockRequestsBannerPresenter(
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
index a9fea0905e..f55ccb0cef 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.knockrequests.impl.banner
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.knockrequests.impl.R
 import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -21,35 +23,29 @@ import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class KnockRequestsBannerViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class KnockRequestsBannerViewTest : RobolectricTest() {
     @Test
-    fun `clicking on view on single request invoke the expected callback`() {
+    fun `clicking on view on single request invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsBannerEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setKnockRequestsBannerView(
+            setKnockRequestsBannerView(
                 state = aKnockRequestsBannerState(
                     eventSink = eventsRecorder,
                 ),
                 onViewRequestsClick = it
             )
-            rule.clickOn(R.string.screen_room_single_knock_request_view_button_title)
+            clickOn(R.string.screen_room_single_knock_request_view_button_title)
         }
     }
 
     @Test
-    fun `clicking on view all when multiple requests invoke the expected callback`() {
+    fun `clicking on view all when multiple requests invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsBannerEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setKnockRequestsBannerView(
+            setKnockRequestsBannerView(
                 state = aKnockRequestsBannerState(
                     knockRequests = listOf(
                         aKnockRequestPresentable(displayName = "Alice"),
@@ -60,37 +56,37 @@ class KnockRequestsBannerViewTest {
                 ),
                 onViewRequestsClick = it
             )
-            rule.clickOn(R.string.screen_room_multiple_knock_requests_view_all_button_title)
+            clickOn(R.string.screen_room_multiple_knock_requests_view_all_button_title)
         }
     }
 
     @Test
-    fun `clicking on accept on a single request emit the expected event`() {
+    fun `clicking on accept on a single request emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsBannerEvents>()
-        rule.setKnockRequestsBannerView(
+        setKnockRequestsBannerView(
             state = aKnockRequestsBannerState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_accept)
+        clickOn(CommonStrings.action_accept)
         eventsRecorder.assertSingle(KnockRequestsBannerEvents.AcceptSingleRequest)
     }
 
     @Test
-    fun `clicking on dismiss emit the expected event`() {
+    fun `clicking on dismiss emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsBannerEvents>()
-        rule.setKnockRequestsBannerView(
+        setKnockRequestsBannerView(
             state = aKnockRequestsBannerState(
                 eventSink = eventsRecorder,
             ),
         )
-        val close = rule.activity.getString(CommonStrings.action_close)
-        rule.onNodeWithContentDescription(close).performClick()
+        val close = activity!!.getString(CommonStrings.action_close)
+        onNodeWithContentDescription(close).performClick()
         eventsRecorder.assertSingle(KnockRequestsBannerEvents.Dismiss)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setKnockRequestsBannerView(
+private fun AndroidComposeUiTest<ComponentActivity>.setKnockRequestsBannerView(
     state: KnockRequestsBannerState,
     onViewRequestsClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenterTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenterTest.kt
index 7102b01773..209e67cadf 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenterTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListPresenterTest.kt
@@ -298,7 +298,6 @@ internal fun TestScope.createKnockRequestsListPresenter(
     val knockRequestsService = KnockRequestsService(
         knockRequestsFlow = knockRequestsFlow,
         coroutineScope = backgroundScope,
-        isKnockFeatureEnabledFlow = flowOf(true),
         permissionsFlow = flowOf(KnockRequestPermissions(canAccept, canDecline, canBan)),
     )
     return KnockRequestsListPresenter(knockRequestsService = knockRequestsService)
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
index 188dcc7e56..1fbcb67b21 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.knockrequests.impl.list
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.knockrequests.impl.R
 import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.architecture.AsyncAction
@@ -22,91 +24,86 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.persistentListOf
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class KnockRequestsListViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class KnockRequestsListViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke the expected callback`() {
+    fun `clicking on back invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setKnockRequestsListView(
+            setKnockRequestsListView(
                 aKnockRequestsListState(
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on accept emit the expected event`() {
+    fun `clicking on accept emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequest = aKnockRequestPresentable()
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_accept)
+        clickOn(CommonStrings.action_accept)
         eventsRecorder.assertSingle(KnockRequestsListEvents.Accept(knockRequest))
     }
 
     @Test
-    fun `clicking on decline emit the expected event`() {
+    fun `clicking on decline emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequest = aKnockRequestPresentable()
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertSingle(KnockRequestsListEvents.Decline(knockRequest))
     }
 
     @Test
-    fun `clicking on decline and ban emit the expected event`() {
+    fun `clicking on decline and ban emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequest = aKnockRequestPresentable()
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_knock_requests_list_decline_and_ban_action_title)
+        clickOn(R.string.screen_knock_requests_list_decline_and_ban_action_title)
         eventsRecorder.assertSingle(KnockRequestsListEvents.DeclineAndBan(knockRequest))
     }
 
     @Test
-    fun `clicking on accept all emit the expected event`() {
+    fun `clicking on accept all emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_knock_requests_list_accept_all_button_title)
+        clickOn(R.string.screen_knock_requests_list_accept_all_button_title)
         eventsRecorder.assertSingle(KnockRequestsListEvents.AcceptAll)
     }
 
     @Test
-    fun `retry on async view retry emit the expected event`() {
+    fun `retry on async view retry emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
                 asyncAction = AsyncAction.Failure(RuntimeException("Failed to accept all")),
@@ -114,15 +111,15 @@ class KnockRequestsListViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_retry)
+        clickOn(CommonStrings.action_retry)
         eventsRecorder.assertSingle(KnockRequestsListEvents.RetryCurrentAction)
     }
 
     @Test
-    fun `canceling async view emit the expected event`() {
+    fun `canceling async view emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
                 asyncAction = AsyncAction.Failure(RuntimeException("Failed to accept all")),
@@ -130,15 +127,15 @@ class KnockRequestsListViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(KnockRequestsListEvents.ResetCurrentAction)
     }
 
     @Test
-    fun `confirming async view emit the expected event`() {
+    fun `confirming async view emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
         val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
-        rule.setKnockRequestsListView(
+        setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
                 asyncAction = AsyncAction.ConfirmingNoParams,
@@ -146,12 +143,12 @@ class KnockRequestsListViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_knock_requests_list_accept_all_alert_confirm_button_title)
+        clickOn(R.string.screen_knock_requests_list_accept_all_alert_confirm_button_title)
         eventsRecorder.assertSingle(KnockRequestsListEvents.ConfirmCurrentAction)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setKnockRequestsListView(
+private fun AndroidComposeUiTest<ComponentActivity>.setKnockRequestsListView(
     state: KnockRequestsListState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/leaveroom/api/src/main/res/values-ca/translations.xml b/features/leaveroom/api/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..870e0c35f2
--- /dev/null
+++ b/features/leaveroom/api/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="leave_conversation_alert_subtitle">"Segur que vols sortir d\'aquest xat? El xat no és públic i no t\'hi podràs tornar a unir sense una invitació."</string>
+  <string name="leave_room_alert_empty_subtitle">"Segur que vols sortir d\'aquesta sala? N\'ets l\'única persona. Si en surts, ningú s\'hi podrà unir i tu tampoc."</string>
+  <string name="leave_room_alert_private_subtitle">"Segur que vols sortir d\'aquesta sala? La sala no és pública i no podràs tornar a unir-t\'hi sense una invitació."</string>
+  <string name="leave_room_alert_subtitle">"Segur que vols sortir de la sala?"</string>
+</resources>
diff --git a/features/leaveroom/api/src/main/res/values-fa/translations.xml b/features/leaveroom/api/src/main/res/values-fa/translations.xml
index 167070891f..ec2cd89314 100644
--- a/features/leaveroom/api/src/main/res/values-fa/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-fa/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="leave_conversation_alert_subtitle">"آیا مطمئنید که می‌خواهید این مکالمه را ترک کنید؟ این مکالمه عمومی نیست و بدون دعوت نمی‌توانید دوباره به آن بپیوندید."</string>
   <string name="leave_room_alert_empty_subtitle">"مطمئنید که می‌خواهید این اتاق را ترک کنید؟ تنها فرد این‌جا هستید. در صورت ترک، هیچ‌کسی از جمله خودتان در آینده نخواهد توانست به آن بپیوندد."</string>
   <string name="leave_room_alert_private_subtitle">"مطمئنید که می‌خواهید این اتاق را ترک کنید؟ این اتاق عمومی نبوده قادر نخواهید بود بدون دعوت دوباره بپیوندید."</string>
   <string name="leave_room_alert_select_new_owner_action">"گزینش مالکان"</string>
diff --git a/features/leaveroom/api/src/main/res/values-ja/translations.xml b/features/leaveroom/api/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..73c1508bd2
--- /dev/null
+++ b/features/leaveroom/api/src/main/res/values-ja/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="leave_conversation_alert_subtitle">"本当にこの会話を退出しますか？この会話は非公開で、再度参加するには招待が必要です。"</string>
+  <string name="leave_room_alert_empty_subtitle">"本当にこのルームを退出しますか？あなたが最後の一人であり、このルームには誰も参加することができなくなります。"</string>
+  <string name="leave_room_alert_private_subtitle">"ルームから退出してもよいですか？ このルームは非公開のため、参加しなおすには改めて招待される必要があります。"</string>
+  <string name="leave_room_alert_select_new_owner_action">"所有者を選択"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"あなたがこのルームの唯一の所有者です。退出する前に所有権を他のユーザーへ譲与する必要があります。"</string>
+  <string name="leave_room_alert_select_new_owner_title">"所有権の譲与"</string>
+  <string name="leave_room_alert_subtitle">"本当にこのルームを退出しますか？"</string>
+</resources>
diff --git a/features/leaveroom/api/src/main/res/values-pl/translations.xml b/features/leaveroom/api/src/main/res/values-pl/translations.xml
index 440b806311..773922623c 100644
--- a/features/leaveroom/api/src/main/res/values-pl/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-pl/translations.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="leave_conversation_alert_subtitle">"Czy na pewno chcesz opuścić tę konwersację? Konwersacja nie jest publiczna i nie będziesz mógł dołączyć ponownie bez zaproszenia."</string>
-  <string name="leave_room_alert_empty_subtitle">"Jesteś pewien, że chcesz opuścić ten pokój? Jesteś tu jedyną osobą. Jeśli wyjdziesz, nikt nie będzie mógł dołączyć, w tym Ty."</string>
+  <string name="leave_room_alert_empty_subtitle">"Czy na pewno chcesz opuścić ten pokój? Jesteś tu jedyną osobą. Jeśli wyjdziesz, nikt nie będzie mógł dołączyć, w tym Ty."</string>
   <string name="leave_room_alert_private_subtitle">"Czy na pewno chcesz opuścić ten pokój? Ten pokój nie jest publiczny i nie będziesz mógł do niego wrócić bez zaproszenia."</string>
   <string name="leave_room_alert_select_new_owner_action">"Wybierz właścicieli"</string>
   <string name="leave_room_alert_select_new_owner_subtitle">"Jesteś jedynym właścicielem tego pokoju. Musisz przenieść własność na kogoś innego, zanim go opuścisz."</string>
   <string name="leave_room_alert_select_new_owner_title">"Przenieś własność"</string>
-  <string name="leave_room_alert_subtitle">"Jesteś pewien, że chcesz wyjść z tego pokoju?"</string>
+  <string name="leave_room_alert_subtitle">"Czy na pewno chcesz wyjść z tego pokoju?"</string>
 </resources>
diff --git a/features/leaveroom/api/src/main/res/values-ru/translations.xml b/features/leaveroom/api/src/main/res/values-ru/translations.xml
index 898dd684b8..4fc11fccf4 100644
--- a/features/leaveroom/api/src/main/res/values-ru/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-ru/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="leave_conversation_alert_subtitle">"Вы уверены, что хотите покинуть беседу? Эта беседа не является общедоступной, и вы не сможете присоединиться к ней без приглашения."</string>
-  <string name="leave_room_alert_empty_subtitle">"Вы уверены, что хотите покинуть эту комнату? Здесь есть только вы. Если вы покинете комнату, никто не сможет присоединиться к ней в будущем, включая вас."</string>
+  <string name="leave_conversation_alert_subtitle">"Вы уверены, что хотите покинуть беседу? Эта беседа не является общедоступной, и Вы не сможете снова присоединиться к ней без приглашения."</string>
+  <string name="leave_room_alert_empty_subtitle">"Вы уверены, что хотите покинуть эту комнату? Здесь есть только Вы. Если Вы покинете комнату, никто не сможет присоединиться к ней в будущем, включая Вас."</string>
   <string name="leave_room_alert_private_subtitle">"Вы уверены, что хотите покинуть эту комнату? Эта комната не является общедоступной, и Вы не сможете присоединиться к ней без приглашения."</string>
   <string name="leave_room_alert_select_new_owner_action">"Назначить владельцев"</string>
   <string name="leave_room_alert_select_new_owner_subtitle">"Вы единственный владелец этой комнаты. Перед тем, как её покинуть, необходимо передать владение кому-нибудь другому."</string>
diff --git a/features/leaveroom/api/src/main/res/values-vi/translations.xml b/features/leaveroom/api/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..430ffa0ea3
--- /dev/null
+++ b/features/leaveroom/api/src/main/res/values-vi/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="leave_conversation_alert_subtitle">"Bạn có chắc chắn muốn rời khỏi cuộc trò chuyện này không? Cuộc trò chuyện này không công khai và bạn sẽ không thể tham gia lại nếu không được mời."</string>
+  <string name="leave_room_alert_empty_subtitle">"Bạn có chắc chắn muốn rời khỏi phòng này không? Bạn là người duy nhất ở đây. Nếu bạn rời đi, sẽ không ai có thể tham gia nữa, kể cả bạn."</string>
+  <string name="leave_room_alert_private_subtitle">"Bạn có chắc chắn muốn rời khỏi phòng này không? Phòng này không công khai và bạn sẽ không thể tham gia lại nếu không có lời mời."</string>
+  <string name="leave_room_alert_select_new_owner_action">"Chọn chủ sở hữu"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"Bạn là chủ sở hữu duy nhất của căn phòng này. Bạn cần chuyển quyền sở hữu cho người khác trước khi rời khỏi phòng."</string>
+  <string name="leave_room_alert_select_new_owner_title">"Chuyển quyền sở hữu"</string>
+  <string name="leave_room_alert_subtitle">"Bạn có chắc chắn muốn rời khỏi phòng không?"</string>
+</resources>
diff --git a/features/leaveroom/api/src/main/res/values-zh/translations.xml b/features/leaveroom/api/src/main/res/values-zh/translations.xml
index 6b7f17558b..a4c920a221 100644
--- a/features/leaveroom/api/src/main/res/values-zh/translations.xml
+++ b/features/leaveroom/api/src/main/res/values-zh/translations.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="leave_conversation_alert_subtitle">"您确定要离开此对话吗？此对话不公开，未经邀请您将无法重新加入。"</string>
-  <string name="leave_room_alert_empty_subtitle">"确定要离开此聊天室吗？此处只有你一个人。如果离开此聊天室，包括你在内的所有人都将无法进入。"</string>
-  <string name="leave_room_alert_private_subtitle">"确定要离开此聊天室吗？此聊天室不公开，没有邀请你将无法重新加入。"</string>
+  <string name="leave_conversation_alert_subtitle">"你确定要离开此对话？此对话不公开，你将无法在未经邀请的情况下重新加入。"</string>
+  <string name="leave_room_alert_empty_subtitle">"确定要离开此房间？此处只有你一个人。如果离开，包括你在内的所有人都将无法加入。"</string>
+  <string name="leave_room_alert_private_subtitle">"确定要离开此房间吗？此房间不公开，没有邀请你将无法重新加入。"</string>
   <string name="leave_room_alert_select_new_owner_action">"选择所有者"</string>
-  <string name="leave_room_alert_select_new_owner_subtitle">"您是本房间的唯一所有者。离开房间前，您需要将所有权转移给他人。"</string>
+  <string name="leave_room_alert_select_new_owner_subtitle">"你是此房间的唯一所有者。离开前需要转让所有权给他人。"</string>
   <string name="leave_room_alert_select_new_owner_title">"转让所有权"</string>
-  <string name="leave_room_alert_subtitle">"确定要离开聊天室吗？"</string>
+  <string name="leave_room_alert_subtitle">"确定要离开房间？"</string>
 </resources>
diff --git a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenter.kt b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenter.kt
index 6455b45659..d11dc7e7e8 100644
--- a/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenter.kt
+++ b/features/leaveroom/impl/src/main/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenter.kt
@@ -24,7 +24,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.usersWithRole
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
 import kotlinx.coroutines.CoroutineScope
diff --git a/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt b/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
index 59d2c1ce23..90b7f2369f 100644
--- a/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
+++ b/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
@@ -115,7 +115,7 @@ class LeaveBaseRoomPresenterTest {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
                     result = FakeBaseRoom().apply {
-                        givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 2))
+                        givenRoomInfo(aRoomInfo(isDm = true, activeMembersCount = 2))
                     },
                 )
             }
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsView.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsView.kt
index f463a6b8d1..14b195a0b5 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsView.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/details/DependenciesDetailsView.kt
@@ -9,7 +9,7 @@
 package io.element.android.features.licenses.impl.details
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -25,6 +25,8 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -41,9 +43,10 @@ fun DependenciesDetailsView(
                 navigationIcon = { BackButton(onClick = onBack) },
             )
         },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { contentPadding ->
         LazyColumn(
-            modifier = Modifier.padding(contentPadding),
+            contentPadding = contentPadding + lazyColumnContentPadding,
         ) {
             val licenses = licenseItem.licenses.orEmpty() +
                 licenseItem.unknownLicenses.orEmpty()
@@ -59,7 +62,7 @@ fun DependenciesDetailsView(
                     }
                 }
                 ListItem(
-                    headlineContent = {
+                    content = {
                         ClickableLinkText(
                             text = text,
                             interactionSource = remember { MutableInteractionSource() },
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListView.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListView.kt
index f60c28ef2b..943f57ab3b 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListView.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListView.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -34,6 +35,8 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -52,10 +55,11 @@ fun DependencyLicensesListView(
                 navigationIcon = { BackButton(onClick = onBackClick) },
             )
         },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { contentPadding ->
         Column(
             modifier = Modifier
-                .padding(contentPadding)
+                .padding(contentPadding + lazyColumnContentPadding)
                 .padding(horizontal = 16.dp)
         ) {
             if (state.licenses.isSuccess()) {
@@ -72,7 +76,9 @@ fun DependencyLicensesListView(
                     modifier = Modifier.fillMaxWidth(),
                 )
             }
-            LazyColumn {
+            LazyColumn(
+                contentPadding = lazyColumnContentPadding,
+            ) {
                 when (state.licenses) {
                     is AsyncData.Failure -> item {
                         Text(
@@ -94,7 +100,7 @@ fun DependencyLicensesListView(
                     }
                     is AsyncData.Success -> items(state.licenses.data) { license ->
                         ListItem(
-                            headlineContent = { Text(license.safeName) },
+                            content = { Text(license.safeName) },
                             supportingContent = {
                                 Text(
                                     buildString {
diff --git a/features/linknewdevice/impl/build.gradle.kts b/features/linknewdevice/impl/build.gradle.kts
index 9c1aa9e990..4659a2d2b8 100644
--- a/features/linknewdevice/impl/build.gradle.kts
+++ b/features/linknewdevice/impl/build.gradle.kts
@@ -30,6 +30,7 @@ dependencies {
     // TODO Cleanup
     implementation(projects.appconfig)
     implementation(projects.features.enterprise.api)
+    implementation(projects.features.lockscreen.api)
     implementation(projects.features.rageshake.api)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
@@ -43,7 +44,7 @@ dependencies {
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.qrcode)
-    implementation(projects.libraries.oidc.api)
+    implementation(projects.libraries.oauth.api)
     implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.wellknown.api)
     implementation(libs.androidx.browser)
@@ -53,10 +54,11 @@ dependencies {
 
     testCommonDependencies(libs, true)
     testImplementation(projects.features.linknewdevice.test)
+    testImplementation(projects.features.lockscreen.test)
     testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.oidc.test)
+    testImplementation(projects.libraries.oauth.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.libraries.wellknown.test)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
index 54baee6663..d686b22860 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewDeviceFlowNode.kt
@@ -13,8 +13,10 @@ import androidx.activity.compose.LocalActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.composable.PermanentChild
 import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
@@ -26,14 +28,18 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.linknewdevice.api.LinkNewDeviceEntryPoint
+import io.element.android.features.linknewdevice.impl.screens.confirmation.CodeConfirmationNode
 import io.element.android.features.linknewdevice.impl.screens.desktop.DesktopNoticeNode
 import io.element.android.features.linknewdevice.impl.screens.error.ErrorNode
 import io.element.android.features.linknewdevice.impl.screens.error.ErrorScreenType
 import io.element.android.features.linknewdevice.impl.screens.number.EnterNumberNode
 import io.element.android.features.linknewdevice.impl.screens.qrcode.ShowQrCodeNode
+import io.element.android.features.linknewdevice.impl.screens.root.LinkDeviceType
 import io.element.android.features.linknewdevice.impl.screens.root.LinkNewDeviceRootNode
 import io.element.android.features.linknewdevice.impl.screens.scan.ScanQrCodeNode
+import io.element.android.features.lockscreen.api.DeviceUnlockEntryPoint
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
@@ -64,11 +70,17 @@ class LinkNewDeviceFlowNode(
     private val sessionCoroutineScope: CoroutineScope,
     private val linkNewMobileHandler: LinkNewMobileHandler,
     private val linkNewDesktopHandler: LinkNewDesktopHandler,
+    private val sessionEnterpriseService: SessionEnterpriseService,
+    private val deviceUnlockEntryPoint: DeviceUnlockEntryPoint,
 ) : BaseFlowNode<LinkNewDeviceFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.Root,
         savedStateMap = buildContext.savedStateMap,
     ),
+    permanentNavModel = PermanentNavModel(
+        navTargets = setOf(NavTarget.LockScreen),
+        savedStateMap = buildContext.savedStateMap,
+    ),
     buildContext = buildContext,
     plugins = plugins,
 ) {
@@ -107,6 +119,11 @@ class LinkNewDeviceFlowNode(
             val data: String,
         ) : NavTarget
 
+        @Parcelize
+        data class CodeConfirmation(
+            val code: String,
+        ) : NavTarget
+
         @Parcelize
         data object MobileEnterNumber : NavTarget
 
@@ -116,6 +133,9 @@ class LinkNewDeviceFlowNode(
         @Parcelize
         data object DesktopScanQrCode : NavTarget
 
+        @Parcelize
+        data object LockScreen : NavTarget
+
         @Parcelize
         data class Error(
             val errorScreenType: ErrorScreenType,
@@ -129,6 +149,9 @@ class LinkNewDeviceFlowNode(
                 Timber.tag(tag.value).d("step: ${linkMobileStep::class.java.simpleName}")
                 when (linkMobileStep) {
                     LinkMobileStep.Uninitialized -> Unit
+                    LinkMobileStep.CreatingQrCode -> {
+                        // This step is handled in LinkNewDeviceRootPresenter
+                    }
                     LinkMobileStep.Done -> {
                         callback.onDone()
                     }
@@ -136,8 +159,14 @@ class LinkNewDeviceFlowNode(
                         navigateToError(linkMobileStep.errorType)
                     }
                     is LinkMobileStep.QrReady -> {
-                        // The QrCode is ready, navigate to its display
-                        backstack.push(NavTarget.MobileShowQrCode(linkMobileStep.data))
+                        // The QrCode is ready, navigate to its display, if not already there
+                        val navTarget = backstack.elements.value.last().key.navTarget
+                        if (navTarget !is NavTarget.MobileShowQrCode) {
+                            backstack.push(NavTarget.MobileShowQrCode(linkMobileStep.data))
+                        }
+                    }
+                    LinkMobileStep.QrRotating -> {
+                        // This step is handled in ShowQrCodePresenter
                     }
                     is LinkMobileStep.QrScanned -> {
                         backstack.replace(NavTarget.MobileEnterNumber)
@@ -145,10 +174,7 @@ class LinkNewDeviceFlowNode(
                     LinkMobileStep.Starting -> {
                         // This step is not received at the moment, so do nothing
                     }
-                    LinkMobileStep.SyncingSecrets -> {
-                        // LinkMobileStep.Done is not received at the moment, so consider that the flow is done here
-                        callback.onDone()
-                    }
+                    LinkMobileStep.SyncingSecrets -> Unit
                     is LinkMobileStep.WaitingForAuth -> {
                         navigateToBrowser(linkMobileStep.verificationUri)
                     }
@@ -166,7 +192,9 @@ class LinkNewDeviceFlowNode(
                 is LinkDesktopStep.Error -> {
                     navigateToError(linkDesktopStep.errorType)
                 }
-                is LinkDesktopStep.EstablishingSecureChannel -> Unit
+                is LinkDesktopStep.EstablishingSecureChannel -> {
+                    backstack.push(NavTarget.CodeConfirmation(linkDesktopStep.checkCodeString))
+                }
                 is LinkDesktopStep.InvalidQrCode -> {
                     // This error will be handled by the ScanQrCodeNode
                 }
@@ -183,20 +211,20 @@ class LinkNewDeviceFlowNode(
 
     private fun navigateToError(errorType: ErrorType) {
         // Map the error to an error screen
-        // TODO Update this mapping
         val error = when (errorType) {
-            is ErrorType.DeviceIdAlreadyInUse -> ErrorScreenType.UnknownError
-            is ErrorType.InvalidCheckCode -> ErrorScreenType.InsecureChannelDetected
-            is ErrorType.MissingSecretsBackup -> ErrorScreenType.UnknownError
-            is ErrorType.NotFound -> ErrorScreenType.Expired
-            is ErrorType.DeviceNotFound -> ErrorScreenType.UnknownError
-            is ErrorType.Unknown -> ErrorScreenType.UnknownError
-            is ErrorType.UnsupportedProtocol -> ErrorScreenType.UnknownError
-            is ErrorType.Cancelled -> ErrorScreenType.UnknownError
+            is ErrorType.InvalidCheckCode -> ErrorScreenType.Mismatch2Digits
+            is ErrorType.UnsupportedProtocol -> ErrorScreenType.ProtocolNotSupported
+            is ErrorType.Cancelled -> ErrorScreenType.Cancelled
             is ErrorType.ConnectionInsecure -> ErrorScreenType.InsecureChannelDetected
-            is ErrorType.Expired -> ErrorScreenType.Expired
-            is ErrorType.OtherDeviceAlreadySignedIn -> ErrorScreenType.UnknownError
+            is ErrorType.Expired,
+            is ErrorType.NotFound,
+            is ErrorType.DeviceNotFound -> ErrorScreenType.Expired
+            is ErrorType.OtherDeviceAlreadySignedIn -> ErrorScreenType.OtherDeviceAlreadySignedIn
+            // TODO check if we expect to hit this here or if it should be caught earlier on
             is ErrorType.UnsupportedQrCodeType -> ErrorScreenType.UnknownError
+            is ErrorType.MissingSecretsBackup,
+            is ErrorType.DeviceIdAlreadyInUse,
+            is ErrorType.Unknown -> ErrorScreenType.UnknownError
         }
         // It is OK to push on backstack, since when user leaves the error screen, a new root will be set,
         // or the whole flow will be popped.
@@ -211,13 +239,28 @@ class LinkNewDeviceFlowNode(
                         callback.onDone()
                     }
 
-                    override fun linkDesktopDevice() {
-                        linkNewDesktopHandler.reset()
-                        backstack.push(NavTarget.DesktopNotice)
+                    override fun onUnlockDevice(type: LinkDeviceType) {
+                        val callback = object : DeviceUnlockEntryPoint.Callback {
+                            override fun onCancel() = Unit
+                            override fun onUnlock() = when (type) {
+                                LinkDeviceType.Mobile -> {
+                                    linkNewMobileHandler.reset()
+                                    linkNewMobileHandler.createAndStartNewHandler()
+                                }
+                                LinkDeviceType.Desktop -> {
+                                    linkNewDesktopHandler.reset()
+                                    backstack.push(NavTarget.DesktopNotice)
+                                }
+                            }
+                        }
+                        deviceUnlockEntryPoint.requestUnlock(callback)
                     }
                 }
                 createNode<LinkNewDeviceRootNode>(buildContext, listOf(callback))
             }
+            is NavTarget.LockScreen -> {
+                deviceUnlockEntryPoint.createNode(this, buildContext)
+            }
             NavTarget.DesktopNotice -> {
                 val callback = object : DesktopNoticeNode.Callback {
                     override fun navigateBack() {
@@ -250,6 +293,18 @@ class LinkNewDeviceFlowNode(
                 }
                 createNode<EnterNumberNode>(buildContext, listOf(callback))
             }
+            is NavTarget.CodeConfirmation -> {
+                val callback = object : CodeConfirmationNode.Callback {
+                    override fun onCancel() {
+                        // Push error
+                        backstack.push(NavTarget.Error(ErrorScreenType.Cancelled))
+                    }
+                }
+                val inputs = CodeConfirmationNode.Inputs(
+                    code = navTarget.code,
+                )
+                createNode<CodeConfirmationNode>(buildContext, listOf(inputs, callback))
+            }
             is NavTarget.MobileShowQrCode -> {
                 val callback = object : ShowQrCodeNode.Callback {
                     override fun navigateBack() {
@@ -281,8 +336,12 @@ class LinkNewDeviceFlowNode(
         }
     }
 
-    private fun navigateToBrowser(url: String) {
-        activity?.openUrlInChromeCustomTab(null, darkTheme, url)
+    private suspend fun navigateToBrowser(url: String) {
+        activity?.openUrlInChromeCustomTab(
+            session = null,
+            darkTheme = darkTheme,
+            url = sessionEnterpriseService.tweakMasUrl(url),
+        )
     }
 
     @Composable
@@ -295,5 +354,6 @@ class LinkNewDeviceFlowNode(
             }
         }
         BackstackView()
+        PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LockScreen)
     }
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewMobileHandler.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewMobileHandler.kt
index 157d946eaa..39c9c6fef3 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewMobileHandler.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/LinkNewMobileHandler.kt
@@ -12,6 +12,7 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
 import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileHandler
 import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
 import io.element.android.libraries.matrix.api.logs.LoggerTags
@@ -42,12 +43,15 @@ class LinkNewMobileHandler(
     val stepFlow: StateFlow<LinkMobileStep>
         get() = linkMobileStepFlow.asStateFlow()
 
-    fun createAndStartNewHandler() {
+    fun createAndStartNewHandler(forRotating: Boolean = false) {
         Timber.tag(loggerTag.value).d("createAndStartNewHandler()")
         currentJob?.cancel()
         handler = matrixClient.createLinkMobileHandler().getOrNull()
         handler?.let { h ->
             currentJob = sessionScope.launch {
+                if (!forRotating) {
+                    linkMobileStepFlow.emit(LinkMobileStep.CreatingQrCode)
+                }
                 h.linkMobileStep
                     .onEach {
                         linkMobileStepFlow.emit(it)
@@ -65,4 +69,15 @@ class LinkNewMobileHandler(
             linkMobileStepFlow.emit(LinkMobileStep.Uninitialized)
         }
     }
+
+    fun rotateQrCode() {
+        createAndStartNewHandler(forRotating = true)
+    }
+
+    fun onTooManyRotation() {
+        reset()
+        sessionScope.launch {
+            linkMobileStepFlow.emit(LinkMobileStep.Error(ErrorType.Expired("Too many QR code rotations")))
+        }
+    }
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationNode.kt
new file mode 100644
index 0000000000..a8db4d2d75
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationNode.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.linknewdevice.impl.screens.confirmation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.di.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class CodeConfirmationNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext = buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun onCancel()
+    }
+
+    data class Inputs(
+        val code: String,
+    ) : NodeInputs
+
+    private val callback: Callback = callback()
+    private val input = inputs<Inputs>()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        CodeConfirmationView(
+            code = input.code,
+            onCancel = callback::onCancel,
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationView.kt
new file mode 100644
index 0000000000..d981574f86
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/confirmation/CodeConfirmationView.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.linknewdevice.impl.screens.confirmation
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+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.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.linknewdevice.impl.R
+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun CodeConfirmationView(
+    code: String,
+    onCancel: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BackHandler(onBack = onCancel)
+    FlowStepPage(
+        modifier = modifier,
+        iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
+        title = stringResource(R.string.screen_qr_code_login_device_code_title),
+        subTitle = stringResource(R.string.screen_qr_code_login_device_code_subtitle),
+        content = { Content(code = code) },
+        buttons = { Buttons(onCancel = onCancel) }
+    )
+}
+
+@Composable
+private fun Content(code: String) {
+    Column(
+        modifier = Modifier.padding(top = 16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Digits(code = code)
+        Spacer(modifier = Modifier.height(32.dp))
+        WaitingForOtherDevice()
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun Digits(code: String) {
+    FlowRow(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center,
+    ) {
+        code.forEach {
+            Text(
+                modifier = Modifier
+                    .padding(horizontal = 6.dp, vertical = 4.dp)
+                    .clip(RoundedCornerShape(4.dp))
+                    .background(ElementTheme.colors.bgActionSecondaryPressed)
+                    .padding(horizontal = 16.dp, vertical = 17.dp),
+                text = it.toString()
+            )
+        }
+    }
+}
+
+@Composable
+private fun WaitingForOtherDevice() {
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(4.dp),
+    ) {
+        CircularProgressIndicator(
+            modifier = Modifier
+                .size(20.dp)
+                .padding(2.dp),
+            strokeWidth = 2.dp,
+        )
+        Text(
+            text = stringResource(R.string.screen_qr_code_login_verify_code_loading),
+            style = ElementTheme.typography.fontBodySmRegular,
+            color = ElementTheme.colors.textSecondary,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Composable
+private fun Buttons(
+    onCancel: () -> Unit,
+) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        OutlinedButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = stringResource(CommonStrings.action_cancel),
+            onClick = onCancel,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun CodeConfirmationViewPreview() {
+    ElementPreview {
+        CodeConfirmationView(
+            code = "67",
+            onCancel = {},
+        )
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeView.kt
index c7f0bb61e7..a66ea7b391 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeView.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeView.kt
@@ -9,21 +9,25 @@
 
 package io.element.android.features.linknewdevice.impl.screens.desktop
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.linknewdevice.impl.R
 import io.element.android.libraries.designsystem.atomic.organisms.NumberedListOrganism
@@ -34,6 +38,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.annotatedTextWithBold
 import io.element.android.libraries.permissions.api.PermissionsView
 import kotlinx.collections.immutable.persistentListOf
@@ -62,6 +67,7 @@ fun DesktopNoticeView(
         title = stringResource(R.string.screen_link_new_device_desktop_title, appName),
         iconStyle = BigIcon.Style.Default(CompoundIcons.Computer()),
         modifier = modifier,
+        isScrollable = true,
         buttons = {
             Button(
                 text = stringResource(R.string.screen_link_new_device_desktop_submit),
@@ -71,11 +77,10 @@ fun DesktopNoticeView(
         }
     ) {
         Column(
-            Modifier.fillMaxWidth()
+            Modifier.fillMaxWidth(),
         ) {
             Spacer(modifier = Modifier.height(40.dp))
             NumberedListOrganism(
-                modifier = Modifier.fillMaxSize(),
                 items = persistentListOf(
                     AnnotatedString(stringResource(R.string.screen_link_new_device_desktop_step1, appName)),
                     annotatedTextWithBold(
@@ -88,6 +93,17 @@ fun DesktopNoticeView(
                     AnnotatedString(stringResource(R.string.screen_link_new_device_desktop_step3)),
                 )
             )
+            Spacer(modifier = Modifier.height(32.dp))
+            Text(
+                modifier = Modifier
+                    .clip(RoundedCornerShape(12.dp))
+                    .background(ElementTheme.colors.bgCriticalSubtle)
+                    .padding(16.dp)
+                    .fillMaxWidth(),
+                text = stringResource(R.string.screen_link_new_device_desktop_warning),
+                style = ElementTheme.typography.fontBodyMdMedium,
+                color = ElementTheme.colors.textCriticalPrimary,
+            )
         }
     }
 
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenType.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenType.kt
index b92a19ef8a..ad8cc276c5 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenType.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenType.kt
@@ -20,6 +20,9 @@ sealed interface ErrorScreenType : NodeInputs, Parcelable {
     @Parcelize
     data object Expired : ErrorScreenType
 
+    @Parcelize
+    data object OtherDeviceAlreadySignedIn : ErrorScreenType
+
     @Parcelize
     data object Mismatch2Digits : ErrorScreenType
 
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenTypeProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenTypeProvider.kt
index 7fd699101b..5946eb9ab2 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenTypeProvider.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorScreenTypeProvider.kt
@@ -19,5 +19,6 @@ class ErrorScreenTypeProvider : PreviewParameterProvider<ErrorScreenType> {
         ErrorScreenType.InsecureChannelDetected,
         ErrorScreenType.SlidingSyncNotAvailable,
         ErrorScreenType.UnknownError,
+        ErrorScreenType.OtherDeviceAlreadySignedIn,
     )
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorView.kt
index 9f67e8bc17..7b830626f6 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorView.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorView.kt
@@ -47,43 +47,54 @@ fun ErrorView(
 ) {
     val appName = LocalBuildMeta.current.applicationName
     BackHandler(onBack = onCancel)
+    val iconStyle = when (errorScreenType) {
+        ErrorScreenType.OtherDeviceAlreadySignedIn -> BigIcon.Style.SuccessSolid
+        else -> BigIcon.Style.AlertSolid
+    }
     FlowStepPage(
         modifier = modifier,
-        iconStyle = BigIcon.Style.AlertSolid,
+        iconStyle = iconStyle,
         title = titleText(errorScreenType, appName),
         subTitle = subtitleText(errorScreenType, appName),
         content = { Content(errorScreenType) },
         buttons = {
-            Buttons(
-                onRetry = onRetry,
-                onCancel = onCancel,
-            )
+            when (errorScreenType) {
+                ErrorScreenType.OtherDeviceAlreadySignedIn -> DoneButton(
+                    onDone = onCancel,
+                )
+                else -> Buttons(
+                    onRetry = onRetry,
+                    onCancel = onCancel,
+                )
+            }
         },
     )
 }
 
 @Composable
 private fun titleText(errorScreenType: ErrorScreenType, appName: String) = when (errorScreenType) {
-    ErrorScreenType.Cancelled -> stringResource(R.string.screen_qr_code_login_error_cancelled_title)
+    ErrorScreenType.Cancelled -> stringResource(R.string.screen_link_new_device_error_request_cancelled_title)
     ErrorScreenType.Declined -> stringResource(R.string.screen_qr_code_login_error_declined_title)
-    ErrorScreenType.Expired -> stringResource(R.string.screen_qr_code_login_error_expired_title)
-    ErrorScreenType.ProtocolNotSupported -> stringResource(R.string.screen_qr_code_login_error_linking_not_suported_title)
+    ErrorScreenType.Expired -> stringResource(R.string.screen_link_new_device_error_request_timeout_title)
+    ErrorScreenType.ProtocolNotSupported -> stringResource(R.string.screen_link_new_device_error_not_supported_title)
     ErrorScreenType.InsecureChannelDetected -> stringResource(id = R.string.screen_qr_code_login_connection_note_secure_state_title)
     ErrorScreenType.Mismatch2Digits -> stringResource(id = R.string.screen_link_new_device_wrong_number_title)
     ErrorScreenType.SlidingSyncNotAvailable -> stringResource(id = R.string.screen_qr_code_login_error_sliding_sync_not_supported_title, appName)
     is ErrorScreenType.UnknownError -> stringResource(CommonStrings.common_something_went_wrong)
+    ErrorScreenType.OtherDeviceAlreadySignedIn -> stringResource(R.string.screen_qr_code_login_error_device_already_signed_in_title)
 }
 
 @Composable
 private fun subtitleText(errorScreenType: ErrorScreenType, appName: String) = when (errorScreenType) {
-    ErrorScreenType.Cancelled -> stringResource(R.string.screen_qr_code_login_error_cancelled_subtitle)
+    ErrorScreenType.Cancelled -> stringResource(R.string.screen_link_new_device_error_request_cancelled_subtitle)
     ErrorScreenType.Declined -> stringResource(R.string.screen_qr_code_login_error_declined_subtitle)
-    ErrorScreenType.Expired -> stringResource(R.string.screen_qr_code_login_error_expired_subtitle)
-    ErrorScreenType.ProtocolNotSupported -> stringResource(R.string.screen_qr_code_login_error_linking_not_suported_subtitle, appName)
+    ErrorScreenType.Expired -> stringResource(R.string.screen_link_new_device_error_request_timeout_subtitle)
+    ErrorScreenType.ProtocolNotSupported -> stringResource(R.string.screen_link_new_device_error_not_supported_subtitle)
     ErrorScreenType.Mismatch2Digits -> stringResource(id = R.string.screen_link_new_device_wrong_number_subtitle)
     ErrorScreenType.InsecureChannelDetected -> stringResource(id = R.string.screen_qr_code_login_connection_note_secure_state_description)
     ErrorScreenType.SlidingSyncNotAvailable -> stringResource(id = R.string.screen_qr_code_login_error_sliding_sync_not_supported_subtitle, appName)
     is ErrorScreenType.UnknownError -> stringResource(R.string.screen_qr_code_login_unknown_error_description)
+    ErrorScreenType.OtherDeviceAlreadySignedIn -> stringResource(R.string.screen_qr_code_login_error_device_already_signed_in_subtitle)
 }
 
 @Composable
@@ -125,7 +136,18 @@ private fun Content(errorScreenType: ErrorScreenType) {
 }
 
 @Composable
-private fun Buttons(
+private fun DoneButton(
+    onDone: () -> Unit,
+) {
+    Button(
+        modifier = Modifier.fillMaxWidth(),
+        text = stringResource(CommonStrings.action_done),
+        onClick = onDone,
+    )
+}
+
+@Composable
+private fun ColumnScope.Buttons(
     onRetry: () -> Unit,
     onCancel: () -> Unit,
 ) {
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt
index a884c3e97f..20bd50f488 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeNode.kt
@@ -25,6 +25,7 @@ import io.element.android.libraries.di.SessionScope
 class ShowQrCodeNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    showQrCodePresenterFactory: ShowQrCodePresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
     class Inputs(
         val data: String,
@@ -36,11 +37,15 @@ class ShowQrCodeNode(
 
     private val inputs: Inputs = inputs<Inputs>()
     private val callback: Callback = callback()
+    private val showQrCodePresenter: ShowQrCodePresenter = showQrCodePresenterFactory.create(
+        initialData = inputs.data,
+    )
 
     @Composable
     override fun View(modifier: Modifier) {
+        val state = showQrCodePresenter.present()
         ShowQrCodeView(
-            data = inputs.data,
+            state = state,
             modifier = modifier,
             onBackClick = callback::navigateBack,
         )
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenter.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenter.kt
new file mode 100644
index 0000000000..21071a6831
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenter.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.linknewdevice.impl.screens.qrcode
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.linknewdevice.impl.LinkNewMobileHandler
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import io.element.android.libraries.matrix.api.logs.LoggerTags
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+private val tag = LoggerTag("ShowQrCodePresenter", LoggerTags.linkNewDevice)
+
+@AssistedInject
+class ShowQrCodePresenter(
+    @Assisted private val initialData: String,
+    private val linkNewMobileHandler: LinkNewMobileHandler,
+) : Presenter<ShowQrCodeState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(initialData: String): ShowQrCodePresenter
+    }
+
+    private var loadingJob: Job? = null
+
+    @Composable
+    override fun present(): ShowQrCodeState {
+        var qrCodeRotationCounter by remember { mutableIntStateOf(MAX_QR_CODE_ROTATION) }
+        val state by produceState(
+            initialValue = ShowQrCodeState(
+                data = AsyncData.Success(initialData),
+            )
+        ) {
+            linkNewMobileHandler.stepFlow.collect { step ->
+                when (step) {
+                    is LinkMobileStep.QrReady -> {
+                        loadingJob?.cancel()
+                        value = ShowQrCodeState(
+                            data = AsyncData.Success(step.data),
+                        )
+                    }
+                    is LinkMobileStep.QrRotating -> {
+                        if (qrCodeRotationCounter-- > 0) {
+                            Timber.tag(tag.value).d("Rotating QrCode")
+                            linkNewMobileHandler.rotateQrCode()
+                            // Ensure that outdated data is not rendered too long while rotating QR code
+                            loadingJob = launch {
+                                delay(1000)
+                                value = ShowQrCodeState(
+                                    data = AsyncData.Loading(),
+                                )
+                            }
+                        } else {
+                            Timber.tag(tag.value).w("Max QR code rotation reached, not rotating anymore")
+                            linkNewMobileHandler.onTooManyRotation()
+                        }
+                    }
+                    else -> Unit
+                }
+            }
+        }
+
+        return state
+    }
+
+    companion object {
+        const val MAX_QR_CODE_ROTATION = 10
+    }
+}
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeState.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeState.kt
new file mode 100644
index 0000000000..e69dde8264
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeState.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.linknewdevice.impl.screens.qrcode
+
+import io.element.android.libraries.architecture.AsyncData
+
+data class ShowQrCodeState(
+    val data: AsyncData<String>,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeStateProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeStateProvider.kt
new file mode 100644
index 0000000000..e6d33c2544
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeStateProvider.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.linknewdevice.impl.screens.qrcode
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncData
+
+class ShowQrCodeStateProvider : PreviewParameterProvider<ShowQrCodeState> {
+    override val values: Sequence<ShowQrCodeState>
+        get() = sequenceOf(
+            aShowQrCodeState(),
+            aShowQrCodeState(
+                data = AsyncData.Loading(),
+            ),
+        )
+}
+
+internal fun aShowQrCodeState(
+    data: AsyncData<String> = AsyncData.Success("DATA"),
+) = ShowQrCodeState(
+    data = data,
+)
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeView.kt
index 501415f621..f2cd07f4a5 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeView.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeView.kt
@@ -9,6 +9,12 @@
 
 package io.element.android.features.linknewdevice.impl.screens.qrcode
 
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -21,6 +27,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.linknewdevice.impl.R
@@ -30,6 +37,7 @@ import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.LocalBuildMeta
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.utils.annotatedTextWithBold
 import io.element.android.libraries.qrcode.QrCodeImage
 import kotlinx.collections.immutable.persistentListOf
@@ -38,9 +46,10 @@ import kotlinx.collections.immutable.persistentListOf
  * QrCode display screen:
  * https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2027-23617
  */
+@OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun ShowQrCodeView(
-    data: String,
+    state: ShowQrCodeState,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -55,11 +64,17 @@ fun ShowQrCodeView(
             Modifier.fillMaxWidth(),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            QrCodeImage(
-                data = data,
-                modifier = Modifier
-                    .size(220.dp)
-            )
+            AnimatedContent(
+                modifier = Modifier.size(220.dp),
+                targetState = state.data.dataOrNull(),
+                transitionSpec = {
+                    fadeIn().togetherWith(fadeOut())
+                }
+            ) { data ->
+                QrCodeOrLoading(
+                    data = data,
+                )
+            }
             Spacer(modifier = Modifier.height(32.dp))
             NumberedListOrganism(
                 modifier = Modifier.fillMaxSize(),
@@ -79,11 +94,33 @@ fun ShowQrCodeView(
     }
 }
 
+@Composable
+private fun QrCodeOrLoading(
+    data: String?,
+    modifier: Modifier = Modifier,
+) {
+    if (data == null) {
+        Box(
+            modifier = modifier,
+            contentAlignment = Alignment.Center,
+        ) {
+            CircularProgressIndicator()
+        }
+    } else {
+        QrCodeImage(
+            modifier = modifier,
+            data = data,
+        )
+    }
+}
+
 @PreviewsDayNight
 @Composable
-internal fun ShowQrCodeViewPreview() = ElementPreview {
+internal fun ShowQrCodeViewPreview(
+    @PreviewParameter(ShowQrCodeStateProvider::class) state: ShowQrCodeState,
+) = ElementPreview {
     ShowQrCodeView(
-        data = "DATA",
+        state = state,
         onBackClick = { },
     )
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkDeviceType.kt
similarity index 60%
rename from libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt
rename to features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkDeviceType.kt
index 529dd4eb4e..6b26fe5e79 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/UserCertificatesProvider.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkDeviceType.kt
@@ -5,8 +5,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.matrix.impl.certificates
+package io.element.android.features.linknewdevice.impl.screens.root
 
-interface UserCertificatesProvider {
-    fun provides(): List<ByteArray>
+enum class LinkDeviceType {
+    Mobile,
+    Desktop,
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootEvent.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootEvent.kt
index 8ce6af90b0..97047fea9d 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootEvent.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootEvent.kt
@@ -8,6 +8,5 @@
 package io.element.android.features.linknewdevice.impl.screens.root
 
 sealed interface LinkNewDeviceRootEvent {
-    data object LinkMobileDevice : LinkNewDeviceRootEvent
     data object CloseDialog : LinkNewDeviceRootEvent
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootNode.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootNode.kt
index f43ffa64df..dc74f1287f 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootNode.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootNode.kt
@@ -27,7 +27,7 @@ class LinkNewDeviceRootNode(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onDone()
-        fun linkDesktopDevice()
+        fun onUnlockDevice(type: LinkDeviceType)
     }
 
     private val callback: Callback = callback()
@@ -39,7 +39,7 @@ class LinkNewDeviceRootNode(
             state = state,
             modifier = modifier,
             onBackClick = callback::onDone,
-            onLinkDesktopDeviceClick = callback::linkDesktopDevice,
+            onUnlockDevice = callback::onUnlockDevice,
         )
     }
 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenter.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenter.kt
index a17ed88fd3..af3ede0c27 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenter.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenter.kt
@@ -50,7 +50,13 @@ class LinkNewDeviceRootPresenter(
         LaunchedEffect(step) {
             when (val finalStep = step) {
                 is LinkMobileStep.Uninitialized -> {
-                    qrCodeData = AsyncData.Uninitialized
+                    // Ignore this step when loading QrCode
+                    if (!qrCodeData.isLoading()) {
+                        qrCodeData = AsyncData.Uninitialized
+                    }
+                }
+                is LinkMobileStep.CreatingQrCode -> {
+                    qrCodeData = AsyncData.Loading()
                 }
                 is LinkMobileStep.QrReady -> {
                     qrCodeData = AsyncData.Success(Unit)
@@ -64,12 +70,6 @@ class LinkNewDeviceRootPresenter(
 
         fun handleEvent(event: LinkNewDeviceRootEvent) {
             when (event) {
-                LinkNewDeviceRootEvent.LinkMobileDevice -> coroutineScope.launch {
-                    qrCodeData = AsyncData.Loading()
-                    // Wait for the QrCode to be ready
-                    linkNewMobileHandler.reset()
-                    linkNewMobileHandler.createAndStartNewHandler()
-                }
                 LinkNewDeviceRootEvent.CloseDialog -> coroutineScope.launch {
                     linkNewMobileHandler.reset()
                 }
diff --git a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootView.kt b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootView.kt
index d9249d3e89..5778abfb2c 100644
--- a/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootView.kt
+++ b/features/linknewdevice/impl/src/main/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootView.kt
@@ -41,7 +41,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun LinkNewDeviceRootView(
     state: LinkNewDeviceRootState,
     onBackClick: () -> Unit,
-    onLinkDesktopDeviceClick: () -> Unit,
+    onUnlockDevice: (type: LinkDeviceType) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val (title, subtitle, iconStyle) = if (state.isSupported.dataOrNull() == false) {
@@ -57,6 +57,7 @@ fun LinkNewDeviceRootView(
             BigIcon.Style.Default(CompoundIcons.Devices())
         )
     }
+
     FlowStepPage(
         onBackClick = onBackClick,
         title = title,
@@ -83,40 +84,37 @@ fun LinkNewDeviceRootView(
                 }
                 is AsyncData.Success -> {
                     if (state.isSupported.data) {
-                        when (state.qrCodeData) {
-                            AsyncData.Uninitialized,
-                            is AsyncData.Failure -> {
-                                Button(
-                                    onClick = { state.eventSink(LinkNewDeviceRootEvent.LinkMobileDevice) },
-                                    text = stringResource(id = R.string.screen_link_new_device_root_mobile_device),
-                                    modifier = Modifier.fillMaxWidth(),
-                                    leadingIcon = IconSource.Vector(CompoundIcons.Mobile()),
-                                )
-                                Button(
-                                    onClick = onLinkDesktopDeviceClick,
-                                    text = stringResource(id = R.string.screen_link_new_device_root_desktop_computer),
-                                    modifier = Modifier.fillMaxWidth(),
-                                    leadingIcon = IconSource.Vector(CompoundIcons.Computer()),
-                                )
-                            }
-                            is AsyncData.Loading,
-                            is AsyncData.Success -> {
-                                Button(
-                                    onClick = { state.eventSink(LinkNewDeviceRootEvent.LinkMobileDevice) },
-                                    text = stringResource(id = R.string.screen_link_new_device_root_loading_qr_code),
-                                    showProgress = true,
-                                    enabled = false,
-                                    modifier = Modifier.fillMaxWidth(),
-                                )
-                                Button(
-                                    onClick = onLinkDesktopDeviceClick,
-                                    text = stringResource(id = R.string.screen_link_new_device_root_desktop_computer),
-                                    modifier = Modifier.fillMaxWidth(),
-                                    enabled = false,
-                                    leadingIcon = IconSource.Vector(CompoundIcons.Computer()),
-                                )
-                            }
-                        }
+                        val canClick = state.qrCodeData is AsyncData.Uninitialized
+                        val isLoading = state.qrCodeData is AsyncData.Loading || state.qrCodeData is AsyncData.Success
+                        Button(
+                            onClick = {
+                                if (canClick) {
+                                    onUnlockDevice(LinkDeviceType.Mobile)
+                                }
+                            },
+                            text = stringResource(
+                                id = if (isLoading) {
+                                    R.string.screen_link_new_device_root_loading_qr_code
+                                } else {
+                                    R.string.screen_link_new_device_root_mobile_device
+                                }
+                            ),
+                            showProgress = isLoading,
+                            enabled = !isLoading,
+                            modifier = Modifier.fillMaxWidth(),
+                            leadingIcon = IconSource.Vector(CompoundIcons.Mobile()),
+                        )
+                        Button(
+                            onClick = {
+                                if (canClick) {
+                                    onUnlockDevice(LinkDeviceType.Desktop)
+                                }
+                            },
+                            text = stringResource(id = R.string.screen_link_new_device_root_desktop_computer),
+                            enabled = !isLoading,
+                            modifier = Modifier.fillMaxWidth(),
+                            leadingIcon = IconSource.Vector(CompoundIcons.Computer()),
+                        )
                     } else {
                         Button(
                             onClick = onBackClick,
@@ -147,6 +145,6 @@ internal fun LinkNewDeviceRootViewPreview(
     LinkNewDeviceRootView(
         state = state,
         onBackClick = { },
-        onLinkDesktopDeviceClick = { },
+        onUnlockDevice = { },
     )
 }
diff --git a/features/linknewdevice/impl/src/main/res/values-be/translations.xml b/features/linknewdevice/impl/src/main/res/values-be/translations.xml
index 16372fa6e4..378a405c95 100644
--- a/features/linknewdevice/impl/src/main/res/values-be/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-be/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Калі вы сутыкнуліся з той жа праблемай, паспрабуйце іншую сетку Wi-Fi або скарыстайцеся мабільнымі дадзенымі замест Wi-Fi."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Калі гэта не дапамагло, увайдзіце ўручную"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Злучэнне небяспечнае"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Вам будзе прапанавана ўвесці дзве лічбы, паказаныя на гэтай прыладзе."</string>
+  <string name="screen_qr_code_login_device_code_title">"Увядзіце наступны нумар на іншай прыладзе."</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Уваход быў адменены на іншай прыладзе."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Запыт на ўваход скасаваны"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Уваход на іншай прыладзе быў адхілены."</string>
@@ -35,4 +37,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Каб працягнуць, вам неабходна дазволіць %1$s выкарыстоўваць камеру вашай прылады."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Дазвольце доступ да камеры для сканіравання QR-кода"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Адбылася нечаканая памылка. Калі ласка, паспрабуйце яшчэ раз."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"У чаканні іншай прылады"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ca/translations.xml b/features/linknewdevice/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..d78744ff85
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_link_new_device_desktop_scanning_title">"Escaneja el QR"</string>
+  <string name="screen_link_new_device_desktop_step3">"Escaneja el codi QR amb aquest dispositiu"</string>
+  <string name="screen_link_new_device_desktop_submit">"Preparat per escanejar"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"El proveïdor del teu compte no admet %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s no és compatible"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"Codi QR no compatible"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"L\'inici de sessió s\'ha cancel·lat a l\'altre dispositiu."</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"Sol·licitud d\'inici de sessió cancel·lada"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Inici de sessió ha caducat. Torna-ho a provar."</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"L\'inici de sessió no s\'ha completat a temps"</string>
+  <string name="screen_link_new_device_mobile_step2">"Selecciona %1$s"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"No s\'ha pogut establir una connexió segura amb el dispositiu nou. Els dispositius existents continuen sent segurs, no te n\'has de preocupar."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"I ara què?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Prova de tornar a iniciar sessió mitjançant un codi QR si es tracta d\'un problema de xarxa."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Si es repeteix el mateix problema, prova una xarxa wifi diferent o utilitza les dades mòbils en lloc del wifi."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Si no funciona, inicia sessió manualment"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_title">"Connexió no segura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Se\'t demanarà que introdueixis els dos dígits mostrats en aquest dispositiu."</string>
+  <string name="screen_qr_code_login_device_code_title">"Introdueix el número següent a l\'altre dispositiu"</string>
+  <string name="screen_qr_code_login_error_cancelled_subtitle">"L\'inici de sessió s\'ha cancel·lat a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_cancelled_title">"Sol·licitud d\'inici de sessió cancel·lada"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"L\'inici de sessió s\'ha rebutjat a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_declined_title">"Inici de sessió rebutjat"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Inici de sessió ha caducat. Torna-ho a provar."</string>
+  <string name="screen_qr_code_login_error_expired_title">"L\'inici de sessió no s\'ha completat a temps"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"El teu altre dispositiu no admet l\'inici de sessió a %s amb codis QR.
+
+Prova d\'iniciar la sessió manualment o escaneja el QR amb un altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Codi QR no compatible"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"El proveïdor del teu compte no admet %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s no és compatible"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Utilitza el codi QR que es mostra a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Torna-ho a intentar"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Codi QR incorrecte"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"Per continuar, has donar permís a %1$s per poder utilitzar la càmera del dispositiu."</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"Permet l\'accés a la càmera per poder escanejar el codi QR"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"S\'ha produït un error inesperat. Torna-ho a provar."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Esperant el teu altre dispositiu"</string>
+</resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-cs/translations.xml b/features/linknewdevice/impl/src/main/res/values-cs/translations.xml
index 4b8f230d55..e0150668a3 100644
--- a/features/linknewdevice/impl/src/main/res/values-cs/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-cs/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Pokud narazíte na stejný problém, zkuste jinou síť wifi nebo použijte mobilní data místo wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Pokud to nefunguje, přihlaste se ručně"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Připojení není zabezpečené"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Budete požádáni o zadání dvou níže uvedených číslic."</string>
+  <string name="screen_qr_code_login_device_code_title">"Zadejte níže uvedené číslo na svém dalším zařízení"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Přihlášení bylo na druhém zařízení zrušeno."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Žádost o přihlášení zrušena"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Přihlášení bylo na druhém zařízení odmítnuto."</string>
@@ -54,4 +56,5 @@ Zkuste se přihlásit ručně nebo naskenujte QR kód pomocí jiného zařízen
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Abyste mohli pokračovat, musíte aplikaci %1$s udělit povolení k použití kamery vašeho zařízení."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Povolte přístup k fotoaparátu a naskenujte QR kód"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Vyskytla se neočekávaná chyba. Prosím zkuste to znovu."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Čekání na vaše další zařízení"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-cy/translations.xml b/features/linknewdevice/impl/src/main/res/values-cy/translations.xml
index b26aed52ef..6b1cb7781f 100644
--- a/features/linknewdevice/impl/src/main/res/values-cy/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-cy/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Os ydych chi\'n dod ar draws yr un broblem, rhowch gynnig ar rwydwaith wifi gwahanol neu defnyddiwch eich data symudol yn lle wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Os nad yw hynny\'n gweithio, mewngofnodwch â llaw"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Nid yw\'r cysylltiad yn ddiogel"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Bydd gofyn i chi nodi\'r ddau ddigid sy\'n cael eu dangos ar y ddyfais hon."</string>
+  <string name="screen_qr_code_login_device_code_title">"Rhowch y rhif isod ar eich dyfais arall"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Cafodd y mewngofnodi ei ddiddymu ar y ddyfais arall."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Cais mewngofnodi wedi\'i ddiddymu"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Cafodd y mewngofnodi ar y ddyfais arall ei wrthod."</string>
@@ -35,4 +37,5 @@ Ceisiwch fewngofnodi â llaw, neu sganiwch y cod QR gyda dyfais arall."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Mae angen i chi roi caniatâd i %1$s ddefnyddio camera eich dyfais er mwyn parhau."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Caniatáu mynediad camera i sganio\'r cod QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Digwyddodd gwall annisgwyl. Ceisiwch eto."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Yn aros am eich dyfais arall"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-da/translations.xml b/features/linknewdevice/impl/src/main/res/values-da/translations.xml
index 5bc9f04fb9..45f510e90b 100644
--- a/features/linknewdevice/impl/src/main/res/values-da/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-da/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Hvis du støder på det samme problem, kan du prøve et andet wifi-netværk eller bruge dine mobildata i stedet for wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Hvis det ikke virker, skal du logge ind manuelt"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Forbindelsen er ikke sikker"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Du bliver bedt om at indtaste de to cifre, der vises på denne enhed."</string>
+  <string name="screen_qr_code_login_device_code_title">"Indtast nummeret herunder på din anden enhed"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Login blev annulleret på den anden enhed."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Anmodning om login annulleret"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Login blev afvist på den anden enhed."</string>
@@ -54,4 +56,5 @@ Prøv at logge ind manuelt, eller scan QR-koden med en anden enhed."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Du skal give tilladelse til at %1$s kan benytte enhedens kamera, for at fortsætte."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Tillad kameraadgang for at scanne QR-koden"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Der opstod en uventet fejl. Prøv venligst igen."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Venter på din anden enhed"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-de/translations.xml b/features/linknewdevice/impl/src/main/res/values-de/translations.xml
index b8ad8b80ef..773878c736 100644
--- a/features/linknewdevice/impl/src/main/res/values-de/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-de/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Wenn das Problem bestehen bleibt, versuche es mit einem anderen WLAN-Netzwerk oder verwende deine mobilen Daten statt WLAN."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Wenn das nicht funktioniert, melde dich manuell an"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Die Verbindung ist nicht sicher"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Du wirst aufgefordert, die beiden unten abgebildeten Ziffern einzugeben."</string>
+  <string name="screen_qr_code_login_device_code_title">"Trage die unten angezeigte Zahl auf einem anderen Device ein"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Die Anmeldung wurde auf dem anderen Gerät abgebrochen."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Anmeldeanfrage abgebrochen"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Die Anmeldung auf dem anderen Gerät wurde abgelehnt."</string>
@@ -54,4 +56,5 @@ Versuche, dich manuell anzumelden, oder scanne den QR-Code mit einem anderen Ger
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Du musst %1$s die Berechtigung erteilen, die Kamera deines Geräts zu verwenden, um fortzufahren."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Erlaube Zugriff auf die Kamera zum Scannen des QR-Codes"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Ein unerwarteter Fehler ist aufgetreten. Bitte versuche es erneut."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Warten auf dein anderes Gerät"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-el/translations.xml b/features/linknewdevice/impl/src/main/res/values-el/translations.xml
index 26c917075b..6c0e77da40 100644
--- a/features/linknewdevice/impl/src/main/res/values-el/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-el/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Εάν αντιμετωπίσεις το ίδιο πρόβλημα, δοκίμασε ένα διαφορετικό δίκτυο wifi ή χρησιμοποίησε τα δεδομένα του κινητού σου αντί για wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Εάν δεν λειτουργήσει, συνδέσου χειροκίνητα"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Η σύνδεση δεν είναι ασφαλής"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Θα σου ζητηθεί να εισάγεις τα δύο ψηφία που εμφανίζονται σε αυτήν τη συσκευή."</string>
+  <string name="screen_qr_code_login_device_code_title">"Εισήγαγε τον παρακάτω αριθμό στην άλλη συσκευή σου"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Η σύνδεση ακυρώθηκε στην άλλη συσκευή."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Το αίτημα σύνδεσης ακυρώθηκε"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Η σύνδεση απορρίφθηκε στην άλλη συσκευή."</string>
@@ -54,4 +56,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Πρέπει να δώσεις άδεια για %1$s για να χρησιμοποιήσεις την κάμερα της συσκευής σου και να συνεχίσεις."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Επέτρεψε την πρόσβαση της κάμερας για σάρωση του κωδικού QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Παρουσιάστηκε ένα απροσδόκητο σφάλμα. Παρακαλώ προσπάθησε ξανά."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Αναμονή για την άλλη σου συσκευή"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-es/translations.xml b/features/linknewdevice/impl/src/main/res/values-es/translations.xml
index 032813a2c4..c33dc3ad88 100644
--- a/features/linknewdevice/impl/src/main/res/values-es/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-es/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Si te encuentras con el mismo problema, prueba con una red wifi diferente o usa tus datos móviles en lugar de wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Si eso no funciona, inicia sesión manualmente"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"La conexión no es segura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Se te pedirá que introduzcas los dos dígitos mostrados en este dispositivo."</string>
+  <string name="screen_qr_code_login_device_code_title">"Introduce el número que aparece a continuación en tu otro dispositivo"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"El inicio de sesión se canceló en el otro dispositivo."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Solicitud de inicio de sesión cancelada"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"El inicio de sesión se rechazó en el otro dispositivo."</string>
@@ -35,4 +37,5 @@ Intenta iniciar sesión manualmente o escanea el código QR con otro dispositivo
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Tienes que dar permiso a %1$s para que utilice la cámara de tu dispositivo y así poder continuar."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Permite el acceso a la cámara para escanear el código QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Se ha producido un error inesperado. Vuelve a intentarlo."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"A la espera de tu otro dispositivo"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-et/translations.xml b/features/linknewdevice/impl/src/main/res/values-et/translations.xml
index 6aa1398e0a..10f8af5e11 100644
--- a/features/linknewdevice/impl/src/main/res/values-et/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-et/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Kui sama probleem kordub, siis kasuta mõnda muud WiFi- või mobiilset andmedsideühendust"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Kui see ka ei aita, siis logi sisse käsitsi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Ühendus pole turvaline"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Sul palutakse sisestada kaks selles seadmes kuvatud numbrit."</string>
+  <string name="screen_qr_code_login_device_code_title">"Sisesta see number oma teises seadmes"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Sisselogimine katkestati teises seadmes."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Sisselogimispäring on tühistatud"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Sisselogimisest on teises seadmes keeldutud."</string>
@@ -54,4 +56,5 @@ Proovi käsitsi sisselogimist või skaneeri QR-koodi mõne muu seadmega."</strin
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Jätkamiseks pead lubama, et %1$s saab kasutada sinu nutiseadme kaamerat"</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"QR-koodi lugemiseks luba kaamerat kasutada"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Tekkis ootamatu viga. Palun proovi uuesti."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Ootame sinu teise seadme järgi"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-eu/translations.xml b/features/linknewdevice/impl/src/main/res/values-eu/translations.xml
index 06cc0fd857..8680ad94c7 100644
--- a/features/linknewdevice/impl/src/main/res/values-eu/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-eu/translations.xml
@@ -16,6 +16,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Saiatu berriro QR kodearekin saioa hasten sare-arazo bat izan bada"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Horrek ez badu funtzionatzen, hasi saioa eskuz"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Konexioa ez da segurua"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Gailu honetan agertzen diren bi digituak sartzeko eskatuko zaizu."</string>
+  <string name="screen_qr_code_login_device_code_title">"Sartu beheko zenbakia beste gailuan"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Saioa hasteko eskaera bertan behera utzi da beste gailuan"</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Saioa hasteko eskaera bertan behera utzi da"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Saioa hasteari uko egin zaio beste dispositiboan."</string>
@@ -33,4 +35,5 @@ Saiatu saioa eskuz hasten, edo eskaneatu QR kodea beste gailu batean."</string>
   <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR kode okerra"</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Baimendu kameraren sarbidea QR kodea eskaneatzeko"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Ustekabeko errore bat gertatu da. Saiatu berriro."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Beste gailuaren zain"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-fa/translations.xml b/features/linknewdevice/impl/src/main/res/values-fa/translations.xml
index 804fa653ad..f7b0d7f3db 100644
--- a/features/linknewdevice/impl/src/main/res/values-fa/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-fa/translations.xml
@@ -13,8 +13,12 @@
   <string name="screen_link_new_device_mobile_step2">"گزینش %1$s"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"نتوانست اتّصالی امن به افزارهٔ جدید بسازد. افزاره‌های موجودتان هنوز امنند و نیازی نیست نگرانشان باشید."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"اکنون چه؟"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"آزمودن ورود دوباره با کد پاس در صورت مشکل شبکه"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"آزمون شبکهٔ وای‌فایی دیگر یا استفاده از دادهٔ همراهتان به جای وای‌فای در صورت مواجه دوباره با مشکل"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"ورود دستی در صورت کار نکردنش"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"اتّصال ناامن"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"از شما خواسته خواهد شد که دو رقم نشان داده روی این افزاره را وارد کنید."</string>
+  <string name="screen_qr_code_login_device_code_title">"شمارهٔ زیر را روی افزارهٔ دیگرتان وارد کنید"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"ورود روی افزارهٔ دیگر لغو شد."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"درخواست ورد لغو شد"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"ورود به دست افزارهٔ دیگر رد شد."</string>
@@ -33,4 +37,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"برای ادامه باید اجازهٔ استفادهٔ %1$s از دوربین افزاره‌تان را بدهید."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"اجازهٔ دسترسی دوربین برای پویش کد پاس"</string>
   <string name="screen_qr_code_login_unknown_error_description">"خطایی غیرمنتظره رخ داد. لطفاً دوباره تلاش کنید."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"منتظر افزارهٔ دیگرتان"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-fi/translations.xml b/features/linknewdevice/impl/src/main/res/values-fi/translations.xml
index f8e999f886..0ba5a30e58 100644
--- a/features/linknewdevice/impl/src/main/res/values-fi/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-fi/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Jos kohtaat saman ongelman, kokeile toista wifi-verkkoa tai käytä mobiilidataa wifi-yhteyden sijaan"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Jos tämä ei auta, kirjaudu sisään manuaalisesti"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Yhteys ei ole turvallinen"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Sinua pyydetään antamaan tässä laitteessa näkyvät kaksi numeroa."</string>
+  <string name="screen_qr_code_login_device_code_title">"Kirjoita alla oleva numero toisella laitteellasi"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Kirjautuminen peruutettiin toisella laitteella."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Kirjautumispyyntö peruutettu"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Kirjautuminen hylättiin toisella laitteella."</string>
@@ -54,4 +56,5 @@ Yritä kirjautua sisään manuaalisesti tai skannaa QR-koodi toisella laitteella
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Jatkaaksesi sinun on annettava lupa %1$s -sovellukselle käyttää laitteesi kameraa."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Salli lupa kameraan QR-koodin skannaamiseksi"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Tapahtui odottamaton virhe. Yritä uudelleen."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Odotetaan toista laitettasi"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-fr/translations.xml b/features/linknewdevice/impl/src/main/res/values-fr/translations.xml
index 0c91dca7a1..12a770af17 100644
--- a/features/linknewdevice/impl/src/main/res/values-fr/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-fr/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Si vous rencontrez le même problème, essayez un autre réseau wifi ou utilisez vos données mobiles au lieu du wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Si cela ne fonctionne pas, connectez-vous manuellement"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"La connexion n’est pas sécurisée"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Il vous sera demandé de saisir les deux chiffres affichés sur cet appareil."</string>
+  <string name="screen_qr_code_login_device_code_title">"Saisissez le nombre ci-dessous sur votre autre appareil"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"La connexion a été annulée sur l’autre appareil."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Demande de connexion annulée"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"La connexion a été refusée sur l’autre appareil."</string>
@@ -52,4 +54,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Vous devez autoriser %1$s à utiliser la camera de votre appareil pour continuer."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Autoriser l’usage de la caméra pour scanner le code QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Une erreur inattendue s’est produite. Veuillez réessayer."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"En attente de votre autre session"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-hr/translations.xml b/features/linknewdevice/impl/src/main/res/values-hr/translations.xml
index 20c194ef93..8561e63ad3 100644
--- a/features/linknewdevice/impl/src/main/res/values-hr/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-hr/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Ako se problem ponovi, pokušajte s drugom Wi-Fi mrežom ili mobilnim podatcima umjesto Wi-Fi-ja."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Ako to ne uspije, prijavite se ručno"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Veza nije sigurna"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Od vas će se zatražiti da unesete dvije znamenke prikazane na ovom uređaju."</string>
+  <string name="screen_qr_code_login_device_code_title">"Unesite ispod navedeni broj u svoj drugi uređaj"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Prijava je otkazana na drugom uređaju."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Zahtjev za prijavu je otkazan"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Prijava je odbijena na drugom uređaju."</string>
@@ -54,4 +56,5 @@ Pokušajte se prijaviti ručno ili skenirajte QR kod drugim uređajem."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Za nastavak morate dati dopuštenje za %1$s da biste se mogli služiti kamerom svog uređaja."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Dopustite pristup kameri kako biste mogli skenirati QR kod"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Došlo je do neočekivane pogreške. Pokušajte ponovno."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Čekanje na vaš drugi uređaj"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-hu/translations.xml b/features/linknewdevice/impl/src/main/res/values-hu/translations.xml
index 51fe30bbd8..8cefed94cc 100644
--- a/features/linknewdevice/impl/src/main/res/values-hu/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-hu/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Ha ugyanezzel a problémával találkozik, próbálkozzon másik Wi-Fi-hálózattal, vagy a Wi-Fi helyett használja a mobil-adatkapcsolatát"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Ha ez nem működik, jelentkezzen be kézileg"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"A kapcsolat nem biztonságos"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"A rendszer kérni fogja, hogy adja meg az alábbi két számjegyet az eszközén."</string>
+  <string name="screen_qr_code_login_device_code_title">"Adja meg az alábbi számot a másik eszközén"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"A bejelentkezést megszakították a másik eszközön."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Bejelentkezési kérés törölve"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"A bejelentkezést elutasították a másik eszközön."</string>
@@ -54,4 +56,5 @@ Próbáljon meg kézileg bejelentkezni, vagy olvassa be a QR-kódot egy másik e
   <string name="screen_qr_code_login_no_camera_permission_state_description">"A folytatáshoz engedélyeznie kell, hogy az %1$s használhassa az eszköz kameráját."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Engedélyezze a kamera elérését a QR-kód beolvasásához"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Váratlan hiba történt. Próbálja meg újra."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Várakozás a másik eszközre"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-in/translations.xml b/features/linknewdevice/impl/src/main/res/values-in/translations.xml
index 20badba9ba..8fb4919836 100644
--- a/features/linknewdevice/impl/src/main/res/values-in/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-in/translations.xml
@@ -1,26 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_link_new_device_desktop_scanning_title">"Pindai kode QR"</string>
+  <string name="screen_link_new_device_desktop_step1">"Buka %1$s di laptop atau komputer desktop."</string>
   <string name="screen_link_new_device_desktop_step3">"Pindai kode QR dengan perangkat ini"</string>
   <string name="screen_link_new_device_desktop_submit">"Siap untuk memindai"</string>
+  <string name="screen_link_new_device_desktop_title">"Buka %1$s di komputer desktop untuk mendapatkan kode QR."</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Angkanya tidak cocok"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Masukkan kode 2 digit"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Ini akan memverifikasi bahwa koneksi ke perangkat Anda yang lain aman."</string>
+  <string name="screen_link_new_device_enter_number_title">"Masukkan nomor yang ditampilkan di perangkat Anda yang lain"</string>
   <string name="screen_link_new_device_error_app_not_supported_subtitle">"Penyedia akun Anda tidak mendukung %1$s."</string>
   <string name="screen_link_new_device_error_app_not_supported_title">"%1$s tidak didukung"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Penyedia akun Anda tidak mendukung masuk ke perangkat baru menggunakan kode QR."</string>
   <string name="screen_link_new_device_error_not_supported_title">"Kode QR tidak didukung"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"Proses masuk dibatalkan di perangkat lain."</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"Permintaan masuk dibatalkan"</string>
   <string name="screen_link_new_device_error_request_timeout_subtitle">"Masa masuk kedaluwarsa. Silakan coba lagi."</string>
   <string name="screen_link_new_device_error_request_timeout_title">"Proses masuk tidak selesai tepat waktu"</string>
+  <string name="screen_link_new_device_mobile_step1">"Buka %1$s di perangkat lain."</string>
   <string name="screen_link_new_device_mobile_step2">"Pilih %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"Masuk dengan kode QR"</string>
+  <string name="screen_link_new_device_mobile_step3">"Pindai kode QR yang ditampilkan di sini dengan perangkat lain."</string>
+  <string name="screen_link_new_device_mobile_title">"Buka %1$s di perangkat lain."</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Komputer desktop"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Memuat kode QR…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Perangkat seluler"</string>
+  <string name="screen_link_new_device_root_title">"Jenis perangkat apa yang ingin Anda tautkan?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Silakan coba lagi dan pastikan Anda telah memasukkan kode 2 digit dengan benar. Jika angka-angka tersebut masih tidak cocok, hubungi penyedia akun Anda."</string>
+  <string name="screen_link_new_device_wrong_number_title">"Angkanya tidak cocok"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Koneksi aman tidak dapat dibuat ke perangkat baru. Perangkat Anda yang ada masih aman dan Anda tidak perlu khawatir tentang mereka."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Apa sekarang?"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Coba masuk lagi dengan kode QR jika ini adalah masalah jaringan"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Jika Anda mengalami masalah yang sama, coba jaringan Wi-Fi yang berbeda atau gunakan data seluler Anda daripada Wi-Fi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Jika tidak berhasil, masuk secara manual"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Koneksi tidak aman"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Anda akan diminta untuk memasukkan dua digit yang ditunjukkan di perangkat ini."</string>
+  <string name="screen_qr_code_login_device_code_title">"Masukkan nomor bawah di perangkat Anda yang lain"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Proses masuk dibatalkan di perangkat lain."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Permintaan masuk dibatalkan"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Proses masuk ditolak di perangkat lain."</string>
   <string name="screen_qr_code_login_error_declined_title">"Proses masuk ditolak"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Anda tidak perlu melakukan hal lain."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Perangkat Anda yang lain sudah masuk"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Masa masuk kedaluwarsa. Silakan coba lagi."</string>
   <string name="screen_qr_code_login_error_expired_title">"Proses masuk tidak selesai tepat waktu"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Perangkat Anda yang lain tidak mendukung masuk ke %s dengan kode QR.
@@ -35,4 +56,5 @@ Coba masuk secara manual, atau pindai kode QR dengan perangkat lain."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Anda perlu memberikan izin ke %1$s untuk menggunakan kamera perangkat Anda untuk melanjutkan."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Izinkan akses kamera untuk memindai kode QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Terjadi kesalahan tak terduga. Silakan coba lagi."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Menunggu perangkat Anda yang lain"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-it/translations.xml b/features/linknewdevice/impl/src/main/res/values-it/translations.xml
index 0cf548c19b..6a32c70fe4 100644
--- a/features/linknewdevice/impl/src/main/res/values-it/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-it/translations.xml
@@ -1,26 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_link_new_device_desktop_scanning_title">"Scansiona il codice QR"</string>
+  <string name="screen_link_new_device_desktop_step1">"Apri %1$s su un laptop o un computer desktop"</string>
   <string name="screen_link_new_device_desktop_step3">"Scansiona il codice QR con questo dispositivo"</string>
   <string name="screen_link_new_device_desktop_submit">"Pronto per la scansione"</string>
+  <string name="screen_link_new_device_desktop_title">"Apri %1$s su un computer desktop per ottenere il codice QR"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"I numeri non corrispondono"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Inserisci il codice a 2 cifre"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Questo verificherà che la connessione con l\'altro dispositivo sia sicura."</string>
+  <string name="screen_link_new_device_enter_number_title">"Inserisci il numero visualizzato sull\'altro dispositivo"</string>
   <string name="screen_link_new_device_error_app_not_supported_subtitle">"Il tuo fornitore di account non supporta %1$s."</string>
   <string name="screen_link_new_device_error_app_not_supported_title">"%1$s non supportato"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Il tuo provider di account non supporta l\'accesso a un nuovo dispositivo tramite codice QR."</string>
   <string name="screen_link_new_device_error_not_supported_title">"Codice QR non supportato"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"L\'accesso è stato annullato sull\'altro dispositivo."</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"Richiesta di accesso annullata"</string>
   <string name="screen_link_new_device_error_request_timeout_subtitle">"L\'accesso è scaduto. Riprova."</string>
   <string name="screen_link_new_device_error_request_timeout_title">"L\'accesso non è stato completato in tempo"</string>
+  <string name="screen_link_new_device_mobile_step1">"Apri %1$s sull\'altro dispositivo"</string>
   <string name="screen_link_new_device_mobile_step2">"Seleziona %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“Accedi con codice QR”"</string>
+  <string name="screen_link_new_device_mobile_step3">"Scansiona il codice QR qui riportato con l\'altro dispositivo"</string>
+  <string name="screen_link_new_device_mobile_title">"Apri %1$s sull\'altro dispositivo"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Computer desktop"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Caricamento codice QR in corso…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Dispositivo mobile"</string>
+  <string name="screen_link_new_device_root_title">"Che tipo di dispositivo desideri collegare?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Prova di nuovo e assicurati di aver inserito correttamente il codice a 2 cifre. Se i numeri continuano a non corrispondere, contatta il gestore del tuo account."</string>
+  <string name="screen_link_new_device_wrong_number_title">"I numeri non corrispondono"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Non è stato possibile stabilire una connessione sicura con il nuovo dispositivo. I tuoi dispositivi esistenti sono ancora al sicuro e non devi preoccuparti di loro."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"E adesso?"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Prova ad accedere di nuovo con un codice QR nel caso si sia verificato un problema di rete."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Se riscontri lo stesso problema, prova con un altra rete wifi o usa i dati mobili al posto del wifi."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Se il problema persiste, accedi manualmente"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"La connessione non è sicura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Ti verrà chiesto di inserire le due cifre mostrate su questo dispositivo."</string>
+  <string name="screen_qr_code_login_device_code_title">"Inserisci il numero qui sotto sull\'altro dispositivo"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"L\'accesso è stato annullato sull\'altro dispositivo."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Richiesta di accesso annullata"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"L\'accesso è stato rifiutato sull\'altro dispositivo."</string>
   <string name="screen_qr_code_login_error_declined_title">"Accesso rifiutato"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Non devi fare altro."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"L\'altro tuo dispositivo è già connesso"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"L\'accesso è scaduto. Riprova."</string>
   <string name="screen_qr_code_login_error_expired_title">"L\'accesso non è stato completato in tempo"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"L\'altro dispositivo non supporta l\'accesso a %s con un codice QR.
@@ -35,4 +56,5 @@ Prova ad accedere manualmente o scansiona il codice QR con un altro dispositivo.
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Per continuare, è necessario fornire l\'autorizzazione a %1$s per utilizzare la fotocamera del dispositivo."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Consenti l\'accesso alla fotocamera per la scansione del codice QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Si è verificato un errore inatteso. Riprova."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"In attesa dell\'altro dispositivo"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ja/translations.xml b/features/linknewdevice/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..c4f09dcd0e
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_link_new_device_desktop_scanning_title">"QRコードを読み取り"</string>
+  <string name="screen_link_new_device_desktop_step1">"%1$s をコンピュータで開いてください"</string>
+  <string name="screen_link_new_device_desktop_step3">"この端末でQRコードを読み取る"</string>
+  <string name="screen_link_new_device_desktop_submit">"読み取る"</string>
+  <string name="screen_link_new_device_desktop_title">"%1$s をコンピュータで開き、QRコードを表示してください"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"数字が一致しません"</string>
+  <string name="screen_link_new_device_enter_number_notice">"2桁の数字を入力してください"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"他の端末との接続が安全であることを確認します。"</string>
+  <string name="screen_link_new_device_enter_number_title">"一方の端末で表示される数字を入力してください"</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"アカウント提供元が %1$s に対応していません。"</string>
+  <string name="screen_link_new_device_error_app_not_supported_title">"%1$s に非対応"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"あなたのアカウント提供元は、QRコードによる追加のサインインに対応していません。"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"QRコードに非対応"</string>
+  <string name="screen_link_new_device_error_request_cancelled_subtitle">"もう一方の端末がサインインをキャンセルしました"</string>
+  <string name="screen_link_new_device_error_request_cancelled_title">"サインインのリクエストがキャンセルされました"</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"サインインが無効です。もう一度試してください。"</string>
+  <string name="screen_link_new_device_error_request_timeout_title">"サインインが時間内に完了しませんでした"</string>
+  <string name="screen_link_new_device_mobile_step1">"%1$s を他の端末で開いてください"</string>
+  <string name="screen_link_new_device_mobile_step2">"%1$s を選択"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"\"QRコードでサインイン\""</string>
+  <string name="screen_link_new_device_mobile_step3">"表示されているQRコードを一方の端末で読み取ってください"</string>
+  <string name="screen_link_new_device_mobile_title">"%1$s を他の端末で開いてください"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"コンピュータ"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"QRコードを読み込み中…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"モバイル端末"</string>
+  <string name="screen_link_new_device_root_title">"どのような端末を使用してサインインしますか？"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"入力した2桁の数字が正しいことを確認し、再度試してください。問題が継続する場合はアカウント提供元に問い合わせてください。"</string>
+  <string name="screen_link_new_device_wrong_number_title">"数字が一致しません"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"新しい端末で安全な通信を確立できませんでした。既存の端末は安全な状態を維持しています。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"どうしますか？"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"ネットワークの問題の可能性があるため、再度QRコードでログインを試してください。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"同様の問題が発生する場合は、異なるWi-Fiやモバイルデータ通信を試してください"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"問題が解決しない場合は、手動でサインインしてください"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_title">"接続が安全ではありません"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"この端末に表示される2つの数字の入力を要求されます"</string>
+  <string name="screen_qr_code_login_device_code_title">"もう一方に表示される数字を入力してください"</string>
+  <string name="screen_qr_code_login_error_cancelled_subtitle">"もう一方の端末がサインインをキャンセルしました"</string>
+  <string name="screen_qr_code_login_error_cancelled_title">"サインインのリクエストがキャンセルされました"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"もう一方の端末でサインインを拒否されました"</string>
+  <string name="screen_qr_code_login_error_declined_title">"サインインを拒否"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"他には何もする必要はありません。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"他の端末で既にサインインしています"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"サインインが無効です。もう一度試してください。"</string>
+  <string name="screen_qr_code_login_error_expired_title">"サインインが時間内に完了しませんでした"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"QRコードを使用した %s へのサインインに他の端末が対応していません。
+
+異なる端末でQRコードを読み取るか、手動でサインインしてください。"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QRコードに非対応"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"アカウント提供元が %1$s に対応していません。"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s に非対応"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"もう一方の端末に表示されているQRコードを使用してください"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"もう一度やり直してください"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QRコードが間違っています"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"続行するには、%1$s にカメラの使用を許可する必要があります。"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"QRコードを読み取るため、カメラへのアクセスを許可"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"予期せぬ問題が発生しました。もう一度試してください。"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"一方の端末を待機しています"</string>
+</resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ko/translations.xml b/features/linknewdevice/impl/src/main/res/values-ko/translations.xml
index 3b31c8fdc2..1d69f58ca5 100644
--- a/features/linknewdevice/impl/src/main/res/values-ko/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-ko/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"동일한 문제를 겪으신 경우 다른 Wi-Fi 네트워크를 사용해 보거나 Wi-Fi 대신 모바일 데이터를 사용해 보세요."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"만약 작동하지 않는 경우, 수동으로 로그인하세요."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"연결이 안전하지 않습니다"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"이 장치에 표시된 두 자리 숫자를 입력하라는 메시지가 표시됩니다."</string>
+  <string name="screen_qr_code_login_device_code_title">"다른 device 에 아래 번호를 입력하세요"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"다른 기기에서 로그인이 취소되었습니다."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"로그인 요청이 취소되었습니다"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"다른 기기에서 로그인이 거부되었습니다."</string>
@@ -54,4 +56,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"계속하려면 %1$s 가 기기의 카메라를 사용할 수 있도록 권한을 부여해야 합니다."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"카메라 액세스를 허용하여 QR 코드를 스캔하세요"</string>
   <string name="screen_qr_code_login_unknown_error_description">"예기치 않은 오류가 발생했습니다. 다시 시도해 주세요."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"다른 기기를 기다리고 있습니다"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-nb/translations.xml b/features/linknewdevice/impl/src/main/res/values-nb/translations.xml
index 6b8541b25b..4e8844ee2f 100644
--- a/features/linknewdevice/impl/src/main/res/values-nb/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-nb/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Hvis du støter på det samme problemet, kan du prøve et annet wifi-nettverk eller bruke mobildata i stedet for wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Hvis det ikke fungerer, kan du logge på manuelt"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Forbindelsen er ikke sikker"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Du blir bedt om å skrive inn de to sifrene som vises på denne enheten."</string>
+  <string name="screen_qr_code_login_device_code_title">"Skriv inn nummeret nedenfor på den andre enheten"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Påloggingen ble kansellert på den andre enheten."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Påloggingsforespørsel kansellert"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Påloggingen ble avvist på den andre enheten."</string>
@@ -54,4 +56,5 @@ Prøv å logge på manuelt, eller skann QR-koden med en annen enhet."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Du må gi tillatelse til at %1$s kan bruke enhetens kamera for å fortsette."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Tillat kameratilgang for å skanne QR-koden"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Det oppstod en uventet feil. Prøv igjen."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Venter på den andre enheten din"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-nl/translations.xml b/features/linknewdevice/impl/src/main/res/values-nl/translations.xml
index 407a470e48..6dbc2c18c2 100644
--- a/features/linknewdevice/impl/src/main/res/values-nl/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-nl/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Als je hetzelfde probleem ondervindt, probeer dan een ander wifi-netwerk of gebruik je mobiele data in plaats van wifi."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Als dat niet werkt, log dan handmatig in"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Verbinding niet veilig"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Daar word je gevraagd om de twee cijfers in te voeren die op dit apparaat worden weergegeven."</string>
+  <string name="screen_qr_code_login_device_code_title">"Voer het onderstaande nummer in op je andere apparaat"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"De aanmelding is geannuleerd op het andere apparaat."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Login verzoek geannuleerd"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"De aanmelding is geweigerd op het andere apparaat."</string>
@@ -35,4 +37,5 @@ Probeer handmatig in te loggen, of scan de QR code met een ander apparaat."</str
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Je moet %1$s toestemming geven om de camera van je apparaat te gebruiken om verder te gaan."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Cameratoegang toestaan om de QR-code te scannen"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Er is een onverwachte fout opgetreden. Probeer het opnieuw."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Aan het wachten op je andere apparaat"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-pl/translations.xml b/features/linknewdevice/impl/src/main/res/values-pl/translations.xml
index 4db42a2a49..38279147f6 100644
--- a/features/linknewdevice/impl/src/main/res/values-pl/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-pl/translations.xml
@@ -1,26 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_link_new_device_desktop_scanning_title">"Skanuj kod QR"</string>
+  <string name="screen_link_new_device_desktop_step1">"Otwórz %1$s na laptopie lub komputerze stacjonarnym"</string>
   <string name="screen_link_new_device_desktop_step3">"Zeskanuj kod QR za pomocą tego urządzenia"</string>
   <string name="screen_link_new_device_desktop_submit">"Gotowy do skanowania"</string>
+  <string name="screen_link_new_device_desktop_title">"Otwórz %1$s na komputerze stacjonarnym, aby uzyskać kod QR"</string>
+  <string name="screen_link_new_device_desktop_warning">"Zeskanuj kod QR dopiero po wykonaniu powyższych kroków na swoim urządzeniu. Nigdy nie skanuj kodu przesłanego przez inną osobę."</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Liczby nie pasują do siebie"</string>
+  <string name="screen_link_new_device_enter_number_notice">"Wprowadź 2-cyfrowy kod"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"Pozwoli to sprawdzić, czy połączenie z drugim urządzeniem jest bezpieczne."</string>
+  <string name="screen_link_new_device_enter_number_title">"Wprowadź numer wyświetlany na drugim urządzeniu"</string>
   <string name="screen_link_new_device_error_app_not_supported_subtitle">"Twój dostawca konta nie obsługuje %1$s."</string>
   <string name="screen_link_new_device_error_app_not_supported_title">"%1$s nie jest wspierany"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"Twój dostawca konta nie wspiera logowania na nowym urządzeniu za pomocą kodu QR."</string>
   <string name="screen_link_new_device_error_not_supported_title">"Kod QR nie jest wspierany"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"Logowanie zostało anulowane na drugim urządzeniu."</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"Prośba o logowanie została anulowana"</string>
   <string name="screen_link_new_device_error_request_timeout_subtitle">"Logowanie wygasło. Spróbuj ponownie."</string>
   <string name="screen_link_new_device_error_request_timeout_title">"Logowanie nie zostało ukończone na czas"</string>
+  <string name="screen_link_new_device_mobile_step1">"Otwórz %1$s na drugim urządzeniu"</string>
   <string name="screen_link_new_device_mobile_step2">"Wybierz %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"“Zaloguj się za pomocą kodu QR”"</string>
+  <string name="screen_link_new_device_mobile_step3">"Zeskanuj kod QR pokazany tutaj za pomocą drugiego urządzenia"</string>
+  <string name="screen_link_new_device_mobile_title">"Otwórz %1$s na drugim urządzeniu"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"Komputer stacjonarny"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"Ładowanie kodu QR…"</string>
+  <string name="screen_link_new_device_root_mobile_device">"Urządzenie mobilne"</string>
+  <string name="screen_link_new_device_root_title">"Jakiego typu urządzenie chcesz powiązać?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Spróbuj ponownie i upewnij się, że 2-cyfrowy kod został wpisany prawidłowo. Jeśli liczby wciąż się nie zgadzają, skontaktuj się ze swoim dostawcą konta."</string>
+  <string name="screen_link_new_device_wrong_number_title">"Liczby nie pasują do siebie"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Nie udało się nawiązać bezpiecznego połączenia z nowym urządzeniem. Twoje istniejące urządzenia są nadal bezpieczne i nie musisz się o nie martwić."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Co teraz?"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Spróbuj zalogować się ponownie za pomocą kodu QR, jeśli byłby to problem z siecią"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Jeśli napotkasz ten sam problem, użyj innej sieci Wi-FI lub danych mobilnych"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Jeśli to nie zadziała, zaloguj się ręcznie"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Połączenie nie jest bezpieczne"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Zostaniesz poproszony o wprowadzenie dwóch cyfr widocznych na tym urządzeniu."</string>
+  <string name="screen_qr_code_login_device_code_title">"Wprowadź numer poniżej na innym urządzeniu"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Logowanie zostało anulowane na drugim urządzeniu."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Prośba o logowanie została anulowana"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Logowanie zostało odrzucone na drugim urządzeniu."</string>
   <string name="screen_qr_code_login_error_declined_title">"Logowanie odrzucone"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Nie musisz już robić nic więcej."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Twoje drugie urządzenie jest już zalogowane"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Logowanie wygasło. Spróbuj ponownie."</string>
   <string name="screen_qr_code_login_error_expired_title">"Logowanie nie zostało ukończone na czas"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Twoje drugie urządzenie nie wspiera logowania się do %s za pomocą kodu QR.
@@ -35,4 +57,5 @@ Spróbuj zalogować się ręcznie lub zeskanuj kod QR na innym urządzeniu."</st
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Musisz przyznać uprawnienia %1$s do korzystania z kamery, aby kontynuować."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Zezwól na dostęp do kamery, aby zeskanować kod QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Wystąpił nieoczekiwany błąd. Spróbuj ponownie."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Oczekiwanie na drugie urządzenie"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-pt-rBR/translations.xml b/features/linknewdevice/impl/src/main/res/values-pt-rBR/translations.xml
index f11bdc6e6d..1680e5c0ff 100644
--- a/features/linknewdevice/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-pt-rBR/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Se o problema persistir, tente uma rede Wi-Fi diferente ou use seus dados móveis em vez de Wi-Fi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Se isso não funcionar, entre manualmente"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Conexão insegura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Você será solicitado a inserir os dois dígitos mostrados neste dispositivo."</string>
+  <string name="screen_qr_code_login_device_code_title">"Digite o número abaixo no seu outro dispositivo"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"A entrada foi cancelada no outro dispositivo."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Solicitação de entrada foi cancelada"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"A entrada foi recusada no outro dispositivo."</string>
@@ -54,4 +56,5 @@ Tente entrar manualmente ou ler o código QR com outro dispositivo."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Você deve permitir que o %1$s use a câmera do seu dispositivo para continuar."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Permita o acesso à câmera para ler o código QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Ocorreu um erro inesperado. Tente novamente."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Aguardando seu outro dispositivo"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-pt/translations.xml b/features/linknewdevice/impl/src/main/res/values-pt/translations.xml
index da6da08f38..eff27b17f0 100644
--- a/features/linknewdevice/impl/src/main/res/values-pt/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-pt/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Se tiveres o mesmo problema, experimenta uma rede Wi-Fi diferente ou utiliza os teus dados móveis."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Se isso não funcionar, inicia sessão manualmente"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Ligação insegura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Ser-te-á pedido que insiras os dois dígitos indicados neste dispositivo."</string>
+  <string name="screen_qr_code_login_device_code_title">"Insere o número abaixo no teu dispositivo"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"O início de sessão foi cancelado no outro dispositivo."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Pedido de início de sessão cancelado"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"O início de sessão foi rejeitado no outro dispositivo."</string>
@@ -35,4 +37,5 @@ Tenta iniciar a sessão manualmente ou digitaliza o código QR com outro disposi
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Para continuar, tens que dar permissão à %1$s para aceder à câmara do teu dispositivo."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Permitir o acesso à câmara para ler o código QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Ocorreu um erro inesperado. Tenta novamente."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"À espera do teu outro dispositivo"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ro/translations.xml b/features/linknewdevice/impl/src/main/res/values-ro/translations.xml
index f1a4f3db59..57d439240d 100644
--- a/features/linknewdevice/impl/src/main/res/values-ro/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-ro/translations.xml
@@ -26,6 +26,7 @@
   <string name="screen_link_new_device_root_loading_qr_code">"Se încarcă codul QR…"</string>
   <string name="screen_link_new_device_root_mobile_device">"Dispozitiv mobil"</string>
   <string name="screen_link_new_device_root_title">"Ce tip de dispozitiv doriți să conectați?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Încercați din nou și asigurați-vă că ați introdus corect codul de 2 cifre. Dacă numerele tot nu se potrivesc, contactați furnizorul contului."</string>
   <string name="screen_link_new_device_wrong_number_title">"Numerele nu se potrivesc"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Nu a putut fi făcută o conexiune sigură la noul dispozitiv. Dispozitivele existente sunt încă în siguranță și nu trebuie să vă faceți griji cu privire la ele."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Și acum?"</string>
@@ -33,10 +34,14 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Dacă întâmpinați aceeași problemă, încercați o altă rețea Wi-Fi sau utilizați datele mobile în loc de Wi-Fi."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Dacă nu funcționează, conectați-vă manual"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Conexiunea nu este sigură"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Vi se va cere să introduceți cele două cifre afișate pe acest dispozitiv."</string>
+  <string name="screen_qr_code_login_device_code_title">"Introduceți numărul de mai jos pe celălalt dispozitiv"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Autentificarea a fost anulată de pe celălalt dispozitiv."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Cererea de autentificare a fost anulată"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Autentificarea a fost refuzată pe celălalt dispozitiv."</string>
   <string name="screen_qr_code_login_error_declined_title">"Autentificarea a fost refuzată"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Nu trebuie să faceți nimic altceva."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Celălalt dispozitiv este deja conectat"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Autentificarea a expirat. Vă rugăm să încercați din nou."</string>
   <string name="screen_qr_code_login_error_expired_title">"Autentificarea nu a fost finalizată la timp"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Celălalt dispozitiv nu acceptă autentificarea la %s cu un cod QR.
@@ -51,4 +56,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Trebuie să acordați permisiunea ca %1$s să folosească camera dispozitivului pentru a continua."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Permiteți accesul la cameră pentru a scana codul QR"</string>
   <string name="screen_qr_code_login_unknown_error_description">"A apărut o eroare neașteptată. Vă rugăm să încercați din nou."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"În așteptarea celuilalt dispozitiv"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ru/translations.xml b/features/linknewdevice/impl/src/main/res/values-ru/translations.xml
index 39506417b6..1382829c04 100644
--- a/features/linknewdevice/impl/src/main/res/values-ru/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-ru/translations.xml
@@ -15,7 +15,7 @@
   <string name="screen_link_new_device_error_not_supported_title">"QR-код не поддерживается"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"Вход на другом устройстве был отменен."</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"Запрос на вход отменен"</string>
-  <string name="screen_link_new_device_error_request_timeout_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_link_new_device_error_request_timeout_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте ещё раз."</string>
   <string name="screen_link_new_device_error_request_timeout_title">"Вход в систему не был выполнен вовремя"</string>
   <string name="screen_link_new_device_mobile_step1">"Откройте %1$s на другом устройстве"</string>
   <string name="screen_link_new_device_mobile_step2">"Выберите %1$s"</string>
@@ -26,7 +26,7 @@
   <string name="screen_link_new_device_root_loading_qr_code">"Загрузка QR-кода…"</string>
   <string name="screen_link_new_device_root_mobile_device">"Смартфон"</string>
   <string name="screen_link_new_device_root_title">"Какое устройство вы хотите привязать?"</string>
-  <string name="screen_link_new_device_wrong_number_subtitle">"Пожалуйста, попробуйте еще раз и убедитесь, что вы правильно ввели 2-значный код. Если цифры по-прежнему не совпадают, обратитесь к администратору сервера."</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Пожалуйста, попробуйте ещё раз и убедитесь, что Вы правильно ввели 2-значный код. Если цифры по-прежнему не совпадают, обратитесь к администратору сервера."</string>
   <string name="screen_link_new_device_wrong_number_title">"Цифры не совпадают"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Не удалось установить безопасное соединение с новым устройством. Не беспокойтесь, существующие устройства в безопасности."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Что теперь?"</string>
@@ -34,13 +34,15 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Если вы столкнулись с той же проблемой, попробуйте сменить точку доступа Wi-Fi или используйте мобильные данные"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Если это не помогло, войдите вручную"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Соединение не защищено"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Вам нужно будет ввести две цифры, показанные на этом устройстве."</string>
+  <string name="screen_qr_code_login_device_code_title">"Введите показанный номер на своем другом устройстве"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Вход на другом устройстве был отменен."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Запрос на вход отменен"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Вход в систему был отклонен на другом устройстве."</string>
   <string name="screen_qr_code_login_error_declined_title">"Вход отклонен"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"На этом все."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"На этом всё."</string>
   <string name="screen_qr_code_login_error_device_already_signed_in_title">"Вход уже выполнен на другом устройстве"</string>
-  <string name="screen_qr_code_login_error_expired_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте ещё раз."</string>
   <string name="screen_qr_code_login_error_expired_title">"Вход в систему не был выполнен вовремя"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Другое устройство не поддерживает вход в %s с помощью QR-кода.
 
@@ -53,5 +55,6 @@
   <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Неверный QR-код"</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Чтобы продолжить, вам необходимо разрешить %1$s использовать камеру вашего устройства."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Разрешите доступ к камере для сканирования QR-кода"</string>
-  <string name="screen_qr_code_login_unknown_error_description">"Произошла непредвиденная ошибка. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_qr_code_login_unknown_error_description">"Произошла непредвиденная ошибка. Пожалуйста, попробуйте ещё раз."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Ожидание другого устройства"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-sk/translations.xml b/features/linknewdevice/impl/src/main/res/values-sk/translations.xml
index cb430671bb..f64c01328b 100644
--- a/features/linknewdevice/impl/src/main/res/values-sk/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-sk/translations.xml
@@ -34,6 +34,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Ak narazíte na rovnaký problém, vyskúšajte inú sieť Wi-Fi alebo namiesto siete Wi-Fi použite mobilné dáta"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Ak to nefunguje, prihláste sa manuálne"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Pripojenie nie je bezpečené"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Budete požiadaní o zadanie dvoch číslic zobrazených na tomto zariadení."</string>
+  <string name="screen_qr_code_login_device_code_title">"Zadajte nižšie uvedené číslo na vašom druhom zariadení"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Prihlásenie bolo zrušené na druhom zariadení."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Žiadosť o prihlásenie bola zrušená"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Prihlásenie bolo zamietnuté na druhom zariadení."</string>
@@ -54,4 +56,5 @@ Skúste sa prihlásiť manuálne alebo naskenujte QR kód pomocou iného zariade
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Ak chcete pokračovať, musíte udeliť povolenie aplikácii %1$s používať fotoaparát vášho zariadenia."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Povoľte prístup k fotoaparátu na naskenovanie QR kódu"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Vyskytla sa neočakávaná chyba. Prosím, skúste to znova."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Čaká sa na vaše druhé zariadenie"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-sv/translations.xml b/features/linknewdevice/impl/src/main/res/values-sv/translations.xml
index 8a1bef434a..8800b31bbd 100644
--- a/features/linknewdevice/impl/src/main/res/values-sv/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-sv/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Om du stöter på samma problem, prova ett annat wifi-nätverk eller använd din mobildata istället för wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Om det inte fungerar, logga in manuellt"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Anslutningen är inte säker"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Du kommer att bli ombedd att ange de två siffrorna som visas på den här enheten."</string>
+  <string name="screen_qr_code_login_device_code_title">"Ange numret nedan på din andra enhet"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Inloggningen avbröts på den andra enheten."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Inloggningsförfrågan avbröts"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Inloggningen avvisades på den andra enheten."</string>
@@ -35,4 +37,5 @@ Prova att logga in manuellt eller skanna QR-koden med en annan enhet."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Du måste ge tillstånd för %1$s att använda enhetens kamera för att kunna fortsätta."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Tillåt kameraåtkomst för att skanna QR-koden"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Ett oväntat fel inträffade. Vänligen försök igen."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Väntar på din andra enhet"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-tr/translations.xml b/features/linknewdevice/impl/src/main/res/values-tr/translations.xml
index e5fd989c0b..3c8767f64c 100644
--- a/features/linknewdevice/impl/src/main/res/values-tr/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-tr/translations.xml
@@ -33,6 +33,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Aynı sorunla karşılaşırsanız, farklı bir wifi ağı deneyin veya wifi yerine mobil verinizi kullanın"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Bu işe yaramazsa, manuel olarak oturum açın"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Bağlantı güvenli değil"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Bu cihazda gösterilen iki haneyi girmeniz istenecektir."</string>
+  <string name="screen_qr_code_login_device_code_title">"Aşağıdaki numarayı diğer cihazınıza girin"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Oturum açma işlemi diğer cihazda iptal edildi."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Oturum açma isteği iptal edildi"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Diğer cihazda oturum açma işlemi reddedildi."</string>
@@ -51,4 +53,5 @@ Manuel olarak oturum açmayı deneyin veya QR kodunu başka bir cihazla tarayın
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Devam etmek için %1$s cihazınızın kamerasını kullanmasına izin vermeniz gerekir."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"QR kodunu taramak için kamera erişimine izin verin"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Diğer cihazınız bekleniyor"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-uk/translations.xml b/features/linknewdevice/impl/src/main/res/values-uk/translations.xml
index 875b5aed16..6f0fc7f3e0 100644
--- a/features/linknewdevice/impl/src/main/res/values-uk/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-uk/translations.xml
@@ -5,6 +5,7 @@
   <string name="screen_link_new_device_desktop_step3">"Зіскануйте QR-код цим пристроєм"</string>
   <string name="screen_link_new_device_desktop_submit">"Готовий до сканування"</string>
   <string name="screen_link_new_device_desktop_title">"Відкрийте %1$s на комп\'ютері, щоб отримати QR-код"</string>
+  <string name="screen_link_new_device_desktop_warning">"Скануйте QR-код лише після виконання наведених вище кроків на своєму власному пристрої. Ніколи не скануйте код, надісланий іншою особою."</string>
   <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"Цифри не збігаються"</string>
   <string name="screen_link_new_device_enter_number_notice">"Введіть 2-значний код"</string>
   <string name="screen_link_new_device_enter_number_subtitle">"Це підтвердить, що з\'єднання з іншим пристроєм захищене."</string>
@@ -26,6 +27,7 @@
   <string name="screen_link_new_device_root_loading_qr_code">"Завантаження QR-коду…"</string>
   <string name="screen_link_new_device_root_mobile_device">"Мобільний пристрій"</string>
   <string name="screen_link_new_device_root_title">"Який тип пристрою ви хочете під\'єднати?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Спробуйте ще раз і переконайтеся, що ви правильно ввели двозначний код. Якщо цифри все одно не збігаються, зверніться до свого провайдера облікового запису."</string>
   <string name="screen_link_new_device_wrong_number_title">"Цифри не збігаються"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Не вдалося встановити безпечне з\'єднання з новим пристроєм. Ваші наявні пристрої досі в безпеці, і вам не потрібно про них турбуватися."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Що тепер?"</string>
@@ -33,6 +35,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Якщо ви зіткнулися з тією ж проблемою, спробуйте іншу мережу Wi-Fi або використовуйте мобільний інтернет замість Wi-Fi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Якщо це не спрацює, увійдіть вручну"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"З\'єднання не безпечне"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Вас попросять ввести дві цифри, показані на цьому пристрої."</string>
+  <string name="screen_qr_code_login_device_code_title">"Введіть номер нижче на іншому пристрої"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Вхід було скасовано на іншому пристрої."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Запит на вхід скасовано"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Вхід був відхилений на іншому пристрої."</string>
@@ -53,4 +57,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Вам потрібно дати дозвіл %1$s на використання камери вашого пристрою, щоб продовжити."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Надайте доступ до камери, щоб сканувати QR-код"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Сталася несподівана помилка. Будь ласка, спробуйте ще раз."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Чекаємо на ваш інший пристрій"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-ur/translations.xml b/features/linknewdevice/impl/src/main/res/values-ur/translations.xml
index 54d2c2e401..0b4bb02226 100644
--- a/features/linknewdevice/impl/src/main/res/values-ur/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-ur/translations.xml
@@ -17,6 +17,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"اگر آپ کو بھی یہی مسئلہ درپیش ہو، تو کوئی دوسرا وائی فائی شبکہ آزمائیں یا وائی فائی کے بجائے اپنے محمول بیانات استعمال کریں۔"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"اگر یہ کام نہ کرے، تو دستی طور پر داخل ہوں"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"اتصال محفوظ نہیں"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"آپ سے اس آلے پر دکھائے گئے دو ہندسوں کو درج کرنے کو کہا جائے گا۔"</string>
+  <string name="screen_qr_code_login_device_code_title">"اپنے دوسرے آلے پر درج ذیل نمبر درج کریں"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"دوسرے آلے پر دخول منسوخ کر دیا گیا تھا۔"</string>
   <string name="screen_qr_code_login_error_cancelled_title">"دخول کی درخواست منسوخ"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"دوسرے آلہ پر دخول کو مسترد کر دیا گیا تھا۔"</string>
@@ -35,4 +37,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"جاری رکھنے کے لیے آپ %1$s کو اپنے آلے کا تصویرگر استعمال کرنے کی اجازت دینے کی ضرورت ہے۔"</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"کیو آر رمز کو مسح ضوئی کرنے کے لئے تصویرگر تک رسائی کی اجازت دیں"</string>
   <string name="screen_qr_code_login_unknown_error_description">"ایک غیر متوقع نقص واقع ہوا۔ برائے مہربانی دوبارہ کوشش کریں۔"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"آپکے دوسرے آلے کا منتظر"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-uz/translations.xml b/features/linknewdevice/impl/src/main/res/values-uz/translations.xml
index b1f3deebf4..1d436b5f4a 100644
--- a/features/linknewdevice/impl/src/main/res/values-uz/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-uz/translations.xml
@@ -26,6 +26,7 @@
   <string name="screen_link_new_device_root_loading_qr_code">"QR kod yuklanmoqda…"</string>
   <string name="screen_link_new_device_root_mobile_device">"Mobil qurilma"</string>
   <string name="screen_link_new_device_root_title">"Qaysi turdagi qurilmani bog‘lashni xohlaysiz?"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"Qayta urining va 2 xonali kodni bexato kiritganingizni tekshiring. Agar raqamlar hali ham mos kelmasa, hisobingiz provayderiga murojaat qiling."</string>
   <string name="screen_link_new_device_wrong_number_title">"Raqamlar mos kelmaydi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Yangi qurilmaga xavfsiz ulanish amalga oshirilmadi. Mavjud qurilmalaringiz hali ham xavfsiz va ular haqida qaygʻurishingiz shart emas."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Endi nima?"</string>
@@ -33,10 +34,14 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Xuddi shu muammoga duch kelsangiz, boshqa wifi tarmogʻini sinang yoki wifi oʻrniga mobil internetdan foydalaning"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Agar bunisi ishlamasa, oddiy usulda kiring"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Ulanish xavfsiz emas"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Sizdan ushbu qurilmada koʻrsatilgan ikkita raqamni kiritish soʻraladi."</string>
+  <string name="screen_qr_code_login_device_code_title">"Narigi qurilmada quyidagi raqamni kiriting"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Boshqa qurilmadan hisobga kirish bekor qilindi."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Tizimga kirish soʻrovi bekor qilindi"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Boshqa qurilmadan hisobga kirish bekor qilindi."</string>
   <string name="screen_qr_code_login_error_declined_title">"Tizimga kirish rad etildi"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Boshqa hech narsa qilishingiz shart emas."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Boshqa qurilmangiz allaqachon tizimga kirgan"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Kirish muddati tugagan. Iltimos, qayta urinib koʻring."</string>
   <string name="screen_qr_code_login_error_expired_title">"Kirish oʻz vaqtida tugallanmagan"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Boshqa qurilmangiz %s hisobiga QR kod orqali kirishni qoʻllab-quvvatlamaydi.
@@ -51,4 +56,5 @@ Oddiy usulda kiring yoki boshqa qurilma bilan QR kodni skanerlang."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"Davom etish uchun %1$s qurilmangiz kamerasidan foydalanishiga ruxsat berishingiz kerak."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"QR kodni skanerlash uchun kameraga ruxsat bering"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Kutilmagan xatolik yuz berdi. Qayta urining."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Boshqa qurilmangiz kutilmoqda"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-vi/translations.xml b/features/linknewdevice/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..5e7709f814
--- /dev/null
+++ b/features/linknewdevice/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Thử lại"</string>
+</resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-zh-rTW/translations.xml b/features/linknewdevice/impl/src/main/res/values-zh-rTW/translations.xml
index 9b3cd5ead5..e18fbc13b6 100644
--- a/features/linknewdevice/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,26 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_link_new_device_desktop_scanning_title">"掃描 QR code"</string>
+  <string name="screen_link_new_device_desktop_step1">"在筆記型電腦或桌上型電腦上開啟 %1$s"</string>
   <string name="screen_link_new_device_desktop_step3">"使用此裝置掃描 QR code"</string>
   <string name="screen_link_new_device_desktop_submit">"準備掃描"</string>
+  <string name="screen_link_new_device_desktop_title">"在桌上型電腦上開啟 %1$s 以取得 QR code"</string>
+  <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"數字不符"</string>
+  <string name="screen_link_new_device_enter_number_notice">"輸入兩位數代碼"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"這將確認您與另一台裝置之間的連線是否安全。"</string>
+  <string name="screen_link_new_device_enter_number_title">"輸入顯示在您的其他裝置上的數字"</string>
   <string name="screen_link_new_device_error_app_not_supported_subtitle">"您的帳號提供者不支援 %1$s。"</string>
   <string name="screen_link_new_device_error_app_not_supported_title">"不支援 %1$s"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"您的帳號提供者不支援使用 QR code 登入新裝置。"</string>
   <string name="screen_link_new_device_error_not_supported_title">"不支援 QR code"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"已在其他裝置上取消登入。"</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"已取消登入請求"</string>
   <string name="screen_link_new_device_error_request_timeout_subtitle">"登入已過期。請再試一次。"</string>
   <string name="screen_link_new_device_error_request_timeout_title">"未及時完成登入"</string>
+  <string name="screen_link_new_device_mobile_step1">"在其他裝置上開啟 %1$s"</string>
   <string name="screen_link_new_device_mobile_step2">"選取 %1$s"</string>
+  <string name="screen_link_new_device_mobile_step2_action">"「使用 QR code 登入」"</string>
+  <string name="screen_link_new_device_mobile_step3">"使用其他裝置掃描此處顯示的 QR code"</string>
+  <string name="screen_link_new_device_mobile_title">"在其他裝置上開啟 %1$s"</string>
+  <string name="screen_link_new_device_root_desktop_computer">"桌上型電腦"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"正在載入 QR code……"</string>
+  <string name="screen_link_new_device_root_mobile_device">"行動裝置"</string>
+  <string name="screen_link_new_device_root_title">"您想連結哪種類型的裝置？"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"請重試，並確定您已輸入兩位數代碼。若數字仍然不符，請聯絡您的帳號提供者。"</string>
+  <string name="screen_link_new_device_wrong_number_title">"數字不符"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"無法與新裝置建立安全連線。您現有的裝置仍然安全，您不必擔心它們。"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"現在怎麼辦？"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"嘗試再次使用 QR code 登入以確認不是網路問題"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"如果遇到相同的問題，請嘗試使用其他 wifi 網路或您的行動數據"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"若無法運作，請手動登入"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"連線不安全"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"系統會要求您輸入此裝置上顯示的兩位數字。"</string>
+  <string name="screen_qr_code_login_device_code_title">"在您的其他裝置上輸入以下數字"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"已在其他裝置上取消登入。"</string>
   <string name="screen_qr_code_login_error_cancelled_title">"已取消登入請求"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"其他裝置拒絕登入。"</string>
   <string name="screen_qr_code_login_error_declined_title">"已拒絕登入"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"您不需要進行其他操作。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"您的其他裝置已登入"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"登入已過期。請再試一次。"</string>
   <string name="screen_qr_code_login_error_expired_title">"未及時完成登入"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"您的其他裝置不支援使用 QR cpde 登入 %s。
@@ -35,4 +56,5 @@
   <string name="screen_qr_code_login_no_camera_permission_state_description">"您必須授予 %1$s 權限以使用裝置相機才能繼續。"</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"允許相機權限以掃描 QR code"</string>
   <string name="screen_qr_code_login_unknown_error_description">"發生意外錯誤。請再試一次。"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"等待您的其他裝置"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values-zh/translations.xml b/features/linknewdevice/impl/src/main/res/values-zh/translations.xml
index 843395fab7..f31cf53c9c 100644
--- a/features/linknewdevice/impl/src/main/res/values-zh/translations.xml
+++ b/features/linknewdevice/impl/src/main/res/values-zh/translations.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_link_new_device_desktop_scanning_title">"扫描二维码"</string>
-  <string name="screen_link_new_device_desktop_step1">"在笔记本电脑或台式机上打开%1$s "</string>
+  <string name="screen_link_new_device_desktop_step1">"在笔记本电脑或台式机上打开 %1$s"</string>
   <string name="screen_link_new_device_desktop_step3">"使用此设备扫描二维码"</string>
   <string name="screen_link_new_device_desktop_submit">"准备进行扫描"</string>
-  <string name="screen_link_new_device_desktop_title">"在电脑上打开%1$s 获取二维码"</string>
+  <string name="screen_link_new_device_desktop_title">"在台式电脑上打开 %1$s 以获取二维码"</string>
+  <string name="screen_link_new_device_desktop_warning">"确保仅在属于你自己的设备上按上述步骤操作后再扫描二维码。绝对不要扫描来自他人的二维码。"</string>
   <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"数字不匹配"</string>
-  <string name="screen_link_new_device_enter_number_notice">"输入两位数的验证码"</string>
-  <string name="screen_link_new_device_enter_number_subtitle">"这将验证您与其他设备的连接是否安全。"</string>
+  <string name="screen_link_new_device_enter_number_notice">"输入两位数字的代码"</string>
+  <string name="screen_link_new_device_enter_number_subtitle">"这将验证你与其它设备的连接是否安全。"</string>
   <string name="screen_link_new_device_enter_number_title">"请输入另一台设备上显示的数字"</string>
-  <string name="screen_link_new_device_error_app_not_supported_subtitle">"账户提供方不支持 %1$s."</string>
+  <string name="screen_link_new_device_error_app_not_supported_subtitle">"账户提供者不支持 %1$s."</string>
   <string name="screen_link_new_device_error_app_not_supported_title">"不支持 %1$s."</string>
-  <string name="screen_link_new_device_error_not_supported_subtitle">"您的账户提供商不支持使用二维码登录新设备。"</string>
-  <string name="screen_link_new_device_error_not_supported_title">"不支持二维码"</string>
+  <string name="screen_link_new_device_error_not_supported_subtitle">"你的账户提供者不支持使用二维码登录到新设备。"</string>
+  <string name="screen_link_new_device_error_not_supported_title">"二维码不受支持"</string>
   <string name="screen_link_new_device_error_request_cancelled_subtitle">"登录被另一台设备取消"</string>
   <string name="screen_link_new_device_error_request_cancelled_title">"登录请求已取消"</string>
   <string name="screen_link_new_device_error_request_timeout_subtitle">"登录已过期. 请重试."</string>
@@ -23,35 +24,38 @@
   <string name="screen_link_new_device_mobile_step3">"请用另一台设备扫描此处显示的二维码"</string>
   <string name="screen_link_new_device_mobile_title">"在另一台设备上打开 %1$s"</string>
   <string name="screen_link_new_device_root_desktop_computer">"台式计算机"</string>
-  <string name="screen_link_new_device_root_loading_qr_code">"正在加载 QR 码…"</string>
+  <string name="screen_link_new_device_root_loading_qr_code">"正在加载二维码…"</string>
   <string name="screen_link_new_device_root_mobile_device">"移动设备"</string>
-  <string name="screen_link_new_device_root_title">"您想连接哪种类型的设备？"</string>
-  <string name="screen_link_new_device_wrong_number_subtitle">"请重试，并确保您已正确输入两位验证码。如果验证码仍然不匹配，请联系您的账户提供商。"</string>
+  <string name="screen_link_new_device_root_title">"你想连接哪种类型的设备？"</string>
+  <string name="screen_link_new_device_wrong_number_subtitle">"请重试，并确保已正确输入两位数字的代码。如果数字仍然不匹配，请联系账户提供者。"</string>
   <string name="screen_link_new_device_wrong_number_title">"数字不匹配"</string>
-  <string name="screen_qr_code_login_connection_note_secure_state_description">"无法与新设备建立安全连接。您现有的设备仍然安全，无需担心。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"无法与新设备建立安全连接。你的现有设备仍然安全，无需担心。"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"现在怎么办？"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"如果这是网络问题，请尝试使用二维码再次登录"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"如果遇到同样的问题，请尝试使用不同的 WiFi 网络或使用移动数据代替 WiFi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"如果不起作用，请手动登录"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"连接不安全"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"你将被要求输入此设备上显示的两位数字。"</string>
+  <string name="screen_qr_code_login_device_code_title">"在你的其它设备上输入以下数字"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"登录被另一台设备取消"</string>
   <string name="screen_qr_code_login_error_cancelled_title">"登录请求已取消"</string>
-  <string name="screen_qr_code_login_error_declined_subtitle">"其它设备未接受请求"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"另一设备上的登录请求已被拒绝。"</string>
   <string name="screen_qr_code_login_error_declined_title">"登录被拒绝"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"您无需额外操作。"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_title">"您已在另一台设备登录。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"无需额外操作。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"你已在另一设备上登录。"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"登录已过期. 请重试."</string>
   <string name="screen_qr_code_login_error_expired_title">"登录未及时完成"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"另一个设备不支持使用二维码登录 %s.
 
 尝试手动或使用另一个设备扫描二维码."</string>
-  <string name="screen_qr_code_login_error_linking_not_suported_title">"不支持二维码"</string>
-  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"账户提供方不支持 %1$s."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"二维码不受支持"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"账户提供者不支持 %1$s."</string>
   <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"不支持 %1$s."</string>
-  <string name="screen_qr_code_login_invalid_scan_state_description">"使用其他设备上显示的二维码。"</string>
-  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"再试一次"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"使用其它设备上显示的二维码。"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"重试"</string>
   <string name="screen_qr_code_login_invalid_scan_state_subtitle">"二维码错误"</string>
-  <string name="screen_qr_code_login_no_camera_permission_state_description">"您需要授予 %1$s 使用设备摄像头的权限才能继续。"</string>
-  <string name="screen_qr_code_login_no_camera_permission_state_title">"允许摄像头权限以扫描 QR 码"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"你需要授予 %1$s 使用设备摄像头的权限才能继续。"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"允许访问摄像头以扫描二维码"</string>
   <string name="screen_qr_code_login_unknown_error_description">"发生了意外错误。请再试一次。"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"正在等待其它设备"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/main/res/values/localazy.xml b/features/linknewdevice/impl/src/main/res/values/localazy.xml
index 321b168751..47d25cbff6 100644
--- a/features/linknewdevice/impl/src/main/res/values/localazy.xml
+++ b/features/linknewdevice/impl/src/main/res/values/localazy.xml
@@ -5,6 +5,7 @@
   <string name="screen_link_new_device_desktop_step3">"Scan the QR code with this device"</string>
   <string name="screen_link_new_device_desktop_submit">"Ready to scan"</string>
   <string name="screen_link_new_device_desktop_title">"Open %1$s on a desktop computer to get the QR code"</string>
+  <string name="screen_link_new_device_desktop_warning">"Only scan a QR code after following the steps above on your own device. Never scan a code sent by another person."</string>
   <string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"The numbers don’t match"</string>
   <string name="screen_link_new_device_enter_number_notice">"Enter 2-digit code"</string>
   <string name="screen_link_new_device_enter_number_subtitle">"This will verify that the connection to your other device is secure."</string>
@@ -34,6 +35,8 @@
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"If you encounter the same problem, try a different wifi network or use your mobile data instead of wifi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"If that doesn’t work, sign in manually"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Connection not secure"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"You’ll be asked to enter the two digits shown on this device."</string>
+  <string name="screen_qr_code_login_device_code_title">"Enter the number below on your other device"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"The sign in was cancelled on the other device."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Sign in request cancelled"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"The sign in was declined on the other device."</string>
@@ -54,4 +57,5 @@ Try signing in manually, or scan the QR code with another device."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_description">"You need to give permission for %1$s to use your device’s camera in order to continue."</string>
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Allow camera access to scan the QR code"</string>
   <string name="screen_qr_code_login_unknown_error_description">"An unexpected error occurred. Please try again."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Waiting for your other device"</string>
 </resources>
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPointTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPointTest.kt
index 2957a89495..a198bc27d9 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPointTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/DefaultLinkNewDeviceEntryPointTest.kt
@@ -11,7 +11,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.features.linknewdevice.api.LinkNewDeviceEntryPoint
+import io.element.android.features.lockscreen.test.FakeDeviceUnlockEntryPoint
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
@@ -37,6 +39,8 @@ class DefaultLinkNewDeviceEntryPointTest {
                 sessionCoroutineScope = backgroundScope,
                 linkNewMobileHandler = LinkNewMobileHandler(client),
                 linkNewDesktopHandler = LinkNewDesktopHandler(client),
+                sessionEnterpriseService = FakeSessionEnterpriseService(),
+                deviceUnlockEntryPoint = FakeDeviceUnlockEntryPoint(),
             )
         }
         val callback: LinkNewDeviceEntryPoint.Callback = object : LinkNewDeviceEntryPoint.Callback {
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeViewTest.kt
index ac0a129f49..cdb1cb6860 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/desktop/DesktopNoticeViewTest.kt
@@ -5,12 +5,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.desktop
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.linknewdevice.impl.R
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
@@ -18,42 +20,36 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DesktopNoticeViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class DesktopNoticeViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aDesktopNoticeState(),
                 onBackClicked = callback,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on back button clicked - calls the expected callback`() {
+    fun `on back button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aDesktopNoticeState(),
                 onBackClicked = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `when can continue - calls the expected callback`() {
+    fun `when can continue - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aDesktopNoticeState(canContinue = true),
                 onReadyToScanClick = callback,
             )
@@ -61,16 +57,16 @@ class DesktopNoticeViewTest {
     }
 
     @Test
-    fun `on submit button clicked - emits the Continue event`() {
+    fun `on submit button clicked - emits the Continue event`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<DesktopNoticeEvent>()
-        rule.setView(
+        setView(
             state = aDesktopNoticeState(eventSink = eventRecorder),
         )
-        rule.clickOn(R.string.screen_link_new_device_desktop_submit)
+        clickOn(R.string.screen_link_new_device_desktop_submit)
         eventRecorder.assertSingle(DesktopNoticeEvent.Continue)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setView(
         state: DesktopNoticeState,
         onBackClicked: () -> Unit = EnsureNeverCalled(),
         onReadyToScanClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorViewTest.kt
index aa52a70149..74619c1b71 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/error/ErrorViewTest.kt
@@ -5,58 +5,54 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.error
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ErrorViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ErrorViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the onCancel callback`() {
+    fun `on back pressed - calls the onCancel callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setErrorView(
+            setErrorView(
                 onCancel = callback,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on try again button clicked - calls the expected callback`() {
+    fun `on try again button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setErrorView(
+            setErrorView(
                 onRetry = callback
             )
-            rule.clickOn(CommonStrings.action_try_again)
+            clickOn(CommonStrings.action_try_again)
         }
     }
 
     @Test
-    fun `on cancel button clicked - calls the expected callback`() {
+    fun `on cancel button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setErrorView(
+            setErrorView(
                 onCancel = callback
             )
-            rule.clickOn(CommonStrings.action_cancel)
+            clickOn(CommonStrings.action_cancel)
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setErrorView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setErrorView(
         onRetry: () -> Unit = EnsureNeverCalled(),
         onCancel: () -> Unit = EnsureNeverCalled(),
         errorScreenType: ErrorScreenType = ErrorScreenType.UnknownError,
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenterTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenterTest.kt
index fe2e11e95c..b3602c81dc 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenterTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberPresenterTest.kt
@@ -88,6 +88,7 @@ class EnterNumberPresenterTest {
             navigator = navigator,
             linkNewMobileHandler = linkNewMobileHandler,
         ).test {
+            skipItems(1)
             val initialState = awaitItem()
             linkMobileHandler.emitStep(
                 LinkMobileStep.QrScanned(checkCodeSender)
@@ -96,7 +97,7 @@ class EnterNumberPresenterTest {
             initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
             skipItems(1)
             initialState.eventSink(EnterNumberEvent.Continue)
-            skipItems(1)
+            skipItems(2)
             val finalState = awaitItem()
             assertThat(finalState.sendingCode.isLoading()).isTrue()
             advanceUntilIdle()
@@ -130,6 +131,7 @@ class EnterNumberPresenterTest {
                 LinkMobileStep.QrScanned(checkCodeSender)
             )
             runCurrent()
+            skipItems(1)
             initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
             skipItems(1)
             initialState.eventSink(EnterNumberEvent.Continue)
@@ -163,6 +165,7 @@ class EnterNumberPresenterTest {
         createPresenter(
             linkNewMobileHandler = linkNewMobileHandler,
         ).test {
+            skipItems(1)
             val initialState = awaitItem()
             linkMobileHandler.emitStep(
                 LinkMobileStep.QrScanned(checkCodeSender)
@@ -171,7 +174,7 @@ class EnterNumberPresenterTest {
             initialState.eventSink(EnterNumberEvent.UpdateNumber("88"))
             skipItems(1)
             initialState.eventSink(EnterNumberEvent.Continue)
-            skipItems(1)
+            skipItems(2)
             val loadingState = awaitItem()
             assertThat(loadingState.sendingCode.isLoading()).isTrue()
             expectNoEvents()
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberViewTest.kt
index 20e1d898dd..0d6da84241 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/number/EnterNumberViewTest.kt
@@ -5,14 +5,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.number
 
 import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assertIsNotEnabled
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
@@ -20,65 +22,59 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class EnterNumberViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class EnterNumberViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aEnterNumberState(),
                 onBackClicked = callback,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on back button clicked - calls the expected callback`() {
+    fun `on back button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aEnterNumberState(),
                 onBackClicked = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `on continue button clicked - emits the Continue event`() {
+    fun `on continue button clicked - emits the Continue event`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<EnterNumberEvent>()
-        rule.setView(
+        setView(
             state = aEnterNumberState(
                 number = "12",
                 eventSink = eventRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventRecorder.assertSingle(EnterNumberEvent.Continue)
     }
 
     @Test
-    fun `when the number is not complete, continue button is disabled`() {
+    fun `when the number is not complete, continue button is disabled`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<EnterNumberEvent>(expectEvents = false)
-        rule.setView(
+        setView(
             state = aEnterNumberState(
                 number = "1",
                 eventSink = eventRecorder,
             ),
         )
-        val continueStr = rule.activity.getString(CommonStrings.action_continue)
-        rule.onNodeWithText(continueStr).assertIsNotEnabled()
+        val continueStr = activity!!.getString(CommonStrings.action_continue)
+        onNodeWithText(continueStr).assertIsNotEnabled()
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setView(
         state: EnterNumberState,
         onBackClicked: () -> Unit = EnsureNeverCalled(),
     ) {
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenterTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenterTest.kt
new file mode 100644
index 0000000000..f92cf66102
--- /dev/null
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodePresenterTest.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.linknewdevice.impl.screens.qrcode
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.linknewdevice.impl.LinkNewMobileHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileHandler
+import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.linknewdevice.FakeLinkMobileHandler
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class ShowQrCodePresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        createPresenter().test {
+            val initialState = awaitItem()
+            assertThat(initialState.data.dataOrNull()).isEqualTo("DATA")
+        }
+    }
+
+    @Test
+    fun `present - when handler emits QrRotating, the presenter requests to rotate the QrCode`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val createLinkMobileHandlerResult = lambdaRecorder<Result<LinkMobileHandler>> {
+            Result.success(linkMobileHandler)
+        }
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = createLinkMobileHandlerResult,
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        createPresenter(
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrRotating
+            )
+            runCurrent()
+            val finalState = awaitItem()
+            assertThat(finalState.data.isLoading()).isTrue()
+            createLinkMobileHandlerResult.assertions().isCalledExactly(2)
+        }
+    }
+
+    @Test
+    fun `present - when handler emits QrRotating, the presenter requests to rotate the QrCode and the code is rotated`() = runTest {
+        val linkMobileHandler = FakeLinkMobileHandler(
+            startResult = {},
+        )
+        val matrixClient = FakeMatrixClient(
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(linkMobileHandler) },
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        linkNewMobileHandler.createAndStartNewHandler()
+        createPresenter(
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            awaitItem()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrRotating
+            )
+            runCurrent()
+            linkMobileHandler.emitStep(
+                LinkMobileStep.QrReady("DATA2")
+            )
+            val finalState = awaitItem()
+            assertThat(finalState.data.dataOrNull()).isEqualTo("DATA2")
+        }
+    }
+
+    private fun createPresenter(
+        linkNewMobileHandler: LinkNewMobileHandler = LinkNewMobileHandler(FakeMatrixClient()),
+    ) = ShowQrCodePresenter(
+        initialData = "DATA",
+        linkNewMobileHandler = linkNewMobileHandler,
+    )
+}
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeViewTest.kt
index c6c89ba818..6715959e0e 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/qrcode/ShowQrCodeViewTest.kt
@@ -5,41 +5,37 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.qrcode
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ShowQrCodeViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ShowQrCodeViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 onBackClick = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setView(
         onBackClick: () -> Unit = EnsureNeverCalled(),
     ) {
         setContent {
             ShowQrCodeView(
-                data = "DATA",
+                state = aShowQrCodeState(),
                 onBackClick = onBackClick,
             )
         }
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenterTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenterTest.kt
index 88a68786f3..d2216c2737 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenterTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootPresenterTest.kt
@@ -75,15 +75,48 @@ class LinkNewDeviceRootPresenterTest {
             sessionCoroutineScope = backgroundScope,
             createLinkMobileHandlerResult = { Result.success(linkMobileHandler) }
         )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
         createPresenter(
             matrixClient = matrixClient,
+            linkNewMobileHandler = linkNewMobileHandler,
         ).test {
             skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.isSupported.dataOrNull()).isTrue()
-            initialState.eventSink(LinkNewDeviceRootEvent.LinkMobileDevice)
+            linkNewMobileHandler.createAndStartNewHandler()
+            skipItems(1)
             val loadingState = awaitItem()
             assertThat(loadingState.qrCodeData.isLoading()).isTrue()
+            skipItems(1)
+        }
+    }
+
+    @Test
+    fun `present - close dialog resets qrCodeData`() = runTest {
+        val fakeLinkMobileHandler = FakeLinkMobileHandler(startResult = {})
+        val matrixClient = FakeMatrixClient(
+            canLinkNewDeviceResult = { Result.success(true) },
+            sessionCoroutineScope = backgroundScope,
+            createLinkMobileHandlerResult = { Result.success(fakeLinkMobileHandler) }
+        )
+        val linkNewMobileHandler = LinkNewMobileHandler(matrixClient)
+        createPresenter(
+            matrixClient = matrixClient,
+            linkNewMobileHandler = linkNewMobileHandler,
+        ).test {
+            skipItems(1)
+            linkNewMobileHandler.onTooManyRotation()
+            var errorState = awaitItem()
+            while (!errorState.qrCodeData.isFailure()) {
+                errorState = awaitItem()
+            }
+            assertThat(errorState.qrCodeData.isFailure()).isTrue()
+            errorState.eventSink(LinkNewDeviceRootEvent.CloseDialog)
+            var resetState = awaitItem()
+            while (!resetState.qrCodeData.isUninitialized()) {
+                resetState = awaitItem()
+            }
+            assertThat(resetState.qrCodeData.isUninitialized()).isTrue()
         }
     }
 
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootViewTest.kt
index e352debfb0..fd75a4d560 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/root/LinkNewDeviceRootViewTest.kt
@@ -5,97 +5,97 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.linknewdevice.impl.R
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class LinkNewDeviceRootViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class LinkNewDeviceRootViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the onRetry callback`() {
+    fun `on back pressed - calls the onRetry callback`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setLinkNewDeviceRootView(
+            setLinkNewDeviceRootView(
                 state = aLinkNewDeviceRootState(
                     eventSink = eventRecorder,
                 ),
                 onBackClick = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `link desktop button clicked - calls the expected callback`() {
+    fun `link desktop button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
-        ensureCalledOnce { callback ->
-            rule.setLinkNewDeviceRootView(
+        ensureCalledOnceWithParam(LinkDeviceType.Desktop) { callback ->
+            setLinkNewDeviceRootView(
                 state = aLinkNewDeviceRootState(
                     isSupported = AsyncData.Success(true),
                     eventSink = eventRecorder,
                 ),
-                onLinkDesktopDeviceClick = callback,
+                onUnlockDevice = callback,
             )
-            rule.clickOn(R.string.screen_link_new_device_root_desktop_computer)
+            clickOn(R.string.screen_link_new_device_root_desktop_computer)
         }
     }
 
     @Test
-    fun `link mobile button clicked - emits the expected event`() {
-        val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>()
-        rule.setLinkNewDeviceRootView(
-            state = aLinkNewDeviceRootState(
-                isSupported = AsyncData.Success(true),
-                eventSink = eventRecorder,
+    fun `link mobile button clicked - calls the expected callback`() = runAndroidComposeUiTest {
+        val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
+        ensureCalledOnceWithParam(LinkDeviceType.Mobile) { callback ->
+            setLinkNewDeviceRootView(
+                state = aLinkNewDeviceRootState(
+                    isSupported = AsyncData.Success(true),
+                    eventSink = eventRecorder,
+                ),
+                onUnlockDevice = callback,
             )
-        )
-        rule.clickOn(R.string.screen_link_new_device_root_mobile_device)
-        eventRecorder.assertSingle(LinkNewDeviceRootEvent.LinkMobileDevice)
+            clickOn(R.string.screen_link_new_device_root_mobile_device)
+        }
     }
 
     @Test
-    fun `not supported - dismiss click - invokes the expected callback`() {
+    fun `not supported - dismiss click - invokes the expected callback`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<LinkNewDeviceRootEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setLinkNewDeviceRootView(
+            setLinkNewDeviceRootView(
                 state = aLinkNewDeviceRootState(
                     isSupported = AsyncData.Success(false),
                     eventSink = eventRecorder,
                 ),
                 onBackClick = callback,
             )
-            rule.clickOn(CommonStrings.action_dismiss)
+            clickOn(CommonStrings.action_dismiss)
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLinkNewDeviceRootView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setLinkNewDeviceRootView(
         state: LinkNewDeviceRootState = aLinkNewDeviceRootState(),
         onBackClick: () -> Unit = EnsureNeverCalled(),
-        onLinkDesktopDeviceClick: () -> Unit = EnsureNeverCalled(),
+        onUnlockDevice: (type: LinkDeviceType) -> Unit = EnsureNeverCalledWithParam(),
     ) {
         setContent {
             LinkNewDeviceRootView(
                 state = state,
                 onBackClick = onBackClick,
-                onLinkDesktopDeviceClick = onLinkDesktopDeviceClick,
+                onUnlockDevice = onUnlockDevice,
             )
         }
     }
diff --git a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeViewTest.kt b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeViewTest.kt
index fcc3afeb7d..a8bc2b27a9 100644
--- a/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeViewTest.kt
+++ b/features/linknewdevice/impl/src/test/kotlin/io/element/android/features/linknewdevice/impl/screens/scan/ScanQrCodeViewTest.kt
@@ -5,12 +5,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.linknewdevice.impl.screens.scan
 
+import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -19,52 +24,51 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ScanQrCodeViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
+import org.robolectric.annotation.Config
 
+class ScanQrCodeViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    @Config(sdk = [UPSIDE_DOWN_CAKE])
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<ScanQrCodeEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setView(
+            setView(
                 state = aScanQrCodeState(
                     eventSink = eventRecorder,
                 ),
                 onBackClick = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `try again button clicked - emits the expected event`() {
+    @Config(sdk = [UPSIDE_DOWN_CAKE])
+    fun `try again button clicked - emits the expected event`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<ScanQrCodeEvent>()
-        rule.setView(
+        setView(
             state = aScanQrCodeState(
                 scanAction = AsyncAction.Failure(AN_EXCEPTION),
                 eventSink = eventRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_try_again)
+        clickOn(CommonStrings.action_try_again)
         eventRecorder.assertSingle(ScanQrCodeEvent.TryAgain)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setView(
         state: ScanQrCodeState = aScanQrCodeState(),
         onBackClick: () -> Unit = EnsureNeverCalled(),
     ) {
         setContent {
-            ScanQrCodeView(
-                state = state,
-                onBackClick = onBackClick,
-            )
+            CompositionLocalProvider(LocalInspectionMode provides true) {
+                ScanQrCodeView(
+                    state = state,
+                    onBackClick = onBackClick,
+                )
+            }
         }
     }
 }
diff --git a/features/location/api/build.gradle.kts b/features/location/api/build.gradle.kts
index ab85e37594..f8377389f1 100644
--- a/features/location/api/build.gradle.kts
+++ b/features/location/api/build.gradle.kts
@@ -71,6 +71,7 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.uiStrings)
     implementation(libs.coil.compose)
+    implementation(libs.datetime)
 
     testCommonDependencies(libs)
 }
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/LiveLocationSharingBanner.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/LiveLocationSharingBanner.kt
new file mode 100644
index 0000000000..8c53550737
--- /dev/null
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/LiveLocationSharingBanner.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.api
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+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.res.stringResource
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ButtonSize
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun LiveLocationSharingBanner(
+    onClick: () -> Unit,
+    onStopClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .background(ElementTheme.colors.bgCanvasDefault)
+            .drawBannerBorder(ElementTheme.colors.separatorPrimary)
+            .clickable(onClick = onClick)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = CompoundIcons.LocationPinSolid(),
+                contentDescription = null,
+                tint = ElementTheme.colors.iconAccentPrimary,
+                modifier = Modifier.size(24.dp),
+            )
+            Text(
+                text = stringResource(CommonStrings.screen_room_live_location_banner),
+                style = ElementTheme.typography.fontBodyMdMedium,
+                color = ElementTheme.colors.textPrimary,
+            )
+        }
+        Button(
+            text = stringResource(CommonStrings.action_stop),
+            onClick = onStopClick,
+            destructive = true,
+            size = ButtonSize.Small,
+        )
+    }
+}
+
+private fun Modifier.drawBannerBorder(borderColor: Color): Modifier = drawBehind {
+    val strokeWidth = 1.dp.toPx()
+    val bottomY = size.height - strokeWidth / 2
+    drawLine(
+        color = borderColor,
+        start = Offset(0f, strokeWidth / 2),
+        end = Offset(size.width, strokeWidth / 2),
+        strokeWidth = strokeWidth,
+    )
+    drawLine(
+        color = borderColor,
+        start = Offset(0f, bottomY),
+        end = Offset(size.width, bottomY),
+        strokeWidth = strokeWidth,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun LiveLocationSharingBannerPreview() = ElementPreview {
+    LiveLocationSharingBanner(
+        onClick = {},
+        onStopClick = {},
+    )
+}
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/RenderingMapsNotSupportedDialog.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/RenderingMapsNotSupportedDialog.kt
new file mode 100644
index 0000000000..a4d65763ab
--- /dev/null
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/RenderingMapsNotSupportedDialog.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.api
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun RenderingMapsNotSupportedDialog(onSubmit: () -> Unit) {
+    ErrorDialog(
+        title = stringResource(CommonStrings.vulkan_not_supported_dialog_title_android),
+        content = stringResource(CommonStrings.vulkan_not_supported_dialog_content_android),
+        onSubmit = onSubmit,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun RenderingMapsNotSupportedDialogPreview() = ElementPreview {
+    RenderingMapsNotSupportedDialog(onSubmit = {})
+}
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationMode.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationMode.kt
index 1227ddec46..3feeeff57d 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationMode.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationMode.kt
@@ -24,5 +24,7 @@ sealed interface ShowLocationMode : Parcelable {
     ) : ShowLocationMode
 
     @Parcelize
-    data object Live : ShowLocationMode
+    data class Live(
+        val senderId: UserId
+    ) : ShowLocationMode
 }
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt
index 0657bae634..c16b1ae560 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt
@@ -8,8 +8,11 @@
 
 package io.element.android.features.location.api
 
+import android.graphics.Bitmap
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.BoxWithConstraintsScope
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -22,11 +25,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.core.graphics.createBitmap
 import coil3.Extras
+import coil3.asImage
 import coil3.compose.AsyncImagePainter
 import coil3.compose.rememberAsyncImagePainter
 import coil3.request.ImageRequest
+import coil3.request.SuccessResult
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.location.api.internal.StaticMapPlaceholder
 import io.element.android.features.location.api.internal.StaticMapUrlBuilder
@@ -35,14 +44,20 @@ import io.element.android.libraries.designsystem.components.LocationPin
 import io.element.android.libraries.designsystem.components.PinVariant
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 
 /**
  * Shows a static map image downloaded via a third party service's static maps API.
+ *
+ * Handles 4 distinct cases:
+ * 1. Stale location (pinVariant is StaleLocation) - shows stale map with stale pin, no fetching
+ * 2. Null location - shows blurred placeholder, no pin, no loading
+ * 3. Loading (location != null, fetching) - shows blurred placeholder with loading indicator
+ * 4. Success (location != null, loaded) - shows actual map with pin
  */
 @Composable
 fun StaticMapView(
-    lat: Double,
-    lon: Double,
+    location: Location?,
     zoom: Double,
     pinVariant: PinVariant,
     contentDescription: String?,
@@ -56,19 +71,90 @@ fun StaticMapView(
         modifier = modifier,
         contentAlignment = Alignment.Center
     ) {
-        val context = LocalContext.current
-        var retryHash by remember { mutableIntStateOf(0) }
-        val builder = remember { StaticMapUrlBuilder() }
+        // Case 1: Stale location - show stale map with stale pin, no fetching
+        when {
+            pinVariant is PinVariant.StaleLocation -> {
+                StaleMapContent(
+                    pinVariant = pinVariant,
+                    contentDescription = contentDescription,
+                    width = maxWidth,
+                    height = maxHeight,
+                )
+            }
+            // Case 2: Null location - show blurred placeholder, no pin, no loading
+            location == null -> {
+                StaticMapPlaceholder(
+                    painter = painterResource(R.drawable.blurred_map),
+                    canReload = false,
+                    contentDescription = contentDescription,
+                    width = maxWidth,
+                    height = maxHeight,
+                    onLoadMapClick = {}
+                )
+            }
+            // Cases 3 & 4: Non-null location - fetch map
+            else -> LoadableMapContent(
+                location = location,
+                zoom = zoom,
+                pinVariant = pinVariant,
+                contentDescription = contentDescription,
+                darkMode = darkMode,
+            )
+        }
+    }
+}
+
+@Composable
+private fun BoxWithConstraintsScope.StaleMapContent(
+    pinVariant: PinVariant,
+    contentDescription: String?,
+    width: Dp,
+    height: Dp,
+) {
+    Box(contentAlignment = Alignment.Center) {
+        Image(
+            painter = painterResource(R.drawable.stale_map),
+            contentDescription = contentDescription,
+            contentScale = ContentScale.FillBounds,
+            modifier = Modifier.size(width = width, height = height)
+        )
+        LocationPin(variant = pinVariant, modifier = Modifier.centerBottomEdge(this@StaleMapContent))
+    }
+}
+
+@Composable
+private fun BoxWithConstraintsScope.LoadableMapContent(
+    location: Location,
+    zoom: Double,
+    pinVariant: PinVariant,
+    contentDescription: String?,
+    darkMode: Boolean,
+) {
+    val context = LocalContext.current
+    var retryHash by remember { mutableIntStateOf(0) }
+    val builder = remember { StaticMapUrlBuilder() }
+
+    val (painter, state, contentScale) = if (LocalInspectionMode.current) {
+        val painter = painterResource(CommonDrawables.sample_map)
+        val state = AsyncImagePainter.State.Success(
+            painter = painter,
+            result = SuccessResult(
+                image = createBitmap(1, 1, Bitmap.Config.ALPHA_8).asImage(),
+                request = ImageRequest.Builder(context).build()
+            )
+        )
+        Triple(painter, state, ContentScale.Crop)
+    } else {
         val painter = rememberAsyncImagePainter(
             model = if (constraints.isZero) {
-                // Avoid building a URL if any of the size constraints is zero (else it will thrown an exception).
+                // Avoid building a URL if any of the size constraints is zero
                 null
             } else {
                 ImageRequest.Builder(context)
                     .data(
                         builder.build(
-                            lat = lat,
-                            lon = lon,
+                            lat = location.lat,
+                            lon = location.lon,
                             zoom = zoom,
                             darkMode = darkMode,
                             width = constraints.maxWidth,
@@ -84,22 +170,26 @@ fun StaticMapView(
             }
         )
 
-        val collectedState = painter.state.collectAsState()
-        if (collectedState.value is AsyncImagePainter.State.Success) {
+        val state by painter.state.collectAsState()
+        Triple(painter, state, ContentScale.Fit)
+    }
+
+    when (state) {
+        is AsyncImagePainter.State.Success -> {
             Image(
                 painter = painter,
                 contentDescription = contentDescription,
                 modifier = Modifier.size(width = maxWidth, height = maxHeight),
                 // The returned image can be smaller than the requested size due to the static maps API having
-                // a max width and height of 2048 px. See buildStaticMapsApiUrl() for more details.
-                // We apply ContentScale.Fit to scale the image to fill the AsyncImage should this be the case.
-                contentScale = ContentScale.Fit,
+                // a max width and height of 2048 px. We apply ContentScale.Fit to handle this.
+                contentScale = contentScale,
             )
             LocationPin(variant = pinVariant, modifier = Modifier.centerBottomEdge(this))
-        } else {
+        }
+        else -> {
             StaticMapPlaceholder(
-                showProgress = collectedState.value.isLoading(),
-                canReload = builder.isServiceAvailable(),
+                painter = painterResource(R.drawable.blurred_map),
+                canReload = builder.isServiceAvailable() && state is AsyncImagePainter.State.Error,
                 contentDescription = contentDescription,
                 width = maxWidth,
                 height = maxHeight,
@@ -109,17 +199,11 @@ fun StaticMapView(
     }
 }
 
-private fun AsyncImagePainter.State.isLoading(): Boolean {
-    return this is AsyncImagePainter.State.Empty ||
-        this is AsyncImagePainter.State.Loading
-}
-
 @PreviewsDayNight
 @Composable
 internal fun StaticMapViewPreview() = ElementPreview {
     StaticMapView(
-        lat = 0.0,
-        lon = 0.0,
+        location = Location(0.0, 0.0),
         zoom = 0.0,
         contentDescription = null,
         pinVariant = PinVariant.PinnedLocation,
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilder.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilder.kt
index d119dc7eb2..054805d1ab 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilder.kt
@@ -25,8 +25,18 @@ internal class MapTilerTileServerStyleUriBuilder(
         darkMapId = BuildConfig.MAPTILER_DARK_MAP_ID,
     )
 
-    override fun build(darkMode: Boolean): String {
-        val mapId = if (darkMode) darkMapId else lightMapId
-        return "$baseUrl/$mapId/style.json?key=$apiKey"
+    override fun build(
+        customMapStyleUrl: String?,
+        darkMode: Boolean,
+    ): String {
+        return buildString {
+            if (customMapStyleUrl.isNullOrBlank()) {
+                val mapId = if (darkMode) darkMapId else lightMapId
+                append("$baseUrl/$mapId/style.json")
+            } else {
+                append(customMapStyleUrl)
+            }
+            append("?key=$apiKey")
+        }
     }
 }
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt
index 81b80c8dc3..0292ec927e 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt
@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -27,14 +28,13 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.location.api.R
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 internal fun StaticMapPlaceholder(
-    showProgress: Boolean,
+    painter: Painter,
     canReload: Boolean,
     contentDescription: String?,
     width: Dp,
@@ -46,17 +46,15 @@ internal fun StaticMapPlaceholder(
         contentAlignment = Alignment.Center,
         modifier = modifier
             .size(width = width, height = height)
-            .then(if (showProgress) Modifier else Modifier.clickable(onClick = onLoadMapClick))
+            .clickable(enabled = canReload, onClick = onLoadMapClick)
     ) {
         Image(
-            painter = painterResource(id = R.drawable.blurred_map),
+            painter = painter,
             contentDescription = contentDescription,
             contentScale = ContentScale.FillBounds,
             modifier = Modifier.size(width = width, height = height)
         )
-        if (showProgress) {
-            CircularProgressIndicator()
-        } else if (canReload) {
+        if (canReload) {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
@@ -77,13 +75,10 @@ internal fun StaticMapPlaceholderPreview() = ElementPreview {
         modifier = Modifier.padding(8.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        listOf(
-            true to false,
-            false to true,
-            false to false,
-        ).forEach { (showProgress, canReload) ->
+        listOf(false, true)
+        .forEach { canReload ->
             StaticMapPlaceholder(
-                showProgress = showProgress,
+                painter = painterResource(R.drawable.blurred_map),
                 canReload = canReload,
                 contentDescription = null,
                 width = 400.dp,
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/TileServerStyleUriBuilder.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/TileServerStyleUriBuilder.kt
index 17b620eec9..762d580f8e 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/TileServerStyleUriBuilder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/TileServerStyleUriBuilder.kt
@@ -19,21 +19,25 @@ import io.element.android.compound.theme.ElementTheme
  */
 interface TileServerStyleUriBuilder {
     fun build(
+        customMapStyleUrl: String?,
         darkMode: Boolean,
     ): String
 }
 
-fun TileServerStyleUriBuilder(): TileServerStyleUriBuilder = MapTilerTileServerStyleUriBuilder()
-
 /**
  * Provides and remembers a style URI for a MapLibre compatible tile server.
  *
  * Used for rendering dynamic maps.
  */
 @Composable
-fun rememberTileStyleUrl(): String {
+fun rememberTileStyleUrl(
+    customMapStyleUrl: String?,
+): String {
     val darkMode = !ElementTheme.isLightTheme
-    return remember(darkMode) {
-        TileServerStyleUriBuilder().build(darkMode)
+    return remember(darkMode, customMapStyleUrl) {
+        MapTilerTileServerStyleUriBuilder().build(
+            customMapStyleUrl = customMapStyleUrl,
+            darkMode = darkMode,
+        )
     }
 }
diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/live/ActiveLiveLocationShareManager.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/live/ActiveLiveLocationShareManager.kt
new file mode 100644
index 0000000000..cd6b8731c1
--- /dev/null
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/live/ActiveLiveLocationShareManager.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.api.live
+
+import io.element.android.libraries.core.coroutine.mapState
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.flow.StateFlow
+import kotlin.time.Duration
+
+interface ActiveLiveLocationShareManager {
+    /** All rooms currently sharing live location on this device. */
+    val sharingRoomIds: StateFlow<Set<RoomId>>
+
+    /**
+     * Initializes the manager.
+     * This will restart or stop current location sharing and set the listener on the SDK
+     * and the session manager.
+     */
+    suspend fun setup()
+
+    /**
+     * Starts live location sharing in the given room.
+     * Calls room.startLiveLocationShare() on the SDK, registers the share,
+     * and starts the foreground GPS service if not already running.
+     */
+    suspend fun startShare(roomId: RoomId, duration: Duration): Result<Unit>
+
+    /**
+     * Stops live location sharing in the given room.
+     * Calls room.stopLiveLocationShare() on the SDK, removes the share,
+     * and stops the foreground service if no shares remain.
+     */
+    suspend fun stopShare(roomId: RoomId): Result<Unit>
+}
+
+fun ActiveLiveLocationShareManager.isCurrentlySharing(roomId: RoomId): StateFlow<Boolean> {
+    return sharingRoomIds.mapState { roomId in it }
+}
diff --git a/features/location/api/src/main/res/drawable-night/stale_map.png b/features/location/api/src/main/res/drawable-night/stale_map.png
new file mode 100644
index 0000000000..9e36759203
Binary files /dev/null and b/features/location/api/src/main/res/drawable-night/stale_map.png differ
diff --git a/features/location/api/src/main/res/drawable/stale_map.png b/features/location/api/src/main/res/drawable/stale_map.png
new file mode 100644
index 0000000000..87fa0188c9
Binary files /dev/null and b/features/location/api/src/main/res/drawable/stale_map.png differ
diff --git a/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilderTest.kt b/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilderTest.kt
index d5c6521258..2e07204594 100644
--- a/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilderTest.kt
+++ b/features/location/api/src/test/kotlin/io/element/android/features/location/api/internal/MapTilerTileServerStyleUriBuilderTest.kt
@@ -22,14 +22,40 @@ class MapTilerTileServerStyleUriBuilderTest {
     @Test
     fun `light map uri`() {
         assertThat(
-            builder.build(darkMode = false)
+            builder.build(
+                customMapStyleUrl = null,
+                darkMode = false,
+            )
         ).isEqualTo("https://base.url/aLightMapId/style.json?key=anApiKey")
     }
 
     @Test
     fun `dark map uri`() {
         assertThat(
-            builder.build(darkMode = true)
+            builder.build(
+                customMapStyleUrl = null,
+                darkMode = true,
+            )
         ).isEqualTo("https://base.url/aDarkMapId/style.json?key=anApiKey")
     }
+
+    @Test
+    fun `custom map uri light`() {
+        assertThat(
+            builder.build(
+                customMapStyleUrl = "https://custom.url/style.json",
+                darkMode = false,
+            )
+        ).isEqualTo("https://custom.url/style.json?key=anApiKey")
+    }
+
+    @Test
+    fun `custom map uri dark`() {
+        assertThat(
+            builder.build(
+                customMapStyleUrl = "https://custom.url/style.json",
+                darkMode = true,
+            )
+        ).isEqualTo("https://custom.url/style.json?key=anApiKey")
+    }
 }
diff --git a/features/location/impl/build.gradle.kts b/features/location/impl/build.gradle.kts
index 0da54a1394..165c32b7c5 100644
--- a/features/location/impl/build.gradle.kts
+++ b/features/location/impl/build.gradle.kts
@@ -37,10 +37,16 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrixui)
     implementation(projects.services.analytics.api)
+    implementation(projects.services.appnavstate.api)
     implementation(libs.accompanist.permission)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.push.api)
+    implementation(projects.libraries.sessionStorage.api)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.datetime)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
@@ -50,4 +56,7 @@ dependencies {
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.features.messages.test)
     testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.sessionStorage.test)
+    testImplementation(projects.features.location.test)
 }
diff --git a/features/location/impl/src/main/AndroidManifest.xml b/features/location/impl/src/main/AndroidManifest.xml
index ae728c09e1..e56a13e644 100644
--- a/features/location/impl/src/main/AndroidManifest.xml
+++ b/features/location/impl/src/main/AndroidManifest.xml
@@ -5,8 +5,26 @@
   ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+
+    <!-- Declare Vulkan as an optional feature to prevent installation issues on devices that do not support it. -->
+    <uses-feature
+        android:name="android.hardware.vulkan.version"
+        android:required="false"
+        tools:replace="android:required" />
+
+    <application>
+        <service
+            android:name=".live.service.LiveLocationSharingService"
+            android:foregroundServiceType="location"
+            android:exported="false" />
+    </application>
+
 </manifest>
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheck.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheck.kt
index a0b0cd4734..72add1ea14 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheck.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheck.kt
@@ -14,15 +14,19 @@ import io.element.android.features.location.impl.common.ui.LocationConstraintsDi
 sealed interface LocationConstraintsCheck {
     data object Success : LocationConstraintsCheck
     data object PermissionRationale : LocationConstraintsCheck
+    data object PermissionShouldBeRequested : LocationConstraintsCheck
     data object PermissionDenied : LocationConstraintsCheck
     data object LocationServiceDisabled : LocationConstraintsCheck
+    data object NotEnoughPowerLevel : LocationConstraintsCheck
 }
 
 fun checkLocationConstraints(
     permissionsState: PermissionsState,
     locationActions: LocationActions,
+    sendLiveLocationPermissions: SendLiveLocationPermissions,
 ): LocationConstraintsCheck {
     return when {
+        !sendLiveLocationPermissions.hasAll -> LocationConstraintsCheck.NotEnoughPowerLevel
         permissionsState.isAnyGranted -> {
             if (locationActions.isLocationEnabled()) {
                 LocationConstraintsCheck.Success
@@ -31,6 +35,7 @@ fun checkLocationConstraints(
             }
         }
         permissionsState.shouldShowRationale -> LocationConstraintsCheck.PermissionRationale
+        !permissionsState.permissionsAlreadyRequested -> LocationConstraintsCheck.PermissionShouldBeRequested
         else -> LocationConstraintsCheck.PermissionDenied
     }
 }
@@ -38,8 +43,10 @@ fun checkLocationConstraints(
 fun LocationConstraintsCheck.toDialogState(): LocationConstraintsDialogState {
     return when (this) {
         LocationConstraintsCheck.Success -> LocationConstraintsDialogState.None
+        LocationConstraintsCheck.PermissionShouldBeRequested -> LocationConstraintsDialogState.None
         LocationConstraintsCheck.PermissionRationale -> LocationConstraintsDialogState.PermissionRationale
         LocationConstraintsCheck.PermissionDenied -> LocationConstraintsDialogState.PermissionDenied
         LocationConstraintsCheck.LocationServiceDisabled -> LocationConstraintsDialogState.LocationServiceDisabled
+        LocationConstraintsCheck.NotEnoughPowerLevel -> LocationConstraintsDialogState.NotEnoughPowerLevel
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/SendLiveLocationPermissions.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/SendLiveLocationPermissions.kt
new file mode 100644
index 0000000000..d1a9e32026
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/SendLiveLocationPermissions.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common
+
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+
+/**
+ * Permissions to send beacon and beacon_info events in the room.
+ */
+data class SendLiveLocationPermissions(
+    val canSendBeacon: Boolean,
+    val canSendBeaconInfo: Boolean,
+) {
+    val hasAll = canSendBeaconInfo && canSendBeacon
+
+    companion object {
+        val DEFAULT = SendLiveLocationPermissions(canSendBeacon = false, canSendBeaconInfo = false)
+        val GRANTED = SendLiveLocationPermissions(canSendBeacon = true, canSendBeaconInfo = true)
+    }
+}
+
+fun RoomPermissions.sendLiveLocationPermissions(): SendLiveLocationPermissions {
+    return SendLiveLocationPermissions(
+        canSendBeaconInfo = canOwnUserSendState(StateEventType.BeaconInfo),
+        canSendBeacon = canOwnUserSendMessage(MessageEventType.Beacon),
+    )
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/DefaultPermissionsPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/DefaultPermissionsPresenter.kt
index 1aa2e1269d..5aa7ae6f63 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/DefaultPermissionsPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/DefaultPermissionsPresenter.kt
@@ -9,6 +9,10 @@
 package io.element.android.features.location.impl.common.permissions
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
@@ -32,11 +36,16 @@ class DefaultPermissionsPresenter(
     @OptIn(ExperimentalPermissionsApi::class)
     @Composable
     override fun present(): PermissionsState {
-        val multiplePermissionsState = rememberMultiplePermissionsState(permissions = permissions)
+        var permissionsRequested by remember { mutableStateOf(false) }
+        val multiplePermissionsState = rememberMultiplePermissionsState(permissions = permissions) {
+            permissionsRequested = true
+        }
 
         fun handleEvent(event: PermissionsEvents) {
             when (event) {
-                PermissionsEvents.RequestPermissions -> multiplePermissionsState.launchMultiplePermissionRequest()
+                PermissionsEvents.RequestPermissions -> {
+                    multiplePermissionsState.launchMultiplePermissionRequest()
+                }
             }
         }
 
@@ -47,6 +56,7 @@ class DefaultPermissionsPresenter(
                 else -> PermissionsState.Permissions.NoneGranted
             },
             shouldShowRationale = multiplePermissionsState.shouldShowRationale,
+            permissionsAlreadyRequested = permissionsRequested,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt
index 91191280d0..25ceb3ba29 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsState.kt
@@ -11,6 +11,7 @@ package io.element.android.features.location.impl.common.permissions
 data class PermissionsState(
     val permissions: Permissions,
     val shouldShowRationale: Boolean,
+    val permissionsAlreadyRequested: Boolean,
     val eventSink: (PermissionsEvents) -> Unit,
 ) {
     sealed interface Permissions {
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationConstraintsDialog.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationConstraintsDialog.kt
index 95f5129f91..334aebaee6 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationConstraintsDialog.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationConstraintsDialog.kt
@@ -10,6 +10,8 @@ package io.element.android.features.location.impl.common.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.res.stringResource
+import io.element.android.features.location.impl.R
+import io.element.android.libraries.designsystem.components.dialogs.AlertDialog
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -42,6 +44,10 @@ fun LocationConstraintsDialog(
             onDismiss = onDismiss,
             submitText = stringResource(CommonStrings.action_continue),
         )
+        LocationConstraintsDialogState.NotEnoughPowerLevel -> AlertDialog(
+            content = stringResource(R.string.screen_share_location_live_location_missing_permissions),
+            onDismiss = onDismiss
+        )
     }
 }
 
@@ -51,4 +57,5 @@ sealed interface LocationConstraintsDialogState {
     data object PermissionRationale : LocationConstraintsDialogState
     data object PermissionDenied : LocationConstraintsDialogState
     data object LocationServiceDisabled : LocationConstraintsDialogState
+    data object NotEnoughPowerLevel : LocationConstraintsDialogState
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationPinMarkers.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationPinMarkers.kt
index 762a719cf4..e30dfd53de 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationPinMarkers.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationPinMarkers.kt
@@ -14,6 +14,7 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.location.api.Location
 import io.element.android.libraries.designsystem.components.PinVariant
 import io.element.android.libraries.designsystem.components.rememberLocationPinBitmap
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.serialization.json.JsonPrimitive
 import org.maplibre.compose.expressions.dsl.and
 import org.maplibre.compose.expressions.dsl.asString
@@ -66,7 +67,7 @@ data class LocationMarkerData(
  */
 @Composable
 fun LocationPinMarkers(
-    markers: List<LocationMarkerData>,
+    markers: ImmutableList<LocationMarkerData>,
     onMarkerClick: ((LocationMarkerData) -> Unit)? = null,
     onClusterClick: ((Position) -> Unit)? = null,
 ) {
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
index b949f55c76..24476e3c66 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -31,6 +32,8 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -42,6 +45,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun LocationShareRow(
     item: LocationShareItem,
     onShareClick: () -> Unit,
+    onStopClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -91,19 +95,32 @@ fun LocationShareRow(
                     )
                 }
                 Text(
-                    text = item.formattedTimestamp,
+                    text = if (item.isLive) stringResource(CommonStrings.screen_room_live_location_banner) else item.formattedTimestamp,
                     style = ElementTheme.typography.fontBodySmRegular,
-                    color = ElementTheme.colors.textSecondary,
+                    color = if (item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                 )
             }
         }
+        if (item.canStopSharing) {
+            IconButton(
+                onClick = onStopClick,
+                colors = IconButtonDefaults.iconButtonColors(
+                    containerColor = ElementTheme.colors.bgCriticalPrimary,
+                    contentColor = ElementTheme.colors.iconOnSolidPrimary,
+                )
+            ) {
+                Icon(
+                    imageVector = CompoundIcons.Stop(),
+                    contentDescription = stringResource(CommonStrings.action_stop),
+                )
+            }
+        }
         IconButton(onClick = onShareClick) {
             Icon(
                 imageVector = CompoundIcons.ShareAndroid(),
                 contentDescription = stringResource(CommonStrings.action_share),
-                tint = ElementTheme.colors.iconPrimary,
             )
         }
     }
@@ -116,35 +133,39 @@ internal fun LocationShareRowPreview() = ElementPreview {
         LocationShareRow(
             item = LocationShareItem(
                 userId = UserId("@alice:matrix.org"),
-                displayName = "Alice",
+                displayName = USER_NAME_ALICE,
                 avatarData = AvatarData(
                     id = "@alice:matrix.org",
-                    name = "Alice",
+                    name = USER_NAME_ALICE,
                     url = null,
                     size = AvatarSize.UserListItem,
                 ),
                 formattedTimestamp = "Shared 1 min ago",
                 isLive = true,
                 assetType = AssetType.SENDER,
-                location = Location(0.0, 0.0)
+                location = Location(0.0, 0.0),
+                isOwnUser = true,
             ),
+            onStopClick = {},
             onShareClick = {},
         )
         LocationShareRow(
             item = LocationShareItem(
                 userId = UserId("@bob:matrix.org"),
-                displayName = "Bob",
+                displayName = USER_NAME_BOB,
                 avatarData = AvatarData(
                     id = "@bob:matrix.org",
-                    name = "Bob",
+                    name = USER_NAME_BOB,
                     url = null,
                     size = AvatarSize.UserListItem,
                 ),
                 isLive = false,
                 assetType = AssetType.PIN,
                 formattedTimestamp = "Shared 5 hours ago",
-                location = Location(0.0, 0.0)
+                location = Location(0.0, 0.0),
+                isOwnUser = false
             ),
+            onStopClick = {},
             onShareClick = {},
         )
     }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/MapBottomSheetScaffold.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/MapBottomSheetScaffold.kt
index fbaed9c854..0eff1b6028 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/MapBottomSheetScaffold.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/MapBottomSheetScaffold.kt
@@ -10,12 +10,14 @@ package io.element.android.features.location.impl.common.ui
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.safeDrawing
@@ -28,13 +30,14 @@ import androidx.compose.material3.SheetValue
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.rememberBottomSheetScaffoldState
-import androidx.compose.material3.rememberStandardBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
@@ -42,8 +45,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.max
 import io.element.android.features.location.api.internal.rememberTileStyleUrl
 import io.element.android.features.location.impl.common.MapDefaults
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.data.tryOrNull
+import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import org.maplibre.compose.camera.CameraState
 import org.maplibre.compose.camera.rememberCameraState
 import org.maplibre.compose.map.MapOptions
@@ -60,6 +66,7 @@ import kotlin.math.roundToInt
  * - Updating camera position padding based on sheet height
  * - Rendering the MaplibreMap with proper ornament positioning
  *
+ * @param customMapStyleUrl Optional custom style URL for the map
  * @param modifier Modifier for the root layout
  * @param scaffoldState State for the bottom sheet scaffold
  * @param cameraState The camera state for the map
@@ -76,9 +83,12 @@ import kotlin.math.roundToInt
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MapBottomSheetScaffold(
+    customMapStyleUrl: AsyncData<String?>,
     modifier: Modifier = Modifier,
     scaffoldState: BottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = rememberStandardBottomSheetState(initialValue = SheetValue.PartiallyExpanded)
+        bottomSheetState = rememberBottomSheetState(
+            initialValue = SheetValue.PartiallyExpanded,
+        )
     ),
     cameraState: CameraState = rememberCameraState(),
     mapOptions: MapOptions = MapDefaults.options,
@@ -112,8 +122,11 @@ fun MapBottomSheetScaffold(
             modifier = Modifier,
             sheetPeekHeight = sheetPeekHeight,
             sheetContent = {
-                sheetContent(sheetPadding)
-                Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
+                val maxContentHeight = (layoutHeightPx * 0.5f).roundToInt().toDp()
+                Column(modifier = Modifier.heightIn(max = maxContentHeight)) {
+                    sheetContent(sheetPadding)
+                    Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
+                }
             },
             scaffoldState = scaffoldState,
             sheetDragHandle = sheetDragHandle,
@@ -124,13 +137,22 @@ fun MapBottomSheetScaffold(
             val ornamentOptions = mapOptions.ornamentOptions.copy(padding = sheetPadding)
             val mapOptions = mapOptions.copy(ornamentOptions = ornamentOptions)
             Box {
-                MaplibreMap(
-                    options = mapOptions,
-                    baseStyle = BaseStyle.Uri(rememberTileStyleUrl()),
-                    modifier = Modifier.fillMaxSize(),
-                    cameraState = cameraState,
-                    content = mapContent,
-                )
+                when (customMapStyleUrl) {
+                    is AsyncData.Success -> {
+                        MaplibreMap(
+                            options = mapOptions,
+                            baseStyle = BaseStyle.Uri(rememberTileStyleUrl(customMapStyleUrl.data)),
+                            modifier = Modifier.fillMaxSize(),
+                            cameraState = cameraState,
+                            content = mapContent,
+                        )
+                    }
+                    else -> {
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+                        }
+                    }
+                }
                 overlayContent(sheetPadding)
             }
         }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt
index 8b89f77be4..074404a4cc 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/UserLocationPuck.kt
@@ -7,75 +7,35 @@
 
 package io.element.android.features.location.impl.common.ui
 
-import android.annotation.SuppressLint
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.features.location.impl.common.MapDefaults
 import org.maplibre.compose.camera.CameraState
-import org.maplibre.compose.location.DesiredAccuracy
+import org.maplibre.compose.location.Location
 import org.maplibre.compose.location.LocationPuck
 import org.maplibre.compose.location.LocationPuckColors
 import org.maplibre.compose.location.LocationPuckSizes
-import org.maplibre.compose.location.LocationTrackingEffect
-import org.maplibre.compose.location.UserLocationState
-import org.maplibre.compose.location.rememberAndroidLocationProvider
-import org.maplibre.compose.location.rememberNullLocationProvider
-import org.maplibre.compose.location.rememberUserLocationState
-import kotlin.time.Duration.Companion.minutes
 
 @Composable
 fun UserLocationPuck(
     cameraState: CameraState,
-    locationState: UserLocationState,
-    trackUserLocation: Boolean,
+    location: Location?,
 ) {
-    LocationTrackingEffect(
-        locationState = locationState,
-        enabled = trackUserLocation,
-    ) {
-        val finalPosition = cameraState.position.copy(
-            target = currentLocation.position,
-            bearing = currentLocation.bearing ?: cameraState.position.bearing,
-            zoom = cameraState.position.zoom.coerceAtLeast(MapDefaults.DEFAULT_ZOOM)
+    LocationPuck(
+        idPrefix = "user-location",
+        location = location,
+        cameraState = cameraState,
+        accuracyThreshold = Float.POSITIVE_INFINITY,
+        showBearingAccuracy = false,
+        showBearing = false,
+        sizes = LocationPuckSizes(
+            dotRadius = 8.dp,
+            dotStrokeWidth = 2.dp,
+        ),
+        colors = LocationPuckColors(
+            dotFillColorCurrentLocation = ElementTheme.colors.iconAccentPrimary,
+            dotFillColorOldLocation = ElementTheme.colors.iconAccentTertiary,
+            dotStrokeColor = ElementTheme.colors.bgCanvasDefault,
         )
-        cameraState.animateTo(finalPosition)
-    }
-    val location = locationState.location
-    if (location != null) {
-        LocationPuck(
-            idPrefix = "user-location",
-            locationState = locationState,
-            cameraState = cameraState,
-            accuracyThreshold = Float.POSITIVE_INFINITY,
-            showBearingAccuracy = false,
-            showBearing = false,
-            sizes = LocationPuckSizes(
-                dotRadius = 8.dp,
-                dotStrokeWidth = 2.dp,
-            ),
-            colors = LocationPuckColors(
-                dotFillColorCurrentLocation = ElementTheme.colors.iconAccentPrimary,
-                dotFillColorOldLocation = ElementTheme.colors.iconAccentTertiary,
-                dotStrokeColor = ElementTheme.colors.bgCanvasDefault,
-            )
-        )
-    }
-}
-
-@SuppressLint("MissingPermission")
-@Composable
-fun rememberUserLocationState(hasLocationPermission: Boolean): UserLocationState {
-    val isPreview = LocalInspectionMode.current
-    val locationProvider = if (isPreview || !hasLocationPermission) {
-        rememberNullLocationProvider()
-    } else {
-        rememberAndroidLocationProvider(
-            updateInterval = 1.minutes,
-            desiredAccuracy = DesiredAccuracy.Balanced,
-            minDistanceMeters = 50f,
-        )
-    }
-    return rememberUserLocationState(locationProvider)
+    )
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/DefaultUserLocationStateFactory.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/DefaultUserLocationStateFactory.kt
new file mode 100644
index 0000000000..01a2b92d4a
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/DefaultUserLocationStateFactory.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common.userlocation
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.RoomScope
+import org.maplibre.compose.location.DesiredAccuracy
+import org.maplibre.compose.location.rememberNullLocationProvider
+import org.maplibre.spatialk.units.extensions.meters
+import kotlin.time.Duration.Companion.seconds
+
+@ContributesBinding(RoomScope::class)
+class DefaultUserLocationStateFactory : UserLocationState.Factory {
+    @Composable
+    override fun create(hasLocationPermission: Boolean): UserLocationState {
+        val locationProvider = if (!hasLocationPermission) {
+            rememberNullLocationProvider()
+        } else {
+            @SuppressLint("MissingPermission")
+            rememberPlatformLocationProvider(
+                updateInterval = 5.seconds,
+                desiredAccuracy = DesiredAccuracy.High,
+                minDistance = 5.meters,
+            )
+        }
+        val location by locationProvider.location.collectAsState()
+        return UserLocationState(location)
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/Location.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/Location.kt
new file mode 100644
index 0000000000..9777e14af5
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/Location.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common.userlocation
+
+import io.element.android.features.location.api.Location
+import org.maplibre.compose.location.PositionWithAccuracy
+import org.maplibre.spatialk.geojson.Position
+import org.maplibre.spatialk.units.extensions.meters
+import kotlin.time.TimeSource
+import org.maplibre.compose.location.Location as MapLibreLocation
+
+fun Location.asMapLibreLocation(): MapLibreLocation {
+    return MapLibreLocation(
+        position = PositionWithAccuracy(
+            value = Position(latitude = lat, longitude = lon),
+            accuracy = accuracy?.toDouble()?.meters
+        ),
+        // Not relevant as not used
+        timestamp = TimeSource.Monotonic.markNow(),
+    )
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/PlatformLocationProvider.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/PlatformLocationProvider.kt
new file mode 100644
index 0000000000..54e6d19cf6
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/PlatformLocationProvider.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common.userlocation
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import android.os.Handler
+import android.os.HandlerThread
+import androidx.annotation.RequiresPermission
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.LocalContext
+import androidx.core.location.LocationListenerCompat
+import androidx.core.location.LocationManagerCompat
+import androidx.core.location.LocationRequestCompat
+import androidx.core.os.ExecutorCompat
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.stateIn
+import org.maplibre.compose.location.DesiredAccuracy
+import org.maplibre.compose.location.Location
+import org.maplibre.compose.location.LocationProvider
+import org.maplibre.compose.location.PermissionException
+import org.maplibre.compose.location.asMapLibreLocation
+import org.maplibre.spatialk.units.Length
+import org.maplibre.spatialk.units.extensions.inMeters
+import kotlin.time.Duration
+
+@SuppressLint("InlinedApi")
+class PlatformLocationProvider(
+    context: Context,
+    private val updateInterval: Duration,
+    private val minDistance: Length,
+    private val desiredAccuracy: DesiredAccuracy = DesiredAccuracy.High,
+    coroutineScope: CoroutineScope,
+    sharingStarted: SharingStarted = SharingStarted.WhileSubscribed(stopTimeoutMillis = 1000),
+) : LocationProvider {
+    override val location: StateFlow<Location?>
+
+    init {
+        if (!handlerThread.isAlive) handlerThread.start()
+        if (
+            context.checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
+            context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED
+        ) {
+            throw PermissionException()
+        }
+        val locationManager = context.getSystemService(LocationManager::class.java)
+        val provider = PROVIDERS_BY_PRIORITY.firstOrNull { LocationManagerCompat.hasProvider(locationManager, it) }
+        val locationFlow = if (provider != null) {
+            createProviderFlow(locationManager, provider)
+        } else {
+            emptyFlow()
+        }
+        location = locationFlow.stateIn(coroutineScope, sharingStarted, null)
+    }
+
+    @RequiresPermission(
+        anyOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION]
+    )
+    private fun createProviderFlow(locationManager: LocationManager, provider: String) = callbackFlow {
+        send(locationManager.getLastKnownLocation(provider)?.asMapLibreLocation())
+        val listener = LocationListenerCompat { trySend(it.asMapLibreLocation()) }
+        val request = LocationRequestCompat.Builder(updateInterval.inWholeMilliseconds)
+            .setQuality(desiredAccuracy.toLocationRequestQuality())
+            .setMinUpdateDistanceMeters(minDistance.inMeters.toFloat())
+            .build()
+        LocationManagerCompat.requestLocationUpdates(
+            locationManager,
+            provider,
+            request,
+            ExecutorCompat.create(Handler(handlerThread.looper)),
+            listener,
+        )
+        awaitClose { LocationManagerCompat.removeUpdates(locationManager, listener) }
+    }
+
+    private companion object {
+        private val PROVIDERS_BY_PRIORITY = listOf(
+            LocationManager.FUSED_PROVIDER,
+            LocationManager.GPS_PROVIDER,
+            LocationManager.NETWORK_PROVIDER,
+        )
+        private val handlerThread by lazy { HandlerThread("PlatformLocationProvider") }
+    }
+}
+
+private fun DesiredAccuracy.toLocationRequestQuality(): Int = when (this) {
+    DesiredAccuracy.Highest, DesiredAccuracy.High -> LocationRequestCompat.QUALITY_HIGH_ACCURACY
+    DesiredAccuracy.Balanced -> LocationRequestCompat.QUALITY_BALANCED_POWER_ACCURACY
+    DesiredAccuracy.Low, DesiredAccuracy.Lowest -> LocationRequestCompat.QUALITY_LOW_POWER
+}
+
+@Composable
+@RequiresPermission(
+    anyOf = [Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION]
+)
+fun rememberPlatformLocationProvider(
+    updateInterval: Duration,
+    minDistance: Length,
+    desiredAccuracy: DesiredAccuracy = DesiredAccuracy.High,
+    context: Context = LocalContext.current,
+    coroutineScope: CoroutineScope = rememberCoroutineScope(),
+    sharingStarted: SharingStarted = SharingStarted.WhileSubscribed(stopTimeoutMillis = 1000),
+): PlatformLocationProvider {
+    return remember(context, updateInterval, minDistance, desiredAccuracy, coroutineScope, sharingStarted) {
+        PlatformLocationProvider(
+            context = context,
+            updateInterval = updateInterval,
+            minDistance = minDistance,
+            desiredAccuracy = desiredAccuracy,
+            coroutineScope = coroutineScope,
+            sharingStarted = sharingStarted,
+        )
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationState.kt
new file mode 100644
index 0000000000..d9dc2037a6
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationState.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common.userlocation
+
+import androidx.compose.runtime.Composable
+import org.maplibre.compose.location.Location
+
+data class UserLocationState(val location: Location?) {
+    fun interface Factory {
+        @Composable
+        fun create(hasLocationPermission: Boolean): UserLocationState
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationTrackingEffect.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationTrackingEffect.kt
new file mode 100644
index 0000000000..ca6c10b7fa
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/userlocation/UserLocationTrackingEffect.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common.userlocation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.snapshotFlow
+import io.element.android.features.location.impl.common.MapDefaults
+import kotlinx.coroutines.flow.distinctUntilChanged
+import org.maplibre.compose.camera.CameraState
+import org.maplibre.compose.location.Location
+import kotlin.math.abs
+
+/**
+ * Drop-in replacement for the library's LocationTrackingEffect.
+ * TODO remove once https://github.com/maplibre/maplibre-compose/issues/808 is fixed
+ */
+@Composable
+internal fun UserLocationTrackingEffect(
+    locationState: UserLocationState,
+    enabled: Boolean = true,
+    precision: Double = 0.00001,
+    onLocationChange: suspend (Location?) -> Unit,
+) {
+    val latestOnLocationChange by rememberUpdatedState(onLocationChange)
+    val latestLocationState by rememberUpdatedState(locationState)
+    LaunchedEffect(enabled) {
+        if (!enabled) return@LaunchedEffect
+        val locationStateFlow = snapshotFlow { latestLocationState.location }
+        locationStateFlow
+            .distinctUntilChanged { oldLocation, newLocation ->
+                if (oldLocation != null && newLocation != null) {
+                    when {
+                        abs(oldLocation.position.value.latitude - newLocation.position.value.latitude) >= precision -> false
+                        abs(oldLocation.position.value.longitude - newLocation.position.value.longitude) >= precision -> false
+                        else -> true
+                    }
+                } else {
+                    false
+                }
+            }
+            .collect { location ->
+                latestOnLocationChange(location)
+            }
+    }
+}
+
+@Composable
+internal fun UserLocationTrackingEffect(
+    cameraState: CameraState,
+    locationState: UserLocationState,
+    enabled: Boolean = true,
+    precision: Double = 0.00001,
+) {
+    UserLocationTrackingEffect(
+        locationState = locationState,
+        enabled = enabled,
+        precision = precision
+    ) { location ->
+        val target = location?.position?.value ?: cameraState.position.target
+        cameraState.animateTo(
+            cameraState.position.copy(
+                target = target,
+                // Force pointing to NORTH
+                bearing = 0.0,
+                zoom = cameraState.position.zoom.coerceAtLeast(MapDefaults.DEFAULT_ZOOM)
+            )
+        )
+    }
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushBindings.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/di/LocationBindings.kt
similarity index 58%
rename from libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushBindings.kt
rename to features/location/impl/src/main/kotlin/io/element/android/features/location/impl/di/LocationBindings.kt
index 49b2c43bc7..ee70936160 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/di/PushBindings.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/di/LocationBindings.kt
@@ -5,13 +5,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.impl.di
+package io.element.android.features.location.impl.di
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesTo
-import io.element.android.libraries.push.impl.push.FetchPushForegroundService
+import io.element.android.features.location.impl.live.service.LiveLocationSharingService
 
 @ContributesTo(AppScope::class)
-interface PushBindings {
-    fun inject(fetchPushForegroundService: FetchPushForegroundService)
+interface LocationBindings {
+    fun inject(service: LiveLocationSharingService)
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManager.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManager.kt
new file mode 100644
index 0000000000..33ce06454d
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManager.kt
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live
+
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import dev.zacsweers.metro.binding
+import io.element.android.features.location.api.Location
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
+import io.element.android.features.location.impl.live.service.LiveLocationReceiver
+import io.element.android.features.location.impl.live.service.LiveLocationSharingCoordinator
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.location.BeaconId
+import io.element.android.libraries.matrix.api.room.location.LiveLocationException
+import io.element.android.libraries.sessionstorage.api.observer.SessionListener
+import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.getAndUpdate
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.concurrent.atomics.AtomicBoolean
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.time.Duration
+import kotlin.time.Instant
+
+@OptIn(ExperimentalAtomicApi::class)
+@SingleIn(SessionScope::class)
+@ContributesBinding(SessionScope::class, binding = binding<ActiveLiveLocationShareManager>())
+class DefaultActiveLiveLocationShareManager(
+    private val matrixClient: MatrixClient,
+    private val coordinator: LiveLocationSharingCoordinator,
+    private val liveLocationStore: LiveLocationStore,
+    private val clock: SystemClock,
+    private val sessionObserver: SessionObserver,
+) : ActiveLiveLocationShareManager, LiveLocationReceiver {
+    private data class Timeout(val expiresAt: Instant, val job: Job)
+
+    private val isSetup = AtomicBoolean(false)
+    private val cachedRooms = ConcurrentHashMap<RoomId, JoinedRoom>()
+    private val timeouts = ConcurrentHashMap<RoomId, Timeout>()
+    private val syncedActiveShareIds = MutableStateFlow<Set<BeaconId>>(emptySet())
+    private val localSharingRoomIds = MutableStateFlow<Set<RoomId>>(emptySet())
+    override val sharingRoomIds: StateFlow<Set<RoomId>> = localSharingRoomIds
+
+    override suspend fun setup() = withContext(NonCancellable) {
+        if (isSetup.compareAndSet(expectedValue = false, newValue = true)) {
+            Timber.d("ActiveLiveLocationShareManager setup manager.")
+
+            recoverPersistedShares()
+
+            matrixClient.ownBeaconInfoUpdates
+                .onEach { update ->
+                    Timber.d("Received beaconInfoUpdate:$update")
+                    // First cancel the local share in this room if any.
+                    if (update.roomId in localSharingRoomIds.value) {
+                        stopLocalShare(roomId = update.roomId)
+                    }
+                    syncedActiveShareIds.update {
+                        if (update.isLive) {
+                            it + update.beaconId
+                        } else {
+                            it - update.beaconId
+                        }
+                    }
+                }
+                .launchIn(matrixClient.sessionCoroutineScope)
+
+            sessionObserver.addListener(sessionListener)
+        }
+    }
+
+    private val sessionListener: SessionListener = object : SessionListener {
+        override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
+            if (matrixClient.sessionId.value == userId) {
+                clear()
+            }
+        }
+    }
+
+    override suspend fun startShare(roomId: RoomId, duration: Duration): Result<Unit> = withContext(NonCancellable) {
+        Timber.d("ActiveLiveLocationShareManager starting share for room $roomId with duration ${duration.inWholeSeconds}s")
+        val room = cachedRooms.getOrPut(roomId) {
+            matrixClient.getJoinedRoom(roomId) ?: return@withContext Result.failure(IllegalStateException("No room found for $roomId"))
+        }
+        // Before starting a new location share, stop the current one if any is active.
+        room.stopLiveLocationShare()
+
+        room.startLiveLocationShare(duration.inWholeMilliseconds)
+            .onSuccess { beaconId ->
+                Timber.d("ActiveLiveLocationShareManager wait remote echo of $beaconId")
+                syncedActiveShareIds.first { beaconIds -> beaconIds.contains(beaconId) }
+                val expiresAt = Instant.fromEpochMilliseconds(clock.epochMillis() + duration.inWholeMilliseconds)
+                startLocalShare(roomId, expiresAt)
+            }
+            .onFailure {
+                Timber.e(it, "ActiveLiveLocationShareManager failed to start share for room $roomId")
+                stopLocalShare(roomId)
+            }
+            .map { }
+    }
+
+    override suspend fun stopShare(roomId: RoomId): Result<Unit> = withContext(NonCancellable) {
+        Timber.d("ActiveLiveLocationShareManager stopping share for room $roomId")
+        val room = cachedRooms.getOrPut(roomId) {
+            matrixClient.getJoinedRoom(roomId) ?: return@withContext Result.failure(IllegalStateException("No room found for $roomId"))
+        }
+        room.stopLiveLocationShare()
+            .onSuccess {
+                Timber.d("ActiveLiveLocationShareManager share stopped successfully for room $roomId")
+            }
+            .onFailure {
+                Timber.e(it, "ActiveLiveLocationShareManager failed to stop share for room $roomId")
+            }
+            .also {
+                stopLocalShare(roomId)
+            }
+    }
+
+    override suspend fun onUnrecoverableError() {
+        Timber.d("ActiveLiveLocationShareManager unrecoverable error, stopping all shares")
+        localSharingRoomIds.value.toList().forEach { stopShare(it) }
+    }
+
+    override suspend fun onLocationUpdate(location: Location) {
+        val active = stopExpiredShares()
+        Timber.d("ActiveLiveLocationShareManager received location update for ${active.size} active share(s)")
+        active.forEach { roomId ->
+            Timber.d("ActiveLiveLocationShareManager sending location to room $roomId")
+            sendLiveLocation(roomId, location)
+                .onFailure {
+                    Timber.e(it, "ActiveLiveLocationShareManager failed to send location to room $roomId")
+                }
+        }
+    }
+
+    private suspend fun stopExpiredShares(): List<RoomId> {
+        val nowMillis = clock.epochMillis()
+        val (expired, active) = localSharingRoomIds.value.partition { roomId ->
+            val timeout = timeouts[roomId] ?: return@partition false
+            timeout.expiresAt.toEpochMilliseconds() <= nowMillis
+        }
+        expired.forEach { roomId ->
+            Timber.d("ActiveLiveLocationShareManager location tick detected expired share for room $roomId, stopping")
+            stopShare(roomId)
+        }
+        return active
+    }
+
+    private suspend fun sendLiveLocation(roomId: RoomId, location: Location): Result<Unit> {
+        val room = cachedRooms.getOrPut(roomId) {
+            matrixClient.getJoinedRoom(roomId) ?: return Result.failure(IllegalStateException("No room found for $roomId"))
+        }
+        return room.sendLiveLocation(location.toGeoUri())
+            .recoverCatching { exception ->
+                when (exception) {
+                    is LiveLocationException.NotLive -> {
+                        stopLocalShare(roomId)
+                        throw exception
+                    }
+                    else -> throw exception
+                }
+            }
+    }
+
+    private suspend fun startLocalShare(roomId: RoomId, expiresAt: Instant) {
+        val wasEmpty = localSharingRoomIds.value.isEmpty()
+        Timber.d("ActiveLiveLocationShareManager share started successfully for room $roomId (wasEmpty=$wasEmpty)")
+        localSharingRoomIds.update { it + roomId }
+        liveLocationStore.setLiveLocationExpiry(roomId, expiresAt)
+        scheduleTimeout(roomId, expiresAt)
+        if (wasEmpty) {
+            Timber.d("ActiveLiveLocationShareManager registering with coordinator for session ${matrixClient.sessionId}")
+            coordinator.register(matrixClient.sessionId, this@DefaultActiveLiveLocationShareManager)
+        }
+    }
+
+    private suspend fun recoverPersistedShares() {
+        val now = Instant.fromEpochMilliseconds(clock.epochMillis())
+        liveLocationStore.getLiveLocationExpiries().forEach { (roomId, expiresAt) ->
+            if (expiresAt > now) {
+                // Only starts locally as the share is already started remotely
+                startLocalShare(roomId, expiresAt)
+            } else {
+                // Explicitly stop the share on the server.
+                stopShare(roomId)
+            }
+        }
+    }
+
+    private fun scheduleTimeout(roomId: RoomId, expiresAt: Instant) {
+        timeouts.remove(roomId)?.job?.cancel()
+        val delayMillis = expiresAt.toEpochMilliseconds() - clock.epochMillis()
+        val job = matrixClient.sessionCoroutineScope.launch {
+            delay(delayMillis)
+            stopShare(roomId)
+                .onFailure { error ->
+                    Timber.e(error, "ActiveLiveLocationShareManager failed to stop timed out share for room $roomId")
+                }
+        }
+        timeouts[roomId] = Timeout(expiresAt = expiresAt, job = job)
+    }
+
+    private suspend fun stopLocalShare(roomId: RoomId) {
+        Timber.d("ActiveLiveLocationShareManager stop local share in $roomId")
+        timeouts.remove(roomId)?.job?.cancel()
+        val wasSharing = localSharingRoomIds.getAndUpdate { it - roomId }.isNotEmpty()
+        cachedRooms.remove(roomId)?.close()
+        liveLocationStore.removeLiveLocationExpiry(roomId)
+        if (wasSharing && localSharingRoomIds.value.isEmpty()) {
+            Timber.d("ActiveLiveLocationShareManager unregistering from coordinator for session ${matrixClient.sessionId}")
+            coordinator.unregister(matrixClient.sessionId)
+        }
+    }
+
+    private suspend fun clear() {
+        Timber.d("ActiveLiveLocationShareManager clear state")
+        sessionObserver.removeListener(sessionListener)
+        coordinator.unregister(matrixClient.sessionId)
+        liveLocationStore.clear()
+        timeouts.values.forEach { it.job.cancel() }
+        timeouts.clear()
+        for (room in cachedRooms.values) {
+            room.close()
+        }
+        cachedRooms.clear()
+        localSharingRoomIds.value = emptySet()
+        syncedActiveShareIds.value = emptySet()
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/LiveLocationStore.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/LiveLocationStore.kt
new file mode 100644
index 0000000000..417d9d423a
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/LiveLocationStore.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live
+
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.androidutils.hash.hash
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
+import kotlinx.coroutines.flow.first
+import timber.log.Timber
+import kotlin.time.Instant
+
+private const val LIVE_LOCATION_EXPIRY_VALUE_SEPARATOR = "="
+
+@Inject
+@SingleIn(SessionScope::class)
+class LiveLocationStore(
+    preferenceDataStoreFactory: PreferenceDataStoreFactory,
+    sessionId: SessionId,
+) {
+    private val store = preferenceDataStoreFactory.create("location_${sessionId.value.hash().take(16)}")
+    private val acceptedLiveLocationDisclaimerKey = booleanPreferencesKey("live_location_disclaimer_accepted")
+    private val liveLocationExpiriesKey = stringSetPreferencesKey("live_location_expiries")
+
+    suspend fun hasAcceptedLiveLocationDisclaimer(): Boolean = runCatchingExceptions {
+        store.data.first()[acceptedLiveLocationDisclaimerKey] ?: false
+    }.getOrDefault(false)
+
+    suspend fun setAcceptedLiveLocationDisclaimer(): Result<Unit> = runCatchingExceptions {
+        store.edit { prefs ->
+            prefs[acceptedLiveLocationDisclaimerKey] = true
+        }
+    }
+
+    suspend fun getLiveLocationExpiries(): Map<RoomId, Instant> = runCatchingExceptions {
+        val serialized = store.data.first()[liveLocationExpiriesKey].orEmpty()
+        decodeLiveLocationExpiries(serialized)
+    }.onFailure { error ->
+        Timber.e(error, "Failed to decode live location expiry payload")
+    }.getOrDefault(emptyMap())
+
+    suspend fun setLiveLocationExpiry(roomId: RoomId, expiresAt: Instant): Result<Unit> = runCatchingExceptions {
+        store.edit { prefs ->
+            val current = decodeLiveLocationExpiries(prefs[liveLocationExpiriesKey].orEmpty())
+            prefs[liveLocationExpiriesKey] = encodeLiveLocationExpiries(current + (roomId to expiresAt))
+        }
+    }
+
+    suspend fun removeLiveLocationExpiry(roomId: RoomId): Result<Unit> = runCatchingExceptions {
+        store.edit { prefs ->
+            val current = decodeLiveLocationExpiries(prefs[liveLocationExpiriesKey].orEmpty())
+            val updated = current - roomId
+            if (updated.isEmpty()) {
+                prefs.remove(liveLocationExpiriesKey)
+            } else {
+                prefs[liveLocationExpiriesKey] = encodeLiveLocationExpiries(updated)
+            }
+        }
+    }
+
+    private fun decodeLiveLocationExpiries(serialized: Set<String>): Map<RoomId, Instant> {
+        return runCatchingExceptions {
+            serialized
+                .map { it.split(LIVE_LOCATION_EXPIRY_VALUE_SEPARATOR) }
+                .associate { values ->
+                    val roomId = RoomId(values[0])
+                    val expiresAtMillis = values[1].toLong()
+                    roomId to Instant.fromEpochMilliseconds(expiresAtMillis)
+                }
+        }.getOrDefault(emptyMap())
+    }
+
+    private fun encodeLiveLocationExpiries(expiries: Map<RoomId, Instant>): Set<String> {
+        return expiries.entries.map { (roomId, expiresAt) ->
+            "${roomId.value}$LIVE_LOCATION_EXPIRY_VALUE_SEPARATOR${expiresAt.toEpochMilliseconds()}"
+        }.toSet()
+    }
+
+    suspend fun clear() {
+        store.edit { prefs -> prefs.clear() }
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/notification/LiveLocationSharingNotificationCreator.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/notification/LiveLocationSharingNotificationCreator.kt
new file mode 100644
index 0000000000..9d4c461b0e
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/notification/LiveLocationSharingNotificationCreator.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live.notification
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import androidx.annotation.ChecksSdkIntAtLeast
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Inject
+class LiveLocationSharingNotificationCreator(
+    @ApplicationContext private val context: Context,
+    private val buildMeta: BuildMeta,
+) {
+    companion object {
+        const val CHANNEL_ID = "LIVE_LOCATION_SHARING"
+    }
+
+    fun createNotification(): Notification {
+        if (supportNotificationChannels()) {
+            ensureChannelExists()
+        }
+        return NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.ic_menu_mylocation)
+            .setContentTitle(context.getString(CommonStrings.live_location_sharing_foreground_service_title_android, buildMeta.applicationName))
+            .setContentText(context.getString(CommonStrings.live_location_sharing_foreground_service_message_android))
+            .setOngoing(true)
+            .build()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun ensureChannelExists() {
+        val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (notificationManager.getNotificationChannel(CHANNEL_ID) == null) {
+            notificationManager.createNotificationChannel(
+                NotificationChannel(
+                    CHANNEL_ID,
+                    context.getString(CommonStrings.live_location_sharing_foreground_service_channel_title_android)
+                        .ifEmpty { "Live Location Sharing" },
+                    NotificationManager.IMPORTANCE_LOW,
+                )
+            )
+        }
+    }
+
+    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O)
+    private fun supportNotificationChannels() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationReceiver.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationReceiver.kt
new file mode 100644
index 0000000000..697a074093
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationReceiver.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live.service
+
+import io.element.android.features.location.api.Location
+
+interface LiveLocationReceiver {
+    suspend fun onLocationUpdate(location: Location)
+    suspend fun onUnrecoverableError()
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingCoordinator.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingCoordinator.kt
new file mode 100644
index 0000000000..63618baa3c
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingCoordinator.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live.service
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.features.location.api.Location
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.concurrent.atomics.AtomicLong
+import kotlin.concurrent.atomics.AtomicReference
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.time.Duration.Companion.seconds
+
+private val THROTTLE_WINDOW = 3.seconds
+
+@OptIn(ExperimentalAtomicApi::class)
+@SingleIn(AppScope::class)
+class LiveLocationSharingCoordinator internal constructor(
+    private val startService: () -> Unit,
+    private val stopService: () -> Unit,
+    private val nowMillis: () -> Long,
+) {
+    @Inject
+    constructor(@ApplicationContext context: Context, clock: SystemClock) : this(
+        startService = {
+            ContextCompat.startForegroundService(context, Intent(context, LiveLocationSharingService::class.java))
+        },
+        stopService = {
+            context.stopService(Intent(context, LiveLocationSharingService::class.java))
+        },
+        nowMillis = clock::epochMillis
+    )
+
+    private val receivers = ConcurrentHashMap<SessionId, LiveLocationReceiver>()
+
+    private val lastDispatchMillis = AtomicLong(0L)
+    private val lastKnownLocation = AtomicReference<Location?>(null)
+
+    suspend fun register(sessionId: SessionId, receiver: LiveLocationReceiver) {
+        val wasEmpty = receivers.isEmpty()
+        Timber.d("LiveLocationSharingCoordinator registering receiver for session $sessionId (wasEmpty=$wasEmpty)")
+        receivers[sessionId] = receiver
+        if (wasEmpty) {
+            Timber.d("LiveLocationSharingCoordinator starting service")
+            runCatchingExceptions(startService).onFailure {
+                Timber.e(it, "Failed to start live location sharing service")
+            }
+        }
+        lastKnownLocation.load()?.let {
+            dispatch(it)
+        }
+    }
+
+    fun unregister(sessionId: SessionId) {
+        Timber.d("LiveLocationSharingCoordinator unregistering receiver for session $sessionId")
+        receivers.remove(sessionId)
+        if (receivers.isEmpty()) {
+            lastKnownLocation.store(null)
+            Timber.d("LiveLocationSharingCoordinator stopping service (no more receivers)")
+            runCatchingExceptions(stopService).onFailure {
+                Timber.e(it, "Failed to stop live location sharing service")
+            }
+        }
+    }
+
+    suspend fun dispatchUnrecoverableError() {
+        Timber.d("LiveLocationSharingCoordinator dispatching unrecoverable error")
+        receivers.forEach { (sessionId, receiver) ->
+            runCatchingExceptions {
+                receiver.onUnrecoverableError()
+            }.onFailure {
+                Timber.e(it, "Failed to dispatch unrecoverable error for session $sessionId")
+            }
+        }
+    }
+
+    suspend fun dispatch(location: Location) {
+        val currentTimeMillis = nowMillis()
+        val millisSincePrevious = currentTimeMillis - lastDispatchMillis.load()
+        if (millisSincePrevious < THROTTLE_WINDOW.inWholeMilliseconds) {
+            Timber.d("Received location before $THROTTLE_WINDOW, ignore.")
+            return
+        }
+        lastKnownLocation.store(location)
+        lastDispatchMillis.store(currentTimeMillis)
+        receivers.forEach { (sessionId, receiver) ->
+            Timber.d("Dispatch received location for session $sessionId ")
+            runCatchingExceptions {
+                receiver.onLocationUpdate(location)
+            }.onFailure {
+                Timber.e(it, "Failed to dispatch live location update for session $sessionId")
+            }
+        }
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingService.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingService.kt
new file mode 100644
index 0000000000..21a0a081d8
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/live/service/LiveLocationSharingService.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live.service
+
+import android.annotation.SuppressLint
+import android.app.Service
+import android.content.Intent
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
+import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import dev.zacsweers.metro.Inject
+import io.element.android.features.location.impl.common.userlocation.PlatformLocationProvider
+import io.element.android.features.location.impl.di.LocationBindings
+import io.element.android.features.location.impl.live.notification.LiveLocationSharingNotificationCreator
+import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.core.coroutine.childScope
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.push.api.notifications.ForegroundServiceType
+import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.services.appnavstate.api.AppForegroundStateService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.maplibre.compose.location.DesiredAccuracy
+import org.maplibre.compose.location.PermissionException
+import org.maplibre.spatialk.units.extensions.inMeters
+import org.maplibre.spatialk.units.extensions.meters
+import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
+import io.element.android.features.location.api.Location as ApiLocation
+
+private const val UPDATE_INTERVAL_IN_SECOND = 10
+
+class LiveLocationSharingService : Service() {
+    @Inject lateinit var coordinator: LiveLocationSharingCoordinator
+    @Inject lateinit var notificationCreator: LiveLocationSharingNotificationCreator
+    @Inject lateinit var appPreferencesStore: AppPreferencesStore
+    @Inject lateinit var appForegroundStateService: AppForegroundStateService
+
+    @AppCoroutineScope
+    @Inject lateinit var appCoroutineScope: CoroutineScope
+    private lateinit var coroutineScope: CoroutineScope
+
+    override fun onBind(p0: Intent?): IBinder? = null
+
+    @OptIn(FlowPreview::class)
+    @SuppressLint("InlinedApi")
+    override fun onCreate() {
+        super.onCreate()
+        Timber.d("LiveLocationSharingService onCreate")
+        bindings<LocationBindings>().inject(this)
+        runCatchingExceptions {
+            appForegroundStateService.updateIsSharingLiveLocation(true)
+            coroutineScope = appCoroutineScope.childScope(Dispatchers.Default, "LiveLocationSharingService")
+            val notificationId = NotificationIdProvider.getForegroundServiceNotificationId(ForegroundServiceType.LIVE_LOCATION)
+            Timber.d("LiveLocationSharingService starting foreground service with notificationId=$notificationId")
+            ServiceCompat.startForeground(
+                // service =
+                this,
+                // id =
+                notificationId,
+                // notification =
+                notificationCreator.createNotification(),
+                // foregroundServiceType =
+                FOREGROUND_SERVICE_TYPE_LOCATION,
+            )
+            startLocationUpdatesListener()
+        }.onFailure {
+            Timber.e(it, "Failed to start live location sharing service")
+            appCoroutineScope.launch { coordinator.dispatchUnrecoverableError() }
+            stopSelf()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun startLocationUpdatesListener() {
+        Timber.d("LiveLocationSharingService listening to location updates")
+        appPreferencesStore.getLiveLocationMinimumDistanceInMetersUpdateFlow()
+            .flatMapLatest { minDistanceMeters ->
+                try {
+                    PlatformLocationProvider(
+                        context = applicationContext,
+                        updateInterval = UPDATE_INTERVAL_IN_SECOND.seconds,
+                        minDistance = minDistanceMeters.meters,
+                        desiredAccuracy = DesiredAccuracy.Balanced,
+                        coroutineScope = coroutineScope
+                    ).location
+                } catch (exception: PermissionException) {
+                    Timber.e(exception, "Failed to create PlatformLocationProvider")
+                    coordinator.dispatchUnrecoverableError()
+                    emptyFlow()
+                }
+            }
+            .filterNotNull()
+            .map { location ->
+                ApiLocation(
+                    lat = location.position.value.latitude,
+                    lon = location.position.value.longitude,
+                    accuracy = location.position.accuracy?.inMeters?.toFloat(),
+                )
+            }
+            .onEach(coordinator::dispatch)
+            .launchIn(coroutineScope)
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        Timber.d("LiveLocationSharingService onStartCommand startId=$startId")
+        return START_STICKY
+    }
+
+    override fun onDestroy() {
+        Timber.d("LiveLocationSharingService onDestroy")
+        if (::coroutineScope.isInitialized) {
+            coroutineScope.cancel()
+        }
+        appForegroundStateService.updateIsSharingLiveLocation(false)
+        super.onDestroy()
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationEvent.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationEvent.kt
index d9ebc8b5af..e560ce805f 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationEvent.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationEvent.kt
@@ -17,7 +17,8 @@ sealed interface ShareLocationEvent {
         val isPinned: Boolean,
     ) : ShareLocationEvent
 
-    data object ShowLiveLocationDurationPicker : ShareLocationEvent
+    data object InitiateLiveLocationShare : ShareLocationEvent
+    data object AcceptLiveLocationDisclaimer : ShareLocationEvent
     data class StartLiveLocationShare(val duration: Duration) : ShareLocationEvent
 
     data object StartTrackingUserLocation : ShareLocationEvent
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenter.kt
index 10fddf1e50..a3f3cac432 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenter.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
@@ -21,26 +22,32 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Composer
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
 import io.element.android.features.location.impl.common.LocationConstraintsCheck
 import io.element.android.features.location.impl.common.MapDefaults
+import io.element.android.features.location.impl.common.SendLiveLocationPermissions
 import io.element.android.features.location.impl.common.actions.LocationActions
 import io.element.android.features.location.impl.common.checkLocationConstraints
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsState
+import io.element.android.features.location.impl.common.sendLiveLocationPermissions
 import io.element.android.features.location.impl.common.toDialogState
-import io.element.android.features.location.impl.share.ShareLocationState.Dialog.Constraints
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.features.location.impl.live.LiveLocationStore
 import io.element.android.features.messages.api.MessageComposerContext
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.extensions.flatMap
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.dateformatter.api.DurationFormatter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.location.AssetType
+import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.services.analytics.api.AnalyticsService
@@ -60,9 +67,11 @@ class ShareLocationPresenter(
     private val messageComposerContext: MessageComposerContext,
     private val locationActions: LocationActions,
     private val buildMeta: BuildMeta,
-    private val featureFlagService: FeatureFlagService,
     private val client: MatrixClient,
     private val durationFormatter: DurationFormatter,
+    private val liveLocationShareManager: ActiveLiveLocationShareManager,
+    private val liveLocationStore: LiveLocationStore,
+    private val userLocationStateFactory: UserLocationState.Factory,
 ) : Presenter<ShareLocationState> {
     @AssistedFactory
     fun interface Factory {
@@ -75,23 +84,73 @@ class ShareLocationPresenter(
     override fun present(): ShareLocationState {
         val permissionsState: PermissionsState = permissionsPresenter.present()
         var trackUserPosition: Boolean by remember { mutableStateOf(permissionsState.isAnyGranted && locationActions.isLocationEnabled()) }
-        val isLiveLocationSharingEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.LiveLocationSharing)
-        }.collectAsState(false)
         val appName by remember { derivedStateOf { buildMeta.applicationName } }
         var dialogState: ShareLocationState.Dialog by remember {
             mutableStateOf(ShareLocationState.Dialog.None)
         }
+        // true when trying to initiate the live location share
+        var pendingLiveLocationShare by remember { mutableStateOf(false) }
+        val startLiveLocationAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val currentUser by client.userProfile.collectAsState()
+        val customMapStyleUrl by produceState(AsyncData.Loading()) {
+            // Ignore errors
+            value = AsyncData.Success(client.getMapStyleUrl().getOrNull())
+        }
+        val sendLiveLocationPermissions by room.permissionsAsState(SendLiveLocationPermissions.DEFAULT) { perms ->
+            perms.sendLiveLocationPermissions()
+        }
         val scope = rememberCoroutineScope()
 
         fun checkLocationConstraints() {
-            val locationConstraints = checkLocationConstraints(permissionsState, locationActions)
-            dialogState = Constraints(locationConstraints.toDialogState())
+            val locationConstraints = checkLocationConstraints(
+                permissionsState = permissionsState,
+                locationActions = locationActions,
+                // No need to check SendLiveLocationPermissions here
+                sendLiveLocationPermissions = SendLiveLocationPermissions.GRANTED
+            )
+            if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
+                permissionsState.eventSink(PermissionsEvents.RequestPermissions)
+            }
             trackUserPosition = locationConstraints is LocationConstraintsCheck.Success
+            dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
         }
 
-        LaunchedEffect(permissionsState.permissions) { checkLocationConstraints() }
+        suspend fun checkLiveLocationConstraints() {
+            val locationConstraints = checkLocationConstraints(
+                permissionsState = permissionsState,
+                locationActions = locationActions,
+                sendLiveLocationPermissions = sendLiveLocationPermissions,
+            )
+            when (locationConstraints) {
+                LocationConstraintsCheck.Success -> {
+                    val hasAcceptedDisclaimer = liveLocationStore.hasAcceptedLiveLocationDisclaimer()
+                    dialogState = if (!hasAcceptedDisclaimer) {
+                        ShareLocationState.Dialog.LiveLocationDisclaimer
+                    } else {
+                        val durations = LIVE_LOCATION_DURATIONS.map {
+                            LiveLocationDuration(duration = it, formatted = durationFormatter.format(it))
+                        }
+                        ShareLocationState.Dialog.LiveLocationDurations(durations.toImmutableList())
+                    }
+                }
+                else -> {
+                    if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
+                        permissionsState.eventSink(PermissionsEvents.RequestPermissions)
+                    }
+                    dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
+                }
+            }
+        }
+
+        val userLocationState = userLocationStateFactory.create(permissionsState.isAnyGranted)
+
+        LaunchedEffect(permissionsState) {
+            if (pendingLiveLocationShare) {
+                checkLiveLocationConstraints()
+            } else {
+                checkLocationConstraints()
+            }
+        }
 
         fun handleEvent(event: ShareLocationEvent) {
             when (event) {
@@ -100,7 +159,10 @@ class ShareLocationPresenter(
                 }
                 ShareLocationEvent.StartTrackingUserLocation -> checkLocationConstraints()
                 ShareLocationEvent.StopTrackingUserLocation -> trackUserPosition = false
-                ShareLocationEvent.DismissDialog -> dialogState = ShareLocationState.Dialog.None
+                ShareLocationEvent.DismissDialog -> {
+                    pendingLiveLocationShare = false
+                    dialogState = ShareLocationState.Dialog.None
+                }
                 ShareLocationEvent.OpenAppSettings -> {
                     locationActions.openAppSettings()
                     dialogState = ShareLocationState.Dialog.None
@@ -109,20 +171,25 @@ class ShareLocationPresenter(
                     locationActions.openLocationSettings()
                     dialogState = ShareLocationState.Dialog.None
                 }
-                ShareLocationEvent.ShowLiveLocationDurationPicker -> {
-                    val constraintsResult = checkLocationConstraints(permissionsState, locationActions)
-                    dialogState = if (constraintsResult is LocationConstraintsCheck.Success) {
-                        val durations = LIVE_LOCATION_DURATIONS.map {
-                            LiveLocationDuration(duration = it, formatted = durationFormatter.format(it))
+                ShareLocationEvent.InitiateLiveLocationShare -> scope.launch {
+                    pendingLiveLocationShare = true
+                    checkLiveLocationConstraints()
+                }
+                ShareLocationEvent.AcceptLiveLocationDisclaimer -> scope.launch {
+                    liveLocationStore.setAcceptedLiveLocationDisclaimer()
+                        .onSuccess {
+                            checkLiveLocationConstraints()
                         }
-                        ShareLocationState.Dialog.LiveLocationDurations(durations.toImmutableList())
-                    } else {
-                        Constraints(constraintsResult.toDialogState())
-                    }
                 }
                 is ShareLocationEvent.StartLiveLocationShare -> scope.launch {
+                    pendingLiveLocationShare = false
                     dialogState = ShareLocationState.Dialog.None
-                    // room.startLiveLocationShare(event.duration.inWholeMilliseconds)
+                    startLiveLocationAction.runUpdatingState {
+                        liveLocationShareManager.startShare(
+                            roomId = room.roomId,
+                            duration = event.duration,
+                        )
+                    }
                 }
                 ShareLocationEvent.RequestPermissions -> {
                     dialogState = ShareLocationState.Dialog.None
@@ -132,12 +199,14 @@ class ShareLocationPresenter(
         }
 
         return ShareLocationState(
+            customMapStyleUrl = customMapStyleUrl,
             currentUser = currentUser,
             dialogState = dialogState,
             trackUserLocation = trackUserPosition,
-            hasLocationPermission = permissionsState.isAnyGranted,
-            canShareLiveLocation = isLiveLocationSharingEnabled,
+            userLocationState = userLocationState,
+            canShareLiveLocation = timelineMode.canShareLiveLocation(),
             appName = appName,
+            startLiveLocationAction = startLiveLocationAction.value,
             eventSink = ::handleEvent,
         )
     }
@@ -174,4 +243,9 @@ class ShareLocationPresenter(
     }
 }
 
+private fun Timeline.Mode.canShareLiveLocation() = when (this) {
+    is Timeline.Mode.Thread -> false
+    else -> true
+}
+
 private fun generateBody(uri: String): String = "Location was shared at $uri"
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationState.kt
index 8b1f494f1e..fb1b803435 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationState.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationState.kt
@@ -9,21 +9,27 @@
 package io.element.android.features.location.impl.share
 
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
 data class ShareLocationState(
+    val customMapStyleUrl: AsyncData<String?>,
     val currentUser: MatrixUser,
     val dialogState: Dialog,
     val trackUserLocation: Boolean,
-    val hasLocationPermission: Boolean,
+    val userLocationState: UserLocationState,
     val appName: String,
     val canShareLiveLocation: Boolean,
+    val startLiveLocationAction: AsyncAction<Unit>,
     val eventSink: (ShareLocationEvent) -> Unit,
 ) {
     sealed interface Dialog {
         data object None : Dialog
         data class Constraints(val state: LocationConstraintsDialogState) : Dialog
+        data object LiveLocationDisclaimer : Dialog
         data class LiveLocationDurations(val durations: ImmutableList<LiveLocationDuration>) : Dialog
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationStateProvider.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationStateProvider.kt
index facef74346..ed8d46afd3 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationStateProvider.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationStateProvider.kt
@@ -10,6 +10,9 @@ package io.element.android.features.location.impl.share
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.persistentListOf
@@ -24,32 +27,36 @@ class ShareLocationStateProvider : PreviewParameterProvider<ShareLocationState>
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.None,
                 trackUserPosition = false,
-                hasLocationPermission = false,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionDenied),
                 trackUserPosition = false,
-                hasLocationPermission = false,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionRationale),
                 trackUserPosition = false,
-                hasLocationPermission = false,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.LocationServiceDisabled),
                 trackUserPosition = false,
-                hasLocationPermission = true,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.None,
                 trackUserPosition = false,
-                hasLocationPermission = true,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.None,
                 trackUserPosition = true,
-                hasLocationPermission = true,
+            ),
+            aShareLocationState(
+                dialogState = ShareLocationState.Dialog.None,
+                trackUserPosition = true,
+                canShareLiveLocation = true,
+            ),
+            aShareLocationState(
+                dialogState = ShareLocationState.Dialog.LiveLocationDisclaimer,
+                trackUserPosition = true,
+                canShareLiveLocation = true,
             ),
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.LiveLocationDurations(
@@ -60,28 +67,34 @@ class ShareLocationStateProvider : PreviewParameterProvider<ShareLocationState>
                     )
                 ),
                 trackUserPosition = true,
-                hasLocationPermission = true,
                 canShareLiveLocation = true,
             ),
+            aShareLocationState(
+                customMapStyleUrl = AsyncData.Loading(),
+            ),
         )
 }
 
 fun aShareLocationState(
+    customMapStyleUrl: AsyncData<String?> = AsyncData.Success(null),
     currentUser: MatrixUser = MatrixUser(UserId("@user:matrix.org")),
     dialogState: ShareLocationState.Dialog = ShareLocationState.Dialog.None,
     trackUserPosition: Boolean = false,
-    hasLocationPermission: Boolean = false,
+    userLocationState: UserLocationState = UserLocationState(null),
     canShareLiveLocation: Boolean = false,
     appName: String = APP_NAME,
+    startLiveLocationAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (ShareLocationEvent) -> Unit = {},
 ): ShareLocationState {
     return ShareLocationState(
+        customMapStyleUrl = customMapStyleUrl,
         currentUser = currentUser,
         dialogState = dialogState,
         trackUserLocation = trackUserPosition,
-        hasLocationPermission = hasLocationPermission,
+        userLocationState = userLocationState,
         canShareLiveLocation = canShareLiveLocation,
         appName = appName,
+        startLiveLocationAction = startLiveLocationAction,
         eventSink = eventSink
     )
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt
index 1e163f417d..8b7106e939 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/share/ShareLocationView.kt
@@ -20,16 +20,16 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberBottomSheetScaffoldState
-import androidx.compose.material3.rememberStandardBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -43,12 +43,17 @@ import io.element.android.features.location.impl.common.ui.LocationConstraintsDi
 import io.element.android.features.location.impl.common.ui.LocationFloatingActionButton
 import io.element.android.features.location.impl.common.ui.MapBottomSheetScaffold
 import io.element.android.features.location.impl.common.ui.UserLocationPuck
-import io.element.android.features.location.impl.common.ui.rememberUserLocationState
-import io.element.android.libraries.androidutils.system.toast
+import io.element.android.features.location.impl.common.userlocation.UserLocationTrackingEffect
+import io.element.android.features.location.impl.share.ShareLocationEvent.StartLiveLocationShare
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.LocationPin
 import io.element.android.libraries.designsystem.components.PinVariant
+import io.element.android.libraries.designsystem.components.async.AsyncIndicator
+import io.element.android.libraries.designsystem.components.async.AsyncIndicatorHost
+import io.element.android.libraries.designsystem.components.async.rememberAsyncIndicatorState
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.ListDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.components.list.RadioButtonListItem
@@ -64,7 +69,6 @@ import kotlinx.collections.immutable.ImmutableList
 import org.maplibre.compose.camera.CameraMoveReason
 import org.maplibre.compose.camera.CameraState
 import org.maplibre.compose.camera.rememberCameraState
-import org.maplibre.compose.location.UserLocationState
 import kotlin.time.Duration
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -74,7 +78,6 @@ fun ShareLocationView(
     navigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val context = LocalContext.current
     when (val dialogState = state.dialogState) {
         ShareLocationState.Dialog.None -> Unit
         is ShareLocationState.Dialog.Constraints -> LocationConstraintsDialog(
@@ -85,22 +88,28 @@ fun ShareLocationView(
             onOpenLocationSettings = { state.eventSink(ShareLocationEvent.OpenLocationSettings) },
             onDismiss = { state.eventSink(ShareLocationEvent.DismissDialog) },
         )
+        ShareLocationState.Dialog.LiveLocationDisclaimer -> ConfirmationDialog(
+            content = stringResource(R.string.screen_share_location_live_location_disclaimer_title),
+            submitText = stringResource(CommonStrings.action_accept),
+            cancelText = stringResource(CommonStrings.action_decline),
+            onSubmitClick = { state.eventSink(ShareLocationEvent.AcceptLiveLocationDisclaimer) },
+            onDismiss = { state.eventSink(ShareLocationEvent.DismissDialog) },
+        )
         is ShareLocationState.Dialog.LiveLocationDurations -> LiveLocationDurationDialog(
             durations = dialogState.durations,
             onSelectDuration = { duration ->
-                state.eventSink(ShareLocationEvent.StartLiveLocationShare(duration))
-                context.toast("Not implemented yet!")
-                navigateUp()
+                state.eventSink(StartLiveLocationShare(duration))
             },
             onDismiss = { state.eventSink(ShareLocationEvent.DismissDialog) },
         )
     }
 
     val scaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = rememberStandardBottomSheetState(initialValue = SheetValue.Expanded)
+        bottomSheetState = rememberBottomSheetState(
+            initialValue = SheetValue.Expanded,
+        )
     )
     val cameraState = rememberCameraState(firstPosition = MapDefaults.defaultCameraPosition)
-    val userLocationState = rememberUserLocationState(state.hasLocationPermission)
 
     LaunchedEffect(cameraState.isCameraMoving) {
         if (cameraState.moveReason == CameraMoveReason.GESTURE) {
@@ -109,6 +118,7 @@ fun ShareLocationView(
     }
 
     MapBottomSheetScaffold(
+        customMapStyleUrl = state.customMapStyleUrl,
         cameraState = cameraState,
         modifier = modifier,
         scaffoldState = scaffoldState,
@@ -126,15 +136,18 @@ fun ShareLocationView(
             BottomSheetContent(
                 cameraState = cameraState,
                 state = state,
-                userLocationState = userLocationState,
                 navigateUp = navigateUp
             )
         },
         mapContent = {
+            UserLocationTrackingEffect(
+                cameraState = cameraState,
+                locationState = state.userLocationState,
+                enabled = state.trackUserLocation,
+            )
             UserLocationPuck(
                 cameraState = cameraState,
-                locationState = userLocationState,
-                trackUserLocation = state.trackUserLocation
+                location = state.userLocationState.location,
             )
         },
         overlayContent = { sheetPadding ->
@@ -160,26 +173,62 @@ fun ShareLocationView(
                     .align(Alignment.TopEnd)
                     .padding(all = 16.dp),
             )
+            StartLiveLocationActionView(state.startLiveLocationAction, navigateUp)
         }
     )
 }
 
+@Composable
+private fun StartLiveLocationActionView(
+    action: AsyncAction<Unit>,
+    onActionSuccess: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val updatedOnActionSuccess by rememberUpdatedState(onActionSuccess)
+    Box(modifier = modifier) {
+        val asyncIndicatorState = rememberAsyncIndicatorState()
+        AsyncIndicatorHost(state = asyncIndicatorState)
+
+        when (action) {
+            is AsyncAction.Loading -> {
+                LaunchedEffect(action) {
+                    asyncIndicatorState.enqueue {
+                        AsyncIndicator.Loading(text = stringResource(CommonStrings.common_waiting_live_location))
+                    }
+                }
+            }
+            is AsyncAction.Failure -> {
+                LaunchedEffect(action) {
+                    asyncIndicatorState.enqueue(AsyncIndicator.DURATION_SHORT) {
+                        AsyncIndicator.Failure(
+                            text = stringResource(CommonStrings.common_something_went_wrong),
+                        )
+                    }
+                }
+            }
+            is AsyncAction.Success -> {
+                LaunchedEffect(action) { updatedOnActionSuccess() }
+            }
+            else -> Unit
+        }
+    }
+}
+
 @Composable
 private fun BottomSheetContent(
     cameraState: CameraState,
     state: ShareLocationState,
-    userLocationState: UserLocationState,
     navigateUp: () -> Unit,
 ) {
     Spacer(Modifier.height(20.dp))
-    val userLocation = userLocationState.location
+    val userLocation = state.userLocationState.location
     if (state.trackUserLocation && userLocation != null) {
         ShareCurrentLocationItem {
             state.eventSink(
                 ShareLocationEvent.ShareStaticLocation(
                     location = Location(
-                        lat = userLocation.position.latitude,
-                        lon = userLocation.position.longitude
+                        lat = userLocation.position.value.latitude,
+                        lon = userLocation.position.value.longitude
                     ),
                     isPinned = false
                 )
@@ -202,7 +251,7 @@ private fun BottomSheetContent(
     }
     if (state.canShareLiveLocation) {
         ShareLiveLocationItem {
-            state.eventSink(ShareLocationEvent.ShowLiveLocationDurationPicker)
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
         }
     }
 }
@@ -212,7 +261,7 @@ private fun ShareCurrentLocationItem(
     onClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = {
+        content = {
             Text(stringResource(CommonStrings.screen_share_my_location_action))
         },
         onClick = onClick,
@@ -227,7 +276,7 @@ private fun SharePinLocationItem(
     onClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = {
+        content = {
             Text(stringResource(CommonStrings.screen_share_this_location_action))
         },
         onClick = onClick,
@@ -242,7 +291,7 @@ private fun ShareLiveLocationItem(
     onClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = {
+        content = {
             Text(stringResource(CommonStrings.action_share_live_location))
         },
         onClick = onClick,
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparator.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparator.kt
new file mode 100644
index 0000000000..41b9bea4ca
--- /dev/null
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparator.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.show
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+
+class LiveLocationShareComparator(private val currentUser: UserId) : Comparator<LiveLocationShare> {
+    override fun compare(p0: LiveLocationShare, p1: LiveLocationShare): Int {
+        val p0IsCurrentUser = p0.userId == currentUser
+        val p1IsCurrentUser = p1.userId == currentUser
+        if (p0IsCurrentUser != p1IsCurrentUser) return if (p0IsCurrentUser) -1 else 1
+        return p1.startTimestamp.compareTo(p0.startTimestamp)
+    }
+}
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvent.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvent.kt
index 6a3e3521e0..34132dccf3 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvent.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationEvent.kt
@@ -17,4 +17,5 @@ sealed interface ShowLocationEvent {
     data object RequestPermissions : ShowLocationEvent
     data object OpenAppSettings : ShowLocationEvent
     data object OpenLocationSettings : ShowLocationEvent
+    data object StopLocationSharing : ShowLocationEvent
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
index a2c9a3702d..f187e91c53 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
@@ -10,17 +10,25 @@ package io.element.android.features.location.impl.show
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.location.api.Location
 import io.element.android.features.location.api.ShowLocationMode
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
+import io.element.android.features.location.api.live.isCurrentlySharing
 import io.element.android.features.location.impl.common.LocationConstraintsCheck
 import io.element.android.features.location.impl.common.MapDefaults
+import io.element.android.features.location.impl.common.SendLiveLocationPermissions
 import io.element.android.features.location.impl.common.actions.LocationActions
 import io.element.android.features.location.impl.common.checkLocationConstraints
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
@@ -28,27 +36,40 @@ import io.element.android.features.location.impl.common.permissions.PermissionsP
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.location.impl.common.toDialogState
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.features.location.impl.common.userlocation.asMapLibreLocation
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.coroutine.mapState
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.getBestName
+import io.element.android.libraries.matrix.api.room.joinedRoomMembers
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 
-@AssistedInject
-class ShowLocationPresenter(
+@AssistedInject class ShowLocationPresenter(
     @Assisted private val mode: ShowLocationMode,
     permissionsPresenterFactory: PermissionsPresenter.Factory,
     private val locationActions: LocationActions,
     private val buildMeta: BuildMeta,
     private val dateFormatter: DateFormatter,
     private val stringProvider: StringProvider,
+    private val client: MatrixClient,
+    private val joinedRoom: JoinedRoom,
+    private val liveLocationShareManager: ActiveLiveLocationShareManager,
+    private val userLocationStateFactory: UserLocationState.Factory,
 ) : Presenter<ShowLocationState> {
-    @AssistedFactory
-    fun interface Factory {
+    @AssistedFactory fun interface Factory {
         fun create(mode: ShowLocationMode): ShowLocationPresenter
     }
 
@@ -56,6 +77,7 @@ class ShowLocationPresenter(
 
     @Composable
     override fun present(): ShowLocationState {
+        val coroutineScope = rememberCoroutineScope()
         val permissionsState: PermissionsState = permissionsPresenter.present()
         var isTrackMyLocation by remember { mutableStateOf(false) }
         val appName by remember { derivedStateOf { buildMeta.applicationName } }
@@ -63,10 +85,27 @@ class ShowLocationPresenter(
             mutableStateOf(LocationConstraintsDialogState.None)
         }
 
-        LaunchedEffect(permissionsState.permissions) {
-            if (permissionsState.isAnyGranted) {
-                dialogState = LocationConstraintsDialogState.None
+        val customMapStyleUrl by produceState(AsyncData.Loading()) {
+            // Ignore errors
+            value = AsyncData.Success(client.getMapStyleUrl().getOrNull())
+        }
+
+        fun checkLocationConstraints() {
+            val locationConstraints = checkLocationConstraints(
+                permissionsState = permissionsState,
+                locationActions = locationActions,
+                // No need to check SendLiveLocationPermissions here
+                sendLiveLocationPermissions = SendLiveLocationPermissions.GRANTED
+            )
+            if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
+                permissionsState.eventSink(PermissionsEvents.RequestPermissions)
             }
+            isTrackMyLocation = locationConstraints is LocationConstraintsCheck.Success
+            dialogState = locationConstraints.toDialogState()
+        }
+
+        LaunchedEffect(permissionsState) {
+            checkLocationConstraints()
         }
 
         fun handleEvent(event: ShowLocationEvent) {
@@ -76,9 +115,7 @@ class ShowLocationPresenter(
                 }
                 is ShowLocationEvent.TrackMyLocation -> {
                     if (event.enabled) {
-                        val locationConstraints = checkLocationConstraints(permissionsState, locationActions)
-                        isTrackMyLocation = locationConstraints is LocationConstraintsCheck.Success
-                        dialogState = locationConstraints.toDialogState()
+                        checkLocationConstraints()
                     } else {
                         isTrackMyLocation = false
                     }
@@ -93,12 +130,15 @@ class ShowLocationPresenter(
                     dialogState = LocationConstraintsDialogState.None
                 }
                 ShowLocationEvent.RequestPermissions -> permissionsState.eventSink(PermissionsEvents.RequestPermissions)
+                ShowLocationEvent.StopLocationSharing -> coroutineScope.launch {
+                    liveLocationShareManager.stopShare(joinedRoom.roomId)
+                }
             }
         }
 
-        val locationShares = remember {
-            when (mode) {
-                is ShowLocationMode.Static -> {
+        val locationShares = when (mode) {
+            is ShowLocationMode.Static -> {
+                remember {
                     val relativeTime = dateFormatter.format(timestamp = mode.timestamp, mode = DateFormatterMode.Full, useRelative = true)
                     val formattedTimestamp = stringProvider.getString(
                         CommonStrings.screen_static_location_sheet_timestamp_description,
@@ -118,19 +158,77 @@ class ShowLocationPresenter(
                             location = mode.location,
                             isLive = false,
                             assetType = mode.assetType,
+                            isOwnUser = mode.senderId == joinedRoom.sessionId
                         )
                     )
                 }
-                ShowLocationMode.Live -> persistentListOf()
+            }
+            is ShowLocationMode.Live -> {
+                produceState(persistentListOf()) {
+                    val comparator = LiveLocationShareComparator(currentUser = joinedRoom.sessionId)
+                    val liveLocationSharesFlow = joinedRoom.subscribeToLiveLocationShares()
+                    val membersStateFlow = joinedRoom.membersStateFlow.mapState { it.joinedRoomMembers() }
+                    combine(liveLocationSharesFlow, membersStateFlow) { liveShares, members ->
+                        liveShares.sortedWith(comparator).mapNotNull { share ->
+                            val lastLocation = share.lastLocation ?: return@mapNotNull null
+                            val location = Location.fromGeoUri(lastLocation.geoUri) ?: return@mapNotNull null
+                            val member = members.find { it.userId == share.userId }
+                            val displayName = member?.getBestName() ?: share.userId.value
+                            val avatarUrl = member?.avatarUrl
+                            val relativeTime = dateFormatter.format(timestamp = lastLocation.timestamp, mode = DateFormatterMode.Full, useRelative = true)
+                            val formattedTimestamp = stringProvider.getString(
+                                CommonStrings.screen_static_location_sheet_timestamp_description,
+                                relativeTime
+                            )
+                            LocationShareItem(
+                                userId = share.userId,
+                                displayName = displayName,
+                                avatarData = AvatarData(
+                                    id = share.userId.value,
+                                    name = displayName,
+                                    url = avatarUrl,
+                                    size = AvatarSize.UserListItem,
+                                ),
+                                formattedTimestamp = formattedTimestamp,
+                                location = location,
+                                isLive = true,
+                                assetType = lastLocation.assetType,
+                                isOwnUser = share.userId == joinedRoom.sessionId
+                            )
+                        }.toImmutableList()
+                    }.collect { value = it }
+                }.value
             }
         }
 
+        val updatedLocationShares by rememberUpdatedState(locationShares)
+        val focusedLocation by remember {
+            derivedStateOf {
+                when (mode) {
+                    is ShowLocationMode.Static -> updatedLocationShares.firstOrNull()
+                    is ShowLocationMode.Live -> updatedLocationShares.firstOrNull { it.userId == mode.senderId }
+                }
+            }
+        }
+        val isCurrentlySharing by liveLocationShareManager.isCurrentlySharing(roomId = joinedRoom.roomId).collectAsState()
+        val hideUserLocationPuck = mode is ShowLocationMode.Live && isCurrentlySharing
+        val userLocationState = if (hideUserLocationPuck) {
+            // When sharing with this device, use the user LocationShareItem as source of data instead of the device.
+            val ownLocationShare by remember { derivedStateOf { updatedLocationShares.find { it.isOwnUser }?.location?.asMapLibreLocation() } }
+            UserLocationState(ownLocationShare)
+        } else {
+            userLocationStateFactory.create(hasLocationPermission = permissionsState.isAnyGranted)
+        }
         return ShowLocationState(
+            customMapStyleUrl = customMapStyleUrl,
             dialogState = dialogState,
             locationShares = locationShares,
-            hasLocationPermission = permissionsState.isAnyGranted,
+            focusedLocation = focusedLocation,
             isTrackMyLocation = isTrackMyLocation,
+            userLocationState = userLocationState,
+            isLive = mode is ShowLocationMode.Live,
             appName = appName,
+            hideUserLocationPuck = hideUserLocationPuck,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationState.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationState.kt
index 9494db12ec..e5ddf589b0 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationState.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationState.kt
@@ -11,6 +11,8 @@ package io.element.android.features.location.impl.show
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
 import io.element.android.features.location.impl.common.ui.LocationMarkerData
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.PinVariant
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.UserId
@@ -18,14 +20,18 @@ import io.element.android.libraries.matrix.api.room.location.AssetType
 import kotlinx.collections.immutable.ImmutableList
 
 data class ShowLocationState(
+    val customMapStyleUrl: AsyncData<String?>,
+    val isLive: Boolean,
     val dialogState: LocationConstraintsDialogState,
     val locationShares: ImmutableList<LocationShareItem>,
-    val hasLocationPermission: Boolean,
+    val focusedLocation: LocationShareItem?,
     val isTrackMyLocation: Boolean,
+    val userLocationState: UserLocationState,
     val appName: String,
+    val hideUserLocationPuck: Boolean,
     val eventSink: (ShowLocationEvent) -> Unit,
 ) {
-    val isSheetDraggable = locationShares.any { item -> item.isLive }
+    val isSheetDraggable = isLive && locationShares.isNotEmpty()
 }
 
 data class LocationShareItem(
@@ -36,7 +42,10 @@ data class LocationShareItem(
     val location: Location,
     val isLive: Boolean,
     val assetType: AssetType?,
-)
+    val isOwnUser: Boolean
+) {
+    val canStopSharing = isLive && isOwnUser
+}
 
 fun LocationShareItem.toMarkerData(): LocationMarkerData {
     val pinVariant = if (assetType == AssetType.PIN) {
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationStateProvider.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationStateProvider.kt
index 8bee410715..cd7ea108bb 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationStateProvider.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationStateProvider.kt
@@ -11,8 +11,11 @@ package io.element.android.features.location.impl.show
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import kotlinx.collections.immutable.toImmutableList
@@ -21,6 +24,8 @@ class ShowLocationStateProvider : PreviewParameterProvider<ShowLocationState> {
     override val values: Sequence<ShowLocationState>
         get() = sequenceOf(
             aShowLocationState(),
+            aShowLocationState(isLive = true),
+            aShowLocationState(isLive = true, locationShares = emptyList()),
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.PermissionDenied,
             ),
@@ -29,51 +34,54 @@ class ShowLocationStateProvider : PreviewParameterProvider<ShowLocationState> {
             ),
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.LocationServiceDisabled,
-                hasLocationPermission = true,
-            ),
-            aShowLocationState(
-                hasLocationPermission = true,
-            ),
-            aShowLocationState(
-                hasLocationPermission = true,
-                isTrackMyLocation = true,
             ),
+            aShowLocationState(isTrackMyLocation = true),
+            aShowLocationState(customMapStyleUrl = AsyncData.Loading()),
         )
 }
 
 private const val APP_NAME = "ApplicationName"
 
 fun aShowLocationState(
+    customMapStyleUrl: AsyncData<String?> = AsyncData.Success(null),
+    isLive: Boolean = false,
     constraintsDialogState: LocationConstraintsDialogState = LocationConstraintsDialogState.None,
-    locationShares: List<LocationShareItem> = listOf(aLocationShareItem()),
-    hasLocationPermission: Boolean = false,
+    locationShares: List<LocationShareItem> = listOf(aLocationShareItem(isLive = isLive)),
+    focusedLocation: LocationShareItem? = locationShares.firstOrNull(),
     isTrackMyLocation: Boolean = false,
+    userLocationState: UserLocationState = UserLocationState(null),
     appName: String = APP_NAME,
+    hideUserLocationPuck: Boolean = false,
     eventSink: (ShowLocationEvent) -> Unit = {},
 ): ShowLocationState {
     return ShowLocationState(
+        customMapStyleUrl = customMapStyleUrl,
         dialogState = constraintsDialogState,
         locationShares = locationShares.toImmutableList(),
-        hasLocationPermission = hasLocationPermission,
+        focusedLocation = focusedLocation,
         isTrackMyLocation = isTrackMyLocation,
+        userLocationState = userLocationState,
+        hideUserLocationPuck = hideUserLocationPuck,
         appName = appName,
+        isLive = isLive,
         eventSink = eventSink,
     )
 }
 
 fun aLocationShareItem(
     userId: UserId = UserId("@alice:matrix.org"),
-    displayName: String = "Alice",
+    displayName: String = USER_NAME_ALICE,
     avatarData: AvatarData = AvatarData(
         id = userId.value,
         name = displayName,
         url = null,
         size = AvatarSize.UserListItem,
     ),
-    formattedTimestamp: String = "Shared 1 min ago",
-    location: Location = Location(1.23, 2.34, 4f),
     isLive: Boolean = false,
     assetType: AssetType? = null,
+    formattedTimestamp: String = "Shared 1 min ago",
+    location: Location = Location(1.23, 2.34, 4f),
+    isOwnUser: Boolean = false,
 ) = LocationShareItem(
     userId = userId,
     displayName = displayName,
@@ -82,4 +90,5 @@ fun aLocationShareItem(
     location = location,
     isLive = isLive,
     assetType = assetType,
+    isOwnUser = isOwnUser,
 )
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
index ad2d4cb8ca..9fdbe3aac8 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@@ -12,20 +12,27 @@ package io.element.android.features.location.impl.show
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetValue
 import androidx.compose.material3.rememberBottomSheetScaffoldState
-import androidx.compose.material3.rememberStandardBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -36,13 +43,14 @@ import io.element.android.features.location.impl.common.ui.LocationPinMarkers
 import io.element.android.features.location.impl.common.ui.LocationShareRow
 import io.element.android.features.location.impl.common.ui.MapBottomSheetScaffold
 import io.element.android.features.location.impl.common.ui.UserLocationPuck
-import io.element.android.features.location.impl.common.ui.rememberUserLocationState
+import io.element.android.features.location.impl.common.userlocation.UserLocationTrackingEffect
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.launch
 import org.maplibre.compose.camera.CameraMoveReason
 import org.maplibre.compose.camera.CameraPosition
@@ -65,19 +73,18 @@ fun ShowLocationView(
         onDismiss = { state.eventSink(ShowLocationEvent.DismissDialog) },
     )
 
-    val initialPosition = remember {
-        if (state.locationShares.isEmpty()) {
-            MapDefaults.defaultCameraPosition
-        } else {
-            val firstLocation = state.locationShares.first().location
-            CameraPosition(
-                target = Position(latitude = firstLocation.lat, longitude = firstLocation.lon),
+    val cameraState = rememberCameraState(firstPosition = MapDefaults.defaultCameraPosition)
+    var hasAnimatedToFocusedLocation by remember { mutableStateOf(false) }
+    LaunchedEffect(state.focusedLocation) {
+        if (state.focusedLocation != null && !hasAnimatedToFocusedLocation) {
+            hasAnimatedToFocusedLocation = true
+            val position = CameraPosition(
+                target = Position(latitude = state.focusedLocation.location.lat, longitude = state.focusedLocation.location.lon),
                 zoom = MapDefaults.DEFAULT_ZOOM
             )
+            cameraState.position = position
         }
     }
-    val cameraState = rememberCameraState(firstPosition = initialPosition)
-    val userLocationState = rememberUserLocationState(state.hasLocationPermission)
     LaunchedEffect(cameraState.isCameraMoving) {
         if (cameraState.moveReason == CameraMoveReason.GESTURE) {
             state.eventSink(ShowLocationEvent.TrackMyLocation(false))
@@ -85,16 +92,17 @@ fun ShowLocationView(
     }
 
     val scaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = rememberStandardBottomSheetState(
-            initialValue =
-                if (state.isSheetDraggable) {
-                    SheetValue.PartiallyExpanded
-                } else {
-                    SheetValue.Expanded
-                }
+        bottomSheetState = rememberBottomSheetState(
+            initialValue = SheetValue.Expanded,
         )
     )
+    LaunchedEffect(state.isSheetDraggable) {
+        if (!state.isSheetDraggable) {
+            scaffoldState.bottomSheetState.expand()
+        }
+    }
     MapBottomSheetScaffold(
+        customMapStyleUrl = state.customMapStyleUrl,
         sheetDragHandle = if (state.isSheetDraggable) {
             { BottomSheetDefaults.DragHandle() }
         } else {
@@ -116,39 +124,65 @@ fun ShowLocationView(
         },
         sheetContent = { sheetPaddings ->
             val coroutineScope = rememberCoroutineScope()
-            Spacer(Modifier.height(20.dp))
-            Text(
-                text = stringResource(CommonStrings.screen_static_location_sheet_title),
-                style = ElementTheme.typography.fontBodyLgMedium,
-                color = ElementTheme.colors.textPrimary,
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
-            )
-            state.locationShares.forEach { locationShare ->
-                LocationShareRow(
-                    item = locationShare,
-                    onShareClick = { state.eventSink(ShowLocationEvent.Share(locationShare.location)) },
-                    modifier = Modifier.clickable {
-                        state.eventSink(ShowLocationEvent.TrackMyLocation(false))
-                        val position = CameraPosition(
-                            padding = sheetPaddings,
-                            target = Position(locationShare.location.lon, locationShare.location.lat),
-                            zoom = MapDefaults.DEFAULT_ZOOM
-                        )
-                        coroutineScope.launch {
-                            cameraState.animateTo(finalPosition = position)
-                        }
-                    }
+            if (!state.isSheetDraggable) {
+                // If sheet is draggable the DragHandle has already some padding
+                Spacer(Modifier.height(20.dp))
+            }
+            if (state.locationShares.isEmpty()) {
+                Text(
+                    text = stringResource(CommonStrings.screen_live_location_sheet_nobody_sharing),
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                    color = ElementTheme.colors.textPrimary,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(all = 16.dp),
+                    textAlign = TextAlign.Center,
                 )
+            } else {
+                Text(
+                    text = stringResource(CommonStrings.screen_static_location_sheet_title),
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                    color = ElementTheme.colors.textPrimary,
+                    modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+                )
+                LazyColumn {
+                    items(state.locationShares) { locationShare ->
+                        LocationShareRow(
+                            item = locationShare,
+                            onShareClick = { state.eventSink(ShowLocationEvent.Share(locationShare.location)) },
+                            onStopClick = { state.eventSink(ShowLocationEvent.StopLocationSharing) },
+                            modifier = Modifier.clickable {
+                                state.eventSink(ShowLocationEvent.TrackMyLocation(false))
+                                val position = CameraPosition(
+                                    padding = sheetPaddings,
+                                    target = Position(locationShare.location.lon, locationShare.location.lat),
+                                    // Force pointing to NORTH
+                                    bearing = 0.0,
+                                    zoom = cameraState.position.zoom.coerceAtLeast(MapDefaults.DEFAULT_ZOOM),
+                                )
+                                coroutineScope.launch {
+                                    cameraState.animateTo(finalPosition = position)
+                                }
+                            }
+                        )
+                    }
+                }
             }
         },
         mapContent = {
-            UserLocationPuck(
+            UserLocationTrackingEffect(
                 cameraState = cameraState,
-                locationState = userLocationState,
-                trackUserLocation = state.isTrackMyLocation
+                locationState = state.userLocationState,
+                enabled = state.isTrackMyLocation,
             )
+            if (!state.hideUserLocationPuck) {
+                UserLocationPuck(
+                    cameraState = cameraState,
+                    location = state.userLocationState.location,
+                )
+            }
             val markers = remember(state.locationShares) {
-                state.locationShares.map { it.toMarkerData() }
+                state.locationShares.map { it.toMarkerData() }.toImmutableList()
             }
             LocationPinMarkers(markers)
         },
diff --git a/features/location/impl/src/main/res/values-cs/translations.xml b/features/location/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..98af57abba
--- /dev/null
+++ b/features/location/impl/src/main/res/values-cs/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Vaše historie aktuální polohy bude uložena v místnosti a bude viditelná pro členy i po skončení relace."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Zvolte, jak dlouho chcete sdílet svou aktuální polohu."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Nemáte oprávnění sdílet svou aktuální polohu v této místnosti."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-da/translations.xml b/features/location/impl/src/main/res/values-da/translations.xml
new file mode 100644
index 0000000000..4d4c5d00bc
--- /dev/null
+++ b/features/location/impl/src/main/res/values-da/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Din live-positionshistorik gemmes i rummet og er synlig for medlemmerne, når sessionen er afsluttet."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Vælg, hvor længe du vil dele din aktuelle position."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-de/translations.xml b/features/location/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..1a1e208c3b
--- /dev/null
+++ b/features/location/impl/src/main/res/values-de/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_duration_picker_title">"Wie lange soll der Live-Standort geteilt werden?"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-el/translations.xml b/features/location/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..8ae7c58c74
--- /dev/null
+++ b/features/location/impl/src/main/res/values-el/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Το ιστορικό ζωντανής τοποθεσίας σας θα αποθηκευτεί στην αίθουσα και θα είναι ορατό στα μέλη μετά το τέλος της συνεδρίας."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Επιλέξτε για πόσο χρονικό διάστημα θα κοινοποιείτε την τρέχουσα τοποθεσία σας."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-et/translations.xml b/features/location/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..73847bcb43
--- /dev/null
+++ b/features/location/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Sinu reaalajas jagatud asukoha ajalugu salvestub siin jututoas ja see on liikmetele nähtav ka pärast jagamissessiooni lõppu."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Vali, kui kaua tahad oma reaalajas jagada."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Sul pole õigust jagada selles jututoas oma asukohta reaalajas"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-fi/translations.xml b/features/location/impl/src/main/res/values-fi/translations.xml
index bc7e84e7b0..b35d11cd49 100644
--- a/features/location/impl/src/main/res/values-fi/translations.xml
+++ b/features/location/impl/src/main/res/values-fi/translations.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Reaaliaikainen sijaintihistoriasi tallennetaan huoneeseen ja on jäsenten nähtävissä istunnon päätyttyä."</string>
   <string name="screen_share_location_live_location_duration_picker_title">"Valitse, kuinka kauan haluat jakaa reaaliaikaisen sijaintisi."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Sinulla ei ole oikeuksia jakaa reaaliaikaista sijaintiasi tässä huoneessa"</string>
 </resources>
diff --git a/features/location/impl/src/main/res/values-fr/translations.xml b/features/location/impl/src/main/res/values-fr/translations.xml
index 46689488e1..802b869271 100644
--- a/features/location/impl/src/main/res/values-fr/translations.xml
+++ b/features/location/impl/src/main/res/values-fr/translations.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Votre historique de localisation en direct sera enregistré dans le salon et visible par les membres après la fin de la session."</string>
   <string name="screen_share_location_live_location_duration_picker_title">"Choisissez la durée pendant laquelle vous partagerez votre position en direct."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Vous n’êtes pas autorisé à partager votre position en direct dans ce salon."</string>
 </resources>
diff --git a/features/location/impl/src/main/res/values-hr/translations.xml b/features/location/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..8ad85c2dd7
--- /dev/null
+++ b/features/location/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Vaša povijest lokacije uživo bit će pohranjena u sobi i vidljiva članovima nakon završetka sesije."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Odaberite koliko dugo želite dijeliti svoju lokaciju uživo."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Nemate dopuštenja za dijeljenje svoje lokacije uživo u ovoj sobi"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-hu/translations.xml b/features/location/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..0ccb2a2413
--- /dev/null
+++ b/features/location/impl/src/main/res/values-hu/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Az élő helymeghatározás története a szobában lesz tárolva, és a munkamenet befejezése után is látható marad a tagok számára."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Válassza ki, mennyi ideig szeretné megosztani az aktuális tartózkodási helyét."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Nincs jogosultsága az élő tartózkodási helyének megosztására ebben a szobában."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-in/translations.xml b/features/location/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..0aa9742d0e
--- /dev/null
+++ b/features/location/impl/src/main/res/values-in/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Riwayat lokasi langsung Anda akan disimpan di ruang obrolan dan dapat dilihat oleh anggota setelah sesi berakhir."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Pilih berapa lama Anda ingin membagikan lokasi langsung Anda."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Anda tidak memiliki izin untuk membagikan lokasi real-time Anda di ruang ini"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-it/translations.xml b/features/location/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..44adc1e3c5
--- /dev/null
+++ b/features/location/impl/src/main/res/values-it/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"La cronologia delle tue posizioni in tempo reale verrà archiviata nella stanza e sarà visibile ai membri al termine della sessione."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Scegli per quanto tempo condividere la tua posizione in tempo reale."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Non hai l\'autorizzazione per condividere la tua posizione in tempo reale in questa stanza"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-ja/translations.xml b/features/location/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..1060120ee5
--- /dev/null
+++ b/features/location/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"ライブ位置情報の履歴はルームに保管され、メンバーは後から確認することもできます。"</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"ライブ位置情報を共有する期間を選択してください。"</string>
+  <string name="screen_share_location_live_location_missing_permissions">"このルームでライブ位置情報を共有する権限がありません。"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-ko/translations.xml b/features/location/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..aa23450335
--- /dev/null
+++ b/features/location/impl/src/main/res/values-ko/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"실시간 위치 기록은 대화방에 저장되며, 공유 종료 후에도 멤버들이 확인할 수 있습니다."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"실시간 위치를 공유할 시간을 선택해 주세요."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"이 방에서는 실시간 위치를 공유할 권한이 없습니다."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-nb/translations.xml b/features/location/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..9eadb3c8e8
--- /dev/null
+++ b/features/location/impl/src/main/res/values-nb/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Din sanntids lokasjonshistorikk lagres i rommet og vil være synlig for medlemmene etter at økten er avsluttet."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Velg hvor lenge du vil dele din sanntidslokasjon."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Du har ikke tillatelse til å dele din sanntidslokasjon i dette rommet"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-pl/translations.xml b/features/location/impl/src/main/res/values-pl/translations.xml
new file mode 100644
index 0000000000..c480d0f43b
--- /dev/null
+++ b/features/location/impl/src/main/res/values-pl/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Twoja historia lokalizacji na żywo zostanie zapisana w pokoju i będzie widoczna dla członków po zakończeniu sesji."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Wybierz, jak długo chcesz udostępniać swoją lokalizację na żywo."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Nie masz uprawnień do udostępniania swojej lokalizacji na żywo w tym pokoju"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-ro/translations.xml b/features/location/impl/src/main/res/values-ro/translations.xml
new file mode 100644
index 0000000000..85e665647a
--- /dev/null
+++ b/features/location/impl/src/main/res/values-ro/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Istoricul locațiilor dumneavoastră va fi stocat în cameră și va fi vizibil pentru membri după încheierea sesiunii."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Alegeți cât timp doriți să vă partajați locația în timp real."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Nu aveți permisiunea de a vă partaja locația în această cameră."</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-ru/translations.xml b/features/location/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..97b279621c
--- /dev/null
+++ b/features/location/impl/src/main/res/values-ru/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"История вашего местоположения в режиме реального времени будет сохранена в комнате и станет доступна участникам после окончания сессии."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Выберите, как долго вы будете делиться своим местоположением в режиме реального времени."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"У тебя нет прав на то, чтобы делиться своим текущим местоположением в этой комнате"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-uk/translations.xml b/features/location/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..08d205d925
--- /dev/null
+++ b/features/location/impl/src/main/res/values-uk/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Ваша історія поточного місцезнаходження зберігатиметься у кімнаті та буде доступна учасникам після завершення сеансу."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Виберіть, як довго ділитися своїм місцезнаходженням."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"У вас немає дозволу ділитися своїм місцезнаходженням у реальному часі в цій кімнаті"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-uz/translations.xml b/features/location/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..e82765de05
--- /dev/null
+++ b/features/location/impl/src/main/res/values-uz/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Jonli joylashuv tarixingiz chat-xonada saqlanadi va sessiya tugaganidan keyin homiylarga ko‘rinadi."</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"Jonli joylashuvingiz qancha vaqt ulashilishini tanlang."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"Bu xonada jonli joylashuvingizni ulashish uchun sizda ruxsat yoʻq"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-zh-rTW/translations.xml b/features/location/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..27f507732d
--- /dev/null
+++ b/features/location/impl/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"您的即時位置歷史將儲存於聊天室中，並在工作階段結束後對其他成員可見。"</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"選擇分享即時位置的時間長度。"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values-zh/translations.xml b/features/location/impl/src/main/res/values-zh/translations.xml
new file mode 100644
index 0000000000..86f2f2a9da
--- /dev/null
+++ b/features/location/impl/src/main/res/values-zh/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"你的实时位置历史将存储在房间中，并于会话结束后对其他成员可见。"</string>
+  <string name="screen_share_location_live_location_duration_picker_title">"选择共享实时位置的时长。"</string>
+  <string name="screen_share_location_live_location_missing_permissions">"你无权在此房内共享实时位置。"</string>
+</resources>
diff --git a/features/location/impl/src/main/res/values/localazy.xml b/features/location/impl/src/main/res/values/localazy.xml
index 04538049db..975bb3c6ea 100644
--- a/features/location/impl/src/main/res/values/localazy.xml
+++ b/features/location/impl/src/main/res/values/localazy.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_share_location_live_location_disclaimer_title">"Your live location history will be stored in the room and visible to members after the session ends."</string>
   <string name="screen_share_location_live_location_duration_picker_title">"Choose how long to share your live location."</string>
+  <string name="screen_share_location_live_location_missing_permissions">"You do not have permissions to share your live location in this room"</string>
 </resources>
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/PermissionsStateFactory.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/PermissionsStateFactory.kt
index a4352444dc..5c7bacb91a 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/PermissionsStateFactory.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/PermissionsStateFactory.kt
@@ -13,10 +13,12 @@ import io.element.android.features.location.impl.common.permissions.PermissionsS
 fun aPermissionsState(
     permissions: PermissionsState.Permissions = PermissionsState.Permissions.NoneGranted,
     shouldShowRationale: Boolean = false,
+    permissionsRequested: Boolean = false,
 ): PermissionsState {
     return PermissionsState(
         permissions = permissions,
         shouldShowRationale = shouldShowRationale,
+        permissionsAlreadyRequested = permissionsRequested,
         eventSink = {},
     )
 }
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/FakeUserLocationStateFactory.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/FakeUserLocationStateFactory.kt
new file mode 100644
index 0000000000..f6855c5667
--- /dev/null
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/FakeUserLocationStateFactory.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.common
+
+import androidx.compose.runtime.Composable
+import io.element.android.features.location.impl.common.userlocation.UserLocationState
+
+class FakeUserLocationStateFactory : UserLocationState.Factory {
+    @Composable
+    override fun create(hasLocationPermission: Boolean): UserLocationState {
+        return UserLocationState(null)
+    }
+}
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheckTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheckTest.kt
index c8e1f21a48..40362bda3c 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheckTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/LocationConstraintsCheckTest.kt
@@ -21,7 +21,7 @@ class LocationConstraintsCheckTest {
         )
         val locationActions = FakeLocationActions(isLocationEnabled = true)
 
-        val result = checkLocationConstraints(permissionsState, locationActions)
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
 
         assertThat(result).isEqualTo(LocationConstraintsCheck.Success)
     }
@@ -33,7 +33,7 @@ class LocationConstraintsCheckTest {
         )
         val locationActions = FakeLocationActions(isLocationEnabled = true)
 
-        val result = checkLocationConstraints(permissionsState, locationActions)
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
 
         assertThat(result).isEqualTo(LocationConstraintsCheck.Success)
     }
@@ -45,7 +45,7 @@ class LocationConstraintsCheckTest {
         )
         val locationActions = FakeLocationActions(isLocationEnabled = false)
 
-        val result = checkLocationConstraints(permissionsState, locationActions)
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
 
         assertThat(result).isEqualTo(LocationConstraintsCheck.LocationServiceDisabled)
     }
@@ -58,21 +58,48 @@ class LocationConstraintsCheckTest {
         )
         val locationActions = FakeLocationActions(isLocationEnabled = true)
 
-        val result = checkLocationConstraints(permissionsState, locationActions)
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
 
         assertThat(result).isEqualTo(LocationConstraintsCheck.PermissionRationale)
     }
 
     @Test
-    fun `checkLocationConstraints returns PermissionDenied when permissions denied without rationale`() {
+    fun `checkLocationConstraints returns PermissionShouldBeRequested when permissions not yet requested`() {
+        val permissionsState = aPermissionsState(
+            permissions = PermissionsState.Permissions.NoneGranted,
+            shouldShowRationale = false,
+            permissionsRequested = false,
+        )
+        val locationActions = FakeLocationActions(isLocationEnabled = true)
+
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
+
+        assertThat(result).isEqualTo(LocationConstraintsCheck.PermissionShouldBeRequested)
+    }
+
+    @Test
+    fun `checkLocationConstraints returns PermissionDenied when permissions already requested and denied without rationale`() {
+        val permissionsState = aPermissionsState(
+            permissions = PermissionsState.Permissions.NoneGranted,
+            shouldShowRationale = false,
+            permissionsRequested = true,
+        )
+        val locationActions = FakeLocationActions(isLocationEnabled = true)
+
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.GRANTED)
+
+        assertThat(result).isEqualTo(LocationConstraintsCheck.PermissionDenied)
+    }
+
+    @Test
+    fun `checkLocationConstraints returns NotEnoughPowerLevel when send permissions are not granted`() {
         val permissionsState = aPermissionsState(
             permissions = PermissionsState.Permissions.NoneGranted,
             shouldShowRationale = false,
         )
         val locationActions = FakeLocationActions(isLocationEnabled = true)
+        val result = checkLocationConstraints(permissionsState, locationActions, SendLiveLocationPermissions.DEFAULT)
 
-        val result = checkLocationConstraints(permissionsState, locationActions)
-
-        assertThat(result).isEqualTo(LocationConstraintsCheck.PermissionDenied)
+        assertThat(result).isEqualTo(LocationConstraintsCheck.NotEnoughPowerLevel)
     }
 }
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
index 94d909a7ef..9b8ff7a29a 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
@@ -20,6 +20,7 @@ class FakePermissionsPresenter : PermissionsPresenter {
     private var state = PermissionsState(
         permissions = PermissionsState.Permissions.NoneGranted,
         shouldShowRationale = false,
+        permissionsAlreadyRequested = false,
         eventSink = ::handleEvent,
     )
         set(value) {
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManagerTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManagerTest.kt
new file mode 100644
index 0000000000..9c15424cad
--- /dev/null
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/DefaultActiveLiveLocationShareManagerTest.kt
@@ -0,0 +1,535 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.impl.live.service.LiveLocationSharingCoordinator
+import io.element.android.libraries.matrix.api.room.location.BeaconInfoUpdate
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID_2
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
+import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
+import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Instant
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class DefaultActiveLiveLocationShareManagerTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `starting the first share starts the coordinator service after the beacon echo and adds an active share`() = runTest {
+        val startServiceRecorder = lambdaRecorder<Unit> { }
+        val stopServiceRecorder = lambdaRecorder<Unit> { }
+        val coordinator = createCoordinator(
+            startService = startServiceRecorder,
+            stopService = stopServiceRecorder
+        )
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val room = FakeJoinedRoom(
+            startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+            stopLiveLocationShareResult = { Result.success(Unit) },
+        )
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply { givenGetRoomResult(A_ROOM_ID, room) },
+            coordinator = coordinator,
+            clock = FakeSystemClock(epochMillisResult = 123L),
+        )
+        advanceUntilIdle()
+
+        val result = async { manager.startShare(A_ROOM_ID, 60.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+
+        assertThat(result.await().isSuccess).isTrue()
+        assertThat(manager.sharingRoomIds.value).containsExactly(A_ROOM_ID)
+        assert(startServiceRecorder).isCalledOnce()
+        assert(stopServiceRecorder).isNeverCalled()
+    }
+
+    @Test
+    fun `stopping the last share stops the coordinator service`() = runTest {
+        val startServiceRecorder = lambdaRecorder<Unit> { }
+        val stopServiceRecorder = lambdaRecorder<Unit> { }
+        val coordinator = createCoordinator(
+            startService = startServiceRecorder,
+            stopService = stopServiceRecorder
+        )
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val room = FakeJoinedRoom(
+            startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+            stopLiveLocationShareResult = { Result.success(Unit) },
+        )
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply { givenGetRoomResult(A_ROOM_ID, room) },
+            coordinator = coordinator,
+        )
+        advanceUntilIdle()
+
+        val startResult = async { manager.startShare(A_ROOM_ID, 15.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(startResult.await().isSuccess).isTrue()
+
+        val result = manager.stopShare(A_ROOM_ID)
+
+        assertThat(result.isSuccess).isTrue()
+        assertThat(manager.sharingRoomIds.value).isEmpty()
+        assert(startServiceRecorder).isCalledOnce()
+        assert(stopServiceRecorder).isCalledOnce()
+    }
+
+    @Test
+    fun `two managers with the same room id keep isolated state per session`() = runTest {
+        val coordinator = createCoordinator()
+        val beaconInfoUpdatesOne = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val beaconInfoUpdatesTwo = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val managerOne = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdatesOne,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = { Result.success(Unit) },
+                    ),
+                )
+            },
+            coordinator = coordinator,
+        )
+        val managerTwo = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID_2,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdatesTwo,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = { Result.success(Unit) },
+                    ),
+                )
+            },
+            coordinator = coordinator,
+        )
+        advanceUntilIdle()
+
+        val startResult = async { managerOne.startShare(A_ROOM_ID, 15.minutes) }
+        beaconInfoUpdatesOne.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(startResult.await().isSuccess).isTrue()
+
+        assertThat(managerOne.sharingRoomIds.value).containsExactly(A_ROOM_ID)
+        assertThat(managerTwo.sharingRoomIds.value).isEmpty()
+    }
+
+    @Test
+    fun `start share persists room expiry after beacon echo`() = runTest {
+        val liveLocationStore = createLiveLocationStore()
+        val coordinator = createCoordinator()
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = { Result.success(Unit) },
+                    ),
+                )
+            },
+            coordinator = coordinator,
+            liveLocationStore = liveLocationStore,
+            clock = FakeSystemClock(epochMillisResult = 123L),
+        )
+        advanceUntilIdle()
+
+        val result = async { manager.startShare(A_ROOM_ID, 15.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+
+        assertThat(result.await().isSuccess).isTrue()
+        assertThat(liveLocationStore.getLiveLocationExpiries()).containsKey(A_ROOM_ID)
+    }
+
+    @Test
+    fun `stop share removes persisted expiry`() = runTest {
+        val liveLocationStore = createLiveLocationStore()
+        val coordinator = createCoordinator()
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = { Result.success(Unit) },
+                    ),
+                )
+            },
+            coordinator = coordinator,
+            liveLocationStore = liveLocationStore,
+        )
+        advanceUntilIdle()
+
+        val startResult = async { manager.startShare(A_ROOM_ID, 15.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(startResult.await().isSuccess).isTrue()
+
+        manager.stopShare(A_ROOM_ID)
+
+        assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+    }
+
+    @Test
+    fun `setup restores unexpired stored share and registers coordinator`() = runTest {
+        val startServiceRecorder = lambdaRecorder<Unit> { }
+        val stopServiceRecorder = lambdaRecorder<Unit> { }
+        val liveLocationStore = createLiveLocationStore().apply {
+            setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(10_000L))
+        }
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+            ).apply {
+                givenGetRoomResult(A_ROOM_ID, FakeJoinedRoom())
+            },
+            coordinator = createCoordinator(
+                startService = startServiceRecorder,
+                stopService = stopServiceRecorder,
+            ),
+            liveLocationStore = liveLocationStore,
+            clock = FakeSystemClock(epochMillisResult = 1_000L),
+        )
+
+        assertThat(manager.sharingRoomIds.value).containsExactly(A_ROOM_ID)
+        assert(startServiceRecorder).isCalledOnce()
+        assert(stopServiceRecorder).isNeverCalled()
+    }
+
+    @Test
+    fun `setup remotely stops expired stored share and removes it from store`() = runTest {
+        val stopLiveLocationShareResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val liveLocationStore = createLiveLocationStore().apply {
+            setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(1_000L))
+        }
+        createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(stopLiveLocationShareResult = stopLiveLocationShareResult),
+                )
+            },
+            coordinator = createCoordinator(),
+            liveLocationStore = liveLocationStore,
+            clock = FakeSystemClock(epochMillisResult = 5_000L),
+        )
+        advanceUntilIdle()
+        assert(stopLiveLocationShareResult).isCalledOnce()
+        assertThat(liveLocationStore.getLiveLocationExpiries()).isEmpty()
+    }
+
+    @Test
+    fun `stop share closes loaded room and removes persisted expiry when room is not tracked`() = runTest {
+        val stopLiveLocationShareResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val room = FakeJoinedRoom(stopLiveLocationShareResult = stopLiveLocationShareResult)
+        val liveLocationStore = createInMemoryLiveLocationStore()
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+            ).apply {
+                givenGetRoomResult(A_ROOM_ID, room)
+            },
+            coordinator = createCoordinator(),
+            liveLocationStore = liveLocationStore,
+        )
+        liveLocationStore.setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(10_000L))
+
+        val result = manager.stopShare(A_ROOM_ID)
+
+        assertThat(result.isSuccess).isTrue()
+        assert(stopLiveLocationShareResult).isCalledOnce()
+        assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+        room.baseRoom.assertDestroyed()
+    }
+
+    @Test
+    fun `share is automatically stopped when timeout elapses`() = runTest {
+        val liveLocationStore = createInMemoryLiveLocationStore()
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val stopLiveLocationShareResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = stopLiveLocationShareResult
+                    ),
+                )
+            },
+            coordinator = createCoordinator(),
+            liveLocationStore = liveLocationStore,
+            clock = FakeSystemClock(epochMillisResult = 123L),
+        )
+        advanceUntilIdle()
+
+        val startResult = async { manager.startShare(A_ROOM_ID, 1.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(startResult.await().isSuccess).isTrue()
+
+        manager.sharingRoomIds.test {
+            assertThat(awaitItem()).containsExactly(A_ROOM_ID)
+            assertThat(awaitItem()).isEmpty()
+            advanceUntilIdle()
+            assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+            assert(stopLiveLocationShareResult).isCalledExactly(2)
+        }
+    }
+
+    @Test
+    fun `restored share is automatically stopped when remaining timeout elapses`() = runTest {
+        val liveLocationStore = createInMemoryLiveLocationStore().apply {
+            setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(6_000L))
+        }
+        val stopLiveLocationShareLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        stopLiveLocationShareResult = stopLiveLocationShareLambda
+                    ),
+                )
+            },
+            coordinator = createCoordinator(),
+            liveLocationStore = liveLocationStore,
+            clock = FakeSystemClock(epochMillisResult = 1_000L),
+        )
+
+        manager.sharingRoomIds.test {
+            assertThat(awaitItem()).containsExactly(A_ROOM_ID)
+            assertThat(awaitItem()).isEmpty()
+            advanceUntilIdle()
+            assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+            assert(stopLiveLocationShareLambda).isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `location update after expiry stops the share and does not send location`() = runTest {
+        val liveLocationStore = createInMemoryLiveLocationStore()
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val stopLiveLocationShareResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val sendLiveLocationResult = lambdaRecorder<String, Result<Unit>> { _ -> Result.success(Unit) }
+        val clock = FakeSystemClock(epochMillisResult = 1_000L)
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = stopLiveLocationShareResult,
+                        sendLiveLocationResult = sendLiveLocationResult,
+                    ),
+                )
+            },
+            coordinator = createCoordinator(),
+            liveLocationStore = liveLocationStore,
+            clock = clock,
+        )
+        advanceUntilIdle()
+
+        val startResult = async { manager.startShare(A_ROOM_ID, 1.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(startResult.await().isSuccess).isTrue()
+
+        // Advance the clock past the expiry so the next location tick is beyond the deadline.
+        clock.epochMillisResult = 1_000L + 1.minutes.inWholeMilliseconds + 1_000L
+
+        manager.sharingRoomIds.test {
+            assertThat(awaitItem()).containsExactly(A_ROOM_ID)
+            manager.onLocationUpdate(io.element.android.features.location.api.Location(lat = 0.0, lon = 0.0, accuracy = null))
+            assertThat(awaitItem()).isEmpty()
+            advanceUntilIdle()
+        }
+        assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+        assert(sendLiveLocationResult).isNeverCalled()
+        // stopLiveLocationShare is called twice: once defensively in startShare, once from the tick-triggered stopShare.
+        assert(stopLiveLocationShareResult).isCalledExactly(2)
+    }
+
+    @Test
+    fun `session deleted clears local state`() = runTest {
+        val startServiceRecorder = lambdaRecorder<Unit> { }
+        val stopServiceRecorder = lambdaRecorder<Unit> { }
+        val liveLocationStore = createInMemoryLiveLocationStore()
+        val sessionObserver = FakeSessionObserver()
+        val beaconInfoUpdates = MutableSharedFlow<BeaconInfoUpdate>(replay = 1)
+        val manager = createManager(
+            client = FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                sessionCoroutineScope = backgroundScope,
+                ownBeaconInfoUpdates = beaconInfoUpdates,
+            ).apply {
+                givenGetRoomResult(
+                    A_ROOM_ID,
+                    FakeJoinedRoom(
+                        startLiveLocationShareResult = { Result.success(AN_EVENT_ID) },
+                        stopLiveLocationShareResult = { Result.success(Unit) },
+                    ),
+                )
+            },
+            coordinator = createCoordinator(
+                startService = startServiceRecorder,
+                stopService = stopServiceRecorder,
+            ),
+            liveLocationStore = liveLocationStore,
+            sessionObserver = sessionObserver,
+        )
+        advanceUntilIdle()
+
+        val firstStart = async { manager.startShare(A_ROOM_ID, 15.minutes) }
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(firstStart.await().isSuccess).isTrue()
+
+        sessionObserver.onSessionDeleted(A_SESSION_ID.value)
+        advanceUntilIdle()
+
+        assertThat(manager.sharingRoomIds.value).isEmpty()
+        assertThat(liveLocationStore.getLiveLocationExpiries()).doesNotContainKey(A_ROOM_ID)
+        assert(startServiceRecorder).isCalledOnce()
+        assert(stopServiceRecorder).isCalledOnce()
+
+        val secondStart = async { manager.startShare(A_ROOM_ID, 15.minutes) }
+        advanceUntilIdle()
+        assertThat(secondStart.isCompleted).isFalse()
+
+        beaconInfoUpdates.emit(BeaconInfoUpdate(roomId = A_ROOM_ID, beaconId = AN_EVENT_ID, isLive = true))
+        assertThat(secondStart.await().isSuccess).isTrue()
+    }
+
+    private suspend fun createManager(
+        client: FakeMatrixClient = FakeMatrixClient(sessionId = A_SESSION_ID),
+        coordinator: LiveLocationSharingCoordinator = createCoordinator(),
+        liveLocationStore: LiveLocationStore = createLiveLocationStore(),
+        clock: SystemClock = FakeSystemClock(),
+        sessionObserver: SessionObserver = FakeSessionObserver(),
+    ): DefaultActiveLiveLocationShareManager {
+        return DefaultActiveLiveLocationShareManager(
+            matrixClient = client,
+            coordinator = coordinator,
+            liveLocationStore = liveLocationStore,
+            clock = clock,
+            sessionObserver = sessionObserver,
+        ).apply {
+            setup()
+        }
+    }
+
+    private fun createCoordinator(
+        startService: () -> Unit = {},
+        stopService: () -> Unit = {},
+        nowMillis: () -> Long = { 0L },
+    ): LiveLocationSharingCoordinator {
+        return LiveLocationSharingCoordinator(
+            startService = startService,
+            stopService = stopService,
+            nowMillis = nowMillis,
+        )
+    }
+
+    private fun createLiveLocationStore(
+        sessionId: io.element.android.libraries.matrix.api.core.SessionId = A_SESSION_ID,
+        preferenceDataStoreFactory: PreferenceDataStoreFactory = FakePreferenceDataStoreFactory(),
+    ): LiveLocationStore {
+        return LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = sessionId,
+        )
+    }
+
+    private fun createInMemoryLiveLocationStore(
+        sessionId: io.element.android.libraries.matrix.api.core.SessionId = A_SESSION_ID,
+    ): LiveLocationStore {
+        val preferenceDataStoreFactory = object : PreferenceDataStoreFactory {
+            override fun create(name: String): DataStore<Preferences> {
+                var preferences: Preferences = emptyPreferences()
+                return object : DataStore<Preferences> {
+                    override val data: Flow<Preferences>
+                        get() = flowOf(preferences)
+
+                    override suspend fun updateData(transform: suspend (t: Preferences) -> Preferences): Preferences {
+                        preferences = transform(preferences)
+                        return preferences
+                    }
+                }
+            }
+        }
+        return createLiveLocationStore(
+            sessionId = sessionId,
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+        )
+    }
+}
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/LiveLocationSharingCoordinatorTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/LiveLocationSharingCoordinatorTest.kt
new file mode 100644
index 0000000000..6cee53a482
--- /dev/null
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/live/LiveLocationSharingCoordinatorTest.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.live
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.api.Location
+import io.element.android.features.location.impl.live.service.LiveLocationReceiver
+import io.element.android.features.location.impl.live.service.LiveLocationSharingCoordinator
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID_2
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class LiveLocationSharingCoordinatorTest {
+    @Test
+    fun `first registration starts the service and last unregister stops it`() = runTest {
+        var startCount = 0
+        var stopCount = 0
+        val coordinator = LiveLocationSharingCoordinator(
+            startService = { startCount++ },
+            stopService = { stopCount++ },
+            nowMillis = { 0L },
+        )
+
+        coordinator.register(A_SESSION_ID, liveLocationReceiver())
+        coordinator.unregister(A_SESSION_ID)
+
+        assertThat(startCount).isEqualTo(1)
+        assertThat(stopCount).isEqualTo(1)
+    }
+
+    @Test
+    fun `dispatch isolates receiver failures and still reaches later receivers`() = runTest {
+        val delivered = mutableListOf<Location>()
+        val coordinator = LiveLocationSharingCoordinator(
+            startService = { },
+            stopService = { },
+            nowMillis = { 4_000L },
+        )
+
+        coordinator.register(A_SESSION_ID, liveLocationReceiver { error("boom") })
+        coordinator.register(A_SESSION_ID_2, liveLocationReceiver { delivered += it })
+        coordinator.dispatch(Location(lat = 1.0, lon = 2.0, accuracy = 3f))
+
+        assertThat(delivered).containsExactly(Location(lat = 1.0, lon = 2.0, accuracy = 3f))
+    }
+
+    @Test
+    fun `dispatch delivers first location immediately`() = runTest {
+        var nowMillis = 4_000L
+        val delivered = mutableListOf<Location>()
+        val coordinator = LiveLocationSharingCoordinator(
+            startService = { },
+            stopService = { },
+            nowMillis = { nowMillis },
+        )
+
+        coordinator.register(A_SESSION_ID, liveLocationReceiver { delivered += it })
+
+        val firstLocation = Location(lat = 1.0, lon = 2.0, accuracy = 3f)
+
+        coordinator.dispatch(firstLocation)
+
+        assertThat(delivered).containsExactly(firstLocation)
+    }
+
+    @Test
+    fun `dispatch drops updates inside the throttle window`() = runTest {
+        var nowMillis = 4_000L
+        val delivered = mutableListOf<Location>()
+        val coordinator = LiveLocationSharingCoordinator(
+            startService = { },
+            stopService = { },
+            nowMillis = { nowMillis },
+        )
+
+        coordinator.register(A_SESSION_ID, liveLocationReceiver { delivered += it })
+
+        val firstLocation = Location(lat = 1.0, lon = 2.0, accuracy = 3f)
+        val secondLocation = Location(lat = 4.0, lon = 5.0, accuracy = 6f)
+
+        coordinator.dispatch(firstLocation)
+        nowMillis += 500
+        coordinator.dispatch(secondLocation)
+
+        assertThat(delivered).containsExactly(firstLocation)
+    }
+
+    @Test
+    fun `dispatch delivers next update after the throttle window elapses`() = runTest {
+        var nowMillis = 4_000L
+        val delivered = mutableListOf<Location>()
+        val coordinator = LiveLocationSharingCoordinator(
+            startService = { },
+            stopService = { },
+            nowMillis = { nowMillis },
+        )
+
+        coordinator.register(A_SESSION_ID, liveLocationReceiver { delivered += it })
+
+        val firstLocation = Location(lat = 1.0, lon = 2.0, accuracy = 3f)
+        val secondLocation = Location(lat = 4.0, lon = 5.0, accuracy = 6f)
+
+        coordinator.dispatch(firstLocation)
+        nowMillis += 3_000
+        coordinator.dispatch(secondLocation)
+
+        assertThat(delivered).containsExactly(firstLocation, secondLocation).inOrder()
+    }
+}
+
+private fun liveLocationReceiver(
+    onLocation: suspend (Location) -> Unit = {},
+) = object : LiveLocationReceiver {
+    override suspend fun onLocationUpdate(location: Location) = onLocation(location)
+    override suspend fun onUnrecoverableError() = Unit
+}
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/DefaultShareLocationEntryPointTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/DefaultShareLocationEntryPointTest.kt
index edd000e02c..49df684666 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/DefaultShareLocationEntryPointTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/DefaultShareLocationEntryPointTest.kt
@@ -11,17 +11,21 @@ package io.element.android.features.location.impl.share
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.impl.common.FakeUserLocationStateFactory
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
 import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
+import io.element.android.features.location.impl.live.LiveLocationStore
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.features.messages.test.FakeMessageComposerContext
 import io.element.android.libraries.dateformatter.test.FakeDurationFormatter
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.node.TestParentNode
+import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
@@ -30,24 +34,30 @@ class DefaultShareLocationEntryPointTest {
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @Test
-    fun `test node builder`() {
+    fun `test node builder`() = runTest {
         val entryPoint = DefaultShareLocationEntryPoint()
         val parentNode = TestParentNode.create { buildContext, plugins ->
+            val room = FakeJoinedRoom()
             ShareLocationNode(
                 buildContext = buildContext,
                 plugins = plugins,
                 presenterFactory = { timelineMode: Timeline.Mode ->
                     ShareLocationPresenter(
                         permissionsPresenterFactory = { FakePermissionsPresenter() },
-                        room = FakeJoinedRoom(),
+                        room = room,
                         timelineMode = timelineMode,
                         analyticsService = FakeAnalyticsService(),
                         messageComposerContext = FakeMessageComposerContext(),
                         locationActions = FakeLocationActions(),
                         buildMeta = aBuildMeta(),
-                        featureFlagService = FakeFeatureFlagService(),
                         client = FakeMatrixClient(),
                         durationFormatter = FakeDurationFormatter(),
+                        liveLocationShareManager = FakeActiveLiveLocationShareManager(),
+                        liveLocationStore = LiveLocationStore(
+                            preferenceDataStoreFactory = FakePreferenceDataStoreFactory(),
+                            sessionId = room.sessionId,
+                        ),
+                        userLocationStateFactory = FakeUserLocationStateFactory(),
                     )
                 },
                 analyticsService = FakeAnalyticsService(),
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenterTest.kt
index 92c27d9f21..f4cc135e9e 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationPresenterTest.kt
@@ -6,41 +6,67 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.element.android.features.location.impl.share
 
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
 import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
+import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.aPermissionsState
+import io.element.android.features.location.impl.common.FakeUserLocationStateFactory
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
 import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.impl.live.LiveLocationStore
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.features.messages.test.FakeMessageComposerContext
 import io.element.android.libraries.dateformatter.test.FakeDurationFormatter
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
+import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
 
 class ShareLocationPresenterTest {
     @get:Rule
@@ -51,25 +77,33 @@ class ShareLocationPresenterTest {
     private val fakeMessageComposerContext = FakeMessageComposerContext()
     private val fakeLocationActions = FakeLocationActions()
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
-    private val fakeFeatureFlagService = FakeFeatureFlagService()
-    private val fakeMatrixClient = FakeMatrixClient(sessionId = A_USER_ID)
+    private val fakeMatrixClient = FakeMatrixClient(
+        sessionId = A_USER_ID,
+        getMapStyleUrlResult = { Result.success(null) },
+    )
 
     private val durationFormatter = FakeDurationFormatter()
 
-    private fun createShareLocationPresenter(
+    private fun TestScope.createShareLocationPresenter(
         joinedRoom: JoinedRoom = FakeJoinedRoom(),
+        timelineMode: Timeline.Mode = Timeline.Mode.Live,
         locationActions: FakeLocationActions = fakeLocationActions,
+        liveLocationShareManager: FakeActiveLiveLocationShareManager = FakeActiveLiveLocationShareManager(),
+        liveLocationStore: LiveLocationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId),
+        client: FakeMatrixClient = fakeMatrixClient,
     ): ShareLocationPresenter = ShareLocationPresenter(
         permissionsPresenterFactory = { fakePermissionsPresenter },
         room = joinedRoom,
-        timelineMode = Timeline.Mode.Live,
+        timelineMode = timelineMode,
         analyticsService = fakeAnalyticsService,
         messageComposerContext = fakeMessageComposerContext,
         locationActions = locationActions,
         buildMeta = fakeBuildMeta,
-        featureFlagService = fakeFeatureFlagService,
-        client = fakeMatrixClient,
+        client = client,
         durationFormatter = durationFormatter,
+        liveLocationShareManager = liveLocationShareManager,
+        liveLocationStore = liveLocationStore,
+        userLocationStateFactory = FakeUserLocationStateFactory(),
     )
 
     @Test
@@ -82,12 +116,28 @@ class ShareLocationPresenterTest {
         )
 
         val shareLocationPresenter = createShareLocationPresenter()
+        shareLocationPresenter.test {
+            val state = awaitFirstItem()
+            assertThat(state.customMapStyleUrl.isLoading()).isFalse()
+            assertThat(state.trackUserLocation).isTrue()
+            assertThat(state.dialogState).isEqualTo(ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.None))
+        }
+    }
+
+    @Test
+    fun `present - non-null customMapStyleUrl`() = runTest {
+        val shareLocationPresenter = createShareLocationPresenter(
+            client = FakeMatrixClient(
+                sessionId = A_USER_ID,
+                getMapStyleUrlResult = { Result.success("aUrl") },
+            )
+        )
         shareLocationPresenter.test {
             skipItems(1)
             val state = awaitItem()
-            assertThat(state.trackUserLocation).isTrue()
-            assertThat(state.hasLocationPermission).isTrue()
-            assertThat(state.dialogState).isEqualTo(ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.None))
+            assertThat(state.customMapStyleUrl.isLoading()).isTrue()
+            val finalState = awaitItem()
+            assertThat(finalState.customMapStyleUrl.dataOrNull()).isEqualTo("aUrl")
         }
     }
 
@@ -104,14 +154,30 @@ class ShareLocationPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             shareLocationPresenter.present()
         }.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.trackUserLocation).isTrue()
-            assertThat(initialState.hasLocationPermission).isTrue()
             assertThat(initialState.dialogState).isEqualTo(ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.None))
         }
     }
 
+    @Test
+    fun `initial state with permissions not yet requested triggers permission request`() = runTest {
+        val shareLocationPresenter = createShareLocationPresenter()
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.NoneGranted,
+                shouldShowRationale = false,
+                permissionsRequested = false,
+            )
+        )
+
+        shareLocationPresenter.test {
+            skipItems(2)
+            cancelAndIgnoreRemainingEvents()
+            assertThat(fakePermissionsPresenter.events).contains(PermissionsEvents.RequestPermissions)
+        }
+    }
+
     @Test
     fun `initial state with permissions denied`() = runTest {
         val shareLocationPresenter = createShareLocationPresenter()
@@ -119,16 +185,15 @@ class ShareLocationPresenterTest {
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
+                permissionsRequested = true,
             )
         )
 
         moleculeFlow(RecompositionMode.Immediate) {
             shareLocationPresenter.present()
         }.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.trackUserLocation).isFalse()
-            assertThat(initialState.hasLocationPermission).isFalse()
             assertThat(initialState.dialogState).isEqualTo(
                 ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionDenied)
             )
@@ -146,10 +211,8 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.trackUserLocation).isFalse()
-            assertThat(initialState.hasLocationPermission).isFalse()
             assertThat(initialState.dialogState).isEqualTo(
                 ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionRationale)
             )
@@ -168,10 +231,8 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.trackUserLocation).isFalse()
-            assertThat(initialState.hasLocationPermission).isTrue()
             assertThat(initialState.dialogState).isEqualTo(
                 ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.LocationServiceDisabled)
             )
@@ -189,8 +250,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.trackUserLocation).isTrue()
 
             initialState.eventSink(ShareLocationEvent.StopTrackingUserLocation)
@@ -210,8 +270,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.dialogState).isEqualTo(
                 ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionRationale)
             )
@@ -233,7 +292,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             initialState.eventSink(ShareLocationEvent.RequestPermissions)
 
             // Wait for dialog to be dismissed
@@ -251,12 +310,12 @@ class ShareLocationPresenterTest {
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
+                permissionsRequested = true,
             )
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             initialState.eventSink(ShareLocationEvent.OpenAppSettings)
             val settingsOpenedState = awaitItem()
 
@@ -277,8 +336,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
             assertThat(initialState.dialogState).isEqualTo(
                 ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.LocationServiceDisabled)
             )
@@ -293,7 +351,15 @@ class ShareLocationPresenterTest {
 
     @Test
     fun `ShowLiveLocationDurationPicker shows duration dialog when constraints pass`() = runTest {
-        val shareLocationPresenter = createShareLocationPresenter()
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = grantedSendLiveLocationPermissions()
+            )
+        )
+        val locationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId).apply {
+            setAcceptedLiveLocationDisclaimer().getOrThrow()
+        }
+        val shareLocationPresenter = createShareLocationPresenter(joinedRoom = joinedRoom, liveLocationStore = locationStore)
         fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
@@ -302,9 +368,8 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
-            initialState.eventSink(ShareLocationEvent.ShowLiveLocationDurationPicker)
+            val initialState = awaitFirstItem()
+            initialState.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
             val durationDialogState = awaitItem()
 
             assertThat(durationDialogState.dialogState).isInstanceOf(ShareLocationState.Dialog.LiveLocationDurations::class.java)
@@ -313,23 +378,174 @@ class ShareLocationPresenterTest {
     }
 
     @Test
-    fun `ShowLiveLocationDurationPicker shows constraint dialog when permissions denied`() = runTest {
-        val shareLocationPresenter = createShareLocationPresenter()
+    fun `ShowLiveLocationDurationPicker shows disclaimer when acceptance is missing`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = grantedSendLiveLocationPermissions()
+            )
+        )
+        val presenter = createShareLocationPresenter(joinedRoom = room)
         fakePermissionsPresenter.givenState(
             aPermissionsState(
-                permissions = PermissionsState.Permissions.NoneGranted,
+                permissions = PermissionsState.Permissions.AllGranted,
                 shouldShowRationale = false,
             )
         )
 
+        presenter.test {
+            val state = awaitFirstItem()
+
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
+            val dialogState = awaitItem()
+
+            assertThat(dialogState.dialogState).isEqualTo(ShareLocationState.Dialog.LiveLocationDisclaimer)
+        }
+    }
+
+    @Test
+    fun `AcceptLiveLocationDisclaimer persists acceptance and shows durations`() = runTest {
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = grantedSendLiveLocationPermissions()
+            )
+        )
+        val locationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId)
+        val presenter = createShareLocationPresenter(joinedRoom = joinedRoom, liveLocationStore = locationStore)
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.AllGranted,
+                shouldShowRationale = false,
+            )
+        )
+
+        presenter.test {
+            val state = awaitFirstItem()
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
+            awaitItem()
+
+            state.eventSink(ShareLocationEvent.AcceptLiveLocationDisclaimer)
+            val durationState = awaitItem()
+
+            assertThat(locationStore.hasAcceptedLiveLocationDisclaimer()).isTrue()
+            assertThat(durationState.dialogState).isInstanceOf(ShareLocationState.Dialog.LiveLocationDurations::class.java)
+        }
+    }
+
+    @Test
+    fun `AcceptLiveLocationDisclaimer keeps disclaimer gate active when persistence fails`() = runTest {
+        val joinedRoom = FakeJoinedRoom()
+        val presenter = createShareLocationPresenter(
+            joinedRoom = joinedRoom,
+            liveLocationStore = createFailingLiveLocationStore(sessionId = joinedRoom.sessionId),
+        )
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.AllGranted,
+                shouldShowRationale = false,
+            )
+        )
+
+        presenter.test {
+            val state = awaitFirstItem()
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
+            val disclaimerState = awaitItem()
+
+            disclaimerState.eventSink(ShareLocationEvent.AcceptLiveLocationDisclaimer)
+            advanceUntilIdle()
+
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `ShowLiveLocationDurationPicker bypasses disclaimer when already accepted`() = runTest {
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = grantedSendLiveLocationPermissions()
+            )
+        )
+        val locationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId).apply {
+            setAcceptedLiveLocationDisclaimer().getOrThrow()
+        }
+        val presenter = createShareLocationPresenter(joinedRoom = joinedRoom, liveLocationStore = locationStore)
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.AllGranted,
+                shouldShowRationale = false,
+            )
+        )
+
+        presenter.test {
+            val state = awaitFirstItem()
+
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
+            val durationState = awaitItem()
+
+            assertThat(durationState.dialogState).isInstanceOf(ShareLocationState.Dialog.LiveLocationDurations::class.java)
+        }
+    }
+
+    @Test
+    fun `ShowLiveLocationDurationPicker uses the active session disclaimer state`() = runTest {
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                sessionId = SessionId("@alice:server"),
+                roomPermissions = grantedSendLiveLocationPermissions()
+            ),
+        )
+        createLiveLocationStore(sessionId = SessionId("@bob:server"))
+            .setAcceptedLiveLocationDisclaimer()
+            .getOrThrow()
+        val presenter = createShareLocationPresenter(
+            joinedRoom = joinedRoom,
+            liveLocationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId),
+        )
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.AllGranted,
+                shouldShowRationale = false,
+            )
+        )
+
+        presenter.test {
+            val state = awaitFirstItem()
+
+            state.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
+            val dialogState = awaitItem()
+
+            assertThat(dialogState.dialogState).isEqualTo(ShareLocationState.Dialog.LiveLocationDisclaimer)
+        }
+    }
+
+    @Test
+    fun `ShowLiveLocationDurationPicker shows constraint dialog when permissions denied`() = runTest {
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = grantedSendLiveLocationPermissions()
+            )
+        )
+        val locationStore = createLiveLocationStore(sessionId = joinedRoom.sessionId).apply {
+            setAcceptedLiveLocationDisclaimer().getOrThrow()
+        }
+        val shareLocationPresenter = createShareLocationPresenter(
+            joinedRoom = joinedRoom,
+            liveLocationStore = locationStore,
+        )
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.NoneGranted,
+                shouldShowRationale = false,
+                permissionsRequested = true,
+            )
+        )
+
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
-            // Dismiss initial dialog
+            val initialState = awaitFirstItem()
+            // Dismiss initial dialog to allow re-triggering it
             initialState.eventSink(ShareLocationEvent.DismissDialog)
             val dismissedState = awaitItem()
 
-            dismissedState.eventSink(ShareLocationEvent.ShowLiveLocationDurationPicker)
+            dismissedState.eventSink(ShareLocationEvent.InitiateLiveLocationShare)
             val constraintDialogState = awaitItem()
 
             assertThat(constraintDialogState.dialogState).isEqualTo(
@@ -358,8 +574,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            skipItems(1)
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
 
             initialState.eventSink(
                 ShareLocationEvent.ShareStaticLocation(
@@ -412,7 +627,7 @@ class ShareLocationPresenterTest {
         )
 
         shareLocationPresenter.test {
-            val initialState = awaitItem()
+            val initialState = awaitFirstItem()
 
             initialState.eventSink(
                 ShareLocationEvent.ShareStaticLocation(
@@ -444,4 +659,88 @@ class ShareLocationPresenterTest {
             cancelAndIgnoreRemainingEvents()
         }
     }
+
+    @Test
+    fun `StartLiveLocationShare event calls manager startShare`() = runTest {
+        val startShareLambda = lambdaRecorder { _: RoomId, _: Duration -> Result.success(Unit) }
+        val manager = FakeActiveLiveLocationShareManager(
+            startShareLambda = startShareLambda,
+        )
+        val shareLocationPresenter = createShareLocationPresenter(liveLocationShareManager = manager)
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.AllGranted,
+                shouldShowRationale = false,
+            )
+        )
+
+        shareLocationPresenter.test {
+            val state = awaitFirstItem()
+            state.eventSink(ShareLocationEvent.StartLiveLocationShare(duration = 1.hours))
+            advanceUntilIdle()
+            assert(startShareLambda).isCalledOnce().with(
+                value(A_ROOM_ID),
+                value(1.hours)
+            )
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `canShareLiveLocation is true in live timeline`() = runTest {
+        val shareLocationPresenter = createShareLocationPresenter(
+            timelineMode = Timeline.Mode.Live,
+        )
+        shareLocationPresenter.test {
+            val state = awaitFirstItem()
+            assertThat(state.canShareLiveLocation).isTrue()
+        }
+    }
+
+    @Test
+    fun `canShareLiveLocation is false in thread timeline`() = runTest {
+        val shareLocationPresenter = createShareLocationPresenter(
+            timelineMode = Timeline.Mode.Thread(A_THREAD_ID),
+        )
+        shareLocationPresenter.test {
+            val state = awaitFirstItem()
+            assertThat(state.canShareLiveLocation).isFalse()
+        }
+    }
+
+    private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
+        skipItems(2)
+        return awaitItem()
+    }
 }
+
+private fun createLiveLocationStore(
+    sessionId: SessionId = A_SESSION_ID,
+    preferenceDataStoreFactory: PreferenceDataStoreFactory = FakePreferenceDataStoreFactory(),
+): LiveLocationStore {
+    return LiveLocationStore(
+        preferenceDataStoreFactory = preferenceDataStoreFactory,
+        sessionId = sessionId,
+    )
+}
+
+private fun createFailingLiveLocationStore(sessionId: SessionId = A_SESSION_ID): LiveLocationStore {
+    val failingPreferenceDataStoreFactory = object : PreferenceDataStoreFactory {
+        override fun create(name: String): DataStore<Preferences> = object : DataStore<Preferences> {
+            override val data: Flow<Preferences> = flowOf(emptyPreferences())
+
+            override suspend fun updateData(transform: suspend (t: Preferences) -> Preferences): Preferences {
+                error("Failed to update preferences")
+            }
+        }
+    }
+    return createLiveLocationStore(
+        sessionId = sessionId,
+        preferenceDataStoreFactory = failingPreferenceDataStoreFactory,
+    )
+}
+
+private fun grantedSendLiveLocationPermissions(): FakeRoomPermissions = FakeRoomPermissions(
+    canSendState = { it is StateEventType.BeaconInfo },
+    canSendMessage = { it is MessageEventType.Beacon }
+)
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationViewTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationViewTest.kt
index 317fbf8fed..c53e463280 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationViewTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/share/ShareLocationViewTest.kt
@@ -5,16 +5,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.location.impl.share
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -23,130 +25,155 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ShareLocationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ShareLocationViewTest : RobolectricTest() {
     @Test
-    fun `test back action`() {
+    fun `test back action`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setShareLocationView(
+            setShareLocationView(
                 state = aShareLocationState(
                     eventSink = eventsRecorder
                 ),
                 navigateUp = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `test fab click`() {
+    fun `test fab click`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.onNodeWithTag(TestTags.floatingActionButton.value).performClick()
+        onNodeWithTag(TestTags.floatingActionButton.value).performClick()
         eventsRecorder.assertSingle(ShareLocationEvent.StartTrackingUserLocation)
     }
 
     @Test
-    fun `when permission denied is displayed user can open the settings`() {
+    fun `when permission denied is displayed user can open the settings`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionDenied),
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShareLocationEvent.OpenAppSettings)
     }
 
     @Test
-    fun `when permission denied is displayed user can close the dialog`() {
+    fun `when permission denied is displayed user can close the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionDenied),
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShareLocationEvent.DismissDialog)
     }
 
     @Test
-    fun `when permission rationale is displayed user can request permissions`() {
+    fun `when permission rationale is displayed user can request permissions`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionRationale),
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShareLocationEvent.RequestPermissions)
     }
 
     @Test
-    fun `when permission rationale is displayed user can close the dialog`() {
+    fun `when permission rationale is displayed user can close the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.PermissionRationale),
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShareLocationEvent.DismissDialog)
     }
 
     @Test
-    fun `when location service disabled is displayed user can open location settings`() {
+    fun `when location service disabled is displayed user can open location settings`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.LocationServiceDisabled),
-                hasLocationPermission = true,
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShareLocationEvent.OpenLocationSettings)
     }
 
     @Test
-    fun `when location service disabled is displayed user can close the dialog`() {
+    fun `when location service disabled is displayed user can close the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShareLocationEvent>()
-        rule.setShareLocationView(
+        setShareLocationView(
             aShareLocationState(
                 dialogState = ShareLocationState.Dialog.Constraints(LocationConstraintsDialogState.LocationServiceDisabled),
-                hasLocationPermission = true,
                 eventSink = eventsRecorder
             ),
             navigateUp = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertSingle(ShareLocationEvent.DismissDialog)
+    }
+
+    @Test
+    fun `when disclaimer is displayed user can accept`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<ShareLocationEvent>()
+        setShareLocationView(
+            aShareLocationState(
+                dialogState = ShareLocationState.Dialog.LiveLocationDisclaimer,
+                eventSink = eventsRecorder,
+                canShareLiveLocation = true,
+            ),
+            navigateUp = EnsureNeverCalled(),
+        )
+
+        clickOn(CommonStrings.action_accept)
+        eventsRecorder.assertSingle(ShareLocationEvent.AcceptLiveLocationDisclaimer)
+    }
+
+    @Test
+    fun `when disclaimer is displayed user can decline`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<ShareLocationEvent>()
+        setShareLocationView(
+            aShareLocationState(
+                dialogState = ShareLocationState.Dialog.LiveLocationDisclaimer,
+                eventSink = eventsRecorder,
+                canShareLiveLocation = true,
+            ),
+            navigateUp = EnsureNeverCalled(),
+        )
+
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertSingle(ShareLocationEvent.DismissDialog)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setShareLocationView(
+private fun AndroidComposeUiTest<ComponentActivity>.setShareLocationView(
     state: ShareLocationState,
     navigateUp: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
index 451531fc7e..23b7e9bf4d 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
@@ -14,11 +14,15 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.api.ShowLocationEntryPoint
 import io.element.android.features.location.api.ShowLocationMode
+import io.element.android.features.location.impl.common.FakeUserLocationStateFactory
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
 import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.node.TestParentNode
@@ -33,6 +37,7 @@ class DefaultShowLocationEntryPointTest {
     fun `test node builder`() {
         val entryPoint = DefaultShowLocationEntryPoint()
         val parentNode = TestParentNode.create { buildContext, plugins ->
+            val joinedRoom = FakeJoinedRoom()
             ShowLocationNode(
                 buildContext = buildContext,
                 plugins = plugins,
@@ -43,7 +48,11 @@ class DefaultShowLocationEntryPointTest {
                         locationActions = FakeLocationActions(),
                         buildMeta = aBuildMeta(),
                         dateFormatter = FakeDateFormatter(),
-                        stringProvider = FakeStringProvider()
+                        stringProvider = FakeStringProvider(),
+                        joinedRoom = joinedRoom,
+                        client = FakeMatrixClient(),
+                        liveLocationShareManager = FakeActiveLiveLocationShareManager(),
+                        userLocationStateFactory = FakeUserLocationStateFactory(),
                     )
                 },
                 analyticsService = FakeAnalyticsService(),
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparatorTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparatorTest.kt
new file mode 100644
index 0000000000..0b8e04abf8
--- /dev/null
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/LiveLocationShareComparatorTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.show
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.room.location.aLiveLocationShare
+import org.junit.Test
+
+class LiveLocationShareComparatorTest {
+    private val currentUser = UserId("@me:matrix.org")
+    private val comparator = LiveLocationShareComparator(currentUser)
+
+    @Test
+    fun `compare returns zero when comparing the same current user share`() {
+        val share = aLiveLocationShare(userId = currentUser, startTimestamp = 123L)
+
+        val result = comparator.compare(share, share)
+
+        assertThat(result).isEqualTo(0)
+    }
+
+    @Test
+    fun `compare orders current user share before another user share`() {
+        val otherShare = aLiveLocationShare(userId = UserId("@alice:matrix.org"), startTimestamp = 200L)
+        val currentUserShare = aLiveLocationShare(userId = currentUser, startTimestamp = 100L)
+
+        val sortedShares = listOf(otherShare, currentUserShare).sortedWith(comparator)
+
+        assertThat(sortedShares).containsExactly(currentUserShare, otherShare).inOrder()
+    }
+
+    @Test
+    fun `compare orders current user shares by newest start timestamp first`() {
+        val newerShare = aLiveLocationShare(userId = currentUser, startTimestamp = 200L)
+        val olderShare = aLiveLocationShare(userId = currentUser, startTimestamp = 100L)
+
+        val sortedShares = listOf(olderShare, newerShare).sortedWith(comparator)
+
+        assertThat(sortedShares).containsExactly(newerShare, olderShare).inOrder()
+    }
+
+    @Test
+    fun `compare orders non current user shares by newest start timestamp first`() {
+        val newerShare = aLiveLocationShare(userId = UserId("@alice:matrix.org"), startTimestamp = 200L)
+        val olderShare = aLiveLocationShare(userId = UserId("@bob:matrix.org"), startTimestamp = 100L)
+
+        val sortedShares = listOf(olderShare, newerShare).sortedWith(comparator)
+
+        assertThat(sortedShares).containsExactly(newerShare, olderShare).inOrder()
+    }
+}
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
index 931dd55cea..b579a79e4f 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
@@ -15,22 +15,35 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.api.ShowLocationMode
 import io.element.android.features.location.impl.aPermissionsState
+import io.element.android.features.location.impl.common.FakeUserLocationStateFactory
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
 import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
+import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.location.AssetType
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.location.aLiveLocationShare
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
+import kotlin.time.Duration.Companion.hours
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class ShowLocationPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
@@ -51,58 +64,35 @@ class ShowLocationPresenterTest {
             assetType = null,
         ),
         locationActions: FakeLocationActions = fakeLocationActions,
+        joinedRoom: JoinedRoom = FakeJoinedRoom(),
+        client: MatrixClient = FakeMatrixClient(),
+        liveLocationShareManager: FakeActiveLiveLocationShareManager = FakeActiveLiveLocationShareManager(),
     ) = ShowLocationPresenter(
         mode = mode,
         permissionsPresenterFactory = { fakePermissionsPresenter },
         locationActions = locationActions,
         buildMeta = fakeBuildMeta,
         dateFormatter = fakeDateFormatter,
-        stringProvider = FakeStringProvider()
+        stringProvider = FakeStringProvider(),
+        joinedRoom = joinedRoom,
+        client = client,
+        liveLocationShareManager = liveLocationShareManager,
+        userLocationStateFactory = FakeUserLocationStateFactory(),
     )
 
     @Test
-    fun `emits initial state with no location permission`() = runTest {
-        fakePermissionsPresenter.givenState(
-            aPermissionsState(
-                permissions = PermissionsState.Permissions.NoneGranted,
-                shouldShowRationale = false,
+    fun `present - non-null customMapStyleUrl`() = runTest {
+        val shareLocationPresenter = createShowLocationPresenter(
+            client = FakeMatrixClient(
+                sessionId = A_USER_ID,
+                getMapStyleUrlResult = { Result.success("aUrl") },
             )
         )
-
-        val presenter = createShowLocationPresenter()
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isFalse()
-            assertThat(initialState.isTrackMyLocation).isFalse()
-        }
-    }
-
-    @Test
-    fun `emits initial state location permission denied once`() = runTest {
-        fakePermissionsPresenter.givenState(
-            aPermissionsState(
-                permissions = PermissionsState.Permissions.NoneGranted,
-                shouldShowRationale = true,
-            )
-        )
-
-        val presenter = createShowLocationPresenter()
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isFalse()
-            assertThat(initialState.isTrackMyLocation).isFalse()
-        }
-    }
-
-    @Test
-    fun `emits initial state with location permission`() = runTest {
-        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
-
-        val presenter = createShowLocationPresenter()
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isTrue()
-            assertThat(initialState.isTrackMyLocation).isFalse()
+        shareLocationPresenter.test {
+            val state = awaitItem()
+            assertThat(state.customMapStyleUrl.isLoading()).isTrue()
+            val finalState = awaitItem()
+            assertThat(finalState.customMapStyleUrl.dataOrNull()).isEqualTo("aUrl")
         }
     }
 
@@ -112,9 +102,8 @@ class ShowLocationPresenterTest {
 
         val presenter = createShowLocationPresenter()
         presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isTrue()
-            assertThat(initialState.isTrackMyLocation).isFalse()
+            assertThat(awaitItem().isTrackMyLocation).isFalse()
+            assertThat(awaitItem().isTrackMyLocation).isTrue()
         }
     }
 
@@ -133,18 +122,18 @@ class ShowLocationPresenterTest {
     fun `centers on user location`() = runTest {
         fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
 
-        val presenter = createShowLocationPresenter()
+        val presenter = createShowLocationPresenter(
+            client = FakeMatrixClient(
+                getMapStyleUrlResult = { Result.success(null) }
+            )
+        )
         presenter.test {
             val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isTrue()
             assertThat(initialState.isTrackMyLocation).isFalse()
 
             initialState.eventSink(ShowLocationEvent.TrackMyLocation(true))
             val trackMyLocationState = awaitItem()
 
-            delay(1)
-
-            assertThat(trackMyLocationState.hasLocationPermission).isTrue()
             assertThat(trackMyLocationState.isTrackMyLocation).isTrue()
 
             // Swipe the map to switch mode
@@ -152,7 +141,6 @@ class ShowLocationPresenterTest {
             val trackLocationDisabledState = awaitItem()
             assertThat(trackLocationDisabledState.dialogState).isEqualTo(LocationConstraintsDialogState.None)
             assertThat(trackLocationDisabledState.isTrackMyLocation).isFalse()
-            assertThat(trackLocationDisabledState.hasLocationPermission).isTrue()
         }
     }
 
@@ -175,14 +163,12 @@ class ShowLocationPresenterTest {
             val trackLocationState = awaitItem()
             assertThat(trackLocationState.dialogState).isEqualTo(LocationConstraintsDialogState.PermissionRationale)
             assertThat(trackLocationState.isTrackMyLocation).isFalse()
-            assertThat(trackLocationState.hasLocationPermission).isFalse()
 
             // Dismiss the dialog
             initialState.eventSink(ShowLocationEvent.DismissDialog)
             val dialogDismissedState = awaitItem()
             assertThat(dialogDismissedState.dialogState).isEqualTo(LocationConstraintsDialogState.None)
             assertThat(dialogDismissedState.isTrackMyLocation).isFalse()
-            assertThat(dialogDismissedState.hasLocationPermission).isFalse()
         }
     }
 
@@ -195,7 +181,7 @@ class ShowLocationPresenterTest {
             )
         )
         val presenter = createShowLocationPresenter()
-       presenter.test {
+        presenter.test {
             // Skip initial state
             val initialState = awaitItem()
 
@@ -204,7 +190,6 @@ class ShowLocationPresenterTest {
             val trackLocationState = awaitItem()
             assertThat(trackLocationState.dialogState).isEqualTo(LocationConstraintsDialogState.PermissionRationale)
             assertThat(trackLocationState.isTrackMyLocation).isFalse()
-            assertThat(trackLocationState.hasLocationPermission).isFalse()
 
             // Continue the dialog sends permission request to the permissions presenter
             trackLocationState.eventSink(ShowLocationEvent.RequestPermissions)
@@ -212,12 +197,34 @@ class ShowLocationPresenterTest {
         }
     }
 
+    @Test
+    fun `TrackMyLocation with permissions not yet requested triggers permission request`() = runTest {
+        fakePermissionsPresenter.givenState(
+            aPermissionsState(
+                permissions = PermissionsState.Permissions.NoneGranted,
+                shouldShowRationale = false,
+                permissionsRequested = false,
+            )
+        )
+
+        val presenter = createShowLocationPresenter()
+        presenter.test {
+            val initialState = awaitItem()
+
+            initialState.eventSink(ShowLocationEvent.TrackMyLocation(true))
+
+            assertThat(fakePermissionsPresenter.events).contains(PermissionsEvents.RequestPermissions)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     @Test
     fun `permission denied dialog dismiss`() = runTest {
         fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
+                permissionsRequested = true,
             )
         )
 
@@ -231,14 +238,12 @@ class ShowLocationPresenterTest {
             val trackLocationState = awaitItem()
             assertThat(trackLocationState.dialogState).isEqualTo(LocationConstraintsDialogState.PermissionDenied)
             assertThat(trackLocationState.isTrackMyLocation).isFalse()
-            assertThat(trackLocationState.hasLocationPermission).isFalse()
 
             // Dismiss the dialog
             initialState.eventSink(ShowLocationEvent.DismissDialog)
             val dialogDismissedState = awaitItem()
             assertThat(dialogDismissedState.dialogState).isEqualTo(LocationConstraintsDialogState.None)
             assertThat(dialogDismissedState.isTrackMyLocation).isFalse()
-            assertThat(dialogDismissedState.hasLocationPermission).isFalse()
         }
     }
 
@@ -248,6 +253,7 @@ class ShowLocationPresenterTest {
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
+                permissionsRequested = true,
             )
         )
 
@@ -286,7 +292,6 @@ class ShowLocationPresenterTest {
         val presenter = createShowLocationPresenter()
         presenter.test {
             val initialState = awaitItem()
-            assertThat(initialState.hasLocationPermission).isTrue()
 
             // Try to track location when location services are disabled
             initialState.eventSink(ShowLocationEvent.TrackMyLocation(true))
@@ -318,4 +323,186 @@ class ShowLocationPresenterTest {
             assertThat(fakeLocationActions.openLocationSettingsInvocationsCount).isEqualTo(1)
         }
     }
+
+    @Test
+    fun `live mode emits empty location shares initially`() = runTest {
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = UserId("@alice:matrix.org")),
+            joinedRoom = FakeJoinedRoom(),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.locationShares).isEmpty()
+            assertThat(initialState.isSheetDraggable).isFalse()
+        }
+    }
+
+    @Test
+    fun `live mode collects live shares from room`() = runTest {
+        val userId = UserId("@bob:matrix.org")
+        val liveSharesFlow = MutableStateFlow(
+            listOf(
+                aLiveLocationShare(userId = userId)
+            )
+        )
+        val fakeRoom = FakeJoinedRoom(liveLocationSharesFlow = liveSharesFlow)
+
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = userId),
+            joinedRoom = fakeRoom,
+        )
+        presenter.test {
+            // Skip initial empty state from collectAsState(initial = emptyList())
+            skipItems(1)
+            val state = awaitItem()
+
+            assertThat(state.locationShares).hasSize(1)
+            val item = state.locationShares.first()
+            assertThat(item.userId).isEqualTo(userId)
+            assertThat(item.location.lat).isEqualTo(48.8584)
+            assertThat(item.location.lon).isEqualTo(2.2945)
+            assertThat(item.isLive).isTrue()
+            assertThat(state.isSheetDraggable).isTrue()
+        }
+    }
+
+    @Test
+    fun `live mode handles invalid geo uri gracefully`() = runTest {
+        val validUserId = UserId("@alice:matrix.org")
+        val invalidUserId = UserId("@bob:matrix.org")
+        val liveSharesFlow = MutableStateFlow(
+            listOf(
+                aLiveLocationShare(userId = validUserId),
+                aLiveLocationShare(userId = invalidUserId, geoUri = "invalid-geo-uri"),
+            )
+        )
+        val fakeRoom = FakeJoinedRoom(liveLocationSharesFlow = liveSharesFlow)
+
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = validUserId),
+            joinedRoom = fakeRoom,
+        )
+        presenter.test {
+            // Skip initial empty state from collectAsState(initial = emptyList())
+            skipItems(1)
+            val state = awaitItem()
+
+            // Only the valid location share should be present
+            assertThat(state.locationShares).hasSize(1)
+            assertThat(state.locationShares.first().userId).isEqualTo(validUserId)
+        }
+    }
+
+    @Test
+    fun `live mode updates when shares change`() = runTest {
+        val userId = UserId("@bob:matrix.org")
+        val liveSharesFlow = MutableStateFlow(emptyList<LiveLocationShare>())
+        val fakeRoom = FakeJoinedRoom(liveLocationSharesFlow = liveSharesFlow)
+
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = userId),
+            joinedRoom = fakeRoom,
+        )
+        presenter.test {
+            // Initial state is empty
+            val initialState = awaitItem()
+            assertThat(initialState.locationShares).isEmpty()
+
+            // Emit a new live share
+            liveSharesFlow.value = listOf(
+                aLiveLocationShare(userId = userId)
+            )
+
+            val updatedState = awaitItem()
+            assertThat(updatedState.locationShares).hasSize(1)
+            assertThat(updatedState.locationShares.first().userId).isEqualTo(userId)
+        }
+    }
+
+    @Test
+    fun `static mode emits location share with correct data`() = runTest {
+        val senderId = UserId("@alice:matrix.org")
+        val senderName = "Alice"
+        val avatarUrl = "https://example.com/avatar.png"
+        val mode = ShowLocationMode.Static(
+            location = location,
+            senderName = senderName,
+            senderId = senderId,
+            senderAvatarUrl = avatarUrl,
+            timestamp = 0L,
+            assetType = AssetType.SENDER,
+        )
+
+        val presenter = createShowLocationPresenter(mode = mode)
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.locationShares).hasSize(1)
+
+            val item = state.locationShares.first()
+            assertThat(item.userId).isEqualTo(senderId)
+            assertThat(item.displayName).isEqualTo(senderName)
+            assertThat(item.location).isEqualTo(location)
+            assertThat(item.isLive).isFalse()
+            assertThat(item.assetType).isEqualTo(AssetType.SENDER)
+            assertThat(item.avatarData.id).isEqualTo(senderId.value)
+            assertThat(item.avatarData.name).isEqualTo(senderName)
+            assertThat(item.avatarData.url).isEqualTo(avatarUrl)
+        }
+    }
+
+    @Test
+    fun `static mode has non-draggable sheet`() = runTest {
+        val presenter = createShowLocationPresenter()
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.isSheetDraggable).isFalse()
+        }
+    }
+
+    @Test
+    fun `static mode never hides user location puck`() = runTest {
+        val presenter = createShowLocationPresenter()
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.hideUserLocationPuck).isFalse()
+        }
+    }
+
+    @Test
+    fun `live mode does not hide user location puck when not sharing`() = runTest {
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = A_USER_ID),
+        )
+        presenter.test {
+            val state = awaitItem()
+            assertThat(state.hideUserLocationPuck).isFalse()
+        }
+    }
+
+    @Test
+    fun `live mode user location state uses own share position when sharing`() = runTest {
+        val ownLiveLocationShare = aLiveLocationShare()
+        val fakeRoom = FakeJoinedRoom(
+            liveLocationSharesFlow = MutableStateFlow(listOf(ownLiveLocationShare))
+        )
+        val manager = FakeActiveLiveLocationShareManager(
+            startShareLambda = { _, _ -> Result.success(Unit) }
+        )
+        manager.startShare(fakeRoom.roomId, 1.hours)
+
+        val presenter = createShowLocationPresenter(
+            mode = ShowLocationMode.Live(senderId = A_USER_ID),
+            joinedRoom = fakeRoom,
+            liveLocationShareManager = manager,
+        )
+        val ownLocation = ownLiveLocationShare.lastLocation?.geoUri?.let(Location::fromGeoUri)
+        presenter.test {
+            skipItems(1)
+            val state = awaitItem()
+            assertThat(state.hideUserLocationPuck).isTrue()
+            val location = requireNotNull(state.userLocationState.location)
+            assertThat(location.position.value.latitude).isEqualTo(ownLocation?.lat)
+            assertThat(location.position.value.longitude).isEqualTo(ownLocation?.lon)
+        }
+    }
 }
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
index fecbbdbf89..053c26c179 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
@@ -6,17 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.location.impl.show
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.common.ui.LocationConstraintsDialogState
 import io.element.android.libraries.testtags.TestTags
@@ -26,115 +28,110 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ShowLocationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ShowLocationViewTest : RobolectricTest() {
     @Test
-    fun `test back action`() {
+    fun `test back action`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setShowLocationView(
+            setShowLocationView(
                 state = aShowLocationState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `test share action`() {
+    fun `test share action`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        val shareContentDescription = rule.activity.getString(CommonStrings.action_share)
-        rule.onNodeWithContentDescription(shareContentDescription).performClick()
+        val shareContentDescription = activity!!.getString(CommonStrings.action_share)
+        onNodeWithContentDescription(shareContentDescription).performClick()
         // The default aStaticLocationMode uses Location(1.23, 2.34, 4f)
         eventsRecorder.assertSingle(ShowLocationEvent.Share(Location(1.23, 2.34, 4f)))
     }
 
     @Test
-    fun `test fab click`() {
+    fun `test fab click`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        rule.onNodeWithTag(TestTags.floatingActionButton.value).performClick()
+        onNodeWithTag(TestTags.floatingActionButton.value).performClick()
         eventsRecorder.assertSingle(ShowLocationEvent.TrackMyLocation(true))
     }
 
     @Test
-    fun `when permission denied is displayed user can open the settings`() {
+    fun `when permission denied is displayed user can open the settings`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.PermissionDenied,
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvent.OpenAppSettings)
     }
 
     @Test
-    fun `when permission denied is displayed user can close the dialog`() {
+    fun `when permission denied is displayed user can close the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.PermissionDenied,
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvent.DismissDialog)
     }
 
     @Test
-    fun `when permission rationale is displayed user can request permissions`() {
+    fun `when permission rationale is displayed user can request permissions`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.PermissionRationale,
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvent.RequestPermissions)
     }
 
     @Test
-    fun `when permission rationale is displayed user can close the dialog`() {
+    fun `when permission rationale is displayed user can close the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ShowLocationEvent>()
-        rule.setShowLocationView(
+        setShowLocationView(
             aShowLocationState(
                 constraintsDialogState = LocationConstraintsDialogState.PermissionRationale,
                 eventSink = eventsRecorder
             ),
             onBackClick = EnsureNeverCalled(),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvent.DismissDialog)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setShowLocationView(
+private fun AndroidComposeUiTest<ComponentActivity>.setShowLocationView(
     state: ShowLocationState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/store/LiveLocationStoreTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/store/LiveLocationStoreTest.kt
new file mode 100644
index 0000000000..c42469e705
--- /dev/null
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/store/LiveLocationStoreTest.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.impl.store
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.mutablePreferencesOf
+import androidx.datastore.preferences.core.stringPreferencesKey
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.impl.live.LiveLocationStore
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
+import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import kotlin.time.Instant
+
+class LiveLocationStoreTest {
+    private val preferenceDataStoreFactory = FakePreferenceDataStoreFactory()
+
+    @Test
+    fun `disclaimer defaults to false`() = runTest {
+        val store = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = A_SESSION_ID,
+        )
+
+        assertThat(store.hasAcceptedLiveLocationDisclaimer()).isFalse()
+    }
+
+    @Test
+    fun `disclaimer acceptance is isolated per session`() = runTest {
+        val firstStore = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = A_SESSION_ID,
+        )
+        val secondStore = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = SessionId("@other:server"),
+        )
+
+        firstStore.setAcceptedLiveLocationDisclaimer().getOrThrow()
+
+        assertThat(firstStore.hasAcceptedLiveLocationDisclaimer()).isTrue()
+        assertThat(secondStore.hasAcceptedLiveLocationDisclaimer()).isFalse()
+    }
+
+    @Test
+    fun `can persist and read expiry per room`() = runTest {
+        val store = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = A_SESSION_ID,
+        )
+
+        store.setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(1_000L)).getOrThrow()
+
+        assertThat(store.getLiveLocationExpiries())
+            .containsExactly(A_ROOM_ID, Instant.fromEpochMilliseconds(1_000L))
+    }
+
+    @Test
+    fun `removing one expiry leaves others untouched`() = runTest {
+        val otherRoomId = RoomId("!other:server")
+        val store = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = A_SESSION_ID,
+        )
+
+        store.setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(1_000L)).getOrThrow()
+        store.setLiveLocationExpiry(otherRoomId, Instant.fromEpochMilliseconds(2_000L)).getOrThrow()
+        store.removeLiveLocationExpiry(A_ROOM_ID).getOrThrow()
+
+        assertThat(store.getLiveLocationExpiries())
+            .containsExactly(otherRoomId, Instant.fromEpochMilliseconds(2_000L))
+    }
+
+    @Test
+    fun `setting expiry twice replaces the existing room value`() = runTest {
+        val store = LiveLocationStore(
+            preferenceDataStoreFactory = preferenceDataStoreFactory,
+            sessionId = A_SESSION_ID,
+        )
+
+        store.setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(1_000L)).getOrThrow()
+        store.setLiveLocationExpiry(A_ROOM_ID, Instant.fromEpochMilliseconds(2_000L)).getOrThrow()
+
+        assertThat(store.getLiveLocationExpiries())
+            .containsExactly(A_ROOM_ID, Instant.fromEpochMilliseconds(2_000L))
+    }
+
+    @Test
+    fun `malformed expiry payload returns empty map`() = runTest {
+        val store = LiveLocationStore(
+            preferenceDataStoreFactory = createMalformedExpiryPreferenceDataStoreFactory(),
+            sessionId = A_SESSION_ID,
+        )
+
+        assertThat(store.getLiveLocationExpiries()).isEmpty()
+    }
+
+    private fun createMalformedExpiryPreferenceDataStoreFactory(): PreferenceDataStoreFactory {
+        return object : PreferenceDataStoreFactory {
+            override fun create(name: String): DataStore<Preferences> {
+                var preferences: Preferences = mutablePreferencesOf(
+                    stringPreferencesKey("live_location_expiries") to "not valid"
+                )
+                return object : DataStore<Preferences> {
+                    override val data: Flow<Preferences>
+                        get() = flowOf(preferences)
+
+                    override suspend fun updateData(transform: suspend (t: Preferences) -> Preferences): Preferences {
+                        preferences = transform(preferences)
+                        return preferences
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/features/location/test/build.gradle.kts b/features/location/test/build.gradle.kts
index f84e8ba772..e51737d40c 100644
--- a/features/location/test/build.gradle.kts
+++ b/features/location/test/build.gradle.kts
@@ -16,7 +16,7 @@ android {
 
 dependencies {
     api(projects.features.location.api)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
-    implementation(libs.appyx.core)
     implementation(projects.tests.testutils)
 }
diff --git a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeActiveLiveLocationShareManager.kt b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeActiveLiveLocationShareManager.kt
new file mode 100644
index 0000000000..255c181ac1
--- /dev/null
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeActiveLiveLocationShareManager.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.location.test
+
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlin.time.Duration
+
+class FakeActiveLiveLocationShareManager(
+    val setupLambda: () -> Unit = { lambdaError() },
+    val startShareLambda: (roomId: RoomId, duration: Duration) -> Result<Unit> = { _, _ -> lambdaError() },
+    val stopShareLambda: (roomId: RoomId) -> Result<Unit> = { _ -> lambdaError() },
+) : ActiveLiveLocationShareManager {
+    private val _sharingRoomIds = MutableStateFlow(emptySet<RoomId>())
+    override val sharingRoomIds: StateFlow<Set<RoomId>> = _sharingRoomIds
+
+    override suspend fun setup() {
+        setupLambda()
+    }
+
+    override suspend fun startShare(roomId: RoomId, duration: Duration): Result<Unit> = simulateLongTask {
+        startShareLambda(roomId, duration).onSuccess {
+            _sharingRoomIds.update {
+                it + roomId
+            }
+        }
+    }
+
+    override suspend fun stopShare(roomId: RoomId): Result<Unit> = simulateLongTask {
+        stopShareLambda(roomId).onSuccess {
+            _sharingRoomIds.update {
+                it - roomId
+            }
+        }
+    }
+}
diff --git a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/DeviceUnlockEntryPoint.kt b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/DeviceUnlockEntryPoint.kt
new file mode 100644
index 0000000000..d67668caf1
--- /dev/null
+++ b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/DeviceUnlockEntryPoint.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+/**
+ * An entry point for features that want to lock the screen and require
+ * the user to unlock it before they can interact with the app.
+ * - if the system lock is available, it will be used to unlock the screen.
+ * - if the system lock is not available, but app lock is available, it will be used to unlock the screen.
+ * - if neither is available, the screen will be unlocked immediately.
+ *
+ * The Node provided by [createNode] has to be added as a PermanentChild.
+ */
+interface DeviceUnlockEntryPoint : FeatureEntryPoint {
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node
+
+    fun requestUnlock(callback: Callback)
+
+    interface Callback {
+        fun onCancel()
+        fun onUnlock()
+    }
+}
diff --git a/features/lockscreen/impl/build.gradle.kts b/features/lockscreen/impl/build.gradle.kts
index 63aec590de..414b4b5909 100644
--- a/features/lockscreen/impl/build.gradle.kts
+++ b/features/lockscreen/impl/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
     implementation(libs.androidx.biometric)
 
     testCommonDependencies(libs, true)
+    testImplementation(projects.features.lockscreen.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.cryptography.test)
     testImplementation(projects.libraries.cryptography.impl)
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultDeviceUnlockEntryPoint.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultDeviceUnlockEntryPoint.kt
new file mode 100644
index 0000000000..f4b78968f8
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultDeviceUnlockEntryPoint.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.lockscreen.api.DeviceUnlockEntryPoint
+import io.element.android.features.lockscreen.impl.device.DeviceUnlockCallbackHolder
+import io.element.android.features.lockscreen.impl.device.DeviceUnlockNode
+import io.element.android.libraries.architecture.createNode
+
+@ContributesBinding(AppScope::class)
+class DefaultDeviceUnlockEntryPoint(
+    private val deviceUnlockCallbackHolder: DeviceUnlockCallbackHolder,
+) : DeviceUnlockEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node {
+        return parentNode.createNode<DeviceUnlockNode>(
+            buildContext = buildContext,
+        )
+    }
+
+    override fun requestUnlock(callback: DeviceUnlockEntryPoint.Callback) {
+        deviceUnlockCallbackHolder.requestUnlock(callback)
+    }
+}
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
index 7ac42feda6..49d299b3f9 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenService.kt
@@ -43,7 +43,7 @@ class DefaultLockScreenService(
     private val coroutineScope: CoroutineScope,
     private val sessionObserver: SessionObserver,
     private val appForegroundStateService: AppForegroundStateService,
-    biometricAuthenticatorManager: BiometricAuthenticatorManager,
+    private val biometricAuthenticatorManager: BiometricAuthenticatorManager,
 ) : LockScreenService {
     private val _lockState = MutableStateFlow<LockScreenLockState>(LockScreenLockState.Unlocked)
     override val lockState: StateFlow<LockScreenLockState> = _lockState
@@ -81,6 +81,7 @@ class DefaultLockScreenService(
             override suspend fun onSessionDeleted(userId: String, wasLastSession: Boolean) {
                 if (wasLastSession) {
                     pinCodeManager.deletePinCode()
+                    biometricAuthenticatorManager.disable()
                 }
             }
         })
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticator.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticator.kt
index a96c713ff2..74d36b0834 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticator.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticator.kt
@@ -36,13 +36,13 @@ interface BiometricAuthenticator {
     }
 
     val isActive: Boolean
-    fun setup()
+    suspend fun setup()
     suspend fun authenticate(): AuthenticationResult
 }
 
 class NoopBiometricAuthentication : BiometricAuthenticator {
     override val isActive: Boolean = false
-    override fun setup() = Unit
+    override suspend fun setup() = Unit
     override suspend fun authenticate() = BiometricAuthenticator.AuthenticationResult.Failure()
 }
 
@@ -58,7 +58,8 @@ class DefaultBiometricAuthentication(
 
     private var cryptoObject: CryptoObject? = null
 
-    override fun setup() {
+    override suspend fun setup() {
+        if (cryptoObject != null) return
         try {
             val secretKey = ensureKey()
             val cipher = encryptionDecryptionService.createEncryptionCipher(secretKey)
@@ -86,7 +87,7 @@ class DefaultBiometricAuthentication(
     }
 
     @Throws(KeyPermanentlyInvalidatedException::class)
-    private fun ensureKey() = secretKeyRepository.getOrCreateKey(keyAlias, true).also {
+    private suspend fun ensureKey() = secretKeyRepository.getOrCreateKey(keyAlias, true).also {
         encryptionDecryptionService.createEncryptionCipher(it)
     }
 }
@@ -109,7 +110,9 @@ private class AuthenticationCallback(
 
     override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
         super.onAuthenticationSucceeded(result)
-        if (result.cryptoObject?.cipher.isValid()) {
+        if (result.authenticationType == BiometricPrompt.AUTHENTICATION_RESULT_TYPE_BIOMETRIC &&
+            result.cryptoObject?.cipher.isValid() ||
+            result.authenticationType == BiometricPrompt.AUTHENTICATION_RESULT_TYPE_DEVICE_CREDENTIAL) {
             callbacks.forEach { it.onBiometricAuthenticationSuccess() }
             deferredAuthenticationResult.complete(BiometricAuthenticator.AuthenticationResult.Success)
         } else {
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticatorManager.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticatorManager.kt
index 9917845725..cccfa143b9 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticatorManager.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/BiometricAuthenticatorManager.kt
@@ -21,15 +21,31 @@ interface BiometricAuthenticatorManager {
      */
     val hasAvailableAuthenticator: Boolean
 
+    /**
+     * If the device is secured for example with a pin, a pattern, a password, or biometric.
+     */
+    val canUseDeviceUnlock: Boolean
+
     fun addCallback(callback: BiometricAuthenticator.Callback)
     fun removeCallback(callback: BiometricAuthenticator.Callback)
 
+    /**
+     * Disable using the biometric unlock feature and remove any data associated with it.
+     */
+    suspend fun disable()
+
     /**
      * Remember a biometric authenticator ready for unlocking the app.
      */
     @Composable
     fun rememberUnlockBiometricAuthenticator(): BiometricAuthenticator
 
+    /**
+     * Remember a biometric authenticator ready for unlocking the app, using the device settings.
+     */
+    @Composable
+    fun rememberUnlockDeviceBiometricAuthenticator(): BiometricAuthenticator
+
     /**
      * Remember a biometric authenticator ready for confirmation.
      */
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricAuthenticatorManager.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricAuthenticatorManager.kt
index 8bb044fd06..80ea43b44d 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricAuthenticatorManager.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/biometric/DefaultBiometricAuthenticatorManager.kt
@@ -35,6 +35,7 @@ import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import java.util.concurrent.CopyOnWriteArrayList
 
@@ -69,6 +70,12 @@ class DefaultBiometricAuthenticatorManager(
         get() = lockScreenConfig.isStrongBiometricsEnabled &&
             biometricManager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) == BiometricManager.BIOMETRIC_SUCCESS
 
+    /**
+     * Returns true if a device credential method (i.e.: pattern, pin) can be used.
+     */
+    private val canUseDeviceCredentialAuth: Boolean
+        get() = biometricManager.canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS
+
     /**
      * Returns true if any biometric method (weak or strong) can be used.
      */
@@ -78,12 +85,12 @@ class DefaultBiometricAuthenticatorManager(
     override val isDeviceSecured: Boolean
         get() = keyguardManager.isDeviceSecure
 
+    override val canUseDeviceUnlock: Boolean
+        get() = isDeviceSecured && (canUseWeakBiometricAuth || canUseStrongBiometricAuth || canUseDeviceCredentialAuth)
+
     private val internalCallback = object : DefaultBiometricUnlockCallback() {
         override fun onBiometricSetupError() {
-            coroutineScope.launch {
-                lockScreenStore.setIsBiometricUnlockAllowed(false)
-                secretKeyRepository.deleteKey(SECRET_KEY_ALIAS)
-            }
+            coroutineScope.launch { disable() }
         }
     }
 
@@ -102,6 +109,28 @@ class DefaultBiometricAuthenticatorManager(
             isAvailable = isAvailable,
             promptTitle = promptTitle,
             promptNegative = promptNegative,
+            forDeviceUnlock = false,
+        )
+    }
+
+    @Composable
+    override fun rememberUnlockDeviceBiometricAuthenticator(): BiometricAuthenticator {
+        val isAvailableTrigger by remember {
+            // Need to trigger the creation of BiometricAuthenticator twice, else the callback will not be ready.
+            // (the issue already exists in [rememberUnlockBiometricAuthenticator])
+            flowOf(false, true)
+        }.collectAsState(initial = false)
+        val lifecycleState by LocalLifecycleOwner.current.lifecycle.currentStateFlow.collectAsState()
+        val isAvailable by remember(lifecycleState) {
+            derivedStateOf { isAvailableTrigger && canUseDeviceUnlock }
+        }
+        val promptTitle = stringResource(id = R.string.screen_app_lock_biometric_unlock_title_android)
+        val promptNegative = null
+        return rememberBiometricAuthenticator(
+            isAvailable = isAvailable,
+            promptTitle = promptTitle,
+            promptNegative = promptNegative,
+            forDeviceUnlock = true,
         )
     }
 
@@ -117,14 +146,21 @@ class DefaultBiometricAuthenticatorManager(
             isAvailable = isAvailable,
             promptTitle = promptTitle,
             promptNegative = promptNegative,
+            forDeviceUnlock = false,
         )
     }
 
+    override suspend fun disable() {
+        lockScreenStore.setIsBiometricUnlockAllowed(false)
+        secretKeyRepository.deleteKey(SECRET_KEY_ALIAS)
+    }
+
     @Composable
     private fun rememberBiometricAuthenticator(
         isAvailable: Boolean,
         promptTitle: String,
-        promptNegative: String,
+        promptNegative: String?,
+        forDeviceUnlock: Boolean,
     ): BiometricAuthenticator {
         val activity = LocalContext.current.findFragmentActivity()
         return remember(isAvailable) {
@@ -134,11 +170,21 @@ class DefaultBiometricAuthenticatorManager(
                     canUseWeakBiometricAuth -> BiometricManager.Authenticators.BIOMETRIC_WEAK
                     else -> 0
                 }
-                val promptInfo = BiometricPrompt.PromptInfo.Builder().apply {
-                    setTitle(promptTitle)
-                    setNegativeButtonText(promptNegative)
-                    setAllowedAuthenticators(authenticators)
-                }.build()
+                val promptInfo = BiometricPrompt.PromptInfo.Builder()
+                    .setTitle(promptTitle)
+                    .apply {
+                        if (promptNegative != null) {
+                            setNegativeButtonText(promptNegative)
+                        }
+                        if (forDeviceUnlock) {
+                            setAllowedAuthenticators(
+                                authenticators or if (canUseDeviceCredentialAuth) BiometricManager.Authenticators.DEVICE_CREDENTIAL else 0
+                            )
+                        } else {
+                            setAllowedAuthenticators(authenticators)
+                        }
+                    }
+                    .build()
                 DefaultBiometricAuthentication(
                     activity = activity,
                     promptInfo = promptInfo,
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/components/PinEntryTextField.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/components/PinEntryTextField.kt
index 439c6aeaa7..28e005fd1d 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/components/PinEntryTextField.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/components/PinEntryTextField.kt
@@ -15,15 +15,23 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -32,6 +40,8 @@ import io.element.android.features.lockscreen.impl.pin.model.PinEntry
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.pinDigitBg
+import io.element.android.libraries.ui.strings.CommonPlurals
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun PinEntryTextField(
@@ -39,16 +49,25 @@ fun PinEntryTextField(
     isSecured: Boolean,
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
+    initialIsFocus: Boolean = false,
 ) {
+    var isFocused by remember { mutableStateOf(initialIsFocus) }
+    val filledCount = pinEntry.digits.count { it is PinDigit.Filled }
+    val pinFieldLabel = stringResource(CommonStrings.a11y_pin_field)
+    val digitsEnteredLabel = pluralStringResource(CommonPlurals.a11y_digits_entered, filledCount, filledCount)
     BasicTextField(
-        modifier = modifier,
+        modifier = modifier
+            .onFocusChanged { isFocused = it.isFocused }
+            .clearAndSetSemantics {
+                contentDescription = "$pinFieldLabel, $digitsEnteredLabel"
+            },
         value = pinEntry.toText(),
         onValueChange = {
             onValueChange(it)
         },
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
         decorationBox = {
-            PinEntryRow(pinEntry = pinEntry, isSecured = isSecured)
+            PinEntryRow(pinEntry = pinEntry, isSecured = isSecured, isFocused = isFocused)
         }
     )
 }
@@ -58,13 +77,19 @@ fun PinEntryTextField(
 private fun PinEntryRow(
     pinEntry: PinEntry,
     isSecured: Boolean,
+    isFocused: Boolean,
 ) {
     FlowRow(
         horizontalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.CenterHorizontally),
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
-        for (digit in pinEntry.digits) {
-            PinDigitView(digit = digit, isSecured = isSecured)
+        val focusedIndex = pinEntry.digits.indexOfFirst { it is PinDigit.Empty }
+        pinEntry.digits.forEachIndexed { index, digit ->
+            PinDigitView(
+                digit = digit,
+                isSecured = isSecured,
+                isFocused = isFocused && index == focusedIndex
+            )
         }
     }
 }
@@ -73,11 +98,16 @@ private fun PinEntryRow(
 private fun PinDigitView(
     digit: PinDigit,
     isSecured: Boolean,
+    isFocused: Boolean,
 ) {
     val shape = RoundedCornerShape(8.dp)
     val appearanceModifier = when (digit) {
         PinDigit.Empty -> {
-            Modifier.border(1.dp, ElementTheme.colors.iconPrimary, shape)
+            if (isFocused) {
+                Modifier.border(2.dp, ElementTheme.colors.borderFocused, shape)
+            } else {
+                Modifier.border(1.dp, ElementTheme.colors.iconPrimary, shape)
+            }
         }
         is PinDigit.Filled -> {
             Modifier.background(ElementTheme.colors.pinDigitBg, shape)
@@ -108,18 +138,19 @@ private fun PinDigitView(
 internal fun PinEntryTextFieldPreview() {
     ElementPreview {
         val pinEntry = PinEntry.createEmpty(4).fillWith("12")
-        Column {
-            PinEntryTextField(
-                pinEntry = pinEntry,
-                isSecured = true,
-                onValueChange = {},
-            )
-            Spacer(modifier = Modifier.size(16.dp))
-            PinEntryTextField(
-                pinEntry = pinEntry,
-                isSecured = false,
-                onValueChange = {},
-            )
+        Column(
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            listOf(true, false).forEach { isSecured ->
+                listOf(true, false).forEach { initialIsFocus ->
+                    PinEntryTextField(
+                        pinEntry = pinEntry,
+                        isSecured = isSecured,
+                        initialIsFocus = initialIsFocus,
+                        onValueChange = {},
+                    )
+                }
+            }
         }
     }
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockCallbackHolder.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockCallbackHolder.kt
new file mode 100644
index 0000000000..cf8b23d3f6
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockCallbackHolder.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.device
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.features.lockscreen.api.DeviceUnlockEntryPoint
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+@Inject
+@SingleIn(AppScope::class)
+class DeviceUnlockCallbackHolder {
+    private val _deviceUnlockCallback = MutableStateFlow<DeviceUnlockEntryPoint.Callback?>(null)
+    val deviceUnlockCallback: StateFlow<DeviceUnlockEntryPoint.Callback?> = _deviceUnlockCallback
+
+    fun requestUnlock(callback: DeviceUnlockEntryPoint.Callback) {
+        _deviceUnlockCallback.value = callback
+    }
+
+    fun onDone() {
+        _deviceUnlockCallback.value = null
+    }
+}
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockEvent.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockEvent.kt
new file mode 100644
index 0000000000..8b894875cb
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockEvent.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.device
+
+sealed interface DeviceUnlockEvent {
+    data object CancelPinCode : DeviceUnlockEvent
+}
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockNode.kt
new file mode 100644
index 0000000000..9b73239725
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockNode.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.device
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.lockscreen.impl.unlock.PinUnlockPresenter
+import io.element.android.features.lockscreen.impl.unlock.PinUnlockView
+import io.element.android.libraries.di.SessionScope
+
+@ContributesNode(SessionScope::class)
+@AssistedInject
+class DeviceUnlockNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: DeviceUnlockPresenter,
+    private val pinUnlockPresenterFactory: PinUnlockPresenter.Factory,
+) : Node(buildContext, plugins = plugins) {
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        if (state.showApplicationPinCode) {
+            val pinUnlockPresenter = remember {
+                pinUnlockPresenterFactory.create(forDeviceUnlock = true)
+            }
+            val pinState = pinUnlockPresenter.present()
+            PinUnlockView(
+                state = pinState,
+                isInAppUnlock = true,
+                onCancel = {
+                    state.eventSink(DeviceUnlockEvent.CancelPinCode)
+                },
+                modifier = modifier,
+            )
+        }
+    }
+}
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenter.kt
new file mode 100644
index 0000000000..676340764e
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenter.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.device
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticatorManager
+import io.element.android.features.lockscreen.impl.pin.PinCodeManager
+import io.element.android.features.lockscreen.impl.unlock.PinUnlockHelper
+import io.element.android.libraries.architecture.Presenter
+import kotlinx.coroutines.flow.first
+
+@Inject
+class DeviceUnlockPresenter(
+    private val pinUnlockHelper: PinUnlockHelper,
+    private val biometricAuthenticatorManager: BiometricAuthenticatorManager,
+    private val deviceUnlockCallbackHolder: DeviceUnlockCallbackHolder,
+    private val pinCodeManager: PinCodeManager,
+) : Presenter<DeviceUnlockState> {
+    @Composable
+    override fun present(): DeviceUnlockState {
+        var showApplicationPinCode by remember {
+            mutableStateOf(false)
+        }
+
+        val biometricUnlock = biometricAuthenticatorManager.rememberUnlockDeviceBiometricAuthenticator()
+        val deviceUnlockCallback by deviceUnlockCallbackHolder.deviceUnlockCallback.collectAsState()
+        val canUseDeviceUnlock = biometricAuthenticatorManager.canUseDeviceUnlock
+
+        fun setUnlock(isUnlock: Boolean) {
+            deviceUnlockCallback?.let {
+                if (isUnlock) {
+                    it.onUnlock()
+                } else {
+                    it.onCancel()
+                }
+            }
+            showApplicationPinCode = false
+            deviceUnlockCallbackHolder.onDone()
+        }
+
+        LaunchedEffect(biometricUnlock, canUseDeviceUnlock, deviceUnlockCallback) {
+            if (deviceUnlockCallback != null) {
+                if (canUseDeviceUnlock) {
+                    biometricUnlock.setup()
+                    biometricUnlock.authenticate()
+                } else if (pinCodeManager.hasPinCode().first()) {
+                    showApplicationPinCode = true
+                } else {
+                    // No security, unlock immediately
+                    setUnlock(true)
+                }
+            }
+        }
+
+        pinUnlockHelper.OnUnlockEffect { isUnlock ->
+            setUnlock(isUnlock)
+        }
+
+        fun handleEvent(event: DeviceUnlockEvent) {
+            when (event) {
+                DeviceUnlockEvent.CancelPinCode -> {
+                    showApplicationPinCode = false
+                    setUnlock(false)
+                }
+            }
+        }
+
+        return DeviceUnlockState(
+            showApplicationPinCode = showApplicationPinCode,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockState.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockState.kt
new file mode 100644
index 0000000000..48d2181605
--- /dev/null
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockState.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.impl.device
+
+data class DeviceUnlockState(
+    val showApplicationPinCode: Boolean,
+    val eventSink: (DeviceUnlockEvent) -> Unit,
+)
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManager.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManager.kt
index 091432044a..d699357933 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManager.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/DefaultPinCodeManager.kt
@@ -16,9 +16,13 @@ import io.element.android.libraries.cryptography.api.EncryptionDecryptionService
 import io.element.android.libraries.cryptography.api.EncryptionResult
 import io.element.android.libraries.cryptography.api.SecretKeyRepository
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.util.concurrent.CopyOnWriteArrayList
 
-private const val SECRET_KEY_ALIAS = "elementx.SECRET_KEY_ALIAS_PIN_CODE"
+internal const val SECRET_KEY_ALIAS = "elementx.SECRET_KEY_ALIAS_PIN_CODE"
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
@@ -29,6 +33,8 @@ class DefaultPinCodeManager(
 ) : PinCodeManager {
     private val callbacks = CopyOnWriteArrayList<PinCodeManager.Callback>()
 
+    private val migrationMutex = Mutex()
+
     override fun addCallback(callback: PinCodeManager.Callback) {
         callbacks.add(callback)
     }
@@ -38,11 +44,20 @@ class DefaultPinCodeManager(
     }
 
     override fun hasPinCode(): Flow<Boolean> {
-        return lockScreenStore.hasPinCode()
+        return secretKeyRepository.hasKey(SECRET_KEY_ALIAS)
+            .onStart {
+                migrationMutex.withLock {
+                    val hasKey = secretKeyRepository.hasKey(SECRET_KEY_ALIAS).first()
+                    if (hasKey && lockScreenStore.getEncryptedCode() == null) {
+                        // Remove the key if there is no pin code
+                        secretKeyRepository.deleteKey(SECRET_KEY_ALIAS)
+                    }
+                }
+            }
     }
 
-    override suspend fun getPinCodeSize(): Int {
-        val encryptedPinCode = lockScreenStore.getEncryptedCode() ?: return 0
+    override suspend fun getPinCodeSize(): Int? {
+        val encryptedPinCode = lockScreenStore.getEncryptedCode() ?: return null
         val secretKey = secretKeyRepository.getOrCreateKey(SECRET_KEY_ALIAS, false)
         val decryptedPinCode = encryptionDecryptionService.decrypt(secretKey, EncryptionResult.fromBase64(encryptedPinCode))
         return decryptedPinCode.size
@@ -79,6 +94,7 @@ class DefaultPinCodeManager(
     override suspend fun deletePinCode() {
         lockScreenStore.deleteEncryptedPinCode()
         lockScreenStore.resetCounter()
+        secretKeyRepository.deleteKey(SECRET_KEY_ALIAS)
         callbacks.forEach { it.onPinCodeRemoved() }
     }
 
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/PinCodeManager.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/PinCodeManager.kt
index 9282f3e7df..350631a233 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/PinCodeManager.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/pin/PinCodeManager.kt
@@ -51,9 +51,9 @@ interface PinCodeManager {
     fun hasPinCode(): Flow<Boolean>
 
     /**
-     * @return the size of the saved pin code.
+     * @return the size of the saved pin code. Return null if no pin code is saved.
      */
-    suspend fun getPinCodeSize(): Int
+    suspend fun getPinCodeSize(): Int?
 
     /**
      * Creates a new encrypted pin code.
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvents.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvent.kt
similarity index 62%
rename from features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvents.kt
rename to features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvent.kt
index 2d62427e02..c7437912eb 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvents.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsEvent.kt
@@ -8,9 +8,9 @@
 
 package io.element.android.features.lockscreen.impl.settings
 
-sealed interface LockScreenSettingsEvents {
-    data object OnRemovePin : LockScreenSettingsEvents
-    data object ConfirmRemovePin : LockScreenSettingsEvents
-    data object CancelRemovePin : LockScreenSettingsEvents
-    data object ToggleBiometricAllowed : LockScreenSettingsEvents
+sealed interface LockScreenSettingsEvent {
+    data object OnRemovePin : LockScreenSettingsEvent
+    data object ConfirmRemovePin : LockScreenSettingsEvent
+    data object CancelRemovePin : LockScreenSettingsEvent
+    data object ToggleBiometricAllowed : LockScreenSettingsEvent
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
index 0bd26729d5..a6e2c1265c 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
@@ -103,8 +103,15 @@ class LockScreenSettingsFlowNode(
                     override fun onUnlock() {
                         backstack.newRoot(NavTarget.Settings)
                     }
+
+                    override fun onCancel() {
+                        // Should not happen in this context.
+                    }
                 }
-                createNode<PinUnlockNode>(buildContext, plugins = listOf(callback))
+                val inputs = PinUnlockNode.Inputs(
+                    forDeviceUnlock = false,
+                )
+                createNode<PinUnlockNode>(buildContext, plugins = listOf(callback, inputs))
             }
             NavTarget.SetupPin -> {
                 createNode<SetupPinNode>(buildContext)
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenter.kt
index 589794bde0..17a0213f63 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenter.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenter.kt
@@ -51,19 +51,20 @@ class LockScreenSettingsPresenter(
 
         val biometricUnlock = biometricAuthenticatorManager.rememberConfirmBiometricAuthenticator()
 
-        fun handleEvent(event: LockScreenSettingsEvents) {
+        fun handleEvent(event: LockScreenSettingsEvent) {
             when (event) {
-                LockScreenSettingsEvents.CancelRemovePin -> showRemovePinConfirmation = false
-                LockScreenSettingsEvents.ConfirmRemovePin -> {
+                LockScreenSettingsEvent.CancelRemovePin -> showRemovePinConfirmation = false
+                LockScreenSettingsEvent.ConfirmRemovePin -> {
                     coroutineScope.launch {
                         if (showRemovePinConfirmation) {
                             showRemovePinConfirmation = false
                             pinCodeManager.deletePinCode()
+                            biometricAuthenticatorManager.disable()
                         }
                     }
                 }
-                LockScreenSettingsEvents.OnRemovePin -> showRemovePinConfirmation = true
-                LockScreenSettingsEvents.ToggleBiometricAllowed -> {
+                LockScreenSettingsEvent.OnRemovePin -> showRemovePinConfirmation = true
+                LockScreenSettingsEvent.ToggleBiometricAllowed -> {
                     coroutineScope.launch {
                         if (!isBiometricEnabled) {
                             biometricUnlock.setup()
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsState.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsState.kt
index a69d633508..62b8d6d4ee 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsState.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsState.kt
@@ -13,5 +13,5 @@ data class LockScreenSettingsState(
     val isBiometricEnabled: Boolean,
     val showRemovePinConfirmation: Boolean,
     val showToggleBiometric: Boolean,
-    val eventSink: (LockScreenSettingsEvents) -> Unit
+    val eventSink: (LockScreenSettingsEvent) -> Unit
 )
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
index fe5f20da0d..d8655e29a3 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
@@ -38,7 +38,7 @@ fun LockScreenSettingsView(
     ) {
         PreferenceCategory(showTopDivider = false) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.screen_app_lock_settings_change_pin))
                 },
                 onClick = onChangePinClick,
@@ -46,12 +46,12 @@ fun LockScreenSettingsView(
             PreferenceDivider()
             if (state.showRemovePinOption) {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(stringResource(id = R.string.screen_app_lock_settings_remove_pin))
                     },
                     style = ListItemStyle.Destructive,
                     onClick = {
-                        state.eventSink(LockScreenSettingsEvents.OnRemovePin)
+                        state.eventSink(LockScreenSettingsEvent.OnRemovePin)
                     }
                 )
             }
@@ -61,7 +61,7 @@ fun LockScreenSettingsView(
                     title = stringResource(id = R.string.screen_app_lock_settings_enable_biometric_unlock),
                     isChecked = state.isBiometricEnabled,
                     onCheckedChange = {
-                        state.eventSink(LockScreenSettingsEvents.ToggleBiometricAllowed)
+                        state.eventSink(LockScreenSettingsEvent.ToggleBiometricAllowed)
                     }
                 )
             }
@@ -72,10 +72,10 @@ fun LockScreenSettingsView(
             title = stringResource(id = R.string.screen_app_lock_settings_remove_pin_alert_title),
             content = stringResource(id = R.string.screen_app_lock_settings_remove_pin_alert_message),
             onSubmitClick = {
-                state.eventSink(LockScreenSettingsEvents.ConfirmRemovePin)
+                state.eventSink(LockScreenSettingsEvent.ConfirmRemovePin)
             },
             onDismiss = {
-                state.eventSink(LockScreenSettingsEvents.CancelRemovePin)
+                state.eventSink(LockScreenSettingsEvent.CancelRemovePin)
             }
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvents.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvent.kt
similarity index 68%
rename from features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvents.kt
rename to features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvent.kt
index ab8b18642e..d4db46b731 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvents.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricEvent.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.features.lockscreen.impl.setup.biometric
 
-sealed interface SetupBiometricEvents {
-    data object AllowBiometric : SetupBiometricEvents
-    data object UsePin : SetupBiometricEvents
+sealed interface SetupBiometricEvent {
+    data object AllowBiometric : SetupBiometricEvent
+    data object UsePin : SetupBiometricEvent
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenter.kt
index 3af2a28851..ce914320bc 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenter.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenter.kt
@@ -35,16 +35,16 @@ class SetupBiometricPresenter(
         val coroutineScope = rememberCoroutineScope()
         val biometricUnlock = biometricAuthenticatorManager.rememberConfirmBiometricAuthenticator()
 
-        fun handleEvent(event: SetupBiometricEvents) {
+        fun handleEvent(event: SetupBiometricEvent) {
             when (event) {
-                SetupBiometricEvents.AllowBiometric -> coroutineScope.launch {
+                SetupBiometricEvent.AllowBiometric -> coroutineScope.launch {
                     biometricUnlock.setup()
                     if (biometricUnlock.authenticate() == BiometricAuthenticator.AuthenticationResult.Success) {
                         lockScreenStore.setIsBiometricUnlockAllowed(true)
                         isBiometricSetupDone = true
                     }
                 }
-                SetupBiometricEvents.UsePin -> coroutineScope.launch {
+                SetupBiometricEvent.UsePin -> coroutineScope.launch {
                     lockScreenStore.setIsBiometricUnlockAllowed(false)
                     isBiometricSetupDone = true
                 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricState.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricState.kt
index 2843c028d1..db11b1dc30 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricState.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricState.kt
@@ -10,5 +10,5 @@ package io.element.android.features.lockscreen.impl.setup.biometric
 
 data class SetupBiometricState(
     val isBiometricSetupDone: Boolean,
-    val eventSink: (SetupBiometricEvents) -> Unit
+    val eventSink: (SetupBiometricEvent) -> Unit
 )
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
index 35b1ec76c0..70a1046e36 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
@@ -33,7 +33,7 @@ fun SetupBiometricView(
     modifier: Modifier = Modifier,
 ) {
     BackHandler {
-        state.eventSink(SetupBiometricEvents.UsePin)
+        state.eventSink(SetupBiometricEvent.UsePin)
     }
     HeaderFooterPage(
         modifier = modifier.padding(top = 80.dp),
@@ -42,8 +42,8 @@ fun SetupBiometricView(
         },
         footer = {
             SetupBiometricFooter(
-                onAllowClick = { state.eventSink(SetupBiometricEvents.AllowBiometric) },
-                onSkipClick = { state.eventSink(SetupBiometricEvents.UsePin) }
+                onAllowClick = { state.eventSink(SetupBiometricEvent.AllowBiometric) },
+                onSkipClick = { state.eventSink(SetupBiometricEvent.UsePin) }
             )
         },
     )
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvents.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvent.kt
similarity index 74%
rename from features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvents.kt
rename to features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvent.kt
index 276a94b2fc..f0dfdc33f0 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvents.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinEvent.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.features.lockscreen.impl.setup.pin
 
-sealed interface SetupPinEvents {
-    data class OnPinEntryChanged(val entryAsText: String, val fromConfirmationStep: Boolean) : SetupPinEvents
-    data object ClearFailure : SetupPinEvents
+sealed interface SetupPinEvent {
+    data class OnPinEntryChanged(val entryAsText: String, val fromConfirmationStep: Boolean) : SetupPinEvent
+    data object ClearFailure : SetupPinEvent
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenter.kt
index ac5b5bd1cc..d780927d44 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenter.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenter.kt
@@ -74,9 +74,9 @@ class SetupPinPresenter(
             }
         }
 
-        fun handleEvent(event: SetupPinEvents) {
+        fun handleEvent(event: SetupPinEvent) {
             when (event) {
-                is SetupPinEvents.OnPinEntryChanged -> {
+                is SetupPinEvent.OnPinEntryChanged -> {
                     // Use the fromConfirmationStep flag from ui to avoid race condition.
                     if (event.fromConfirmationStep) {
                         confirmPinEntry = confirmPinEntry.fillWith(event.entryAsText)
@@ -84,7 +84,7 @@ class SetupPinPresenter(
                         choosePinEntry = choosePinEntry.fillWith(event.entryAsText)
                     }
                 }
-                SetupPinEvents.ClearFailure -> {
+                SetupPinEvent.ClearFailure -> {
                     when (setupPinFailure) {
                         is SetupPinFailure.PinsDoNotMatch -> {
                             choosePinEntry = choosePinEntry.clear()
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinState.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinState.kt
index 2d5124d440..cf65e63c1b 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinState.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinState.kt
@@ -17,7 +17,7 @@ data class SetupPinState(
     val isConfirmationStep: Boolean,
     val setupPinFailure: SetupPinFailure?,
     val appName: String,
-    val eventSink: (SetupPinEvents) -> Unit
+    val eventSink: (SetupPinEvent) -> Unit
 ) {
     val activePinEntry = if (isConfirmationStep) {
         confirmPinEntry
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
index 5f2320db32..508d3c1fbb 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
@@ -107,7 +107,7 @@ private fun SetupPinContent(
         pinEntry = state.activePinEntry,
         isSecured = true,
         onValueChange = { entry ->
-            state.eventSink(SetupPinEvents.OnPinEntryChanged(entry, state.isConfirmationStep))
+            state.eventSink(SetupPinEvent.OnPinEntryChanged(entry, state.isConfirmationStep))
         },
         modifier = Modifier
             .focusRequester(focusRequester)
@@ -119,7 +119,7 @@ private fun SetupPinContent(
             title = state.setupPinFailure.title(),
             content = state.setupPinFailure.content(),
             onSubmit = {
-                state.eventSink(SetupPinEvents.ClearFailure)
+                state.eventSink(SetupPinEvent.ClearFailure)
             }
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/EncryptedPinCodeStorage.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/EncryptedPinCodeStorage.kt
index c4558812de..b41e6a9578 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/EncryptedPinCodeStorage.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/EncryptedPinCodeStorage.kt
@@ -8,8 +8,6 @@
 
 package io.element.android.features.lockscreen.impl.storage
 
-import kotlinx.coroutines.flow.Flow
-
 /**
  * Should be implemented by any class that provides access to the encrypted PIN code.
  * All methods are suspending in case there are async IO operations involved.
@@ -29,9 +27,4 @@ interface EncryptedPinCodeStorage {
      * Deletes the PIN code from some persistable storage.
      */
     suspend fun deleteEncryptedPinCode()
-
-    /**
-     * Returns whether the PIN code is stored or not.
-     */
-    fun hasPinCode(): Flow<Boolean>
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/PreferencesLockScreenStore.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/PreferencesLockScreenStore.kt
index 6b99d90592..bce20b2418 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/PreferencesLockScreenStore.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/storage/PreferencesLockScreenStore.kt
@@ -70,12 +70,6 @@ class PreferencesLockScreenStore(
         }
     }
 
-    override fun hasPinCode(): Flow<Boolean> {
-        return dataStore.data.map { preferences ->
-            preferences[pinCodeKey] != null
-        }
-    }
-
     override fun isBiometricUnlockAllowed(): Flow<Boolean> {
         return dataStore.data.map { preferences ->
             preferences[biometricUnlockKey] ?: false
@@ -88,5 +82,7 @@ class PreferencesLockScreenStore(
         }
     }
 
-    private fun Preferences.getRemainingPinCodeAttemptsNumber() = this[remainingAttemptsKey] ?: lockScreenConfig.maxPinCodeAttemptsBeforeLogout
+    private fun Preferences.getRemainingPinCodeAttemptsNumber() =
+        this[remainingAttemptsKey]?.coerceIn(0, lockScreenConfig.maxPinCodeAttemptsBeforeLogout)
+            ?: lockScreenConfig.maxPinCodeAttemptsBeforeLogout
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvents.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvent.kt
similarity index 61%
rename from features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvents.kt
rename to features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvent.kt
index bd9043859f..aa96a2e115 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvents.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockEvent.kt
@@ -10,12 +10,12 @@ package io.element.android.features.lockscreen.impl.unlock
 
 import io.element.android.features.lockscreen.impl.unlock.keypad.PinKeypadModel
 
-sealed interface PinUnlockEvents {
-    data class OnPinKeypadPressed(val pinKeypadModel: PinKeypadModel) : PinUnlockEvents
-    data class OnPinEntryChanged(val entryAsText: String) : PinUnlockEvents
-    data object OnForgetPin : PinUnlockEvents
-    data object ClearSignOutPrompt : PinUnlockEvents
-    data object SignOut : PinUnlockEvents
-    data object OnUseBiometric : PinUnlockEvents
-    data object ClearBiometricError : PinUnlockEvents
+sealed interface PinUnlockEvent {
+    data class OnPinKeypadPressed(val pinKeypadModel: PinKeypadModel) : PinUnlockEvent
+    data class OnPinEntryChanged(val entryAsText: String) : PinUnlockEvent
+    data object OnForgetPin : PinUnlockEvent
+    data object ClearSignOutPrompt : PinUnlockEvent
+    data object SignOut : PinUnlockEvent
+    data object OnUseBiometric : PinUnlockEvent
+    data object ClearBiometricError : PinUnlockEvent
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockHelper.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockHelper.kt
index 2a475814c9..10de1f23a5 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockHelper.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockHelper.kt
@@ -24,17 +24,23 @@ class PinUnlockHelper(
     private val pinCodeManager: PinCodeManager
 ) {
     @Composable
-    fun OnUnlockEffect(onUnlock: () -> Unit) {
+    fun OnUnlockEffect(onUnlock: (Boolean) -> Unit) {
         val latestOnUnlock by rememberUpdatedState(onUnlock)
         DisposableEffect(Unit) {
             val biometricUnlockCallback = object : DefaultBiometricUnlockCallback() {
                 override fun onBiometricAuthenticationSuccess() {
-                    latestOnUnlock()
+                    latestOnUnlock(true)
+                }
+
+                override fun onBiometricAuthenticationFailed(error: Exception?) {
+                    if (error != null) {
+                        latestOnUnlock(false)
+                    }
                 }
             }
             val pinCodeVerifiedCallback = object : DefaultPinCodeManagerCallback() {
                 override fun onPinCodeVerified() {
-                    latestOnUnlock()
+                    latestOnUnlock(true)
                 }
             }
             biometricAuthenticatorManager.addCallback(biometricUnlockCallback)
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt
index 459e165e00..47e7715ea5 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt
@@ -17,7 +17,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -25,13 +27,23 @@ import io.element.android.libraries.di.SessionScope
 class PinUnlockNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val presenter: PinUnlockPresenter,
+    presenterFactory: PinUnlockPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onUnlock()
+
+        // For feature unlock
+        fun onCancel()
     }
 
+    data class Inputs(
+        val forDeviceUnlock: Boolean,
+    ) : NodeInputs
+
     private val callback: Callback = callback()
+    private val inputs: Inputs = inputs()
+
+    private val presenter: PinUnlockPresenter = presenterFactory.create(inputs.forDeviceUnlock)
 
     @Composable
     override fun View(modifier: Modifier) {
@@ -46,6 +58,7 @@ class PinUnlockNode(
             // UnlockNode is only used for in-app unlock, so we can safely set isInAppUnlock to true.
             // It's set to false in PinUnlockActivity.
             isInAppUnlock = true,
+            onCancel = callback::onCancel,
             modifier = modifier
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
index 5429320fc7..65afba669d 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenter.kt
@@ -16,7 +16,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticator
 import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticatorManager
 import io.element.android.features.lockscreen.impl.pin.PinCodeManager
@@ -32,8 +34,9 @@ import io.element.android.libraries.di.annotations.AppCoroutineScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
-@Inject
+@AssistedInject
 class PinUnlockPresenter(
+    @Assisted private val forDeviceUnlock: Boolean,
     private val pinCodeManager: PinCodeManager,
     private val biometricAuthenticatorManager: BiometricAuthenticatorManager,
     private val logoutUseCase: LogoutUseCase,
@@ -41,6 +44,11 @@ class PinUnlockPresenter(
     private val coroutineScope: CoroutineScope,
     private val pinUnlockHelper: PinUnlockHelper,
 ) : Presenter<PinUnlockState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(forDeviceUnlock: Boolean): PinUnlockPresenter
+    }
+
     @Composable
     override fun present(): PinUnlockState {
         val pinEntryState = remember {
@@ -69,7 +77,13 @@ class PinUnlockPresenter(
         LaunchedEffect(Unit) {
             suspend {
                 val pinCodeSize = pinCodeManager.getPinCodeSize()
-                PinEntry.createEmpty(pinCodeSize)
+                if (pinCodeSize == null) {
+                    // No pin code set, deleted store? Force sign out
+                    showSignOutPrompt = true
+                    error("No pin code size found")
+                } else {
+                    PinEntry.createEmpty(pinCodeSize)
+                }
             }.runCatchingUpdatingState(pinEntryState)
         }
         LaunchedEffect(biometricUnlock) {
@@ -92,36 +106,37 @@ class PinUnlockPresenter(
             }
         }
         pinUnlockHelper.OnUnlockEffect {
-            isUnlocked.value = true
+            isUnlocked.value = it
         }
 
-        fun handleEvent(event: PinUnlockEvents) {
+        fun handleEvent(event: PinUnlockEvent) {
             when (event) {
-                is PinUnlockEvents.OnPinKeypadPressed -> {
+                is PinUnlockEvent.OnPinKeypadPressed -> {
                     pinEntryState.value = pinEntry.process(event.pinKeypadModel)
                 }
-                PinUnlockEvents.OnForgetPin -> showSignOutPrompt = true
-                PinUnlockEvents.ClearSignOutPrompt -> showSignOutPrompt = false
-                PinUnlockEvents.SignOut -> {
+                PinUnlockEvent.OnForgetPin -> showSignOutPrompt = true
+                PinUnlockEvent.ClearSignOutPrompt -> showSignOutPrompt = false
+                PinUnlockEvent.SignOut -> {
                     if (showSignOutPrompt) {
                         showSignOutPrompt = false
                         coroutineScope.signOut(signOutAction)
                     }
                 }
-                PinUnlockEvents.OnUseBiometric -> {
+                PinUnlockEvent.OnUseBiometric -> {
                     coroutineScope.launch {
                         biometricUnlockResult = biometricUnlock.authenticate()
                     }
                 }
-                PinUnlockEvents.ClearBiometricError -> {
+                PinUnlockEvent.ClearBiometricError -> {
                     biometricUnlockResult = null
                 }
-                is PinUnlockEvents.OnPinEntryChanged -> {
+                is PinUnlockEvent.OnPinEntryChanged -> {
                     pinEntryState.value = pinEntry.process(event.entryAsText)
                 }
             }
         }
         return PinUnlockState(
+            canNavigateBack = forDeviceUnlock,
             pinEntry = pinEntry,
             showWrongPinTitle = showWrongPinTitle,
             remainingAttempts = remainingAttempts,
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt
index 2bbcbe335c..1aae6afa51 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockState.kt
@@ -15,6 +15,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 
 data class PinUnlockState(
+    val canNavigateBack: Boolean,
     val pinEntry: AsyncData<PinEntry>,
     val showWrongPinTitle: Boolean,
     val remainingAttempts: AsyncData<Int>,
@@ -23,11 +24,15 @@ data class PinUnlockState(
     val showBiometricUnlock: Boolean,
     val isUnlocked: Boolean,
     val biometricUnlockResult: BiometricAuthenticator.AuthenticationResult?,
-    val eventSink: (PinUnlockEvents) -> Unit
+    val eventSink: (PinUnlockEvent) -> Unit
 ) {
-    val isSignOutPromptCancellable = when (remainingAttempts) {
-        is AsyncData.Success -> remainingAttempts.data > 0
-        else -> true
+    val isSignOutPromptCancellable = if (pinEntry.isFailure()) {
+        false
+    } else {
+        when (remainingAttempts) {
+            is AsyncData.Success -> remainingAttempts.data > 0
+            else -> true
+        }
     }
 
     val biometricUnlockErrorMessage = when {
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt
index 2beb8babe3..aef2c057a2 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockStateProvider.kt
@@ -20,7 +20,7 @@ open class PinUnlockStateProvider : PreviewParameterProvider<PinUnlockState> {
     override val values: Sequence<PinUnlockState>
         get() = sequenceOf(
             aPinUnlockState(),
-            aPinUnlockState(pinEntry = PinEntry.createEmpty(4).fillWith("12")),
+            aPinUnlockState(pinEntry = AsyncData.Success(PinEntry.createEmpty(4).fillWith("12"))),
             aPinUnlockState(showWrongPinTitle = true),
             aPinUnlockState(showSignOutPrompt = true),
             aPinUnlockState(showBiometricUnlock = false),
@@ -31,11 +31,28 @@ open class PinUnlockStateProvider : PreviewParameterProvider<PinUnlockState> {
                     BiometricUnlockError(BiometricPrompt.ERROR_LOCKOUT, "Biometric auth disabled")
                 )
             ),
+            aPinUnlockState(showSignOutPrompt = true, pinEntry = AsyncData.Failure(Exception("An error occurred"))),
+            // User enter wrong pin once, and then correct PIN. In this case, the error (with counter reset to 3) should not be displayed.
+            aPinUnlockState(
+                remainingAttempts = AsyncData.Success(2),
+                showWrongPinTitle = true,
+                isUnlocked = true,
+            ),
+            aPinUnlockState(canNavigateBack = true),
+        )
+}
+
+open class PinUnlockStateCompactProvider : PreviewParameterProvider<PinUnlockState> {
+    override val values: Sequence<PinUnlockState>
+        get() = sequenceOf(
+            aPinUnlockState(),
+            aPinUnlockState(canNavigateBack = true)
         )
 }
 
 fun aPinUnlockState(
-    pinEntry: PinEntry = PinEntry.createEmpty(4),
+    canNavigateBack: Boolean = false,
+    pinEntry: AsyncData<PinEntry> = AsyncData.Success(PinEntry.createEmpty(4)),
     remainingAttempts: AsyncData<Int> = AsyncData.Success(3),
     showWrongPinTitle: Boolean = false,
     showSignOutPrompt: Boolean = false,
@@ -44,7 +61,8 @@ fun aPinUnlockState(
     isUnlocked: Boolean = false,
     signOutAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
 ) = PinUnlockState(
-    pinEntry = AsyncData.Success(pinEntry),
+    canNavigateBack = canNavigateBack,
+    pinEntry = pinEntry,
     showWrongPinTitle = showWrongPinTitle,
     remainingAttempts = remainingAttempts,
     showSignOutPrompt = showSignOutPrompt,
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
index 659f8c2966..0292b29a0f 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
@@ -50,6 +51,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -65,21 +67,22 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun PinUnlockView(
     state: PinUnlockState,
     isInAppUnlock: Boolean,
+    onCancel: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnLifecycleEvent { _, event ->
         when (event) {
-            Lifecycle.Event.ON_RESUME -> state.eventSink.invoke(PinUnlockEvents.OnUseBiometric)
+            Lifecycle.Event.ON_RESUME -> state.eventSink.invoke(PinUnlockEvent.OnUseBiometric)
             else -> Unit
         }
     }
     Surface(modifier) {
-        PinUnlockPage(state = state, isInAppUnlock = isInAppUnlock)
+        PinUnlockPage(state = state, isInAppUnlock = isInAppUnlock, onCancel = onCancel)
         if (state.showSignOutPrompt) {
             SignOutPrompt(
                 isCancellable = state.isSignOutPromptCancellable,
-                onSignOut = { state.eventSink(PinUnlockEvents.SignOut) },
-                onDismiss = { state.eventSink(PinUnlockEvents.ClearSignOutPrompt) },
+                onSignOut = { state.eventSink(PinUnlockEvent.SignOut) },
+                onDismiss = { state.eventSink(PinUnlockEvent.ClearSignOutPrompt) },
             )
         }
         when (state.signOutAction) {
@@ -95,7 +98,7 @@ fun PinUnlockView(
         if (state.showBiometricUnlockError) {
             ErrorDialog(
                 content = state.biometricUnlockErrorMessage ?: "",
-                onSubmit = { state.eventSink(PinUnlockEvents.ClearBiometricError) }
+                onSubmit = { state.eventSink(PinUnlockEvent.ClearBiometricError) }
             )
         }
     }
@@ -105,6 +108,7 @@ fun PinUnlockView(
 private fun PinUnlockPage(
     state: PinUnlockState,
     isInAppUnlock: Boolean,
+    onCancel: () -> Unit,
 ) {
     BoxWithConstraints {
         val commonModifier = Modifier
@@ -125,10 +129,10 @@ private fun PinUnlockPage(
                 modifier = Modifier.padding(top = 24.dp),
                 showBiometricUnlock = state.showBiometricUnlock,
                 onUseBiometric = {
-                    state.eventSink(PinUnlockEvents.OnUseBiometric)
+                    state.eventSink(PinUnlockEvent.OnUseBiometric)
                 },
                 onForgotPin = {
-                    state.eventSink(PinUnlockEvents.OnForgetPin)
+                    state.eventSink(PinUnlockEvent.OnForgetPin)
                 },
             )
         }
@@ -144,7 +148,7 @@ private fun PinUnlockPage(
                         pinEntry = pinEntry,
                         isSecured = true,
                         onValueChange = {
-                            state.eventSink(PinUnlockEvents.OnPinEntryChanged(it))
+                            state.eventSink(PinUnlockEvent.OnPinEntryChanged(it))
                         },
                         modifier = Modifier
                             .focusRequester(focusRequester)
@@ -154,7 +158,7 @@ private fun PinUnlockPage(
             } else {
                 PinKeypad(
                     onClick = {
-                        state.eventSink(PinUnlockEvents.OnPinKeypadPressed(it))
+                        state.eventSink(PinUnlockEvent.OnPinKeypadPressed(it))
                     },
                     maxWidth = constraints.maxWidth,
                     maxHeight = constraints.maxHeight,
@@ -177,6 +181,15 @@ private fun PinUnlockPage(
                 modifier = commonModifier,
             )
         }
+        if (state.canNavigateBack) {
+            BackButton(
+                onClick = onCancel,
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .systemBarsPadding()
+                    .padding(8.dp),
+            )
+        }
     }
 }
 
@@ -311,14 +324,26 @@ private fun PinUnlockHeader(
         )
         Spacer(Modifier.height(8.dp))
         val remainingAttempts = state.remainingAttempts.dataOrNull()
-        val subtitle = if (remainingAttempts != null) {
-            if (state.showWrongPinTitle) {
-                pluralStringResource(id = R.plurals.screen_app_lock_subtitle_wrong_pin, count = remainingAttempts, remainingAttempts)
-            } else {
-                pluralStringResource(id = R.plurals.screen_app_lock_subtitle, count = remainingAttempts, remainingAttempts)
+        val subtitle = when {
+            state.isUnlocked -> {
+                // Hide any previous error
+                ""
             }
-        } else {
-            ""
+            remainingAttempts != null ->
+                if (state.showWrongPinTitle) {
+                    pluralStringResource(
+                        id = R.plurals.screen_app_lock_subtitle_wrong_pin,
+                        count = remainingAttempts,
+                        remainingAttempts,
+                    )
+                } else {
+                    pluralStringResource(
+                        id = R.plurals.screen_app_lock_subtitle,
+                        count = remainingAttempts,
+                        remainingAttempts,
+                    )
+                }
+            else -> ""
         }
         val subtitleColor = if (state.showWrongPinTitle) {
             ElementTheme.colors.textCriticalPrimary
@@ -361,6 +386,7 @@ internal fun PinUnlockViewInAppPreview(@PreviewParameter(PinUnlockStateProvider:
         PinUnlockView(
             state = state,
             isInAppUnlock = true,
+            onCancel = {},
         )
     }
 }
@@ -372,6 +398,19 @@ internal fun PinUnlockViewPreview(@PreviewParameter(PinUnlockStateProvider::clas
         PinUnlockView(
             state = state,
             isInAppUnlock = false,
+            onCancel = {},
+        )
+    }
+}
+
+@Composable
+@Preview(heightDp = 480, widthDp = 800)
+internal fun PinUnlockViewCompactPreview(@PreviewParameter(PinUnlockStateCompactProvider::class) state: PinUnlockState) {
+    ElementPreview {
+        PinUnlockView(
+            state = state,
+            isInAppUnlock = false,
+            onCancel = {},
         )
     }
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt
index 6209c19be2..613b1cf79e 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt
@@ -30,6 +30,7 @@ import io.element.android.features.lockscreen.impl.unlock.di.PinUnlockBindings
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
+import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.launch
 
@@ -40,9 +41,10 @@ class PinUnlockActivity : AppCompatActivity() {
         }
     }
 
-    @Inject lateinit var presenter: PinUnlockPresenter
+    @Inject lateinit var presenterFactory: PinUnlockPresenter.Factory
     @Inject lateinit var lockScreenService: LockScreenService
     @Inject lateinit var appPreferencesStore: AppPreferencesStore
+    @Inject lateinit var featureFlagService: FeatureFlagService
     @Inject lateinit var enterpriseService: EnterpriseService
     @Inject lateinit var buildMeta: BuildMeta
 
@@ -50,12 +52,14 @@ class PinUnlockActivity : AppCompatActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         bindings<PinUnlockBindings>().inject(this)
+        val presenter = presenterFactory.create(forDeviceUnlock = false)
         setContent {
             val colors by remember {
                 enterpriseService.semanticColorsFlow(sessionId = null)
             }.collectAsState(SemanticColorsLightDark.default)
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
+                featureFlagService = featureFlagService,
                 compoundLight = colors.light,
                 compoundDark = colors.dark,
                 buildMeta = buildMeta,
@@ -64,6 +68,9 @@ class PinUnlockActivity : AppCompatActivity() {
                 PinUnlockView(
                     state = state,
                     isInAppUnlock = false,
+                    onCancel = {
+                        // Should not happen
+                    },
                 )
             }
         }
diff --git a/features/lockscreen/impl/src/main/res/values-be/translations.xml b/features/lockscreen/impl/src/main/res/values-be/translations.xml
index 7667034623..7b714d329d 100644
--- a/features/lockscreen/impl/src/main/res/values-be/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-be/translations.xml
@@ -35,5 +35,5 @@
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Выкарыстоўваць біяметрыю"</string>
   <string name="screen_app_lock_use_pin_android">"Выкарыстоўваць PIN-код"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выхад…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Выдаленне прылады…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-ca/translations.xml b/features/lockscreen/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..5637977b97
--- /dev/null
+++ b/features/lockscreen/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_app_lock_biometric_authentication">"l\'autenticació biomètrica"</string>
+  <string name="screen_app_lock_biometric_unlock">"desbloqueig biomètric"</string>
+  <string name="screen_app_lock_biometric_unlock_title_android">"Desbloqueja amb biometria"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Confirma biometria"</string>
+  <string name="screen_app_lock_forgot_pin">"Has oblidat el PIN?"</string>
+  <string name="screen_app_lock_settings_change_pin">"Canvia codi PIN"</string>
+  <string name="screen_app_lock_settings_enable_biometric_unlock">"Permet desbloqueig biomètric"</string>
+  <string name="screen_app_lock_settings_remove_pin">"Elimina PIN"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"Segur que vols eliminar el PIN?"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_title">"Vols eliminar el PIN?"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"Permet %1$s"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"Prefereixo utilitzar el PIN"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Estalvia\'t temps i utilitza %1$s per desbloquejar l\'aplicació"</string>
+  <string name="screen_app_lock_setup_choose_pin">"Escull el PIN"</string>
+  <string name="screen_app_lock_setup_confirm_pin">"Confirma PIN"</string>
+  <string name="screen_app_lock_setup_pin_context">"Bloqueja %1$s per afegir més seguretat als teus xats.
+
+Escull alguna cosa que recordis. Si oblides aquest PIN, es tancarà sessió a l\'aplicació."</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Per motius de seguretat no pots utilitzar aquest codi PIN"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Escull un PIN diferent"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Introdueix el mateix PIN dues vegades"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Els codis PIN no coincideixen"</string>
+  <string name="screen_app_lock_signout_alert_message">"Hauràs de tornar a iniciar sessió i crear un nou PIN per continuar."</string>
+  <string name="screen_app_lock_signout_alert_title">"S\'està tancant la sessió"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="one">"Tens %1$d intent per desbloquejar"</item>
+    <item quantity="other">"Tens %1$d intents per desbloquejar"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="one">"PIN incorrecte. Tens %1$d intent més"</item>
+    <item quantity="other">"PIN incorrecte. Tens %1$d intents més"</item>
+  </plurals>
+  <string name="screen_app_lock_use_biometric_android">"Utilitza biometria"</string>
+  <string name="screen_app_lock_use_pin_android">"Utilitza PIN"</string>
+  <string name="screen_signout_in_progress_dialog_content">"S\'està tancant la sessió…"</string>
+</resources>
diff --git a/features/lockscreen/impl/src/main/res/values-cs/translations.xml b/features/lockscreen/impl/src/main/res/values-cs/translations.xml
index fce1142f2c..f54d16f42b 100644
--- a/features/lockscreen/impl/src/main/res/values-cs/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-cs/translations.xml
@@ -23,7 +23,7 @@ Vyberte si něco zapamatovatelného. Pokud tento kód PIN zapomenete, budete z a
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Zadejte stejný PIN dvakrát"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN kódy se neshodují."</string>
   <string name="screen_app_lock_signout_alert_message">"Abyste mohli pokračovat, budete se muset znovu přihlásit a vytvořit nový PIN"</string>
-  <string name="screen_app_lock_signout_alert_title">"Jste odhlášeni"</string>
+  <string name="screen_app_lock_signout_alert_title">"Toto zařízení se odstraňuje"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Máte %1$d pokus pro odemknutí"</item>
     <item quantity="few">"Máte %1$d pokusy pro odemknutí"</item>
@@ -36,5 +36,5 @@ Vyberte si něco zapamatovatelného. Pokud tento kód PIN zapomenete, budete z a
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Použijte biometrické údaje"</string>
   <string name="screen_app_lock_use_pin_android">"Použít PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odhlašování…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odebírání zařízení…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-da/translations.xml b/features/lockscreen/impl/src/main/res/values-da/translations.xml
index ffbd657970..76725ac637 100644
--- a/features/lockscreen/impl/src/main/res/values-da/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-da/translations.xml
@@ -23,7 +23,7 @@ Vælg noget mindeværdigt. Hvis du glemmer denne pinkode, bliver du logget ud af
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Indtast venligst den samme PIN-kode to gange"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN-koderne stemmer ikke overens"</string>
   <string name="screen_app_lock_signout_alert_message">"Du vil være nødt til at logge ind igen og oprette en ny PIN-kode for at fortsætte."</string>
-  <string name="screen_app_lock_signout_alert_title">"Du bliver logget ud"</string>
+  <string name="screen_app_lock_signout_alert_title">"Denne enhed bliver fjernet"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Du har %1$d forsøg på at låse op"</item>
     <item quantity="other">"Du har %1$d forsøg på at låse op"</item>
@@ -34,5 +34,5 @@ Vælg noget mindeværdigt. Hvis du glemmer denne pinkode, bliver du logget ud af
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Brug biometri"</string>
   <string name="screen_app_lock_use_pin_android">"Brug PIN-kode"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logger ud…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Fjerner enhed…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-de/translations.xml b/features/lockscreen/impl/src/main/res/values-de/translations.xml
index dd74818610..e1819583f0 100644
--- a/features/lockscreen/impl/src/main/res/values-de/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-de/translations.xml
@@ -23,7 +23,7 @@ Wähle eine einprägsame PIN. Wenn du sie vergisst, wirst du aus der App abgemel
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Bitte gib die gleiche PIN wie zuvor ein."</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Die PINs stimmen nicht überein"</string>
   <string name="screen_app_lock_signout_alert_message">"Um fortzufahren, musst du dich erneut anmelden und eine neue PIN erstellen"</string>
-  <string name="screen_app_lock_signout_alert_title">"Du wirst abgemeldet"</string>
+  <string name="screen_app_lock_signout_alert_title">"Dieses Gerät wurde entfernt"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Du hast %1$d Versuch, um zu entsperren"</item>
     <item quantity="other">"Du hast %1$d Versuche, um zu entsperren"</item>
@@ -34,5 +34,5 @@ Wähle eine einprägsame PIN. Wenn du sie vergisst, wirst du aus der App abgemel
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Biometrie verwenden"</string>
   <string name="screen_app_lock_use_pin_android">"PIN verwenden"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Abmelden…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Gerät wird entfernt…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-et/translations.xml b/features/lockscreen/impl/src/main/res/values-et/translations.xml
index 4449479ba6..7137c09b60 100644
--- a/features/lockscreen/impl/src/main/res/values-et/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-et/translations.xml
@@ -23,7 +23,7 @@ Vali midagi, mis hästi meelde jääb. Kui unustad selle PIN-koodi, siis turvaka
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Palun sisesta sama PIN-kood kaks korda"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN-koodid ei klapi omavahel"</string>
   <string name="screen_app_lock_signout_alert_message">"Jätkamaks pead uuesti sisse logima ja looma uue PIN-koodi"</string>
-  <string name="screen_app_lock_signout_alert_title">"Sa oled logimas välja"</string>
+  <string name="screen_app_lock_signout_alert_title">"See seade on eemaldamisel"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Sul on lukustuse eemaldamiseks jäänud %1$d katse"</item>
     <item quantity="other">"Sul on lukustuse eemaldamiseks jäänud %1$d katset"</item>
@@ -34,5 +34,5 @@ Vali midagi, mis hästi meelde jääb. Kui unustad selle PIN-koodi, siis turvaka
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Kasuta biomeetriat"</string>
   <string name="screen_app_lock_use_pin_android">"Kasuta PIN-koodi"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logime välja…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eemaldan seadet…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-fa/translations.xml b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
index 56dc91e835..0575f22221 100644
--- a/features/lockscreen/impl/src/main/res/values-fa/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
@@ -23,7 +23,7 @@
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"لطفاً یک پین را دو بار وارد کنید"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"پین‌ها مطابق نیستند"</string>
   <string name="screen_app_lock_signout_alert_message">"برای ادامه باید دوباره وارد شده و پینی جدید ایجاد کنید"</string>
-  <string name="screen_app_lock_signout_alert_title">"دارید خارج می‌شوید"</string>
+  <string name="screen_app_lock_signout_alert_title">"این دستگاه در حال حذف شدن است"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"شما %1$d تلاش برای باز کردن قفل دارید"</item>
     <item quantity="other">"شما %1$d تلاش برای باز کردن قفل دارید"</item>
@@ -34,5 +34,5 @@
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"استفاده از زیست‌سنجی"</string>
   <string name="screen_app_lock_use_pin_android">"استفاده از پین"</string>
-  <string name="screen_signout_in_progress_dialog_content">"خارج شدن…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"برداشتن افزاره…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-hr/translations.xml b/features/lockscreen/impl/src/main/res/values-hr/translations.xml
index 1a81bcc6cb..232775c798 100644
--- a/features/lockscreen/impl/src/main/res/values-hr/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-hr/translations.xml
@@ -23,7 +23,7 @@ Odaberite nešto nezaboravno. Ako zaboravite ovaj PIN, bit ćete odjavljeni iz a
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Unesite dvaput isti PIN"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN-ovi se ne podudaraju"</string>
   <string name="screen_app_lock_signout_alert_message">"Morat ćete se ponovno prijaviti i izraditi novi PIN da biste mogli nastaviti"</string>
-  <string name="screen_app_lock_signout_alert_title">"Odjavit ćete se"</string>
+  <string name="screen_app_lock_signout_alert_title">"Ovaj uređaj se uklanja"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Imate %1$d pokušaj otključavanja"</item>
     <item quantity="few">"Imate %1$d pokušaja otključavanja"</item>
@@ -36,5 +36,5 @@ Odaberite nešto nezaboravno. Ako zaboravite ovaj PIN, bit ćete odjavljeni iz a
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Upotrijebi biometriju"</string>
   <string name="screen_app_lock_use_pin_android">"Upotrijebi PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odjavljivanje…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Uklanjanje uređaja…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-hu/translations.xml b/features/lockscreen/impl/src/main/res/values-hu/translations.xml
index 3a65239697..470324b2ba 100644
--- a/features/lockscreen/impl/src/main/res/values-hu/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-hu/translations.xml
@@ -23,7 +23,7 @@ Válasszon valami megjegyezhetőt. Ha elfelejti a PIN-kódot, akkor ki lesz jele
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Adja meg a PIN-kódját kétszer"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"A PIN-kódok nem egyeznek"</string>
   <string name="screen_app_lock_signout_alert_message">"A folytatáshoz újra be kell jelentkeznie, és létre kell hoznia egy új PIN-kódot"</string>
-  <string name="screen_app_lock_signout_alert_title">"Kijelentkeztetésre kerül"</string>
+  <string name="screen_app_lock_signout_alert_title">"Ez az eszköz eltávolításra kerül"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"%1$d próbálkozása van a feloldáshoz"</item>
     <item quantity="other">"%1$d próbálkozása van a feloldáshoz"</item>
@@ -34,5 +34,5 @@ Válasszon valami megjegyezhetőt. Ha elfelejti a PIN-kódot, akkor ki lesz jele
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Biometrikus adatok használata"</string>
   <string name="screen_app_lock_use_pin_android">"PIN-kód használata"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Kijelentkezés…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eszköz eltávolítása…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-in/translations.xml b/features/lockscreen/impl/src/main/res/values-in/translations.xml
index 0396f56b0c..5cd461b477 100644
--- a/features/lockscreen/impl/src/main/res/values-in/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-in/translations.xml
@@ -23,7 +23,7 @@ Pilih sesuatu yang mudah untuk diingat. Jika Anda lupa PIN ini, Anda akan dikelu
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Silakan masukkan PIN yang sama dua kali"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN tidak cocok"</string>
   <string name="screen_app_lock_signout_alert_message">"Anda harus masuk ulang dan membuat PIN baru untuk melanjutkan"</string>
-  <string name="screen_app_lock_signout_alert_title">"Anda sedang dikeluarkan"</string>
+  <string name="screen_app_lock_signout_alert_title">"Perangkat ini sedang dilepas"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="other">"Anda memiliki %1$d percobaan lagi untuk membuka kunci"</item>
   </plurals>
@@ -32,5 +32,5 @@ Pilih sesuatu yang mudah untuk diingat. Jika Anda lupa PIN ini, Anda akan dikelu
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Gunakan biometrik"</string>
   <string name="screen_app_lock_use_pin_android">"Gunakan PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan dari akun…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan device dari akun…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-it/translations.xml b/features/lockscreen/impl/src/main/res/values-it/translations.xml
index 514d2461a2..5f9c82a34a 100644
--- a/features/lockscreen/impl/src/main/res/values-it/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-it/translations.xml
@@ -23,7 +23,7 @@ Scegli un PIN facile da ricordare. Se lo dimentichi, verrai disconnesso dall’a
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Inserisci lo stesso PIN due volte"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"I PIN non corrispondono"</string>
   <string name="screen_app_lock_signout_alert_message">"Dovrai effettuare nuovamente l\'accesso e creare un nuovo PIN per procedere"</string>
-  <string name="screen_app_lock_signout_alert_title">"Stai per essere disconnesso"</string>
+  <string name="screen_app_lock_signout_alert_title">"Questo dispositivo verrà rimosso"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Hai %1$d tentativo di sblocco"</item>
     <item quantity="other">"Hai %1$d tentativi di sblocco"</item>
@@ -34,5 +34,5 @@ Scegli un PIN facile da ricordare. Se lo dimentichi, verrai disconnesso dall’a
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Usa la biometria"</string>
   <string name="screen_app_lock_use_pin_android">"Usa il PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Disconnessione in corso…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Rimozione del dispositivo…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-ja/translations.xml b/features/lockscreen/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..982c4574c8
--- /dev/null
+++ b/features/lockscreen/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_app_lock_biometric_authentication">"生体認証"</string>
+  <string name="screen_app_lock_biometric_unlock">"生体認証で解除"</string>
+  <string name="screen_app_lock_biometric_unlock_title_android">"生体認証を使用"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"生体認証を使用しますか？"</string>
+  <string name="screen_app_lock_forgot_pin">"PINをお忘れですか？"</string>
+  <string name="screen_app_lock_settings_change_pin">"PINを変更"</string>
+  <string name="screen_app_lock_settings_enable_biometric_unlock">"生体認証を使用"</string>
+  <string name="screen_app_lock_settings_remove_pin">"PINを削除"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"本当にPINを削除しますか？"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_title">"PINを削除しますか？"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"%1$sを使用"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"PINを使用する"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"素早い認証のために %1$s を常に使用"</string>
+  <string name="screen_app_lock_setup_choose_pin">"PINを選択"</string>
+  <string name="screen_app_lock_setup_confirm_pin">"PINの確認"</string>
+  <string name="screen_app_lock_setup_pin_context">"チャットのセキュリティを強化するため、%1$s を保護しましょう。
+
+覚えやすいPINを設定してください。PINを忘れると、アプリにログインできなくなります。"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"セキュリティ上の理由により、入力された内容をPINとして使用できません。"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"別のPINを使用してください"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"同一のPINを2回入力してください"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PINが一致しません"</string>
+  <string name="screen_app_lock_signout_alert_message">"再度ログインし、PINを再設定する必要があります"</string>
+  <string name="screen_app_lock_signout_alert_title">"端末を削除しようとしています"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="other">"%1$d 回試すことができます"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="other">"PINが間違っています。あと %1$d 回試すことができます。"</item>
+  </plurals>
+  <string name="screen_app_lock_use_biometric_android">"生体認証を使用"</string>
+  <string name="screen_app_lock_use_pin_android">"PINを使用"</string>
+  <string name="screen_signout_in_progress_dialog_content">"削除中…"</string>
+</resources>
diff --git a/features/lockscreen/impl/src/main/res/values-pl/translations.xml b/features/lockscreen/impl/src/main/res/values-pl/translations.xml
index 5d61ecb7c6..29691987f6 100644
--- a/features/lockscreen/impl/src/main/res/values-pl/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-pl/translations.xml
@@ -23,7 +23,7 @@ Wybierz coś łatwego do zapamiętania. Jeśli zapomnisz ten PIN, zostaniesz wyl
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Wprowadź ten sam kod PIN dwa razy"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN\'y nie pasują do siebie"</string>
   <string name="screen_app_lock_signout_alert_message">"Aby kontynuować, zaloguj się ponownie i utwórz nowy kod PIN"</string>
-  <string name="screen_app_lock_signout_alert_title">"Trwa wylogowywanie"</string>
+  <string name="screen_app_lock_signout_alert_title">"Trwa usuwanie urządzenia"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Masz %1$d próbę, żeby odblokować"</item>
     <item quantity="few">"Masz %1$d próby, żeby odblokować"</item>
@@ -36,5 +36,5 @@ Wybierz coś łatwego do zapamiętania. Jeśli zapomnisz ten PIN, zostaniesz wyl
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Użyj biometrii"</string>
   <string name="screen_app_lock_use_pin_android">"Użyj kodu PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Wylogowywanie…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Usuwam urządzenie…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-pt-rBR/translations.xml b/features/lockscreen/impl/src/main/res/values-pt-rBR/translations.xml
index f2f67dca6d..56f113c2fb 100644
--- a/features/lockscreen/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-pt-rBR/translations.xml
@@ -23,7 +23,7 @@ Escolha algo memorável. Se você esquecer este PIN, você será desconectado do
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Por favor, digite o mesmo PIN duas vezes"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Os PINs não correspondem"</string>
   <string name="screen_app_lock_signout_alert_message">"Você terá que entrar novamente e criar um PIN novo para continuar"</string>
-  <string name="screen_app_lock_signout_alert_title">"Você está sendo desconectado"</string>
+  <string name="screen_app_lock_signout_alert_title">"Este dispositivo está sendo removido"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Você tem %1$d tentativa de desbloqueio"</item>
     <item quantity="other">"Você tem %1$d tentativas de desbloqueio"</item>
@@ -34,5 +34,5 @@ Escolha algo memorável. Se você esquecer este PIN, você será desconectado do
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Usar biometria"</string>
   <string name="screen_app_lock_use_pin_android">"Usar PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Saindo…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Removendo dispositivo…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-pt/translations.xml b/features/lockscreen/impl/src/main/res/values-pt/translations.xml
index a6b2516fba..fca6fbcb9e 100644
--- a/features/lockscreen/impl/src/main/res/values-pt/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-pt/translations.xml
@@ -23,7 +23,7 @@ Escolhe algo memorável. Se te esqueceres deste PIN, a tua sessão será termina
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Insere o mesmo PIN duas vezes"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Os PINs não coincidem"</string>
   <string name="screen_app_lock_signout_alert_message">"Terás de voltar a iniciar sessão e criar um novo PIN para continuar"</string>
-  <string name="screen_app_lock_signout_alert_title">"Estás a terminar a sessão"</string>
+  <string name="screen_app_lock_signout_alert_title">"O teu dispositivo está a ser removido"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Tens %1$d tentativa de desbloqueio"</item>
     <item quantity="other">"Tens %1$d tentativas de desbloqueio"</item>
@@ -34,5 +34,5 @@ Escolhe algo memorável. Se te esqueceres deste PIN, a tua sessão será termina
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Utilizar biometria"</string>
   <string name="screen_app_lock_use_pin_android">"Utilizar PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"A terminar sessão…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"A remover dispositivo…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-ro/translations.xml b/features/lockscreen/impl/src/main/res/values-ro/translations.xml
index d40bfbaece..7555d7eb58 100644
--- a/features/lockscreen/impl/src/main/res/values-ro/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-ro/translations.xml
@@ -23,7 +23,7 @@ Alegeți ceva memorabil. Dacă uitați acest PIN, veți fi deconectat din aplica
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Vă rugăm să introduceți același cod PIN de două ori"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Codurile PIN nu corespund"</string>
   <string name="screen_app_lock_signout_alert_message">"Va trebui să vă reconectați și să creați un cod PIN nou pentru a continua"</string>
-  <string name="screen_app_lock_signout_alert_title">"Sunteți deconectat"</string>
+  <string name="screen_app_lock_signout_alert_title">"Acest device este în curs de eliminare"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Aveți %1$d încercare de deblocare"</item>
     <item quantity="few">"Aveți %1$d încercări de deblocare"</item>
diff --git a/features/lockscreen/impl/src/main/res/values-ru/translations.xml b/features/lockscreen/impl/src/main/res/values-ru/translations.xml
index d0441fb253..7bbdef1594 100644
--- a/features/lockscreen/impl/src/main/res/values-ru/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-ru/translations.xml
@@ -15,9 +15,9 @@
   <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Используйте %1$s для разблокировки приложения"</string>
   <string name="screen_app_lock_setup_choose_pin">"Выберите PIN-код"</string>
   <string name="screen_app_lock_setup_confirm_pin">"Подтвердите PIN-код"</string>
-  <string name="screen_app_lock_setup_pin_context">"Установите блокировку на %1$s, чтобы повысить безопасность ваших чатов.
+  <string name="screen_app_lock_setup_pin_context">"Установите блокировку на %1$s, чтобы повысить безопасность Ваших чатов.
 
-Выберите код, который трудно забыть. Если вы забудете PIN-код, вам придется выйти из приложения."</string>
+Выберите код, который трудно забыть. Если Вы забудете PIN-код, Вам придется выйти из аккаунта."</string>
   <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Этот PIN-код небезопасен."</string>
   <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Выбрать другой PIN-код"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Повторите PIN-код"</string>
@@ -25,16 +25,16 @@
   <string name="screen_app_lock_signout_alert_message">"Чтобы продолжить, вам необходимо повторно войти в систему и создать новый PIN-код"</string>
   <string name="screen_app_lock_signout_alert_title">"Это устройство удаляется"</string>
   <plurals name="screen_app_lock_subtitle">
-    <item quantity="one">"У вас осталась %1$d попытка разблокировки"</item>
-    <item quantity="few">"У вас остались %1$d попытки разблокировки"</item>
-    <item quantity="many">"У вас осталось %1$d попыток разблокировки"</item>
+    <item quantity="one">"У Вас осталась %1$d попытка разблокировки"</item>
+    <item quantity="few">"У Вас остались %1$d попытки разблокировки"</item>
+    <item quantity="many">"У Вас осталось %1$d попыток разблокировки"</item>
   </plurals>
   <plurals name="screen_app_lock_subtitle_wrong_pin">
-    <item quantity="one">"Неверный PIN-код. У вас осталась %1$d попытка"</item>
-    <item quantity="few">"Неверный PIN-код. У вас остались %1$d попытки"</item>
-    <item quantity="many">"Неверный PIN-код. У вас осталось %1$d попыток"</item>
+    <item quantity="one">"Неверный PIN-код. У Вас осталась %1$d попытка"</item>
+    <item quantity="few">"Неверный PIN-код. У Вас остались %1$d попытки"</item>
+    <item quantity="many">"Неверный PIN-код. У Вас осталось %1$d попыток"</item>
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Использовать биометрию"</string>
   <string name="screen_app_lock_use_pin_android">"Использовать PIN-код"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выполняется выход…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Удаление устройства…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-sk/translations.xml b/features/lockscreen/impl/src/main/res/values-sk/translations.xml
index 0cfb2e88cd..e8fdf50bfd 100644
--- a/features/lockscreen/impl/src/main/res/values-sk/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-sk/translations.xml
@@ -23,7 +23,7 @@ Vyberte si niečo zapamätateľné. Ak tento kód PIN zabudnete, budete z aplik
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Zadajte prosím ten istý PIN dvakrát"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN kódy sa nezhodujú"</string>
   <string name="screen_app_lock_signout_alert_message">"Ak chcete pokračovať, musíte sa znovu prihlásiť a vytvoriť nový PIN kód."</string>
-  <string name="screen_app_lock_signout_alert_title">"Prebieha odhlasovanie"</string>
+  <string name="screen_app_lock_signout_alert_title">"Toto zariadenie sa odstraňuje"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Máte %1$d pokus na odomknutie"</item>
     <item quantity="few">"Máte %1$d pokusy na odomknutie"</item>
@@ -36,5 +36,5 @@ Vyberte si niečo zapamätateľné. Ak tento kód PIN zabudnete, budete z aplik
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Použiť biometrické údaje"</string>
   <string name="screen_app_lock_use_pin_android">"Použiť PIN"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Prebieha odhlasovanie…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odoberanie zariadenia…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-sv/translations.xml b/features/lockscreen/impl/src/main/res/values-sv/translations.xml
index a559e4c909..021fa67fb3 100644
--- a/features/lockscreen/impl/src/main/res/values-sv/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-sv/translations.xml
@@ -34,5 +34,5 @@ Välj något minnesvärt. Om du glömmer den här PIN-koden loggas du ut från a
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Använd biometri"</string>
   <string name="screen_app_lock_use_pin_android">"Använd PIN-kod"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Loggar ut …"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Tar bort enhet …"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-uk/translations.xml b/features/lockscreen/impl/src/main/res/values-uk/translations.xml
index 5c19889282..e200a4ac21 100644
--- a/features/lockscreen/impl/src/main/res/values-uk/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-uk/translations.xml
@@ -15,15 +15,15 @@
   <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Заощаджуйте час і використовуйте %1$s для розблокування застосунку щоразу"</string>
   <string name="screen_app_lock_setup_choose_pin">"Виберіть PIN-код"</string>
   <string name="screen_app_lock_setup_confirm_pin">"Підтвердити PIN-код"</string>
-  <string name="screen_app_lock_setup_pin_context">"Заблокуйте %1$s, щоб додати додаткову безпеку вашим чатам.
+  <string name="screen_app_lock_setup_pin_context">"Додаткове блокування %1$s поліпшить захист ваших бесід.
 
-Виберіть щось, що запам\'ятовується. Але якщо ви забудете PIN-код, ви вийдете з застосунку."</string>
+Виберіть щось, що запам’ятовується. Але якщо ви забудете PIN-код, ви вийдете із застосунку."</string>
   <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Ви не можете вибрати його своїм PIN-кодом з міркувань безпеки"</string>
   <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Виберіть інший PIN-код"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Будь ласка, введіть один і той самий PIN-код двічі"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN-коди не збігаються"</string>
   <string name="screen_app_lock_signout_alert_message">"Щоб продовжити, вам потрібно повторно ввійти та створити новий PIN-код"</string>
-  <string name="screen_app_lock_signout_alert_title">"Ви виходите з системи"</string>
+  <string name="screen_app_lock_signout_alert_title">"Цей пристрій вилучається"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="one">"Ви маєте %1$d спробу"</item>
     <item quantity="few">"Ви маєте %1$d спроби"</item>
@@ -36,5 +36,5 @@
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"Використати біометрію"</string>
   <string name="screen_app_lock_use_pin_android">"Використати PIN-код"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Вихід…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Видалення пристрою…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-vi/translations.xml b/features/lockscreen/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..59dd89b114
--- /dev/null
+++ b/features/lockscreen/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_app_lock_biometric_authentication">"xác thực sinh trắc học"</string>
+  <string name="screen_app_lock_biometric_unlock">"mở khóa sinh trắc học"</string>
+  <string name="screen_app_lock_biometric_unlock_title_android">"Mở khóa bằng sinh trắc học"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Xác nhận sinh trắc học"</string>
+  <string name="screen_app_lock_forgot_pin">"Quên mã PIN rồi à?"</string>
+  <string name="screen_app_lock_settings_change_pin">"Thay đổi mã PIN"</string>
+  <string name="screen_app_lock_settings_enable_biometric_unlock">"Cho phép mở khóa bằng sinh trắc học"</string>
+  <string name="screen_app_lock_settings_remove_pin">"Xóa mã PIN"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"Bạn có chắc chắn muốn xóa mã PIN không?"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_title">"Xóa mã PIN?"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"Cho phép %1$s"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"Tôi thích dùng mã PIN hơn."</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Dùng %1$s để mở khóa ứng dụng nhanh hơn."</string>
+  <string name="screen_app_lock_setup_choose_pin">"Chọn mã PIN"</string>
+  <string name="screen_app_lock_setup_confirm_pin">"Xác nhận mã PIN"</string>
+  <string name="screen_app_lock_setup_pin_context">"Khóa %1$s để tăng cường bảo mật cho các cuộc trò chuyện của bạn.
+
+Chọn một mã dễ nhớ. Nếu quên PIN này, bạn sẽ bị đăng xuất khỏi ứng dụng."</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Vì lý do bảo mật, bạn không thể chọn mã này làm mã PIN của mình."</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Chọn mã PIN khác"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Vui lòng nhập cùng một mã PIN hai lần."</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Mã PIN không khớp"</string>
+  <string name="screen_app_lock_signout_alert_message">"Đăng nhập lại và tạo PIN mới để tiếp tục."</string>
+  <string name="screen_app_lock_signout_alert_title">"Thiết bị này đang được gỡ bỏ"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="other">"Bạn còn %1$d lần thử để mở khóa"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="other">"PIN không đúng. Còn %1$d lần thử"</item>
+  </plurals>
+  <string name="screen_app_lock_use_biometric_android">"Sử dụng sinh trắc học"</string>
+  <string name="screen_app_lock_use_pin_android">"Sử dụng mã PIN"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Đang gỡ thiết bị…"</string>
+</resources>
diff --git a/features/lockscreen/impl/src/main/res/values-zh-rTW/translations.xml b/features/lockscreen/impl/src/main/res/values-zh-rTW/translations.xml
index 799db8f84c..2bd329aea4 100644
--- a/features/lockscreen/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-zh-rTW/translations.xml
@@ -23,7 +23,7 @@
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"請輸入相同的 PIN 碼兩次"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN 碼不一樣"</string>
   <string name="screen_app_lock_signout_alert_message">"您需要重新登入並建立新的 PIN 碼才能繼續"</string>
-  <string name="screen_app_lock_signout_alert_title">"您即將登出"</string>
+  <string name="screen_app_lock_signout_alert_title">"此裝置已被移除"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="other">"您有 %1$d 次解鎖的機會"</item>
   </plurals>
@@ -32,5 +32,5 @@
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"使用生物辨識"</string>
   <string name="screen_app_lock_use_pin_android">"使用 PIN 碼"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除裝置……"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-zh/translations.xml b/features/lockscreen/impl/src/main/res/values-zh/translations.xml
index d3633e4af5..f3e93668fd 100644
--- a/features/lockscreen/impl/src/main/res/values-zh/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-zh/translations.xml
@@ -8,22 +8,22 @@
   <string name="screen_app_lock_settings_change_pin">"更改 PIN 码"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"允许生物识别解锁"</string>
   <string name="screen_app_lock_settings_remove_pin">"移除 PIN 码"</string>
-  <string name="screen_app_lock_settings_remove_pin_alert_message">"您确定要删除 PIN 码吗？"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"你确定要删除 PIN 码？"</string>
   <string name="screen_app_lock_settings_remove_pin_alert_title">"移除 PIN 码？"</string>
   <string name="screen_app_lock_setup_biometric_unlock_allow_title">"允许 %1$s"</string>
   <string name="screen_app_lock_setup_biometric_unlock_skip">"我宁愿使用 PIN 码"</string>
   <string name="screen_app_lock_setup_biometric_unlock_subtitle">"节省时间，用 %1$s 来解锁应用程序"</string>
   <string name="screen_app_lock_setup_choose_pin">"选择 PIN 码"</string>
   <string name="screen_app_lock_setup_confirm_pin">"确认 PIN 码"</string>
-  <string name="screen_app_lock_setup_pin_context">"锁定 %1$s 以为聊天增加安全性。
+  <string name="screen_app_lock_setup_pin_context">"锁定 %1$s 以增加聊天的安全性。
 
-选择好记的 PIN 码。如果忘掉了这个 PIN 码，就不得不登出应用。"</string>
-  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"出于安全原因，您不能选择这个 PIN 码"</string>
+选择好记的 PIN 码。如果忘掉了此 PIN 码，你将被迫从 app 注销。"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"出于安全考虑，你不能使用此 PIN 码"</string>
   <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"选择不同的 PIN 码"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"请输入两次相同的 PIN 码"</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"PIN 码不匹配"</string>
-  <string name="screen_app_lock_signout_alert_message">"您需要重新登录并创建新的 PIN 才能继续"</string>
-  <string name="screen_app_lock_signout_alert_title">"您正在登出"</string>
+  <string name="screen_app_lock_signout_alert_message">"你需要重新登录并创建新的 PIN 码才能继续"</string>
+  <string name="screen_app_lock_signout_alert_title">"正在被移除该设备"</string>
   <plurals name="screen_app_lock_subtitle">
     <item quantity="other">"还剩 %1$d 次解锁机会"</item>
   </plurals>
@@ -32,5 +32,5 @@
   </plurals>
   <string name="screen_app_lock_use_biometric_android">"使用生物识别"</string>
   <string name="screen_app_lock_use_pin_android">"使用 PIN 码"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除设备…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointIntentTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointIntentTest.kt
index e99223735f..e2b410e663 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointIntentTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointIntentTest.kt
@@ -8,15 +8,13 @@
 
 package io.element.android.features.lockscreen.impl
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.impl.unlock.activity.PinUnlockActivity
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultLockScreenEntryPointIntentTest {
+class DefaultLockScreenEntryPointIntentTest : RobolectricTest() {
     @Test
     fun `test pin unlock intent`() {
         val entryPoint = DefaultLockScreenEntryPoint()
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenServiceTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenServiceTest.kt
index 9082f20a55..f906d0d6ba 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenServiceTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenServiceTest.kt
@@ -14,9 +14,12 @@ import io.element.android.features.lockscreen.impl.biometric.BiometricAuthentica
 import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthenticatorManager
 import io.element.android.features.lockscreen.impl.fixtures.aLockScreenConfig
 import io.element.android.features.lockscreen.impl.pin.PinCodeManager
+import io.element.android.features.lockscreen.impl.pin.SECRET_KEY_ALIAS
 import io.element.android.features.lockscreen.impl.pin.createDefaultPinCodeManager
 import io.element.android.features.lockscreen.impl.pin.storage.InMemoryLockScreenStore
 import io.element.android.features.lockscreen.impl.storage.LockScreenStore
+import io.element.android.libraries.cryptography.api.SecretKeyRepository
+import io.element.android.libraries.cryptography.test.SimpleSecretKeyRepository
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
 import io.element.android.services.appnavstate.api.AppForegroundStateService
@@ -38,18 +41,18 @@ class DefaultLockScreenServiceTest {
 
     @Test
     fun `when the pin is mandatory, isSetupRequired emits true`() = runTest {
-        val lockScreenStore = InMemoryLockScreenStore()
+        val secretKeyRepository = SimpleSecretKeyRepository()
         val sut = createDefaultLockScreenService(
             lockScreenConfig = aLockScreenConfig(isPinMandatory = true),
-            lockScreenStore = lockScreenStore,
+            secretKeyRepository = secretKeyRepository,
         )
         sut.isSetupRequired().test {
             assertThat(awaitItem()).isTrue()
             // When the user configures the pin code, the setup is not required anymore
-            lockScreenStore.saveEncryptedPinCode("encryptedCode")
+            secretKeyRepository.getOrCreateKey(SECRET_KEY_ALIAS, true)
             assertThat(awaitItem()).isFalse()
             // Users deletes the pin code
-            lockScreenStore.deleteEncryptedPinCode()
+            secretKeyRepository.deleteKey("elementx.SECRET_KEY_ALIAS_PIN_CODE")
             assertThat(awaitItem()).isTrue()
         }
     }
@@ -57,16 +60,16 @@ class DefaultLockScreenServiceTest {
     @Test
     fun `when the last session is deleted, the pin code is removed`() = runTest {
         val sessionObserver = FakeSessionObserver()
-        val lockScreenStore = InMemoryLockScreenStore()
+        val secretKeyRepository = SimpleSecretKeyRepository()
         val sut = createDefaultLockScreenService(
             lockScreenConfig = aLockScreenConfig(isPinMandatory = true),
-            lockScreenStore = lockScreenStore,
+            secretKeyRepository = secretKeyRepository,
             sessionObserver = sessionObserver,
         )
         sut.isPinSetup().test {
             assertThat(awaitItem()).isFalse()
             // When the user configure the pin code, the setup is not required anymore
-            lockScreenStore.saveEncryptedPinCode("encryptedCode")
+            secretKeyRepository.getOrCreateKey(SECRET_KEY_ALIAS, true)
             assertThat(awaitItem()).isTrue()
             sessionObserver.onSessionDeleted("userId", wasLastSession = false)
             expectNoEvents()
@@ -79,8 +82,10 @@ class DefaultLockScreenServiceTest {
 private fun TestScope.createDefaultLockScreenService(
     lockScreenConfig: LockScreenConfig = aLockScreenConfig(),
     lockScreenStore: LockScreenStore = InMemoryLockScreenStore(),
+    secretKeyRepository: SecretKeyRepository = SimpleSecretKeyRepository(),
     pinCodeManager: PinCodeManager = createDefaultPinCodeManager(
         lockScreenStore = lockScreenStore,
+        secretKeyRepository = secretKeyRepository,
     ),
     sessionObserver: SessionObserver = FakeSessionObserver(),
     appForegroundStateService: AppForegroundStateService = FakeAppForegroundStateService(),
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticator.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticator.kt
index 073bdc799d..0fb2e9df8b 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticator.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticator.kt
@@ -8,10 +8,18 @@
 
 package io.element.android.features.lockscreen.impl.biometric
 
+import io.element.android.tests.testutils.simulateLongTask
+
 class FakeBiometricAuthenticator(
     override val isActive: Boolean = false,
-    private val authenticateLambda: suspend () -> BiometricAuthenticator.AuthenticationResult = { BiometricAuthenticator.AuthenticationResult.Success },
+    private val setupLambda: () -> Unit = { },
+    private val authenticateLambda: () -> BiometricAuthenticator.AuthenticationResult = { BiometricAuthenticator.AuthenticationResult.Success },
 ) : BiometricAuthenticator {
-    override fun setup() = Unit
-    override suspend fun authenticate() = authenticateLambda()
+    override suspend fun setup() = simulateLongTask {
+        setupLambda()
+    }
+
+    override suspend fun authenticate() = simulateLongTask {
+        authenticateLambda()
+    }
 }
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticatorManager.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticatorManager.kt
index 9e9b892582..1a70f25d30 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticatorManager.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/biometric/FakeBiometricAuthenticatorManager.kt
@@ -12,9 +12,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 
 class FakeBiometricAuthenticatorManager(
-    override var isDeviceSecured: Boolean = true,
-    override var hasAvailableAuthenticator: Boolean = false,
+    override val isDeviceSecured: Boolean = true,
+    override val canUseDeviceUnlock: Boolean = true,
+    override val hasAvailableAuthenticator: Boolean = false,
     private val createBiometricAuthenticator: () -> BiometricAuthenticator = { FakeBiometricAuthenticator() },
+    private val disableLambda: suspend () -> Unit = { },
 ) : BiometricAuthenticatorManager {
     override fun addCallback(callback: BiometricAuthenticator.Callback) {
         // no-op
@@ -27,7 +29,14 @@ class FakeBiometricAuthenticatorManager(
     @Composable
     override fun rememberUnlockBiometricAuthenticator(): BiometricAuthenticator {
         return remember {
-           createBiometricAuthenticator()
+            createBiometricAuthenticator()
+        }
+    }
+
+    @Composable
+    override fun rememberUnlockDeviceBiometricAuthenticator(): BiometricAuthenticator {
+        return remember {
+            createBiometricAuthenticator()
         }
     }
 
@@ -37,4 +46,8 @@ class FakeBiometricAuthenticatorManager(
             createBiometricAuthenticator()
         }
     }
+
+    override suspend fun disable() {
+        disableLambda()
+    }
 }
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenterTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenterTest.kt
new file mode 100644
index 0000000000..52aeaa04a8
--- /dev/null
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/device/DeviceUnlockPresenterTest.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.lockscreen.impl.device
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticator
+import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthenticator
+import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthenticatorManager
+import io.element.android.features.lockscreen.impl.fixtures.aPinCodeManager
+import io.element.android.features.lockscreen.impl.pin.PinCodeManager
+import io.element.android.features.lockscreen.impl.unlock.PinUnlockHelper
+import io.element.android.features.lockscreen.test.FakeDeviceUnlockEntryPointCallback
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DeviceUnlockPresenterTest {
+    @Test
+    fun `present - when unlock requested and device unlock available, use biometric authenticator`() = runTest {
+        val setupLambda = lambdaRecorder<Unit> { }
+        val authenticateLambda = lambdaRecorder<BiometricAuthenticator.AuthenticationResult> {
+            BiometricAuthenticator.AuthenticationResult.Success
+        }
+        val fakeBiometricAuthenticator = FakeBiometricAuthenticator(
+            setupLambda = setupLambda,
+            authenticateLambda = authenticateLambda,
+        )
+        val biometricAuthenticatorManager = FakeBiometricAuthenticatorManager(
+            canUseDeviceUnlock = true,
+            createBiometricAuthenticator = { fakeBiometricAuthenticator },
+        )
+        val callbackHolder = DeviceUnlockCallbackHolder()
+        val callback = FakeDeviceUnlockEntryPointCallback()
+
+        createDeviceUnlockPresenter(
+            biometricAuthenticatorManager = biometricAuthenticatorManager,
+            callbackHolder = callbackHolder,
+        ).test {
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isFalse()
+            }
+            callbackHolder.requestUnlock(callback)
+            advanceUntilIdle()
+            setupLambda.assertions().isCalledOnce()
+            authenticateLambda.assertions().isCalledOnce()
+            skipItems(1)
+        }
+    }
+
+    @Test
+    fun `present - when unlock requested and device unlock unavailable and app pin is configured, show app pin`() = runTest {
+        val callbackHolder = DeviceUnlockCallbackHolder()
+        val callback = FakeDeviceUnlockEntryPointCallback()
+        val pinCodeManager = aPinCodeManager().apply {
+            createPinCode("1234")
+        }
+        createDeviceUnlockPresenter(
+            biometricAuthenticatorManager = FakeBiometricAuthenticatorManager(canUseDeviceUnlock = false),
+            callbackHolder = callbackHolder,
+            pinCodeManager = pinCodeManager,
+        ).test {
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isFalse()
+            }
+
+            callbackHolder.requestUnlock(callback)
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isTrue()
+            }
+        }
+    }
+
+    @Test
+    fun `present - when unlock requested and no security, unlock immediately`() = runTest {
+        val callbackHolder = DeviceUnlockCallbackHolder()
+        val onUnlockedLambda = lambdaRecorder<Unit> { }
+        val callback = FakeDeviceUnlockEntryPointCallback(
+            onUnlockedLambda = onUnlockedLambda,
+        )
+        createDeviceUnlockPresenter(
+            biometricAuthenticatorManager = FakeBiometricAuthenticatorManager(canUseDeviceUnlock = false),
+            callbackHolder = callbackHolder,
+        ).test {
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isFalse()
+            }
+            callbackHolder.requestUnlock(callback)
+            skipItems(2)
+            assertThat(callbackHolder.deviceUnlockCallback.value).isNull()
+            onUnlockedLambda.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - CancelPinCode event cancels unlock request`() = runTest {
+        val callbackHolder = DeviceUnlockCallbackHolder()
+        val onCancelLambda = lambdaRecorder<Unit> { }
+        val callback = FakeDeviceUnlockEntryPointCallback(
+            onCancelLambda = onCancelLambda,
+        )
+        val pinCodeManager = aPinCodeManager().apply {
+            createPinCode("1234")
+        }
+        createDeviceUnlockPresenter(
+            biometricAuthenticatorManager = FakeBiometricAuthenticatorManager(canUseDeviceUnlock = false),
+            callbackHolder = callbackHolder,
+            pinCodeManager = pinCodeManager,
+        ).test {
+            awaitItem()
+            callbackHolder.requestUnlock(callback)
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isTrue()
+                state.eventSink(DeviceUnlockEvent.CancelPinCode)
+            }
+            awaitItem().also { state ->
+                assertThat(state.showApplicationPinCode).isFalse()
+            }
+            skipItems(1)
+            onCancelLambda.assertions().isCalledOnce()
+            assertThat(callbackHolder.deviceUnlockCallback.value).isNull()
+        }
+    }
+
+    private fun createDeviceUnlockPresenter(
+        biometricAuthenticatorManager: FakeBiometricAuthenticatorManager = FakeBiometricAuthenticatorManager(),
+        callbackHolder: DeviceUnlockCallbackHolder = DeviceUnlockCallbackHolder(),
+        pinCodeManager: PinCodeManager = aPinCodeManager(),
+    ): DeviceUnlockPresenter {
+        val pinUnlockHelper = PinUnlockHelper(
+            biometricAuthenticatorManager = biometricAuthenticatorManager,
+            pinCodeManager = pinCodeManager,
+        )
+        return DeviceUnlockPresenter(
+            pinUnlockHelper = pinUnlockHelper,
+            biometricAuthenticatorManager = biometricAuthenticatorManager,
+            deviceUnlockCallbackHolder = callbackHolder,
+            pinCodeManager = pinCodeManager,
+        )
+    }
+}
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/storage/InMemoryLockScreenStore.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/storage/InMemoryLockScreenStore.kt
index 61acf71cdd..312a33b7f1 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/storage/InMemoryLockScreenStore.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/pin/storage/InMemoryLockScreenStore.kt
@@ -15,12 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 private const val DEFAULT_REMAINING_ATTEMPTS = 3
 
 class InMemoryLockScreenStore : LockScreenStore {
-    private val hasPinCode = MutableStateFlow(false)
     private var pinCode: String? = null
-        set(value) {
-            field = value
-            hasPinCode.value = value != null
-        }
     private var remainingAttempts: Int = DEFAULT_REMAINING_ATTEMPTS
     private var isBiometricUnlockAllowed = MutableStateFlow(false)
 
@@ -48,10 +43,6 @@ class InMemoryLockScreenStore : LockScreenStore {
         pinCode = null
     }
 
-    override fun hasPinCode(): Flow<Boolean> {
-        return hasPinCode
-    }
-
     override fun isBiometricUnlockAllowed(): Flow<Boolean> {
         return isBiometricUnlockAllowed
     }
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenterTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenterTest.kt
index ef3e94f27f..85eb4a37e7 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenterTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenterTest.kt
@@ -43,19 +43,19 @@ class LockScreenSettingsPresenterTest {
             consumeItemsUntilPredicate { state ->
                 state.showRemovePinOption
             }.last().also { state ->
-                state.eventSink(LockScreenSettingsEvents.OnRemovePin)
+                state.eventSink(LockScreenSettingsEvent.OnRemovePin)
             }
             awaitLastSequentialItem().also { state ->
                 assertThat(state.showRemovePinConfirmation).isTrue()
-                state.eventSink(LockScreenSettingsEvents.CancelRemovePin)
+                state.eventSink(LockScreenSettingsEvent.CancelRemovePin)
             }
             awaitLastSequentialItem().also { state ->
                 assertThat(state.showRemovePinConfirmation).isFalse()
-                state.eventSink(LockScreenSettingsEvents.OnRemovePin)
+                state.eventSink(LockScreenSettingsEvent.OnRemovePin)
             }
             awaitLastSequentialItem().also { state ->
                 assertThat(state.showRemovePinConfirmation).isTrue()
-                state.eventSink(LockScreenSettingsEvents.ConfirmRemovePin)
+                state.eventSink(LockScreenSettingsEvent.ConfirmRemovePin)
             }
             consumeItemsUntilPredicate {
                 it.showRemovePinOption.not()
@@ -93,7 +93,7 @@ class LockScreenSettingsPresenterTest {
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
-                state.eventSink(LockScreenSettingsEvents.ToggleBiometricAllowed)
+                state.eventSink(LockScreenSettingsEvent.ToggleBiometricAllowed)
             }
             awaitItem().also { state ->
                 assertThat(state.isBiometricEnabled).isTrue()
@@ -114,7 +114,7 @@ class LockScreenSettingsPresenterTest {
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
-                state.eventSink(LockScreenSettingsEvents.ToggleBiometricAllowed)
+                state.eventSink(LockScreenSettingsEvent.ToggleBiometricAllowed)
             }
         }
     }
@@ -137,7 +137,7 @@ class LockScreenSettingsPresenterTest {
             skipItems(1)
             awaitItem().also { state ->
                 assertThat(state.isBiometricEnabled).isTrue()
-                state.eventSink(LockScreenSettingsEvents.ToggleBiometricAllowed)
+                state.eventSink(LockScreenSettingsEvent.ToggleBiometricAllowed)
             }
             awaitItem().also { state ->
                 assertThat(state.isBiometricEnabled).isFalse()
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenterTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenterTest.kt
index 3f87c1dccf..9dde220906 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenterTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricPresenterTest.kt
@@ -8,9 +8,6 @@
 
 package io.element.android.features.lockscreen.impl.setup.biometric
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticator
 import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticatorManager
@@ -18,6 +15,7 @@ import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthen
 import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthenticatorManager
 import io.element.android.features.lockscreen.impl.pin.storage.InMemoryLockScreenStore
 import io.element.android.features.lockscreen.impl.storage.LockScreenStore
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -30,12 +28,10 @@ class SetupBiometricPresenterTest {
             FakeBiometricAuthenticator(authenticateLambda = { BiometricAuthenticator.AuthenticationResult.Success })
         })
         val presenter = createSetupBiometricPresenter(lockScreenStore, fakeBiometricAuthenticatorManager)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().also { state ->
                 assertThat(state.isBiometricSetupDone).isFalse()
-                state.eventSink(SetupBiometricEvents.AllowBiometric)
+                state.eventSink(SetupBiometricEvent.AllowBiometric)
             }
             awaitItem().also { state ->
                 assertThat(state.isBiometricSetupDone).isTrue()
@@ -51,12 +47,10 @@ class SetupBiometricPresenterTest {
             FakeBiometricAuthenticator(authenticateLambda = { BiometricAuthenticator.AuthenticationResult.Failure() })
         })
         val presenter = createSetupBiometricPresenter(lockScreenStore, fakeBiometricAuthenticatorManager)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().also { state ->
                 assertThat(state.isBiometricSetupDone).isFalse()
-                state.eventSink(SetupBiometricEvents.AllowBiometric)
+                state.eventSink(SetupBiometricEvent.AllowBiometric)
             }
         }
         assertThat(lockScreenStore.isBiometricUnlockAllowed().first()).isFalse()
@@ -66,12 +60,10 @@ class SetupBiometricPresenterTest {
     fun `present - skip flow`() = runTest {
         val lockScreenStore = InMemoryLockScreenStore()
         val presenter = createSetupBiometricPresenter(lockScreenStore)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().also { state ->
                 assertThat(state.isBiometricSetupDone).isFalse()
-                state.eventSink(SetupBiometricEvents.UsePin)
+                state.eventSink(SetupBiometricEvent.UsePin)
             }
             awaitItem().also { state ->
                 assertThat(state.isBiometricSetupDone).isTrue()
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenterTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenterTest.kt
index 6a1d32e879..9d63f9e26b 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenterTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinPresenterTest.kt
@@ -8,9 +8,6 @@
 
 package io.element.android.features.lockscreen.impl.setup.pin
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.impl.LockScreenConfig
 import io.element.android.features.lockscreen.impl.fixtures.aLockScreenConfig
@@ -24,6 +21,7 @@ import io.element.android.features.lockscreen.impl.setup.pin.validation.SetupPin
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -43,9 +41,7 @@ class SetupPinPresenterTest {
             }
         }
         val presenter = createSetupPinPresenter(callback)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().also { state ->
                 state.choosePinEntry.assertEmpty()
                 state.confirmPinEntry.assertEmpty()
@@ -63,7 +59,7 @@ class SetupPinPresenterTest {
             awaitLastSequentialItem().also { state ->
                 state.choosePinEntry.assertText(forbiddenPin)
                 assertThat(state.setupPinFailure).isEqualTo(SetupPinFailure.ForbiddenPin)
-                state.eventSink(SetupPinEvents.ClearFailure)
+                state.eventSink(SetupPinEvent.ClearFailure)
             }
             awaitLastSequentialItem().also { state ->
                 state.choosePinEntry.assertEmpty()
@@ -82,7 +78,7 @@ class SetupPinPresenterTest {
                 state.choosePinEntry.assertText(completePin)
                 state.confirmPinEntry.assertText(mismatchedPin)
                 assertThat(state.setupPinFailure).isEqualTo(SetupPinFailure.PinsDoNotMatch)
-                state.eventSink(SetupPinEvents.ClearFailure)
+                state.eventSink(SetupPinEvent.ClearFailure)
             }
             awaitLastSequentialItem().also { state ->
                 state.choosePinEntry.assertEmpty()
@@ -108,7 +104,7 @@ class SetupPinPresenterTest {
     }
 
     private fun SetupPinState.onPinEntryChanged(pinEntry: String) {
-        eventSink(SetupPinEvents.OnPinEntryChanged(pinEntry, isConfirmationStep))
+        eventSink(SetupPinEvent.OnPinEntryChanged(pinEntry, isConfirmationStep))
     }
 
     private fun createSetupPinPresenter(
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt
index f5bfb11818..b20a99d27f 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt
@@ -8,9 +8,6 @@
 
 package io.element.android.features.lockscreen.impl.unlock
 
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.impl.biometric.BiometricAuthenticatorManager
 import io.element.android.features.lockscreen.impl.biometric.FakeBiometricAuthenticatorManager
@@ -19,12 +16,14 @@ import io.element.android.features.lockscreen.impl.pin.DefaultPinCodeManagerCall
 import io.element.android.features.lockscreen.impl.pin.PinCodeManager
 import io.element.android.features.lockscreen.impl.pin.model.PinEntry
 import io.element.android.features.lockscreen.impl.pin.model.assertText
+import io.element.android.features.lockscreen.impl.pin.storage.InMemoryLockScreenStore
 import io.element.android.features.lockscreen.impl.unlock.keypad.PinKeypadModel
 import io.element.android.features.logout.test.FakeLogoutUseCase
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -36,9 +35,7 @@ class PinUnlockPresenterTest {
     @Test
     fun `present - success verify flow`() = runTest {
         val presenter = createPinUnlockPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             awaitItem().also { state ->
                 assertThat(state.pinEntry).isInstanceOf(AsyncData.Uninitialized::class.java)
                 assertThat(state.showWrongPinTitle).isFalse()
@@ -50,17 +47,17 @@ class PinUnlockPresenterTest {
             awaitItem().also { state ->
                 assertThat(state.pinEntry).isInstanceOf(AsyncData.Success::class.java)
                 assertThat(state.remainingAttempts).isInstanceOf(AsyncData.Success::class.java)
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('1')))
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('2')))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('1')))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('2')))
             }
             skipItems(1)
             awaitItem().also { state ->
                 state.pinEntry.assertText(halfCompletePin)
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('3')))
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Back))
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Empty))
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('3')))
-                state.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('5')))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('3')))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Back))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Empty))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('3')))
+                state.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('5')))
             }
             skipItems(4)
             awaitItem().also { state ->
@@ -73,9 +70,7 @@ class PinUnlockPresenterTest {
     @Test
     fun `present - failure verify flow`() = runTest {
         val presenter = createPinUnlockPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             val initialState = awaitItem().also { state ->
                 assertThat(state.pinEntry).isInstanceOf(AsyncData.Success::class.java)
@@ -83,10 +78,10 @@ class PinUnlockPresenterTest {
             }
             val numberOfAttempts = initialState.remainingAttempts.dataOrNull() ?: 0
             repeat(numberOfAttempts) {
-                initialState.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('1')))
-                initialState.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('2')))
-                initialState.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('3')))
-                initialState.eventSink(PinUnlockEvents.OnPinKeypadPressed(PinKeypadModel.Number('4')))
+                initialState.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('1')))
+                initialState.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('2')))
+                initialState.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('3')))
+                initialState.eventSink(PinUnlockEvent.OnPinKeypadPressed(PinKeypadModel.Number('4')))
             }
             skipItems(4 * numberOfAttempts + 2)
             awaitItem().also { state ->
@@ -102,27 +97,25 @@ class PinUnlockPresenterTest {
         val signOutLambda = lambdaRecorder<Boolean, Unit> {}
         val signOut = FakeLogoutUseCase(signOutLambda)
         val presenter = createPinUnlockPresenter(logoutUseCase = signOut)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             skipItems(1)
             awaitItem().also { state ->
                 assertThat(state.pinEntry).isInstanceOf(AsyncData.Success::class.java)
                 assertThat(state.remainingAttempts).isInstanceOf(AsyncData.Success::class.java)
-                state.eventSink(PinUnlockEvents.OnForgetPin)
+                state.eventSink(PinUnlockEvent.OnForgetPin)
             }
             awaitItem().also { state ->
                 assertThat(state.showSignOutPrompt).isTrue()
                 assertThat(state.isSignOutPromptCancellable).isTrue()
-                state.eventSink(PinUnlockEvents.ClearSignOutPrompt)
+                state.eventSink(PinUnlockEvent.ClearSignOutPrompt)
             }
             awaitItem().also { state ->
                 assertThat(state.showSignOutPrompt).isFalse()
-                state.eventSink(PinUnlockEvents.OnForgetPin)
+                state.eventSink(PinUnlockEvent.OnForgetPin)
             }
             awaitItem().also { state ->
                 assertThat(state.showSignOutPrompt).isTrue()
-                state.eventSink(PinUnlockEvents.SignOut)
+                state.eventSink(PinUnlockEvent.SignOut)
             }
             skipItems(2)
             awaitItem().also { state ->
@@ -132,20 +125,70 @@ class PinUnlockPresenterTest {
         }
     }
 
+    @Test
+    fun `present - pin is configured, but deleted in store, sign out prompt will be shown`() = runTest {
+        val lockScreenStore = InMemoryLockScreenStore()
+        val pinCodeManager = aPinCodeManager(
+            lockScreenStore = lockScreenStore,
+        )
+        val presenter = createPinUnlockPresenter(
+            pinCodeManager = pinCodeManager,
+        )
+        // Delete the pin code from the store
+        lockScreenStore.deleteEncryptedPinCode()
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.pinEntry).isInstanceOf(AsyncData.Failure::class.java)
+                assertThat(state.showSignOutPrompt).isTrue()
+                assertThat(state.isSignOutPromptCancellable).isFalse()
+                assertThat(state.remainingAttempts.dataOrNull()).isEqualTo(3)
+            }
+        }
+    }
+
+    @Test
+    fun `present - forDeviceUnlock is exposed in state`() = runTest {
+        val presenter = createPinUnlockPresenter(forDeviceUnlock = true)
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.canNavigateBack).isTrue()
+            }
+        }
+    }
+
+    @Test
+    fun `present - pin entry changed event updates pin entry`() = runTest {
+        val presenter = createPinUnlockPresenter()
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                state.eventSink(PinUnlockEvent.OnPinEntryChanged(halfCompletePin))
+            }
+            awaitItem().also { state ->
+                state.pinEntry.assertText(halfCompletePin)
+            }
+        }
+    }
+
     private fun AsyncData<PinEntry>.assertText(text: String) {
         dataOrNull()?.assertText(text)
     }
 
     private suspend fun TestScope.createPinUnlockPresenter(
+        forDeviceUnlock: Boolean = false,
         biometricAuthenticatorManager: BiometricAuthenticatorManager = FakeBiometricAuthenticatorManager(),
         callback: PinCodeManager.Callback = DefaultPinCodeManagerCallback(),
-        logoutUseCase: FakeLogoutUseCase = FakeLogoutUseCase(logoutLambda = { "" }),
+        logoutUseCase: FakeLogoutUseCase = FakeLogoutUseCase(logoutLambda = {}),
+        pinCodeManager: PinCodeManager = aPinCodeManager()
     ): PinUnlockPresenter {
-        val pinCodeManager = aPinCodeManager().apply {
+        pinCodeManager.apply {
             addCallback(callback)
             createPinCode(completePin)
         }
         return PinUnlockPresenter(
+            forDeviceUnlock = forDeviceUnlock,
             pinCodeManager = pinCodeManager,
             biometricAuthenticatorManager = biometricAuthenticatorManager,
             logoutUseCase = logoutUseCase,
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadTest.kt
index 1ecb79bd67..fb7d3aa372 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypadTest.kt
@@ -6,60 +6,55 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.lockscreen.impl.unlock.keypad
 
 import android.view.KeyEvent
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.test.AndroidComposeUiTest
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.isRoot
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performKeyInput
 import androidx.compose.ui.test.pressKey
 import androidx.compose.ui.test.requestFocus
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import androidx.compose.ui.unit.dp
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class PinKeypadTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class PinKeypadTest : RobolectricTest() {
     @Test
-    fun `clicking on a number emits the expected event`() {
+    fun `clicking on a number emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinKeypadModel>()
-        rule.setPinKeyPad(onClick = eventsRecorder)
-        rule.onNode(hasText("1")).performClick()
+        setPinKeyPad(onClick = eventsRecorder)
+        onNode(hasText("1")).performClick()
         eventsRecorder.assertSingle(PinKeypadModel.Number('1'))
     }
 
     @Test
-    fun `clicking on the delete previous character button emits the expected event`() {
+    fun `clicking on the delete previous character button emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinKeypadModel>()
-        rule.setPinKeyPad(onClick = eventsRecorder)
-        rule.onNode(hasContentDescription(rule.activity.getString(CommonStrings.a11y_delete))).performClick()
+        setPinKeyPad(onClick = eventsRecorder)
+        onNode(hasContentDescription(activity!!.getString(CommonStrings.a11y_delete))).performClick()
         eventsRecorder.assertSingle(PinKeypadModel.Back)
     }
 
     @OptIn(ExperimentalTestApi::class)
     @Test
-    fun `typing using the hardware keyboard emits the expected events`() {
+    fun `typing using the hardware keyboard emits the expected events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinKeypadModel>()
-        rule.setPinKeyPad(onClick = eventsRecorder)
-        rule.onNodeWithText("1").requestFocus()
-        rule.onAllNodes(isRoot())[0].performKeyInput {
+        setPinKeyPad(onClick = eventsRecorder)
+        onNodeWithText("1").requestFocus()
+        onAllNodes(isRoot())[0].performKeyInput {
             val keys = listOf(
                 Key.A,
                 Key.NumPad1,
@@ -118,7 +113,7 @@ class PinKeypadTest {
         )
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPinKeyPad(
+    private fun AndroidComposeUiTest<ComponentActivity>.setPinKeyPad(
         onClick: (PinKeypadModel) -> Unit = EnsureNeverCalledWithParam(),
     ) {
         setContent {
diff --git a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPoint.kt b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPoint.kt
new file mode 100644
index 0000000000..8278fc882f
--- /dev/null
+++ b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPoint.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.lockscreen.api.DeviceUnlockEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeDeviceUnlockEntryPoint : DeviceUnlockEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node = lambdaError()
+
+    override fun requestUnlock(callback: DeviceUnlockEntryPoint.Callback) = lambdaError()
+}
diff --git a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPointCallback.kt b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPointCallback.kt
new file mode 100644
index 0000000000..3b7394cae0
--- /dev/null
+++ b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeDeviceUnlockEntryPointCallback.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.lockscreen.test
+
+import io.element.android.features.lockscreen.api.DeviceUnlockEntryPoint
+import io.element.android.tests.testutils.EnsureNeverCalled
+
+class FakeDeviceUnlockEntryPointCallback(
+    private val onCancelLambda: () -> Unit = EnsureNeverCalled(),
+    private val onUnlockedLambda: () -> Unit = EnsureNeverCalled(),
+) : DeviceUnlockEntryPoint.Callback {
+    override fun onCancel() = onCancelLambda()
+    override fun onUnlock() = onUnlockedLambda()
+}
diff --git a/features/login/impl/build.gradle.kts b/features/login/impl/build.gradle.kts
index f19ba61783..86a8e0e7bc 100644
--- a/features/login/impl/build.gradle.kts
+++ b/features/login/impl/build.gradle.kts
@@ -55,11 +55,11 @@ setupDependencyInjection()
 dependencies {
     implementation(projects.appconfig)
     implementation(projects.features.enterprise.api)
+    implementation(projects.features.preferences.api)
     implementation(projects.features.rageshake.api)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
-    implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.designsystem)
@@ -68,7 +68,7 @@ dependencies {
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.qrcode)
-    implementation(projects.libraries.oidc.api)
+    implementation(projects.libraries.oauth.api)
     implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.wellknown.api)
     implementation(libs.androidx.browser)
@@ -79,9 +79,9 @@ dependencies {
     testCommonDependencies(libs, true)
     testImplementation(projects.features.login.test)
     testImplementation(projects.features.enterprise.test)
-    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.features.preferences.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.oidc.test)
+    testImplementation(projects.libraries.oauth.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.libraries.wellknown.test)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
index 928d98c244..978d28dfa3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@@ -22,6 +22,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
+import com.bumble.appyx.navmodel.backstack.operation.replace
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
@@ -30,14 +31,17 @@ import io.element.android.annotations.ContributesNode
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
+import io.element.android.features.login.impl.classic.ElementClassicConnection
 import io.element.android.features.login.impl.qrcode.QrCodeLoginFlowNode
 import io.element.android.features.login.impl.screens.changeaccountprovider.ChangeAccountProviderNode
 import io.element.android.features.login.impl.screens.chooseaccountprovider.ChooseAccountProviderNode
+import io.element.android.features.login.impl.screens.classic.ClassicFlowNode
 import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderNode
 import io.element.android.features.login.impl.screens.createaccount.CreateAccountNode
 import io.element.android.features.login.impl.screens.loginpassword.LoginPasswordNode
 import io.element.android.features.login.impl.screens.onboarding.OnBoardingNode
 import io.element.android.features.login.impl.screens.searchaccountprovider.SearchAccountProviderNode
+import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
@@ -46,9 +50,9 @@ import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.matrix.api.auth.OidcDetails
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -60,12 +64,14 @@ class LoginFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val accountProviderDataSource: AccountProviderDataSource,
-    private val oidcActionFlow: OidcActionFlow,
+    private val oAuthActionFlow: OAuthActionFlow,
     @AppCoroutineScope
     private val appCoroutineScope: CoroutineScope,
+    private val elementClassicConnection: ElementClassicConnection,
+    private val preferencesEntryPoint: PreferencesEntryPoint,
 ) : BaseFlowNode<LoginFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = NavTarget.OnBoarding,
+        initialElement = NavTarget.CheckClassicFlow,
         savedStateMap = buildContext.savedStateMap,
     ),
     buildContext = buildContext,
@@ -94,7 +100,7 @@ class LoginFlowNode(
                     // by pressing back or by closing the Custom Chrome Tab.
                     lifecycleScope.launch {
                         delay(5000)
-                        oidcActionFlow.post(OidcAction.GoBack(toUnblock = true))
+                        oAuthActionFlow.post(OAuthAction.GoBack(toUnblock = true))
                     }
                 }
             }
@@ -103,11 +109,19 @@ class LoginFlowNode(
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
-        data object OnBoarding : NavTarget
+        data object CheckClassicFlow : NavTarget
+
+        @Parcelize
+        data class OnBoarding(
+            val showBackButton: Boolean,
+        ) : NavTarget
 
         @Parcelize
         data object QrCode : NavTarget
 
+        @Parcelize
+        data object AppDeveloperSettings : NavTarget
+
         @Parcelize
         data class ConfirmAccountProvider(
             val isAccountCreation: Boolean,
@@ -123,7 +137,9 @@ class LoginFlowNode(
         data object SearchAccountProvider : NavTarget
 
         @Parcelize
-        data object LoginPassword : NavTarget
+        data class LoginPassword(
+            val initialLogin: String = "",
+        ) : NavTarget
 
         @Parcelize
         data class CreateAccount(val url: String) : NavTarget
@@ -131,7 +147,31 @@ class LoginFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.OnBoarding -> {
+            NavTarget.CheckClassicFlow -> {
+                val callback = object : ClassicFlowNode.Callback {
+                    override fun navigateToOnBoarding(allowBackNavigation: Boolean) {
+                        if (allowBackNavigation) {
+                            backstack.push(NavTarget.OnBoarding(showBackButton = true))
+                        } else {
+                            backstack.replace(NavTarget.OnBoarding(showBackButton = false))
+                        }
+                    }
+
+                    override fun navigateToLoginPassword() {
+                        backstack.push(NavTarget.LoginPassword())
+                    }
+
+                    override fun navigateToOAuth(oAuthDetails: OAuthDetails) {
+                        navigateToMas(oAuthDetails)
+                    }
+
+                    override fun navigateToCreateAccount(url: String) {
+                        backstack.push(NavTarget.CreateAccount(url))
+                    }
+                }
+                createNode<ClassicFlowNode>(buildContext, listOf(callback))
+            }
+            is NavTarget.OnBoarding -> {
                 val callback = object : OnBoardingNode.Callback {
                     override fun navigateToSignUpFlow() {
                         backstack.push(
@@ -157,33 +197,54 @@ class LoginFlowNode(
                         callback.navigateToBugReport()
                     }
 
-                    override fun navigateToOidc(oidcDetails: OidcDetails) {
-                        navigateToMas(oidcDetails)
+                    override fun navigateToOAuth(oAuthDetails: OAuthDetails) {
+                        navigateToMas(oAuthDetails)
                     }
 
                     override fun navigateToCreateAccount(url: String) {
                         backstack.push(NavTarget.CreateAccount(url))
                     }
 
+                    override fun navigateToDeveloperSettings() {
+                        backstack.push(NavTarget.AppDeveloperSettings)
+                    }
+
                     override fun navigateToLoginPassword() {
-                        backstack.push(NavTarget.LoginPassword)
+                        backstack.push(NavTarget.LoginPassword())
                     }
 
                     override fun onDone() {
-                        callback.onDone()
+                        if (navTarget.showBackButton) {
+                            backstack.pop()
+                        } else {
+                            callback.onDone()
+                        }
                     }
                 }
                 val params = inputs<Params>()
                 val inputs = OnBoardingNode.Params(
                     accountProvider = params.accountProvider,
                     loginHint = params.loginHint,
+                    showBackButton = navTarget.showBackButton,
                 )
                 createNode<OnBoardingNode>(buildContext, listOf(callback, inputs))
             }
+            NavTarget.AppDeveloperSettings -> {
+                val callback = object : PreferencesEntryPoint.DeveloperSettingsCallback {
+                    override fun onDone() {
+                        backstack.pop()
+                    }
+                }
+                preferencesEntryPoint.createAppDeveloperSettingsNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
+            }
             NavTarget.ChooseAccountProvider -> {
                 val callback = object : ChooseAccountProviderNode.Callback {
-                    override fun navigateToOidc(oidcDetails: OidcDetails) {
-                        navigateToMas(oidcDetails)
+                    override fun navigateToOAuth(oAuthDetails: OAuthDetails) {
+                        navigateToMas(oAuthDetails)
                     }
 
                     override fun navigateToCreateAccount(url: String) {
@@ -191,7 +252,7 @@ class LoginFlowNode(
                     }
 
                     override fun navigateToLoginPassword() {
-                        backstack.push(NavTarget.LoginPassword)
+                        backstack.push(NavTarget.LoginPassword())
                     }
                 }
                 createNode<ChooseAccountProviderNode>(buildContext, listOf(callback))
@@ -209,8 +270,8 @@ class LoginFlowNode(
                     isAccountCreation = navTarget.isAccountCreation,
                 )
                 val callback = object : ConfirmAccountProviderNode.Callback {
-                    override fun navigateToOidc(oidcDetails: OidcDetails) {
-                        navigateToMas(oidcDetails)
+                    override fun navigateToOAuth(oAuthDetails: OAuthDetails) {
+                        navigateToMas(oAuthDetails)
                     }
 
                     override fun navigateToCreateAccount(url: String) {
@@ -218,7 +279,7 @@ class LoginFlowNode(
                     }
 
                     override fun navigateToLoginPassword() {
-                        backstack.push(NavTarget.LoginPassword)
+                        backstack.push(NavTarget.LoginPassword())
                     }
 
                     override fun navigateToChangeAccountProvider() {
@@ -257,8 +318,11 @@ class LoginFlowNode(
 
                 createNode<SearchAccountProviderNode>(buildContext, plugins = listOf(callback))
             }
-            NavTarget.LoginPassword -> {
-                createNode<LoginPasswordNode>(buildContext)
+            is NavTarget.LoginPassword -> {
+                val inputs = LoginPasswordNode.Inputs(
+                    initialLogin = navTarget.initialLogin,
+                )
+                createNode<LoginPasswordNode>(buildContext, plugins = listOf(inputs))
             }
             is NavTarget.CreateAccount -> {
                 val inputs = CreateAccountNode.Inputs(
@@ -269,10 +333,10 @@ class LoginFlowNode(
         }
     }
 
-    private fun navigateToMas(oidcDetails: OidcDetails) {
+    private fun navigateToMas(oAuthDetails: OAuthDetails) {
         activity?.let {
             externalAppStarted = true
-            it.openUrlInChromeCustomTab(null, darkTheme, oidcDetails.url)
+            it.openUrlInChromeCustomTab(null, darkTheme, oAuthDetails.url)
         }
     }
 
@@ -280,6 +344,14 @@ class LoginFlowNode(
     override fun View(modifier: Modifier) {
         activity = requireNotNull(LocalActivity.current)
         darkTheme = !ElementTheme.isLightTheme
+
+        DisposableEffect(Unit) {
+            elementClassicConnection.start()
+            onDispose {
+                elementClassicConnection.stop()
+            }
+        }
+
         DisposableEffect(Unit) {
             onDispose {
                 activity = null
@@ -288,6 +360,6 @@ class LoginFlowNode(
                 }
             }
         }
-        BackstackView()
+        BackstackView(transitionHandler = rememberLoginFlowTransitionHandler())
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowTransitionHandler.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowTransitionHandler.kt
new file mode 100644
index 0000000000..5486619e5d
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowTransitionHandler.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl
+
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.Transition
+import androidx.compose.animation.core.spring
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.navigation.transition.ModifierTransitionHandler
+import com.bumble.appyx.core.navigation.transition.TransitionDescriptor
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.Replace
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackFader
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider
+import io.element.android.libraries.architecture.appyx.rememberDelegateTransitionHandler
+
+/**
+ * A TransitionHandler that uses fade transition when OnBoarding is replacing the current screen,
+ * and slide transition for all other cases.
+ */
+private class LoginFlowTransitionHandler(
+    private val slider: ModifierTransitionHandler<LoginFlowNode.NavTarget, BackStack.State>,
+    private val fader: ModifierTransitionHandler<LoginFlowNode.NavTarget, BackStack.State>,
+) : ModifierTransitionHandler<LoginFlowNode.NavTarget, BackStack.State>() {
+    override fun createModifier(
+        modifier: Modifier,
+        transition: Transition<BackStack.State>,
+        descriptor: TransitionDescriptor<LoginFlowNode.NavTarget, BackStack.State>
+    ): Modifier {
+        val useFader = descriptor.element is LoginFlowNode.NavTarget.OnBoarding &&
+            descriptor.operation is Replace
+        val handler = if (useFader) fader else slider
+        return handler.createModifier(modifier, transition, descriptor)
+    }
+}
+
+@Composable
+fun rememberLoginFlowTransitionHandler(): ModifierTransitionHandler<LoginFlowNode.NavTarget, BackStack.State> {
+    val slider = rememberBackstackSlider<LoginFlowNode.NavTarget>(
+        transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+    )
+    val fader = rememberBackstackFader<LoginFlowNode.NavTarget>(
+        transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+    )
+    return rememberDelegateTransitionHandler {
+        LoginFlowTransitionHandler(slider, fader)
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderOtherView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderOtherView.kt
index fd5c7b8019..8b9b22022e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderOtherView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderOtherView.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -40,7 +41,7 @@ fun AccountProviderOtherView(
     Column(
         modifier = modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(role = Role.Button) { onClick() }
     ) {
         HorizontalDivider()
         Row(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderView.kt
index 5130bf1ad8..fcf4dac3b1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderView.kt
@@ -19,6 +19,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.semantics.Role
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -45,7 +46,7 @@ fun AccountProviderView(
     Column(
         modifier = modifier
             .fillMaxWidth()
-            .clickable { onClick() }
+            .clickable(role = Role.Button) { onClick() }
     ) {
         HorizontalDivider()
         Column(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt
index 27e6128dd0..4f0d228dd2 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt
@@ -13,4 +13,6 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider
 sealed interface ChangeServerEvents {
     data class ChangeServer(val accountProvider: AccountProvider) : ChangeServerEvents
     data object ClearError : ChangeServerEvents
+    data object RequestLocalNetworkPermission : ChangeServerEvents
+    data object DismissLocalNetworkPermission : ChangeServerEvents
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
index 4a4fb3ca41..79f76d5fb5 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt
@@ -12,50 +12,55 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
 import io.element.android.features.login.impl.error.ChangeServerError
+import io.element.android.features.login.impl.localnetwork.LocalNetworkPermissionGate
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 
 @Inject
 class ChangeServerPresenter(
     private val authenticationService: MatrixAuthenticationService,
     private val accountProviderDataSource: AccountProviderDataSource,
     private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,
+    private val localNetworkPermissionGate: LocalNetworkPermissionGate,
 ) : Presenter<ChangeServerState> {
     @Composable
     override fun present(): ChangeServerState {
-        val localCoroutineScope = rememberCoroutineScope()
-
         val changeServerAction: MutableState<AsyncData<Unit>> = remember {
             mutableStateOf(AsyncData.Uninitialized)
         }
 
+        val gateState = localNetworkPermissionGate.present<AccountProvider>(
+            urlOf = { provider -> provider.url },
+            onProceed = { provider -> changeServer(provider, changeServerAction) },
+        )
+
         fun handleEvent(event: ChangeServerEvents) {
             when (event) {
-                is ChangeServerEvents.ChangeServer -> localCoroutineScope.changeServer(event.accountProvider, changeServerAction)
                 ChangeServerEvents.ClearError -> changeServerAction.value = AsyncData.Uninitialized
+                is ChangeServerEvents.ChangeServer -> gateState.submit(event.accountProvider)
+                ChangeServerEvents.DismissLocalNetworkPermission -> gateState.abort()
+                ChangeServerEvents.RequestLocalNetworkPermission -> gateState.requestPermission()
             }
         }
 
         return ChangeServerState(
             changeServerAction = changeServerAction.value,
+            localNetworkPermissionDialog = gateState.dialog,
             eventSink = ::handleEvent,
         )
     }
 
-    private fun CoroutineScope.changeServer(
+    private suspend fun changeServer(
         data: AccountProvider,
         changeServerAction: MutableState<AsyncData<Unit>>,
-    ) = launch {
+    ) {
         suspend {
             defaultAccountProviderAccessControl.assertIsAllowedToConnectToAccountProvider(
                 title = data.title,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt
index eea3ad78cd..6d8ce25d75 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt
@@ -9,8 +9,10 @@
 package io.element.android.features.login.impl.changeserver
 
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
 
 data class ChangeServerState(
     val changeServerAction: AsyncData<Unit>,
+    val localNetworkPermissionDialog: LocalNetworkPermissionDialog,
     val eventSink: (ChangeServerEvents) -> Unit
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
index 1a94bb5631..183158bceb 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt
@@ -11,6 +11,7 @@ package io.element.android.features.login.impl.changeserver
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.login.impl.error.ChangeServerError
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
 
 open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerState> {
     override val values: Sequence<ChangeServerState>
@@ -39,12 +40,15 @@ open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerStat
                     ChangeServerError.UnsupportedServer
                 )
             ),
+            aChangeServerState(localNetworkPermissionDialog = LocalNetworkPermissionDialog.Rationale),
         )
 }
 
 fun aChangeServerState(
     changeServerAction: AsyncData<Unit> = AsyncData.Uninitialized,
+    localNetworkPermissionDialog: LocalNetworkPermissionDialog = LocalNetworkPermissionDialog.None,
 ) = ChangeServerState(
     changeServerAction = changeServerAction,
+    localNetworkPermissionDialog = localNetworkPermissionDialog,
     eventSink = {}
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
index d6b9c1709b..30ae644a70 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.LocalBuildMeta
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -121,6 +122,15 @@ fun ChangeServerView(
         }
         AsyncData.Uninitialized -> Unit
     }
+    LocalNetworkPermissionDialogView(
+        dialog = state.localNetworkPermissionDialog,
+        onSubmit = {
+            eventSink.invoke(ChangeServerEvents.RequestLocalNetworkPermission)
+        },
+        onDismiss = {
+            eventSink.invoke(ChangeServerEvents.DismissLocalNetworkPermission)
+        }
+    )
 }
 
 @PreviewsDayNight
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/classic/ElementClassicConnection.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/classic/ElementClassicConnection.kt
new file mode 100644
index 0000000000..dfddd1d496
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/classic/ElementClassicConnection.kt
@@ -0,0 +1,411 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.classic
+
+import android.content.ComponentName
+import android.content.Context.BIND_AUTO_CREATE
+import android.content.Intent
+import android.content.ServiceConnection
+import android.graphics.Bitmap
+import android.os.Bundle
+import android.os.Handler
+import android.os.IBinder
+import android.os.Message
+import android.os.Messenger
+import android.os.RemoteException
+import androidx.annotation.VisibleForTesting
+import androidx.core.os.BundleCompat
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.features.login.impl.BuildConfig
+import io.element.android.libraries.androidutils.service.ServiceBinder
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.core.uri.ensureProtocol
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.matrix.api.auth.ElementClassicSession
+import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.api.core.UserId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+interface ElementClassicConnection {
+    fun start()
+    fun stop()
+    fun requestSession()
+    val stateFlow: StateFlow<ElementClassicConnectionState>
+}
+
+sealed interface ElementClassicConnectionState {
+    object Idle : ElementClassicConnectionState
+    object ElementClassicNotFound : ElementClassicConnectionState
+    object ElementClassicReadyNoSession : ElementClassicConnectionState
+    data class ElementClassicReady(
+        val elementClassicSession: ElementClassicSession,
+        val displayName: String?,
+        val avatar: Bitmap?,
+    ) : ElementClassicConnectionState
+
+    data class Error(val error: String) : ElementClassicConnectionState
+}
+
+private val loggerTag = LoggerTag("ECConnection")
+
+@ContributesBinding(AppScope::class)
+@SingleIn(AppScope::class)
+class DefaultElementClassicConnection(
+    private val serviceBinder: ServiceBinder,
+    @AppCoroutineScope
+    private val coroutineScope: CoroutineScope,
+    private val matrixAuthenticationService: MatrixAuthenticationService,
+    private val homeServerLoginCompatibilityChecker: HomeServerLoginCompatibilityChecker,
+) : ElementClassicConnection {
+    // Messenger for communicating with the service.
+    private var messenger: Messenger? = null
+
+    // Target we publish for external service to send messages to IncomingHandler.
+    private val incomingMessenger: Messenger = Messenger(IncomingHandler())
+
+    // Flag indicating whether we have called bind on the service.
+    private var bound: Boolean = false
+
+    private val mutableStateFlow = MutableStateFlow<ElementClassicConnectionState>(ElementClassicConnectionState.Idle)
+    override val stateFlow = mutableStateFlow.asStateFlow()
+
+    private val elementClassicComponent = ComponentName(
+        BuildConfig.elementClassicPackage,
+        ELEMENT_CLASSIC_SERVICE_FULL_CLASS_NAME,
+    )
+
+    /**
+     * Class for interacting with the main interface of the service.
+     */
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            Timber.tag(loggerTag.value).d("onServiceConnected")
+            // This is called when the connection with the service has been
+            // established, giving us the object we can use to
+            // interact with the service. We are communicating with the
+            // service using a Messenger, so here we get a client-side
+            // representation of that from the raw IBinder object.
+            messenger = Messenger(service)
+            bound = true
+            // Request the data as soon as possible
+            requestSession()
+        }
+
+        override fun onServiceDisconnected(className: ComponentName) {
+            Timber.tag(loggerTag.value).d("onServiceDisconnected")
+            // This is called when the connection with the service has been
+            // unexpectedly disconnected&mdash;that is, its process crashed.
+            messenger = null
+            bound = false
+        }
+    }
+
+    override fun start() {
+        Timber.tag(loggerTag.value).d("start()")
+        coroutineScope.launch {
+            // Establish a connection with the service. We use an explicit
+            // class name because there is no reason to be able to let other
+            // applications replace our component.
+            try {
+                val intentService = Intent()
+                intentService.setComponent(elementClassicComponent)
+                if (serviceBinder.bindService(intentService, serviceConnection, BIND_AUTO_CREATE)) {
+                    Timber.tag(loggerTag.value).d("Binding returned true")
+                } else {
+                    // This happens when the app is not installed
+                    Timber.tag(loggerTag.value).d("Binding returned false")
+                    emitState(ElementClassicConnectionState.ElementClassicNotFound)
+                }
+            } catch (e: SecurityException) {
+                Timber.tag(loggerTag.value).e(e, "Can't bind to Service")
+                emitState(ElementClassicConnectionState.Error(e.localizedMessage.orEmpty()))
+            }
+        }
+    }
+
+    override fun stop() {
+        Timber.tag(loggerTag.value).d("stop(): Unbinding (bound=$bound)")
+        if (bound) {
+            // Detach our existing connection.
+            serviceBinder.unbindService(serviceConnection)
+            bound = false
+        }
+        coroutineScope.launch {
+            emitState(ElementClassicConnectionState.Idle)
+        }
+    }
+
+    override fun requestSession() {
+        Timber.tag(loggerTag.value).d("requestSession()")
+        coroutineScope.launch {
+            val finalMessenger = messenger
+            if (finalMessenger == null) {
+                Timber.tag(loggerTag.value).d("The messenger is null, can't request data")
+                // Do not emit error, else the regular on boarding flow will be displayed
+            } else {
+                try {
+                    // Get the data
+                    val msg = Message.obtain(null, MSG_GET_SESSION)
+                    msg.replyTo = incomingMessenger
+                    finalMessenger.send(msg)
+                } catch (e: RemoteException) {
+                    // In this case the service has crashed before we could even
+                    // do anything with it; we can count on soon being
+                    // disconnected (and then reconnected if it can be restarted)
+                    // so there is no need to do anything here.
+                    Timber.tag(loggerTag.value).e(e, "RemoteException")
+                    emitState(ElementClassicConnectionState.Error(e.localizedMessage.orEmpty()))
+                }
+            }
+        }
+    }
+
+    private fun requestAvatar(userId: UserId) {
+        Timber.tag(loggerTag.value).d("requestAvatar()")
+        coroutineScope.launch {
+            val finalMessenger = messenger
+            if (finalMessenger == null) {
+                Timber.tag(loggerTag.value).w("The messenger is null, can't request extra data")
+            } else {
+                try {
+                    // Get the data
+                    val msg = Message.obtain(null, MSG_GET_AVATAR)
+                    msg.data = Bundle().apply {
+                        putString(KEY_USER_ID_STR, userId.value)
+                    }
+                    msg.replyTo = incomingMessenger
+                    finalMessenger.send(msg)
+                } catch (e: RemoteException) {
+                    // In this case the service has crashed before we could even
+                    // do anything with it; we can count on soon being
+                    // disconnected (and then reconnected if it can be restarted)
+                    // so there is no need to do anything here.
+                    Timber.tag(loggerTag.value).e(e, "RemoteException")
+                }
+            }
+        }
+    }
+
+    /**
+     * Handler of incoming messages from service.
+     */
+    @Suppress("DEPRECATION")
+    inner class IncomingHandler : Handler() {
+        override fun handleMessage(msg: Message) {
+            Timber.tag(loggerTag.value).d("IncomingHandler handling message ${msg.what}")
+            when (msg.what) {
+                MSG_GET_SESSION -> onSessionReceived(msg.data)
+                MSG_GET_AVATAR -> onAvatarReceived(msg.data)
+                else -> {
+                    Timber.tag(loggerTag.value).w("Received unknown message ${msg.what}")
+                    super.handleMessage(msg)
+                }
+            }
+        }
+    }
+
+    @VisibleForTesting
+    fun onSessionReceived(data: Bundle) {
+        // The data must be extracted from the bundle before we launch the coroutine, else the bundle will be emptied
+        val state = data.toElementClassicConnectionState()
+        coroutineScope.launch {
+            val updatedState = ensureHomeserverIsSupported(state)
+            emitState(updatedState)
+            val userId = (updatedState as? ElementClassicConnectionState.ElementClassicReady)?.elementClassicSession?.userId
+            if (userId != null) {
+                // Step 2, request the avatar
+                requestAvatar(userId)
+            }
+        }
+    }
+
+    @VisibleForTesting
+    fun onAvatarReceived(data: Bundle) {
+        val currentState = stateFlow.value
+        if (currentState is ElementClassicConnectionState.ElementClassicReady) {
+            // Check that the userId is still the same
+            val userId = data.getString(KEY_USER_ID_STR)
+            if (userId != currentState.elementClassicSession.userId.value) {
+                Timber.tag(loggerTag.value).w(
+                    "Received profile data for userId $userId but current" +
+                        " userId is ${currentState.elementClassicSession.userId}, ignoring"
+                )
+            } else {
+                val avatar = BundleCompat.getParcelable(data, KEY_USER_AVATAR_PARCELABLE, Bitmap::class.java)
+                // If the avatar is identical to the current one, do not emit a new state to avoid unnecessary recompositions
+                // and blink on the avatar image
+                if (avatar == null || !avatar.sameAs(currentState.avatar)) {
+                    val updatedState = currentState.copy(
+                        avatar = avatar,
+                    )
+                    coroutineScope.launch {
+                        emitState(updatedState)
+                    }
+                }
+            }
+        } else {
+            Timber.tag(loggerTag.value).w("Received profile data but current state is not ElementClassicReady: %s", currentState)
+        }
+    }
+
+    private suspend fun ensureHomeserverIsSupported(state: ElementClassicConnectionState): ElementClassicConnectionState {
+        return if (state is ElementClassicConnectionState.ElementClassicReady) {
+            val elementXCanConnect = setOfNotNull(
+                // Try with the domain name first
+                state.elementClassicSession.userId.domainName?.ensureProtocol(),
+                // Then try with the resolved homeserver URL, if provided and distinct
+                state.elementClassicSession.homeserverUrl,
+            ).any { url ->
+                val isCompatible = homeServerLoginCompatibilityChecker.check(url)
+                    .onFailure {
+                        Timber.tag(loggerTag.value).w(it, "Failed to check compatibility with homeserver: $url")
+                    }
+                    .getOrNull() == true
+                if (isCompatible) {
+                    Timber.tag(loggerTag.value).d("Found compatible homeserver URL: %s", url)
+                } else {
+                    Timber.tag(loggerTag.value).d("Homeserver URL is not compatible: %s", url)
+                }
+                isCompatible
+            }
+            if (elementXCanConnect) {
+                state
+            } else {
+                Timber.tag(loggerTag.value).w("Cannot import session because the homeserver is not compatible with Element X")
+                ElementClassicConnectionState.Error("The homeserver is not compatible with Element X")
+            }
+        } else {
+            state
+        }
+    }
+
+    private suspend fun emitState(state: ElementClassicConnectionState) {
+        when (state) {
+            is ElementClassicConnectionState.Error -> {
+                Timber.tag(loggerTag.value).w("Error: %s", state.error)
+            }
+            is ElementClassicConnectionState.ElementClassicReady -> {
+                Timber.tag(loggerTag.value).d("Ready state for user: %s", state.elementClassicSession.userId)
+            }
+            ElementClassicConnectionState.ElementClassicReadyNoSession -> {
+                Timber.tag(loggerTag.value).d("No session from Element Classic")
+            }
+            ElementClassicConnectionState.ElementClassicNotFound -> {
+                Timber.tag(loggerTag.value).d("Element Classic not found")
+            }
+            ElementClassicConnectionState.Idle -> {
+                Timber.tag(loggerTag.value).d("Idle")
+            }
+        }
+        // Also give the Element Classic session info to the MatrixAuthenticationService
+        matrixAuthenticationService.setElementClassicSession(
+            session = (state as? ElementClassicConnectionState.ElementClassicReady)?.elementClassicSession
+        )
+        mutableStateFlow.emit(state)
+    }
+
+    private fun Bundle.toElementClassicConnectionState(): ElementClassicConnectionState {
+        val error = getString(KEY_ERROR_STR)
+        return if (error != null) {
+            ElementClassicConnectionState.Error(error)
+        } else {
+            val userId = getString(KEY_USER_ID_STR)?.takeIf { it.isNotEmpty() }?.let(::UserId)
+            if (userId == null) {
+                ElementClassicConnectionState.ElementClassicReadyNoSession
+            } else {
+                var secrets = getString(KEY_SECRETS_STR)?.takeIf { it.isNotEmpty() }
+                val roomKeysVersion = getString(KEY_ROOM_KEYS_VERSION_STR)
+                    .also {
+                        if (secrets != null && it == null) {
+                            Timber.tag(loggerTag.value).w("Room keys version is null, outdated version of Element Classic, ignore secrets")
+                            // In this case, just ignore the secrets, the SDK will not accept them anyway
+                            secrets = null
+                        }
+                    }
+                    ?.takeIf { it.isNotEmpty() }
+                val homeserverUrl = getString(KEY_HOMESERVER_URL_STR)?.takeIf { it.isNotEmpty() }
+                val displayName = getString(KEY_USER_DISPLAY_NAME_STR)?.takeIf { it.isNotEmpty() }
+                val doesContainBackupKey = secrets != null &&
+                    roomKeysVersion != null &&
+                    matrixAuthenticationService.doSecretsContainBackupKey(userId, secrets, roomKeysVersion)
+                Timber.tag(loggerTag.value).d(
+                    buildString {
+                        append("Receiving session $userId ($displayName) from Element Classic, with secrets: ")
+                        append(secrets != null)
+                        append(", with roomKeysVersion: ")
+                        append(roomKeysVersion != null)
+                        append(", with valid backup key: ")
+                        append(doesContainBackupKey)
+                    }
+                )
+                // Ensure avatar is not lost when refreshing the data
+                val currentAvatar = (stateFlow.value as? ElementClassicConnectionState.ElementClassicReady)
+                    ?.takeIf { it.elementClassicSession.userId == userId }
+                    ?.avatar
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = userId,
+                        homeserverUrl = homeserverUrl,
+                        secrets = secrets,
+                        roomKeysVersion = roomKeysVersion,
+                        doesContainBackupKey = doesContainBackupKey,
+                    ),
+                    displayName = displayName,
+                    avatar = currentAvatar,
+                )
+            }
+        }
+    }
+
+    // Everything in this companion object must match what is defined in Element Classic
+    companion object {
+        const val ELEMENT_CLASSIC_SERVICE_FULL_CLASS_NAME = "im.vector.app.features.importer.ImporterService"
+
+        // Command to the service to get the userId/displayName/secrets of a verified session.
+        const val MSG_GET_SESSION = 1
+
+        // Command to the service to get the avatar oor the session.
+        const val MSG_GET_AVATAR = 2
+
+        // Keys for the bundle returned from the service
+        const val KEY_ERROR_STR = "error"
+        const val KEY_USER_ID_STR = "userId"
+        const val KEY_HOMESERVER_URL_STR = "homeserverUrl"
+        const val KEY_USER_DISPLAY_NAME_STR = "displayName"
+
+        /**
+         * Key to extract the secrets from the bundle, as a Json string.
+         * Json will have this format:
+         * {
+         *   "cross_signing" : {
+         *     "master_key" : "z8RUxnaAGu___REDACTED___k+BQL9o",
+         *     "user_signing_key" : "baJHzA___REDACTED___xMLbSUAXw9QUzqms",
+         *     "self_signing_key" : "DU0CvLtR2G/___REDACTED___dV/MONNq4nsQhM"
+         *   },
+         *   "backup" : {
+         *     "algorithm" : "m.megolm_backup.v1.curve25519-aes-sha2",
+         *     "key" : "VzncmQ+UOV___REDACTED___patxDz7m0Nc",
+         *     "backup_version" : "1"
+         *   }
+         * }
+         */
+        const val KEY_SECRETS_STR = "secrets"
+        const val KEY_ROOM_KEYS_VERSION_STR = "roomKeysVersion"
+
+        // For the avatar
+        const val KEY_USER_AVATAR_PARCELABLE = "avatar"
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/LoginModule.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/LoginModule.kt
index 12b9106b71..037acf859b 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/LoginModule.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/di/LoginModule.kt
@@ -14,8 +14,8 @@ import dev.zacsweers.metro.Binds
 import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.login.impl.changeserver.ChangeServerPresenter
 import io.element.android.features.login.impl.changeserver.ChangeServerState
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicPresenter
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicState
+import io.element.android.features.login.impl.login.LoginModePresenter
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.Presenter
 
 @ContributesTo(AppScope::class)
@@ -25,5 +25,5 @@ interface LoginModule {
     fun bindChangeServerPresenter(presenter: ChangeServerPresenter): Presenter<ChangeServerState>
 
     @Binds
-    fun bindLoginWithClassicPresenter(presenter: LoginWithClassicPresenter): Presenter<LoginWithClassicState>
+    fun bindLoginModePresenter(presenter: LoginModePresenter): Presenter<LoginModeState>
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
index 2f4af14237..560e6123c1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
@@ -41,7 +41,7 @@ sealed class ChangeServerError : Exception() {
                     // AccountAlreadyLoggedIn error should not happen at this point
                     is AuthenticationException.AccountAlreadyLoggedIn -> Error(messageStr = error.message)
                     is AuthenticationException.Generic -> Error(messageStr = error.message)
-                    is AuthenticationException.Oidc -> Error(messageStr = error.message)
+                    is AuthenticationException.OAuth -> Error(messageStr = error.message)
                 }
             }
             is AccountProviderAccessException.NeedElementProException -> NeedElementPro(
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGate.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGate.kt
new file mode 100644
index 0000000000..37a97e71dd
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGate.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.localnetwork
+
+import android.Manifest
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.permissions.api.PermissionsEvent
+import io.element.android.libraries.permissions.api.PermissionsPresenter
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
+import kotlinx.coroutines.launch
+
+@Inject
+class LocalNetworkPermissionGate(
+    private val advisor: LocalNetworkPermissionAdvisor,
+    permissionsPresenterFactory: PermissionsPresenter.Factory,
+) {
+    private val permissionsPresenter: PermissionsPresenter =
+        permissionsPresenterFactory.create(Manifest.permission.ACCESS_LOCAL_NETWORK)
+
+    @Composable
+    fun <T : Any> present(
+        urlOf: (T) -> String,
+        onProceed: suspend (T) -> Unit,
+    ): LocalNetworkPermissionGateState<T> {
+        val coroutineScope = rememberCoroutineScope()
+        val permissionsState = permissionsPresenter.present()
+        var pendingSubmit by remember { mutableStateOf<T?>(null) }
+
+        val latestUrlOf by rememberUpdatedState(urlOf)
+        val latestOnProceed by rememberUpdatedState(onProceed)
+
+        LaunchedEffect(permissionsState.permissionGranted, pendingSubmit) {
+            val pending = pendingSubmit
+            if (pending != null && permissionsState.permissionGranted) {
+                coroutineScope.launch { latestOnProceed(pending) }
+                pendingSubmit = null
+            }
+        }
+
+        val dialog by rememberUpdatedState(
+            when {
+                pendingSubmit == null -> LocalNetworkPermissionDialog.None
+                permissionsState.permissionGranted -> LocalNetworkPermissionDialog.None
+                permissionsState.shouldShowRationale || !permissionsState.permissionAlreadyAsked -> LocalNetworkPermissionDialog.Rationale
+                else -> LocalNetworkPermissionDialog.Settings
+            }
+        )
+
+        fun submit(value: T) {
+            coroutineScope.launch {
+                if (advisor.shouldRequestPermissionFor(latestUrlOf(value))) {
+                    pendingSubmit = value
+                } else {
+                    latestOnProceed(value)
+                }
+            }
+        }
+
+        fun requestPermission() {
+            when (dialog) {
+                LocalNetworkPermissionDialog.Settings -> {
+                    permissionsState.eventSink(PermissionsEvent.OpenSystemSettingAndCloseDialog)
+                }
+                LocalNetworkPermissionDialog.Rationale -> {
+                    permissionsState.eventSink(PermissionsEvent.ForceRequestPermissions)
+                }
+                else -> Unit
+            }
+        }
+
+        fun abort() {
+            pendingSubmit = null
+        }
+
+        return LocalNetworkPermissionGateState(
+            dialog = dialog,
+            submit = ::submit,
+            requestPermission = ::requestPermission,
+            abort = ::abort,
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGateState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGateState.kt
new file mode 100644
index 0000000000..f3ecee729e
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/localnetwork/LocalNetworkPermissionGateState.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.localnetwork
+
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
+
+data class LocalNetworkPermissionGateState<T>(
+    val dialog: LocalNetworkPermissionDialog,
+    val submit: (T) -> Unit,
+    val requestPermission: () -> Unit,
+    val abort: () -> Unit,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginHelper.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginHelper.kt
deleted file mode 100644
index a62919e705..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginHelper.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.login
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import dev.zacsweers.metro.Inject
-import io.element.android.features.login.impl.error.ChangeServerError
-import io.element.android.features.login.impl.screens.chooseaccountprovider.ChooseAccountProviderPresenter
-import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenter
-import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
-import io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenter
-import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationRetriever
-import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.architecture.runCatchingUpdatingState
-import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
-import io.element.android.libraries.matrix.api.auth.OidcPrompt
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
-
-/**
- * This class is responsible for managing the login flow, including handling OIDC actions and
- * submitting login requests.
- * It's a helper to avoid code duplication. It is used by [OnBoardingPresenter], [ConfirmAccountProviderPresenter]
- * and [ChooseAccountProviderPresenter].
- */
-@Inject
-class LoginHelper(
-    private val oidcActionFlow: OidcActionFlow,
-    private val authenticationService: MatrixAuthenticationService,
-    private val webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever,
-) {
-    private val loginModeState: MutableState<AsyncData<LoginMode>> = mutableStateOf(AsyncData.Uninitialized)
-
-    @Composable
-    fun collectLoginMode(): State<AsyncData<LoginMode>> {
-        LaunchedEffect(Unit) {
-            oidcActionFlow.collect { oidcAction ->
-                if (oidcAction != null) {
-                    onOidcAction(oidcAction)
-                }
-            }
-        }
-        return loginModeState
-    }
-
-    fun clearError() {
-        loginModeState.value = AsyncData.Uninitialized
-    }
-
-    suspend fun submit(
-        isAccountCreation: Boolean,
-        homeserverUrl: String,
-        loginHint: String?,
-    ) {
-        suspend {
-            authenticationService.setHomeserver(homeserverUrl).map { matrixHomeServerDetails ->
-                if (matrixHomeServerDetails.supportsOidcLogin) {
-                    // Retrieve the details right now
-                    val oidcPrompt = if (isAccountCreation) OidcPrompt.Create else OidcPrompt.Login
-                    LoginMode.Oidc(
-                        authenticationService.getOidcUrl(prompt = oidcPrompt, loginHint = loginHint).getOrThrow()
-                    )
-                } else if (isAccountCreation) {
-                    val url = webClientUrlForAuthenticationRetriever.retrieve(homeserverUrl)
-                    LoginMode.AccountCreation(url)
-                } else if (matrixHomeServerDetails.supportsPasswordLogin) {
-                    LoginMode.PasswordLogin
-                } else {
-                    error("Unsupported login flow")
-                }
-            }.getOrThrow()
-        }.runCatchingUpdatingState(
-            state = loginModeState,
-            errorTransform = {
-                when (it) {
-                    is AccountCreationNotSupported -> it
-                    else -> ChangeServerError.from(it)
-                }
-            }
-        )
-    }
-
-    private suspend fun onOidcAction(oidcAction: OidcAction) {
-        if (oidcAction is OidcAction.GoBack && oidcAction.toUnblock && loginModeState.value !is AsyncData.Loading) {
-            // Ignore GoBack action if the current state is not Loading. This GoBack action is coming from LoginFlowNode.
-            // This can happen if there is an error, for instance attempt to login again on the same account.
-            return
-        }
-        loginModeState.value = AsyncData.Loading()
-        when (oidcAction) {
-            is OidcAction.GoBack -> {
-                authenticationService.cancelOidcLogin()
-                    .onSuccess {
-                        loginModeState.value = AsyncData.Uninitialized
-                    }
-                    .onFailure { failure ->
-                        loginModeState.value = AsyncData.Failure(failure)
-                    }
-            }
-            is OidcAction.Success -> {
-                authenticationService.loginWithOidc(oidcAction.url)
-                    .onFailure { failure ->
-                        loginModeState.value = AsyncData.Failure(failure)
-                    }
-            }
-        }
-        oidcActionFlow.reset()
-    }
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginMode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginMode.kt
deleted file mode 100644
index 08e604ef20..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginMode.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.login
-
-import io.element.android.libraries.matrix.api.auth.OidcDetails
-
-sealed interface LoginMode {
-    data object PasswordLogin : LoginMode
-    data class Oidc(val oidcDetails: OidcDetails) : LoginMode
-    data class AccountCreation(val url: String) : LoginMode
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeEvent.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeEvent.kt
new file mode 100644
index 0000000000..73400890d5
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeEvent.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.login
+
+sealed interface LoginModeEvent {
+    data class Submit(
+        val isAccountCreation: Boolean,
+        val homeserverUrl: String,
+        val resolvedHomeserverUrl: String?,
+        val loginHint: String?,
+    ) : LoginModeEvent
+
+    data object ClearError : LoginModeEvent
+
+    data object RequestLocalNetworkPermission : LoginModeEvent
+
+    data object DismissLocalNetworkPermission : LoginModeEvent
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModePresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModePresenter.kt
new file mode 100644
index 0000000000..34188095b0
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModePresenter.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.login
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import dev.zacsweers.metro.Inject
+import io.element.android.features.login.impl.error.ChangeServerError
+import io.element.android.features.login.impl.localnetwork.LocalNetworkPermissionGate
+import io.element.android.features.login.impl.screens.chooseaccountprovider.ChooseAccountProviderPresenter
+import io.element.android.features.login.impl.screens.classic.loginwithclassic.LoginWithClassicPresenter
+import io.element.android.features.login.impl.screens.confirmaccountprovider.ConfirmAccountProviderPresenter
+import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
+import io.element.android.features.login.impl.screens.onboarding.OnBoardingPresenter
+import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationRetriever
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runCatchingUpdatingState
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.api.auth.OAuthPrompt
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
+
+/**
+ * Presenter responsible for managing the login flow, including handling OAuth actions and
+ * submitting login requests.
+ * It's a helper to avoid code duplication. It is used by [OnBoardingPresenter], [ConfirmAccountProviderPresenter],
+ * [ChooseAccountProviderPresenter] and [LoginWithClassicPresenter].
+ */
+@Inject
+class LoginModePresenter(
+    private val oAuthActionFlow: OAuthActionFlow,
+    private val authenticationService: MatrixAuthenticationService,
+    private val webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever,
+    private val localNetworkPermissionGate: LocalNetworkPermissionGate,
+) : Presenter<LoginModeState> {
+    @Composable
+    override fun present(): LoginModeState {
+        val loginMode: MutableState<AsyncData<LoginMode>> = remember { mutableStateOf(AsyncData.Uninitialized) }
+
+        val gateState = localNetworkPermissionGate.present<LoginModeEvent.Submit>(
+            urlOf = { it.homeserverUrl },
+            onProceed = { request -> performSubmit(request, loginMode) },
+        )
+
+        // Forward OAuth navigation events to the presenter's own loginMode state.
+        LaunchedEffect(Unit) {
+            oAuthActionFlow.collect { action ->
+                if (action != null) handleOAuthAction(action, loginMode)
+            }
+        }
+
+        fun handleEvent(event: LoginModeEvent) {
+            when (event) {
+                LoginModeEvent.ClearError -> loginMode.value = AsyncData.Uninitialized
+                is LoginModeEvent.Submit -> gateState.submit(event)
+                LoginModeEvent.DismissLocalNetworkPermission -> gateState.abort()
+                LoginModeEvent.RequestLocalNetworkPermission -> gateState.requestPermission()
+            }
+        }
+        return LoginModeState(
+            loginMode = loginMode.value,
+            localNetworkPermissionDialog = gateState.dialog,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    private suspend fun performSubmit(request: LoginModeEvent.Submit, loginMode: MutableState<AsyncData<LoginMode>>) {
+        suspend {
+            authenticationService.setHomeserver(request.homeserverUrl).recoverCatching {
+                // Fallback to the well-known-resolved URL if the primary URL failed and the caller supplied one.
+                if (request.resolvedHomeserverUrl != null && request.resolvedHomeserverUrl != request.homeserverUrl) {
+                    authenticationService.setHomeserver(request.resolvedHomeserverUrl).getOrThrow()
+                } else {
+                    throw it
+                }
+            }.map { matrixHomeServerDetails ->
+                when {
+                    matrixHomeServerDetails.supportsOAuthLogin -> {
+                        val oAuthPrompt = if (request.isAccountCreation) OAuthPrompt.Create else OAuthPrompt.Login
+                        LoginMode.OAuth(
+                            authenticationService.getOAuthUrl(prompt = oAuthPrompt, loginHint = request.loginHint).getOrThrow()
+                        )
+                    }
+                    request.isAccountCreation -> LoginMode.AccountCreation(
+                        webClientUrlForAuthenticationRetriever.retrieve(request.homeserverUrl)
+                    )
+                    matrixHomeServerDetails.supportsPasswordLogin -> LoginMode.PasswordLogin
+                    else -> error("Unsupported login flow")
+                }
+            }.getOrThrow()
+        }.runCatchingUpdatingState(
+            state = loginMode,
+            errorTransform = {
+                when (it) {
+                    is AccountCreationNotSupported -> it
+                    else -> ChangeServerError.from(it)
+                }
+            }
+        )
+    }
+
+    private suspend fun handleOAuthAction(action: OAuthAction, loginMode: MutableState<AsyncData<LoginMode>>) {
+        if (action is OAuthAction.GoBack && action.toUnblock && loginMode.value !is AsyncData.Loading) {
+            // Ignore GoBack that isn't tied to an in-flight login — it comes from LoginFlowNode
+            // when the user backs out after a completed login attempt.
+            return
+        }
+        loginMode.value = AsyncData.Loading()
+        when (action) {
+            is OAuthAction.GoBack -> authenticationService.cancelOAuthLogin()
+                .onSuccess { loginMode.value = AsyncData.Uninitialized }
+                .onFailure { loginMode.value = AsyncData.Failure(it) }
+            is OAuthAction.Success -> authenticationService.loginWithOAuth(action.url)
+                .onFailure { loginMode.value = AsyncData.Failure(it) }
+        }
+        oAuthActionFlow.reset()
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeState.kt
new file mode 100644
index 0000000000..849ff31f85
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.login
+
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
+
+data class LoginModeState(
+    val loginMode: AsyncData<LoginMode>,
+    val localNetworkPermissionDialog: LocalNetworkPermissionDialog,
+    val eventSink: (LoginModeEvent) -> Unit,
+)
+
+sealed interface LoginMode {
+    data object PasswordLogin : LoginMode
+    data class OAuth(val oAuthDetails: OAuthDetails) : LoginMode
+    data class AccountCreation(val url: String) : LoginMode
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeStateProvider.kt
new file mode 100644
index 0000000000..1d33a1c48a
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeStateProvider.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.login
+
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
+
+fun aLoginModeState(
+    loginMode: AsyncData<LoginMode> = AsyncData.Uninitialized,
+    localNetworkPermissionDialog: LocalNetworkPermissionDialog = LocalNetworkPermissionDialog.None,
+    eventSink: (LoginModeEvent) -> Unit = {},
+) = LoginModeState(
+    loginMode = loginMode,
+    localNetworkPermissionDialog = localNetworkPermissionDialog,
+    eventSink = eventSink,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
index f88e34bf4a..3549e17457 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/login/LoginModeView.kt
@@ -24,7 +24,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -32,7 +32,7 @@ fun LoginModeView(
     loginMode: AsyncData<LoginMode>,
     onClearError: () -> Unit,
     onLearnMoreClick: () -> Unit,
-    onOidcDetails: (OidcDetails) -> Unit,
+    onOAuthDetails: (OAuthDetails) -> Unit,
     onNeedLoginPassword: () -> Unit,
     onCreateAccountContinue: (url: String) -> Unit
 ) {
@@ -118,7 +118,7 @@ fun LoginModeView(
         is AsyncData.Loading -> Unit // The Continue button shows the loading state
         is AsyncData.Success -> {
             when (val loginModeData = loginMode.data) {
-                is LoginMode.Oidc -> onOidcDetails(loginModeData.oidcDetails)
+                is LoginMode.OAuth -> onOAuthDetails(loginModeData.oAuthDetails)
                 LoginMode.PasswordLogin -> onNeedLoginPassword()
                 is LoginMode.AccountCreation -> onCreateAccountContinue(loginModeData.url)
             }
@@ -137,7 +137,7 @@ internal fun LoginModeViewPreview(@PreviewParameter(LoginModeViewErrorProvider::
             loginMode = AsyncData.Failure(error),
             onClearError = {},
             onLearnMoreClick = {},
-            onOidcDetails = {},
+            onOAuthDetails = {},
             onNeedLoginPassword = {},
             onCreateAccountContinue = {}
         )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt
index 613aa6aeb6..6d46cdea0f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt
@@ -135,12 +135,14 @@ class QrCodeLoginFlowNode(
                                 is QrLoginException.SlidingSyncNotAvailable -> {
                                     backstack.replace(NavTarget.Error(QrCodeErrorScreenType.SlidingSyncNotAvailable))
                                 }
-                                is QrLoginException.OidcMetadataInvalid -> {
-                                    Timber.e(error, "OIDC metadata is invalid")
+                                is QrLoginException.OAuthMetadataInvalid -> {
+                                    Timber.e(error, "OAuth metadata is invalid")
                                     backstack.replace(NavTarget.Error(QrCodeErrorScreenType.UnknownError))
                                 }
                                 QrLoginException.CheckCodeAlreadySent,
                                 QrLoginException.CheckCodeCannotBeSent,
+                                QrLoginException.ContinuationAlreadySent,
+                                QrLoginException.ContinuationCannotBeSent,
                                 QrLoginException.UnsupportedQrCodeType,
                                 QrLoginException.Unknown -> {
                                     Timber.e(error, "Unknown error found")
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
index 1c4ef8cd09..8c6cab79ce 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.core.coroutine.parallelMap
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.core.uri.isValidUrl
 import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -28,6 +29,7 @@ import java.util.Collections
 class HomeserverResolver(
     private val dispatchers: CoroutineDispatchers,
     private val homeServerLoginCompatibilityChecker: HomeServerLoginCompatibilityChecker,
+    private val localNetworkPermissionAdvisor: LocalNetworkPermissionAdvisor,
 ) {
     fun resolve(userInput: String): Flow<List<HomeserverData>> = flow {
         val flowContext = currentCoroutineContext()
@@ -39,13 +41,17 @@ class HomeserverResolver(
         // Run all the requests in parallel
         withContext(dispatchers.io) {
             list.parallelMap { url ->
-                val isValid = homeServerLoginCompatibilityChecker.check(url)
-                    .onFailure { Timber.w(it, "Failed to check compatibility with homeserver $url") }
-                    .getOrNull()
-                    ?: return@parallelMap
+                // Skip the compatibility probe if we'd need ACCESS_LOCAL_NETWORK first —
+                // otherwise the probe hangs on the TCP timeout for ~30s. Emit the URL as a
+                // candidate directly; the actual sign-in flow triggers the permission prompt.
+                val shouldRequestPermissionOrIsValid = localNetworkPermissionAdvisor.shouldRequestPermissionFor(url) ||
+                    homeServerLoginCompatibilityChecker.check(url)
+                        .onFailure { Timber.w(it, "Failed to check compatibility with homeserver $url") }
+                        .getOrNull()
+                        ?: return@parallelMap
 
                 // Emit the list as soon as possible
-                if (isValid) {
+                if (shouldRequestPermissionOrIsValid) {
                     currentList.add(HomeserverData(homeserverUrl = url))
                     withContext(flowContext) {
                         emit(currentList.toList())
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
index 4f6c87ac73..212bab515d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
@@ -39,6 +39,8 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 
 /**
  * https://www.figma.com/file/o9p34zmiuEpZRyvZXJZAYL/FTUE?type=design&node-id=604-60817
@@ -59,7 +61,8 @@ fun ChangeAccountProviderView(
                 title = {},
                 navigationIcon = { BackButton(onClick = onBackClick) }
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Box(
             modifier = Modifier
@@ -71,6 +74,7 @@ fun ChangeAccountProviderView(
             Column(
                 modifier = Modifier
                     .verticalScroll(state = rememberScrollState())
+                    .padding(lazyColumnContentPadding)
             ) {
                 IconTitleSubtitleMolecule(
                     modifier = Modifier.padding(top = 16.dp, bottom = 32.dp, start = 16.dp, end = 16.dp),
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
index 5dc6ebbd6b..5f79f197d9 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
@@ -20,7 +20,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.impl.util.openLearnMorePage
 import io.element.android.libraries.architecture.callback
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -31,7 +31,7 @@ class ChooseAccountProviderNode(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun navigateToLoginPassword()
-        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToOAuth(oAuthDetails: OAuthDetails)
         fun navigateToCreateAccount(url: String)
     }
 
@@ -45,7 +45,7 @@ class ChooseAccountProviderNode(
             state = state,
             modifier = modifier,
             onBackClick = ::navigateUp,
-            onOidcDetails = callback::navigateToOidc,
+            onOAuthDetails = callback::navigateToOAuth,
             onNeedLoginPassword = callback::navigateToLoginPassword,
             onLearnMoreClick = { openLearnMorePage(context) },
             onCreateAccountContinue = callback::navigateToCreateAccount,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
index 87010a4a30..a9983a19d1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenter.kt
@@ -12,49 +12,49 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AuthenticationConfig
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.login.impl.accountprovider.AccountProvider
-import io.element.android.features.login.impl.login.LoginHelper
+import io.element.android.features.login.impl.login.LoginModeEvent
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.uri.ensureProtocol
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.launch
 
 @Inject
 class ChooseAccountProviderPresenter(
     private val enterpriseService: EnterpriseService,
-    private val loginHelper: LoginHelper,
+    private val loginModePresenter: Presenter<LoginModeState>,
 ) : Presenter<ChooseAccountProviderState> {
     @Composable
     override fun present(): ChooseAccountProviderState {
-        val localCoroutineScope = rememberCoroutineScope()
-        val loginMode by loginHelper.collectLoginMode()
-
+        val loginModeState = loginModePresenter.present()
         var selectedAccountProvider: AccountProvider? by remember { mutableStateOf(null) }
 
         fun handleEvent(event: ChooseAccountProviderEvents) {
             when (event) {
-                ChooseAccountProviderEvents.Continue -> localCoroutineScope.launch {
-                    selectedAccountProvider?.let {
-                        loginHelper.submit(
-                            isAccountCreation = false,
-                            homeserverUrl = it.url,
-                            loginHint = null,
+                ChooseAccountProviderEvents.Continue -> {
+                    selectedAccountProvider?.let { provider ->
+                        loginModeState.eventSink(
+                            LoginModeEvent.Submit(
+                                isAccountCreation = false,
+                                homeserverUrl = provider.url,
+                                resolvedHomeserverUrl = null,
+                                loginHint = null,
+                            )
                         )
                     }
                 }
                 is ChooseAccountProviderEvents.SelectAccountProvider -> {
-                    // Ensure that the user do not change the server during processing
-                    if (loginMode is AsyncData.Uninitialized) {
+                    // Ensure that the user does not change the server during processing.
+                    if (loginModeState.loginMode is AsyncData.Uninitialized) {
                         selectedAccountProvider = event.accountProvider
                     }
                 }
-                ChooseAccountProviderEvents.ClearError -> loginHelper.clearError()
+                ChooseAccountProviderEvents.ClearError -> loginModeState.eventSink(LoginModeEvent.ClearError)
             }
         }
 
@@ -76,7 +76,7 @@ class ChooseAccountProviderPresenter(
         return ChooseAccountProviderState(
             accountProviders = staticAccountProviderList,
             selectedAccountProvider = selectedAccountProvider,
-            loginMode = loginMode,
+            loginModeState = loginModeState,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
index e34fbccb41..a31e5c464f 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderState.kt
@@ -9,16 +9,17 @@
 package io.element.android.features.login.impl.screens.chooseaccountprovider
 
 import io.element.android.features.login.impl.accountprovider.AccountProvider
-import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.AsyncData
 import kotlinx.collections.immutable.ImmutableList
 
 data class ChooseAccountProviderState(
     val accountProviders: ImmutableList<AccountProvider>,
     val selectedAccountProvider: AccountProvider?,
-    val loginMode: AsyncData<LoginMode>,
+    val loginModeState: LoginModeState,
     val eventSink: (ChooseAccountProviderEvents) -> Unit,
 ) {
     val submitEnabled: Boolean
-        get() = selectedAccountProvider != null && (loginMode is AsyncData.Uninitialized || loginMode is AsyncData.Loading)
+        get() = selectedAccountProvider != null &&
+            (loginModeState.loginMode is AsyncData.Uninitialized || loginModeState.loginMode is AsyncData.Loading)
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
index 93bd665011..3fea548fca 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateProvider.kt
@@ -11,7 +11,8 @@ package io.element.android.features.login.impl.screens.chooseaccountprovider
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.anAccountProvider
-import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.libraries.architecture.AsyncData
 import kotlinx.collections.immutable.toImmutableList
 
@@ -58,7 +59,7 @@ open class ChooseAccountProviderStateProvider : PreviewParameterProvider<ChooseA
                     server3,
                 ),
                 selectedAccountProvider = server2,
-                loginMode = AsyncData.Loading(),
+                loginModeState = aLoginModeState(loginMode = AsyncData.Loading()),
             ),
             // Add other state here
         )
@@ -69,11 +70,11 @@ fun aChooseAccountProviderState(
         anAccountProvider()
     ),
     selectedAccountProvider: AccountProvider? = null,
-    loginMode: AsyncData<LoginMode> = AsyncData.Uninitialized,
+    loginModeState: LoginModeState = aLoginModeState(),
     eventSink: (ChooseAccountProviderEvents) -> Unit = {},
 ) = ChooseAccountProviderState(
     accountProviders = accountProviders.toImmutableList(),
     selectedAccountProvider = selectedAccountProvider,
-    loginMode = loginMode,
+    loginModeState = loginModeState,
     eventSink = eventSink,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
index cdb80304a7..e858789bb4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderView.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.accountprovider.AccountProviderView
+import io.element.android.features.login.impl.login.LoginModeEvent
 import io.element.android.features.login.impl.login.LoginModeView
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
@@ -43,22 +44,25 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun ChooseAccountProviderView(
     state: ChooseAccountProviderState,
     onBackClick: () -> Unit,
-    onOidcDetails: (OidcDetails) -> Unit,
+    onOAuthDetails: (OAuthDetails) -> Unit,
     onNeedLoginPassword: () -> Unit,
     onLearnMoreClick: () -> Unit,
     onCreateAccountContinue: (url: String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val isLoading by remember(state.loginMode) {
+    val isLoading by remember(state.loginModeState.loginMode) {
         derivedStateOf {
-            state.loginMode is AsyncData.Loading
+            state.loginModeState.loginMode is AsyncData.Loading
         }
     }
 
@@ -69,7 +73,8 @@ fun ChooseAccountProviderView(
                 title = {},
                 navigationIcon = { BackButton(onClick = onBackClick) }
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Box(
             modifier = Modifier
@@ -82,6 +87,7 @@ fun ChooseAccountProviderView(
                 modifier = Modifier
                     .fillMaxSize()
                     .verticalScroll(state = rememberScrollState())
+                    .padding(lazyColumnContentPadding)
             ) {
                 IconTitleSubtitleMolecule(
                     modifier = Modifier.padding(top = 16.dp, bottom = 32.dp, start = 16.dp, end = 16.dp),
@@ -124,17 +130,26 @@ fun ChooseAccountProviderView(
                 Spacer(modifier = Modifier.height(48.dp))
             }
             LoginModeView(
-                loginMode = state.loginMode,
+                loginMode = state.loginModeState.loginMode,
                 onClearError = {
                     state.eventSink(ChooseAccountProviderEvents.ClearError)
                 },
                 onLearnMoreClick = onLearnMoreClick,
-                onOidcDetails = onOidcDetails,
+                onOAuthDetails = onOAuthDetails,
                 onNeedLoginPassword = onNeedLoginPassword,
                 onCreateAccountContinue = onCreateAccountContinue,
             )
         }
     }
+    LocalNetworkPermissionDialogView(
+        dialog = state.loginModeState.localNetworkPermissionDialog,
+        onSubmit = {
+            state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
+        },
+        onDismiss = {
+            state.loginModeState.eventSink(LoginModeEvent.DismissLocalNetworkPermission)
+        }
+    )
 }
 
 @PreviewsDayNight
@@ -144,7 +159,7 @@ internal fun ChooseAccountProviderViewPreview(@PreviewParameter(ChooseAccountPro
         state = state,
         onBackClick = { },
         onLearnMoreClick = { },
-        onOidcDetails = { },
+        onOAuthDetails = { },
         onNeedLoginPassword = { },
         onCreateAccountContinue = { },
     )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNode.kt
new file mode 100644
index 0000000000..cfbd86f363
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNode.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic
+
+import android.os.Parcelable
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.lifecycleScope
+import com.bumble.appyx.core.lifecycle.subscribe
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.newRoot
+import com.bumble.appyx.navmodel.backstack.operation.pop
+import com.bumble.appyx.navmodel.backstack.operation.push
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.login.impl.screens.classic.loginwithclassic.LoginWithClassicNode
+import io.element.android.features.login.impl.screens.classic.missingkeybackup.MissingKeyBackupNode
+import io.element.android.features.login.impl.screens.classic.root.RootNode
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.appyx.rememberFaderOrSliderTransitionHandler
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.matrix.api.core.UserId
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(AppScope::class)
+@AssistedInject
+class ClassicFlowNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val classicFlowNodeHelper: ClassicFlowNodeHelper,
+) : BaseFlowNode<ClassicFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins,
+) {
+    interface Callback : Plugin {
+        fun navigateToOnBoarding(allowBackNavigation: Boolean)
+        fun navigateToLoginPassword()
+        fun navigateToOAuth(oAuthDetails: OAuthDetails)
+        fun navigateToCreateAccount(url: String)
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data class LoginWithClassic(
+            val userId: UserId,
+        ) : NavTarget
+
+        @Parcelize
+        data object MissingKeyBackup : NavTarget
+    }
+
+    private val callback: Callback = callback()
+
+    override fun onBuilt() {
+        super.onBuilt()
+        observeElementClassicConnection()
+        lifecycle.subscribe(
+            onResume = {
+                classicFlowNodeHelper.onResume()
+            },
+        )
+    }
+
+    private fun observeElementClassicConnection() {
+        classicFlowNodeHelper.navigationEventFlow().onEach { navigationEvent ->
+            when (navigationEvent) {
+                is NavigationEvent.Idle -> Unit
+                is NavigationEvent.NavigateToOnBoarding -> callback.navigateToOnBoarding(allowBackNavigation = false)
+                is NavigationEvent.NavigateToLoginWithClassic -> backstack.newRoot(NavTarget.LoginWithClassic(navigationEvent.userId))
+            }
+        }.launchIn(lifecycleScope)
+    }
+
+    override fun resolve(
+        navTarget: NavTarget,
+        buildContext: BuildContext,
+    ): Node {
+        return when (navTarget) {
+            NavTarget.Root -> {
+                createNode<RootNode>(buildContext)
+            }
+            is NavTarget.LoginWithClassic -> {
+                val callback = object : LoginWithClassicNode.Callback {
+                    override fun navigateToOtherOptions() {
+                        callback.navigateToOnBoarding(allowBackNavigation = true)
+                    }
+
+                    override fun navigateToLoginPassword() {
+                        callback.navigateToLoginPassword()
+                    }
+
+                    override fun navigateToOAuth(oAuthDetails: OAuthDetails) {
+                        callback.navigateToOAuth(oAuthDetails)
+                    }
+
+                    override fun navigateToCreateAccount(url: String) {
+                        callback.navigateToCreateAccount(url)
+                    }
+
+                    override fun navigateToMissingKeyBackup() {
+                        backstack.push(NavTarget.MissingKeyBackup)
+                    }
+                }
+                val inputs = LoginWithClassicNode.Inputs(
+                    userId = navTarget.userId,
+                )
+                createNode<LoginWithClassicNode>(buildContext, plugins = listOf(inputs, callback))
+            }
+            NavTarget.MissingKeyBackup -> {
+                val callback = object : MissingKeyBackupNode.Callback {
+                    override fun navigateBack() {
+                        backstack.pop()
+                    }
+                }
+                createNode<MissingKeyBackupNode>(buildContext, listOf(callback))
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        BackstackView(
+            modifier = modifier,
+            transitionHandler = rememberFaderOrSliderTransitionHandler(),
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelper.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelper.kt
new file mode 100644
index 0000000000..a5bc74c5e4
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelper.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic
+
+import dev.zacsweers.metro.Inject
+import io.element.android.features.login.impl.classic.ElementClassicConnection
+import io.element.android.features.login.impl.classic.ElementClassicConnectionState
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.api.toUserListFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
+
+@Inject
+class ClassicFlowNodeHelper(
+    private val elementClassicConnection: ElementClassicConnection,
+    private val sessionStore: SessionStore,
+) {
+    fun onResume() {
+        elementClassicConnection.requestSession()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun navigationEventFlow(): Flow<NavigationEvent> {
+        return elementClassicConnection.stateFlow
+            .distinctUntilChangedBy {
+                // Ignore change on ElementClassicConnectionState.ElementClassicReady.avatar
+                if (it is ElementClassicConnectionState.ElementClassicReady) {
+                    it.copy(avatar = null)
+                } else {
+                    it
+                }
+            }
+            .flatMapLatest { elementClassicConnectionState ->
+                when (elementClassicConnectionState) {
+                    ElementClassicConnectionState.Idle -> {
+                        // Ensure user is not stuck on the loading screen.
+                        // If Element Classic is taking too long to communicate (or crashes), unblock the user after a few seconds.
+                        flow {
+                            emit(NavigationEvent.Idle)
+                            delay(5_000)
+                            emit(NavigationEvent.NavigateToOnBoarding)
+                        }
+                    }
+                    ElementClassicConnectionState.ElementClassicNotFound,
+                    ElementClassicConnectionState.ElementClassicReadyNoSession,
+                    is ElementClassicConnectionState.Error -> {
+                        flowOf(NavigationEvent.NavigateToOnBoarding)
+                    }
+                    is ElementClassicConnectionState.ElementClassicReady -> {
+                        val existingSessions = sessionStore.sessionsFlow().toUserListFlow().first()
+                        if (elementClassicConnectionState.elementClassicSession.userId.value in existingSessions) {
+                            flowOf(NavigationEvent.NavigateToOnBoarding)
+                        } else {
+                            // 2 cases when this can be run:
+                            // First time this screen will be displayed
+                            // Missing key backup screen was displayed, but the data has changed (user set up the key backup on Classic),
+                            // and the app is resuming.
+                            flowOf(NavigationEvent.NavigateToLoginWithClassic(elementClassicConnectionState.elementClassicSession.userId))
+                        }
+                    }
+                }
+            }
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/NavigationEvent.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/NavigationEvent.kt
new file mode 100644
index 0000000000..cddca0015b
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/NavigationEvent.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic
+
+import io.element.android.libraries.matrix.api.core.UserId
+
+sealed interface NavigationEvent {
+    data object Idle : NavigationEvent
+    data object NavigateToOnBoarding : NavigationEvent
+    data class NavigateToLoginWithClassic(
+        val userId: UserId,
+    ) : NavigationEvent
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicEvent.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicEvent.kt
new file mode 100644
index 0000000000..6ba9b2142a
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicEvent.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+sealed interface LoginWithClassicEvent {
+    data object Submit : LoginWithClassicEvent
+    data object ClearError : LoginWithClassicEvent
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNavigator.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNavigator.kt
new file mode 100644
index 0000000000..55716c2cf7
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNavigator.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+interface LoginWithClassicNavigator {
+    fun navigateToMissingKeyBackup()
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNode.kt
new file mode 100644
index 0000000000..d5acca38ae
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicNode.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.login.impl.util.openLearnMorePage
+import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.matrix.api.core.UserId
+
+@ContributesNode(AppScope::class)
+@AssistedInject
+class LoginWithClassicNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: LoginWithClassicPresenter.Factory,
+) : Node(buildContext, plugins = plugins),
+    LoginWithClassicNavigator {
+    interface Callback : Plugin {
+        fun navigateToOtherOptions()
+        fun navigateToLoginPassword()
+        fun navigateToOAuth(oAuthDetails: OAuthDetails)
+        fun navigateToCreateAccount(url: String)
+        fun navigateToMissingKeyBackup()
+    }
+
+    data class Inputs(
+        val userId: UserId,
+    ) : NodeInputs
+
+    private val inputs: Inputs = inputs()
+    val presenter = presenterFactory.create(inputs.userId, this)
+    private val callback: Callback = callback()
+
+    override fun navigateToMissingKeyBackup() {
+        callback.navigateToMissingKeyBackup()
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val context = LocalContext.current
+        val state = presenter.present()
+        LoginWithClassicView(
+            state = state,
+            modifier = modifier,
+            onOtherOptionsClick = callback::navigateToOtherOptions,
+            onOAuthDetails = callback::navigateToOAuth,
+            onNeedLoginPassword = callback::navigateToLoginPassword,
+            onLearnMoreClick = { openLearnMorePage(context) },
+            onCreateAccountContinue = callback::navigateToCreateAccount,
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenter.kt
new file mode 100644
index 0000000000..765dfaadd1
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenter.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
+import io.element.android.features.login.impl.classic.ElementClassicConnection
+import io.element.android.features.login.impl.classic.ElementClassicConnectionState
+import io.element.android.features.login.impl.login.LoginModeEvent
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.uri.ensureProtocol
+import io.element.android.libraries.matrix.api.core.UserId
+import kotlinx.coroutines.launch
+
+@AssistedInject
+class LoginWithClassicPresenter(
+    @Assisted private val userId: UserId,
+    @Assisted private val navigator: LoginWithClassicNavigator,
+    private val loginModePresenter: Presenter<LoginModeState>,
+    private val elementClassicConnection: ElementClassicConnection,
+    private val accountProviderDataSource: AccountProviderDataSource,
+    private val buildMeta: BuildMeta,
+) : Presenter<LoginWithClassicState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(
+            userId: UserId,
+            navigator: LoginWithClassicNavigator,
+        ): LoginWithClassicPresenter
+    }
+
+    @Composable
+    override fun present(): LoginWithClassicState {
+        val coroutineScope = rememberCoroutineScope()
+        var loginWithClassicAction by remember {
+            mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
+        }
+        val loginModeState = loginModePresenter.present()
+        val elementClassicConnectionState by elementClassicConnection.stateFlow.collectAsState()
+
+        fun handleEvent(event: LoginWithClassicEvent) {
+            when (event) {
+                LoginWithClassicEvent.Submit -> {
+                    val currentState = elementClassicConnection.stateFlow.value
+                    if (currentState is ElementClassicConnectionState.ElementClassicReady) {
+                        if (currentState.elementClassicSession.secrets != null &&
+                            !currentState.elementClassicSession.doesContainBackupKey) {
+                            navigator.navigateToMissingKeyBackup()
+                        } else {
+                            coroutineScope.launch {
+                                loginWithClassicAction = AsyncAction.Loading
+                                // Ensure that the current account provider is set
+                                val elementClassicUserId = currentState.elementClassicSession.userId
+                                val accountProvider = elementClassicUserId.domainName.orEmpty().ensureProtocol()
+                                accountProviderDataSource.setUrl(accountProvider)
+                                loginModeState.eventSink(
+                                    LoginModeEvent.Submit(
+                                        isAccountCreation = false,
+                                        homeserverUrl = accountProvider,
+                                        resolvedHomeserverUrl = currentState.elementClassicSession.homeserverUrl,
+                                        loginHint = "mxid:" + elementClassicUserId.value,
+                                    )
+                                )
+                            }
+                        }
+                    } else {
+                        loginWithClassicAction = AsyncAction.Failure(IllegalStateException("Element Classic is not ready"))
+                    }
+                }
+                LoginWithClassicEvent.ClearError -> {
+                    loginWithClassicAction = AsyncAction.Uninitialized
+                    loginModeState.eventSink(LoginModeEvent.ClearError)
+                }
+            }
+        }
+
+        val elementClassicReady = elementClassicConnectionState as? ElementClassicConnectionState.ElementClassicReady
+        return LoginWithClassicState(
+            isElementPro = buildMeta.isEnterpriseBuild,
+            userId = userId,
+            displayName = elementClassicReady?.displayName,
+            avatar = elementClassicReady?.avatar,
+            loginModeState = loginModeState,
+            loginWithClassicAction = loginWithClassicAction,
+            eventSink = ::handleEvent,
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicState.kt
new file mode 100644
index 0000000000..8e93298e76
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicState.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import android.graphics.Bitmap
+import androidx.compose.runtime.Stable
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.UserId
+
+@Stable
+data class LoginWithClassicState(
+    val isElementPro: Boolean,
+    val userId: UserId,
+    val displayName: String?,
+    val avatar: Bitmap?,
+    val loginWithClassicAction: AsyncAction<Unit>,
+    val loginModeState: LoginModeState,
+    val eventSink: (LoginWithClassicEvent) -> Unit,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicStateProvider.kt
new file mode 100644
index 0000000000..6dfc292f6f
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicStateProvider.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import android.graphics.Bitmap
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.features.login.impl.login.aLoginModeState
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.matrix.api.core.UserId
+
+open class LoginWithClassicStateProvider : PreviewParameterProvider<LoginWithClassicState> {
+    override val values: Sequence<LoginWithClassicState>
+        get() = sequenceOf(
+            aLoginWithClassicState(),
+            aLoginWithClassicState(isElementPro = true, displayName = USER_NAME_ALICE),
+        )
+}
+
+fun aLoginWithClassicState(
+    isElementPro: Boolean = false,
+    userId: UserId = UserId("@alice:matrix.org"),
+    displayName: String? = null,
+    avatar: Bitmap? = null,
+    loginWithClassicAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    loginModeState: LoginModeState = aLoginModeState(),
+    eventSink: (LoginWithClassicEvent) -> Unit = {},
+) = LoginWithClassicState(
+    isElementPro = isElementPro,
+    userId = userId,
+    displayName = displayName,
+    avatar = avatar,
+    loginWithClassicAction = loginWithClassicAction,
+    loginModeState = loginModeState,
+    eventSink = eventSink,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicView.kt
new file mode 100644
index 0000000000..75181a068e
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicView.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+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.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.login.impl.R
+import io.element.android.features.login.impl.login.LoginModeEvent
+import io.element.android.features.login.impl.login.LoginModeView
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
+import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
+import io.element.android.libraries.designsystem.background.OnboardingBackground
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.components.avatar.BitmapAvatar
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LoginWithClassicView(
+    state: LoginWithClassicState,
+    onOtherOptionsClick: () -> Unit,
+    onOAuthDetails: (OAuthDetails) -> Unit,
+    onNeedLoginPassword: () -> Unit,
+    onLearnMoreClick: () -> Unit,
+    onCreateAccountContinue: (url: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val isLoading by remember(state.loginModeState.loginMode) {
+        derivedStateOf {
+            state.loginModeState.loginMode is AsyncData.Loading
+        }
+    }
+
+    HeaderFooterPage(
+        modifier = modifier
+            .fillMaxSize()
+            .systemBarsPadding()
+            .imePadding(),
+        background = { OnboardingBackground() },
+        isScrollable = true,
+        header = {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                Spacer(Modifier.height(40.dp))
+                Box(
+                    modifier = Modifier
+                        .size(54.dp)
+                        .shadow(elevation = 10.dp, shape = RoundedCornerShape(15.dp))
+                        .background(ElementTheme.colors.bgCanvasDefault, shape = RoundedCornerShape(15.dp)),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    val resId = if (state.isElementPro) {
+                        R.drawable.element_pro_logo
+                    } else {
+                        R.drawable.element_foss_logo
+                    }
+                    Image(
+                        modifier = Modifier.size(37.5.dp),
+                        painter = painterResource(id = resId),
+                        contentDescription = null,
+                    )
+                }
+                Spacer(Modifier.height(8.dp))
+                Text(
+                    text = stringResource(id = R.string.screen_onboarding_welcome_title),
+                    color = ElementTheme.colors.textPrimary,
+                    style = ElementTheme.typography.fontHeadingMdBold,
+                    textAlign = TextAlign.Center,
+                )
+                Spacer(Modifier.height(10.dp))
+            }
+        },
+        content = {
+            Column(
+                modifier = Modifier
+                    .fillMaxSize(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                Spacer(Modifier.height(40.dp))
+                BitmapAvatar(
+                    avatarData = AvatarData(
+                        id = state.userId.value,
+                        name = state.displayName,
+                        // Not used here
+                        url = null,
+                        size = AvatarSize.UserHeader,
+                    ),
+                    bitmap = state.avatar,
+                )
+                Spacer(Modifier.height(24.dp))
+                Text(
+                    modifier = Modifier.padding(horizontal = 32.dp),
+                    text = stringResource(R.string.screen_onboarding_welcome_back),
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    textAlign = TextAlign.Center,
+                )
+                // User display name
+                if (state.displayName != null) {
+                    Text(
+                        text = state.displayName,
+                        style = ElementTheme.typography.fontHeadingLgBold,
+                        color = ElementTheme.colors.textPrimary,
+                        textAlign = TextAlign.Center,
+                    )
+                    Spacer(Modifier.height(16.dp))
+                }
+                // UserId
+                Text(
+                    text = state.userId.value,
+                    style = if (state.displayName == null) ElementTheme.typography.fontHeadingLgBold else ElementTheme.typography.fontBodyLgRegular,
+                    color = ElementTheme.colors.textPrimary,
+                    textAlign = TextAlign.Center,
+                )
+                // Min spacing
+                Spacer(Modifier.height(45.dp))
+                ButtonColumnMolecule {
+                    Button(
+                        text = stringResource(CommonStrings.action_continue),
+                        showProgress = isLoading,
+                        onClick = {
+                            state.eventSink(LoginWithClassicEvent.Submit)
+                        },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .testTag(TestTags.loginContinue)
+                    )
+                    OutlinedButton(
+                        text = stringResource(CommonStrings.common_other_options),
+                        onClick = onOtherOptionsClick,
+                        enabled = !isLoading,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .testTag(TestTags.loginContinue)
+                    )
+                }
+            }
+        },
+        footer = {},
+    )
+
+    AsyncActionView(
+        async = state.loginWithClassicAction,
+        onErrorDismiss = {
+            state.eventSink(LoginWithClassicEvent.ClearError)
+        },
+        onSuccess = {
+            // noop, the view will be closed
+        },
+        progressDialog = {
+            // The button is showing the progress
+        }
+    )
+    LoginModeView(
+        loginMode = state.loginModeState.loginMode,
+        onClearError = {
+            state.eventSink(LoginWithClassicEvent.ClearError)
+        },
+        onLearnMoreClick = onLearnMoreClick,
+        onOAuthDetails = onOAuthDetails,
+        onNeedLoginPassword = onNeedLoginPassword,
+        onCreateAccountContinue = onCreateAccountContinue,
+    )
+    LocalNetworkPermissionDialogView(
+        dialog = state.loginModeState.localNetworkPermissionDialog,
+        onSubmit = {
+            state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
+        },
+        onDismiss = {
+            state.loginModeState.eventSink(LoginModeEvent.DismissLocalNetworkPermission)
+        }
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun LoginWithClassicViewPreview(@PreviewParameter(LoginWithClassicStateProvider::class) state: LoginWithClassicState) = ElementPreview {
+    LoginWithClassicView(
+        state = state,
+        onOtherOptionsClick = {},
+        onOAuthDetails = {},
+        onNeedLoginPassword = {},
+        onLearnMoreClick = {},
+        onCreateAccountContinue = {},
+    )
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupNode.kt
new file mode 100644
index 0000000000..45c16e7cde
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupNode.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.login.impl.BuildConfig
+import io.element.android.libraries.architecture.callback
+import timber.log.Timber
+
+@ContributesNode(AppScope::class)
+@AssistedInject
+class MissingKeyBackupNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: MissingKeyBackupPresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun navigateBack()
+    }
+
+    private val callback: Callback = callback()
+
+    /**
+     * Open Element Classic application.
+     */
+    private fun openClassic(context: Context) {
+        context.packageManager.getLaunchIntentForPackage(
+            BuildConfig.elementClassicPackage,
+        )?.let { intent ->
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            try {
+                context.startActivity(intent)
+            } catch (e: ActivityNotFoundException) {
+                // Should not happen, Element Classic must be installed for this screen to be displayed.
+                Timber.e(e, "Element Classic app not found, cannot open it.")
+            }
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        val context = LocalContext.current
+        MissingKeyBackupView(
+            state = state,
+            onBackClick = callback::navigateBack,
+            onOpenClassicClick = {
+                openClassic(context)
+            },
+            modifier = modifier,
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenter.kt
new file mode 100644
index 0000000000..593c50dcb5
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenter.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+import androidx.compose.runtime.Composable
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.meta.BuildMeta
+
+@Inject
+class MissingKeyBackupPresenter(
+    private val buildMeta: BuildMeta,
+) : Presenter<MissingKeyBackupState> {
+    @Composable
+    override fun present(): MissingKeyBackupState {
+        return MissingKeyBackupState(
+            appName = buildMeta.applicationName,
+        )
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupState.kt
new file mode 100644
index 0000000000..31eaf015a0
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupState.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+data class MissingKeyBackupState(
+    val appName: String,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupStateProvider.kt
new file mode 100644
index 0000000000..2c6a09b3ed
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupStateProvider.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+
+open class MissingKeyBackupStateProvider : PreviewParameterProvider<MissingKeyBackupState> {
+    override val values: Sequence<MissingKeyBackupState>
+        get() = sequenceOf(
+            aMissingKeyBackupState(),
+            // Add other state here
+        )
+}
+
+fun aMissingKeyBackupState(
+    appName: String = "AppName",
+) = MissingKeyBackupState(
+    appName = appName,
+)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupView.kt
new file mode 100644
index 0000000000..c4c9c5f286
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupView.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.login.impl.R
+import io.element.android.libraries.designsystem.atomic.organisms.NumberedListOrganism
+import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import kotlinx.collections.immutable.persistentListOf
+
+@Composable
+fun MissingKeyBackupView(
+    state: MissingKeyBackupState,
+    onBackClick: () -> Unit,
+    onOpenClassicClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    FlowStepPage(
+        modifier = modifier,
+        onBackClick = onBackClick,
+        iconStyle = BigIcon.Style.Default(CompoundIcons.KeySolid()),
+        title = stringResource(id = R.string.screen_missing_key_backup_title, state.appName),
+        content = { Content(state) },
+        buttons = {
+            Buttons(
+                onOpenClassicClick = onOpenClassicClick,
+            )
+        }
+    )
+}
+
+@Composable
+private fun Content(
+    state: MissingKeyBackupState,
+) {
+    NumberedListOrganism(
+        modifier = Modifier.padding(top = 50.dp, start = 20.dp, end = 20.dp),
+        items = persistentListOf(
+            AnnotatedString(stringResource(R.string.screen_missing_key_backup_step_1)),
+            AnnotatedString(stringResource(R.string.screen_missing_key_backup_step_2_android)),
+            AnnotatedString(stringResource(R.string.screen_missing_key_backup_step_3_android)),
+            AnnotatedString(stringResource(R.string.screen_missing_key_backup_step_4)),
+            AnnotatedString(stringResource(R.string.screen_missing_key_backup_step_5, state.appName)),
+        ),
+    )
+}
+
+@Composable
+private fun ColumnScope.Buttons(
+    onOpenClassicClick: () -> Unit,
+) {
+    Button(
+        text = stringResource(id = R.string.screen_missing_key_backup_open_element_classic),
+        modifier = Modifier.fillMaxWidth(),
+        onClick = onOpenClassicClick,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun MissingKeyBackupViewPreview(@PreviewParameter(MissingKeyBackupStateProvider::class) state: MissingKeyBackupState) = ElementPreview {
+    MissingKeyBackupView(
+        state = state,
+        onBackClick = {},
+        onOpenClassicClick = {},
+    )
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootNode.kt
new file mode 100644
index 0000000000..adb8c2d728
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootNode.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.root
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+
+@ContributesNode(AppScope::class)
+@AssistedInject
+class RootNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext, plugins = plugins) {
+    @Composable
+    override fun View(modifier: Modifier) {
+        RootView(modifier)
+    }
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootView.kt
new file mode 100644
index 0000000000..f1ca4b048a
--- /dev/null
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/classic/root/RootView.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.root
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.utils.DelayedVisibility
+import kotlin.time.Duration.Companion.milliseconds
+
+@Composable
+fun RootView(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center,
+    ) {
+        DelayedVisibility(
+            duration = 100.milliseconds,
+        ) {
+            CircularProgressIndicator()
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun RootViewPreview() = ElementPreview {
+    RootView()
+}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
index e3643afbf2..928a493dc1 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
@@ -22,7 +22,7 @@ import io.element.android.features.login.impl.util.openLearnMorePage
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -44,7 +44,7 @@ class ConfirmAccountProviderNode(
 
     interface Callback : Plugin {
         fun navigateToLoginPassword()
-        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToOAuth(oAuthDetails: OAuthDetails)
         fun navigateToCreateAccount(url: String)
         fun navigateToChangeAccountProvider()
     }
@@ -58,7 +58,7 @@ class ConfirmAccountProviderNode(
         ConfirmAccountProviderView(
             state = state,
             modifier = modifier,
-            onOidcDetails = callback::navigateToOidc,
+            onOAuthDetails = callback::navigateToOAuth,
             onNeedLoginPassword = callback::navigateToLoginPassword,
             onCreateAccountContinue = callback::navigateToCreateAccount,
             onChange = callback::navigateToChangeAccountProvider,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
index c38da7b11c..0111b1e7d7 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
@@ -11,20 +11,19 @@ package io.element.android.features.login.impl.screens.confirmaccountprovider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
-import io.element.android.features.login.impl.login.LoginHelper
+import io.element.android.features.login.impl.login.LoginModeEvent
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.Presenter
-import kotlinx.coroutines.launch
 
 @AssistedInject
 class ConfirmAccountProviderPresenter(
     @Assisted private val params: Params,
     private val accountProviderDataSource: AccountProviderDataSource,
-    private val loginHelper: LoginHelper,
+    private val loginModePresenter: Presenter<LoginModeState>,
 ) : Presenter<ConfirmAccountProviderState> {
     data class Params(
         val isAccountCreation: Boolean,
@@ -38,27 +37,26 @@ class ConfirmAccountProviderPresenter(
     @Composable
     override fun present(): ConfirmAccountProviderState {
         val accountProvider by accountProviderDataSource.flow.collectAsState()
-        val localCoroutineScope = rememberCoroutineScope()
-
-        val loginMode by loginHelper.collectLoginMode()
+        val loginModeState = loginModePresenter.present()
 
         fun handleEvent(event: ConfirmAccountProviderEvents) {
             when (event) {
-                ConfirmAccountProviderEvents.Continue -> localCoroutineScope.launch {
-                    loginHelper.submit(
+                ConfirmAccountProviderEvents.Continue -> loginModeState.eventSink(
+                    LoginModeEvent.Submit(
                         isAccountCreation = params.isAccountCreation,
                         homeserverUrl = accountProvider.url,
+                        resolvedHomeserverUrl = null,
                         loginHint = null,
                     )
-                }
-                ConfirmAccountProviderEvents.ClearError -> loginHelper.clearError()
+                )
+                ConfirmAccountProviderEvents.ClearError -> loginModeState.eventSink(LoginModeEvent.ClearError)
             }
         }
 
         return ConfirmAccountProviderState(
             accountProvider = accountProvider,
             isAccountCreation = params.isAccountCreation,
-            loginMode = loginMode,
+            loginModeState = loginModeState,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
index b29b610b3e..6e6deb8c2c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderState.kt
@@ -9,14 +9,16 @@
 package io.element.android.features.login.impl.screens.confirmaccountprovider
 
 import io.element.android.features.login.impl.accountprovider.AccountProvider
-import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.AsyncData
 
 data class ConfirmAccountProviderState(
     val accountProvider: AccountProvider,
     val isAccountCreation: Boolean,
-    val loginMode: AsyncData<LoginMode>,
+    val loginModeState: LoginModeState,
     val eventSink: (ConfirmAccountProviderEvents) -> Unit
 ) {
-    val submitEnabled: Boolean get() = accountProvider.url.isNotEmpty() && (loginMode is AsyncData.Uninitialized || loginMode is AsyncData.Loading)
+    val submitEnabled: Boolean
+        get() = accountProvider.url.isNotEmpty() &&
+            (loginModeState.loginMode is AsyncData.Uninitialized || loginModeState.loginMode is AsyncData.Loading)
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
index f3a48a86b4..f597ad6b54 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderStateProvider.kt
@@ -11,7 +11,8 @@ package io.element.android.features.login.impl.screens.confirmaccountprovider
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.anAccountProvider
-import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
 import io.element.android.libraries.architecture.AsyncData
 
@@ -24,7 +25,7 @@ open class ConfirmAccountProviderStateProvider : PreviewParameterProvider<Confir
             ),
             aConfirmAccountProviderState(
                 isAccountCreation = true,
-                loginMode = AsyncData.Failure(AccountCreationNotSupported())
+                loginModeState = aLoginModeState(loginMode = AsyncData.Failure(AccountCreationNotSupported())),
             ),
         )
 }
@@ -32,11 +33,11 @@ open class ConfirmAccountProviderStateProvider : PreviewParameterProvider<Confir
 private fun aConfirmAccountProviderState(
     accountProvider: AccountProvider = anAccountProvider(),
     isAccountCreation: Boolean = false,
-    loginMode: AsyncData<LoginMode> = AsyncData.Uninitialized,
+    loginModeState: LoginModeState = aLoginModeState(),
     eventSink: (ConfirmAccountProviderEvents) -> Unit = {},
 ) = ConfirmAccountProviderState(
     accountProvider = accountProvider,
     isAccountCreation = isAccountCreation,
-    loginMode = loginMode,
+    loginModeState = loginModeState,
     eventSink = eventSink
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
index a175ab556d..95fbff25ab 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.login.impl.R
+import io.element.android.features.login.impl.login.LoginModeEvent
 import io.element.android.features.login.impl.login.LoginModeView
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
@@ -30,7 +31,8 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.TextButton
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -38,16 +40,16 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun ConfirmAccountProviderView(
     state: ConfirmAccountProviderState,
-    onOidcDetails: (OidcDetails) -> Unit,
+    onOAuthDetails: (OAuthDetails) -> Unit,
     onNeedLoginPassword: () -> Unit,
     onLearnMoreClick: () -> Unit,
     onCreateAccountContinue: (url: String) -> Unit,
     onChange: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val isLoading by remember(state.loginMode) {
+    val isLoading by remember(state.loginModeState.loginMode) {
         derivedStateOf {
-            state.loginMode is AsyncData.Loading
+            state.loginModeState.loginMode is AsyncData.Loading
         }
     }
     val eventSink = state.eventSink
@@ -98,16 +100,26 @@ fun ConfirmAccountProviderView(
         }
     ) {
         LoginModeView(
-            loginMode = state.loginMode,
+            loginMode = state.loginModeState.loginMode,
             onClearError = {
                 eventSink(ConfirmAccountProviderEvents.ClearError)
             },
             onLearnMoreClick = onLearnMoreClick,
-            onOidcDetails = onOidcDetails,
+            onOAuthDetails = onOAuthDetails,
             onNeedLoginPassword = onNeedLoginPassword,
             onCreateAccountContinue = onCreateAccountContinue,
         )
     }
+
+    LocalNetworkPermissionDialogView(
+        dialog = state.loginModeState.localNetworkPermissionDialog,
+        onSubmit = {
+            state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
+        },
+        onDismiss = {
+            state.loginModeState.eventSink(LoginModeEvent.DismissLocalNetworkPermission)
+        }
+    )
 }
 
 @PreviewsDayNight
@@ -117,7 +129,7 @@ internal fun ConfirmAccountProviderViewPreview(
 ) = ElementPreview {
     ConfirmAccountProviderView(
         state = state,
-        onOidcDetails = {},
+        onOAuthDetails = {},
         onNeedLoginPassword = {},
         onCreateAccountContinue = {},
         onLearnMoreClick = {},
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
index c6ce16141d..853b8a7423 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
@@ -17,14 +17,23 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.inputs
 
 @ContributesNode(AppScope::class)
 @AssistedInject
 class LoginPasswordNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val presenter: LoginPasswordPresenter,
+    presenterFactory: LoginPasswordPresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
+    data class Inputs(
+        val initialLogin: String,
+    ) : NodeInputs
+
+    private val inputs: Inputs = inputs()
+    private val presenter = presenterFactory.create(inputs.initialLogin)
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
index b1ddc6e5b8..f26f342a42 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenter.kt
@@ -16,7 +16,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -25,11 +27,18 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
-@Inject
+@AssistedInject
 class LoginPasswordPresenter(
+    @Assisted
+    private val initialLogin: String,
     private val authenticationService: MatrixAuthenticationService,
     private val accountProviderDataSource: AccountProviderDataSource,
 ) : Presenter<LoginPasswordState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(initialLogin: String): LoginPasswordPresenter
+    }
+
     @Composable
     override fun present(): LoginPasswordState {
         val localCoroutineScope = rememberCoroutineScope()
@@ -38,7 +47,12 @@ class LoginPasswordPresenter(
         }
 
         val formState = rememberSaveable {
-            mutableStateOf(LoginFormState.Default)
+            mutableStateOf(
+                LoginFormState(
+                    login = initialLogin,
+                    password = "",
+                )
+            )
         }
         val accountProvider by accountProviderDataSource.flow.collectAsState()
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
index d3641ea749..06a1641644 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.platform.LocalAutofillManager
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentType
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.input.ImeAction
@@ -60,6 +61,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.PasswordVisibilityToggle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
@@ -210,10 +212,15 @@ private fun LoginForm(
             singleLine = true,
             trailingIcon = if (loginFieldState.isNotEmpty()) {
                 {
-                    Box(Modifier.clickable {
-                        loginFieldState = ""
-                        eventSink(LoginPasswordEvents.SetLogin(""))
-                    }) {
+                    Box(
+                        Modifier.clickable(
+                            onClickLabel = stringResource(CommonStrings.action_clear),
+                            role = Role.Button,
+                        ) {
+                            loginFieldState = ""
+                            eventSink(LoginPasswordEvents.SetLogin(""))
+                        }
+                    ) {
                         Icon(
                             imageVector = CompoundIcons.Close(),
                             contentDescription = stringResource(CommonStrings.action_clear),
@@ -249,16 +256,10 @@ private fun LoginForm(
             placeholder = stringResource(CommonStrings.common_password),
             visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
             trailingIcon = {
-                val image =
-                    if (passwordVisible) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff()
-                val description =
-                    if (passwordVisible) stringResource(CommonStrings.a11y_hide_password) else stringResource(CommonStrings.a11y_show_password)
-                Box(Modifier.clickable { passwordVisible = !passwordVisible }) {
-                    Icon(
-                        imageVector = image,
-                        contentDescription = description,
-                    )
-                }
+                PasswordVisibilityToggle(
+                    visible = passwordVisible,
+                    onToggle = { passwordVisible = !passwordVisible },
+                )
             },
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Password,
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
index 1ded677c13..99f7e86fd3 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
@@ -22,7 +22,7 @@ import io.element.android.features.login.impl.util.openLearnMorePage
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 
 @ContributesNode(AppScope::class)
 @AssistedInject
@@ -40,14 +40,16 @@ class OnBoardingNode(
         fun navigateToQrCode()
         fun navigateToBugReport()
         fun navigateToLoginPassword()
-        fun navigateToOidc(oidcDetails: OidcDetails)
+        fun navigateToOAuth(oAuthDetails: OAuthDetails)
         fun navigateToCreateAccount(url: String)
+        fun navigateToDeveloperSettings()
         fun onDone()
     }
 
     data class Params(
         val accountProvider: String?,
         val loginHint: String?,
+        val showBackButton: Boolean,
     ) : NodeInputs
 
     private val callback: Callback = callback()
@@ -61,6 +63,7 @@ class OnBoardingNode(
     override fun View(modifier: Modifier) {
         val state = presenter.present()
         val context = LocalContext.current
+
         OnBoardingView(
             state = state,
             modifier = modifier,
@@ -68,11 +71,12 @@ class OnBoardingNode(
             onCreateAccount = callback::navigateToSignUpFlow,
             onSignInWithQrCode = callback::navigateToQrCode,
             onReportProblem = callback::navigateToBugReport,
-            onOidcDetails = callback::navigateToOidc,
+            onOAuthDetails = callback::navigateToOAuth,
             onNeedLoginPassword = callback::navigateToLoginPassword,
             onLearnMoreClick = { openLearnMorePage(context) },
             onCreateAccountContinue = callback::navigateToCreateAccount,
             onBackClick = callback::onDone,
+            onDeveloperSettingsClick = callback::navigateToDeveloperSettings,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
index 741f65234e..29e4b1afe5 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenter.kt
@@ -25,11 +25,12 @@ import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.api.canConnectToAnyHomeserver
 import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
-import io.element.android.features.login.impl.login.LoginHelper
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicState
+import io.element.android.features.login.impl.login.LoginModeEvent
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.ui.utils.MultipleTapToUnlock
 import kotlinx.coroutines.launch
@@ -41,11 +42,10 @@ class OnBoardingPresenter(
     private val enterpriseService: EnterpriseService,
     private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,
     private val rageshakeFeatureAvailability: RageshakeFeatureAvailability,
-    private val loginHelper: LoginHelper,
+    private val loginModePresenter: Presenter<LoginModeState>,
     private val onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider,
     private val sessionStore: SessionStore,
     private val accountProviderDataSource: AccountProviderDataSource,
-    private val loginWithClassicPresenter: Presenter<LoginWithClassicState>,
 ) : Presenter<OnBoardingState> {
     @AssistedFactory
     interface Factory {
@@ -99,22 +99,23 @@ class OnBoardingPresenter(
             value = sessionStore.numberOfSessions() > 0
         }
 
-        val loginMode by loginHelper.collectLoginMode()
-
-        val loginWithClassicState = loginWithClassicPresenter.present()
+        val loginModeState = loginModePresenter.present()
 
         fun handleEvent(event: OnBoardingEvents) {
             when (event) {
                 is OnBoardingEvents.OnSignIn -> localCoroutineScope.launch {
                     // Ensure that the current account provider is set
                     accountProviderDataSource.setUrl(event.defaultAccountProvider)
-                    loginHelper.submit(
-                        isAccountCreation = false,
-                        homeserverUrl = event.defaultAccountProvider,
-                        loginHint = params.loginHint?.takeIf { forcedAccountProvider == null },
+                    loginModeState.eventSink(
+                        LoginModeEvent.Submit(
+                            isAccountCreation = false,
+                            homeserverUrl = event.defaultAccountProvider,
+                            resolvedHomeserverUrl = null,
+                            loginHint = params.loginHint?.takeIf { forcedAccountProvider == null },
+                        )
                     )
                 }
-                OnBoardingEvents.ClearError -> loginHelper.clearError()
+                OnBoardingEvents.ClearError -> loginModeState.eventSink(LoginModeEvent.ClearError)
                 OnBoardingEvents.OnVersionClick -> {
                     if (canReportBug) {
                         if (multipleTapToUnlock.unlock(localCoroutineScope)) {
@@ -127,16 +128,17 @@ class OnBoardingPresenter(
 
         return OnBoardingState(
             isAddingAccount = isAddingAccount,
+            showBackButton = params.showBackButton,
+            showDeveloperSettings = buildMeta.buildType != BuildType.RELEASE,
             productionApplicationName = buildMeta.productionApplicationName,
             defaultAccountProvider = defaultAccountProvider,
             mustChooseAccountProvider = mustChooseAccountProvider,
             canLoginWithQrCode = canLoginWithQrCode,
             canCreateAccount = defaultAccountProvider == null && canConnectToAnyHomeserver && OnBoardingConfig.CAN_CREATE_ACCOUNT,
             canReportBug = canReportBug && showReportBug,
-            loginMode = loginMode,
+            loginModeState = loginModeState,
             version = buildMeta.versionName,
             onBoardingLogoResId = onBoardingLogoResId,
-            loginWithClassicState = loginWithClassicState,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
index 703120b260..4fb4b8090e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingState.kt
@@ -9,12 +9,13 @@
 package io.element.android.features.login.impl.screens.onboarding
 
 import androidx.annotation.DrawableRes
-import io.element.android.features.login.impl.login.LoginMode
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicState
+import io.element.android.features.login.impl.login.LoginModeState
 import io.element.android.libraries.architecture.AsyncData
 
 data class OnBoardingState(
     val isAddingAccount: Boolean,
+    val showBackButton: Boolean,
+    val showDeveloperSettings: Boolean,
     val productionApplicationName: String,
     val defaultAccountProvider: String?,
     val mustChooseAccountProvider: Boolean,
@@ -24,10 +25,10 @@ data class OnBoardingState(
     val version: String,
     @DrawableRes
     val onBoardingLogoResId: Int?,
-    val loginMode: AsyncData<LoginMode>,
-    val loginWithClassicState: LoginWithClassicState,
+    val loginModeState: LoginModeState,
     val eventSink: (OnBoardingEvents) -> Unit,
 ) {
     val submitEnabled: Boolean
-        get() = defaultAccountProvider != null && (loginMode is AsyncData.Uninitialized || loginMode is AsyncData.Loading)
+        get() = defaultAccountProvider != null &&
+            (loginModeState.loginMode is AsyncData.Uninitialized || loginModeState.loginMode is AsyncData.Loading)
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
index 76f8eb3513..41e4a81818 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingStateProvider.kt
@@ -10,10 +10,8 @@ package io.element.android.features.login.impl.screens.onboarding
 
 import androidx.annotation.DrawableRes
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.login.impl.login.LoginMode
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicState
-import io.element.android.features.login.impl.screens.onboarding.classic.aLoginWithClassicState
-import io.element.android.libraries.architecture.AsyncData
+import io.element.android.features.login.impl.login.LoginModeState
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.libraries.designsystem.R
 
 open class OnBoardingStateProvider : PreviewParameterProvider<OnBoardingState> {
@@ -31,11 +29,17 @@ open class OnBoardingStateProvider : PreviewParameterProvider<OnBoardingState> {
                 canLoginWithQrCode = true,
                 canCreateAccount = true,
             ),
+            anOnBoardingState(
+                showBackButton = true,
+                showDeveloperSettings = true,
+            ),
         )
 }
 
 fun anOnBoardingState(
     isAddingAccount: Boolean = false,
+    showBackButton: Boolean = false,
+    showDeveloperSettings: Boolean = false,
     productionApplicationName: String = "Element",
     defaultAccountProvider: String? = null,
     mustChooseAccountProvider: Boolean = false,
@@ -45,11 +49,12 @@ fun anOnBoardingState(
     version: String = "1.0.0",
     @DrawableRes
     customLogoResId: Int? = null,
-    loginMode: AsyncData<LoginMode> = AsyncData.Uninitialized,
-    loginWithClassicState: LoginWithClassicState = aLoginWithClassicState(),
+    loginModeState: LoginModeState = aLoginModeState(),
     eventSink: (OnBoardingEvents) -> Unit = {},
 ) = OnBoardingState(
     isAddingAccount = isAddingAccount,
+    showBackButton = showBackButton,
+    showDeveloperSettings = showDeveloperSettings,
     productionApplicationName = productionApplicationName,
     defaultAccountProvider = defaultAccountProvider,
     mustChooseAccountProvider = mustChooseAccountProvider,
@@ -57,8 +62,7 @@ fun anOnBoardingState(
     canCreateAccount = canCreateAccount,
     canReportBug = canReportBug,
     version = version,
-    loginMode = loginMode,
+    loginModeState = loginModeState,
     onBoardingLogoResId = customLogoResId,
-    loginWithClassicState = loginWithClassicState,
     eventSink = eventSink,
 )
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
index d590f1fec8..bf96b2dbe0 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingView.kt
@@ -27,19 +27,15 @@ import androidx.compose.ui.BiasAlignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.compose.LifecycleEventEffect
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.login.impl.R
+import io.element.android.features.login.impl.login.LoginModeEvent
 import io.element.android.features.login.impl.login.LoginModeView
-import io.element.android.features.login.impl.screens.onboarding.classic.ConfirmingLoginWithElementClassic
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicEvent
-import io.element.android.features.login.impl.screens.onboarding.classic.LoginWithClassicState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtom
 import io.element.android.libraries.designsystem.atomic.atoms.ElementLogoAtomSize
@@ -47,32 +43,32 @@ import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMo
 import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
 import io.element.android.libraries.designsystem.atomic.pages.OnBoardingPage
 import io.element.android.libraries.designsystem.components.BigIcon
-import io.element.android.libraries.designsystem.components.async.AsyncActionView
-import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialogView
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
 
-// Refs:
-// FTUE:
-// - https://www.figma.com/file/o9p34zmiuEpZRyvZXJZAYL/FTUE?type=design&node-id=133-5427&t=5SHVppfYzjvkEywR-0
-// ElementX:
-// - https://www.figma.com/file/0MMNu7cTOzLOlWb7ctTkv3/Element-X?type=design&node-id=1816-97419
+/**
+ * Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=41-6503
+ */
 @Composable
 fun OnBoardingView(
     state: OnBoardingState,
     onBackClick: () -> Unit,
+    onDeveloperSettingsClick: () -> Unit,
     onSignInWithQrCode: () -> Unit,
     onSignIn: (mustChooseAccountProvider: Boolean) -> Unit,
     onCreateAccount: () -> Unit,
-    onOidcDetails: (OidcDetails) -> Unit,
+    onOAuthDetails: (OAuthDetails) -> Unit,
     onNeedLoginPassword: () -> Unit,
     onLearnMoreClick: () -> Unit,
     onCreateAccountContinue: (url: String) -> Unit,
@@ -81,15 +77,24 @@ fun OnBoardingView(
 ) {
     val loginView = @Composable {
         LoginModeView(
-            loginMode = state.loginMode,
+            loginMode = state.loginModeState.loginMode,
             onClearError = {
                 state.eventSink(OnBoardingEvents.ClearError)
             },
             onLearnMoreClick = onLearnMoreClick,
-            onOidcDetails = onOidcDetails,
+            onOAuthDetails = onOAuthDetails,
             onNeedLoginPassword = onNeedLoginPassword,
             onCreateAccountContinue = onCreateAccountContinue,
         )
+        LocalNetworkPermissionDialogView(
+            dialog = state.loginModeState.localNetworkPermissionDialog,
+            onSubmit = {
+                state.loginModeState.eventSink(LoginModeEvent.RequestLocalNetworkPermission)
+            },
+            onDismiss = {
+                state.loginModeState.eventSink(LoginModeEvent.DismissLocalNetworkPermission)
+            }
+        )
     }
     val buttons = @Composable {
         OnBoardingButtons(
@@ -114,45 +119,10 @@ fun OnBoardingView(
             state = state,
             loginView = loginView,
             buttons = buttons,
+            onBackClick = onBackClick,
+            onDeveloperSettingsClick = onDeveloperSettingsClick,
         )
     }
-
-    LoginWithElementClassicView(
-        state = state.loginWithClassicState,
-    )
-}
-
-@Composable
-private fun LoginWithElementClassicView(
-    state: LoginWithClassicState,
-) {
-    LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
-        state.eventSink(LoginWithClassicEvent.RefreshData)
-    }
-    AsyncActionView(
-        async = state.loginWithClassicAction,
-        confirmationDialog = { confirming ->
-            when (confirming) {
-                is ConfirmingLoginWithElementClassic -> {
-                    // TODO i18n
-                    ConfirmationDialog(
-                        title = "Sign in with Element Classic",
-                        content = "You are signing in as ${confirming.userId} on Element Classic." +
-                            " Your existing session on Element Classic will not be signed out. Do you want to continue?",
-                        submitText = stringResource(CommonStrings.action_continue),
-                        onSubmitClick = { state.eventSink(LoginWithClassicEvent.DoLoginWithClassic) },
-                        onDismiss = { state.eventSink(LoginWithClassicEvent.CloseDialog) },
-                    )
-                }
-            }
-        },
-        onErrorDismiss = {
-            state.eventSink(LoginWithClassicEvent.CloseDialog)
-        },
-        onSuccess = {
-            // noop, the view will be closed
-        }
-    )
 }
 
 @Composable
@@ -160,18 +130,49 @@ private fun AddFirstAccountScaffold(
     state: OnBoardingState,
     loginView: @Composable () -> Unit,
     buttons: @Composable () -> Unit,
+    onBackClick: () -> Unit,
+    onDeveloperSettingsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnBoardingPage(
         modifier = modifier,
         renderBackground = state.onBoardingLogoResId == null,
         content = {
-            if (state.onBoardingLogoResId != null) {
-                OnBoardingLogo(
-                    onBoardingLogoResId = state.onBoardingLogoResId,
-                )
-            } else {
-                OnBoardingContent(state = state)
+            Box(
+                modifier = Modifier.fillMaxSize(),
+            ) {
+                if (state.onBoardingLogoResId != null) {
+                    OnBoardingLogo(
+                        onBoardingLogoResId = state.onBoardingLogoResId,
+                    )
+                } else {
+                    OnBoardingContent(state = state)
+                }
+                if (state.showDeveloperSettings) {
+                    IconButton(
+                        onClick = onDeveloperSettingsClick,
+                        modifier = Modifier
+                            .align(Alignment.TopStart),
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.SettingsSolid(),
+                            contentDescription = stringResource(CommonStrings.common_developer_options),
+                        )
+                    }
+                }
+                if (state.showBackButton) {
+                    // Add icon button to "navigate back"
+                    IconButton(
+                        onClick = onBackClick,
+                        modifier = Modifier
+                            .align(Alignment.TopEnd),
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.Close(),
+                            contentDescription = stringResource(CommonStrings.action_cancel),
+                        )
+                    }
+                }
             }
             loginView()
         },
@@ -231,14 +232,14 @@ private fun OnBoardingContent(state: OnBoardingState) {
                     text = stringResource(id = R.string.screen_onboarding_welcome_title),
                     color = ElementTheme.colors.textPrimary,
                     style = ElementTheme.typography.fontHeadingLgBold,
-                    textAlign = TextAlign.Center
+                    textAlign = TextAlign.Center,
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
                     text = stringResource(id = R.string.screen_onboarding_welcome_message, state.productionApplicationName),
-                    color = ElementTheme.colors.textSecondary,
-                    style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp),
-                    textAlign = TextAlign.Center
+                    color = ElementTheme.colors.textPrimary,
+                    style = ElementTheme.typography.fontBodyLgRegular,
+                    textAlign = TextAlign.Center,
                 )
             }
         }
@@ -271,9 +272,9 @@ private fun OnBoardingButtons(
     onCreateAccount: () -> Unit,
     onReportProblem: () -> Unit,
 ) {
-    val isLoading by remember(state.loginMode) {
+    val isLoading by remember(state.loginModeState.loginMode) {
         derivedStateOf {
-            state.loginMode is AsyncData.Loading
+            state.loginModeState.loginMode is AsyncData.Loading
         }
     }
 
@@ -283,18 +284,6 @@ private fun OnBoardingButtons(
         } else {
             CommonStrings.action_continue
         }
-        if (state.loginWithClassicState.canLoginWithClassic) {
-            Button(
-                text = "Sign in with Element Classic",
-                leadingIcon = IconSource.Vector(CompoundIcons.Mobile()),
-                onClick = {
-                    state.loginWithClassicState.eventSink(
-                        LoginWithClassicEvent.StartLoginWithClassic
-                    )
-                },
-                modifier = Modifier.fillMaxWidth(),
-            )
-        }
         if (state.canLoginWithQrCode) {
             Button(
                 text = stringResource(id = R.string.screen_onboarding_sign_in_with_qr_code),
@@ -348,7 +337,7 @@ private fun OnBoardingButtons(
             } else {
                 Text(
                     modifier = Modifier
-                        .clickable {
+                        .clickable(role = Role.Button) {
                             state.eventSink(OnBoardingEvents.OnVersionClick)
                         }
                         .padding(16.dp),
@@ -369,11 +358,12 @@ internal fun OnBoardingViewPreview(
     OnBoardingView(
         state = state,
         onBackClick = {},
+        onDeveloperSettingsClick = {},
         onSignInWithQrCode = {},
         onSignIn = {},
         onCreateAccount = {},
         onReportProblem = {},
-        onOidcDetails = {},
+        onOAuthDetails = {},
         onNeedLoginPassword = {},
         onLearnMoreClick = {},
         onCreateAccountContinue = {},
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ElementClassicConnection.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ElementClassicConnection.kt
deleted file mode 100644
index f895dd781e..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ElementClassicConnection.kt
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Context.BIND_AUTO_CREATE
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.Bundle
-import android.os.Handler
-import android.os.IBinder
-import android.os.Message
-import android.os.Messenger
-import android.os.RemoteException
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.features.login.impl.BuildConfig
-import io.element.android.libraries.core.log.logger.LoggerTag
-import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.matrix.api.core.UserId
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-interface ElementClassicConnection {
-    fun start()
-    fun stop()
-    fun requestData()
-    val stateFlow: StateFlow<ElementClassicConnectionState>
-}
-
-sealed interface ElementClassicConnectionState {
-    object Idle : ElementClassicConnectionState
-    object ElementClassicNotFound : ElementClassicConnectionState
-    object ElementClassicReadyNoSession : ElementClassicConnectionState
-    data class ElementClassicReady(
-        val userId: UserId,
-        val secrets: String,
-    ) : ElementClassicConnectionState
-
-    data class Error(val error: String) : ElementClassicConnectionState
-}
-
-private val loggerTag = LoggerTag("ECConnection")
-
-@ContributesBinding(AppScope::class)
-class DefaultElementClassicConnection(
-    @ApplicationContext
-    private val context: Context,
-    @AppCoroutineScope
-    private val coroutineScope: CoroutineScope,
-) : ElementClassicConnection {
-    // Messenger for communicating with the service.
-    private var messenger: Messenger? = null
-
-    // Target we publish for external service to send messages to IncomingHandler.
-    private val incomingMessenger: Messenger = Messenger(IncomingHandler())
-
-    // Flag indicating whether we have called bind on the service.
-    private var bound: Boolean = false
-
-    /**
-     * Class for interacting with the main interface of the service.
-     */
-    private val serviceConnection = object : ServiceConnection {
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            Timber.tag(loggerTag.value).d("onServiceConnected")
-            // This is called when the connection with the service has been
-            // established, giving us the object we can use to
-            // interact with the service. We are communicating with the
-            // service using a Messenger, so here we get a client-side
-            // representation of that from the raw IBinder object.
-            messenger = Messenger(service)
-            bound = true
-            // Request the data as soon as possible
-            requestData()
-        }
-
-        override fun onServiceDisconnected(className: ComponentName) {
-            Timber.tag(loggerTag.value).d("onServiceDisconnected")
-            // This is called when the connection with the service has been
-            // unexpectedly disconnected&mdash;that is, its process crashed.
-            messenger = null
-            bound = false
-        }
-    }
-
-    override fun start() {
-        Timber.tag(loggerTag.value).w("start()")
-        coroutineScope.launch {
-            // Establish a connection with the service. We use an explicit
-            // class name because there is no reason to be able to let other
-            // applications replace our component.
-            try {
-                val intentService = Intent()
-                intentService.setComponent(getElementClassicComponent())
-                if (context.bindService(intentService, serviceConnection, BIND_AUTO_CREATE)) {
-                    Timber.tag(loggerTag.value).d("Binding returned true")
-                } else {
-                    // This happen when the app is not installed
-                    Timber.tag(loggerTag.value).d("Binding returned false")
-                    mutableStateFlow.emit(ElementClassicConnectionState.ElementClassicNotFound)
-                }
-            } catch (e: SecurityException) {
-                Timber.tag(loggerTag.value).e(e, "Can't bind to Service")
-                mutableStateFlow.emit(ElementClassicConnectionState.Error(e.localizedMessage.orEmpty()))
-            }
-        }
-    }
-
-    override fun stop() {
-        Timber.tag(loggerTag.value).w("stop(): Unbinding (bound=$bound)")
-        if (bound) {
-            // Detach our existing connection.
-            context.unbindService(serviceConnection)
-            bound = false
-        }
-        coroutineScope.launch {
-            mutableStateFlow.emit(ElementClassicConnectionState.Idle)
-        }
-    }
-
-    override fun requestData() {
-        Timber.tag(loggerTag.value).w("requestData()")
-        coroutineScope.launch {
-            val finalMessenger = messenger
-            if (finalMessenger == null) {
-                Timber.tag(loggerTag.value).w("The messenger is null, can't request data")
-                mutableStateFlow.emit(ElementClassicConnectionState.Error("The messenger is null, can't request data"))
-            } else {
-                try {
-                    // Get the data
-                    val msg = Message.obtain(null, MSG_GET_DATA)
-                    msg.replyTo = incomingMessenger
-                    finalMessenger.send(msg)
-                } catch (e: RemoteException) {
-                    // In this case the service has crashed before we could even
-                    // do anything with it; we can count on soon being
-                    // disconnected (and then reconnected if it can be restarted)
-                    // so there is no need to do anything here.
-                    Timber.tag(loggerTag.value).e(e, "RemoteException")
-                    mutableStateFlow.emit(ElementClassicConnectionState.Error(e.localizedMessage.orEmpty()))
-                }
-            }
-        }
-    }
-
-    private val mutableStateFlow = MutableStateFlow<ElementClassicConnectionState>(ElementClassicConnectionState.Idle)
-    override val stateFlow = mutableStateFlow.asStateFlow()
-
-    /**
-     * Handler of incoming messages from service.
-     */
-    @Suppress("DEPRECATION")
-    inner class IncomingHandler : Handler() {
-        override fun handleMessage(msg: Message) {
-            Timber.tag(loggerTag.value).d("IncomingHandler handling message ${msg.what}")
-            when (msg.what) {
-                MSG_GET_DATA -> {
-                    // The data must be extracted from the bundle before we launch the coroutine, else the bundle will be emptied
-                    val state = msg.data.toElementClassicConnectionState()
-                    emitElementClassicState(state)
-                }
-                else -> {
-                    super.handleMessage(msg)
-                }
-            }
-        }
-    }
-
-    private fun emitElementClassicState(state: ElementClassicConnectionState) = coroutineScope.launch {
-        when (state) {
-            is ElementClassicConnectionState.Error -> {
-                Timber.tag(loggerTag.value).w("Received error from Element Classic: %s", state.error)
-                mutableStateFlow.emit(state)
-            }
-            is ElementClassicConnectionState.ElementClassicReady -> {
-                Timber.tag(loggerTag.value).d("Received userId from Element Classic: %s", state.userId)
-                mutableStateFlow.emit(state)
-            }
-            ElementClassicConnectionState.ElementClassicReadyNoSession -> {
-                Timber.tag(loggerTag.value).d("Received no session from Element Classic")
-                mutableStateFlow.emit(state)
-            }
-            else -> {
-                // Should not happen
-                Timber.tag(loggerTag.value).w("Received unexpected state from Element Classic: %s", state)
-                mutableStateFlow.emit(ElementClassicConnectionState.Idle)
-            }
-        }
-    }
-
-    private fun getElementClassicComponent() = ComponentName(
-        BuildConfig.elementClassicPackage,
-        ELEMENT_CLASSIC_SERVICE_FULL_CLASS_NAME,
-    )
-
-    private fun Bundle?.toElementClassicConnectionState(): ElementClassicConnectionState {
-        return if (this == null) {
-            ElementClassicConnectionState.Error("No data received from Element Classic")
-        } else {
-            val error = getString(KEY_ERROR_STR)
-            if (error != null) {
-                ElementClassicConnectionState.Error(error)
-            } else {
-                val userId = getString(KEY_USER_ID_STR)?.takeIf { it.isNotEmpty() }?.let(::UserId)
-                if (userId != null) {
-                    val secrets = getString(KEY_SECRETS_STR)?.takeIf { it.isNotEmpty() }
-                    if (secrets == null) {
-                        ElementClassicConnectionState.Error("No secrets received from Element Classic")
-                    } else {
-                        ElementClassicConnectionState.ElementClassicReady(userId, secrets)
-                    }
-                } else {
-                    ElementClassicConnectionState.ElementClassicReadyNoSession
-                }
-            }
-        }
-    }
-
-    // Everything in this companion object must match what is defined in Element Classic
-    private companion object {
-        const val ELEMENT_CLASSIC_SERVICE_FULL_CLASS_NAME = "im.vector.app.features.importer.ImporterService"
-
-        // Command to the service to get the data.
-        const val MSG_GET_DATA = 1
-
-        // Keys for the bundle returned from the service
-        const val KEY_ERROR_STR = "error"
-        const val KEY_USER_ID_STR = "userId"
-
-        /**
-         * Key to extract the secrets from the bundle, as a Json string.
-         * Json will have this format:
-         * {
-         *   "cross_signing" : {
-         *     "master_key" : "z8RUxnaAGu___REDACTED___k+BQL9o",
-         *     "user_signing_key" : "baJHzA___REDACTED___xMLbSUAXw9QUzqms",
-         *     "self_signing_key" : "DU0CvLtR2G/___REDACTED___dV/MONNq4nsQhM"
-         *   },
-         *   "backup" : {
-         *     "algorithm" : "m.megolm_backup.v1.curve25519-aes-sha2",
-         *     "key" : "VzncmQ+UOV___REDACTED___patxDz7m0Nc",
-         *     "backup_version" : "1"
-         *   }
-         * }
-         */
-        const val KEY_SECRETS_STR = "secrets"
-    }
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicEvent.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicEvent.kt
deleted file mode 100644
index 75a9496a02..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicEvent.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-sealed interface LoginWithClassicEvent {
-    data object RefreshData : LoginWithClassicEvent
-    data object StartLoginWithClassic : LoginWithClassicEvent
-    data object DoLoginWithClassic : LoginWithClassicEvent
-    data object CloseDialog : LoginWithClassicEvent
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenter.kt
deleted file mode 100644
index ef352794cb..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenter.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.sessionstorage.api.toUserListFlow
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-@Inject
-class LoginWithClassicPresenter(
-    private val elementClassicConnection: ElementClassicConnection,
-    private val sessionStore: SessionStore,
-    private val featureFlagService: FeatureFlagService,
-) : Presenter<LoginWithClassicState> {
-    @Composable
-    override fun present(): LoginWithClassicState {
-        val coroutineScope = rememberCoroutineScope()
-
-        val isSignInWithClassicEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.SignInWithClassic)
-        }.collectAsState(initial = false)
-
-        if (isSignInWithClassicEnabled) {
-            DisposableEffect(Unit) {
-                elementClassicConnection.start()
-                onDispose {
-                    elementClassicConnection.stop()
-                }
-            }
-        }
-
-        val state by elementClassicConnection.stateFlow.collectAsState()
-        val loginWithClassicAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
-
-        val existingSession by remember {
-            sessionStore.sessionsFlow().toUserListFlow()
-        }.collectAsState(emptyList())
-
-        val canLoginWithClassic by remember {
-            derivedStateOf {
-                when (val finalState = state) {
-                    is ElementClassicConnectionState.ElementClassicReady -> {
-                        // Ensure there is no existing session with the same Id.
-                        finalState.userId.value !in existingSession && isSignInWithClassicEnabled
-                    }
-                    else -> false
-                }
-            }
-        }
-
-        fun handleEvent(event: LoginWithClassicEvent) {
-            when (event) {
-                LoginWithClassicEvent.RefreshData -> {
-                    elementClassicConnection.requestData()
-                }
-                LoginWithClassicEvent.StartLoginWithClassic -> {
-                    val currentState = elementClassicConnection.stateFlow.value
-                    if (currentState is ElementClassicConnectionState.ElementClassicReady) {
-                        loginWithClassicAction.value = ConfirmingLoginWithElementClassic(
-                            userId = currentState.userId,
-                        )
-                    } else {
-                        loginWithClassicAction.value = AsyncAction.Failure(IllegalStateException("Element Classic is not ready"))
-                    }
-                }
-                LoginWithClassicEvent.DoLoginWithClassic -> coroutineScope.launch {
-                    // TODO Implement real login logic here
-                    loginWithClassicAction.value = AsyncAction.Loading
-                    delay(1000)
-                    loginWithClassicAction.value = AsyncAction.Success(Unit)
-                }
-                LoginWithClassicEvent.CloseDialog -> {
-                    loginWithClassicAction.value = AsyncAction.Uninitialized
-                }
-            }
-        }
-
-        return LoginWithClassicState(
-            canLoginWithClassic = canLoginWithClassic,
-            loginWithClassicAction = loginWithClassicAction.value,
-            eventSink = ::handleEvent,
-        )
-    }
-}
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicState.kt
deleted file mode 100644
index d2706fc24a..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicState.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-import io.element.android.libraries.architecture.AsyncAction
-
-data class LoginWithClassicState(
-    val canLoginWithClassic: Boolean,
-    val loginWithClassicAction: AsyncAction<Unit>,
-    val eventSink: (LoginWithClassicEvent) -> Unit,
-)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicStateProvider.kt
deleted file mode 100644
index 73f68e5d61..0000000000
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicStateProvider.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-import io.element.android.libraries.architecture.AsyncAction
-
-fun aLoginWithClassicState(
-    canLoginWithClassic: Boolean = false,
-    loginWithClassicAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    eventSink: (LoginWithClassicEvent) -> Unit = {},
-) = LoginWithClassicState(
-    canLoginWithClassic = canLoginWithClassic,
-    loginWithClassicAction = loginWithClassicAction,
-    eventSink = eventSink,
-)
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
index a6d9da3de2..6b5da8f300 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorView.kt
@@ -125,7 +125,7 @@ private fun Content(errorScreenType: QrCodeErrorScreenType) {
 }
 
 @Composable
-private fun Buttons(
+private fun ColumnScope.Buttons(
     onRetry: () -> Unit,
     onCancel: () -> Unit,
 ) {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
index 2f93d5b214..5e298604a4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenter.kt
@@ -17,7 +17,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
-import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.qrcode.QrCodeLoginManager
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
@@ -39,7 +38,6 @@ class QrCodeScanPresenter(
     private val qrCodeLoginDataFactory: MatrixQrCodeLoginDataFactory,
     private val qrCodeLoginManager: QrCodeLoginManager,
     private val coroutineDispatchers: CoroutineDispatchers,
-    private val defaultAccountProviderAccessControl: DefaultAccountProviderAccessControl,
 ) : Presenter<QrCodeScanState> {
     private var isScanning by mutableStateOf(true)
 
@@ -97,13 +95,6 @@ class QrCodeScanPresenter(
                 val data = qrCodeLoginDataFactory.parseQrCodeData(code).onFailure {
                     Timber.e(it, "Error parsing QR code data")
                 }.getOrThrow()
-                val serverName = data.serverName()
-                if (serverName != null) {
-                    defaultAccountProviderAccessControl.assertIsAllowedToConnectToAccountProvider(
-                        title = serverName,
-                        accountProviderUrl = serverName,
-                    )
-                }
                 data
             }.runCatchingUpdatingState(codeScannedAction)
         }.invokeOnCompletion {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
index 55c2c28f5b..8335dde112 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -34,6 +34,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -125,10 +126,15 @@ fun SearchAccountProviderView(
                         singleLine = true,
                         trailingIcon = if (userInputState.isNotEmpty()) {
                             {
-                                Box(Modifier.clickable {
-                                    userInputState = ""
-                                    eventSink(SearchAccountProviderEvents.UserInput(""))
-                                }) {
+                                Box(
+                                    Modifier.clickable(
+                                        onClickLabel = stringResource(CommonStrings.action_clear),
+                                        role = Role.Button,
+                                    ) {
+                                        userInputState = ""
+                                        eventSink(SearchAccountProviderEvents.UserInput(""))
+                                    }
+                                ) {
                                     Icon(
                                         imageVector = CompoundIcons.Close(),
                                         contentDescription = stringResource(CommonStrings.action_clear)
diff --git a/features/login/impl/src/main/res/drawable-xxhdpi/element_foss_logo.png b/features/login/impl/src/main/res/drawable-xxhdpi/element_foss_logo.png
new file mode 100644
index 0000000000..67684ee944
Binary files /dev/null and b/features/login/impl/src/main/res/drawable-xxhdpi/element_foss_logo.png differ
diff --git a/features/login/impl/src/main/res/drawable-xxhdpi/element_pro_logo.png b/features/login/impl/src/main/res/drawable-xxhdpi/element_pro_logo.png
new file mode 100644
index 0000000000..45d11b5f2e
Binary files /dev/null and b/features/login/impl/src/main/res/drawable-xxhdpi/element_pro_logo.png differ
diff --git a/features/login/impl/src/main/res/values-be/translations.xml b/features/login/impl/src/main/res/values-be/translations.xml
index 307ccf7263..5018377eb0 100644
--- a/features/login/impl/src/main/res/values-be/translations.xml
+++ b/features/login/impl/src/main/res/values-be/translations.xml
@@ -20,15 +20,16 @@
   <string name="screen_change_server_subtitle">"Які адрас вашага сервера?"</string>
   <string name="screen_change_server_title">"Выберыце свой сервер"</string>
   <string name="screen_create_account_title">"Стварыць уліковы запіс"</string>
-  <string name="screen_login_error_deactivated_account">"Гэты ўліковы запіс быў дэактываваны."</string>
+  <string name="screen_login_error_deactivated_account">"Гэты ўліковы запіс быў выдалены."</string>
   <string name="screen_login_error_invalid_credentials">"Няправільнае імя карыстальніка і/або пароль"</string>
   <string name="screen_login_error_invalid_user_id">"Гэта несапраўдны ідэнтыфікатар карыстальніка. Чаканы фармат: ‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"Гэты сервер настроены на выкарыстанне маркераў абнаўлення. Яны не падтрымліваюцца пры ўваходзе на аснове пароля."</string>
-  <string name="screen_login_error_unsupported_authentication">"Выбраны хатні сервер не падтрымлівае пароль або ўваход у OIDC. Калі ласка, звярніцеся да адміністратара або абярыце іншы хатні сервер."</string>
+  <string name="screen_login_error_unsupported_authentication">"Выбраны хатні сервер не падтрымлівае пароль або ўваход у OAuth. Калі ласка, звярніцеся да адміністратара або абярыце іншы хатні сервер."</string>
   <string name="screen_login_form_header">"Увядзіце свае даныя"</string>
   <string name="screen_login_subtitle">"Matrix - гэта адкрытая сетка для бяспечнай, дэцэнтралізаванай сувязі."</string>
   <string name="screen_login_title">"Сардэчна запрашаем!"</string>
   <string name="screen_login_title_with_homeserver">"Увайсці ў %1$s"</string>
+  <string name="screen_onboarding_app_version">"Версія %1$s"</string>
   <string name="screen_onboarding_sign_in_manually">"Увайсці ўручную"</string>
   <string name="screen_onboarding_sign_in_to">"Увайсці ў %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Увайсці з QR-кодам"</string>
diff --git a/features/login/impl/src/main/res/values-bg/translations.xml b/features/login/impl/src/main/res/values-bg/translations.xml
index 6ccc7c9129..c6c74ff1a8 100644
--- a/features/login/impl/src/main/res/values-bg/translations.xml
+++ b/features/login/impl/src/main/res/values-bg/translations.xml
@@ -21,7 +21,7 @@
   <string name="screen_login_error_deactivated_account">"Този акаунт бе деактивиран."</string>
   <string name="screen_login_error_invalid_credentials">"Неправилно потребителско име и/или парола"</string>
   <string name="screen_login_error_invalid_user_id">"Това не е валиден потребителски идентификатор. Очакван формат: ‘@user:homeserver.org’"</string>
-  <string name="screen_login_error_unsupported_authentication">"Избраният сървър не поддържа влизане с парола или OIDC. Моля, свържете се с вашия администратор или изберете друг сървър."</string>
+  <string name="screen_login_error_unsupported_authentication">"Избраният сървър не поддържа влизане с парола или OAuth. Моля, свържете се с вашия администратор или изберете друг сървър."</string>
   <string name="screen_login_form_header">"Въведете своите данни"</string>
   <string name="screen_login_subtitle">"Matrix е отворена мрежа за сигурна, децентрализирана комуникация."</string>
   <string name="screen_login_title">"Добре дошли отново!"</string>
diff --git a/features/login/impl/src/main/res/values-ca/translations.xml b/features/login/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..f079e7b071
--- /dev/null
+++ b/features/login/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"Canvia el proveïdor del compte"</string>
+  <string name="screen_account_provider_form_hint">"Adreça del servidor"</string>
+  <string name="screen_account_provider_form_notice">"Introdueix una paraula de cerca o un domini (adreça)."</string>
+  <string name="screen_account_provider_form_subtitle">"Cerca una empresa, una comunitat o un servidor privat."</string>
+  <string name="screen_account_provider_form_title">"Busca un proveïdor de comptes"</string>
+  <string name="screen_account_provider_signin_subtitle">"Aquí és on es guardaran els teus xats, de manera similar a utilitzar un proveïdor de correu electrònic per guardar els teus correus electrònics."</string>
+  <string name="screen_account_provider_signin_title">"Estàs a punt d\'iniciar sessió a %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"Aquí és on es guardaran els teus xats, de manera similar a utilitzar un proveïdor de correu electrònic per guardar els teus correus electrònics."</string>
+  <string name="screen_account_provider_signup_title">"Estàs a punt de crear un compte a %s"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org és un gran servidor gratuït de la xarxa pública de Matrix per a la comunicació segura i descentralitzada, gestionat per la Fundació Matrix.org."</string>
+  <string name="screen_change_account_provider_other">"Altres"</string>
+  <string name="screen_change_account_provider_subtitle">"Utilitza un proveïdor de comptes diferent, com ara el teu servidor privat o un compte de feina."</string>
+  <string name="screen_change_account_provider_title">"Canvia el proveïdor del compte"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"No s\'ha pogut accedir a aquest servidor. Comprova que hagis introduït correctament l\'URL del servidor. Si ja és correcte, posa\'t en contacte amb l\'administrador del servidor per a més informació."</string>
+  <string name="screen_change_server_error_invalid_well_known">"Servidor no disponible a causa d\'un problema al fitxer .well-known:
+%1$s"</string>
+  <string name="screen_change_server_form_header">"URL del servidor"</string>
+  <string name="screen_change_server_form_notice">"Introdueix un domini."</string>
+  <string name="screen_change_server_subtitle">"Quina és l\'adreça del teu servidor?"</string>
+  <string name="screen_change_server_title">"Selecciona el teu servidor"</string>
+  <string name="screen_create_account_title">"Crea un compte"</string>
+  <string name="screen_login_error_deactivated_account">"Aquest compte s\'ha desactivat."</string>
+  <string name="screen_login_error_invalid_credentials">"Usuari i/o contrasenya incorrectes"</string>
+  <string name="screen_login_error_invalid_user_id">"Identificador d\'usuari invàlid. Format esperat: ‘@usuari:servidor.org’"</string>
+  <string name="screen_login_error_refresh_tokens">"Aquest servidor està configurat per utilitzar tokens d\'actualització, però no són compatibles quan s\'utilitza l\'inici de sessió basat en contrasenya."</string>
+  <string name="screen_login_error_unsupported_authentication">"El servidor seleccionat no admet contrasenya o inici de sessió OAuth. Posa\'t en contacte amb l\'administrador o tria un altre servidor."</string>
+  <string name="screen_login_form_header">"Introdueix les teves dades"</string>
+  <string name="screen_login_subtitle">"Matrix és una xarxa oberta per a comunicacions segures i descentralitzades."</string>
+  <string name="screen_login_title">"Hola de nou!"</string>
+  <string name="screen_login_title_with_homeserver">"Inicia sessió a %1$s"</string>
+  <string name="screen_onboarding_sign_in_manually">"Inicia sessió manualment"</string>
+  <string name="screen_onboarding_sign_in_to">"Inicia sessió a %1$s"</string>
+  <string name="screen_onboarding_sign_in_with_qr_code">"Inicia sessió amb un codi QR"</string>
+  <string name="screen_onboarding_sign_up">"Crea un compte"</string>
+  <string name="screen_onboarding_welcome_message">"Et donem la benvinguda a %1$s. Més ràpid i simple que mai."</string>
+  <string name="screen_onboarding_welcome_subtitle">"Et donem la benvinguda a %1$s. Dissenyat per ser més ràpid i simple."</string>
+  <string name="screen_onboarding_welcome_title">"Sigues el teu propi element"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Establint una connexió segura"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"No s\'ha pogut establir una connexió segura amb el dispositiu nou. Els dispositius existents continuen sent segurs, no te n\'has de preocupar."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"I ara què?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Prova de tornar a iniciar sessió mitjançant un codi QR si es tracta d\'un problema de xarxa."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Si es repeteix el mateix problema, prova una xarxa wifi diferent o utilitza les dades mòbils en lloc del wifi."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Si no funciona, inicia sessió manualment"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_title">"Connexió no segura"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Se\'t demanarà que introdueixis els dos dígits mostrats en aquest dispositiu."</string>
+  <string name="screen_qr_code_login_device_code_title">"Introdueix el número següent a l\'altre dispositiu"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_description">"Inicia sessió a l\'altre dispositiu i torna-ho a provar o utilitza un altre dispositiu amb la sessió ja iniciada."</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"No s\'ha iniciat sessió a l\'altre dispositiu"</string>
+  <string name="screen_qr_code_login_error_cancelled_subtitle">"L\'inici de sessió s\'ha cancel·lat a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_cancelled_title">"Sol·licitud d\'inici de sessió cancel·lada"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"L\'inici de sessió s\'ha rebutjat a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_declined_title">"Inici de sessió rebutjat"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Inici de sessió ha caducat. Torna-ho a provar."</string>
+  <string name="screen_qr_code_login_error_expired_title">"L\'inici de sessió no s\'ha completat a temps"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"El teu altre dispositiu no admet l\'inici de sessió a %s amb codis QR.
+
+Prova d\'iniciar la sessió manualment o escaneja el QR amb un altre dispositiu."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"Codi QR no compatible"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"El proveïdor del teu compte no admet %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s no és compatible"</string>
+  <string name="screen_qr_code_login_initial_state_button_title">"Preparat per escanejar"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Obre %1$s en un dispositiu d\'escriptori"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Clica la teva imatge"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Selecciona %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Enllaça nou dispositiu”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Escaneja el codi QR amb aquest dispositiu"</string>
+  <string name="screen_qr_code_login_initial_state_subtitle">"Només disponible si el proveïdor del compte ho admet."</string>
+  <string name="screen_qr_code_login_initial_state_title">"Obre %1$s en un altre dispositiu per obtenir el codi QR"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Utilitza el codi QR que es mostra a l\'altre dispositiu."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Torna-ho a intentar"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Codi QR incorrecte"</string>
+  <string name="screen_qr_code_login_no_camera_permission_button">"Vés a la configuració de càmera"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"Per continuar, has donar permís a %1$s per poder utilitzar la càmera del dispositiu."</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"Permet l\'accés a la càmera per poder escanejar el codi QR"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Escaneja el QR"</string>
+  <string name="screen_qr_code_login_start_over_button">"Torna a començar"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"S\'ha produït un error inesperat. Torna-ho a provar."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Esperant el teu altre dispositiu"</string>
+  <string name="screen_qr_code_login_verify_code_subtitle">"Per verificar l\'inici de sessió, pot ser que el proveïdor del teu compte et demani el següent codi."</string>
+  <string name="screen_qr_code_login_verify_code_title">"Codi de verificació"</string>
+  <string name="screen_server_confirmation_change_server">"Canvia el proveïdor del compte"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Servidor privat per a treballadors d\'Element."</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix és una xarxa oberta per a comunicacions segures i descentralitzades."</string>
+  <string name="screen_server_confirmation_message_register">"Aquí és on es guardaran els teus xats, de manera similar a utilitzar un proveïdor de correu electrònic per guardar els teus correus electrònics."</string>
+  <string name="screen_server_confirmation_title_login">"Estàs a punt d\'iniciar sessió a %1$s"</string>
+  <string name="screen_server_confirmation_title_register">"Estàs a punt de crear un compte a %1$s"</string>
+</resources>
diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml
index 73f0dd51cc..3181e823bb 100644
--- a/features/login/impl/src/main/res/values-cs/translations.xml
+++ b/features/login/impl/src/main/res/values-cs/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Jaká je adresa vašeho serveru?"</string>
   <string name="screen_change_server_title">"Vyberte váš server"</string>
   <string name="screen_create_account_title">"Vytvořit účet"</string>
-  <string name="screen_login_error_deactivated_account">"Tento účet byl deaktivován."</string>
+  <string name="screen_login_error_deactivated_account">"Tento účet byl smazán."</string>
   <string name="screen_login_error_invalid_credentials">"Nesprávné uživatelské jméno nebo heslo"</string>
   <string name="screen_login_error_invalid_user_id">"Toto není platný identifikátor uživatele. Očekávaný formát: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Tento server je nakonfigurován tak, aby používal obnovovací tokeny. Ty nejsou podporovány při použití přihlašovacích údajů založených na hesle."</string>
-  <string name="screen_login_error_unsupported_authentication">"Vybraný domovský server nepodporuje přihlášení pomocí hesla nebo OIDC. Kontaktujte prosím svého správce nebo vyberte jiný domovský server."</string>
+  <string name="screen_login_error_unsupported_authentication">"Vybraný domovský server nepodporuje přihlášení pomocí hesla nebo OAuth. Kontaktujte prosím svého správce nebo vyberte jiný domovský server."</string>
   <string name="screen_login_form_header">"Zadejte své údaje"</string>
   <string name="screen_login_subtitle">"Matrix je otevřená síť pro bezpečnou a decentralizovanou komunikaci."</string>
   <string name="screen_login_title">"Vítejte zpět!"</string>
   <string name="screen_login_title_with_homeserver">"Přihlaste se k %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Otevřít Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Otevřete Element Classic na svém zařízení"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Přejděte do Nastavení &gt; Zabezpečení a soukromí"</string>
+  <string name="screen_missing_key_backup_step_3_android">"V části Správa kryptografických klíčů vyberte Obnova šifrovaných zpráv"</string>
+  <string name="screen_missing_key_backup_step_4">"Postupujte podle pokynů k povolení úložiště klíčů"</string>
+  <string name="screen_missing_key_backup_step_5">"Vraťte se do %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Povolte úložiště klíčů, než budete pokračovat na %1$s"</string>
   <string name="screen_onboarding_app_version">"Verze %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Kontrola účtu"</string>
   <string name="screen_onboarding_sign_in_manually">"Ruční přihlášení"</string>
   <string name="screen_onboarding_sign_in_to">"Přihlaste se k %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Přihlásit se pomocí QR kódu"</string>
   <string name="screen_onboarding_sign_up">"Vytvořit účet"</string>
+  <string name="screen_onboarding_welcome_back">"Vítejte zpět"</string>
   <string name="screen_onboarding_welcome_message">"Vítejte v dosud nejrychlejším %1$su. Vylepšený pro rychlost a jednoduchost."</string>
   <string name="screen_onboarding_welcome_subtitle">"Vítejte v %1$su. Vylepšený, pro rychlost a jednoduchost."</string>
   <string name="screen_onboarding_welcome_title">"Buďte ve svém živlu"</string>
diff --git a/features/login/impl/src/main/res/values-cy/translations.xml b/features/login/impl/src/main/res/values-cy/translations.xml
index b8988a9889..0f44287ed4 100644
--- a/features/login/impl/src/main/res/values-cy/translations.xml
+++ b/features/login/impl/src/main/res/values-cy/translations.xml
@@ -32,7 +32,7 @@
   <string name="screen_login_error_invalid_credentials">"Enw defnyddiwr a/neu gyfrinair anghywir"</string>
   <string name="screen_login_error_invalid_user_id">"Nid yw hwn yn ddynodwr defnyddiwr dilys. Fformat disgwyliedig: ‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"Mae\'r gweinydd hwn wedi\'i ffurfweddu i ddefnyddio tocynnau adnewyddu. Nid yw\'r rhain yn cael eu cefnogi wrth ddefnyddio mewngofnodi ar sail cyfrinair."</string>
-  <string name="screen_login_error_unsupported_authentication">"Nid yw\'r gweinydd cartref ddewiswyd yn cefnogi cyfrinair na mewngofnodi OIDC. Cysylltwch â\'ch gweinyddwr neu dewis gweinydd cartref arall."</string>
+  <string name="screen_login_error_unsupported_authentication">"Nid yw\'r gweinydd cartref ddewiswyd yn cefnogi cyfrinair na mewngofnodi OAuth. Cysylltwch â\'ch gweinyddwr neu dewis gweinydd cartref arall."</string>
   <string name="screen_login_form_header">"Rhowch eich manylion"</string>
   <string name="screen_login_subtitle">"Mae Matrix yn rhwydwaith agored ar gyfer cyfathrebu diogel, datganoledig."</string>
   <string name="screen_login_title">"Croeso nôl!"</string>
diff --git a/features/login/impl/src/main/res/values-da/translations.xml b/features/login/impl/src/main/res/values-da/translations.xml
index 2b2f00267b..35d66a6e69 100644
--- a/features/login/impl/src/main/res/values-da/translations.xml
+++ b/features/login/impl/src/main/res/values-da/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Hvad er adressen på din server?"</string>
   <string name="screen_change_server_title">"Vælg din server"</string>
   <string name="screen_create_account_title">"Opret konto"</string>
-  <string name="screen_login_error_deactivated_account">"Denne konto er blevet deaktiveret."</string>
+  <string name="screen_login_error_deactivated_account">"Denne konto er blevet slettet."</string>
   <string name="screen_login_error_invalid_credentials">"Forkert brugernavn og/eller adgangskode"</string>
   <string name="screen_login_error_invalid_user_id">"Dette er ikke en gyldig brugeridentifikation. Forventet format: \'@bruger:hjemmeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Denne server er konfigureret til at bruge opdateringstokens. Disse understøttes ikke, når du bruger adgangskodebaseret login."</string>
-  <string name="screen_login_error_unsupported_authentication">"Den valgte hjemmeserver understøtter ikke adgangskode eller OIDC-login. Kontakt venligst din administrator eller vælg en anden hjemmeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"Den valgte hjemmeserver understøtter ikke adgangskode eller OAuth-login. Kontakt venligst din administrator eller vælg en anden hjemmeserver."</string>
   <string name="screen_login_form_header">"Indtast dine oplysninger"</string>
   <string name="screen_login_subtitle">"Matrix er et åbent netværk for sikker, decentraliseret kommunikation."</string>
   <string name="screen_login_title">"Velkommen tilbage!"</string>
   <string name="screen_login_title_with_homeserver">"Log ind på %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Åbn Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Åbn Element Classic på din enhed"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Gå til Indstillinger &gt; Sikkerhed og privatliv"</string>
+  <string name="screen_missing_key_backup_step_3_android">"I Nøgleadministration skal du, under Kryptografi, vælge Gendannelse af krypterede meddelelser"</string>
+  <string name="screen_missing_key_backup_step_4">"Følg instruktionerne for at aktivere dit nøglelager"</string>
+  <string name="screen_missing_key_backup_step_5">"Gå tilbage til %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Aktivér dit nøglelager, før du fortsætter til %1$s"</string>
   <string name="screen_onboarding_app_version">"Version %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Kontoen kontrolleres…"</string>
   <string name="screen_onboarding_sign_in_manually">"Log ind manuelt"</string>
   <string name="screen_onboarding_sign_in_to">"Log ind på %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Log ind med QR-kode"</string>
   <string name="screen_onboarding_sign_up">"Opret konto"</string>
+  <string name="screen_onboarding_welcome_back">"Velkommen tilbage"</string>
   <string name="screen_onboarding_welcome_message">"Velkommen til den hurtigste %1$s nogensinde. Supercharged til hastighed og enkelhed."</string>
   <string name="screen_onboarding_welcome_subtitle">"Velkommen til %1$s. Ladet med hastighed og enkelhed."</string>
   <string name="screen_onboarding_welcome_title">"Vær i dit rette Element"</string>
diff --git a/features/login/impl/src/main/res/values-de/translations.xml b/features/login/impl/src/main/res/values-de/translations.xml
index f1d426e134..89e4412d0f 100644
--- a/features/login/impl/src/main/res/values-de/translations.xml
+++ b/features/login/impl/src/main/res/values-de/translations.xml
@@ -5,9 +5,9 @@
   <string name="screen_account_provider_form_notice">"Gib einen Suchbegriff oder eine Domainadresse ein."</string>
   <string name="screen_account_provider_form_subtitle">"Suche nach einem Unternehmen, einer Community oder einem privaten Server."</string>
   <string name="screen_account_provider_form_title">"Kontoanbieter finden"</string>
-  <string name="screen_account_provider_signin_subtitle">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würden."</string>
+  <string name="screen_account_provider_signin_subtitle">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würdest."</string>
   <string name="screen_account_provider_signin_title">"Du bist dabei, dich bei %s anzumelden"</string>
-  <string name="screen_account_provider_signup_subtitle">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würden."</string>
+  <string name="screen_account_provider_signup_subtitle">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würdest."</string>
   <string name="screen_account_provider_signup_title">"Du bist dabei, ein Konto bei %s zu erstellen"</string>
   <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org ist ein großer, kostenloser Server im öffentlichen Matrix-Netzwerk für eine sichere, dezentralisierte Kommunikation, der von der Matrix.org Foundation betrieben wird."</string>
   <string name="screen_change_account_provider_other">"Sonstige"</string>
@@ -28,11 +28,11 @@
   <string name="screen_change_server_subtitle">"Wie lautet die Adresse deines Servers?"</string>
   <string name="screen_change_server_title">"Wähle deinen Server aus"</string>
   <string name="screen_create_account_title">"Konto erstellen"</string>
-  <string name="screen_login_error_deactivated_account">"Dieses Konto wurde deaktiviert."</string>
+  <string name="screen_login_error_deactivated_account">"Dieses Konto wurde gelöscht."</string>
   <string name="screen_login_error_invalid_credentials">"Falscher Nutzername und/oder Passwort"</string>
   <string name="screen_login_error_invalid_user_id">"Dies ist keine gültige Nutzerkennung. Erwartetes Format: \'@nutzer:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Dieser Server ist so konfiguriert, dass er Refresh-Tokens verwendet. Diese werden für die passwortbasierte Anmeldung nicht unterstützt."</string>
-  <string name="screen_login_error_unsupported_authentication">"Der ausgewählte Homeserver unterstützt weder den Login per Passwort noch per OIDC. Bitte kontaktiere deinen Administrator oder wähle einen anderen Homeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"Der ausgewählte Homeserver unterstützt weder den Login per Passwort noch per OAuth. Bitte kontaktiere deinen Administrator oder wähle einen anderen Homeserver."</string>
   <string name="screen_login_form_header">"Gib deine Daten ein"</string>
   <string name="screen_login_subtitle">"Matrix ist ein offenes Netzwerk für eine sichere, dezentrale Kommunikation."</string>
   <string name="screen_login_title">"Willkommen zurück!"</string>
@@ -42,6 +42,7 @@
   <string name="screen_onboarding_sign_in_to">"Anmelden bei %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Mit QR-Code anmelden"</string>
   <string name="screen_onboarding_sign_up">"Konto erstellen"</string>
+  <string name="screen_onboarding_welcome_back">"Willkommen zurück"</string>
   <string name="screen_onboarding_welcome_message">"Willkommen beim schnellsten %1$s aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit."</string>
   <string name="screen_onboarding_welcome_subtitle">"Willkommen zu %1$s. Aufgeladen, für Geschwindigkeit und Einfachheit."</string>
   <string name="screen_onboarding_welcome_title">"Sei in Deinem Element"</string>
@@ -93,7 +94,7 @@ Versuche, dich manuell anzumelden, oder scanne den QR-Code mit einem anderen Ger
   <string name="screen_server_confirmation_change_server">"Kontoanbieter wechseln"</string>
   <string name="screen_server_confirmation_message_login_element_dot_io">"Ein privater Server für die Mitarbeiter von Element."</string>
   <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix ist ein offenes Netzwerk für eine sichere, dezentrale Kommunikation."</string>
-  <string name="screen_server_confirmation_message_register">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würden."</string>
+  <string name="screen_server_confirmation_message_register">"Hier werden deine Gespräche gespeichert - so wie du deine E-Mails bei einem E-Mail-Anbieter aufbewahren würdest."</string>
   <string name="screen_server_confirmation_title_login">"Du bist dabei, dich bei %1$s anzumelden"</string>
   <string name="screen_server_confirmation_title_picker_mode">"Kontoanbieter auswählen"</string>
   <string name="screen_server_confirmation_title_register">"Du bist dabei, auf %1$s ein Konto zu erstellen"</string>
diff --git a/features/login/impl/src/main/res/values-el/translations.xml b/features/login/impl/src/main/res/values-el/translations.xml
index 5f21a53c37..9852eac5cc 100644
--- a/features/login/impl/src/main/res/values-el/translations.xml
+++ b/features/login/impl/src/main/res/values-el/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Ποια είναι η διεύθυνση του διακομιστή σου;"</string>
   <string name="screen_change_server_title">"Επέλεξε το διακομιστή σου"</string>
   <string name="screen_create_account_title">"Δημιουργία λογαριασμού"</string>
-  <string name="screen_login_error_deactivated_account">"Αυτός ο λογαριασμός έχει απενεργοποιηθεί."</string>
+  <string name="screen_login_error_deactivated_account">"Αυτός ο λογαριασμός έχει διαγραφεί."</string>
   <string name="screen_login_error_invalid_credentials">"Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης"</string>
   <string name="screen_login_error_invalid_user_id">"Αυτό δεν είναι έγκυρο αναγνωριστικό χρήστη. Αναμενόμενη μορφή: \'@χρήστης:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Αυτός ο διακομιστής έχει ρυθμιστεί ώστε να χρησιμοποιεί διακριτικά ανανέωσης. Αυτά δεν υποστηρίζονται όταν χρησιμοποιείς σύνδεση μέσω κωδικού πρόσβασης."</string>
-  <string name="screen_login_error_unsupported_authentication">"Ο επιλεγμένος οικιακός διακομιστής δεν υποστηρίζει κωδικό πρόσβασης ή σύνδεση OIDC. Επικοινωνήστε με τον διαχειριστή σου ή επέλεξε άλλο οικιακό διακομιστή."</string>
+  <string name="screen_login_error_unsupported_authentication">"Ο επιλεγμένος οικιακός διακομιστής δεν υποστηρίζει κωδικό πρόσβασης ή σύνδεση OAuth. Επικοινωνήστε με τον διαχειριστή σου ή επέλεξε άλλο οικιακό διακομιστή."</string>
   <string name="screen_login_form_header">"Εισήγαγε τα στοιχεία σου"</string>
   <string name="screen_login_subtitle">"Το Matrix είναι ένα ανοιχτό δίκτυο για ασφαλή, αποκεντρωμένη επικοινωνία."</string>
   <string name="screen_login_title">"Καλωσόρισες ξανά!"</string>
   <string name="screen_login_title_with_homeserver">"Συνδέσου στο %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Άνοιγμα του Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Ανοίξτε το Element Classic στη συσκευή σας."</string>
+  <string name="screen_missing_key_backup_step_2_android">"Μεταβείτε στις Ρυθμίσεις &gt; Ασφάλεια και Απόρρητο"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Στη Διαχείριση κλειδιών κρυπτογράφησης, επιλέξτε Ανάκτηση κρυπτογραφημένων μηνυμάτων"</string>
+  <string name="screen_missing_key_backup_step_4">"Ακολουθήστε τις οδηγίες για να ενεργοποιήσετε την αποθήκευση κλειδιών"</string>
+  <string name="screen_missing_key_backup_step_5">"Επιστρέψτε στο %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Ενεργοποιήστε την αποθήκευση κλειδιών σας πριν προχωρήσετε στο %1$s"</string>
   <string name="screen_onboarding_app_version">"Έκδοση %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Έλεγχος λογαριασμού"</string>
   <string name="screen_onboarding_sign_in_manually">"Σύνδεση χειροκίνητα"</string>
   <string name="screen_onboarding_sign_in_to">"Συνδέσου στο %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Συνδέσου με κωδικό QR"</string>
   <string name="screen_onboarding_sign_up">"Δημιουργία λογαριασμού"</string>
+  <string name="screen_onboarding_welcome_back">"Καλώς ήρθατε ξανά"</string>
   <string name="screen_onboarding_welcome_message">"Καλώς ήλθατε στο γρηγορότερο %1$s όλων των εποχών. Υπερτροφοδοτούμενο με ταχύτητα και απλότητα."</string>
   <string name="screen_onboarding_welcome_subtitle">"Καλώς ήρθες στο %1$s. Υπερφορτισμένο, για ταχύτητα και απλότητα."</string>
   <string name="screen_onboarding_welcome_title">"Μείνε στο element σου"</string>
diff --git a/features/login/impl/src/main/res/values-es/translations.xml b/features/login/impl/src/main/res/values-es/translations.xml
index df6a06ab29..3b9ffbe2dd 100644
--- a/features/login/impl/src/main/res/values-es/translations.xml
+++ b/features/login/impl/src/main/res/values-es/translations.xml
@@ -29,7 +29,7 @@
   <string name="screen_login_error_invalid_credentials">"Usuario y/o contraseña incorrectos"</string>
   <string name="screen_login_error_invalid_user_id">"Este no es un id de usuario válido. Formato esperado: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Este servidor está configurado para utilizar tokens de actualización. Estos no son compatibles cuando se utiliza el inicio de sesión basado en contraseña."</string>
-  <string name="screen_login_error_unsupported_authentication">"El servidor base seleccionado no admite el inicio de sesión usando contraseña ni OIDC. Ponte en contacto con tu administrador o elige otro servidor base."</string>
+  <string name="screen_login_error_unsupported_authentication">"El servidor base seleccionado no admite el inicio de sesión usando contraseña ni OAuth. Ponte en contacto con tu administrador o elige otro servidor base."</string>
   <string name="screen_login_form_header">"Introduce tus datos"</string>
   <string name="screen_login_subtitle">"Matrix es una red abierta para una comunicación segura y descentralizada."</string>
   <string name="screen_login_title">"¡Hola de nuevo!"</string>
diff --git a/features/login/impl/src/main/res/values-et/translations.xml b/features/login/impl/src/main/res/values-et/translations.xml
index 0a1a99383d..dc37ed3e38 100644
--- a/features/login/impl/src/main/res/values-et/translations.xml
+++ b/features/login/impl/src/main/res/values-et/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Mis on sinu koduserveri aadress?"</string>
   <string name="screen_change_server_title">"Vali oma server"</string>
   <string name="screen_create_account_title">"Loo kasutajakonto"</string>
-  <string name="screen_login_error_deactivated_account">"Konto on kasutusest eemaldatud."</string>
+  <string name="screen_login_error_deactivated_account">"See kasutajakonto on kustutatud."</string>
   <string name="screen_login_error_invalid_credentials">"Vigane kasutajanimi ja/või salasõna"</string>
   <string name="screen_login_error_invalid_user_id">"See ei ole korrektne kasutajanimi. Õige vorming on: „@kasutaja:koduserver.ee“"</string>
   <string name="screen_login_error_refresh_tokens">"See server on seadistatud kasutama tunnusloa põhist sisselogimist. Salasõnaga sisselogimisel see võimalus aga ei ole toetatud."</string>
-  <string name="screen_login_error_unsupported_authentication">"Valitud koduserver ei toeta salasõna ega OIDC-põhist sisselogimist. Lisateavet saad koduserveri haldajalt, aga sa võid ka valida mõne teise serveri."</string>
+  <string name="screen_login_error_unsupported_authentication">"Valitud koduserver ei toeta salasõna ega OAuth-põhist sisselogimist. Lisateavet saad koduserveri haldajalt, aga sa võid ka valida mõne teise serveri."</string>
   <string name="screen_login_form_header">"Sisesta oma andmed"</string>
   <string name="screen_login_subtitle">"Matrix on avatud võrk turvalise ja hajutatud suhtluse jaoks."</string>
   <string name="screen_login_title">"Tere tulemast tagasi!"</string>
   <string name="screen_login_title_with_homeserver">"Logi sisse serverisse %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Ava Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Ava Element Classic oma seadmes"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Ava „Seadistused“ → „Turvalisus ja privaatsus“"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Krüptovõtmete halduses vali „Krüptitud sõnumite taastamine“"</string>
+  <string name="screen_missing_key_backup_step_4">"Võtmehoidla kasutuselevõtmiseks palun järgi juhendit"</string>
+  <string name="screen_missing_key_backup_step_5">"Tule tagasi rakendusse %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Enne jätkamist rakenduses %1$s võta oma võtmehoidla kasutusele"</string>
   <string name="screen_onboarding_app_version">"Versioon %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Kontrollin kasutajakontot"</string>
   <string name="screen_onboarding_sign_in_manually">"Logi sisse käsitsi"</string>
   <string name="screen_onboarding_sign_in_to">"Logi sisse serverisse %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Logi sisse QR-koodi alusel"</string>
   <string name="screen_onboarding_sign_up">"Loo kasutajakonto"</string>
+  <string name="screen_onboarding_welcome_back">"Tere tulemast tagasi"</string>
   <string name="screen_onboarding_welcome_message">"Läbi aegade kiireim ja mugavaim %1$s."</string>
   <string name="screen_onboarding_welcome_subtitle">"Tere tulemast kasutama kiiret ja lihtsat suhtlusrakendust %1$s."</string>
   <string name="screen_onboarding_welcome_title">"Ole oma elemendis"</string>
diff --git a/features/login/impl/src/main/res/values-eu/translations.xml b/features/login/impl/src/main/res/values-eu/translations.xml
index 355e63546c..78a13e5810 100644
--- a/features/login/impl/src/main/res/values-eu/translations.xml
+++ b/features/login/impl/src/main/res/values-eu/translations.xml
@@ -21,7 +21,7 @@
   <string name="screen_create_account_title">"Sortu kontua"</string>
   <string name="screen_login_error_deactivated_account">"Kontu hau desaktibatuta dago."</string>
   <string name="screen_login_error_invalid_credentials">"Erabiltzaile-izena edo/eta pasahitza okerrak"</string>
-  <string name="screen_login_error_unsupported_authentication">"Hautatutako zerbitzaria ez da bateragarria pasahitz edo OIDC saio-hasierarekin. Jarri harremanetan administratzailearekin edo aukeratu beste zerbitzari bat."</string>
+  <string name="screen_login_error_unsupported_authentication">"Hautatutako zerbitzaria ez da bateragarria pasahitz edo OAuth saio-hasierarekin. Jarri harremanetan administratzailearekin edo aukeratu beste zerbitzari bat."</string>
   <string name="screen_login_form_header">"Sartu zure datuak"</string>
   <string name="screen_login_subtitle">"Matrix komunikazio seguru eta deszentralizaturako sare irekia da."</string>
   <string name="screen_login_title">"Ongi etorri!"</string>
diff --git a/features/login/impl/src/main/res/values-fa/translations.xml b/features/login/impl/src/main/res/values-fa/translations.xml
index ef7062a88a..38c2c11eaa 100644
--- a/features/login/impl/src/main/res/values-fa/translations.xml
+++ b/features/login/impl/src/main/res/values-fa/translations.xml
@@ -15,15 +15,17 @@
   <string name="screen_change_account_provider_title">"تغییر فراهم کنندهٔ حساب"</string>
   <string name="screen_change_server_error_element_pro_required_action_android">"پلی گپگل"</string>
   <string name="screen_change_server_error_invalid_homeserver">"ما نتوانستیم به این کارساز خانگی برسیم. لطفاً بررسی کنید که URL کارساز اصلی را به درستی وارد کرده اید. اگر URL صحیح است، برای کمک بیشتر با مدیر کارساز خانگی خود تماس بگیرید."</string>
+  <string name="screen_change_server_error_invalid_well_known">"سرور به دلیل مشکلی در فایل .well-known در دسترس نیست: %1$s"</string>
   <string name="screen_change_server_form_header">"نشانی کارساز خانگی"</string>
   <string name="screen_change_server_form_notice">"ورود نشانی دامنه."</string>
   <string name="screen_change_server_subtitle">"نشانی کارسازتان چیست؟"</string>
   <string name="screen_change_server_title">"کارسازتان را برگزینید"</string>
   <string name="screen_create_account_title">"ایجاد حساب"</string>
-  <string name="screen_login_error_deactivated_account">"این حساب از کار افتاده است."</string>
+  <string name="screen_login_error_deactivated_account">"این حساب حذف شده است."</string>
   <string name="screen_login_error_invalid_credentials">"نام کاربری یا گذرواژه نامعتبر است"</string>
   <string name="screen_login_error_invalid_user_id">"این یک شناسه کاربری معتبر نیست. قالب صحیح: ‪«@user:homeserver.or"</string>
-  <string name="screen_login_error_unsupported_authentication">"کارساز اصلی انتخاب شده از رمز عبور یا ورود OIDC پشتیبانی نمی کند. لطفا با مدیر خود تماس بگیرید یا یک کارساز خانگی دیگر را انتخاب کنید."</string>
+  <string name="screen_login_error_refresh_tokens">"این سرور برای استفاده از توکن‌های به‌روزرسانی پیکربندی شده است. این توکن‌ها هنگام استفاده از ورود مبتنی بر رمز عبور پشتیبانی نمی‌شوند."</string>
+  <string name="screen_login_error_unsupported_authentication">"کارساز اصلی انتخاب شده از رمز عبور یا ورود OAuth پشتیبانی نمی کند. لطفا با مدیر خود تماس بگیرید یا یک کارساز خانگی دیگر را انتخاب کنید."</string>
   <string name="screen_login_form_header">"جزییاتتان را وارد کنید"</string>
   <string name="screen_login_subtitle">"ماتریکس شبکه‌ای بار برای ارتباطات نامتمرکز و امن است."</string>
   <string name="screen_login_title">"خوش برگشتید!"</string>
@@ -39,6 +41,8 @@
   <string name="screen_qr_code_login_connecting_subtitle">"برقرار کدن اتّصالی امن"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"نتوانست اتّصالی امن به افزارهٔ جدید بسازد. افزاره‌های موجودتان هنوز امنند و نیازی نیست نگرانشان باشید."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"اکنون چه؟"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"آزمودن ورود دوباره با کد پاس در صورت مشکل شبکه"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"آزمون شبکهٔ وای‌فایی دیگر یا استفاده از دادهٔ همراهتان به جای وای‌فای در صورت مواجه دوباره با مشکل"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"ورود دستی در صورت کار نکردنش"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"اتّصال ناامن"</string>
   <string name="screen_qr_code_login_device_code_subtitle">"از شما خواسته خواهد شد که دو رقم نشان داده روی این افزاره را وارد کنید."</string>
diff --git a/features/login/impl/src/main/res/values-fi/translations.xml b/features/login/impl/src/main/res/values-fi/translations.xml
index af8e242309..8561bcfce3 100644
--- a/features/login/impl/src/main/res/values-fi/translations.xml
+++ b/features/login/impl/src/main/res/values-fi/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Mikä on palvelimesi osoite?"</string>
   <string name="screen_change_server_title">"Valitse palvelimesi"</string>
   <string name="screen_create_account_title">"Luo tili"</string>
-  <string name="screen_login_error_deactivated_account">"Tämä tili on deaktivoitu."</string>
+  <string name="screen_login_error_deactivated_account">"Tämä tili on poistettu."</string>
   <string name="screen_login_error_invalid_credentials">"Väärä käyttäjänimi ja/tai salasana"</string>
   <string name="screen_login_error_invalid_user_id">"Tämä ei ole kelvollinen käyttäjätunnus. Odotettu muoto: \'@käyttäjä:kotipalvelin.fi\'"</string>
   <string name="screen_login_error_refresh_tokens">"Tämä palvelin on määritetty käyttämään refresh tokeneja. Näitä ei tueta salasanapohjaisen kirjautumisen kanssa."</string>
-  <string name="screen_login_error_unsupported_authentication">"Valitsemasi kotipalvelin ei tue salasana- tai OIDC-kirjautumista. Ota yhteyttä palvelimesi ylläpitäjään tai valitse toinen kotipalvelin."</string>
+  <string name="screen_login_error_unsupported_authentication">"Valitsemasi kotipalvelin ei tue salasana- tai OAuth-kirjautumista. Ota yhteyttä palvelimesi ylläpitäjään tai valitse toinen kotipalvelin."</string>
   <string name="screen_login_form_header">"Anna tietosi"</string>
   <string name="screen_login_subtitle">"Matrix on avoin verkko turvallista, hajautettua viestintää varten."</string>
   <string name="screen_login_title">"Tervetuloa takaisin!"</string>
   <string name="screen_login_title_with_homeserver">"Kirjaudu sisään %1$s -palvelimelle"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Avaa Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Avaa Element Classic laitteellasi"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Mene kohtaan Asetukset &gt; Tietoturva ja yksityisyys"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Osiossa \"Salausavainten hallinta\", paina \"Salattujen viestien palautus\"."</string>
+  <string name="screen_missing_key_backup_step_4">"Noudata ohjeita"</string>
+  <string name="screen_missing_key_backup_step_5">"Palaa takaisin %1$s -sovellukseen"</string>
+  <string name="screen_missing_key_backup_title">"Ota avainten säilytys käyttöön ennen kuin jatkat %1$s -sovellukseen"</string>
   <string name="screen_onboarding_app_version">"Versio %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Tarkistetaan tiliä…"</string>
   <string name="screen_onboarding_sign_in_manually">"Kirjaudu sisään manuaalisesti"</string>
   <string name="screen_onboarding_sign_in_to">"Kirjaudu sisään %1$s -palvelimelle"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Kirjaudu sisään QR-koodilla"</string>
   <string name="screen_onboarding_sign_up">"Luo tili"</string>
+  <string name="screen_onboarding_welcome_back">"Tervetuloa takaisin"</string>
   <string name="screen_onboarding_welcome_message">"Tervetuloa kaikkien aikojen nopeimpaan %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella."</string>
   <string name="screen_onboarding_welcome_subtitle">"Tervetuloa %1$s -sovellukseen. Ahdettu nopeudella ja yksinkertaisuudella."</string>
   <string name="screen_onboarding_welcome_title">"Ole elementissäsi"</string>
diff --git a/features/login/impl/src/main/res/values-fr/translations.xml b/features/login/impl/src/main/res/values-fr/translations.xml
index 9846feec38..504517aad7 100644
--- a/features/login/impl/src/main/res/values-fr/translations.xml
+++ b/features/login/impl/src/main/res/values-fr/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Quelle est l’adresse de votre serveur ?"</string>
   <string name="screen_change_server_title">"Choisissez votre serveur"</string>
   <string name="screen_create_account_title">"Créer un compte"</string>
-  <string name="screen_login_error_deactivated_account">"Ce compte a été désactivé."</string>
+  <string name="screen_login_error_deactivated_account">"Ce compte a été supprimé."</string>
   <string name="screen_login_error_invalid_credentials">"Nom d’utilisateur et/ou mot de passe incorrects"</string>
   <string name="screen_login_error_invalid_user_id">"Il ne s’agit pas d’un identifiant utilisateur valide. Format attendu : « @user:homeserver.org »"</string>
   <string name="screen_login_error_refresh_tokens">"Ce serveur est configuré pour utiliser des tokens d’actualisation. Ils ne sont pas pris en charge lors de l’utilisation d’une connexion basée sur un mot de passe."</string>
-  <string name="screen_login_error_unsupported_authentication">"Le serveur d’accueil sélectionné ne prend pas en charge le mot de passe ou la connexion OIDC. Contactez votre administrateur ou choisissez un autre serveur d’accueil."</string>
+  <string name="screen_login_error_unsupported_authentication">"Le serveur d’accueil sélectionné ne prend pas en charge le mot de passe ou la connexion OAuth. Contactez votre administrateur ou choisissez un autre serveur d’accueil."</string>
   <string name="screen_login_form_header">"Saisissez vos identifiants"</string>
   <string name="screen_login_subtitle">"Matrix est un réseau ouvert pour une communication sécurisée et décentralisée."</string>
   <string name="screen_login_title">"Content de vous revoir !"</string>
   <string name="screen_login_title_with_homeserver">"Connectez-vous à %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Ouvrir Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Ouvrez Element Classic sur votre appareil"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Aller à Paramètres &gt; Sécurité et vie privée"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Dans Gestion des clés cryptographiques, sélectionnez Récupération des messages chiffrés"</string>
+  <string name="screen_missing_key_backup_step_4">"Suivez les instructions pour activer votre stockage de clés"</string>
+  <string name="screen_missing_key_backup_step_5">"Revenez à %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Activez le stockage de vos clés avant de continuer avec %1$s"</string>
   <string name="screen_onboarding_app_version">"Version %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Vérification du compte"</string>
   <string name="screen_onboarding_sign_in_manually">"Se connecter manuellement"</string>
   <string name="screen_onboarding_sign_in_to">"Connectez-vous à %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Se connecter avec un code QR"</string>
   <string name="screen_onboarding_sign_up">"Créer un compte"</string>
+  <string name="screen_onboarding_welcome_back">"Bon retour parmi nous"</string>
   <string name="screen_onboarding_welcome_message">"Bienvenue dans l’application %1$s la plus rapide de tous les temps. Boosté pour plus de rapidité et de simplicité."</string>
   <string name="screen_onboarding_welcome_subtitle">"Bienvenue sur %1$s. Boosté, pour plus de rapidité et de simplicité."</string>
   <string name="screen_onboarding_welcome_title">"Soyez dans votre Element"</string>
diff --git a/features/login/impl/src/main/res/values-hr/translations.xml b/features/login/impl/src/main/res/values-hr/translations.xml
index ced196f87e..f578790380 100644
--- a/features/login/impl/src/main/res/values-hr/translations.xml
+++ b/features/login/impl/src/main/res/values-hr/translations.xml
@@ -32,16 +32,25 @@
   <string name="screen_login_error_invalid_credentials">"Netočno korisničko ime i/ili zaporka"</string>
   <string name="screen_login_error_invalid_user_id">"To nije valjani identifikator korisnika. Očekivani oblik: ‘@korisnik:matičniposlužitelj.org’"</string>
   <string name="screen_login_error_refresh_tokens">"Ovaj je poslužitelj konfiguriran za korištenje tokena za osvježavanje. Oni nisu podržani kada se upotrebljava prijava temeljena na zaporki."</string>
-  <string name="screen_login_error_unsupported_authentication">"Odabrani matični poslužitelj ne podržava zaporku ili OIDC prijavu. Obratite se administratoru ili odaberite drugi matični poslužitelj."</string>
+  <string name="screen_login_error_unsupported_authentication">"Odabrani matični poslužitelj ne podržava zaporku ili OAuth prijavu. Obratite se administratoru ili odaberite drugi matični poslužitelj."</string>
   <string name="screen_login_form_header">"Unesite svoje podatke"</string>
   <string name="screen_login_subtitle">"Matrix je otvorena mreža za sigurnu, decentraliziranu komunikaciju."</string>
   <string name="screen_login_title">"Dobro došli natrag!"</string>
   <string name="screen_login_title_with_homeserver">"Prijavi se na poslužitelj %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Pokreni Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Otvorite Element Classic na svom uređaju"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Idite na Postavke &gt; Sigurnost i privatnost"</string>
+  <string name="screen_missing_key_backup_step_3_android">"šifrirane poruke"</string>
+  <string name="screen_missing_key_backup_step_4">"Slijedite upute za omogućavanje pohrane ključeva"</string>
+  <string name="screen_missing_key_backup_step_5">"Vrati se %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Omogućite pohranu ključeva prije nego što nastavite na %1$s"</string>
   <string name="screen_onboarding_app_version">"Inačica %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Provjera računa…"</string>
   <string name="screen_onboarding_sign_in_manually">"Prijavi se ručno"</string>
   <string name="screen_onboarding_sign_in_to">"Prijavi se na poslužitelj %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Prijavi se pomoću QR koda"</string>
   <string name="screen_onboarding_sign_up">"Izradi račun"</string>
+  <string name="screen_onboarding_welcome_back">"Dobro došli natrag!"</string>
   <string name="screen_onboarding_welcome_message">"Dobro došli u nikad brži %1$s. Snažniji no ikad za postizanje brzine i jednostavnosti."</string>
   <string name="screen_onboarding_welcome_subtitle">"Dobro došli u %1$s. Snažniji no ikad – za brzinu i jednostavnost."</string>
   <string name="screen_onboarding_welcome_title">"Budi u elementu"</string>
diff --git a/features/login/impl/src/main/res/values-hu/translations.xml b/features/login/impl/src/main/res/values-hu/translations.xml
index 06014b77b7..26534cc523 100644
--- a/features/login/impl/src/main/res/values-hu/translations.xml
+++ b/features/login/impl/src/main/res/values-hu/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Mi a kiszolgálója címe?"</string>
   <string name="screen_change_server_title">"Válassza ki a kiszolgálóját"</string>
   <string name="screen_create_account_title">"Fiók létrehozása"</string>
-  <string name="screen_login_error_deactivated_account">"Ez a fiók deaktiválva lett."</string>
+  <string name="screen_login_error_deactivated_account">"Ez a fiók törölve lett."</string>
   <string name="screen_login_error_invalid_credentials">"Helytelen felhasználónév vagy jelszó"</string>
   <string name="screen_login_error_invalid_user_id">"Ez nem érvényes felhasználóazonosító. A várt formátum: „@user:homeserver.org”"</string>
   <string name="screen_login_error_refresh_tokens">"Ez a kiszolgáló frissítési tokenek használatára van beállítva. Ezek jelszó alapú bejelentkezés esetén nem támogatottak."</string>
-  <string name="screen_login_error_unsupported_authentication">"A kiválasztott Matrix-kiszolgáló nem támogatja a jelszavas vagy OIDC-alapú bejelentkezést. Lépjen kapcsolatba a kiszolgáló adminisztrátorával, vagy válasszon másik Matrix-kiszolgálót."</string>
+  <string name="screen_login_error_unsupported_authentication">"A kiválasztott Matrix-kiszolgáló nem támogatja a jelszavas vagy OAuth-alapú bejelentkezést. Lépjen kapcsolatba a kiszolgáló adminisztrátorával, vagy válasszon másik Matrix-kiszolgálót."</string>
   <string name="screen_login_form_header">"Adja meg adatait"</string>
   <string name="screen_login_subtitle">"A Matrix egy nyitott hálózat a biztonságos, decentralizált kommunikációhoz."</string>
   <string name="screen_login_title">"Örülünk, hogy visszatért!"</string>
   <string name="screen_login_title_with_homeserver">"Bejelentkezés ide: %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Nyissa meg az Element Classic alkalmazást"</string>
+  <string name="screen_missing_key_backup_step_1">"Nyissa meg az Element Classic alkalmazást az eszközén"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Lépjen a Beállítások &gt; Biztonság és adatvédelem menüponthoz"</string>
+  <string name="screen_missing_key_backup_step_3_android">"A Kriptográfiai kulcsok kezelése részben válassza a Titkosított üzenetek helyreállítása lehetőséget"</string>
+  <string name="screen_missing_key_backup_step_4">"Kövesse az utasításokat a kulcstároló engedélyezéséhez"</string>
+  <string name="screen_missing_key_backup_step_5">"Térjen vissza ide: %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Engedélyezze a kulcstárolást a folytatás előtt ide: %1$s"</string>
   <string name="screen_onboarding_app_version">"Verzió: %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Fiók ellenőrzése"</string>
   <string name="screen_onboarding_sign_in_manually">"Kézi bejelentkezés"</string>
   <string name="screen_onboarding_sign_in_to">"Bejelentkezés ide: %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Bejelentkezés QR-kóddal"</string>
   <string name="screen_onboarding_sign_up">"Fiók létrehozása"</string>
+  <string name="screen_onboarding_welcome_back">"Üdvözöljük újra!"</string>
   <string name="screen_onboarding_welcome_message">"Üdvözöljük a valaha volt leggyorsabb %1$sben. Felturbózva, a sebesség és az egyszerűség érdekében."</string>
   <string name="screen_onboarding_welcome_subtitle">"Üdvözli az %1$s. Felturbózva, a sebesség és az egyszerűség jegyében."</string>
   <string name="screen_onboarding_welcome_title">"Legyen elemében"</string>
diff --git a/features/login/impl/src/main/res/values-in/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml
index e05fd8746d..1d29c5b619 100644
--- a/features/login/impl/src/main/res/values-in/translations.xml
+++ b/features/login/impl/src/main/res/values-in/translations.xml
@@ -32,16 +32,25 @@
   <string name="screen_login_error_invalid_credentials">"Nama pengguna dan/atau kata sandi salah"</string>
   <string name="screen_login_error_invalid_user_id">"Ini bukan pengenal pengguna yang valid. Format yang diharapkan: \'@pengguna:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Server ini diatur untuk menggunakan token penyegaran. Ini tidak didukung ketika menggunakan log masuk berbasis kata sandi."</string>
-  <string name="screen_login_error_unsupported_authentication">"Homeserver yang dipilih tidak mendukung log masuk kata sandi atau OIDC. Silakan hubungi admin Anda atau pilih homeserver yang lain."</string>
+  <string name="screen_login_error_unsupported_authentication">"Homeserver yang dipilih tidak mendukung log masuk kata sandi atau OAuth. Silakan hubungi admin Anda atau pilih homeserver yang lain."</string>
   <string name="screen_login_form_header">"Masukkan detail Anda"</string>
   <string name="screen_login_subtitle">"Matrix adalah jaringan terbuka untuk komunikasi yang aman dan terdesentralisasi."</string>
   <string name="screen_login_title">"Selamat datang kembali!"</string>
   <string name="screen_login_title_with_homeserver">"Masuk ke %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Buka Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Buka Element Classic di perangkat Anda"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Buka Pengaturan &gt; Keamanan &amp;amp; Privasi"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Dalam pengelolaan kunci kriptografi, pilih Pemulihan pesan terenkripsi"</string>
+  <string name="screen_missing_key_backup_step_4">"Ikuti petunjuk berikut untuk mengaktifkan penyimpanan kunci Anda"</string>
+  <string name="screen_missing_key_backup_step_5">"Kembali ke %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Aktifkan penyimpanan kunci Anda sebelum melanjutkan ke %1$s"</string>
   <string name="screen_onboarding_app_version">"Versi %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Memeriksa akun…"</string>
   <string name="screen_onboarding_sign_in_manually">"Masuk secara manual"</string>
   <string name="screen_onboarding_sign_in_to">"Masuk ke %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Masuk dengan kode QR"</string>
   <string name="screen_onboarding_sign_up">"Buat akun"</string>
+  <string name="screen_onboarding_welcome_back">"Selamat datang kembali!"</string>
   <string name="screen_onboarding_welcome_message">"Selamat datang di %1$s tercepat yang pernah ada. Berdaya besar untuk kecepatan dan kesederhanaan."</string>
   <string name="screen_onboarding_welcome_subtitle">"Selamat datang di %1$s. Berdaya penuh, untuk kecepatan dan kesederhanaan."</string>
   <string name="screen_onboarding_welcome_title">"Berada di elemen Anda"</string>
@@ -60,6 +69,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Permintaan masuk dibatalkan"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Proses masuk ditolak di perangkat lain."</string>
   <string name="screen_qr_code_login_error_declined_title">"Proses masuk ditolak"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Anda tidak perlu melakukan hal lain."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Perangkat Anda yang lain sudah masuk"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Masa masuk kedaluwarsa. Silakan coba lagi."</string>
   <string name="screen_qr_code_login_error_expired_title">"Proses masuk tidak selesai tepat waktu"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Perangkat Anda yang lain tidak mendukung masuk ke %s dengan kode QR.
diff --git a/features/login/impl/src/main/res/values-it/translations.xml b/features/login/impl/src/main/res/values-it/translations.xml
index 310aa22906..1f1b51cda8 100644
--- a/features/login/impl/src/main/res/values-it/translations.xml
+++ b/features/login/impl/src/main/res/values-it/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Qual è l\'indirizzo del tuo server?"</string>
   <string name="screen_change_server_title">"Seleziona il tuo server"</string>
   <string name="screen_create_account_title">"Crea account"</string>
-  <string name="screen_login_error_deactivated_account">"Questo account è stato disattivato."</string>
+  <string name="screen_login_error_deactivated_account">"Questo account è stato eliminato."</string>
   <string name="screen_login_error_invalid_credentials">"Nome utente e/o password errati"</string>
   <string name="screen_login_error_invalid_user_id">"Questo non è un identità utente valida. il formato atteso é: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Questo server è configurato per usare i token di aggiornamento. Non sono supportati quando si usa l\'accesso basato su password."</string>
-  <string name="screen_login_error_unsupported_authentication">"L\'homeserver selezionato non supporta la password o l\'accesso OIDC. Contatta il tuo amministratore o scegli un altro homeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"L\'homeserver selezionato non supporta la password o l\'accesso OAuth. Contatta il tuo amministratore o scegli un altro homeserver."</string>
   <string name="screen_login_form_header">"Inserisci i tuoi dati"</string>
   <string name="screen_login_subtitle">"Matrix è una rete aperta per comunicazioni sicure e decentralizzate."</string>
   <string name="screen_login_title">"Bentornato!"</string>
   <string name="screen_login_title_with_homeserver">"Accedi a %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Apri Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Apri Element Classic sul tuo dispositivo"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Vai su Impostazioni &gt; Sicurezza &amp; privacy"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Nella gestione delle chiavi crittografiche, seleziona Recupero dei messaggi cifrati"</string>
+  <string name="screen_missing_key_backup_step_4">"Segui le istruzioni per abilitare l\'archiviazione delle chiavi"</string>
+  <string name="screen_missing_key_backup_step_5">"Torna a %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Abilita l\'archivio delle chiavi prima di procedere con %1$s"</string>
   <string name="screen_onboarding_app_version">"Versione %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Verifica dell\'account"</string>
   <string name="screen_onboarding_sign_in_manually">"Accedi manualmente"</string>
   <string name="screen_onboarding_sign_in_to">"Accedi a %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Accedi con codice QR"</string>
   <string name="screen_onboarding_sign_up">"Crea account"</string>
+  <string name="screen_onboarding_welcome_back">"Bentornato"</string>
   <string name="screen_onboarding_welcome_message">"Benvenuti nell\'%1$s più veloce di sempre. Potenziato per velocità e semplicità."</string>
   <string name="screen_onboarding_welcome_subtitle">"Benvenuto su %1$s. Potenziato in velocità e semplicità."</string>
   <string name="screen_onboarding_welcome_title">"Sii nel tuo elemento"</string>
@@ -60,6 +69,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Richiesta di accesso annullata"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"L\'accesso è stato rifiutato sull\'altro dispositivo."</string>
   <string name="screen_qr_code_login_error_declined_title">"Accesso rifiutato"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Non devi fare altro."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"L\'altro tuo dispositivo è già connesso"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"L\'accesso è scaduto. Riprova."</string>
   <string name="screen_qr_code_login_error_expired_title">"L\'accesso non è stato completato in tempo"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"L\'altro dispositivo non supporta l\'accesso a %s con un codice QR.
diff --git a/features/login/impl/src/main/res/values-ja/translations.xml b/features/login/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..42698e27dc
--- /dev/null
+++ b/features/login/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"アカウント提供元を変更"</string>
+  <string name="screen_account_provider_form_hint">"ホームサーバーのアドレス"</string>
+  <string name="screen_account_provider_form_notice">"検索のキーワードまたはドメインのアドレスを入力してください。"</string>
+  <string name="screen_account_provider_form_subtitle">"会社やコミュニティ, 個人のサーバーなどを検索します。"</string>
+  <string name="screen_account_provider_form_title">"アカウント提供元を検索"</string>
+  <string name="screen_account_provider_signin_subtitle">"メールアプリのように、あなたの会話はこのサーバー上に保管されます。"</string>
+  <string name="screen_account_provider_signin_title">"%s にサインインを試みています"</string>
+  <string name="screen_account_provider_signup_subtitle">"メールアプリのように、あなたの会話はこのサーバー上に保管されます。"</string>
+  <string name="screen_account_provider_signup_title">"%s 上にアカウントを作成しようとしています"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org は Matrix.org Foundation が運営する、大規模で安全な分散型コミュニケーションを実現する無償のサーバーです。"</string>
+  <string name="screen_change_account_provider_other">"その他"</string>
+  <string name="screen_change_account_provider_subtitle">"自身のサーバーや仕事用のアカウントにサインインするには、アカウント提供元を変更してください。"</string>
+  <string name="screen_change_account_provider_title">"アカウント提供元を変更"</string>
+  <string name="screen_change_server_error_element_pro_required_action_android">"Google Play"</string>
+  <string name="screen_change_server_error_element_pro_required_message">"%1$s では Element Pro を使用する必要があります。アプリストアよりダウンロードしてください。"</string>
+  <string name="screen_change_server_error_element_pro_required_title">"Element Pro が必要です"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"このホームサーバーに接続できませんでした。正しいURLを入力したことを確認し、問題が継続する場合は、ホームサーバーの管理者に問い合わせてください。"</string>
+  <string name="screen_change_server_error_invalid_well_known">".well-knownファイルに問題があるためサーバーを使用できません: %1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"このアカウント提供元は、スライド同期に対応していません。%1$s を使用するにはサーバーのアップグレードが必要です。"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%2$s は %1$s からの接続を許可していません。"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"このアプリは次のサーバーを許可します: %1$s"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"アカウント提供元 %1$s は許可されていません。"</string>
+  <string name="screen_change_server_form_header">"ホームサーバーURL"</string>
+  <string name="screen_change_server_form_notice">"ドメイン名を入力してください"</string>
+  <string name="screen_change_server_subtitle">"サーバーのアドレスは何ですか？"</string>
+  <string name="screen_change_server_title">"サーバーを選択"</string>
+  <string name="screen_create_account_title">"アカウントを作成"</string>
+  <string name="screen_login_error_deactivated_account">"アカウントは削除されました。"</string>
+  <string name="screen_login_error_invalid_credentials">"ユーザー名またはパスワードが違います"</string>
+  <string name="screen_login_error_invalid_user_id">"無効なユーザーIDです。正しい形式は \"@ユーザー:ホームサーバー\" です。"</string>
+  <string name="screen_login_error_refresh_tokens">"このサーバーはリフレッシュトークンを使用します。パスワードを使用したログインとは併用できません。"</string>
+  <string name="screen_login_error_unsupported_authentication">"指定したホームサーバはパスワードまたはOAuthによるログインに対応していません。管理者に問い合わせるか、異なるホームサーバーを使用してください。"</string>
+  <string name="screen_login_form_header">"詳細を入力"</string>
+  <string name="screen_login_subtitle">"Matrix は安全で分散型のオープンなネットワークです。"</string>
+  <string name="screen_login_title">"お待ちしておりました。"</string>
+  <string name="screen_login_title_with_homeserver">"%1$s にサインイン"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Element Classic を開く"</string>
+  <string name="screen_missing_key_backup_step_1">"Element Classic をこの端末で開く"</string>
+  <string name="screen_missing_key_backup_step_2_android">"「設定- セキュリティとプライバシー」に移動します"</string>
+  <string name="screen_missing_key_backup_step_3_android">"暗号鍵の管理から、暗号化されたメッセージの回復を選択します"</string>
+  <string name="screen_missing_key_backup_step_4">"指示に従って、鍵の保管庫を有効化してください"</string>
+  <string name="screen_missing_key_backup_step_5">"%1$s に戻ってください"</string>
+  <string name="screen_missing_key_backup_title">"%1$s に続行する前に、鍵の保管庫を有効化してください"</string>
+  <string name="screen_onboarding_app_version">"バージョン %1$s"</string>
+  <string name="screen_onboarding_checking_account">"アカウントを確認中"</string>
+  <string name="screen_onboarding_sign_in_manually">"手動で指定してサインイン"</string>
+  <string name="screen_onboarding_sign_in_to">"%1$s にサインイン"</string>
+  <string name="screen_onboarding_sign_in_with_qr_code">"QRコードでサインイン"</string>
+  <string name="screen_onboarding_sign_up">"アカウントを作成"</string>
+  <string name="screen_onboarding_welcome_back">"おかえりなさい"</string>
+  <string name="screen_onboarding_welcome_message">"最速の %1$s にようこそ。機能性と利便性を極限まで追求しました。"</string>
+  <string name="screen_onboarding_welcome_subtitle">"機敏と利便を追求した %1$s へようこそ。"</string>
+  <string name="screen_onboarding_welcome_title">"Be in your element"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"安全な通信を確立しています"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"新しい端末で安全な通信を確立できませんでした。既存の端末は安全な状態を維持しています。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"どうしますか？"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"ネットワークの問題の可能性があるため、再度QRコードでログインを試してください。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"同様の問題が発生する場合は、異なるWi-Fiやモバイルデータ通信を試してください"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"問題が解決しない場合は、手動でサインインしてください"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_title">"接続が安全ではありません"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"この端末に表示される2つの数字の入力を要求されます"</string>
+  <string name="screen_qr_code_login_device_code_title">"もう一方に表示される数字を入力してください"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_description">"他の端末にサインインしてからもう一度試すか、既にサインインしてある端末を使用してください"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"他の端末でサインインしていません"</string>
+  <string name="screen_qr_code_login_error_cancelled_subtitle">"もう一方の端末がサインインをキャンセルしました"</string>
+  <string name="screen_qr_code_login_error_cancelled_title">"サインインのリクエストがキャンセルされました"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"もう一方の端末でサインインを拒否されました"</string>
+  <string name="screen_qr_code_login_error_declined_title">"サインインを拒否"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"他には何もする必要はありません。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"他の端末で既にサインインしています"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"サインインが無効です。もう一度試してください。"</string>
+  <string name="screen_qr_code_login_error_expired_title">"サインインが時間内に完了しませんでした"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"QRコードを使用した %s へのサインインに他の端末が対応していません。
+
+異なる端末でQRコードを読み取るか、手動でサインインしてください。"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"QRコードに非対応"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"アカウント提供元が %1$s に対応していません。"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s に非対応"</string>
+  <string name="screen_qr_code_login_initial_state_button_title">"読み取る"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"コンピュータで %1$s を開く"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"アバターをタップ"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"%1$s を選択"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"\"新しい端末を追加\""</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"この端末でQRコードを読み取る"</string>
+  <string name="screen_qr_code_login_initial_state_subtitle">"アカウント提供元が対応する場合にのみ使用できます。"</string>
+  <string name="screen_qr_code_login_initial_state_title">"他の端末の %1$s でQRコードを表示"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"もう一方の端末に表示されているQRコードを使用してください"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"もう一度やり直してください"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QRコードが間違っています"</string>
+  <string name="screen_qr_code_login_no_camera_permission_button">"カメラの設定を開く"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"続行するには、%1$s にカメラの使用を許可する必要があります。"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"QRコードを読み取るため、カメラへのアクセスを許可"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"QRコードを読み取り"</string>
+  <string name="screen_qr_code_login_start_over_button">"やり直す"</string>
+  <string name="screen_qr_code_login_unknown_error_description">"予期せぬ問題が発生しました。もう一度試してください。"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"一方の端末を待機しています"</string>
+  <string name="screen_qr_code_login_verify_code_subtitle">"アカウント提供元が、サインインを検証するために以下の文字列を要求することがあります。"</string>
+  <string name="screen_qr_code_login_verify_code_title">"検証コード"</string>
+  <string name="screen_server_confirmation_change_server">"アカウント提供元を変更"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Element 開発者用の非公開のサーバーです。"</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix は安全で分散型のオープンなネットワークです。"</string>
+  <string name="screen_server_confirmation_message_register">"メールアプリのように、あなたの会話はこのサーバー上に保管されます。"</string>
+  <string name="screen_server_confirmation_title_login">"%1$s にサインインを試みています"</string>
+  <string name="screen_server_confirmation_title_picker_mode">"アカウント提供元を選択"</string>
+  <string name="screen_server_confirmation_title_register">"%1$s 上にアカウントを作成しようとしています"</string>
+</resources>
diff --git a/features/login/impl/src/main/res/values-ka/translations.xml b/features/login/impl/src/main/res/values-ka/translations.xml
index 54e277ec12..04db3fda13 100644
--- a/features/login/impl/src/main/res/values-ka/translations.xml
+++ b/features/login/impl/src/main/res/values-ka/translations.xml
@@ -23,7 +23,7 @@
   <string name="screen_login_error_invalid_credentials">"არასწორი მომხმარებლის სახელი და/ან პაროლი"</string>
   <string name="screen_login_error_invalid_user_id">"მოცემული მომხმარებლის იდენტიფიკატორი არასწორია. დასაშვები ფორმატი: ‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"ეს სერვერი კონფიგურირებულია განახლების გასაღებების გამოსაყენებლად. პაროლზე დაფუძნებული შეცვლისას ისინი მხარდაჭერილი არაა."</string>
-  <string name="screen_login_error_unsupported_authentication">"მოცემული სახლის სერვერი მხარს არ უჭერს პაროლით ან OIDC-ით შესვლას. გთხოვთ, დაუკავშირდეთ თქვენს ადმინისტრატორს ან აარჩიეთ სხვა სახლის სერვერი."</string>
+  <string name="screen_login_error_unsupported_authentication">"მოცემული სახლის სერვერი მხარს არ უჭერს პაროლით ან OAuth-ით შესვლას. გთხოვთ, დაუკავშირდეთ თქვენს ადმინისტრატორს ან აარჩიეთ სხვა სახლის სერვერი."</string>
   <string name="screen_login_form_header">"შეიყვანეთ თქვენი დეტალები"</string>
   <string name="screen_login_subtitle">"Matrix არის ღია ქსელი უსაფრთხო, დეცენტრალიზებული კომუნიკაციისთვის."</string>
   <string name="screen_login_title">"კეთილი იყოს თქვენი მობრძანება!"</string>
diff --git a/features/login/impl/src/main/res/values-ko/translations.xml b/features/login/impl/src/main/res/values-ko/translations.xml
index 69bf12cdb0..8f313b15ee 100644
--- a/features/login/impl/src/main/res/values-ko/translations.xml
+++ b/features/login/impl/src/main/res/values-ko/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"서버의 주소는 무엇인가요?"</string>
   <string name="screen_change_server_title">"서버 선택"</string>
   <string name="screen_create_account_title">"계정 만들기"</string>
-  <string name="screen_login_error_deactivated_account">"계정이 비활성화되었습니다."</string>
+  <string name="screen_login_error_deactivated_account">"삭제된 계정입니다."</string>
   <string name="screen_login_error_invalid_credentials">"잘못된 아이디/비밀번호"</string>
   <string name="screen_login_error_invalid_user_id">"이 사용자 ID는 유효하지 않습니다. 예상 형식: ‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"이 서버는 새로 고침 토큰을 사용하도록 구성되어 있습니다. 비밀번호 기반 로그인을 사용하는 경우 이 기능은 지원되지 않습니다."</string>
-  <string name="screen_login_error_unsupported_authentication">"선택한 홈 서버는 password 또는 OIDC 로그인을 지원하지 않습니다. 관리자에게 문의하거나 다른 홈 서버를 선택하세요."</string>
+  <string name="screen_login_error_unsupported_authentication">"선택한 홈 서버는 password 또는 OAuth 로그인을 지원하지 않습니다. 관리자에게 문의하거나 다른 홈 서버를 선택하세요."</string>
   <string name="screen_login_form_header">"귀하의 세부 정보를 입력하십시오"</string>
   <string name="screen_login_subtitle">"Matrix 는 안전하고 분산된 커뮤니케이션을 위한 개방형 네트워크입니다."</string>
   <string name="screen_login_title">"다시 돌아온 걸 환영합니다!"</string>
   <string name="screen_login_title_with_homeserver">"%1$s 에 로그인합니다"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Element Classic 열기"</string>
+  <string name="screen_missing_key_backup_step_1">"기기에서 Element Classic 앱을 열어 주세요"</string>
+  <string name="screen_missing_key_backup_step_2_android">"설정 &gt; 보안 및 개인정보 보호로 이동하세요"</string>
+  <string name="screen_missing_key_backup_step_3_android">"암호화 키 관리에서 \'암호화된 메시지 복구\'를 선택하세요"</string>
+  <string name="screen_missing_key_backup_step_4">"안내에 따라 키 저장소를 활성화해 주세요"</string>
+  <string name="screen_missing_key_backup_step_5">"%1$s(으)로 돌아가기"</string>
+  <string name="screen_missing_key_backup_title">"%1$s(으)로 진행하기 전에 키 저장소를 활성화해 주세요."</string>
   <string name="screen_onboarding_app_version">"버전 %1$s"</string>
+  <string name="screen_onboarding_checking_account">"계정 확인 중"</string>
   <string name="screen_onboarding_sign_in_manually">"수동으로 로그인"</string>
   <string name="screen_onboarding_sign_in_to">"%1$s 에 로그인합니다"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"QR 코드로 로그인"</string>
   <string name="screen_onboarding_sign_up">"계정 만들기"</string>
+  <string name="screen_onboarding_welcome_back">"다시 오신 것을 환영합니다"</string>
   <string name="screen_onboarding_welcome_message">"%1$s 에 오신 것을 환영합니다. 속도와 단순성을 극대화한 가장 빠른 버전입니다."</string>
   <string name="screen_onboarding_welcome_subtitle">"%1$s 에 오신 것을 환영합니다. 속도와 단순성을 위해 최적화된 앱입니다."</string>
   <string name="screen_onboarding_welcome_title">"당신의 엘리먼트에 있어"</string>
diff --git a/features/login/impl/src/main/res/values-lt/translations.xml b/features/login/impl/src/main/res/values-lt/translations.xml
index 35e82d5a58..dc1a2b7ba6 100644
--- a/features/login/impl/src/main/res/values-lt/translations.xml
+++ b/features/login/impl/src/main/res/values-lt/translations.xml
@@ -4,22 +4,34 @@
   <string name="screen_account_provider_form_hint">"Pagrindinio serverio adresas"</string>
   <string name="screen_account_provider_form_notice">"Įveskite paieškos terminą arba domeno adresą."</string>
   <string name="screen_account_provider_form_subtitle">"Ieškokite bendrovės, bendruomenės arba privataus serverio."</string>
-  <string name="screen_account_provider_form_title">"Rasti paskyros teikėją"</string>
+  <string name="screen_account_provider_form_title">"Raskite paskyros teikėją"</string>
   <string name="screen_account_provider_signin_subtitle">"Čia bus saugomi Jūsų pokalbiai - panašiai kaip el. pašto paslaugų teikėjas saugo Jūsų el. laiškus."</string>
   <string name="screen_account_provider_signin_title">"Ketinate prisijungti prie %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Čia bus saugomi Jūsų pokalbiai - panašiai kaip el. pašto paslaugų teikėjas saugo Jūsų el. laiškus."</string>
   <string name="screen_account_provider_signup_title">"Ketinate sukurti paskyrą teikėjoje %s"</string>
-  <string name="screen_change_account_provider_other">"Kita"</string>
-  <string name="screen_change_account_provider_subtitle">"Naudokite skirtingą paskyros teikėją, pavyzdžiui, savo privatų serverį arba darbo paskyrą."</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org – tai didelis nemokamas serveris viešajame „Matrix“ tinkle saugiam ir decentralizuotam bendravimui, kurį valdo „Matrix.org“ fondas."</string>
+  <string name="screen_change_account_provider_other">"Kitas"</string>
+  <string name="screen_change_account_provider_subtitle">"Naudokite kitą paskyros teikėją, pavyzdžiui, savo privatų serverį arba darbo paskyrą."</string>
   <string name="screen_change_account_provider_title">"Keisti paskyros teikėją"</string>
-  <string name="screen_change_server_error_invalid_homeserver">"Nepavyko pasiekti šio serverio. Patikrinkite, ar teisingai įvedėte serverio URL. Jei URL yra teisingas, susisiekite su serverio administracija dėl tolimesnės pagalbos."</string>
-  <string name="screen_change_server_form_header">"Serverio URL"</string>
-  <string name="screen_change_server_subtitle">"Koks yra Jūsų serverio adresas?"</string>
+  <string name="screen_change_server_error_element_pro_required_action_android">"„Google Play“"</string>
+  <string name="screen_change_server_error_element_pro_required_message">"„Element Pro“ programa privaloma teikėjoje %1$s. Atsisiųskite ją iš parduotuvės."</string>
+  <string name="screen_change_server_error_element_pro_required_title">"„Element Pro“ privaloma"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"Nepavyko pasiekti šio pagrindinio serverio. Patikrinkite, ar teisingai įvedėte serverio URL. Jei URL yra teisingas, susisiekite su serverio administratoriumi dėl tolimesnės pagalbos."</string>
+  <string name="screen_change_server_error_invalid_well_known">"Serveris nepasiekiamas dėl problemos .labai-zinomame faile:
+%1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Pasirinktas paskyros teikėjas nepalaiko slankiojo sinchronizavimo. Norint naudoti „%1$s“, reikia atnaujinti serverį."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"„%1$s“ neleidžiama prisijungti prie %2$s."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"Ši programa sukonfigūruota, kad leistų %1$s."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"Paskyros teikėjas %1$s neleidžiamas."</string>
+  <string name="screen_change_server_form_header">"Pagrindinio serverio URL"</string>
+  <string name="screen_change_server_form_notice">"Įveskite domeno adresą."</string>
+  <string name="screen_change_server_subtitle">"Koks yra jūsų serverio adresas?"</string>
+  <string name="screen_change_server_title">"Pasirinkite savo serverį"</string>
   <string name="screen_create_account_title">"Kurti paskyrą"</string>
   <string name="screen_login_error_deactivated_account">"Ši paskyra buvo išjungta."</string>
   <string name="screen_login_error_invalid_credentials">"Neteisingas vartotojo vardas ir (arba) slaptažodis"</string>
   <string name="screen_login_error_invalid_user_id">"Tai nėra tinkamas vartotojo vardas. Reikalingas formatas: \'@vartotojas:serveris.org\'"</string>
-  <string name="screen_login_error_unsupported_authentication">"Pasirinktas serveris nepalaiko slaptažodžio ar OIDC prisijungimo. Susisiekite su serverio administracija arba pasirinkite kitą serverį."</string>
+  <string name="screen_login_error_unsupported_authentication">"Pasirinktas serveris nepalaiko slaptažodžio ar OAuth prisijungimo. Susisiekite su serverio administracija arba pasirinkite kitą serverį."</string>
   <string name="screen_login_form_header">"Įveskite savo duomenis"</string>
   <string name="screen_login_subtitle">"Matrix yra atviras tinklas, skirtas saugiam, decentralizuotam bendravimui."</string>
   <string name="screen_login_title">"Sveiki sugrįžę!"</string>
@@ -29,9 +41,10 @@
   <string name="screen_onboarding_sign_in_to">"Prisijungti prie %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Prisijungti su QR kodu"</string>
   <string name="screen_onboarding_sign_up">"Kurti paskyrą"</string>
+  <string name="screen_onboarding_welcome_back">"Sveiki sugrįžę"</string>
   <string name="screen_onboarding_welcome_message">"Sveiki atvykę į sparčiausią „%1$s“ kada nors. Pagerintas spartai ir paprastumui."</string>
   <string name="screen_onboarding_welcome_subtitle">"Sveiki atvykę į „%1$s“. Pagerintas spartai ir paprastumui."</string>
-  <string name="screen_onboarding_welcome_title">"Būkite savo elemente"</string>
+  <string name="screen_onboarding_welcome_title">"Būkite savo stichijoje"</string>
   <string name="screen_server_confirmation_change_server">"Keisti paskyros teikėją"</string>
   <string name="screen_server_confirmation_message_login_element_dot_io">"Privatus serveris “Element” darbuotojams."</string>
   <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix yra atviras tinklas, skirtas saugiam, decentralizuotam bendravimui."</string>
diff --git a/features/login/impl/src/main/res/values-nb/translations.xml b/features/login/impl/src/main/res/values-nb/translations.xml
index 3233329f86..5d4a3c1494 100644
--- a/features/login/impl/src/main/res/values-nb/translations.xml
+++ b/features/login/impl/src/main/res/values-nb/translations.xml
@@ -28,20 +28,28 @@
   <string name="screen_change_server_subtitle">"Hva er adressen til serveren din?"</string>
   <string name="screen_change_server_title">"Velg din server"</string>
   <string name="screen_create_account_title">"Opprett konto"</string>
-  <string name="screen_login_error_deactivated_account">"Denne kontoen er deaktivert."</string>
+  <string name="screen_login_error_deactivated_account">"Denne kontoen er slettet."</string>
   <string name="screen_login_error_invalid_credentials">"Feil brukernavn og/eller passord"</string>
   <string name="screen_login_error_invalid_user_id">"Dette er ikke en gyldig brukeridentifikator. Forventet format: \'@bruker:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Denne serveren er konfigurert til å bruke oppdateringstokener. Disse støttes ikke når du bruker passordbasert pålogging."</string>
-  <string name="screen_login_error_unsupported_authentication">"Den valgte hjemmeserveren støtter ikke passord eller OIDC-pålogging. Ta kontakt med administratoren din eller velg en annen hjemmeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"Den valgte hjemmeserveren støtter ikke passord eller OAuth-pålogging. Ta kontakt med administratoren din eller velg en annen hjemmeserver."</string>
   <string name="screen_login_form_header">"Skriv inn opplysningene dine"</string>
   <string name="screen_login_subtitle">"Matrix er et åpent nettverk for sikker, desentralisert kommunikasjon."</string>
   <string name="screen_login_title">"Velkommen tilbake!"</string>
   <string name="screen_login_title_with_homeserver">"Logg inn på %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Åpne Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Åpne Element Classic på enheten din"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Gå til Innstillinger → Sikkerhet og personvern"</string>
+  <string name="screen_missing_key_backup_step_4">"Følg instruksjonene for å aktivere nøkkellagringen din"</string>
+  <string name="screen_missing_key_backup_step_5">"Kom tilbake til %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Aktiver nøkkellagringen din før du går videre til %1$s"</string>
   <string name="screen_onboarding_app_version">"Versjon %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Sjekker kontoen"</string>
   <string name="screen_onboarding_sign_in_manually">"Logg på manuelt"</string>
   <string name="screen_onboarding_sign_in_to">"Logg inn på %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Logg inn med QR-kode"</string>
   <string name="screen_onboarding_sign_up">"Opprett konto"</string>
+  <string name="screen_onboarding_welcome_back">"Velkommen tilbake"</string>
   <string name="screen_onboarding_welcome_message">"Velkommen til den raskeste %1$s noensinne. Superladet for hastighet og enkelhet."</string>
   <string name="screen_onboarding_welcome_subtitle">"Velkommen til %1$s. Supercharged, for hastighet og enkelhet."</string>
   <string name="screen_onboarding_welcome_title">"Vær i ditt rette element"</string>
diff --git a/features/login/impl/src/main/res/values-nl/translations.xml b/features/login/impl/src/main/res/values-nl/translations.xml
index 8a7f695156..e5d90e2234 100644
--- a/features/login/impl/src/main/res/values-nl/translations.xml
+++ b/features/login/impl/src/main/res/values-nl/translations.xml
@@ -24,7 +24,7 @@
   <string name="screen_login_error_invalid_credentials">"Onjuiste gebruikersnaam en/of wachtwoord"</string>
   <string name="screen_login_error_invalid_user_id">"Dit is geen geldige gebruikers-ID. Verwacht formaat: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Deze server is geconfigureerd om verversingstokens te gebruiken. Deze worden niet ondersteund bij inloggen met een wachtwoord."</string>
-  <string name="screen_login_error_unsupported_authentication">"De geselecteerde homeserver ondersteunt geen wachtwoord of OIDC aanmelding. Neem contact op met je beheerder of kies een andere homeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"De geselecteerde homeserver ondersteunt geen wachtwoord of OAuth aanmelding. Neem contact op met je beheerder of kies een andere homeserver."</string>
   <string name="screen_login_form_header">"Vul je gegevens in"</string>
   <string name="screen_login_subtitle">"Matrix is een open netwerk voor veilige, gedecentraliseerde communicatie."</string>
   <string name="screen_login_title">"Welkom terug!"</string>
diff --git a/features/login/impl/src/main/res/values-pl/translations.xml b/features/login/impl/src/main/res/values-pl/translations.xml
index 0c7810abe7..634d856cdf 100644
--- a/features/login/impl/src/main/res/values-pl/translations.xml
+++ b/features/login/impl/src/main/res/values-pl/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Jaki jest adres Twojego serwera?"</string>
   <string name="screen_change_server_title">"Wybierz swój serwer"</string>
   <string name="screen_create_account_title">"Utwórz konto"</string>
-  <string name="screen_login_error_deactivated_account">"To konto zostało dezaktywowane."</string>
+  <string name="screen_login_error_deactivated_account">"To konto zostało usunięte."</string>
   <string name="screen_login_error_invalid_credentials">"Nieprawidłowa nazwa użytkownika i/lub hasło"</string>
   <string name="screen_login_error_invalid_user_id">"To nie jest prawidłowy identyfikator użytkownika. Oczekiwany format: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Ten serwer został skonfigurowany do korzystania z tokenów odświeżania. Nie są one obsługiwane, gdy korzystasz z hasła."</string>
-  <string name="screen_login_error_unsupported_authentication">"Wybrany serwer domowy nie obsługuje uwierzytelniania hasłem, ani OIDC. Skontaktuj się z jego administratorem lub wybierz inny serwer domowy."</string>
+  <string name="screen_login_error_unsupported_authentication">"Wybrany serwer domowy nie obsługuje uwierzytelniania hasłem, ani OAuth. Skontaktuj się z jego administratorem lub wybierz inny serwer domowy."</string>
   <string name="screen_login_form_header">"Wprowadź swoje dane"</string>
   <string name="screen_login_subtitle">"Matrix to otwarta sieć do bezpiecznej i zdecentralizowanej komunikacji."</string>
   <string name="screen_login_title">"Witaj ponownie!"</string>
   <string name="screen_login_title_with_homeserver">"Zaloguj się do %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Otwórz Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Otwórz Element Classic na swoim urządzeniu"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Przejdź do Ustawienia &gt; Bezpieczeństwo i prywatność"</string>
+  <string name="screen_missing_key_backup_step_3_android">"W Zarządzaniu kluczami kryptograficznymi wybierz przywracanie wiadomości szyfrowanych"</string>
+  <string name="screen_missing_key_backup_step_4">"Aby włączyć magazyn kluczy, postępuj zgodnie z instrukcjami"</string>
+  <string name="screen_missing_key_backup_step_5">"Wróć do %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Włącz magazyn kluczy zanim przejdziesz do %1$s"</string>
   <string name="screen_onboarding_app_version">"Wersja %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Sprawdzanie konta"</string>
   <string name="screen_onboarding_sign_in_manually">"Zaloguj się ręcznie"</string>
   <string name="screen_onboarding_sign_in_to">"Zaloguj się do %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Zaloguj się za pomocą kodu QR"</string>
   <string name="screen_onboarding_sign_up">"Utwórz konto"</string>
+  <string name="screen_onboarding_welcome_back">"Witamy ponownie"</string>
   <string name="screen_onboarding_welcome_message">"Witamy w %1$s. Szybszy i prostszy niż kiedykolwiek."</string>
   <string name="screen_onboarding_welcome_subtitle">"Witamy w %1$s. Doładowany, dla szybkości i prostoty."</string>
   <string name="screen_onboarding_welcome_title">"Be in your element"</string>
@@ -60,6 +69,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Prośba o logowanie została anulowana"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Logowanie zostało odrzucone na drugim urządzeniu."</string>
   <string name="screen_qr_code_login_error_declined_title">"Logowanie odrzucone"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Nie musisz już robić nic więcej."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Twoje drugie urządzenie jest już zalogowane"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Logowanie wygasło. Spróbuj ponownie."</string>
   <string name="screen_qr_code_login_error_expired_title">"Logowanie nie zostało ukończone na czas"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Twoje drugie urządzenie nie wspiera logowania się do %s za pomocą kodu QR.
@@ -86,7 +97,7 @@ Spróbuj zalogować się ręcznie lub zeskanuj kod QR na innym urządzeniu."</st
   <string name="screen_qr_code_login_start_over_button">"Zacznij od nowa"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Wystąpił nieoczekiwany błąd. Spróbuj ponownie."</string>
   <string name="screen_qr_code_login_verify_code_loading">"Oczekiwanie na drugie urządzenie"</string>
-  <string name="screen_qr_code_login_verify_code_subtitle">"Twój dostawca konta może poprosić o podany kod, aby zweryfikować logowanie."</string>
+  <string name="screen_qr_code_login_verify_code_subtitle">"Twój dostawca konta może poprosić o podany kod w celu weryfikacji logowania."</string>
   <string name="screen_qr_code_login_verify_code_title">"Twój kod weryfikacyjny"</string>
   <string name="screen_server_confirmation_change_server">"Zmień dostawcę konta"</string>
   <string name="screen_server_confirmation_message_login_element_dot_io">"Serwer prywatny dla pracowników Element."</string>
diff --git a/features/login/impl/src/main/res/values-pt-rBR/translations.xml b/features/login/impl/src/main/res/values-pt-rBR/translations.xml
index afca14d201..a789cc766c 100644
--- a/features/login/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/login/impl/src/main/res/values-pt-rBR/translations.xml
@@ -28,11 +28,11 @@
   <string name="screen_change_server_subtitle">"Qual é o endereço do seu servidor?"</string>
   <string name="screen_change_server_title">"Selecione seu servidor"</string>
   <string name="screen_create_account_title">"Criar conta"</string>
-  <string name="screen_login_error_deactivated_account">"Essa conta foi desativada."</string>
+  <string name="screen_login_error_deactivated_account">"Essa conta foi apagada."</string>
   <string name="screen_login_error_invalid_credentials">"Nome de usuário e/ou senha incorretos"</string>
   <string name="screen_login_error_invalid_user_id">"Esse não é um identificador de usuário válido. Formato esperado: \'@usuário:servidor.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Este servidor está configurado para usar tokens recarregados. Não há suporte a eles ao entrar por uma senha."</string>
-  <string name="screen_login_error_unsupported_authentication">"O servidor selecionado não suporta a entrada por senha ou OIDC. Entre em contato com o administrador ou escolha outro servidor."</string>
+  <string name="screen_login_error_unsupported_authentication">"O servidor selecionado não suporta a entrada por senha ou OAuth. Entre em contato com o administrador ou escolha outro servidor."</string>
   <string name="screen_login_form_header">"Digite seus dados"</string>
   <string name="screen_login_subtitle">"A Matrix é uma rede aberta para comunicação segura e descentralizada."</string>
   <string name="screen_login_title">"Boas-vindas novamente!"</string>
diff --git a/features/login/impl/src/main/res/values-pt/translations.xml b/features/login/impl/src/main/res/values-pt/translations.xml
index c2aa0d5ed6..ff3cae843d 100644
--- a/features/login/impl/src/main/res/values-pt/translations.xml
+++ b/features/login/impl/src/main/res/values-pt/translations.xml
@@ -28,11 +28,11 @@
   <string name="screen_change_server_subtitle">"Qual é o endereço do teu servidor?"</string>
   <string name="screen_change_server_title">"Seleciona o teu servidor"</string>
   <string name="screen_create_account_title">"Criar conta"</string>
-  <string name="screen_login_error_deactivated_account">"Esta conta foi desativada."</string>
+  <string name="screen_login_error_deactivated_account">"Esta conta foi eliminada."</string>
   <string name="screen_login_error_invalid_credentials">"Nome de utilizador ou senha incorretos"</string>
   <string name="screen_login_error_invalid_user_id">"Identificador de utilizador inválido. Formato esperado: ‘@utilizador:servidor.org’"</string>
   <string name="screen_login_error_refresh_tokens">"Este servidor está configurado para utilizar \"tokens\" de atualização. Estes não são suportados quando utilizas o início de sessão por senha."</string>
-  <string name="screen_login_error_unsupported_authentication">"O servidor selecionado não suporta início de sessão por senha nem por OIDC. Por favor, contacta o teu administrador ou escolhe outro servidor."</string>
+  <string name="screen_login_error_unsupported_authentication">"O servidor selecionado não suporta início de sessão por senha nem por OAuth. Por favor, contacta o teu administrador ou escolhe outro servidor."</string>
   <string name="screen_login_form_header">"Insere o teus detalhes"</string>
   <string name="screen_login_subtitle">"A Matrix é uma rede aberta de comunicação descentralizada e segura."</string>
   <string name="screen_login_title">"Bem-vindo(a) de volta!"</string>
diff --git a/features/login/impl/src/main/res/values-ro/translations.xml b/features/login/impl/src/main/res/values-ro/translations.xml
index 6dddc4d0bf..b44242abf8 100644
--- a/features/login/impl/src/main/res/values-ro/translations.xml
+++ b/features/login/impl/src/main/res/values-ro/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Care este adresa serverului dumneavoastră?"</string>
   <string name="screen_change_server_title">"Selectați serverul dumneavoastra"</string>
   <string name="screen_create_account_title">"Creați un cont"</string>
-  <string name="screen_login_error_deactivated_account">"Acest cont a fost dezactivat."</string>
+  <string name="screen_login_error_deactivated_account">"Acest cont a fost șters."</string>
   <string name="screen_login_error_invalid_credentials">"Utilizator și/sau parolă incorecte"</string>
   <string name="screen_login_error_invalid_user_id">"Acesta nu este un identificator de utilizator valid. Format așteptat: „@user:homeserver.org”"</string>
   <string name="screen_login_error_refresh_tokens">"Acest server este configurat pentru a utiliza token-uri de reîmprospătare. Acestea nu sunt acceptate atunci când utilizați autentificare bazată pe parolă."</string>
-  <string name="screen_login_error_unsupported_authentication">"Homeserver-ul selectat nu acceptă autentificarea prin parola sau OIDC. Te rugăm să contactezi administratorul sau să alegi un alt homeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"Homeserver-ul selectat nu acceptă autentificarea prin parola sau OAuth. Te rugăm să contactezi administratorul sau să alegi un alt homeserver."</string>
   <string name="screen_login_form_header">"Introduceți detaliile"</string>
   <string name="screen_login_subtitle">"Matrix este o rețea deschisă pentru o comunicare sigură și descentralizată."</string>
   <string name="screen_login_title">"Bine ați revenit!"</string>
   <string name="screen_login_title_with_homeserver">"Conectați-vă la %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Deschideți Element Clasic"</string>
+  <string name="screen_missing_key_backup_step_1">"Deschideți Element Classic pe dispozitivul dumneavoastră"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Accesați Setări &gt; Securitate și confidențialitate"</string>
+  <string name="screen_missing_key_backup_step_3_android">"În Gestionarea cheilor criptografice, selectați Recuperarea mesajelor criptate"</string>
+  <string name="screen_missing_key_backup_step_4">"Urmați instrucțiunile pentru a activa stocarea cheilor"</string>
+  <string name="screen_missing_key_backup_step_5">"Reveniți la %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Activați stocarea cheilor înainte de a continua către %1$s"</string>
   <string name="screen_onboarding_app_version">"Versiunea %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Se verifică contul…"</string>
   <string name="screen_onboarding_sign_in_manually">"Conectați-vă manual"</string>
   <string name="screen_onboarding_sign_in_to">"Conectați-vă la %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Conectați-vă cu un cod QR"</string>
   <string name="screen_onboarding_sign_up">"Creați un cont"</string>
+  <string name="screen_onboarding_welcome_back">"Bine ați revenit"</string>
   <string name="screen_onboarding_welcome_message">"Bine ați venit la cel mai rapid %1$s din toate timpurile. Supraalimentat pentru viteză și simplitate."</string>
   <string name="screen_onboarding_welcome_subtitle">"Bun venit în %1$s. Supraalimentat, pentru viteză și simplitate."</string>
   <string name="screen_onboarding_welcome_title">"Fii în Elementul tău"</string>
@@ -60,6 +69,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Cererea de autentificare a fost anulată"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Autentificarea a fost refuzată pe celălalt dispozitiv."</string>
   <string name="screen_qr_code_login_error_declined_title">"Autentificarea a fost refuzată"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Nu trebuie să faceți nimic altceva."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Celălalt dispozitiv este deja conectat"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Autentificarea a expirat. Vă rugăm să încercați din nou."</string>
   <string name="screen_qr_code_login_error_expired_title">"Autentificarea nu a fost finalizată la timp"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Celălalt dispozitiv nu acceptă autentificarea la %s cu un cod QR.
diff --git a/features/login/impl/src/main/res/values-ru/translations.xml b/features/login/impl/src/main/res/values-ru/translations.xml
index b967224f2e..5afbe1f513 100644
--- a/features/login/impl/src/main/res/values-ru/translations.xml
+++ b/features/login/impl/src/main/res/values-ru/translations.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"Какой адрес у вашего сервера?"</string>
   <string name="screen_change_server_title">"Выберите свой сервер"</string>
   <string name="screen_create_account_title">"Создать аккаунт"</string>
-  <string name="screen_login_error_deactivated_account">"Данная учётная запись была отключена."</string>
+  <string name="screen_login_error_deactivated_account">"Эта учетная запись была удалена."</string>
   <string name="screen_login_error_invalid_credentials">"Неверное имя пользователя и/или пароль"</string>
   <string name="screen_login_error_invalid_user_id">"Это некорректный идентификатор пользователя. Правильный формат: @user:homeserver.org"</string>
   <string name="screen_login_error_refresh_tokens">"Этот сервер настроен на использование токенов обновления. Они не поддерживаются при использовании входа на основе пароля."</string>
-  <string name="screen_login_error_unsupported_authentication">"Выбранный сервер не поддерживает вход по паролю и OIDC. Пожалуйста, свяжитесь с администратором или выберите другой сервер."</string>
+  <string name="screen_login_error_unsupported_authentication">"Выбранный сервер не поддерживает вход по паролю и OAuth. Пожалуйста, свяжитесь с администратором или выберите другой сервер."</string>
   <string name="screen_login_form_header">"Введите свои данные"</string>
   <string name="screen_login_subtitle">"Matrix — это открытая сеть для безопасной децентрализованной связи."</string>
-  <string name="screen_login_title">"Рады видеть вас снова!"</string>
+  <string name="screen_login_title">"Рады видеть Вас снова!"</string>
   <string name="screen_login_title_with_homeserver">"Войти в %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Открыть Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Откройте Element Classic на своем устройстве."</string>
+  <string name="screen_missing_key_backup_step_2_android">"Перейдите в Настройки &gt; Безопасность и конфиденциальность"</string>
+  <string name="screen_missing_key_backup_step_3_android">"В разделе «Управление криптографическими ключами» выбери «Восстановление зашифрованных сообщений»"</string>
+  <string name="screen_missing_key_backup_step_4">"Следуйте инструкциям, чтобы активировать хранилище ключей"</string>
+  <string name="screen_missing_key_backup_step_5">"Вернитесь к %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Перед продолжением активируйте хранилище ключей %1$s"</string>
   <string name="screen_onboarding_app_version">"Версия %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Проверка аккаунта"</string>
   <string name="screen_onboarding_sign_in_manually">"Войти"</string>
   <string name="screen_onboarding_sign_in_to">"Войти в %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Войти с QR-кодом"</string>
   <string name="screen_onboarding_sign_up">"Создать аккаунт"</string>
+  <string name="screen_onboarding_welcome_back">"С возвращением"</string>
   <string name="screen_onboarding_welcome_message">"Добро пожаловать в быстрый и простой %1$s."</string>
   <string name="screen_onboarding_welcome_subtitle">"Добро пожаловать в быстрый и простой %1$s."</string>
   <string name="screen_onboarding_welcome_title">"Элементарно."</string>
@@ -60,9 +69,9 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Запрос на вход отменен"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Вход в систему был отклонен на другом устройстве."</string>
   <string name="screen_qr_code_login_error_declined_title">"Вход отклонен"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"На этом все."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"На этом всё."</string>
   <string name="screen_qr_code_login_error_device_already_signed_in_title">"Вход уже выполнен на другом устройстве"</string>
-  <string name="screen_qr_code_login_error_expired_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Срок действия входа истек. Пожалуйста, попробуйте ещё раз."</string>
   <string name="screen_qr_code_login_error_expired_title">"Вход в систему не был выполнен вовремя"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Другое устройство не поддерживает вход в %s с помощью QR-кода.
 
@@ -86,7 +95,7 @@
   <string name="screen_qr_code_login_no_camera_permission_state_title">"Разрешите доступ к камере для сканирования QR-кода"</string>
   <string name="screen_qr_code_login_scanning_state_title">"Сканировать QR-код"</string>
   <string name="screen_qr_code_login_start_over_button">"Начать заново"</string>
-  <string name="screen_qr_code_login_unknown_error_description">"Произошла непредвиденная ошибка. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_qr_code_login_unknown_error_description">"Произошла непредвиденная ошибка. Пожалуйста, попробуйте ещё раз."</string>
   <string name="screen_qr_code_login_verify_code_loading">"Ожидание другого устройства"</string>
   <string name="screen_qr_code_login_verify_code_subtitle">"Сервер для аккаунта может запросить следующий код для подтверждения входа."</string>
   <string name="screen_qr_code_login_verify_code_title">"Ваш код подтверждения"</string>
diff --git a/features/login/impl/src/main/res/values-sk/translations.xml b/features/login/impl/src/main/res/values-sk/translations.xml
index 9bd494dd56..b2c3077de2 100644
--- a/features/login/impl/src/main/res/values-sk/translations.xml
+++ b/features/login/impl/src/main/res/values-sk/translations.xml
@@ -32,7 +32,7 @@
   <string name="screen_login_error_invalid_credentials">"Nesprávne používateľské meno a/alebo heslo"</string>
   <string name="screen_login_error_invalid_user_id">"Toto nie je platný identifikátor používateľa. Očakávaný formát: \'@pouzivatel:homeserver.sk\'"</string>
   <string name="screen_login_error_refresh_tokens">"Tento server je nakonfigurovaný tak, aby používal obnovovacie tokeny. Pri prihlasovaní na základe hesla nie sú podporované."</string>
-  <string name="screen_login_error_unsupported_authentication">"Vybraný domovský server nepodporuje prihlásenie pomocou hesla alebo OIDC. Obráťte sa na správcu alebo vyberte iný domovský server."</string>
+  <string name="screen_login_error_unsupported_authentication">"Vybraný domovský server nepodporuje prihlásenie pomocou hesla alebo OAuth. Obráťte sa na správcu alebo vyberte iný domovský server."</string>
   <string name="screen_login_form_header">"Zadajte svoje údaje"</string>
   <string name="screen_login_subtitle">"Matrix je otvorená sieť pre bezpečnú a decentralizovanú komunikáciu."</string>
   <string name="screen_login_title">"Vitajte späť!"</string>
diff --git a/features/login/impl/src/main/res/values-sv/translations.xml b/features/login/impl/src/main/res/values-sv/translations.xml
index 33fb76b5bd..396f2025b7 100644
--- a/features/login/impl/src/main/res/values-sv/translations.xml
+++ b/features/login/impl/src/main/res/values-sv/translations.xml
@@ -32,7 +32,7 @@
   <string name="screen_login_error_invalid_credentials">"Felaktigt användarnamn och/eller lösenord"</string>
   <string name="screen_login_error_invalid_user_id">"Detta är inte en giltig användaridentifierare. Förväntat format: \'@användare:hemserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Den här servern är konfigurerad för att använda uppdateringstokens. Dessa stöds inte när du använder lösenordsbaserad inloggning."</string>
-  <string name="screen_login_error_unsupported_authentication">"Den valda hemservern stöder inte lösenord eller OIDC-inloggning. Kontakta administratören eller välj en annan hemserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"Den valda hemservern stöder inte lösenord eller OAuth-inloggning. Kontakta administratören eller välj en annan hemserver."</string>
   <string name="screen_login_form_header">"Ange dina uppgifter"</string>
   <string name="screen_login_subtitle">"Matrix är ett öppet nätverk för säker, decentraliserad kommunikation."</string>
   <string name="screen_login_title">"Välkommen tillbaka!"</string>
diff --git a/features/login/impl/src/main/res/values-tr/translations.xml b/features/login/impl/src/main/res/values-tr/translations.xml
index 1574fca3a8..05bb9bab15 100644
--- a/features/login/impl/src/main/res/values-tr/translations.xml
+++ b/features/login/impl/src/main/res/values-tr/translations.xml
@@ -28,7 +28,7 @@
   <string name="screen_login_error_invalid_credentials">"Yanlış kullanıcı adı ve/veya şifre"</string>
   <string name="screen_login_error_invalid_user_id">"Bu geçerli bir kullanıcı tanımlayıcısı değil. Kullanılması gereken biçim: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Bu sunucu, yenileme belirteçlerini kullanacak şekilde yapılandırılmıştır. Parola tabanlı oturum açma kullanılırken bunlar desteklenmez."</string>
-  <string name="screen_login_error_unsupported_authentication">"Seçilen ana sunucu parola veya OIDC oturum açmayı desteklemiyor. Lütfen yöneticinizle iletişime geçin veya başka bir ana sunucu seçin."</string>
+  <string name="screen_login_error_unsupported_authentication">"Seçilen ana sunucu parola veya OAuth oturum açmayı desteklemiyor. Lütfen yöneticinizle iletişime geçin veya başka bir ana sunucu seçin."</string>
   <string name="screen_login_form_header">"Bilgilerinizi girin"</string>
   <string name="screen_login_subtitle">"Matrix, güvenli, merkezi olmayan iletişim için açık bir ağdır."</string>
   <string name="screen_login_title">"Tekrar hoş geldiniz!"</string>
diff --git a/features/login/impl/src/main/res/values-uk/translations.xml b/features/login/impl/src/main/res/values-uk/translations.xml
index b93a66fed2..60959c80d4 100644
--- a/features/login/impl/src/main/res/values-uk/translations.xml
+++ b/features/login/impl/src/main/res/values-uk/translations.xml
@@ -28,23 +28,32 @@
   <string name="screen_change_server_subtitle">"Яка адреса вашого сервера?"</string>
   <string name="screen_change_server_title">"Виберіть свій сервер"</string>
   <string name="screen_create_account_title">"Створити обліковий запис"</string>
-  <string name="screen_login_error_deactivated_account">"Цей обліковий запис було деактивовано."</string>
+  <string name="screen_login_error_deactivated_account">"Цей обліковий запис було видалено."</string>
   <string name="screen_login_error_invalid_credentials">"Неправильне ім\'я користувача та/або пароль"</string>
   <string name="screen_login_error_invalid_user_id">"Це недійсний ідентифікатор користувача. Очікуваний формат: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Цей сервер налаштований на використання оновлюваних токенів. Вони не підтримуються, якщо використовується вхід за допомогою основі пароля."</string>
-  <string name="screen_login_error_unsupported_authentication">"Обраний домашній сервер не підтримує вхід за допомогою пароля або OIDC. Зверніться до адміністратора або виберіть інший домашній сервер."</string>
+  <string name="screen_login_error_unsupported_authentication">"Обраний домашній сервер не підтримує вхід за допомогою пароля або OAuth. Зверніться до адміністратора або виберіть інший домашній сервер."</string>
   <string name="screen_login_form_header">"Введіть свої дані"</string>
   <string name="screen_login_subtitle">"Matrix — це відкрита мережа для безпечної, децентралізованої комунікації."</string>
   <string name="screen_login_title">"З поверненням!"</string>
   <string name="screen_login_title_with_homeserver">"Увійти в %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Відкрити Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Відкрийте Element Classic на своєму пристрої"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Перейдіть до «Налаштування» &gt; «Безпека та конфіденційність»"</string>
+  <string name="screen_missing_key_backup_step_3_android">"У розділі «Управління криптографічними ключами» виберіть «Відновлення зашифрованих повідомлень»"</string>
+  <string name="screen_missing_key_backup_step_4">"Дотримуйтесь інструкцій, щоб увімкнути сховище ключів"</string>
+  <string name="screen_missing_key_backup_step_5">"Повернутися до %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Увімкніть сховище ключів, перш ніж переходити до %1$s"</string>
   <string name="screen_onboarding_app_version">"Версія %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Перевірка облікового запису"</string>
   <string name="screen_onboarding_sign_in_manually">"Увійти вручну"</string>
   <string name="screen_onboarding_sign_in_to">"Увійти в %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Увійти за допомогою QR-коду"</string>
   <string name="screen_onboarding_sign_up">"Створити обліковий запис"</string>
-  <string name="screen_onboarding_welcome_message">"Ласкаво просимо до найшвидшого %1$s. Заряджений для швидкості та простоти."</string>
-  <string name="screen_onboarding_welcome_subtitle">"Ласкаво просимо до %1$s. Заряджений, для швидкості та простоти."</string>
-  <string name="screen_onboarding_welcome_title">"Будьте у своєму element"</string>
+  <string name="screen_onboarding_welcome_back">"З поверненням!"</string>
+  <string name="screen_onboarding_welcome_message">"Вітаємо в %1$s. Сфокусованому на швидкості та простоті."</string>
+  <string name="screen_onboarding_welcome_subtitle">"Вітаємо у %1$s. Сфокусованому на швидкості та простоті."</string>
+  <string name="screen_onboarding_welcome_title">"Спілкуйтесь елементарно"</string>
   <string name="screen_qr_code_login_connecting_subtitle">"Встановлення безпечного з\'єднання"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_description">"Не вдалося встановити безпечне з\'єднання з новим пристроєм. Ваші наявні пристрої досі в безпеці, і вам не потрібно про них турбуватися."</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Що тепер?"</string>
diff --git a/features/login/impl/src/main/res/values-ur/translations.xml b/features/login/impl/src/main/res/values-ur/translations.xml
index 334d5b6ea6..6762ab16af 100644
--- a/features/login/impl/src/main/res/values-ur/translations.xml
+++ b/features/login/impl/src/main/res/values-ur/translations.xml
@@ -24,7 +24,7 @@
   <string name="screen_login_error_invalid_credentials">"غلط صارف نام اور/یا لفظ عبور"</string>
   <string name="screen_login_error_invalid_user_id">"یہ صالح صارف شناسه نہیں ہے۔ متوقع شکل: @صارف:منزلی خادم"</string>
   <string name="screen_login_error_refresh_tokens">"یہ خادم تازگی کی رموزِ ممیز استعمال کرنے کے لئے تشکیل دیا گیا ہے۔ لفظ عبور پر مبنی دخول استعمال کرتے ہوئے ان کی حمایت نہیں کی جاتی۔"</string>
-  <string name="screen_login_error_unsupported_authentication">"منتخب منزلی خادم کلمۂ عبوری یا OIDC دخول کا تعاون نہیں کرتا۔ برائے مہربانی اپنے منتظم سے رابطہ کریں یا کوئی اور منزلی خادم چنیں۔"</string>
+  <string name="screen_login_error_unsupported_authentication">"منتخب منزلی خادم کلمۂ عبوری یا OAuth دخول کا تعاون نہیں کرتا۔ برائے مہربانی اپنے منتظم سے رابطہ کریں یا کوئی اور منزلی خادم چنیں۔"</string>
   <string name="screen_login_form_header">"اپنی تفصیلات درج کریں"</string>
   <string name="screen_login_subtitle">"میٹرکس محفوظ، غیر مرکزی مواصلت کے لئے ایک کھلا شبکہ ہے۔"</string>
   <string name="screen_login_title">"واپس خوش آمدید!"</string>
diff --git a/features/login/impl/src/main/res/values-uz/translations.xml b/features/login/impl/src/main/res/values-uz/translations.xml
index 54a1cf11cc..546397935b 100644
--- a/features/login/impl/src/main/res/values-uz/translations.xml
+++ b/features/login/impl/src/main/res/values-uz/translations.xml
@@ -31,16 +31,25 @@
   <string name="screen_login_error_invalid_credentials">"Notog\'ri foydalanuvchi nomi va/yoki parol"</string>
   <string name="screen_login_error_invalid_user_id">"Bu haqiqiy foydalanuvchi identifikatori emas. Kutilayotgan format: \'@user:homeserver.org\'"</string>
   <string name="screen_login_error_refresh_tokens">"Ushbu server yangilash tokenlaridan foydalanishga moslashtirilgan. Parolga asoslangan tizimga kirishda bunday tokenlar qoʻllab-quvvatlanmaydi."</string>
-  <string name="screen_login_error_unsupported_authentication">"Tanlangan uy serveri parol yoki OIDC loginni qo\'lab-quvvatlamaydi. Iltimos, administratoringizga murojaat qiling yoki boshqa uy serverini tanlang."</string>
+  <string name="screen_login_error_unsupported_authentication">"Tanlangan uy serveri parol yoki OAuth loginni qo\'lab-quvvatlamaydi. Iltimos, administratoringizga murojaat qiling yoki boshqa uy serverini tanlang."</string>
   <string name="screen_login_form_header">"Tafsilotlaringizni kiriting"</string>
   <string name="screen_login_subtitle">"Matrix xavfsiz, markazlashmagan aloqa uchun ochiq tarmoqdir."</string>
   <string name="screen_login_title">"Qaytib kelganingizdan xursandmiz!"</string>
   <string name="screen_login_title_with_homeserver">"Kirish%1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Element Classic ilovasini ochish"</string>
+  <string name="screen_missing_key_backup_step_1">"Element Classic ilovasini qurilmada oching"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Sozlamalar &gt; Xavfsizlik va maxfiylik bo‘limiga kiring"</string>
+  <string name="screen_missing_key_backup_step_3_android">"Kriptografiya kalitlarini boshqarishda Shifrlangan xabarlarni tiklash bandini tanlang"</string>
+  <string name="screen_missing_key_backup_step_4">"Kalit xotirasini yoqish uchun ko‘rsatmalarga amal qiling"</string>
+  <string name="screen_missing_key_backup_step_5">"%1$sga qaytish"</string>
+  <string name="screen_missing_key_backup_title">"%1$s xizmatiga o‘tishdan oldin kalit xotirasini yoqing"</string>
   <string name="screen_onboarding_app_version">"%1$s versiya"</string>
+  <string name="screen_onboarding_checking_account">"Joriy hisob"</string>
   <string name="screen_onboarding_sign_in_manually">"Qo\'lda tizimga kiring"</string>
   <string name="screen_onboarding_sign_in_to">"Kirish%1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"QR kod bilan tizimga kiring"</string>
   <string name="screen_onboarding_sign_up">"Hisob yaratish"</string>
+  <string name="screen_onboarding_welcome_back">"Xush kelibsiz."</string>
   <string name="screen_onboarding_welcome_message">"Eng tezkor %1$sga xush kelibsiz. Tezlik va oddiylik uchun super zaryadlangan."</string>
   <string name="screen_onboarding_welcome_subtitle">"%1$sga Xush kelibsiz. Tezlik va oddiylik uchun o\'ta zaryadlangan."</string>
   <string name="screen_onboarding_welcome_title">"Elementingizda bo\'ling"</string>
@@ -59,6 +68,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"Tizimga kirish soʻrovi bekor qilindi"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"Boshqa qurilmadan hisobga kirish bekor qilindi."</string>
   <string name="screen_qr_code_login_error_declined_title">"Tizimga kirish rad etildi"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"Boshqa hech narsa qilishingiz shart emas."</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"Boshqa qurilmangiz allaqachon tizimga kirgan"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"Kirish muddati tugagan. Iltimos, qayta urinib koʻring."</string>
   <string name="screen_qr_code_login_error_expired_title">"Kirish oʻz vaqtida tugallanmagan"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Boshqa qurilmangiz %s hisobiga QR kod orqali kirishni qoʻllab-quvvatlamaydi.
diff --git a/features/login/impl/src/main/res/values-vi/translations.xml b/features/login/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..1536b7e499
--- /dev/null
+++ b/features/login/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"Thay đổi nhà cung cấp tài khoản"</string>
+  <string name="screen_account_provider_form_hint">"Địa chỉ Homeserver"</string>
+  <string name="screen_account_provider_form_notice">"Nhập từ khóa tìm kiếm hoặc địa chỉ tên miền."</string>
+  <string name="screen_account_provider_form_subtitle">"Tìm kiếm công ty, cộng đồng hoặc máy chủ riêng."</string>
+  <string name="screen_account_provider_form_title">"Tìm nhà cung cấp tài khoản"</string>
+  <string name="screen_account_provider_signin_subtitle">"Đây là nơi các cuộc trò chuyện của bạn sẽ được lưu — giống như bạn dùng nhà cung cấp email để giữ email của mình."</string>
+  <string name="screen_account_provider_signin_title">"Bạn sắp đăng nhập vào %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"Đây là nơi các cuộc trò chuyện của bạn sẽ được lưu — giống như bạn dùng nhà cung cấp email để giữ email của mình."</string>
+  <string name="screen_account_provider_signup_title">"Bạn sắp tạo tài khoản trên %s"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org là một máy chủ lớn, miễn phí trên mạng Matrix công cộng, cung cấp liên lạc an toàn và phi tập trung, được điều hành bởi Quỹ Matrix.org."</string>
+  <string name="screen_change_account_provider_other">"Khác"</string>
+  <string name="screen_change_account_provider_subtitle">"Sử dụng nhà cung cấp tài khoản khác, ví dụ như máy chủ riêng của bạn hoặc tài khoản công việc."</string>
+  <string name="screen_change_account_provider_title">"Thay đổi nhà cung cấp tài khoản"</string>
+  <string name="screen_change_server_error_element_pro_required_action_android">"Google Play"</string>
+  <string name="screen_change_server_error_element_pro_required_message">"Ứng dụng Element Pro là bắt buộc trên %1$s. Vui lòng tải xuống từ cửa hàng."</string>
+  <string name="screen_change_server_error_element_pro_required_title">"Element Pro là bắt buộc"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"Chúng tớ không thể kết nối với homeserver này. Vui lòng kiểm tra xem cậu đã nhập URL homeserver chính xác chưa. Nếu URL chính xác, hãy liên hệ với quản trị viên homeserver để được hỗ trợ thêm."</string>
+  <string name="screen_change_server_error_invalid_well_known">"Máy chủ không khả dụng do sự cố trong tệp .well-known:
+%1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Nhà cung cấp tài khoản đã chọn không hỗ trợ đồng bộ sliding. Cần nâng cấp máy chủ để sử dụng %1$s ."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s không được phép kết nối với %2$s ."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"Ứng dụng này đã được cấu hình để cho phép: %1$s ."</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"Không cho phép nhà cung cấp tài khoản %1$s."</string>
+  <string name="screen_change_server_form_header">"URL homeserver"</string>
+  <string name="screen_change_server_subtitle">"Địa chỉ máy chủ của bạn là gì?"</string>
+  <string name="screen_change_server_title">"Chọn máy chủ của bạn"</string>
+  <string name="screen_create_account_title">"Tạo tài khoản"</string>
+  <string name="screen_login_error_deactivated_account">"Tài khoản này đã bị xóa."</string>
+  <string name="screen_login_error_invalid_credentials">"Tên người dùng và/hoặc mật khẩu không chính xác"</string>
+  <string name="screen_login_error_invalid_user_id">"Đây không phải là mã nhận dạng người dùng hợp lệ. Định dạng mong đợi: ‘@user:homeserver.org’"</string>
+  <string name="screen_login_error_refresh_tokens">"Máy chủ này được cấu hình sử dụng refresh token. Điều này không được hỗ trợ khi đăng nhập bằng mật khẩu."</string>
+  <string name="screen_login_error_unsupported_authentication">"Homeserver đã chọn không hỗ trợ đăng nhập bằng mật khẩu hoặc OAuth. Vui lòng liên hệ với quản trị viên của cậu hoặc chọn một homeserver khác."</string>
+  <string name="screen_login_form_header">"Nhập thông tin chi tiết của bạn."</string>
+  <string name="screen_login_subtitle">"Matrix là một mạng mở cho việc liên lạc an toàn và phi tập trung."</string>
+  <string name="screen_login_title">"Chào mừng bạn quay trở lại!"</string>
+  <string name="screen_login_title_with_homeserver">"Đăng nhập vào %1$s"</string>
+  <string name="screen_onboarding_sign_in_manually">"Đăng nhập thủ công"</string>
+  <string name="screen_onboarding_sign_in_to">"Đăng nhập vào %1$s"</string>
+  <string name="screen_onboarding_sign_in_with_qr_code">"Đăng nhập bằng mã QR"</string>
+  <string name="screen_onboarding_sign_up">"Tạo tài khoản"</string>
+  <string name="screen_onboarding_welcome_message">"Chào mừng đến với %1$s nhanh nhất từ trước đến nay. Tối ưu cho tốc độ và sự đơn giản."</string>
+  <string name="screen_onboarding_welcome_subtitle">"Chào mừng đến với %1$s. Tối ưu hóa cho tốc độ và sự đơn giản."</string>
+  <string name="screen_onboarding_welcome_title">"Hãy ở trong thế mạnh (element) của mình"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Thử lại"</string>
+  <string name="screen_qr_code_login_start_over_button">"Bắt đầu lại"</string>
+  <string name="screen_server_confirmation_change_server">"Thay đổi nhà cung cấp tài khoản"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Máy chủ riêng dành cho nhân viên của Element."</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix là một mạng mở cho việc liên lạc an toàn và phi tập trung."</string>
+  <string name="screen_server_confirmation_message_register">"Đây là nơi các cuộc trò chuyện của bạn sẽ được lưu — giống như bạn dùng nhà cung cấp email để giữ email của mình."</string>
+  <string name="screen_server_confirmation_title_login">"Bạn sắp đăng nhập vào %1$s"</string>
+  <string name="screen_server_confirmation_title_register">"Bạn sắp tạo tài khoản trên %1$s"</string>
+</resources>
diff --git a/features/login/impl/src/main/res/values-zh-rTW/translations.xml b/features/login/impl/src/main/res/values-zh-rTW/translations.xml
index 1b0b94d7a6..c4d16f5928 100644
--- a/features/login/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/login/impl/src/main/res/values-zh-rTW/translations.xml
@@ -32,16 +32,25 @@
   <string name="screen_login_error_invalid_credentials">"不正確的使用者名稱或密碼"</string>
   <string name="screen_login_error_invalid_user_id">"此非有效的使用者識別字串。預期的格式：‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"此伺服器已設定為使用重新整理權杖。使用以密碼為基礎的登入方式時，不支援這些功能。"</string>
-  <string name="screen_login_error_unsupported_authentication">"選定的家伺服器不支援密碼或 OIDC 登入。請聯絡您的管理員或選擇其他家伺服器。"</string>
+  <string name="screen_login_error_unsupported_authentication">"選定的家伺服器不支援密碼或 OAuth 登入。請聯絡您的管理員或選擇其他家伺服器。"</string>
   <string name="screen_login_form_header">"輸入您的詳細資料"</string>
   <string name="screen_login_subtitle">"Matrix 是一個開放網路，為了安全且去中心化的通訊而生。"</string>
   <string name="screen_login_title">"歡迎回來！"</string>
   <string name="screen_login_title_with_homeserver">"登入 %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"開啟 Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"在您的裝置上開啟 Element Classic"</string>
+  <string name="screen_missing_key_backup_step_2_android">"前往「設定」→「安全性與隱私權」"</string>
+  <string name="screen_missing_key_backup_step_3_android">"在密碼學金鑰管理中，選取加密訊息還原"</string>
+  <string name="screen_missing_key_backup_step_4">"按照說明啟用您的金鑰儲存空間"</string>
+  <string name="screen_missing_key_backup_step_5">"回到 %1$s"</string>
+  <string name="screen_missing_key_backup_title">"請先啟用您的金鑰儲存空間，然後再繼續 %1$s"</string>
   <string name="screen_onboarding_app_version">"版本 %1$s"</string>
+  <string name="screen_onboarding_checking_account">"檢查帳號"</string>
   <string name="screen_onboarding_sign_in_manually">"手動登入"</string>
   <string name="screen_onboarding_sign_in_to">"登入 %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"使用 QR code 登入"</string>
   <string name="screen_onboarding_sign_up">"建立帳號"</string>
+  <string name="screen_onboarding_welcome_back">"歡迎回來"</string>
   <string name="screen_onboarding_welcome_message">"歡迎使用有史以來最快的 %1$s。速度超快，操作簡便。"</string>
   <string name="screen_onboarding_welcome_subtitle">"歡迎使用 %1$s。速度超快且簡單。"</string>
   <string name="screen_onboarding_welcome_title">"Be in your element"</string>
@@ -60,6 +69,8 @@
   <string name="screen_qr_code_login_error_cancelled_title">"已取消登入請求"</string>
   <string name="screen_qr_code_login_error_declined_subtitle">"其他裝置拒絕登入。"</string>
   <string name="screen_qr_code_login_error_declined_title">"已拒絕登入"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"您不需要進行其他操作。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"您的其他裝置已登入"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"登入已過期。請再試一次。"</string>
   <string name="screen_qr_code_login_error_expired_title">"未及時完成登入"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"您的其他裝置不支援使用 QR cpde 登入 %s。
diff --git a/features/login/impl/src/main/res/values-zh/translations.xml b/features/login/impl/src/main/res/values-zh/translations.xml
index fd8105b71e..16afe7d5bd 100644
--- a/features/login/impl/src/main/res/values-zh/translations.xml
+++ b/features/login/impl/src/main/res/values-zh/translations.xml
@@ -1,100 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_account_provider_change">"更改账户提供方"</string>
-  <string name="screen_account_provider_form_hint">"服务器地址"</string>
+  <string name="screen_account_provider_change">"更改账户提供者"</string>
+  <string name="screen_account_provider_form_hint">"主服务器地址"</string>
   <string name="screen_account_provider_form_notice">"输入搜索词或域名地址。"</string>
   <string name="screen_account_provider_form_subtitle">"搜索公司、社区或私人服务器。"</string>
-  <string name="screen_account_provider_form_title">"寻找账户提供方"</string>
-  <string name="screen_account_provider_signin_subtitle">"这是您的对话将存在的地方，就像您使用电子邮件提供方来保存电子邮件一样。"</string>
-  <string name="screen_account_provider_signin_title">"您即将登录 %s"</string>
-  <string name="screen_account_provider_signup_subtitle">"这是您的对话将存在的地方，就像您使用电子邮件提供方来保存电子邮件一样。"</string>
-  <string name="screen_account_provider_signup_title">"您即将在 %s 上创建一个帐户"</string>
+  <string name="screen_account_provider_form_title">"查找账户提供者"</string>
+  <string name="screen_account_provider_signin_subtitle">"这是你的对话将存在的地方，就像你使用邮件提供者来存储电子邮件那样。"</string>
+  <string name="screen_account_provider_signin_title">"你即将登录到 %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"这是你的对话将存在的地方，就像你使用邮件提供者来存储电子邮件那样。"</string>
+  <string name="screen_account_provider_signup_title">"你即将在 %s 上创建账户"</string>
   <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org 由 Matrix.org 基金会运营，是用于安全、去中心化的通信的公共 Matrix 网络上的大型免费服务器。"</string>
-  <string name="screen_change_account_provider_other">"其他"</string>
-  <string name="screen_change_account_provider_subtitle">"使用其他账户提供商，例如您自己的私人服务器或工作账户。"</string>
-  <string name="screen_change_account_provider_title">"更改账户提供方"</string>
+  <string name="screen_change_account_provider_other">"其它"</string>
+  <string name="screen_change_account_provider_subtitle">"使用其它账户提供者，例如你自己的私有服务器或工作账户。"</string>
+  <string name="screen_change_account_provider_title">"更改账户提供者"</string>
   <string name="screen_change_server_error_element_pro_required_action_android">"Google Play"</string>
-  <string name="screen_change_server_error_element_pro_required_message">"%1$s 需要 Element Pro 应用。请从应用商店下载。"</string>
-  <string name="screen_change_server_error_element_pro_required_title">"需要 Element Pro 版"</string>
-  <string name="screen_change_server_error_invalid_homeserver">"我们无法访问此服务器。请检查您输入的服务器网址是否正确。如果 URL 正确，请联系您的服务器管理员寻求进一步帮助。"</string>
-  <string name="screen_change_server_error_invalid_well_known">"由于 .well-known 文件中存在问题，服务器不可用：
+  <string name="screen_change_server_error_element_pro_required_message">"%1$s 要求 Element Pro。请从应用商店下载。"</string>
+  <string name="screen_change_server_error_element_pro_required_title">"需要 Element Pro"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"我们无法访问此服务器。请检查输入的服务器 URL 是否正确。如果 URL 正确，请联系服务器管理员寻求进一步帮助。"</string>
+  <string name="screen_change_server_error_invalid_well_known">"由于 .well-known 文件存在问题，服务器不可用：
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"所选账户提供商不支持跨屏同步。需要升级服务器才能使用%1$s。"</string>
-  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s不允许连接到%2$s。"</string>
-  <string name="screen_change_server_error_unauthorized_homeserver_content">"本应用已配置为允许访问：%1$s 。"</string>
-  <string name="screen_change_server_error_unauthorized_homeserver_title">"账户提供商%1$s 不被允许。"</string>
-  <string name="screen_change_server_form_header">"服务器网址"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"所选账户提供者不支持滑动同步。需要升级服务器才能使用 %1$s。"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver">"%1$s 不允许连接到 %2$s。"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_content">"此 app 已配置为允许访问：%1$s。"</string>
+  <string name="screen_change_server_error_unauthorized_homeserver_title">"账户提供者 %1$s 不被允许。"</string>
+  <string name="screen_change_server_form_header">"主服务器 URL"</string>
   <string name="screen_change_server_form_notice">"输入域名地址。"</string>
-  <string name="screen_change_server_subtitle">"您的服务器地址是什么？"</string>
+  <string name="screen_change_server_subtitle">"你的服务器地址是什么？"</string>
   <string name="screen_change_server_title">"选择服务器"</string>
   <string name="screen_create_account_title">"创建账户"</string>
-  <string name="screen_login_error_deactivated_account">"该账户已被停用。"</string>
-  <string name="screen_login_error_invalid_credentials">"错误的用户名和/或密码"</string>
-  <string name="screen_login_error_invalid_user_id">"这不是合法的用户 ID。期望格式：‘@user:homeserver.org’。"</string>
+  <string name="screen_login_error_deactivated_account">"此账户已被删除。"</string>
+  <string name="screen_login_error_invalid_credentials">"用户名与（或）密码不正确"</string>
+  <string name="screen_login_error_invalid_user_id">"这不是合法的用户 ID。预期格式：“@user:homeserver.org”。"</string>
   <string name="screen_login_error_refresh_tokens">"此服务器使用刷新令牌。使用密码登录时不支持这些功能。"</string>
-  <string name="screen_login_error_unsupported_authentication">"该服务器不支持密码登录和 OIDC 第三方账户登录。请联系服务器管理员，或选择别的服务器。"</string>
-  <string name="screen_login_form_header">"输入您的详细信息"</string>
+  <string name="screen_login_error_unsupported_authentication">"该服务器不支持密码登录与 OAuth 登录。请联系服务器管理员或选择另一服务器。"</string>
+  <string name="screen_login_form_header">"输入详细信息"</string>
   <string name="screen_login_subtitle">"Matrix 是一个用于安全、去中心化通信的开放网络。"</string>
   <string name="screen_login_title">"欢迎回来！"</string>
   <string name="screen_login_title_with_homeserver">"登录到 %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"打开 Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"在你的设备上打开 Element Classic"</string>
+  <string name="screen_missing_key_backup_step_2_android">"前往“设置” &gt; “安全与隐私”"</string>
+  <string name="screen_missing_key_backup_step_3_android">"在加密密钥管理中选择“恢复加密消息”。"</string>
+  <string name="screen_missing_key_backup_step_4">"按指示启用密钥存储"</string>
+  <string name="screen_missing_key_backup_step_5">"返回到 %1$s"</string>
+  <string name="screen_missing_key_backup_title">"请先启用密钥存储再继续处理 %1$s"</string>
   <string name="screen_onboarding_app_version">"版本%1$s"</string>
+  <string name="screen_onboarding_checking_account">"正在检查账户"</string>
   <string name="screen_onboarding_sign_in_manually">"手动登录"</string>
   <string name="screen_onboarding_sign_in_to">"登录到 %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"使用二维码登录"</string>
   <string name="screen_onboarding_sign_up">"创建账户"</string>
-  <string name="screen_onboarding_welcome_message">"欢迎使用 %1$s，快而简约的消息应用。"</string>
+  <string name="screen_onboarding_welcome_back">"欢迎回来"</string>
+  <string name="screen_onboarding_welcome_message">"欢迎使用迄今最快的 %1$s，速度与简洁的极致。"</string>
   <string name="screen_onboarding_welcome_subtitle">"欢迎使用 %1$s，速度与简洁的极致。"</string>
-  <string name="screen_onboarding_welcome_title">"融入您的 Element"</string>
+  <string name="screen_onboarding_welcome_title">"融入 Element"</string>
   <string name="screen_qr_code_login_connecting_subtitle">"建立安全连接"</string>
-  <string name="screen_qr_code_login_connection_note_secure_state_description">"无法与新设备建立安全连接。您现有的设备仍然安全，无需担心。"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"无法与新设备建立安全连接。你的现有设备仍然安全，无需担心。"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_header">"现在怎么办？"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"如果这是网络问题，请尝试使用二维码再次登录"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"如果遇到同样的问题，请尝试使用不同的 WiFi 网络或使用移动数据代替 WiFi"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"如果不起作用，请手动登录"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"连接不安全"</string>
-  <string name="screen_qr_code_login_device_code_subtitle">"您会被要求输入此设备上显示的两位数。"</string>
-  <string name="screen_qr_code_login_device_code_title">"在您的其他设备上输入下面的数字"</string>
-  <string name="screen_qr_code_login_device_not_signed_in_scan_state_description">"在其他设备登录后重试，或使用另一个已登录的设备。"</string>
-  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"其他设备未登录"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"你将被要求输入此设备上显示的两位数字。"</string>
+  <string name="screen_qr_code_login_device_code_title">"在你的其它设备上输入以下数字"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_description">"在其它设备登录后重试，或使用另一个已登录的设备。"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"尚未登录的其它设备"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"登录被另一台设备取消"</string>
   <string name="screen_qr_code_login_error_cancelled_title">"登录请求已取消"</string>
-  <string name="screen_qr_code_login_error_declined_subtitle">"其它设备未接受请求"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"另一设备上的登录请求已被拒绝。"</string>
   <string name="screen_qr_code_login_error_declined_title">"登录被拒绝"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"您无需额外操作。"</string>
-  <string name="screen_qr_code_login_error_device_already_signed_in_title">"您已在另一台设备登录。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_subtitle">"无需额外操作。"</string>
+  <string name="screen_qr_code_login_error_device_already_signed_in_title">"你已在另一设备上登录。"</string>
   <string name="screen_qr_code_login_error_expired_subtitle">"登录已过期. 请重试."</string>
   <string name="screen_qr_code_login_error_expired_title">"登录未及时完成"</string>
   <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"另一个设备不支持使用二维码登录 %s.
 
 尝试手动或使用另一个设备扫描二维码."</string>
-  <string name="screen_qr_code_login_error_linking_not_suported_title">"不支持二维码"</string>
-  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"账户提供方不支持 %1$s."</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_title">"二维码不受支持"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"账户提供者不支持 %1$s."</string>
   <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"不支持 %1$s."</string>
   <string name="screen_qr_code_login_initial_state_button_title">"准备进行扫描"</string>
   <string name="screen_qr_code_login_initial_state_item_1">"在桌面设备上打开 %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_2">"点击你的头像"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"选择 %1$s"</string>
-  <string name="screen_qr_code_login_initial_state_item_3_action">"「连接新设备」"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“关联新设备”"</string>
   <string name="screen_qr_code_login_initial_state_item_4">"使用此设备扫描二维码"</string>
-  <string name="screen_qr_code_login_initial_state_subtitle">"仅在您的账户提供方支持时才可用。"</string>
+  <string name="screen_qr_code_login_initial_state_subtitle">"仅在账户提供者支持时可用。"</string>
   <string name="screen_qr_code_login_initial_state_title">"在另一台设备上打开 %1$s 以获取二维码"</string>
-  <string name="screen_qr_code_login_invalid_scan_state_description">"使用其他设备上显示的二维码。"</string>
-  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"再试一次"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"使用其它设备上显示的二维码。"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"重试"</string>
   <string name="screen_qr_code_login_invalid_scan_state_subtitle">"二维码错误"</string>
   <string name="screen_qr_code_login_no_camera_permission_button">"转到摄像头设置"</string>
-  <string name="screen_qr_code_login_no_camera_permission_state_description">"您需要授予 %1$s 使用设备摄像头的权限才能继续。"</string>
-  <string name="screen_qr_code_login_no_camera_permission_state_title">"允许摄像头权限以扫描 QR 码"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"你需要授予 %1$s 使用设备摄像头的权限才能继续。"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"允许访问摄像头以扫描二维码"</string>
   <string name="screen_qr_code_login_scanning_state_title">"扫描二维码"</string>
   <string name="screen_qr_code_login_start_over_button">"重新开始"</string>
   <string name="screen_qr_code_login_unknown_error_description">"发生了意外错误。请再试一次。"</string>
-  <string name="screen_qr_code_login_verify_code_loading">"等着您的其他设备"</string>
-  <string name="screen_qr_code_login_verify_code_subtitle">"您的账户提供方可能会要求您提供以下代码来验证登录。"</string>
-  <string name="screen_qr_code_login_verify_code_title">"您的验证码"</string>
-  <string name="screen_server_confirmation_change_server">"更改账户提供方"</string>
+  <string name="screen_qr_code_login_verify_code_loading">"正在等待其它设备"</string>
+  <string name="screen_qr_code_login_verify_code_subtitle">"你的账户提供者可能会要求你提供以下代码以验证登录。"</string>
+  <string name="screen_qr_code_login_verify_code_title">"你的验证码"</string>
+  <string name="screen_server_confirmation_change_server">"更改账户提供者"</string>
   <string name="screen_server_confirmation_message_login_element_dot_io">"专为 Element 员工提供的私人服务器。"</string>
   <string name="screen_server_confirmation_message_login_matrix_dot_org">"Matrix 是一个用于安全、去中心化通信的开放网络。"</string>
-  <string name="screen_server_confirmation_message_register">"这是您的对话将存在的地方，就像您使用电子邮件提供方来保存电子邮件一样。"</string>
+  <string name="screen_server_confirmation_message_register">"这是你的对话将存在的地方，就像你使用邮件提供者来存储电子邮件那样。"</string>
   <string name="screen_server_confirmation_title_login">"即将登录 %1$s"</string>
-  <string name="screen_server_confirmation_title_picker_mode">"选择账户提供商"</string>
+  <string name="screen_server_confirmation_title_picker_mode">"选择账户提供者"</string>
   <string name="screen_server_confirmation_title_register">"即将在 %1$s 上创建一个账户"</string>
 </resources>
diff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml
index 832c3b7f71..10fb6ef04a 100644
--- a/features/login/impl/src/main/res/values/localazy.xml
+++ b/features/login/impl/src/main/res/values/localazy.xml
@@ -28,20 +28,29 @@
   <string name="screen_change_server_subtitle">"What is the address of your server?"</string>
   <string name="screen_change_server_title">"Select your server"</string>
   <string name="screen_create_account_title">"Create account"</string>
-  <string name="screen_login_error_deactivated_account">"This account has been deactivated."</string>
+  <string name="screen_login_error_deactivated_account">"This account has been deleted."</string>
   <string name="screen_login_error_invalid_credentials">"Incorrect username and/or password"</string>
   <string name="screen_login_error_invalid_user_id">"This is not a valid user identifier. Expected format: ‘@user:homeserver.org’"</string>
   <string name="screen_login_error_refresh_tokens">"This server is configured to use refresh tokens. These aren\'t supported when using password based login."</string>
-  <string name="screen_login_error_unsupported_authentication">"The selected homeserver doesn\'t support password or OIDC login. Please contact your admin or choose another homeserver."</string>
+  <string name="screen_login_error_unsupported_authentication">"The selected homeserver doesn\'t support password or OAuth login. Please contact your admin or choose another homeserver."</string>
   <string name="screen_login_form_header">"Enter your details"</string>
   <string name="screen_login_subtitle">"Matrix is an open network for secure, decentralised communication."</string>
   <string name="screen_login_title">"Welcome back!"</string>
   <string name="screen_login_title_with_homeserver">"Sign in to %1$s"</string>
+  <string name="screen_missing_key_backup_open_element_classic">"Open Element Classic"</string>
+  <string name="screen_missing_key_backup_step_1">"Open Element Classic on your device"</string>
+  <string name="screen_missing_key_backup_step_2_android">"Go to Settings &gt; Security &amp; Privacy"</string>
+  <string name="screen_missing_key_backup_step_3_android">"In Cryptography keys management, select Encrypted messages recovery"</string>
+  <string name="screen_missing_key_backup_step_4">"Follow the instructions to enable your key storage"</string>
+  <string name="screen_missing_key_backup_step_5">"Come back to %1$s"</string>
+  <string name="screen_missing_key_backup_title">"Enable your key storage before proceeding to %1$s"</string>
   <string name="screen_onboarding_app_version">"Version %1$s"</string>
+  <string name="screen_onboarding_checking_account">"Checking account"</string>
   <string name="screen_onboarding_sign_in_manually">"Sign in manually"</string>
   <string name="screen_onboarding_sign_in_to">"Sign in to %1$s"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Sign in with QR code"</string>
   <string name="screen_onboarding_sign_up">"Create account"</string>
+  <string name="screen_onboarding_welcome_back">"Welcome back"</string>
   <string name="screen_onboarding_welcome_message">"Welcome to the fastest %1$s ever. Supercharged for speed and simplicity."</string>
   <string name="screen_onboarding_welcome_subtitle">"Welcome to %1$s. Supercharged, for speed and simplicity."</string>
   <string name="screen_onboarding_welcome_title">"Be in your element"</string>
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
index 953693b40d..a05194d008 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
@@ -15,7 +15,9 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
-import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
+import io.element.android.features.login.impl.classic.FakeElementClassicConnection
+import io.element.android.features.preferences.test.FakePreferencesEntryPoint
+import io.element.android.libraries.oauth.test.customtab.FakeOAuthActionFlow
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@@ -37,8 +39,10 @@ class DefaultLoginEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 accountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
-                oidcActionFlow = FakeOidcActionFlow(),
+                oAuthActionFlow = FakeOAuthActionFlow(),
                 appCoroutineScope = backgroundScope,
+                elementClassicConnection = FakeElementClassicConnection(),
+                preferencesEntryPoint = FakePreferencesEntryPoint(),
             )
         }
         val callback = object : LoginEntryPoint.Callback {
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolverTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolverTest.kt
index 21b3cca600..feeeb982c4 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolverTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginIntentResolverTest.kt
@@ -8,14 +8,12 @@
 
 package io.element.android.features.login.impl
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.login.api.LoginParams
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultLoginIntentResolverTest {
+class DefaultLoginIntentResolverTest : RobolectricTest() {
     @Test
     fun `nominal case`() {
         val sut = DefaultLoginIntentResolver()
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
index 1fb5d37627..5d9040adac 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
@@ -15,6 +15,7 @@ import io.element.android.features.login.impl.accesscontrol.DefaultAccountProvid
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
 import io.element.android.features.login.impl.error.ChangeServerError
+import io.element.android.features.login.impl.localnetwork.LocalNetworkPermissionGate
 import io.element.android.features.wellknown.test.FakeWellknownRetriever
 import io.element.android.features.wellknown.test.anElementWellKnown
 import io.element.android.libraries.architecture.AsyncData
@@ -23,6 +24,10 @@ import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.auth.aMatrixHomeServerDetails
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionDialog
+import io.element.android.libraries.permissions.test.FakeLocalNetworkPermissionAdvisor
+import io.element.android.libraries.permissions.test.FakePermissionsPresenter
+import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
 import io.element.android.libraries.wellknown.api.ElementWellKnown
 import io.element.android.libraries.wellknown.api.WellknownRetriever
 import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
@@ -43,6 +48,7 @@ class ChangeServerPresenterTest {
         createPresenter().test {
             val initialState = awaitItem()
             assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
+            assertThat(initialState.localNetworkPermissionDialog).isEqualTo(LocalNetworkPermissionDialog.None)
         }
     }
 
@@ -50,7 +56,7 @@ class ChangeServerPresenterTest {
     fun `present - change server ok`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
         createPresenter(
@@ -183,11 +189,81 @@ class ChangeServerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - advisor advises prompt, dialog shown before setHomeserver runs`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = { Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true)) },
+        )
+        createPresenter(
+            authenticationService = authenticationService,
+            enterpriseService = FakeEnterpriseService(isAllowedToConnectToHomeserverResult = { true }),
+            localNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(shouldPrompt = true),
+            permissionsPresenter = FakePermissionsPresenter(),
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.localNetworkPermissionDialog).isEqualTo(LocalNetworkPermissionDialog.None)
+            initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL)))
+            val promptState = expectMostRecentItem()
+            // Dialog is shown, permission has not been requested yet, setHomeserver has not been called.
+            assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None)
+            assertThat(promptState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
+        }
+    }
+
+    @Test
+    fun `present - dismissing the dialog aborts the submit`() = runTest {
+        createPresenter(
+            authenticationService = FakeMatrixAuthenticationService(
+                setHomeserverResult = { Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true)) },
+            ),
+            enterpriseService = FakeEnterpriseService(isAllowedToConnectToHomeserverResult = { true }),
+            localNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(shouldPrompt = true),
+            permissionsPresenter = FakePermissionsPresenter(),
+        ).test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL)))
+            val promptState = expectMostRecentItem()
+            assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None)
+            promptState.eventSink.invoke(ChangeServerEvents.DismissLocalNetworkPermission)
+            val dismissedState = expectMostRecentItem()
+            assertThat(dismissedState.localNetworkPermissionDialog).isEqualTo(LocalNetworkPermissionDialog.None)
+            assertThat(dismissedState.changeServerAction).isEqualTo(AsyncData.Uninitialized)
+        }
+    }
+
+    @Test
+    fun `present - advisor advises prompt, permission granted resumes setHomeserver`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = { Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true)) },
+        )
+        val permissionsPresenter = FakePermissionsPresenter()
+        createPresenter(
+            authenticationService = authenticationService,
+            enterpriseService = FakeEnterpriseService(isAllowedToConnectToHomeserverResult = { true }),
+            localNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(shouldPrompt = true),
+            permissionsPresenter = permissionsPresenter,
+        ).test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL)))
+            val promptState = expectMostRecentItem()
+            assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None)
+            permissionsPresenter.setPermissionGranted()
+            // Await recompositions until the deferred setHomeserver completes.
+            var finalState = awaitItem()
+            while (finalState.changeServerAction !is AsyncData.Success) {
+                finalState = awaitItem()
+            }
+            assertThat(finalState.changeServerAction).isEqualTo(AsyncData.Success(Unit))
+        }
+    }
+
     private fun createPresenter(
         authenticationService: FakeMatrixAuthenticationService = FakeMatrixAuthenticationService(),
         accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
         enterpriseService: EnterpriseService = FakeEnterpriseService(),
         wellknownRetriever: WellknownRetriever = FakeWellknownRetriever(),
+        localNetworkPermissionAdvisor: FakeLocalNetworkPermissionAdvisor = FakeLocalNetworkPermissionAdvisor(),
+        permissionsPresenter: FakePermissionsPresenter = FakePermissionsPresenter(),
     ) = ChangeServerPresenter(
         authenticationService = authenticationService,
         accountProviderDataSource = accountProviderDataSource,
@@ -195,5 +271,9 @@ class ChangeServerPresenterTest {
             enterpriseService = enterpriseService,
             wellknownRetriever = wellknownRetriever,
         ),
+        localNetworkPermissionGate = LocalNetworkPermissionGate(
+            advisor = localNetworkPermissionAdvisor,
+            permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionsPresenter),
+        ),
     )
 }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/DefaultElementClassicConnectionTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/DefaultElementClassicConnectionTest.kt
new file mode 100644
index 0000000000..702adaaa6d
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/DefaultElementClassicConnectionTest.kt
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.login.impl.classic
+
+import android.graphics.Bitmap
+import android.os.Bundle
+import androidx.core.graphics.createBitmap
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.service.ServiceBinder
+import io.element.android.libraries.matrix.api.auth.ElementClassicSession
+import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.test.A_FAILURE_REASON
+import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
+import io.element.android.libraries.matrix.test.A_SECRET
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_ID_2
+import io.element.android.libraries.matrix.test.A_USER_NAME
+import io.element.android.libraries.matrix.test.auth.FakeHomeServerLoginCompatibilityChecker
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultElementClassicConnectionTest : RobolectricTest() {
+    @Test
+    fun `connection can be started Element Classic service can be bound`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            serviceBinder = FakeServiceBinder(
+                bindServiceResult = {
+                    // Element Classic is found
+                    true
+                },
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            connection.start()
+            runCurrent()
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `connection can be started Element Classic service cannot be bound`() = runTest {
+        val setElementClassicSessionResult = lambdaRecorder<ElementClassicSession?, Unit> { }
+        val connection = createDefaultElementClassicConnection(
+            serviceBinder = FakeServiceBinder(
+                bindServiceResult = {
+                    // Element Classic not found
+                    false
+                },
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = setElementClassicSessionResult,
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            connection.start()
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.ElementClassicNotFound)
+            setElementClassicSessionResult.assertions().isCalledOnce().with(value(null))
+        }
+    }
+
+    @Test
+    fun `connection cannot be started in case of security error`() = runTest {
+        val setElementClassicSessionResult = lambdaRecorder<ElementClassicSession?, Unit> { }
+        val connection = createDefaultElementClassicConnection(
+            serviceBinder = FakeServiceBinder(
+                bindServiceResult = { throw SecurityException(A_FAILURE_REASON) },
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = setElementClassicSessionResult,
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            connection.start()
+            assertThat(awaitItem()).isInstanceOf(ElementClassicConnectionState.Error::class.java)
+            setElementClassicSessionResult.assertions().isCalledOnce().with(value(null))
+        }
+    }
+
+    @Test
+    fun `requestSession when messenger is not ready has no effect`() = runTest {
+        val connection = createDefaultElementClassicConnection()
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            connection.requestSession()
+            runCurrent()
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when an error is received, an error is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_ERROR_STR, A_FAILURE_REASON)
+                }
+            )
+            assertThat(awaitItem()).isInstanceOf(ElementClassicConnectionState.Error::class.java)
+        }
+    }
+
+    @Test
+    fun `when there is no Element Classic session, ElementClassicReadyNoSession is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving no session from Element Classic
+            connection.onSessionReceived(Bundle())
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.ElementClassicReadyNoSession)
+        }
+    }
+
+    @Test
+    fun `when there is Element Classic session with empty userId, ElementClassicReadyNoSession is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving empty userId from Element Classic
+            connection.onSessionReceived(Bundle().apply {
+                putString(DefaultElementClassicConnection.KEY_USER_ID_STR, "")
+            })
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.ElementClassicReadyNoSession)
+        }
+    }
+
+    @Test
+    fun `when session is received, but homeserver is not supported, an error is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(false) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                }
+            )
+            assertThat(awaitItem()).isInstanceOf(ElementClassicConnectionState.Error::class.java)
+        }
+    }
+
+    @Test
+    fun `when session is received without secrets, and homeserver is supported, ElementClassicReady is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = null,
+                        secrets = null,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = null,
+                    avatar = null,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `when session is received with all data including key backup, and homeserver is supported, ElementClassicReady is emitted`() {
+        `when session is received with all data, and homeserver is supported, ElementClassicReady is emitted`(
+            withKeyBackup = true,
+        )
+    }
+
+    @Test
+    fun `when session is received with all data without key backup, and homeserver is supported, ElementClassicReady is emitted - backup key is missing`() {
+        `when session is received with all data, and homeserver is supported, ElementClassicReady is emitted`(
+            withKeyBackup = false,
+        )
+    }
+
+    private fun `when session is received with all data, and homeserver is supported, ElementClassicReady is emitted`(
+        withKeyBackup: Boolean,
+    ) = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+                doSecretsContainBackupKeyResult = { _, _, _ -> withKeyBackup },
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                    putString(DefaultElementClassicConnection.KEY_HOMESERVER_URL_STR, A_HOMESERVER_URL)
+                    putString(DefaultElementClassicConnection.KEY_SECRETS_STR, A_SECRET)
+                    putString(DefaultElementClassicConnection.KEY_ROOM_KEYS_VERSION_STR, ROOM_KEYS_VERSION)
+                    putString(DefaultElementClassicConnection.KEY_USER_DISPLAY_NAME_STR, A_USER_NAME)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = A_HOMESERVER_URL,
+                        secrets = A_SECRET,
+                        roomKeysVersion = ROOM_KEYS_VERSION,
+                        doesContainBackupKey = withKeyBackup,
+                    ),
+                    displayName = A_USER_NAME,
+                    avatar = null,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `when session is received with secret but without room keys version Element Classic is outdated and the secret is ignored`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                    putString(DefaultElementClassicConnection.KEY_HOMESERVER_URL_STR, A_HOMESERVER_URL)
+                    putString(DefaultElementClassicConnection.KEY_SECRETS_STR, A_SECRET)
+                    putString(DefaultElementClassicConnection.KEY_ROOM_KEYS_VERSION_STR, null)
+                    putString(DefaultElementClassicConnection.KEY_USER_DISPLAY_NAME_STR, A_USER_NAME)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = A_HOMESERVER_URL,
+                        secrets = null,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = A_USER_NAME,
+                    avatar = null,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `when session is received with secret but with empty room keys version, doesContainBackupKey is false`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                    putString(DefaultElementClassicConnection.KEY_HOMESERVER_URL_STR, A_HOMESERVER_URL)
+                    putString(DefaultElementClassicConnection.KEY_SECRETS_STR, A_SECRET)
+                    putString(DefaultElementClassicConnection.KEY_ROOM_KEYS_VERSION_STR, "")
+                    putString(DefaultElementClassicConnection.KEY_USER_DISPLAY_NAME_STR, A_USER_NAME)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = A_HOMESERVER_URL,
+                        secrets = A_SECRET,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = A_USER_NAME,
+                    avatar = null,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `when session is received with empty data, and homeserver is supported, ElementClassicReady is emitted`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                    putString(DefaultElementClassicConnection.KEY_HOMESERVER_URL_STR, "")
+                    putString(DefaultElementClassicConnection.KEY_SECRETS_STR, "")
+                    putString(DefaultElementClassicConnection.KEY_USER_DISPLAY_NAME_STR, "")
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = null,
+                        secrets = null,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = null,
+                    avatar = null,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `when avatar is received when the state is not ElementClassicReady, nothing happen`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving an avatar from Element Classic
+            connection.onAvatarReceived(Bundle().apply {
+                putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                putParcelable(DefaultElementClassicConnection.KEY_USER_AVATAR_PARCELABLE, createBitmap(1, 1, Bitmap.Config.ARGB_8888))
+            })
+            runCurrent()
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when avatar is received when the state is ElementClassicReady with a different user, nothing happen`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = null,
+                        secrets = null,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = null,
+                    avatar = null,
+                )
+            )
+            // Simulate receiving an avatar for another user from Element Classic
+            connection.onAvatarReceived(Bundle().apply {
+                putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID_2.value)
+                putParcelable(DefaultElementClassicConnection.KEY_USER_AVATAR_PARCELABLE, createBitmap(1, 1, Bitmap.Config.ARGB_8888))
+            })
+            runCurrent()
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when avatar is received, the state is updated`() = runTest {
+        val connection = createDefaultElementClassicConnection(
+            homeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+                checkResult = { Result.success(true) }
+            ),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
+                setElementClassicSessionResult = {},
+            ),
+        )
+        connection.stateFlow.test {
+            assertThat(awaitItem()).isEqualTo(ElementClassicConnectionState.Idle)
+            // Simulate receiving a session from Element Classic
+            connection.onSessionReceived(
+                Bundle().apply {
+                    putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                }
+            )
+            assertThat(awaitItem()).isEqualTo(
+                ElementClassicConnectionState.ElementClassicReady(
+                    elementClassicSession = ElementClassicSession(
+                        userId = A_USER_ID,
+                        homeserverUrl = null,
+                        secrets = null,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = null,
+                    avatar = null,
+                )
+            )
+            // Simulate receiving an avatar from Element Classic
+            connection.onAvatarReceived(Bundle().apply {
+                putString(DefaultElementClassicConnection.KEY_USER_ID_STR, A_USER_ID.value)
+                putParcelable(DefaultElementClassicConnection.KEY_USER_AVATAR_PARCELABLE, createBitmap(1, 1, Bitmap.Config.ARGB_8888))
+            })
+            assertThat((awaitItem() as? ElementClassicConnectionState.ElementClassicReady)?.avatar).isNotNull()
+        }
+    }
+
+    private fun TestScope.createDefaultElementClassicConnection(
+        serviceBinder: ServiceBinder = FakeServiceBinder(
+            bindServiceResult = { true },
+            unbindServiceResult = { },
+        ),
+        coroutineScope: CoroutineScope = backgroundScope,
+        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
+        homeServerLoginCompatibilityChecker: HomeServerLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(
+            checkResult = { Result.success(true) }
+        ),
+    ) = DefaultElementClassicConnection(
+        serviceBinder = serviceBinder,
+        coroutineScope = coroutineScope,
+        matrixAuthenticationService = matrixAuthenticationService,
+        homeServerLoginCompatibilityChecker = homeServerLoginCompatibilityChecker,
+    )
+}
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/FakeElementClassicConnection.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeElementClassicConnection.kt
similarity index 84%
rename from features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/FakeElementClassicConnection.kt
rename to features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeElementClassicConnection.kt
index 2c41d2ed0f..227aa514b3 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/FakeElementClassicConnection.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeElementClassicConnection.kt
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.login.impl.screens.onboarding.classic
+package io.element.android.features.login.impl.classic
 
 import io.element.android.tests.testutils.lambda.lambdaError
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -15,12 +15,12 @@ import kotlinx.coroutines.flow.asStateFlow
 class FakeElementClassicConnection(
     private val startResult: () -> Unit = { lambdaError() },
     private val stopResult: () -> Unit = { lambdaError() },
-    private val requestDataResult: () -> Unit = { lambdaError() },
+    private val requestSessionResult: () -> Unit = { lambdaError() },
     initialState: ElementClassicConnectionState = ElementClassicConnectionState.Idle
 ) : ElementClassicConnection {
     override fun start() = startResult()
     override fun stop() = stopResult()
-    override fun requestData() = requestDataResult()
+    override fun requestSession() = requestSessionResult()
     private val mutableStateFlow = MutableStateFlow(initialState)
     override val stateFlow: StateFlow<ElementClassicConnectionState> = mutableStateFlow.asStateFlow()
     suspend fun emitState(state: ElementClassicConnectionState) {
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeServiceBinder.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeServiceBinder.kt
new file mode 100644
index 0000000000..0a24f13fa7
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/FakeServiceBinder.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.classic
+
+import android.content.Intent
+import android.content.ServiceConnection
+import io.element.android.libraries.androidutils.service.ServiceBinder
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeServiceBinder(
+    private val bindServiceResult: () -> Boolean = { lambdaError() },
+    private val unbindServiceResult: () -> Unit = { lambdaError() },
+) : ServiceBinder {
+    override fun bindService(service: Intent, conn: ServiceConnection, flags: Int): Boolean {
+        return bindServiceResult()
+    }
+
+    override fun unbindService(conn: ServiceConnection) {
+        unbindServiceResult()
+    }
+}
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/Fixtures.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/Fixtures.kt
new file mode 100644
index 0000000000..9039743fd5
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/classic/Fixtures.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.classic
+
+import android.graphics.Bitmap
+import io.element.android.libraries.matrix.api.auth.ElementClassicSession
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.A_USER_ID
+
+internal const val ROOM_KEYS_VERSION = "roomKeysVersion as Json data"
+
+fun anElementClassicReady(
+    elementClassicSession: ElementClassicSession = anElementClassicSession(),
+    displayName: String? = null,
+    avatar: Bitmap? = null,
+) = ElementClassicConnectionState.ElementClassicReady(
+    elementClassicSession = elementClassicSession,
+    displayName = displayName,
+    avatar = avatar,
+)
+
+fun anElementClassicSession(
+    userId: UserId = A_USER_ID,
+    homeserverUrl: String? = null,
+    secrets: String? = null,
+    roomKeysVersion: String? = null,
+    doesContainBackupKey: Boolean = false,
+) = ElementClassicSession(
+    userId = userId,
+    homeserverUrl = homeserverUrl,
+    secrets = secrets,
+    roomKeysVersion = roomKeysVersion,
+    doesContainBackupKey = doesContainBackupKey,
+)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt
index 9d2628005c..c56b4d5208 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNodeTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.features.login.impl.qrcode
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.AncestryInfo
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.utils.customisations.NodeCustomisationDirectoryImpl
@@ -22,16 +21,15 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.auth.qrlogin.FakeMatrixQrCodeLoginData
 import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class QrCodeLoginFlowNodeTest {
+class QrCodeLoginFlowNodeTest : RobolectricTest() {
     @Test
     fun `backstack changes when confirmation steps are received`() = runTest {
         val qrCodeLoginManager = FakeQrCodeLoginManager()
@@ -79,7 +77,7 @@ class QrCodeLoginFlowNodeTest {
         qrCodeLoginManager.currentLoginStep.value = QrCodeLoginStep.Failed(QrLoginException.ConnectionInsecure)
         assertThat(flowNode.currentNavTarget()).isEqualTo(QrCodeLoginFlowNode.NavTarget.Error(QrCodeErrorScreenType.InsecureChannelDetected))
 
-        qrCodeLoginManager.currentLoginStep.value = QrCodeLoginStep.Failed(QrLoginException.OidcMetadataInvalid)
+        qrCodeLoginManager.currentLoginStep.value = QrCodeLoginStep.Failed(QrLoginException.OAuthMetadataInvalid)
         assertThat(flowNode.currentNavTarget()).isEqualTo(QrCodeLoginFlowNode.NavTarget.Error(QrCodeErrorScreenType.UnknownError))
 
         qrCodeLoginManager.currentLoginStep.value = QrCodeLoginStep.Failed(QrLoginException.Unknown)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenterTest.kt
index 7461a7db55..4f00bb002b 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderPresenterTest.kt
@@ -12,8 +12,8 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.impl.accountprovider.AccountProvider
-import io.element.android.features.login.impl.login.LoginHelper
-import io.element.android.features.login.impl.screens.onboarding.createLoginHelper
+import io.element.android.features.login.impl.login.LoginModePresenter
+import io.element.android.features.login.impl.screens.onboarding.createLoginModePresenter
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.matrix.test.AN_ACCOUNT_PROVIDER_2
@@ -81,7 +81,7 @@ class ChooseAccountProviderPresenterTest {
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG_1, ACCOUNT_PROVIDER_FROM_CONFIG_2) },
             ),
-            loginHelper = createLoginHelper(
+            loginModePresenter = createLoginModePresenter(
                 authenticationService = authenticationService,
             ),
         )
@@ -105,7 +105,7 @@ class ChooseAccountProviderPresenterTest {
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG_1, ACCOUNT_PROVIDER_FROM_CONFIG_2) },
             ),
-            loginHelper = createLoginHelper(
+            loginModePresenter = createLoginModePresenter(
                 authenticationService = authenticationService,
             ),
         )
@@ -121,12 +121,12 @@ class ChooseAccountProviderPresenterTest {
 
                 // Check an error was returned
                 val submittedState = awaitItem()
-                assertThat(submittedState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+                assertThat(submittedState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
 
                 // Assert the error is then cleared
                 submittedState.eventSink(ChooseAccountProviderEvents.ClearError)
                 val clearedState = awaitItem()
-                assertThat(clearedState.loginMode).isEqualTo(AsyncData.Uninitialized)
+                assertThat(clearedState.loginModeState.loginMode).isEqualTo(AsyncData.Uninitialized)
             }
         }
     }
@@ -138,7 +138,7 @@ class ChooseAccountProviderPresenterTest {
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG_1, ACCOUNT_PROVIDER_FROM_CONFIG_2) },
             ),
-            loginHelper = createLoginHelper(
+            loginModePresenter = createLoginModePresenter(
                 authenticationService = authenticationService,
             ),
         )
@@ -152,7 +152,7 @@ class ChooseAccountProviderPresenterTest {
                 it.eventSink(ChooseAccountProviderEvents.Continue)
             }
             awaitItem().also {
-                assertThat(it.loginMode.isLoading()).isTrue()
+                assertThat(it.loginModeState.loginMode.isLoading()).isTrue()
                 it.eventSink(ChooseAccountProviderEvents.SelectAccountProvider(accountProvider2))
             }
             expectNoEvents()
@@ -162,8 +162,8 @@ class ChooseAccountProviderPresenterTest {
 
 private fun createPresenter(
     enterpriseService: EnterpriseService = FakeEnterpriseService(),
-    loginHelper: LoginHelper = createLoginHelper(),
+    loginModePresenter: LoginModePresenter = createLoginModePresenter(),
 ) = ChooseAccountProviderPresenter(
     enterpriseService = enterpriseService,
-    loginHelper = loginHelper,
+    loginModePresenter = loginModePresenter,
 )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateTest.kt
index ba1eff39e8..a5cb54e7e1 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderStateTest.kt
@@ -11,6 +11,7 @@ package io.element.android.features.login.impl.screens.chooseaccountprovider
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.login.impl.accountprovider.anAccountProvider
 import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.libraries.architecture.AsyncData
 import org.junit.Test
 
@@ -35,7 +36,7 @@ class ChooseAccountProviderStateTest {
     fun `submitEnabled returns false when there is a selectedAccountProvider but there is an error`() {
         val sut = aChooseAccountProviderState(
             selectedAccountProvider = anAccountProvider(),
-            loginMode = AsyncData.Failure(Throwable("Error")),
+            loginModeState = aLoginModeState(loginMode = AsyncData.Failure(Throwable("Error"))),
         )
         assertThat(sut.submitEnabled).isFalse()
     }
@@ -44,7 +45,7 @@ class ChooseAccountProviderStateTest {
     fun `submitEnabled returns false when there is a selectedAccountProvider but the result is successful`() {
         val sut = aChooseAccountProviderState(
             selectedAccountProvider = anAccountProvider(),
-            loginMode = AsyncData.Success(LoginMode.PasswordLogin),
+            loginModeState = aLoginModeState(loginMode = AsyncData.Success(LoginMode.PasswordLogin)),
         )
         assertThat(sut.submitEnabled).isFalse()
     }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderViewTest.kt
index f7ff5d384d..f1ce703d1c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderViewTest.kt
@@ -6,17 +6,20 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.chooseaccountprovider
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.login.impl.accountprovider.anAccountProvider
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -25,36 +28,30 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class ChooseAccountProviderViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class ChooseAccountProviderViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<ChooseAccountProviderEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setChooseAccountProviderView(
+            setChooseAccountProviderView(
                 state = aChooseAccountProviderState(
                     eventSink = eventSink,
                 ),
                 onBackClick = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `selecting an account provider emits the the expected event`() {
+    fun `selecting an account provider emits the the expected event`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<ChooseAccountProviderEvents>()
-        rule.setChooseAccountProviderView(
+        setChooseAccountProviderView(
             state = aChooseAccountProviderState(
                 accountProviders = listOf(
                     ChooseAccountProviderPresenterTest.accountProvider1,
@@ -64,27 +61,27 @@ class ChooseAccountProviderViewTest {
                 eventSink = eventSink,
             ),
         )
-        rule.onNodeWithText(ChooseAccountProviderPresenterTest.accountProvider1.title).performClick()
+        onNodeWithText(ChooseAccountProviderPresenterTest.accountProvider1.title).performClick()
         eventSink.assertSingle(ChooseAccountProviderEvents.SelectAccountProvider(ChooseAccountProviderPresenterTest.accountProvider1))
     }
 
     @Test
-    fun `when error is displayed - closing the dialog emits the expected event`() {
+    fun `when error is displayed - closing the dialog emits the expected event`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<ChooseAccountProviderEvents>()
-        rule.setChooseAccountProviderView(
+        setChooseAccountProviderView(
             state = aChooseAccountProviderState(
-                loginMode = AsyncData.Failure(AN_EXCEPTION),
+                loginModeState = aLoginModeState(loginMode = AsyncData.Failure(AN_EXCEPTION)),
                 eventSink = eventSink,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventSink.assertSingle(ChooseAccountProviderEvents.ClearError)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChooseAccountProviderView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setChooseAccountProviderView(
         state: ChooseAccountProviderState,
         onBackClick: () -> Unit = EnsureNeverCalled(),
-        onOidcDetails: (OidcDetails) -> Unit = EnsureNeverCalledWithParam(),
+        onOAuthDetails: (OAuthDetails) -> Unit = EnsureNeverCalledWithParam(),
         onNeedLoginPassword: () -> Unit = EnsureNeverCalled(),
         onLearnMoreClick: () -> Unit = EnsureNeverCalled(),
         onCreateAccountContinue: (url: String) -> Unit = EnsureNeverCalledWithParam(),
@@ -93,7 +90,7 @@ class ChooseAccountProviderViewTest {
             ChooseAccountProviderView(
                 state = state,
                 onBackClick = onBackClick,
-                onOidcDetails = onOidcDetails,
+                onOAuthDetails = onOAuthDetails,
                 onNeedLoginPassword = onNeedLoginPassword,
                 onLearnMoreClick = onLearnMoreClick,
                 onCreateAccountContinue = onCreateAccountContinue,
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelperTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelperTest.kt
new file mode 100644
index 0000000000..805e3c10b6
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/ClassicFlowNodeHelperTest.kt
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.login.impl.screens.classic
+
+import androidx.core.graphics.createBitmap
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.login.impl.classic.ElementClassicConnection
+import io.element.android.features.login.impl.classic.ElementClassicConnectionState
+import io.element.android.features.login.impl.classic.FakeElementClassicConnection
+import io.element.android.features.login.impl.classic.anElementClassicReady
+import io.element.android.features.login.impl.classic.anElementClassicSession
+import io.element.android.libraries.matrix.test.A_FAILURE_REASON
+import io.element.android.libraries.matrix.test.A_SECRET
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_ID_2
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.aSessionData
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+// Use RobolectricTest for the test with the Bitmap.
+class ClassicFlowNodeHelperTest : RobolectricTest() {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `after a few seconds in Idle, NavigateToOnBoarding is emitted`() = runTest {
+        createHelper()
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToOnBoarding)
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to onboarding if a session with the same account already exists`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(
+                    aSessionData(
+                        sessionId = A_USER_ID.value,
+                    )
+                )
+            ),
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady()
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToOnBoarding)
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to onboarding if Element Classic is not found`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    ElementClassicConnectionState.ElementClassicNotFound
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToOnBoarding)
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to onboarding if Element Classic has no session`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    ElementClassicConnectionState.ElementClassicReadyNoSession
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToOnBoarding)
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to onboarding if there has been an error`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    ElementClassicConnectionState.Error(A_FAILURE_REASON)
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToOnBoarding)
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to login with classic when the session can be retrieved`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady()
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to login with classic when the session can be retrieved - ignore avatar update`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady()
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                // When the avatar is retrieved, no new event is emitted
+                elementClassicConnection.emitState(
+                    anElementClassicReady(
+                        avatar = createBitmap(1, 1)
+                    )
+                )
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to login with classic when the session can be retrieved and navigate again once the session is verified`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady(
+                        elementClassicSession = anElementClassicSession(
+                            secrets = A_SECRET,
+                        )
+                    )
+                )
+                val readyState = awaitItem()
+                assertThat(readyState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                // When the secret with the key backup is retrieved, NavigateToLoginWithClassic is emitted again
+                elementClassicConnection.emitState(
+                    anElementClassicReady(
+                        elementClassicSession = anElementClassicSession(
+                            secrets = A_SECRET + A_SECRET,
+                        )
+                    )
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to login with classic if a session with another account already exists`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(
+                    aSessionData(
+                        sessionId = A_USER_ID_2.value,
+                    )
+                )
+            ),
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady()
+                )
+                val finalState = awaitItem()
+                assertThat(finalState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+
+    @Test
+    fun `navigate to login with classic but do not navigate to OnBoarding once the user is logged in`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection()
+        val sessionStore = InMemorySessionStore(
+            initialList = listOf()
+        )
+        createHelper(
+            elementClassicConnection = elementClassicConnection,
+            sessionStore = sessionStore,
+        )
+            .navigationEventFlow()
+            .test {
+                val initialState = awaitItem()
+                assertThat(initialState).isEqualTo(NavigationEvent.Idle)
+                elementClassicConnection.emitState(
+                    anElementClassicReady()
+                )
+                val navigateToLoginWithClassicState = awaitItem()
+                assertThat(navigateToLoginWithClassicState).isEqualTo(NavigationEvent.NavigateToLoginWithClassic(A_USER_ID))
+                // User actually logs in
+                sessionStore.addSession(
+                    aSessionData(
+                        sessionId = A_USER_ID.value,
+                    )
+                )
+                advanceTimeBy(10_000)
+                expectNoEvents()
+            }
+    }
+}
+
+private fun createHelper(
+    elementClassicConnection: ElementClassicConnection = FakeElementClassicConnection(),
+    sessionStore: SessionStore = InMemorySessionStore(),
+) = ClassicFlowNodeHelper(
+    elementClassicConnection = elementClassicConnection,
+    sessionStore = sessionStore,
+)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/FakeLoginWithClassicNavigator.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/FakeLoginWithClassicNavigator.kt
new file mode 100644
index 0000000000..e5ff91aa91
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/FakeLoginWithClassicNavigator.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeLoginWithClassicNavigator(
+    private val navigateToMissingKeyBackupResult: () -> Unit = { lambdaError() },
+) : LoginWithClassicNavigator {
+    override fun navigateToMissingKeyBackup() {
+        navigateToMissingKeyBackupResult()
+    }
+}
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenterTest.kt
new file mode 100644
index 0000000000..8d56386fa4
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/loginwithclassic/LoginWithClassicPresenterTest.kt
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.loginwithclassic
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
+import io.element.android.features.login.impl.classic.ElementClassicConnection
+import io.element.android.features.login.impl.classic.ElementClassicConnectionState
+import io.element.android.features.login.impl.classic.FakeElementClassicConnection
+import io.element.android.features.login.impl.classic.ROOM_KEYS_VERSION
+import io.element.android.features.login.impl.classic.anElementClassicReady
+import io.element.android.features.login.impl.classic.anElementClassicSession
+import io.element.android.features.login.impl.login.LoginModePresenter
+import io.element.android.features.login.impl.screens.onboarding.createLoginModePresenter
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.AN_EXCEPTION
+import io.element.android.libraries.matrix.test.A_FAILURE_REASON
+import io.element.android.libraries.matrix.test.A_SECRET
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_NAME
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
+import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class LoginWithClassicPresenterTest {
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.isElementPro).isFalse()
+            assertThat(initialState.userId).isEqualTo(A_USER_ID)
+            assertThat(initialState.displayName).isNull()
+            assertThat(initialState.avatar).isNull()
+            assertThat(initialState.loginWithClassicAction.isUninitialized()).isTrue()
+            assertThat(initialState.loginModeState.loginMode.isUninitialized()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - initial state - element Pro`() = runTest {
+        val presenter = createPresenter(
+            isEnterpriseBuild = true,
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.isElementPro).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - start login with correct state - user can login`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
+        val elementClassicConnection = FakeElementClassicConnection(
+            startResult = {},
+        )
+        val presenter = createPresenter(
+            elementClassicConnection = elementClassicConnection,
+            loginModePresenter = createLoginModePresenter(
+                authenticationService = authenticationService,
+            ),
+        )
+        presenter.test {
+            skipItems(1)
+            elementClassicConnection.emitState(
+                anElementClassicReady(
+                    elementClassicSession = anElementClassicSession(
+                        userId = A_USER_ID,
+                        secrets = A_SECRET,
+                        roomKeysVersion = ROOM_KEYS_VERSION,
+                        doesContainBackupKey = true,
+                    ),
+                    displayName = A_USER_NAME,
+                )
+            )
+            val readyState = awaitItem()
+            assertThat(readyState.userId).isEqualTo(A_USER_ID)
+            assertThat(readyState.displayName).isEqualTo(A_USER_NAME)
+            readyState.eventSink(LoginWithClassicEvent.Submit)
+            val loadingState = awaitItem()
+            assertThat(loadingState.loginWithClassicAction.isLoading()).isTrue()
+            skipItems(1)
+        }
+    }
+
+    @Test
+    fun `present - start login with no secrets - user can login and will have to verify manually`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
+        val elementClassicConnection = FakeElementClassicConnection(
+            startResult = {},
+        )
+        val presenter = createPresenter(
+            elementClassicConnection = elementClassicConnection,
+            loginModePresenter = createLoginModePresenter(
+                authenticationService = authenticationService,
+            ),
+        )
+        presenter.test {
+            skipItems(1)
+            elementClassicConnection.emitState(
+                anElementClassicReady(
+                    elementClassicSession = anElementClassicSession(
+                        userId = A_USER_ID,
+                        secrets = null,
+                        roomKeysVersion = null,
+                    ),
+                    displayName = A_USER_NAME,
+                )
+            )
+            val readyState = awaitItem()
+            assertThat(readyState.userId).isEqualTo(A_USER_ID)
+            assertThat(readyState.displayName).isEqualTo(A_USER_NAME)
+            readyState.eventSink(LoginWithClassicEvent.Submit)
+            val loadingState = awaitItem()
+            assertThat(loadingState.loginWithClassicAction.isLoading()).isTrue()
+            skipItems(1)
+        }
+    }
+
+    @Test
+    fun `present - start login with secrets and without key backup - user will see the screen to enable key backup`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
+        val elementClassicConnection = FakeElementClassicConnection(
+            startResult = {},
+        )
+        val navigateToMissingKeyBackupResult = lambdaRecorder<Unit> { }
+        val presenter = createPresenter(
+            elementClassicConnection = elementClassicConnection,
+            loginModePresenter = createLoginModePresenter(
+                authenticationService = authenticationService,
+            ),
+            navigator = FakeLoginWithClassicNavigator(
+                navigateToMissingKeyBackupResult = navigateToMissingKeyBackupResult,
+            ),
+        )
+        presenter.test {
+            skipItems(1)
+            elementClassicConnection.emitState(
+                anElementClassicReady(
+                    elementClassicSession = anElementClassicSession(
+                        userId = A_USER_ID,
+                        secrets = A_SECRET,
+                        roomKeysVersion = null,
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = A_USER_NAME,
+                )
+            )
+            val readyState = awaitItem()
+            assertThat(readyState.userId).isEqualTo(A_USER_ID)
+            assertThat(readyState.displayName).isEqualTo(A_USER_NAME)
+            readyState.eventSink(LoginWithClassicEvent.Submit)
+            navigateToMissingKeyBackupResult.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - start login with secrets and with invalid key backup - user will see the screen to enable key backup`() = runTest {
+        val authenticationService = FakeMatrixAuthenticationService(
+            setHomeserverResult = {
+                Result.failure(AN_EXCEPTION)
+            },
+        )
+        val elementClassicConnection = FakeElementClassicConnection(
+            startResult = {},
+        )
+        val navigateToMissingKeyBackupResult = lambdaRecorder<Unit> { }
+        val presenter = createPresenter(
+            elementClassicConnection = elementClassicConnection,
+            loginModePresenter = createLoginModePresenter(
+                authenticationService = authenticationService,
+            ),
+            navigator = FakeLoginWithClassicNavigator(
+                navigateToMissingKeyBackupResult = navigateToMissingKeyBackupResult,
+            ),
+        )
+        presenter.test {
+            skipItems(1)
+            elementClassicConnection.emitState(
+                anElementClassicReady(
+                    elementClassicSession = anElementClassicSession(
+                        userId = A_USER_ID,
+                        secrets = A_SECRET,
+                        roomKeysVersion = ROOM_KEYS_VERSION,
+                        // false here
+                        doesContainBackupKey = false,
+                    ),
+                    displayName = A_USER_NAME,
+                )
+            )
+            val readyState = awaitItem()
+            assertThat(readyState.userId).isEqualTo(A_USER_ID)
+            assertThat(readyState.displayName).isEqualTo(A_USER_NAME)
+            readyState.eventSink(LoginWithClassicEvent.Submit)
+            navigateToMissingKeyBackupResult.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - submit in wrong state and clear error`() = runTest {
+        val elementClassicConnection = FakeElementClassicConnection(
+            startResult = {},
+        )
+        val presenter = createPresenter(
+            elementClassicConnection = elementClassicConnection,
+        )
+        presenter.test {
+            skipItems(1)
+            elementClassicConnection.emitState(
+                ElementClassicConnectionState.Error(
+                    error = A_FAILURE_REASON,
+                )
+            )
+            val initialState = awaitItem()
+            assertThat(initialState.loginWithClassicAction.isUninitialized()).isTrue()
+            initialState.eventSink(LoginWithClassicEvent.Submit)
+            val errorState = awaitItem()
+            assertThat(errorState.loginWithClassicAction.isFailure()).isTrue()
+            errorState.eventSink(LoginWithClassicEvent.ClearError)
+            val clearedState = awaitItem()
+            assertThat(clearedState.loginWithClassicAction.isUninitialized()).isTrue()
+        }
+    }
+}
+
+private fun createPresenter(
+    userId: UserId = A_USER_ID,
+    navigator: LoginWithClassicNavigator = FakeLoginWithClassicNavigator(),
+    loginModePresenter: LoginModePresenter = createLoginModePresenter(),
+    elementClassicConnection: ElementClassicConnection = FakeElementClassicConnection(),
+    accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
+    isEnterpriseBuild: Boolean = false,
+) = LoginWithClassicPresenter(
+    userId = userId,
+    navigator = navigator,
+    loginModePresenter = loginModePresenter,
+    elementClassicConnection = elementClassicConnection,
+    accountProviderDataSource = accountProviderDataSource,
+    buildMeta = aBuildMeta(
+        isEnterpriseBuild = isEnterpriseBuild,
+    ),
+)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenterTest.kt
new file mode 100644
index 0000000000..447b0ba77b
--- /dev/null
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/classic/missingkeybackup/MissingKeyBackupPresenterTest.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.login.impl.screens.classic.missingkeybackup
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.matrix.test.AN_APPLICATION_NAME
+import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class MissingKeyBackupPresenterTest {
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.appName).isEqualTo(AN_APPLICATION_NAME)
+        }
+    }
+}
+
+private fun createPresenter(
+    buildMeta: BuildMeta = aBuildMeta(applicationName = AN_APPLICATION_NAME),
+) = MissingKeyBackupPresenter(
+    buildMeta = buildMeta,
+)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
index 6372841250..c20896870b 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
@@ -14,7 +14,7 @@ import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
 import io.element.android.features.login.impl.login.LoginMode
 import io.element.android.features.login.impl.screens.createaccount.AccountCreationNotSupported
-import io.element.android.features.login.impl.screens.onboarding.createLoginHelper
+import io.element.android.features.login.impl.screens.onboarding.createLoginModePresenter
 import io.element.android.features.login.impl.web.FakeWebClientUrlForAuthenticationRetriever
 import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationRetriever
 import io.element.android.libraries.architecture.AsyncData
@@ -22,9 +22,9 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.auth.aMatrixHomeServerDetails
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
-import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
+import io.element.android.libraries.oauth.test.customtab.FakeOAuthActionFlow
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
@@ -43,7 +43,7 @@ class ConfirmAccountProviderPresenterTest {
             assertThat(initialState.isAccountCreation).isFalse()
             assertThat(initialState.submitEnabled).isTrue()
             assertThat(initialState.accountProvider.url).isEqualTo(AuthenticationConfig.MATRIX_ORG_URL)
-            assertThat(initialState.loginMode).isEqualTo(AsyncData.Uninitialized)
+            assertThat(initialState.loginModeState.loginMode).isEqualTo(AsyncData.Uninitialized)
         }
     }
 
@@ -62,11 +62,11 @@ class ConfirmAccountProviderPresenterTest {
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isEqualTo(LoginMode.PasswordLogin)
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isEqualTo(LoginMode.PasswordLogin)
         }
     }
 
@@ -74,7 +74,7 @@ class ConfirmAccountProviderPresenterTest {
     fun `present - continue oidc`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
         val presenter = createConfirmAccountProviderPresenter(
@@ -85,151 +85,151 @@ class ConfirmAccountProviderPresenterTest {
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
         }
     }
 
     @Test
-    fun `present - oidc - cancel with failure`() = runTest {
+    fun `present - OAuth - cancel with failure`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
-        val defaultOidcActionFlow = FakeOidcActionFlow()
+        val defaultOAuthActionFlow = FakeOAuthActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
-            defaultOidcActionFlow = defaultOidcActionFlow,
+            defaultOAuthActionFlow = defaultOAuthActionFlow,
         )
         presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
-            authenticationService.givenOidcCancelError(AN_EXCEPTION)
-            defaultOidcActionFlow.post(OidcAction.GoBack())
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
+            authenticationService.givenOAuthCancelError(AN_EXCEPTION)
+            defaultOAuthActionFlow.post(OAuthAction.GoBack())
             val cancelFailureState = awaitItem()
-            assertThat(cancelFailureState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+            assertThat(cancelFailureState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
         }
     }
 
     @Test
-    fun `present - oidc - cancel with success`() = runTest {
+    fun `present - OAuth - cancel with success`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
-        val defaultOidcActionFlow = FakeOidcActionFlow()
+        val defaultOAuthActionFlow = FakeOAuthActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
-            defaultOidcActionFlow = defaultOidcActionFlow,
+            defaultOAuthActionFlow = defaultOAuthActionFlow,
         )
         presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
-            defaultOidcActionFlow.post(OidcAction.GoBack())
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
+            defaultOAuthActionFlow.post(OAuthAction.GoBack())
             val cancelFinalState = awaitItem()
-            assertThat(cancelFinalState.loginMode).isInstanceOf(AsyncData.Uninitialized::class.java)
+            assertThat(cancelFinalState.loginModeState.loginMode).isInstanceOf(AsyncData.Uninitialized::class.java)
         }
     }
 
     @Test
-    fun `present - oidc - cancel to unblock`() = runTest {
+    fun `present - OAuth - cancel to unblock`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
-        val defaultOidcActionFlow = FakeOidcActionFlow()
+        val defaultOAuthActionFlow = FakeOAuthActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
-            defaultOidcActionFlow = defaultOidcActionFlow,
+            defaultOAuthActionFlow = defaultOAuthActionFlow,
         )
         presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
-            defaultOidcActionFlow.post(OidcAction.GoBack(toUnblock = true))
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            defaultOAuthActionFlow.post(OAuthAction.GoBack(toUnblock = true))
             val cancelFinalState = awaitItem()
-            assertThat(cancelFinalState.loginMode).isInstanceOf(AsyncData.Uninitialized::class.java)
+            assertThat(cancelFinalState.loginModeState.loginMode).isInstanceOf(AsyncData.Uninitialized::class.java)
         }
     }
 
     @Test
-    fun `present - oidc - success with failure`() = runTest {
+    fun `present - OAuth - success with failure`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
-        val defaultOidcActionFlow = FakeOidcActionFlow()
+        val defaultOAuthActionFlow = FakeOAuthActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
-            defaultOidcActionFlow = defaultOidcActionFlow,
+            defaultOAuthActionFlow = defaultOAuthActionFlow,
         )
         presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
             authenticationService.givenLoginError(AN_EXCEPTION)
-            defaultOidcActionFlow.post(OidcAction.Success("aUrl"))
+            defaultOAuthActionFlow.post(OAuthAction.Success("aUrl"))
             val cancelLoadingState = awaitItem()
-            assertThat(cancelLoadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(cancelLoadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val cancelFailureState = awaitItem()
-            assertThat(cancelFailureState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+            assertThat(cancelFailureState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
         }
     }
 
     @Test
-    fun `present - oidc - success with success`() = runTest {
+    fun `present - OAuth - success with success`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
-        val defaultOidcActionFlow = FakeOidcActionFlow()
+        val defaultOidcActionFlow = FakeOAuthActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
-            defaultOidcActionFlow = defaultOidcActionFlow,
+            defaultOAuthActionFlow = defaultOidcActionFlow,
         )
         presenter.test {
             val initialState = awaitItem()
             initialState.eventSink.invoke(ConfirmAccountProviderEvents.Continue)
             val loadingState = awaitItem()
             assertThat(loadingState.submitEnabled).isTrue()
-            assertThat(loadingState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(loadingState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
             val successState = awaitItem()
             assertThat(successState.submitEnabled).isFalse()
-            assertThat(successState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(successState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
-            defaultOidcActionFlow.post(OidcAction.Success("aUrl"))
+            assertThat(successState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(successState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
+            defaultOidcActionFlow.post(OAuthAction.Success("aUrl"))
             val successSuccessState = awaitItem()
-            assertThat(successSuccessState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
+            assertThat(successSuccessState.loginModeState.loginMode).isInstanceOf(AsyncData.Loading::class.java)
         }
     }
 
@@ -249,7 +249,7 @@ class ConfirmAccountProviderPresenterTest {
             skipItems(1) // Loading
             val failureState = awaitItem()
             assertThat(failureState.submitEnabled).isFalse()
-            assertThat(failureState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+            assertThat(failureState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
         }
     }
 
@@ -273,12 +273,12 @@ class ConfirmAccountProviderPresenterTest {
 
             // Check an error was returned
             val submittedState = awaitItem()
-            assertThat(submittedState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+            assertThat(submittedState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
 
             // Assert the error is then cleared
             submittedState.eventSink(ConfirmAccountProviderEvents.ClearError)
             val clearedState = awaitItem()
-            assertThat(clearedState.loginMode).isEqualTo(AsyncData.Uninitialized)
+            assertThat(clearedState.loginModeState.loginMode).isEqualTo(AsyncData.Uninitialized)
         }
     }
 
@@ -302,19 +302,19 @@ class ConfirmAccountProviderPresenterTest {
             skipItems(1) // Loading
             // Check an error was returned
             val submittedState = awaitItem()
-            assertThat(submittedState.loginMode.errorOrNull()).isInstanceOf(AccountCreationNotSupported::class.java)
+            assertThat(submittedState.loginModeState.loginMode.errorOrNull()).isInstanceOf(AccountCreationNotSupported::class.java)
             // Assert the error is then cleared
             submittedState.eventSink(ConfirmAccountProviderEvents.ClearError)
             val clearedState = awaitItem()
-            assertThat(clearedState.loginMode).isEqualTo(AsyncData.Uninitialized)
+            assertThat(clearedState.loginModeState.loginMode).isEqualTo(AsyncData.Uninitialized)
         }
     }
 
     @Test
-    fun `present - confirm account creation with oidc is successful`() = runTest {
+    fun `present - confirm account creation with OAuth is successful`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
         val presenter = createConfirmAccountProviderPresenter(
@@ -326,17 +326,17 @@ class ConfirmAccountProviderPresenterTest {
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
             val submittedState = awaitItem()
-            assertThat(submittedState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(submittedState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
+            assertThat(submittedState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(submittedState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
         }
     }
 
     @Test
-    fun `present - confirm account creation with oidc and url continues with oidc`() = runTest {
+    fun `present - confirm account creation with OAuth and url continues with OAuth`() = runTest {
         val aUrl = "aUrl"
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
-                Result.success(aMatrixHomeServerDetails(supportsOidcLogin = true))
+                Result.success(aMatrixHomeServerDetails(supportsOAuthLogin = true))
             },
         )
         val presenter = createConfirmAccountProviderPresenter(
@@ -349,13 +349,13 @@ class ConfirmAccountProviderPresenterTest {
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
             val submittedState = awaitItem()
-            assertThat(submittedState.loginMode).isInstanceOf(AsyncData.Success::class.java)
-            assertThat(submittedState.loginMode.dataOrNull()).isInstanceOf(LoginMode.Oidc::class.java)
+            assertThat(submittedState.loginModeState.loginMode).isInstanceOf(AsyncData.Success::class.java)
+            assertThat(submittedState.loginModeState.loginMode.dataOrNull()).isInstanceOf(LoginMode.OAuth::class.java)
         }
     }
 
     @Test
-    fun `present - confirm account creation without oidc and with url continuing with url`() = runTest {
+    fun `present - confirm account creation without OAuth and with url continuing with url`() = runTest {
         val aUrl = "aUrl"
         val authenticationService = FakeMatrixAuthenticationService(
             setHomeserverResult = {
@@ -372,7 +372,7 @@ class ConfirmAccountProviderPresenterTest {
             initialState.eventSink(ConfirmAccountProviderEvents.Continue)
             skipItems(1) // Loading
             val submittedState = awaitItem()
-            assertThat(submittedState.loginMode.dataOrNull()).isEqualTo(LoginMode.AccountCreation(aUrl))
+            assertThat(submittedState.loginModeState.loginMode.dataOrNull()).isEqualTo(LoginMode.AccountCreation(aUrl))
         }
     }
 
@@ -380,14 +380,14 @@ class ConfirmAccountProviderPresenterTest {
         params: ConfirmAccountProviderPresenter.Params = ConfirmAccountProviderPresenter.Params(isAccountCreation = false),
         accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
         matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
-        defaultOidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
+        defaultOAuthActionFlow: OAuthActionFlow = FakeOAuthActionFlow(),
         webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),
     ) = ConfirmAccountProviderPresenter(
         params = params,
         accountProviderDataSource = accountProviderDataSource,
-        loginHelper = createLoginHelper(
+        loginModePresenter = createLoginModePresenter(
             authenticationService = matrixAuthenticationService,
-            oidcActionFlow = defaultOidcActionFlow,
+            oAuthActionFlow = defaultOAuthActionFlow,
             webClientUrlForAuthenticationRetriever = webClientUrlForAuthenticationRetriever,
         ),
     )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
index 92099180ec..31a835cb8c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_PASSWORD
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
+import io.element.android.libraries.matrix.test.A_USER_NAME_2
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.auth.aMatrixHomeServerDetails
 import io.element.android.tests.testutils.WarmUpRule
@@ -41,6 +42,20 @@ class LoginPasswordPresenterTest {
         }
     }
 
+    @Test
+    fun `present - initial login is in the first state and can be modified`() = runTest {
+        createLoginPasswordPresenter(
+            initialLogin = A_USER_NAME,
+        ).test {
+            val initialState = awaitItem()
+            assertThat(initialState.formState.login).isEqualTo(A_USER_NAME)
+            // Login can be changed
+            initialState.eventSink.invoke(LoginPasswordEvents.SetLogin(A_USER_NAME_2))
+            val loginChangedState = awaitItem()
+            assertThat(loginChangedState.formState.login).isEqualTo(A_USER_NAME_2)
+        }
+    }
+
     @Test
     fun `present - enter login and password`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService(
@@ -140,9 +155,11 @@ class LoginPasswordPresenterTest {
     }
 
     private fun createLoginPasswordPresenter(
+        initialLogin: String = "",
         authenticationService: FakeMatrixAuthenticationService = FakeMatrixAuthenticationService(),
         accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
     ): LoginPasswordPresenter = LoginPasswordPresenter(
+        initialLogin = initialLogin,
         authenticationService = authenticationService,
         accountProviderDataSource = accountProviderDataSource,
     )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordViewTest.kt
index 26da50da63..3a128f2e4f 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordViewTest.kt
@@ -6,21 +6,23 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.loginpassword
 
 import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertIsEnabled
 import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.test.A_PASSWORD
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.testtags.TestTags
@@ -30,158 +32,153 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class LoginPasswordViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class LoginPasswordViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke back callback`() {
+    fun `clicking on back invoke back callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setLoginPasswordView(
+            setLoginPasswordView(
                 aLoginPasswordState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `changing login invokes the expected event`() {
+    fun `changing login invokes the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>()
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 eventSink = eventsRecorder,
             ),
         )
-        val userNameHint = rule.activity.getString(CommonStrings.common_username)
-        rule.onNodeWithText(userNameHint).performTextInput(A_USER_NAME)
+        val userNameHint = activity!!.getString(CommonStrings.common_username)
+        onNodeWithText(userNameHint).performTextInput(A_USER_NAME)
         eventsRecorder.assertSingle(
             LoginPasswordEvents.SetLogin(A_USER_NAME)
         )
     }
 
     @Test
-    fun `changing login removes new lines the expected event`() {
+    fun `changing login removes new lines the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>()
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 eventSink = eventsRecorder,
             ),
         )
-        val userNameHint = rule.activity.getString(CommonStrings.common_username)
-        rule.onNodeWithText(userNameHint).performTextInput("a\nb")
+        val userNameHint = activity!!.getString(CommonStrings.common_username)
+        onNodeWithText(userNameHint).performTextInput("a\nb")
         eventsRecorder.assertSingle(
             LoginPasswordEvents.SetLogin("ab")
         )
     }
 
     @Test
-    fun `clearing login invokes the expected event`() {
+    fun `clearing login invokes the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>()
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 formState = aLoginFormState(A_USER_NAME),
                 eventSink = eventsRecorder,
             ),
         )
-        val a11yClear = rule.activity.getString(CommonStrings.action_clear)
-        rule.onNodeWithContentDescription(a11yClear).performClick()
+        val a11yClear = activity!!.getString(CommonStrings.action_clear)
+        onNodeWithContentDescription(a11yClear).performClick()
         eventsRecorder.assertSingle(
             LoginPasswordEvents.SetLogin("")
         )
     }
 
     @Test
-    fun `changing password invokes the expected event`() {
+    fun `changing password invokes the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>()
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 eventSink = eventsRecorder,
             ),
         )
-        val userNameHint = rule.activity.getString(CommonStrings.common_password)
-        rule.onNodeWithText(userNameHint).performTextInput(A_PASSWORD)
+        val userNameHint = activity!!.getString(CommonStrings.common_password)
+        onNodeWithText(userNameHint).performTextInput(A_PASSWORD)
         eventsRecorder.assertSingle(
             LoginPasswordEvents.SetPassword(A_PASSWORD)
         )
     }
 
     @Test
-    fun `reveal password makes the password visible`() {
+    fun `reveal password makes the password visible`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>(expectEvents = false)
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 formState = aLoginFormState(password = A_PASSWORD),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithTag(TestTags.loginPassword.value).assert(hasText("••••••••"))
+        onNodeWithTag(TestTags.loginPassword.value).assert(hasText("••••••••"))
+        val resources = activity!!.resources
         // Show password
-        val a11yShowPassword = rule.activity.getString(CommonStrings.a11y_show_password)
-        rule.onNodeWithContentDescription(a11yShowPassword).performClick()
-        rule.onNodeWithTag(TestTags.loginPassword.value).assert(hasText(A_PASSWORD))
+        val a11yShowPassword = resources.getString(CommonStrings.a11y_show_password)
+        onNodeWithContentDescription(a11yShowPassword).performClick()
+        onNodeWithTag(TestTags.loginPassword.value).assert(hasText(A_PASSWORD))
         // Hide password
-        val a11yHidePassword = rule.activity.getString(CommonStrings.a11y_hide_password)
-        rule.onNodeWithContentDescription(a11yHidePassword).performClick()
-        rule.onNodeWithTag(TestTags.loginPassword.value).assert(hasText("••••••••"))
+        val a11yHidePassword = resources.getString(CommonStrings.a11y_hide_password)
+        onNodeWithContentDescription(a11yHidePassword).performClick()
+        onNodeWithTag(TestTags.loginPassword.value).assert(hasText("••••••••"))
     }
 
     @Test
-    fun `when login is empty, continue button is not enabled`() {
+    fun `when login is empty, continue button is not enabled`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>(expectEvents = false)
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 formState = aLoginFormState(password = A_PASSWORD),
                 eventSink = eventsRecorder,
             ),
         )
-        val continueStr = rule.activity.getString(CommonStrings.action_continue)
-        rule.onNodeWithText(continueStr).assertIsNotEnabled()
+        val continueStr = activity!!.getString(CommonStrings.action_continue)
+        onNodeWithText(continueStr).assertIsNotEnabled()
     }
 
     @Test
-    fun `when password is empty, continue button is not enabled`() {
+    fun `when password is empty, continue button is not enabled`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>(expectEvents = false)
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 formState = aLoginFormState(login = A_USER_NAME),
                 eventSink = eventsRecorder,
             ),
         )
-        val continueStr = rule.activity.getString(CommonStrings.action_continue)
-        rule.onNodeWithText(continueStr).assertIsNotEnabled()
+        val continueStr = activity!!.getString(CommonStrings.action_continue)
+        onNodeWithText(continueStr).assertIsNotEnabled()
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on Continue sends expected event`() {
+    fun `clicking on Continue sends expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LoginPasswordEvents>()
-        rule.setLoginPasswordView(
+        setLoginPasswordView(
             aLoginPasswordState(
                 formState = aLoginFormState(login = A_USER_NAME, password = A_PASSWORD),
                 eventSink = eventsRecorder,
             ),
         )
-        val continueStr = rule.activity.getString(CommonStrings.action_continue)
-        rule.onNodeWithText(continueStr).assertIsEnabled()
-        rule.clickOn(CommonStrings.action_continue)
+        val continueStr = activity!!.getString(CommonStrings.action_continue)
+        onNodeWithText(continueStr).assertIsEnabled()
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(
             LoginPasswordEvents.Submit
         )
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLoginPasswordView(
+private fun AndroidComposeUiTest<ComponentActivity>.setLoginPasswordView(
     state: LoginPasswordState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/DefaultOnBoardingLogoResIdProviderTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/DefaultOnBoardingLogoResIdProviderTest.kt
index 6e67925444..337f2d659c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/DefaultOnBoardingLogoResIdProviderTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/DefaultOnBoardingLogoResIdProviderTest.kt
@@ -8,14 +8,12 @@
 
 package io.element.android.features.login.impl.screens.onboarding
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultOnBoardingLogoResIdProviderTest {
+class DefaultOnBoardingLogoResIdProviderTest : RobolectricTest() {
     @Test
     fun `when onboarding_logo resource does not exist, get() returns null`() {
         val context = InstrumentationRegistry.getInstrumentation().context
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt
index 1e971ef265..79268aa1e4 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt
@@ -15,8 +15,8 @@ import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
-import io.element.android.features.login.impl.login.LoginHelper
-import io.element.android.features.login.impl.screens.onboarding.classic.aLoginWithClassicState
+import io.element.android.features.login.impl.localnetwork.LocalNetworkPermissionGate
+import io.element.android.features.login.impl.login.LoginModePresenter
 import io.element.android.features.login.impl.web.FakeWebClientUrlForAuthenticationRetriever
 import io.element.android.features.login.impl.web.WebClientUrlForAuthenticationRetriever
 import io.element.android.features.wellknown.test.FakeWellknownRetriever
@@ -32,8 +32,9 @@ import io.element.android.libraries.matrix.test.A_HOMESERVER_URL_2
 import io.element.android.libraries.matrix.test.A_LOGIN_HINT
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
-import io.element.android.libraries.oidc.api.OidcActionFlow
-import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
+import io.element.android.libraries.oauth.api.OAuthActionFlow
+import io.element.android.libraries.oauth.test.customtab.FakeOAuthActionFlow
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
@@ -83,16 +84,31 @@ class OnBoardingPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
+            assertThat(initialState.showBackButton).isFalse()
             assertThat(initialState.defaultAccountProvider).isNull()
             assertThat(initialState.canLoginWithQrCode).isFalse()
             assertThat(initialState.productionApplicationName).isEqualTo("B")
             assertThat(initialState.canCreateAccount).isEqualTo(OnBoardingConfig.CAN_CREATE_ACCOUNT)
             assertThat(initialState.canReportBug).isFalse()
             assertThat(initialState.isAddingAccount).isFalse()
-            assertThat(initialState.loginWithClassicState.canLoginWithClassic).isFalse()
             val finalState = awaitItem()
             assertThat(finalState.canLoginWithQrCode).isTrue()
-            assertThat(finalState.loginWithClassicState.canLoginWithClassic).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - initial state with back button`() = runTest {
+        val presenter = createPresenter(
+            params = OnBoardingNode.Params(
+                accountProvider = null,
+                loginHint = null,
+                showBackButton = true,
+            ),
+        )
+        presenter.test {
+            val initialState = awaitItem()
+            assertThat(initialState.showBackButton).isTrue()
+            skipItems(1)
         }
     }
 
@@ -162,6 +178,7 @@ class OnBoardingPresenterTest {
             params = OnBoardingNode.Params(
                 accountProvider = ACCOUNT_PROVIDER_FROM_LINK,
                 loginHint = null,
+                showBackButton = false,
             ),
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, EnterpriseService.ANY_ACCOUNT_PROVIDER) },
@@ -184,6 +201,7 @@ class OnBoardingPresenterTest {
             params = OnBoardingNode.Params(
                 accountProvider = ACCOUNT_PROVIDER_FROM_LINK,
                 loginHint = null,
+                showBackButton = false,
             ),
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG, ACCOUNT_PROVIDER_FROM_CONFIG_2) },
@@ -206,6 +224,7 @@ class OnBoardingPresenterTest {
             params = OnBoardingNode.Params(
                 accountProvider = ACCOUNT_PROVIDER_FROM_LINK,
                 loginHint = null,
+                showBackButton = false,
             ),
             enterpriseService = FakeEnterpriseService(
                 defaultHomeserverListResult = { listOf(ACCOUNT_PROVIDER_FROM_CONFIG) },
@@ -233,11 +252,12 @@ class OnBoardingPresenterTest {
             params = OnBoardingNode.Params(
                 accountProvider = A_HOMESERVER_URL,
                 loginHint = A_LOGIN_HINT,
+                showBackButton = false,
             ),
             enterpriseService = FakeEnterpriseService(
                 isAllowedToConnectToHomeserverResult = { true },
             ),
-            loginHelper = createLoginHelper(
+            loginModePresenter = createLoginModePresenter(
                 authenticationService = authenticationService,
             ),
             accountProviderDataSource = accountProviderDataSource,
@@ -253,24 +273,28 @@ class OnBoardingPresenterTest {
                 assertThat(accountProviderDataSource.flow.first().url).isEqualTo(A_HOMESERVER_URL_2)
                 // Check an error was returned
                 val submittedState = awaitItem()
-                assertThat(submittedState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
+                assertThat(submittedState.loginModeState.loginMode).isInstanceOf(AsyncData.Failure::class.java)
 
                 // Assert the error is then cleared
                 submittedState.eventSink(OnBoardingEvents.ClearError)
                 val clearedState = awaitItem()
-                assertThat(clearedState.loginMode).isEqualTo(AsyncData.Uninitialized)
+                assertThat(clearedState.loginModeState.loginMode).isEqualTo(AsyncData.Uninitialized)
             }
         }
     }
 }
 
 private fun createPresenter(
-    params: OnBoardingNode.Params = OnBoardingNode.Params(null, null),
+    params: OnBoardingNode.Params = OnBoardingNode.Params(
+        accountProvider = null,
+        loginHint = null,
+        showBackButton = false,
+    ),
     buildMeta: BuildMeta = aBuildMeta(),
     enterpriseService: EnterpriseService = FakeEnterpriseService(),
     wellknownRetriever: WellknownRetriever = FakeWellknownRetriever(),
     rageshakeFeatureAvailability: () -> Flow<Boolean> = { flowOf(true) },
-    loginHelper: LoginHelper = createLoginHelper(),
+    loginModePresenter: LoginModePresenter = createLoginModePresenter(),
     onBoardingLogoResIdProvider: OnBoardingLogoResIdProvider = OnBoardingLogoResIdProvider { null },
     sessionStore: SessionStore = InMemorySessionStore(),
     accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
@@ -283,19 +307,26 @@ private fun createPresenter(
         wellknownRetriever = wellknownRetriever,
     ),
     rageshakeFeatureAvailability = rageshakeFeatureAvailability,
-    loginHelper = loginHelper,
+    loginModePresenter = loginModePresenter,
     onBoardingLogoResIdProvider = onBoardingLogoResIdProvider,
     sessionStore = sessionStore,
     accountProviderDataSource = accountProviderDataSource,
-    loginWithClassicPresenter = { aLoginWithClassicState() },
 )
 
-fun createLoginHelper(
-    oidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
+fun createLoginModePresenter(
+    oAuthActionFlow: OAuthActionFlow = FakeOAuthActionFlow(),
     authenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
     webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),
-): LoginHelper = LoginHelper(
-    oidcActionFlow = oidcActionFlow,
+    localNetworkPermissionAdvisor: LocalNetworkPermissionAdvisor =
+        io.element.android.libraries.permissions.test.FakeLocalNetworkPermissionAdvisor(),
+    permissionsPresenterFactory: io.element.android.libraries.permissions.api.PermissionsPresenter.Factory =
+        io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory(),
+): LoginModePresenter = LoginModePresenter(
+    oAuthActionFlow = oAuthActionFlow,
     authenticationService = authenticationService,
     webClientUrlForAuthenticationRetriever = webClientUrlForAuthenticationRetriever,
+    localNetworkPermissionGate = LocalNetworkPermissionGate(
+        advisor = localNetworkPermissionAdvisor,
+        permissionsPresenterFactory = permissionsPresenterFactory,
+    ),
 )
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnboardingViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnboardingViewTest.kt
index c8dcd978c6..1bdcb9bda1 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnboardingViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnboardingViewTest.kt
@@ -6,18 +6,24 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.onboarding
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import com.google.testing.junit.testparameterinjector.KotlinTestParameters.namedTestValues
+import com.google.testing.junit.testparameterinjector.TestParameter
 import io.element.android.features.login.impl.R
 import io.element.android.features.login.impl.login.LoginMode
+import io.element.android.features.login.impl.login.aLoginModeState
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -27,81 +33,69 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTestParameter
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class OnboardingViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class OnboardingViewTest : RobolectricTestParameter() {
     @Test
-    fun `when can create account - clicking on create account calls the expected callback`() {
+    fun `when can create account - clicking on create account calls the expected callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     canCreateAccount = true,
+                    showDeveloperSettings = false,
                     eventSink = eventSink,
                 ),
                 onCreateAccount = callback,
             )
-            rule.clickOn(R.string.screen_onboarding_sign_up)
+            clickOn(R.string.screen_onboarding_sign_up)
+            // Developer settings should not be shown
+            val developerSettingsText = activity!!.getString(CommonStrings.common_developer_options)
+            onNodeWithContentDescription(developerSettingsText).assertDoesNotExist()
         }
     }
 
     @Test
-    fun `when can go back - clicking on back calls the expected callback`() {
+    fun `when can go back - clicking on back calls the expected callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     isAddingAccount = true,
                     eventSink = eventSink,
                 ),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `when can login with QR code - clicking on sign in with QR code calls the expected callback`() {
+    fun `when can login with QR code - clicking on sign in with QR code calls the expected callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     canLoginWithQrCode = true,
                     eventSink = eventSink,
                 ),
                 onSignInWithQrCode = callback,
             )
-            rule.clickOn(R.string.screen_onboarding_sign_in_with_qr_code)
+            clickOn(R.string.screen_onboarding_sign_in_with_qr_code)
         }
     }
 
     @Test
-    fun `when can login with QR code - clicking on sign in manually calls the expected callback - can search account provider`() {
-        `when can login with QR code - clicking on sign in manually calls the expected callback`(
-            mustChooseAccountProvider = false,
+    fun `when can login with QR code - clicking on sign in manually calls the expected callback`(
+        @TestParameter mustChooseAccountProvider: Boolean = namedTestValues(
+            "can search account provider" to false,
+            "cannot search account provider" to true,
         )
-    }
-
-    @Test
-    fun `when can login with QR code - clicking on sign in manually calls the expected callback - cannot search account provider`() {
-        `when can login with QR code - clicking on sign in manually calls the expected callback`(
-            mustChooseAccountProvider = true,
-        )
-    }
-
-    private fun `when can login with QR code - clicking on sign in manually calls the expected callback`(
-        mustChooseAccountProvider: Boolean,
-    ) {
+    ) = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnceWithParam(mustChooseAccountProvider) { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     canLoginWithQrCode = true,
                     mustChooseAccountProvider = mustChooseAccountProvider,
@@ -109,30 +103,20 @@ class OnboardingViewTest {
                 ),
                 onSignIn = callback,
             )
-            rule.clickOn(R.string.screen_onboarding_sign_in_manually)
+            clickOn(R.string.screen_onboarding_sign_in_manually)
         }
     }
 
     @Test
-    fun `when cannot login with QR code or create account - clicking on continue calls the sign in callback - can search account provider`() {
-        `when cannot login with QR code or create account - clicking on continue calls the sign in callback`(
-            mustChooseAccountProvider = false,
+    fun `when cannot login with QR code or create account - clicking on continue calls the sign in callback`(
+        @TestParameter mustChooseAccountProvider: Boolean = namedTestValues(
+            "can search account provider" to false,
+            "cannot search account provider" to true,
         )
-    }
-
-    @Test
-    fun `when cannot login with QR code or create account - clicking on continue calls the sign in callback - cannot search account provider`() {
-        `when cannot login with QR code or create account - clicking on continue calls the sign in callback`(
-            mustChooseAccountProvider = true,
-        )
-    }
-
-    private fun `when cannot login with QR code or create account - clicking on continue calls the sign in callback`(
-        mustChooseAccountProvider: Boolean,
-    ) {
+    ) = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnceWithParam(mustChooseAccountProvider) { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     canLoginWithQrCode = false,
                     canCreateAccount = false,
@@ -141,75 +125,91 @@ class OnboardingViewTest {
                 ),
                 onSignIn = callback,
             )
-            rule.clickOn(CommonStrings.action_continue)
+            clickOn(CommonStrings.action_continue)
         }
     }
 
     @Test
-    fun `when sign in to pre defined account provider - clicking on button emits the expected event`() {
+    fun `when sign in to pre defined account provider - clicking on button emits the expected event`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>()
-        rule.setOnboardingView(
+        setOnboardingView(
             state = anOnBoardingState(
                 defaultAccountProvider = "element.io",
                 eventSink = eventSink,
             ),
         )
-        val buttonText = rule.activity.getString(R.string.screen_onboarding_sign_in_to, "element.io")
-        rule.onNodeWithText(buttonText).performClick()
+        val buttonText = activity!!.getString(R.string.screen_onboarding_sign_in_to, "element.io")
+        onNodeWithText(buttonText).performClick()
         eventSink.assertSingle(OnBoardingEvents.OnSignIn("element.io"))
     }
 
     @Test
-    fun `when error is displayed - closing the dialog emits the expected event`() {
+    fun `when error is displayed - closing the dialog emits the expected event`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>()
-        rule.setOnboardingView(
+        setOnboardingView(
             state = anOnBoardingState(
                 defaultAccountProvider = "element.io",
-                loginMode = AsyncData.Failure(AN_EXCEPTION),
+                loginModeState = aLoginModeState(loginMode = AsyncData.Failure(AN_EXCEPTION)),
                 eventSink = eventSink,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventSink.assertSingle(OnBoardingEvents.ClearError)
     }
 
     @Test
-    fun `clicking on report a problem calls the sign in callback`() {
+    fun `clicking on report a problem calls the sign in callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
                     canReportBug = true,
                     eventSink = eventSink,
                 ),
                 onReportProblem = callback,
             )
-            val text = rule.activity.getString(CommonStrings.common_report_a_problem)
-            rule.onNodeWithText(text).assertExists()
-            rule.clickOn(CommonStrings.common_report_a_problem)
+            val text = activity!!.getString(CommonStrings.common_report_a_problem)
+            onNodeWithText(text).assertExists()
+            clickOn(CommonStrings.common_report_a_problem)
         }
     }
 
     @Test
-    fun `cannot report a problem when the feature is disabled`() {
+    fun `clicking on settings calls the developer settings callback`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
-        rule.setOnboardingView(
+        ensureCalledOnce { callback ->
+            setOnboardingView(
+                state = anOnBoardingState(
+                    showDeveloperSettings = true,
+                    eventSink = eventSink,
+                ),
+                onDeveloperSettingsClick = callback,
+            )
+            val text = activity!!.getString(CommonStrings.common_developer_options)
+            onNodeWithContentDescription(text).performClick()
+        }
+    }
+
+    @Test
+    fun `cannot report a problem when the feature is disabled`() = runAndroidComposeUiTest {
+        val eventSink = EventsRecorder<OnBoardingEvents>(expectEvents = false)
+        setOnboardingView(
             state = anOnBoardingState(
                 canReportBug = false,
                 eventSink = eventSink,
             ),
         )
-        val text = rule.activity.getString(CommonStrings.common_report_a_problem)
-        rule.onNodeWithText(text).assertDoesNotExist()
+        val text = activity!!.getString(CommonStrings.common_report_a_problem)
+        onNodeWithText(text).assertDoesNotExist()
     }
 
     @Test
-    fun `when success PasswordLogin - the expected callback is invoked and the event is received`() {
+    fun `when success PasswordLogin - the expected callback is invoked and the event is received`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>()
         ensureCalledOnce { callback ->
-            rule.setOnboardingView(
+            setOnboardingView(
                 state = anOnBoardingState(
-                    loginMode = AsyncData.Success(LoginMode.PasswordLogin),
+                    loginModeState = aLoginModeState(loginMode = AsyncData.Success(LoginMode.PasswordLogin)),
                     eventSink = eventSink,
                 ),
                 onNeedLoginPassword = callback,
@@ -219,29 +219,29 @@ class OnboardingViewTest {
     }
 
     @Test
-    fun `when success Oidc - the expected callback is invoked and the event is received`() {
+    fun `when success Oidc - the expected callback is invoked and the event is received`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>()
-        val oidcDetails = OidcDetails("aUrl")
-        ensureCalledOnceWithParam(oidcDetails) { callback ->
-            rule.setOnboardingView(
+        val oAuthDetails = OAuthDetails("aUrl")
+        ensureCalledOnceWithParam(oAuthDetails) { callback ->
+            setOnboardingView(
                 state = anOnBoardingState(
-                    loginMode = AsyncData.Success(LoginMode.Oidc(oidcDetails)),
+                    loginModeState = aLoginModeState(loginMode = AsyncData.Success(LoginMode.OAuth(oAuthDetails))),
                     eventSink = eventSink,
                 ),
-                onOidcDetails = callback,
+                onOAuthDetails = callback,
             )
         }
         eventSink.assertSingle(OnBoardingEvents.ClearError)
     }
 
     @Test
-    fun `when success AccountCreation - the expected callback is invoked and the event is received`() {
+    fun `when success AccountCreation - the expected callback is invoked and the event is received`() = runAndroidComposeUiTest {
         val eventSink = EventsRecorder<OnBoardingEvents>()
-        val oidcDetails = OidcDetails("aUrl")
-        ensureCalledOnceWithParam(oidcDetails.url) { callback ->
-            rule.setOnboardingView(
+        val oAuthDetails = OAuthDetails("aUrl")
+        ensureCalledOnceWithParam(oAuthDetails.url) { callback ->
+            setOnboardingView(
                 state = anOnBoardingState(
-                    loginMode = AsyncData.Success(LoginMode.AccountCreation("aUrl")),
+                    loginModeState = aLoginModeState(loginMode = AsyncData.Success(LoginMode.AccountCreation("aUrl"))),
                     eventSink = eventSink,
                 ),
                 onCreateAccountContinue = callback,
@@ -250,14 +250,15 @@ class OnboardingViewTest {
         eventSink.assertSingle(OnBoardingEvents.ClearError)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setOnboardingView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setOnboardingView(
         state: OnBoardingState,
         onBackClick: () -> Unit = EnsureNeverCalled(),
+        onDeveloperSettingsClick: () -> Unit = EnsureNeverCalled(),
         onSignInWithQrCode: () -> Unit = EnsureNeverCalled(),
         onSignIn: (Boolean) -> Unit = EnsureNeverCalledWithParam(),
         onCreateAccount: () -> Unit = EnsureNeverCalled(),
         onReportProblem: () -> Unit = EnsureNeverCalled(),
-        onOidcDetails: (OidcDetails) -> Unit = EnsureNeverCalledWithParam(),
+        onOAuthDetails: (OAuthDetails) -> Unit = EnsureNeverCalledWithParam(),
         onNeedLoginPassword: () -> Unit = EnsureNeverCalled(),
         onLearnMoreClick: () -> Unit = EnsureNeverCalled(),
         onCreateAccountContinue: (url: String) -> Unit = EnsureNeverCalledWithParam(),
@@ -266,11 +267,12 @@ class OnboardingViewTest {
             OnBoardingView(
                 state = state,
                 onBackClick = onBackClick,
+                onDeveloperSettingsClick = onDeveloperSettingsClick,
                 onSignInWithQrCode = onSignInWithQrCode,
                 onSignIn = onSignIn,
                 onCreateAccount = onCreateAccount,
                 onReportProblem = onReportProblem,
-                onOidcDetails = onOidcDetails,
+                onOAuthDetails = onOAuthDetails,
                 onNeedLoginPassword = onNeedLoginPassword,
                 onLearnMoreClick = onLearnMoreClick,
                 onCreateAccountContinue = onCreateAccountContinue,
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenterTest.kt
deleted file mode 100644
index 437e65f21d..0000000000
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/LoginWithClassicPresenterTest.kt
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-@file:OptIn(ExperimentalCoroutinesApi::class)
-
-package io.element.android.features.login.impl.screens.onboarding.classic
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.matrix.test.A_SECRET
-import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
-import io.element.android.libraries.sessionstorage.test.aSessionData
-import io.element.android.tests.testutils.WarmUpRule
-import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.element.android.tests.testutils.test
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
-import org.junit.Test
-
-class LoginWithClassicPresenterTest {
-    @get:Rule
-    val warmUpRule = WarmUpRule()
-
-    @Test
-    fun `present - initial state - feature disabled - start is not invoked`() = runTest {
-        val presenter = createPresenter(
-            elementClassicConnection = FakeElementClassicConnection(
-                startResult = {
-                    error("start should not be invoked when feature is disabled")
-                },
-            )
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.canLoginWithClassic).isFalse()
-            assertThat(initialState.loginWithClassicAction.isUninitialized()).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - feature enabled - start is invoked`() = runTest {
-        val startResult = lambdaRecorder<Unit> {}
-        val presenter = createPresenter(
-            elementClassicConnection = FakeElementClassicConnection(
-                startResult = startResult,
-            ),
-            isFeatureEnabled = true,
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.canLoginWithClassic).isFalse()
-            assertThat(initialState.loginWithClassicAction.isUninitialized()).isTrue()
-            val finalState = awaitItem()
-            assertThat(finalState.canLoginWithClassic).isFalse()
-        }
-        startResult.assertions().isCalledOnce()
-    }
-
-    @Test
-    fun `present - emit request data invokes the expected method`() = runTest {
-        val requestDataResult = lambdaRecorder<Unit> {}
-        val presenter = createPresenter(
-            elementClassicConnection = FakeElementClassicConnection(
-                startResult = {},
-                requestDataResult = requestDataResult,
-            ),
-            isFeatureEnabled = true,
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            assertThat(initialState.canLoginWithClassic).isFalse()
-            assertThat(initialState.loginWithClassicAction.isUninitialized()).isTrue()
-            val nextState = awaitItem()
-            assertThat(nextState.canLoginWithClassic).isFalse()
-            nextState.eventSink(LoginWithClassicEvent.RefreshData)
-        }
-        requestDataResult.assertions().isCalledOnce()
-    }
-
-    @Test
-    fun `present - start login with wrong state emits an error`() = runTest {
-        val presenter = createPresenter(
-            elementClassicConnection = FakeElementClassicConnection(
-                startResult = {},
-            ),
-            isFeatureEnabled = true,
-        )
-        presenter.test {
-            skipItems(1)
-            val state = awaitItem()
-            state.eventSink(LoginWithClassicEvent.StartLoginWithClassic)
-            val errorState = awaitItem()
-            assertThat(errorState.loginWithClassicAction.isFailure()).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - start login with correct state - user cancel`() = runTest {
-        val elementClassicConnection = FakeElementClassicConnection(
-            startResult = {},
-        )
-        val presenter = createPresenter(
-            elementClassicConnection = elementClassicConnection,
-            isFeatureEnabled = true,
-        )
-        presenter.test {
-            skipItems(2)
-            elementClassicConnection.emitState(
-                ElementClassicConnectionState.ElementClassicReady(userId = A_USER_ID, secrets = A_SECRET)
-            )
-            val readyState = awaitItem()
-            assertThat(readyState.canLoginWithClassic).isTrue()
-            readyState.eventSink(LoginWithClassicEvent.StartLoginWithClassic)
-            val confirmingState = awaitItem()
-            assertThat(confirmingState.loginWithClassicAction.isConfirming()).isTrue()
-            assertThat((confirmingState.loginWithClassicAction as ConfirmingLoginWithElementClassic).userId).isEqualTo(A_USER_ID)
-            confirmingState.eventSink(LoginWithClassicEvent.CloseDialog)
-            val finalState = awaitItem()
-            assertThat(finalState.loginWithClassicAction.isUninitialized()).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - start login with correct state - user confirms`() = runTest {
-        val elementClassicConnection = FakeElementClassicConnection(
-            startResult = {},
-        )
-        val presenter = createPresenter(
-            elementClassicConnection = elementClassicConnection,
-            isFeatureEnabled = true,
-        )
-        presenter.test {
-            skipItems(2)
-            elementClassicConnection.emitState(
-                ElementClassicConnectionState.ElementClassicReady(userId = A_USER_ID, secrets = A_SECRET)
-            )
-            val readyState = awaitItem()
-            assertThat(readyState.canLoginWithClassic).isTrue()
-            readyState.eventSink(LoginWithClassicEvent.StartLoginWithClassic)
-            val confirmingState = awaitItem()
-            assertThat(confirmingState.loginWithClassicAction.isConfirming()).isTrue()
-            assertThat((confirmingState.loginWithClassicAction as ConfirmingLoginWithElementClassic).userId).isEqualTo(A_USER_ID)
-            confirmingState.eventSink(LoginWithClassicEvent.DoLoginWithClassic)
-            val loadingState = awaitItem()
-            assertThat(loadingState.loginWithClassicAction.isLoading()).isTrue()
-            val finalState = awaitItem()
-            assertThat(finalState.loginWithClassicAction.isSuccess()).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - cannot sign in if a session with the same account already exists`() = runTest {
-        val elementClassicConnection = FakeElementClassicConnection(
-            startResult = {},
-        )
-        val presenter = createPresenter(
-            elementClassicConnection = elementClassicConnection,
-            isFeatureEnabled = true,
-            sessionStore = InMemorySessionStore(
-                initialList = listOf(
-                    aSessionData(
-                        sessionId = A_USER_ID.value,
-                    )
-                )
-            ),
-        )
-        presenter.test {
-            skipItems(2)
-            elementClassicConnection.emitState(
-                ElementClassicConnectionState.ElementClassicReady(userId = A_USER_ID, secrets = A_SECRET)
-            )
-            // No new item, because canLoginWithClassic is still false
-        }
-    }
-
-    @Test
-    fun `present - cannot sign in if the feature is disabled`() = runTest {
-        val elementClassicConnection = FakeElementClassicConnection()
-        val presenter = createPresenter(
-            elementClassicConnection = elementClassicConnection,
-            isFeatureEnabled = false,
-        )
-        presenter.test {
-            skipItems(1)
-            // Note: it should not happen IRL
-            elementClassicConnection.emitState(
-                ElementClassicConnectionState.ElementClassicReady(userId = A_USER_ID, secrets = A_SECRET)
-            )
-            // No new item, because canLoginWithClassic is still false
-        }
-    }
-}
-
-private fun createPresenter(
-    elementClassicConnection: ElementClassicConnection = FakeElementClassicConnection(),
-    sessionStore: SessionStore = InMemorySessionStore(),
-    isFeatureEnabled: Boolean = false,
-    featureFlagService: FeatureFlagService = FakeFeatureFlagService(
-        initialState = mapOf(FeatureFlags.SignInWithClassic.key to isFeatureEnabled)
-    ),
-) = LoginWithClassicPresenter(
-    elementClassicConnection = elementClassicConnection,
-    sessionStore = sessionStore,
-    featureFlagService = featureFlagService,
-)
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationViewTest.kt
index a0469a684e..8c1802a3c5 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/confirmation/QrCodeConfirmationViewTest.kt
@@ -6,49 +6,45 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.qrcode.confirmation
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class QrCodeConfirmationViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class QrCodeConfirmationViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeConfirmationView(
+            setQrCodeConfirmationView(
                 step = QrCodeConfirmationStep.DisplayCheckCode("12"),
                 onCancel = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on Cancel button clicked - calls the expected callback`() {
+    fun `on Cancel button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeConfirmationView(
+            setQrCodeConfirmationView(
                 step = QrCodeConfirmationStep.DisplayVerificationCode("123456"),
                 onCancel = callback
             )
-            rule.clickOn(CommonStrings.action_cancel)
+            clickOn(CommonStrings.action_cancel)
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setQrCodeConfirmationView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setQrCodeConfirmationView(
         step: QrCodeConfirmationStep,
         onCancel: () -> Unit
     ) {
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorViewTest.kt
index de0f689220..976d98c594 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/error/QrCodeErrorViewTest.kt
@@ -6,59 +6,55 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.qrcode.error
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.login.impl.qrcode.QrCodeErrorScreenType
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class QrCodeErrorViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class QrCodeErrorViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the onCancel callback`() {
+    fun `on back pressed - calls the onCancel callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeErrorView(
+            setQrCodeErrorView(
                 onCancel = callback,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on try again button clicked - calls the expected callback`() {
+    fun `on try again button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeErrorView(
+            setQrCodeErrorView(
                 onRetry = callback,
             )
-            rule.clickOn(CommonStrings.action_try_again)
+            clickOn(CommonStrings.action_try_again)
         }
     }
 
     @Test
-    fun `on cancel button clicked - calls the expected callback`() {
+    fun `on cancel button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeErrorView(
+            setQrCodeErrorView(
                 onCancel = callback,
             )
-            rule.clickOn(CommonStrings.action_cancel)
+            clickOn(CommonStrings.action_cancel)
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setQrCodeErrorView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setQrCodeErrorView(
         onRetry: () -> Unit = EnsureNeverCalled(),
         onCancel: () -> Unit = EnsureNeverCalled(),
         errorScreenType: QrCodeErrorScreenType = QrCodeErrorScreenType.UnknownError,
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt
index cec67e5011..5720c68ab4 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.qrcode.intro
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.login.impl.R
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
@@ -19,42 +21,36 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class QrCodeIntroViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class QrCodeIntroViewTest : RobolectricTest() {
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeIntroView(
+            setQrCodeIntroView(
                 state = aQrCodeIntroState(),
                 onBackClicked = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on back button clicked - calls the expected callback`() {
+    fun `on back button clicked - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeIntroView(
+            setQrCodeIntroView(
                 state = aQrCodeIntroState(),
                 onBackClicked = callback
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `when can continue - calls the expected callback`() {
+    fun `when can continue - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeIntroView(
+            setQrCodeIntroView(
                 state = aQrCodeIntroState(canContinue = true),
                 onContinue = callback
             )
@@ -62,16 +58,16 @@ class QrCodeIntroViewTest {
     }
 
     @Test
-    fun `on submit button clicked - emits the Continue event`() {
+    fun `on submit button clicked - emits the Continue event`() = runAndroidComposeUiTest {
         val eventRecorder = EventsRecorder<QrCodeIntroEvents>()
-        rule.setQrCodeIntroView(
+        setQrCodeIntroView(
             state = aQrCodeIntroState(eventSink = eventRecorder),
         )
-        rule.clickOn(R.string.screen_qr_code_login_initial_state_button_title)
+        clickOn(R.string.screen_qr_code_login_initial_state_button_title)
         eventRecorder.assertSingle(QrCodeIntroEvents.Continue)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setQrCodeIntroView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setQrCodeIntroView(
         state: QrCodeIntroState,
         onBackClicked: () -> Unit = EnsureNeverCalled(),
         onContinue: () -> Unit = EnsureNeverCalled(),
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt
index 65a0713f64..d4f23a452c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanPresenterTest.kt
@@ -9,18 +9,12 @@
 package io.element.android.features.login.impl.screens.qrcode.scan
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.features.enterprise.test.FakeEnterpriseService
-import io.element.android.features.login.impl.accesscontrol.DefaultAccountProviderAccessControl
-import io.element.android.features.login.impl.changeserver.AccountProviderAccessException
 import io.element.android.features.login.impl.qrcode.FakeQrCodeLoginManager
-import io.element.android.features.wellknown.test.FakeWellknownRetriever
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrLoginException
 import io.element.android.libraries.matrix.test.auth.qrlogin.FakeMatrixQrCodeLoginData
 import io.element.android.libraries.matrix.test.auth.qrlogin.FakeMatrixQrCodeLoginDataFactory
-import io.element.android.libraries.wellknown.api.WellknownRetriever
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
@@ -53,9 +47,6 @@ class QrCodeScanPresenterTest {
         )
         val presenter = createQrCodeScanPresenter(
             qrCodeLoginDataFactory = qrCodeLoginDataFactory,
-            enterpriseService = FakeEnterpriseService(
-                isAllowedToConnectToHomeserverResult = { true },
-            )
         )
         presenter.test {
             val initialState = awaitItem()
@@ -66,44 +57,6 @@ class QrCodeScanPresenterTest {
         }
     }
 
-    @Test
-    fun `present - scanned QR code successfully, but homeserver not allowed`() = runTest {
-        val qrCodeLoginDataFactory = FakeMatrixQrCodeLoginDataFactory(
-            parseQrCodeLoginDataResult = {
-                Result.success(
-                    FakeMatrixQrCodeLoginData(
-                        serverNameResult = { "example.com" }
-                    )
-                )
-            }
-        )
-        val presenter = createQrCodeScanPresenter(
-            qrCodeLoginDataFactory = qrCodeLoginDataFactory,
-            enterpriseService = FakeEnterpriseService(
-                isAllowedToConnectToHomeserverResult = { false },
-                defaultHomeserverListResult = { listOf("element.io") },
-            )
-        )
-        presenter.test {
-            val initialState = awaitItem()
-            initialState.eventSink(QrCodeScanEvents.QrCodeScanned(byteArrayOf()))
-            assertThat(awaitItem().isScanning).isFalse()
-            assertThat(awaitItem().authenticationAction.isLoading()).isTrue()
-            awaitItem().also { state ->
-                assertThat(
-                    (state.authenticationAction
-                        .errorOrNull() as AccountProviderAccessException.UnauthorizedAccountProviderException).unauthorisedAccountProviderTitle
-                )
-                    .isEqualTo("example.com")
-                assertThat(
-                    (state.authenticationAction
-                        .errorOrNull() as AccountProviderAccessException.UnauthorizedAccountProviderException).authorisedAccountProviderTitles
-                )
-                    .containsExactly("element.io")
-            }
-        }
-    }
-
     @Test
     fun `present - scanned QR code failed and can be retried`() = runTest {
         val qrCodeLoginDataFactory = FakeMatrixQrCodeLoginDataFactory(
@@ -153,15 +106,9 @@ class QrCodeScanPresenterTest {
         qrCodeLoginDataFactory: FakeMatrixQrCodeLoginDataFactory = FakeMatrixQrCodeLoginDataFactory(),
         coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         qrCodeLoginManager: FakeQrCodeLoginManager = FakeQrCodeLoginManager(),
-        enterpriseService: EnterpriseService = FakeEnterpriseService(),
-        wellknownRetriever: WellknownRetriever = FakeWellknownRetriever(),
     ) = QrCodeScanPresenter(
         qrCodeLoginDataFactory = qrCodeLoginDataFactory,
         qrCodeLoginManager = qrCodeLoginManager,
         coroutineDispatchers = coroutineDispatchers,
-        defaultAccountProviderAccessControl = DefaultAccountProviderAccessControl(
-            enterpriseService = enterpriseService,
-            wellknownRetriever = wellknownRetriever,
-        ),
     )
 }
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanViewTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanViewTest.kt
index b8becd545f..c0c7c084a8 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanViewTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanViewTest.kt
@@ -6,13 +6,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.login.impl.screens.qrcode.scan
 
 import androidx.activity.ComponentActivity
 import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import androidx.test.platform.app.InstrumentationRegistry
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
@@ -22,18 +24,12 @@ import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.After
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class QrCodeScanViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class QrCodeScanViewTest : RobolectricTest() {
     private var provider: ProcessCameraProvider? = null
 
     @Before
@@ -48,28 +44,28 @@ class QrCodeScanViewTest {
     }
 
     @Test
-    fun `on back pressed - calls the expected callback`() {
+    fun `on back pressed - calls the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setQrCodeScanView(
+            setQrCodeScanView(
                 state = aQrCodeScanState(),
                 onBackClick = callback
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `on QR code data ready - calls the expected callback`() {
+    fun `on QR code data ready - calls the expected callback`() = runAndroidComposeUiTest {
         val data = FakeMatrixQrCodeLoginData()
         ensureCalledOnceWithParam<MatrixQrCodeLoginData>(data) { callback ->
-            rule.setQrCodeScanView(
+            setQrCodeScanView(
                 state = aQrCodeScanState(authenticationAction = AsyncAction.Success(data)),
                 onQrCodeDataReady = callback
             )
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setQrCodeScanView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setQrCodeScanView(
         state: QrCodeScanState,
         onBackClick: () -> Unit = EnsureNeverCalled(),
         onQrCodeDataReady: (MatrixQrCodeLoginData) -> Unit = EnsureNeverCalledWithParam(),
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
index 87afb77474..29c5d4a86c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
@@ -13,6 +13,7 @@ import io.element.android.features.login.impl.changeserver.aChangeServerState
 import io.element.android.features.login.impl.resolver.HomeserverResolver
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.test.auth.FakeHomeServerLoginCompatibilityChecker
+import io.element.android.libraries.permissions.test.FakeLocalNetworkPermissionAdvisor
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -30,7 +31,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - initial state`() = runTest {
         val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.success(true) })
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker, FakeLocalNetworkPermissionAdvisor()),
             changeServerPresenter = { aChangeServerState() }
         )
         presenter.test {
@@ -44,7 +45,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - error while checking login compatibility`() = runTest {
         val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.failure(IllegalStateException("Oops")) })
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker, FakeLocalNetworkPermissionAdvisor()),
             changeServerPresenter = { aChangeServerState() }
         )
         presenter.test {
@@ -68,7 +69,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - enter text no result`() = runTest {
         val fakeWellknownRetriever = FakeHomeServerLoginCompatibilityChecker(checkResult = { Result.success(false) })
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeWellknownRetriever, FakeLocalNetworkPermissionAdvisor()),
             changeServerPresenter = { aChangeServerState() }
         )
         presenter.test {
@@ -101,7 +102,7 @@ class SearchAccountProviderPresenterTest {
         }
         val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = checkResult)
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker, FakeLocalNetworkPermissionAdvisor()),
             changeServerPresenter = { aChangeServerState() }
         )
         presenter.test {
@@ -141,7 +142,7 @@ class SearchAccountProviderPresenterTest {
         }
         val fakeLoginCompatibilityChecker = FakeHomeServerLoginCompatibilityChecker(checkResult = checkResult)
         val presenter = SearchAccountProviderPresenter(
-            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker),
+            homeserverResolver = HomeserverResolver(testCoroutineDispatchers(), fakeLoginCompatibilityChecker, FakeLocalNetworkPermissionAdvisor()),
             changeServerPresenter = { aChangeServerState() }
         )
         presenter.test {
diff --git a/features/logout/impl/build.gradle.kts b/features/logout/impl/build.gradle.kts
index 8de7718980..d5356ced63 100644
--- a/features/logout/impl/build.gradle.kts
+++ b/features/logout/impl/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.workmanager.api)
     api(projects.features.logout.api)
 
diff --git a/features/logout/impl/src/main/res/values-be/translations.xml b/features/logout/impl/src/main/res/values-be/translations.xml
index bc005e2bd2..0aab51833f 100644
--- a/features/logout/impl/src/main/res/values-be/translations.xml
+++ b/features/logout/impl/src/main/res/values-be/translations.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Вы ўпэўнены, што хочаце выйсці?"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Вы ўпэўненыя, што хочаце выдаліць гэту прыладу?"</string>
   <string name="screen_signout_confirmation_dialog_submit">"Выйсці"</string>
   <string name="screen_signout_confirmation_dialog_title">"Выйсці"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выхад…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Выдаленне прылады…"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"Вы збіраецеся выйсці з апошняга сеанса. Калі вы выйдзеце з сістэмы зараз, вы страціце доступ да зашыфраваных паведамленняў."</string>
   <string name="screen_signout_key_backup_disabled_title">"Вы адключылі рэзервовае капіраванне"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"Вашы ключы ўсё яшчэ захоўваліся, калі вы выйшлі з сеткі. Паўторна падключыцеся, каб можна было стварыць рэзервовую копію вашых ключоў перад выхадам."</string>
diff --git a/features/logout/impl/src/main/res/values-ca/translations.xml b/features/logout/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..eb0c82bb15
--- /dev/null
+++ b/features/logout/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signout_confirmation_dialog_content">"Segur que vols tancar sessió?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Tanca sessió"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Tanca sessió"</string>
+  <string name="screen_signout_in_progress_dialog_content">"S\'està tancant la sessió…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Estàs a punt de tancar sessió. Si tanques sessió ara, perdràs l\'accés als missatges xifrats."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Has desactivat la còpia de seguretat"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Encara tens una còpia de seguretat de les teves claus i t\'has desconnectat. Torna a connectar-te per poder fer una còpia de seguretat de les teves claus abans de tancar la sessió."</string>
+  <string name="screen_signout_key_backup_offline_title">"Encara s\'està fent una còpia de seguretat de les teves claus"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Espera a que s\'hagi completat abans de tancar sessió."</string>
+  <string name="screen_signout_key_backup_ongoing_title">"Encara s\'està fent una còpia de seguretat de les teves claus"</string>
+  <string name="screen_signout_preference_item">"Tanca sessió"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Estàs a punt de tancar sessió a la teva última i única sessió. Si tanques sessió ara, perdràs l\'accés als missatges xifrats."</string>
+  <string name="screen_signout_recovery_disabled_title">"Recuperació no configurada"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Estàs a punt de tancar sessió. Si tanques sessió ara, pot ser que perdis l\'accés als missatges xifrats."</string>
+</resources>
diff --git a/features/logout/impl/src/main/res/values-cs/translations.xml b/features/logout/impl/src/main/res/values-cs/translations.xml
index e2c2a68fd5..e19512c017 100644
--- a/features/logout/impl/src/main/res/values-cs/translations.xml
+++ b/features/logout/impl/src/main/res/values-cs/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Opravdu se chcete odhlásit?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Odhlásit se"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Odhlásit se"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odhlašování…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Chystáte se odhlásit z poslední relace. Pokud se nyní odhlásíte, ztratíte přístup ke svým šifrovaným zprávám."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Vypnuli jste zálohování"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Když jste přešli do režimu offline, vaše klíče se ještě stále zálohovaly. Znovu se připojte, aby bylo možné před odhlášením zálohovat vaše klíče."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Opravdu chcete odstranit toto zařízení?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Odebrat toto zařízení"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Odebrat toto zařízení"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odebírání zařízení…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Toto je vaše jediné zařízení. Pokud ho odstraníte, budete potřebovat klíč pro obnovení, abyste si při příštím přihlášení ověřili svou digitální identitu a obnovili šifrované chaty."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Chystáte se ztratit přístup ke svým šifrovaným chatům"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Vaše klíče se stále zálohovaly, když jste byli offline. Před odpojením tohoto zařízení se znovu připojte, aby se vaše klíče mohly zálohovat."</string>
   <string name="screen_signout_key_backup_offline_title">"Vaše klíče jsou stále zálohovány"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Před odhlášením prosím počkejte na dokončení."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Před odstraněním tohoto zařízení počkejte, až se proces dokončí."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Vaše klíče jsou stále zálohovány"</string>
-  <string name="screen_signout_preference_item">"Odhlásit se"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Chystáte se odhlásit z poslední relace. Pokud se nyní odhlásíte, ztratíte přístup ke svým šifrovaným zprávám."</string>
-  <string name="screen_signout_recovery_disabled_title">"Obnovení není nastaveno"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Chystáte se odhlásit z poslední relace. Pokud se nyní odhlásíte, můžete ztratit přístup k šifrovaným zprávám."</string>
-  <string name="screen_signout_save_recovery_key_title">"Uložili jste si klíč pro obnovení?"</string>
+  <string name="screen_signout_preference_item">"Odebrat toto zařízení"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Toto je vaše jediné zařízení. Pokud ho odstraníte, budete potřebovat klíč pro obnovení, abyste si při příštím přihlášení ověřili svou digitální identitu a obnovili šifrované chaty."</string>
+  <string name="screen_signout_recovery_disabled_title">"Chystáte se ztratit přístup ke svým šifrovaným chatům"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Toto je vaše jediné zařízení. Pokud ho odstraníte, budete potřebovat klíč pro obnovení, abyste si při příštím přihlášení ověřili svou digitální identitu a obnovili šifrované chaty."</string>
+  <string name="screen_signout_save_recovery_key_title">"Před odebráním tohoto zařízení se ujistěte, že máte přístup ke klíči pro obnovení"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-da/translations.xml b/features/logout/impl/src/main/res/values-da/translations.xml
index a828cd48b8..6bf98f8db5 100644
--- a/features/logout/impl/src/main/res/values-da/translations.xml
+++ b/features/logout/impl/src/main/res/values-da/translations.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Er du sikker på, at du vil logge ud?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Log ud"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Log ud"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logger ud…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Du er ved at logge ud af din sidste session. Hvis du logger ud nu, mister du adgangen til dine krypterede meddelelser."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Du har slået sikkerhedskopiering fra"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Dine nøgler blev stadig sikkerhedskopieret, da du gik offline. Opret forbindelse igen, så dine nøgler kan sikkerhedskopieres, før du logger ud."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Er du sikker på, at ønsker at fjerne denne enhed?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Fjern denne enhed"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Fjern denne enhed"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Fjerner enhed…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Dette er din eneste enhed. Hvis du fjerner den, skal du bruge en gendannelsesnøgle for at bekræfte din digitale identitet og gendanne dine krypterede chats, næste gang du logger ind."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Du er ved at miste adgangen til dine krypterede chats"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Dine nøgler blev stadig sikkerhedskopieret, da du gik offline. Opret forbindelse igen, så dine nøgler kan sikkerhedskopieres, før du fjerner denne enhed."</string>
   <string name="screen_signout_key_backup_offline_title">"Dine nøgler bliver stadig sikkerhedskopieret"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Vent på, at dette er fuldført, før du logger ud."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Vent venligst, indtil dette er færdigt, før du fjerner denne enhed."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Dine nøgler bliver stadig sikkerhedskopieret"</string>
-  <string name="screen_signout_preference_item">"Log ud"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Du er ved at logge ud af din sidste session. Hvis du logger af nu, mister du adgangen til dine krypterede meddelelser."</string>
-  <string name="screen_signout_recovery_disabled_title">"Gendannelse er ikke konfigureret"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Du er ved at logge ud af din sidste session. Hvis du logger af nu, kan du miste adgangen til dine krypterede meddelelser."</string>
+  <string name="screen_signout_preference_item">"Fjern denne enhed"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Dette er din eneste enhed. Hvis du fjerner den, skal du bruge en gendannelsesnøgle for at bekræfte din digitale identitet og gendanne dine krypterede chats, næste gang du logger ind."</string>
+  <string name="screen_signout_recovery_disabled_title">"Du er ved at miste adgangen til dine krypterede chats"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Dette er din eneste enhed. Hvis du fjerner den, skal du bruge en gendannelsesnøgle for at bekræfte din digitale identitet og gendanne dine krypterede chats, næste gang du logger ind."</string>
+  <string name="screen_signout_save_recovery_key_title">"Sørg for, at du har adgang til din gendannelsesnøgle, før du fjerner denne enhed."</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-de/translations.xml b/features/logout/impl/src/main/res/values-de/translations.xml
index 8ebea45c0e..0218642abc 100644
--- a/features/logout/impl/src/main/res/values-de/translations.xml
+++ b/features/logout/impl/src/main/res/values-de/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Möchtest du dich wirklich abmelden?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Abmelden"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Abmelden"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Abmelden…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Du bist dabei, dich von deiner letzten Sitzung abzumelden. Wenn dich jetzt abmeldest, verlierst du den Zugriff auf deine verschlüsselten Nachrichten."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Du hast das Backup deaktiviert"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Das Backup deiner Schlüssel lief noch, als du offline gegangen bist. Verbinde dich erneut, damit deine Schlüssel vor dem Abmelden gesichert werden können."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Bist du sicher, dass du dieses Gerät entfernen möchtest?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Dieses Gerät entfernen"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Dieses Gerät entfernen"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Gerät wird entfernt…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Dies ist dein einziges Gerät. Wenn du es entfernst, benötigst du einen Wiederherstellungsschlüssel, um deine digitale Identität zu bestätigen und deine verschlüsselten Chats bei deiner nächsten Anmeldung wiederherzustellen."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Du bist dabei, den Zugriff auf deine verschlüsselten Chats zu verlieren"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Deine Schlüssel wurden noch gesichert, während du offline gegangen bist. Stelle die Verbindung wieder her, damit deine Schlüssel gesichert werden können, bevor du dieses Gerät entfernst."</string>
   <string name="screen_signout_key_backup_offline_title">"Deine Schlüssel werden noch gesichert"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Bitte warte, bis dieser Vorgang abgeschlossen ist, bevor du dich abmeldest."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Bitte warte, bis der Vorgang abgeschlossen ist, bevor du dieses Gerät entfernst."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Deine Schlüssel werden noch gesichert"</string>
-  <string name="screen_signout_preference_item">"Abmelden"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Du bist dabei, dich von deiner letzten Sitzung abzumelden. Wenn du dich jetzt abmeldest, verlierst du den Zugriff auf deine verschlüsselten Nachrichten."</string>
-  <string name="screen_signout_recovery_disabled_title">"Wiederherstellung nicht eingerichtet"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Du bist dabei, dich von deiner letzten Sitzung abzumelden. Wenn du dich jetzt abmeldest, verlierst du möglicherweise den Zugriff auf deine verschlüsselten Nachrichten."</string>
-  <string name="screen_signout_save_recovery_key_title">"Hast du deinen Wiederherstellungsschlüssel gespeichert?"</string>
+  <string name="screen_signout_preference_item">"Dieses Gerät entfernen"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Dies ist dein einziges Gerät. Wenn du es entfernst, benötigst du einen Wiederherstellungsschlüssel, um deine digitale Identität zu bestätigen und deine verschlüsselten Chats bei deiner nächsten Anmeldung wiederherzustellen."</string>
+  <string name="screen_signout_recovery_disabled_title">"Du bist dabei, den Zugriff auf deine verschlüsselten Chats zu verlieren"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Dies ist dein einziges Gerät. Wenn du es entfernst, benötigst du einen Wiederherstellungsschlüssel, um deine digitale Identität zu bestätigen und deine verschlüsselten Chats bei deiner nächsten Anmeldung wiederherzustellen."</string>
+  <string name="screen_signout_save_recovery_key_title">"Stelle sicher, dass du Zugriff auf deinen Wiederherstellungsschlüssel hast, bevor du dieses Gerät entfernst"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-et/translations.xml b/features/logout/impl/src/main/res/values-et/translations.xml
index 4bdf169576..cd29e13354 100644
--- a/features/logout/impl/src/main/res/values-et/translations.xml
+++ b/features/logout/impl/src/main/res/values-et/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Kas sa oled kindel, et soovid välja logida?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Logi välja"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Logi välja"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logime välja…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Oled oma viimasest seansist välja logimas. Kui logid nüüd välja, kaotad ligipääsu oma krüptitud sõnumitele."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Sa oled varukoopiate tegemise välja lülitanud"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Kui su võrguühendus katkes, siis sinu krüptovõtmed oli parasjagu varundamisel. Loo võrguühendus uuesti, oota kuni krüptovõtmete varundamine lõppeb ja alles siis logi rakendusest välja."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Kas sa oled kindel, et soovid selle seadme eemaldada?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Eemalda see seade"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Eemalda see seade"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eemaldan seadet…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"See on sinu ainus seade. Kui sa selle eemaldad, vajad taastamisvõtit, et kinnitada oma digitaalset identiteeti ja taastada järgmisel sisselogimisel oma krüptitud vestlused."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Sa kaotad peagi juurdepääsu oma krüptitud vestlustele"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Kui su võrguühendus katkes, siis sinu krüptovõtmed oli parasjagu varundamisel. Loo võrguühendus uuesti, oota kuni krüptovõtmete varundamine lõppeb ja alles siis eemalda see seade."</string>
   <string name="screen_signout_key_backup_offline_title">"Sinu krüptovõtmed on veel varundamisel"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Enne väljalogimist palun oota, et pooleliolev toiming lõppeb."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Enne selle seadme eemaldamist palun oota, et pooleliolev toiming lõppeb."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Sinu krüptovõtmed on veel varundamisel"</string>
-  <string name="screen_signout_preference_item">"Logi välja"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Sa oled logimas välja oma viimasest sessioonist. Kui teed seda nüüd, siis kaotad ligipääsu oma krüptitud sõnumitele."</string>
+  <string name="screen_signout_preference_item">"Eemalda see seade"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"See on sinu ainus seade. Kui sa selle eemaldad, vajad taastamisvõtit, et kinnitada oma digitaalset identiteeti ja taastada järgmisel sisselogimisel oma krüptitud vestlused."</string>
   <string name="screen_signout_recovery_disabled_title">"Andmete taastamine on seadistamata"</string>
   <string name="screen_signout_save_recovery_key_subtitle">"Sa oled logimas välja oma viimasest sessioonist. Kui teed seda nüüd, siis ilmselt kaotad ligipääsu oma krüptitud sõnumitele."</string>
-  <string name="screen_signout_save_recovery_key_title">"Kas sa oled oma taastevõtme salvestanud?"</string>
+  <string name="screen_signout_save_recovery_key_title">"Enne selle seadme eemaldamist veendu, et sul on juurdepääs taastevõtmele"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-fa/translations.xml b/features/logout/impl/src/main/res/values-fa/translations.xml
index 8dfaad8580..a540b9be37 100644
--- a/features/logout/impl/src/main/res/values-fa/translations.xml
+++ b/features/logout/impl/src/main/res/values-fa/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"مطمئنید که می‌خواهید از حسابتان خارج شوید؟"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"خروج"</string>
-  <string name="screen_signout_confirmation_dialog_title">"خروج"</string>
-  <string name="screen_signout_in_progress_dialog_content">"خارج شدن…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"دارید از واپسین نشستتان خارج می‌شوید. اگر اکنون خارج شوید پیام‌های رمزنگاشته‌تان را از دست خواهید داد."</string>
-  <string name="screen_signout_key_backup_disabled_title">"پشتیبان را خاموش کرده‌اید"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"در هنگامی که آفلاین شدید، کلیدهای شما هنوز در حال پشتیبان‌گیری بودند. دوباره متصل شوید ، تا قبل از خروج از کلیدهایتان نسخه پشتیبان‌ گرفته شود."</string>
+  <string name="screen_signout_confirmation_dialog_content">"مطمئنید که می‌خواهید این افزاره را بردارید؟"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"برداشتن این افزاره"</string>
+  <string name="screen_signout_confirmation_dialog_title">"برداشتن این افزاره"</string>
+  <string name="screen_signout_in_progress_dialog_content">"برداشتن افزاره…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"این تنها دستگاه شماست. اگر آن را جدا کنید، برای تأیید هویت دیجیتال خود و بازیابی چت‌های رمزگذاری شده‌تان در دفعه بعد که وارد سیستم می‌شوید، به یک کلید بازیابی نیاز خواهید داشت."</string>
+  <string name="screen_signout_key_backup_disabled_title">"شما در درحال از دست دادن دسترسی به چت‌های رمزگذاری‌شده‌تان هستید."</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"وقتی آفلاین شدید، کلیدهای شما هنوز در حال پشتیبان‌گیری بودند. دوباره متصل شوید تا قبل از جدا کردن این دستگاه، از کلیدهایتان پشتیبان‌گیری شود."</string>
   <string name="screen_signout_key_backup_offline_title">"کلیدهایتان هنوز در حال پشتیبان گیریند"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"لطفاً پیش از خروج منتظر پایانش شوید."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"لطفاً قبل از خروج از این دستگاه، منتظر بمانید تا این مراحل تکمیل شود."</string>
   <string name="screen_signout_key_backup_ongoing_title">"کلیدهایتان هنوز در حال پشتیبان گیریند"</string>
-  <string name="screen_signout_preference_item">"خروج"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"شما در آستانه خروج از آخرین جلسه خود هستید. اگر اکنون از سیستم خارج شوید، دسترسی به پیام های رمزگذاری شده تان را از دست خواهید داد."</string>
-  <string name="screen_signout_recovery_disabled_title">"بازگردانی برپا نشده"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"دارید از واپسین نشستتان خارج می‌شوید. اگر اکنون خارج شوید ممکن است پیام‌های رمزنگاشته‌تان را از دست بدهید."</string>
-  <string name="screen_signout_save_recovery_key_title">"کلید بازیابیتان را ذخیره کرده‌اید؟"</string>
+  <string name="screen_signout_preference_item">"برداشتن این افزاره"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"این تنها دستگاه شماست. اگر آن را جدا کنید، برای تأیید هویت دیجیتال خود و بازیابی چت‌های رمزگذاری شده‌تان در دفعه بعد که وارد سیستم می‌شوید، به یک کلید بازیابی نیاز خواهید داشت."</string>
+  <string name="screen_signout_recovery_disabled_title">"شما در حال از دست دادن دسترسی به چت‌های رمزگذاری‌شده‌تان هستید."</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"این تنها دستگاه شماست. اگر آن را جدا کنید، برای تأیید هویت دیجیتال خود و بازیابی چت‌های رمزگذاری شده‌تان در دفعه بعد که وارد سیستم می‌شوید، به یک کلید بازیابی نیاز خواهید داشت."</string>
+  <string name="screen_signout_save_recovery_key_title">"قبل از حذف این دستگاه، مطمئن شوید که به کلید بازیابی خود دسترسی دارید."</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-hr/translations.xml b/features/logout/impl/src/main/res/values-hr/translations.xml
index 0a5d583a3c..ec8116a8c5 100644
--- a/features/logout/impl/src/main/res/values-hr/translations.xml
+++ b/features/logout/impl/src/main/res/values-hr/translations.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Jeste li sigurni da se želite odjaviti?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Odjava"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Odjava"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odjavljivanje…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Odjavit ćete se iz svoje posljednje sesije. Ako se sada odjavite, nećete moći pristupiti svojim šifriranim porukama."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Isključili ste sigurnosno kopiranje"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Jeste li sigurni da želite ukloniti ovaj uređaj?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Ukloni ovaj uređaj"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Ukloni ovaj uređaj"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Uklanjanje uređaja…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Ovo je vaš jedini uređaj. Ako ga uklonite, trebat će vam ključ za oporavak kako biste potvrdili svoj digitalni identitet i vratili šifrirane razgovore sljedeći put kada se prijavite."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Izgubiti ćete pristup svojim šifriranim chatovima"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"Vaši su se ključevi još uvijek sigurnosno kopirali kada ste se isključili iz mreže. Ponovno se povežite kako bi se vaši ključevi mogli sigurnosno kopirati prije nego što se odjavite."</string>
   <string name="screen_signout_key_backup_offline_title">"Vaši se ključevi još uvijek sigurnosno kopiraju"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Pričekajte da se to dovrši prije nego što se odjavite."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Pričekajte da se ovo završi prije uklanjanja ovog uređaja."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Vaši se ključevi još uvijek sigurnosno kopiraju"</string>
-  <string name="screen_signout_preference_item">"Odjava"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Odjavit ćete se iz svoje posljednje sesije. Ako se sada odjavite, nećete moći pristupiti svojim šifriranim porukama."</string>
-  <string name="screen_signout_recovery_disabled_title">"Oporavak nije postavljen"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Odjavit ćete se iz svoje posljednje sesije. Ako se sada odjavite, možda nećete moći pristupiti svojim šifriranim porukama."</string>
+  <string name="screen_signout_preference_item">"Ukloni ovaj uređaj"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Ovo je vaš jedini uređaj. Ako ga uklonite, trebat će vam ključ za oporavak kako biste potvrdili svoj digitalni identitet i vratili šifrirane razgovore sljedeći put kada se prijavite."</string>
+  <string name="screen_signout_recovery_disabled_title">"Izgubit ćete pristup svojim šifriranim chatovima"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Ovo je vaš jedini uređaj. Ako ga uklonite, trebat će vam ključ za oporavak kako biste potvrdili svoj digitalni identitet i vratili šifrirane razgovore sljedeći put kada se prijavite."</string>
+  <string name="screen_signout_save_recovery_key_title">"Prije uklanjanja ovog uređaja provjerite imate li pristup ključu za oporavak"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-hu/translations.xml b/features/logout/impl/src/main/res/values-hu/translations.xml
index 2cf2b89e4a..e7eb8de99e 100644
--- a/features/logout/impl/src/main/res/values-hu/translations.xml
+++ b/features/logout/impl/src/main/res/values-hu/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Biztos, hogy kijelentkezik?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Kijelentkezés"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Kijelentkezés"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Kijelentkezés…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Arra készül, hogy kijelentkezzen az utolsó munkamenetéből is. Ha most kijelentkezik, akkor elveszti a hozzáférését a titkosított üzeneteihez."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Kikapcsolta a biztonsági mentést"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"A kulcsai mentése során bontotta a kapcsolatot. Kapcsolódjon újra, hogy a kulcsai továbbra is mentésre kerüljenek mielőtt kijelentkezik."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Biztosan eltávolítja ezt az eszközt?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Eszköz eltávolítása"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Eszköz eltávolítása"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eszköz eltávolítása…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Ez az egyetlen eszköze. Ha eltávolítja, a következő bejelentkezéskor szüksége lesz egy helyreállítási kulcsra a digitális személyazonossága megerősítéséhez és a titkosított csevegések helyreállításához."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Hamarosan elveszíti a hozzáférését a titkosított csevegéseihez"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"A kulcsok biztonsági mentése még folyamatban volt, amikor megszűnt a hálózati kapcsolat. Csatlakozzon újra, hogy a kulcsok biztonsági mentése megtörténhessen, mielőtt eltávolítja ezt az eszközt."</string>
   <string name="screen_signout_key_backup_offline_title">"A kulcsai mentése még folyamatban van"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Kijelentkezés előtt várja meg a befejezését."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Várja meg, amíg ez befejeződik, mielőtt eltávolítja ezt az eszközt."</string>
   <string name="screen_signout_key_backup_ongoing_title">"A kulcsai mentése még folyamatban van"</string>
-  <string name="screen_signout_preference_item">"Kijelentkezés"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Arra készül, hogy kijelentkezzen az utolsó munkamenetéből is. Ha most kijelentkezik, akkor elveszti a hozzáférését a titkosított üzeneteihez."</string>
-  <string name="screen_signout_recovery_disabled_title">"A helyreállítás nincs beállítva"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Arra készül, hogy kijelentkezzen az utolsó munkamenetéből is. Ha most kijelentkezik, akkor elveszítheti a hozzáférését a titkosított üzeneteihez."</string>
-  <string name="screen_signout_save_recovery_key_title">"Mentette a helyreállítási kulcsát?"</string>
+  <string name="screen_signout_preference_item">"Eszköz eltávolítása"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Ez az egyetlen eszköze. Ha eltávolítja,  a következő bejelentkezéskor szüksége lesz egy helyreállítási kulcsra a digitális személyazonossága megerősítéséhez és a titkosított csevegések helyreállításához."</string>
+  <string name="screen_signout_recovery_disabled_title">"Hamarosan elveszíti a hozzáférését a titkosított csevegéseihez"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Ez az egyetlen eszköze. Ha eltávolítja, a következő bejelentkezéskor szüksége lesz egy helyreállítási kulcsra a digitális személyazonossága megerősítéséhez és a titkosított csevegések helyreállításához."</string>
+  <string name="screen_signout_save_recovery_key_title">"Az eszköz eltávolítása előtt győződjön meg arról, hogy hozzáfér a helyreállítási kulcshoz"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-in/translations.xml b/features/logout/impl/src/main/res/values-in/translations.xml
index dabf83545e..718cadd21b 100644
--- a/features/logout/impl/src/main/res/values-in/translations.xml
+++ b/features/logout/impl/src/main/res/values-in/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Apakah Anda yakin ingin keluar dari akun?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Keluar dari akun"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Keluar dari akun"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan dari akun…"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Apakah Anda yakin ingin non aktifkan device dari akun?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Hapus device dari akun"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Hapus device dari akun"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan device dari akun…"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"Anda akan keluar dari sesi terakhir Anda. Jika Anda keluar sekarang, Anda akan kehilangan akses ke pesan terenkripsi Anda."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Anda telah menonaktifkan pencadangan"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Kunci Anda masih dicadangkan saat Anda luring. Sambungkan kembali sehingga kunci Anda dapat dicadangkan sebelum keluar."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Anda akan segera kehilangan akses ke obrolan terenkripsi Anda."</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Kunci Anda masih dalam proses pencadangan saat Anda offline. Sambungkan kembali agar kunci Anda dapat dicadangkan sebelum Anda menghapus perangkat ini."</string>
   <string name="screen_signout_key_backup_offline_title">"Kunci Anda masih dicadangkan"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Mohon tunggu hingga proses ini selesai sebelum keluar."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Harap tunggu hingga proses ini selesai sebelum melepas perangkat ini."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Kunci Anda masih dicadangkan"</string>
-  <string name="screen_signout_preference_item">"Keluar dari akun"</string>
+  <string name="screen_signout_preference_item">"Hapus device dari akun"</string>
   <string name="screen_signout_recovery_disabled_subtitle">"Anda akan keluar dari sesi Anda yang terakhir. Jika Anda keluar sekarang, Anda akan kehilangan akses ke pesan terenkripsi Anda."</string>
-  <string name="screen_signout_recovery_disabled_title">"Pemulihan belum disiapkan"</string>
+  <string name="screen_signout_recovery_disabled_title">"Anda akan segera kehilangan akses ke obrolan terenkripsi Anda."</string>
   <string name="screen_signout_save_recovery_key_subtitle">"Anda akan keluar dari sesi terakhir Anda. Jika Anda keluar sekarang, Anda mungkin kehilangan akses ke pesan terenkripsi Anda."</string>
-  <string name="screen_signout_save_recovery_key_title">"Apakah Anda sudah menyimpan kunci pemulihan Anda?"</string>
+  <string name="screen_signout_save_recovery_key_title">"Pastikan Anda memiliki akses ke kunci pemulihan sebelum mencabut perangkat ini."</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-it/translations.xml b/features/logout/impl/src/main/res/values-it/translations.xml
index 47d6bcf519..eea93297c0 100644
--- a/features/logout/impl/src/main/res/values-it/translations.xml
+++ b/features/logout/impl/src/main/res/values-it/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Sei sicuro di voler uscire?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Disconnetti"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Disconnetti"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Disconnessione in corso…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Stai per disconnettere la tua ultima sessione. Se esci ora, perderai l\'accesso ai tuoi messaggi cifrati."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Hai disattivato il backup"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Il backup delle chiavi era ancora in corso quando sei andato offline. Riconnettiti per eseguire il backup delle chiavi prima di uscire."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Sei sicuro di voler rimuovere questo dispositivo?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Rimuovi questo dispositivo"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Rimuovi questo dispositivo"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Rimozione del dispositivo…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Questo è il tuo unico dispositivo. Se lo rimuovi, avrai bisogno di una chiave di recupero per confermare la tua identità digitale e ripristinare le tue conversazioni cifrate al prossimo accesso."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Stai per perdere l\'accesso alle tue conversazioni cifrate"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Il backup delle tue chiavi era ancora in corso quando ti sei disconnesso. Riconnettiti in modo che il backup delle tue chiavi possa essere completato prima di rimuovere questo dispositivo."</string>
   <string name="screen_signout_key_backup_offline_title">"Il backup delle chiavi è ancora in corso"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Attendi il completamento dell\'operazione prima di uscire."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Attendi il completamento dell\'operazione prima di rimuovere questo dispositivo."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Il backup delle chiavi è ancora in corso"</string>
-  <string name="screen_signout_preference_item">"Disconnetti"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Stai per disconnettere la tua ultima sessione. Se esci ora, perderai l\'accesso ai tuoi messaggi cifrati."</string>
-  <string name="screen_signout_recovery_disabled_title">"Recupero non impostato"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Stai per disconnettere la tua ultima sessione. Se esci ora, potresti perdere l\'accesso ai tuoi messaggi cifrati."</string>
-  <string name="screen_signout_save_recovery_key_title">"Hai salvato la chiave di recupero?"</string>
+  <string name="screen_signout_preference_item">"Rimuovi questo dispositivo"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Questo è il tuo unico dispositivo. Se lo rimuovi, avrai bisogno di una chiave di recupero per confermare la tua identità digitale e ripristinare le tue conversazioni cifrate al prossimo accesso."</string>
+  <string name="screen_signout_recovery_disabled_title">"Stai per perdere l\'accesso alle tue conversazioni cifrate"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Questo è il tuo unico dispositivo. Se lo rimuovi, avrai bisogno di una chiave di recupero per confermare la tua identità digitale e ripristinare le tue conversazioni cifrate al prossimo accesso."</string>
+  <string name="screen_signout_save_recovery_key_title">"Assicurati di avere accesso alla tua chiave di recupero prima di rimuovere questo dispositivo"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-ja/translations.xml b/features/logout/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..2082bacf6e
--- /dev/null
+++ b/features/logout/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signout_confirmation_dialog_content">"本当にこの端末を削除しますか？"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"この端末を削除"</string>
+  <string name="screen_signout_confirmation_dialog_title">"この端末を削除"</string>
+  <string name="screen_signout_in_progress_dialog_content">"削除中…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"この端末が唯一の端末です。削除を続行すると次回のログインの際に、デジタルIDと暗号化された会話を復元するために、回復鍵を入力する必要があります。"</string>
+  <string name="screen_signout_key_backup_disabled_title">"暗号化された会話は見られなくなります"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"鍵のバックアップ中にオフライン状態になりました。この端末を削除する前に、オンラインに復旧してバックアップを完了させてください。"</string>
+  <string name="screen_signout_key_backup_offline_title">"鍵のバックアップは継続しています"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"端末の削除の前に、処理の完了をお待ち下さい。"</string>
+  <string name="screen_signout_key_backup_ongoing_title">"鍵のバックアップは継続しています"</string>
+  <string name="screen_signout_preference_item">"この端末を削除"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"この端末が唯一の端末です。削除を続行すると次回のログインの際に、デジタルIDと暗号化された会話を復元するために、回復鍵を入力する必要があります。"</string>
+  <string name="screen_signout_recovery_disabled_title">"暗号化された会話は見られなくなります"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"この端末が唯一の端末です。削除を続行すると次回のログインの際に、デジタルIDと暗号化された会話を復元するために、回復鍵を入力する必要があります。"</string>
+  <string name="screen_signout_save_recovery_key_title">"この端末を削除する前に、回復鍵が手元にあることを確認してください。"</string>
+</resources>
diff --git a/features/logout/impl/src/main/res/values-nb/translations.xml b/features/logout/impl/src/main/res/values-nb/translations.xml
index 136e02fb34..63f3d09c78 100644
--- a/features/logout/impl/src/main/res/values-nb/translations.xml
+++ b/features/logout/impl/src/main/res/values-nb/translations.xml
@@ -4,15 +4,15 @@
   <string name="screen_signout_confirmation_dialog_submit">"Fjern denne enheten"</string>
   <string name="screen_signout_confirmation_dialog_title">"Fjern denne enheten"</string>
   <string name="screen_signout_in_progress_dialog_content">"Fjerner enheten …"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Du er i ferd med å logge av din siste sesjon. Hvis du logger av nå, mister du tilgangen til de krypterte meldingene dine."</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Dette er din eneste enhet. Hvis du fjerner den, trenger du en gjenopprettingsnøkkel for å bekrefte din digitale identitet og gjenopprette de krypterte chattene dine neste gang du logger på."</string>
   <string name="screen_signout_key_backup_disabled_title">"Du er i ferd med å miste tilgangen til dine krypterte chatter"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"Nøklene dine ble fortsatt sikkerhetskopiert da du koblet fra. Koble til igjen, slik at nøklene dine kan sikkerhetskopieres før du logger av."</string>
   <string name="screen_signout_key_backup_offline_title">"Nøklene dine blir fortsatt sikkerhetskopiert"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Vennligst vent til dette er fullført før du fjerner denne enheten."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Nøklene dine blir fortsatt sikkerhetskopiert"</string>
   <string name="screen_signout_preference_item">"Fjern denne enheten"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Du er i ferd med å logge ut av din siste sesjon. Hvis du logger ut nå, mister du tilgangen til de krypterte meldingene dine."</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Dette er din eneste enhet. Hvis du fjerner den, trenger du en gjenopprettingsnøkkel for å bekrefte din digitale identitet og gjenopprette de krypterte chattene dine neste gang du logger på."</string>
   <string name="screen_signout_recovery_disabled_title">"Du er i ferd med å miste tilgangen til dine krypterte chatter"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Du er i ferd med å logge av din siste sesjon. Hvis du logger av nå, kan du miste tilgangen til de krypterte meldingene dine."</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Dette er din eneste enhet. Hvis du fjerner den, trenger du en gjenopprettingsnøkkel for å bekrefte din digitale identitet og gjenopprette de krypterte chattene dine neste gang du logger på."</string>
   <string name="screen_signout_save_recovery_key_title">"Sørg for at du har tilgang til gjenopprettingsnøkkelen din før du fjerner denne enheten"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-pl/translations.xml b/features/logout/impl/src/main/res/values-pl/translations.xml
index 46a5c2d6bd..691255f434 100644
--- a/features/logout/impl/src/main/res/values-pl/translations.xml
+++ b/features/logout/impl/src/main/res/values-pl/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Czy na pewno chcesz się wylogować?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Wyloguj"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Wyloguj"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Wylogowywanie…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Zamierzasz wylogować się ze swojej ostatniej sesji. Jeśli wylogujesz się teraz, stracisz dostęp do swoich wiadomości szyfrowanych."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Wyłączyłeś backup"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Twoje klucze były nadal archiwizowane po przejściu w tryb offline. Połącz się ponownie, aby zapisać w chmurze przed wylogowaniem."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Czy na pewno chcesz usunąć to urządzenie?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Usuń to urządzenie"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Usuń to urządzenie"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Usuwam urządzenie…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"To jest twoje jedyne urządzenie. Jeśli je usuniesz, będziesz potrzebować klucza przywracania, aby potwierdzić swoją tożsamość cyfrową i przywrócić zaszyfrowane czaty przy następnym logowaniu."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Zamierzasz utracić dostęp do swoich zaszyfrowanych czatów"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Twoje klucze były nadal archiwizowane po przejściu w tryb offline. Połącz się ponownie, aby zapisać je w chmurze przed usunięciem urządzenia."</string>
   <string name="screen_signout_key_backup_offline_title">"Twoje klucze są nadal archiwizowane"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Zanim się wylogujesz, poczekaj na zakończenie operacji."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Poczekaj na zakończenie procesu, zanim usuniesz to urządzenie."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Twoje klucze są nadal archiwizowane"</string>
-  <string name="screen_signout_preference_item">"Wyloguj"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Zamierzasz wylogować się ze swojej ostatniej sesji. Jeśli wylogujesz się teraz, stracisz dostęp do swoich wiadomości szyfrowanych."</string>
-  <string name="screen_signout_recovery_disabled_title">"Nie ustawiono przywracania"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Zamierzasz wylogować się ze swojej ostatniej sesji. Jeśli wylogujesz się teraz, stracisz dostęp do swoich wiadomości szyfrowanych."</string>
-  <string name="screen_signout_save_recovery_key_title">"Czy zapisałeś swój klucz przywracania?"</string>
+  <string name="screen_signout_preference_item">"Usuń to urządzenie"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"To jest twoje jedyne urządzenie. Jeśli je usuniesz, będziesz potrzebować klucza przywracania, aby potwierdzić swoją tożsamość cyfrową i przywrócić zaszyfrowane czaty przy następnym logowaniu."</string>
+  <string name="screen_signout_recovery_disabled_title">"Zamierzasz utracić dostęp do swoich zaszyfrowanych czatów"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"To jest twoje jedyne urządzenie. Jeśli je usuniesz, będziesz potrzebować klucza przywracania, aby potwierdzić swoją tożsamość cyfrową i przywrócić zaszyfrowane czaty przy następnym logowaniu."</string>
+  <string name="screen_signout_save_recovery_key_title">"Upewnij się, że posiadasz dostęp do klucza przywracania przed usunięciem urządzenia"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-pt-rBR/translations.xml b/features/logout/impl/src/main/res/values-pt-rBR/translations.xml
index b12a2aa470..b7b1728313 100644
--- a/features/logout/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/logout/impl/src/main/res/values-pt-rBR/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Você tem certeza que deseja sair?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Sair"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Sair"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Saindo…"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Você tem certeza que deseja remover este dispositivo?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Remover este dispositivo"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Remover este dispositivo"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Removendo dispositivo…"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"Você está prestes a sair da sua última sessão. Se você sair agora, perderá o acesso às suas mensagens criptografadas."</string>
   <string name="screen_signout_key_backup_disabled_title">"Você desativou o backup"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"O backup das suas chaves ainda estava sendo feito quando você ficou off-line. Reconecte-se para que você possa fazer o backup de suas chaves antes de sair."</string>
   <string name="screen_signout_key_backup_offline_title">"O backup das suas chaves ainda está em andamento"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Aguarde até que isso seja concluído antes de sair."</string>
   <string name="screen_signout_key_backup_ongoing_title">"O backup das suas chaves ainda está em andamento"</string>
-  <string name="screen_signout_preference_item">"Sair"</string>
+  <string name="screen_signout_preference_item">"Remover este dispositivo"</string>
   <string name="screen_signout_recovery_disabled_subtitle">"Você está prestes a sair da sua última sessão. Se você sair agora, perderá o acesso às suas mensagens criptografadas."</string>
-  <string name="screen_signout_recovery_disabled_title">"A recuperação não está configurada"</string>
+  <string name="screen_signout_recovery_disabled_title">"Você está prestes a perder o acesso às suas conversas criptografadas"</string>
   <string name="screen_signout_save_recovery_key_subtitle">"Você está prestes a sair da sua última sessão. Se você sair agora, poderá perder o acesso às suas mensagens criptografadas."</string>
   <string name="screen_signout_save_recovery_key_title">"Você salvou sua chave de recuperação?"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-pt/translations.xml b/features/logout/impl/src/main/res/values-pt/translations.xml
index b8a7161c21..76e4f09d42 100644
--- a/features/logout/impl/src/main/res/values-pt/translations.xml
+++ b/features/logout/impl/src/main/res/values-pt/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Tens a certeza que queres terminar a sessão?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Terminar sessão"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Terminar sessão"</string>
-  <string name="screen_signout_in_progress_dialog_content">"A terminar sessão…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Estás prestes a terminar a tua última sessão. Se continuares, perderás o acesso às tuas mensagens cifradas."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Desativaste a cópia de segurança"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"As tuas chaves ainda estavam a ser guardadas quando ficaste desligado. Volta a ligar-te para que as tuas chaves possam ser guardadas antes de encerrares a sessão."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Tens a certeza que queres remover este dispositivo?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Remover este dispositivo"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Remover este dispositivo"</string>
+  <string name="screen_signout_in_progress_dialog_content">"A remover dispositivo…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Este é o teu único dispositivo. Se o removeres, da próxima vez que iniciares sessão, precisarás da chave de recuperação para confirmares a tua identidade digital e recuperares as tuas conversas cifradas."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Estás prestes a perder o acesso às tuas conversas privadas"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"As tuas chaves ainda estavam a ser guardadas quando ficaste desligado. Volta a ligar-te para que as tuas chaves possam ser guardadas antes de removeres o dispositivo."</string>
   <string name="screen_signout_key_backup_offline_title">"As tuas chaves ainda estão a ser guardadas"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Por favor, aguarda a conclusão desta operação antes de terminares a sessão."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Por favor, aguarda a conclusão desta operação antes de removeres o dispositivo."</string>
   <string name="screen_signout_key_backup_ongoing_title">"As tuas chaves ainda estão a ser guardadas"</string>
-  <string name="screen_signout_preference_item">"Terminar sessão"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Estás prestes a terminar a tua última sessão. Se continuares, perderás o acesso às tuas mensagens cifradas."</string>
-  <string name="screen_signout_recovery_disabled_title">"Recuperação não configurada"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Estás prestes a terminar a tua última sessão. Se continuares, poderás perder o acesso às tuas mensagens cifradas."</string>
-  <string name="screen_signout_save_recovery_key_title">"Guardaste a tua chave de recuperação?"</string>
+  <string name="screen_signout_preference_item">"Remover este dispositivo"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Este é o teu único dispositivo. Se o removeres, da próxima vez que iniciares sessão, precisarás da chave de recuperação para confirmares a tua identidade digital e recuperares as tuas conversas cifradas."</string>
+  <string name="screen_signout_recovery_disabled_title">"Estás prestes a perder o acesso às tuas conversas cifradas"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Este é o teu único dispositivo. Se o removeres, da próxima vez que iniciares sessão, precisarás da chave de recuperação para confirmares a tua identidade digital e recuperares as tuas conversas cifradas."</string>
+  <string name="screen_signout_save_recovery_key_title">"Certifica-te de que tens acesso à tua chave de recuperação antes de removeres este dispositivo"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-ro/translations.xml b/features/logout/impl/src/main/res/values-ro/translations.xml
index 7124188269..1f1ff9e07a 100644
--- a/features/logout/impl/src/main/res/values-ro/translations.xml
+++ b/features/logout/impl/src/main/res/values-ro/translations.xml
@@ -4,15 +4,15 @@
   <string name="screen_signout_confirmation_dialog_submit">"Deconectați-vă"</string>
   <string name="screen_signout_confirmation_dialog_title">"Deconectați-vă"</string>
   <string name="screen_signout_in_progress_dialog_content">"Deconectare în curs…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Sunteți pe cale să vă deconectați de la ultima sesiune. Dacă vă deconectați acum, veți pierde accesul la mesajele criptate."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Ați dezactivat backup-ul"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Cheile dumneavoastră erau încă în curs de backup atunci când ați fost deconectat. Reconectați-vă pentru ca cheile dumneavoastră să poată fi salvate înainte de a vă deconecta."</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Acesta este singurul dumneavoastră dispozitiv. Dacă îl eliminați, veți avea nevoie de o cheie de recuperare pentru a vă confirma identitatea digitală și a restaura mesajele criptate data viitoare când vă conectați."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Sunteți pe cale să vă pierdeți accesul la mesajele dumneavoastră criptate."</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Cheile dumneavoastră erau încă în curs de backup atunci când ați fost deconectat. Reconectați-vă pentru ca cheile dumneavoastră să poată fi salvate înainte de a elimina acest dispozitiv."</string>
   <string name="screen_signout_key_backup_offline_title">"Cheile dumneavoastră sunt încă în curs de backup"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Vă rugăm să așteptați până la finalizarea acestui proces înainte de a vă deconecta."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Cheile dumneavoastră sunt încă în curs de backup"</string>
   <string name="screen_signout_preference_item">"Deconectați-vă"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Sunteți pe cale să vă deconectați de la ultima sesiune. Dacă vă deconectați acum, veți pierde accesul la mesajele criptate."</string>
-  <string name="screen_signout_recovery_disabled_title">"Recuperarea nu este configurată"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Sunteți pe cale să vă deconectați de la ultima sesiune. Dacă vă deconectați acum, este posibil să pierdeți accesul la mesajele criptate."</string>
-  <string name="screen_signout_save_recovery_key_title">"Ați salvat cheia de recuperare?"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Acesta este singurul dumneavoastră dispozitiv. Dacă îl eliminați, veți avea nevoie de o cheie de recuperare pentru a vă confirma identitatea digitală și a restaura chat-urile criptate data viitoare când vă conectați."</string>
+  <string name="screen_signout_recovery_disabled_title">"Sunteți pe cale să pierdeți accesul la mesajele dumneavoastră criptate"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Acesta este singurul dumneavoastră dispozitiv. Dacă îl eliminați, veți avea nevoie de o cheie de recuperare pentru a vă confirma identitatea digitală și a restaura mesajele criptate data viitoare când vă conectați."</string>
+  <string name="screen_signout_save_recovery_key_title">"Asigurați-vă că aveți acces la cheia de recuperare înainte de a elimina acest dispozitiv."</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-ru/translations.xml b/features/logout/impl/src/main/res/values-ru/translations.xml
index f7ed9216c0..fde2aadcab 100644
--- a/features/logout/impl/src/main/res/values-ru/translations.xml
+++ b/features/logout/impl/src/main/res/values-ru/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Вы уверены, что вы хотите выйти?"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Вы уверены, что хотите удалить это устройство?"</string>
   <string name="screen_signout_confirmation_dialog_submit">"Удалить это устройство"</string>
   <string name="screen_signout_confirmation_dialog_title">"Удалить это устройство"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выполняется выход…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Вы собираетесь выйти из последнего сеанса. Если вы выйдете из системы сейчас, вы потеряете доступ к зашифрованным сообщениям."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Вы отключили резервное копирование"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Когда вы перешли в автономный режим, резервное копирование ваших ключей продолжалось. Повторно подключитесь, чтобы перед выходом из системы можно было создать резервную копию ключей."</string>
-  <string name="screen_signout_key_backup_offline_title">"Резервное копирование ключей все еще продолжается"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Удаление устройства…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Это ваше единственное устройство. Если вы его удалите, вам потребуется ключ восстановления, чтобы подтвердить свою цифровую личность и восстановить зашифрованные чаты при следующем входе в систему."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Вы потеряете доступ к своим зашифрованным чатам"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Когда вы отключились от сети, резервное копирование ваших ключей продолжалось. Подключитесь снова, чтобы резервная копия ваших ключей была создана, прежде чем вы отключите это устройство."</string>
+  <string name="screen_signout_key_backup_offline_title">"Резервное копирование ключей всё ещё продолжается"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Пожалуйста, дождитесь завершения процесса, прежде чем выходить из системы."</string>
-  <string name="screen_signout_key_backup_ongoing_title">"Резервное копирование ключей все еще продолжается"</string>
+  <string name="screen_signout_key_backup_ongoing_title">"Резервное копирование ключей всё ещё продолжается"</string>
   <string name="screen_signout_preference_item">"Удалить это устройство"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Вы собираетесь выйти из последнего сеанса. Если вы выйдете из системы сейчас, вы потеряете доступ к зашифрованным сообщениям."</string>
-  <string name="screen_signout_recovery_disabled_title">"Восстановление не настроено"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Вы собираетесь выйти из последнего сеанса. Если вы выйдете из системы сейчас, вы можете потерять доступ к зашифрованным сообщениям."</string>
-  <string name="screen_signout_save_recovery_key_title">"Вы сохранили свой ключ восстановления?"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Это ваше единственное устройство. Если вы его удалите, вам потребуется ключ восстановления, чтобы подтвердить свою цифровую личность и восстановить зашифрованные чаты при следующем входе в систему."</string>
+  <string name="screen_signout_recovery_disabled_title">"Вы потеряете доступ к своим зашифрованным чатам"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Это ваше единственное устройство. Если вы его удалите, вам потребуется ключ восстановления, чтобы подтвердить свою цифровую личность и восстановить зашифрованные чаты при следующем входе в систему."</string>
+  <string name="screen_signout_save_recovery_key_title">"Перед тем как отключить это устройство, убедись, что у тебя есть доступ к ключу восстановления"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-sk/translations.xml b/features/logout/impl/src/main/res/values-sk/translations.xml
index 39301437fb..28e0a05c2f 100644
--- a/features/logout/impl/src/main/res/values-sk/translations.xml
+++ b/features/logout/impl/src/main/res/values-sk/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Ste si istí, že sa chcete odhlásiť?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Odhlásiť sa"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Odhlásiť sa"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Prebieha odhlasovanie…"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Naozaj chcete odstrániť toto zariadenie?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Odstrániť toto zariadenie"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Odstrániť toto zariadenie"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odoberanie zariadenia…"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"Chystáte sa odhlásiť z vašej poslednej relácie. Ak sa teraz odhlásite, stratíte prístup k svojim šifrovaným správam."</string>
   <string name="screen_signout_key_backup_disabled_title">"Vypli ste zálohovanie"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"Keď ste sa odpojili od internetu, vaše kľúče sa ešte stále zálohovali. Pripojte sa znova k internetu, aby sa vaše kľúče mohli zálohovať pred odhlásením."</string>
   <string name="screen_signout_key_backup_offline_title">"Vaše kľúče sa ešte stále zálohujú"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Pred odhlásením počkajte, kým sa to dokončí."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Vaše kľúče sa ešte stále zálohujú"</string>
-  <string name="screen_signout_preference_item">"Odhlásiť sa"</string>
+  <string name="screen_signout_preference_item">"Odstrániť toto zariadenie"</string>
   <string name="screen_signout_recovery_disabled_subtitle">"Chystáte sa odhlásiť z vašej poslednej relácie. Ak sa teraz odhlásite, stratíte prístup k svojim šifrovaným správam."</string>
-  <string name="screen_signout_recovery_disabled_title">"Obnovenie nie je nastavené"</string>
+  <string name="screen_signout_recovery_disabled_title">"Čoskoro stratíte prístup k svojim zašifrovaným konverzáciám"</string>
   <string name="screen_signout_save_recovery_key_subtitle">"Chystáte sa odhlásiť z vašej poslednej relácie. Ak sa teraz odhlásite, môžete stratiť prístup k svojim šifrovaným správam."</string>
   <string name="screen_signout_save_recovery_key_title">"Uložili ste si kľúč na obnovenie?"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-sv/translations.xml b/features/logout/impl/src/main/res/values-sv/translations.xml
index fdf0e5102e..c35a0455f9 100644
--- a/features/logout/impl/src/main/res/values-sv/translations.xml
+++ b/features/logout/impl/src/main/res/values-sv/translations.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Är du säker på att du vill logga ut?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Logga ut"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Logga ut"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Loggar ut …"</string>
+  <string name="screen_signout_confirmation_dialog_content">"Är du säker på att du vill ta bort den här enheten?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Ta bort den här enheten"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Ta bort den här enheten"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Tar bort enhet …"</string>
   <string name="screen_signout_key_backup_disabled_subtitle">"Du är på väg att logga ut ur din senaste session. Om du loggar ut nu kommer du att förlora åtkomsten till dina krypterade meddelanden."</string>
   <string name="screen_signout_key_backup_disabled_title">"Du har stängt av säkerhetskopiering"</string>
   <string name="screen_signout_key_backup_offline_subtitle">"Dina nycklar säkerhetskopierades fortfarande när du gick offline. Anslut igen så att dina nycklar kan säkerhetskopieras innan du loggar ut."</string>
   <string name="screen_signout_key_backup_offline_title">"Dina nycklar säkerhetskopieras fortfarande"</string>
   <string name="screen_signout_key_backup_ongoing_subtitle">"Vänta tills detta är klart innan du loggar ut."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Dina nycklar säkerhetskopieras fortfarande"</string>
-  <string name="screen_signout_preference_item">"Logga ut"</string>
+  <string name="screen_signout_preference_item">"Ta bort den här enheten"</string>
   <string name="screen_signout_recovery_disabled_subtitle">"Du är på väg att logga ut ur din sista session. Om du loggar ut nu förlorar du åtkomsten till dina krypterade meddelanden."</string>
   <string name="screen_signout_recovery_disabled_title">"Återställning inte inställd"</string>
   <string name="screen_signout_save_recovery_key_subtitle">"Du är på väg att logga ut från din senaste session. Om du loggar ut nu kan du förlora åtkomsten till dina krypterade meddelanden."</string>
diff --git a/features/logout/impl/src/main/res/values-uk/translations.xml b/features/logout/impl/src/main/res/values-uk/translations.xml
index 7e23189dc6..c227ffeee6 100644
--- a/features/logout/impl/src/main/res/values-uk/translations.xml
+++ b/features/logout/impl/src/main/res/values-uk/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"Ви впевнені, що бажаєте вийти?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Вийти"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Вийти"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Вихід…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Ви збираєтеся вийти зі свого останнього сеансу. Якщо ви вийдете зараз, ви втратите доступ до своїх зашифрованих повідомлень."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Ви вимкнули резервне копіювання"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Коли ви вийшли з мережі, резервна копія ваших ключів все ще створювалася. Повторно під\'єднайтеся, щоб зберегти резервну копію ключів перед виходом."</string>
+  <string name="screen_signout_confirmation_dialog_content">"Ви впевнені, що хочете видалити цей пристрій?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Вилучити цей пристрій"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Вилучити цей пристрій"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Видалення пристрою…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Це ваш єдиний пристрій. Якщо ви його вилучите, вам знадобиться ключ відновлення, щоб підтвердити свою цифрову ідентичність і відновити зашифровані бесіди під час наступного входу."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Ви втратите доступ до своїх зашифрованих бесід"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Резервні копії ваших ключів продовжували створюватися після вашого виходу з мережі. Під\'єднайтеся знову, щоб створити резервні копії ключів, перш ніж вилучати цей пристрій."</string>
   <string name="screen_signout_key_backup_offline_title">"Резервне копіювання ваших ключів ще триває"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Дочекайтеся завершення процесу, перш ніж вийти."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Дочекайтесь завершення, перш ніж вилучити цей пристрій."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Резервне копіювання ваших ключів ще триває"</string>
-  <string name="screen_signout_preference_item">"Вийти"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Ви збираєтеся вийти зі свого останнього сеансу. Якщо ви вийдете зараз, ви втратите доступ до своїх зашифрованих повідомлень."</string>
-  <string name="screen_signout_recovery_disabled_title">"Відновлення не налаштовано"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Ви збираєтеся вийти зі свого останнього сеансу. Якщо вийти зараз, ви можете втратити доступ до зашифрованих повідомлень."</string>
-  <string name="screen_signout_save_recovery_key_title">"Ви зберегли ключ відновлення?"</string>
+  <string name="screen_signout_preference_item">"Вилучити цей пристрій"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Це ваш єдиний пристрій. Якщо ви вилучите його, вам знадобиться ключ відновлення, щоб підтвердити свою цифрову ідентичність і відновити зашифровані бесіди під час наступного входу."</string>
+  <string name="screen_signout_recovery_disabled_title">"Ви втратите доступ до своїх зашифрованих бесід"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Це ваш єдиний пристрій. Якщо ви його вилучите, вам знадобиться ключ відновлення, щоб підтвердити свою цифрову ідентичність і відновити зашифровані бесіди під час наступного входу."</string>
+  <string name="screen_signout_save_recovery_key_title">"Переконайтеся, що у вас є доступ до ключа відновлення, перш ніж вилучити цей пристрій"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-uz/translations.xml b/features/logout/impl/src/main/res/values-uz/translations.xml
index 4d03d9cfa3..a6b46bd5b5 100644
--- a/features/logout/impl/src/main/res/values-uz/translations.xml
+++ b/features/logout/impl/src/main/res/values-uz/translations.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_signout_confirmation_dialog_content">"Haqiqatan ham tizimdan chiqmoqchimisiz?"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"Tizimdan chiqish"</string>
-  <string name="screen_signout_confirmation_dialog_title">"Tizimdan chiqish"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Bu qurilmani olib tashlash"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Bu qurilmani olib tashlash"</string>
   <string name="screen_signout_in_progress_dialog_content">"Chiqish…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"Siz oxirgi sessiyangizdan chiqmoqdasiz. Agar hozir chiqib ketsangiz, shifrlangan xabarlaringizga kira olmaysiz."</string>
-  <string name="screen_signout_key_backup_disabled_title">"Siz zaxira nusxasini oʻchirdingiz"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"Siz oflayn bo‘lganingizda ham kalitlaringiz zaxiralanish jarayonida edi. Tizimdan chiqishdan oldin kalitlaringizning to‘liq zaxiralanishini ta’minlash uchun qayta ulanishingiz zarur."</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Bu sizning yagona qurilmangiz. Agar uni olib tashlasangiz, keyingi safar hisobingizga kirganingizda raqamli shaxsingizni tasdiqlash va shifrlangan chatlaringizni tiklash uchun zaxira kaliti kerak bo‘ladi."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Shifrlangan chatlarga ruxsat yopiladi"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Oflaynga chiqqaningizda kalitlaringiz hali ham zaxiralanayotgan edi. Bu qurilmani olib tashlashdan oldin kalitlaringiz zaxiralanishi uchun qayta ulaning."</string>
   <string name="screen_signout_key_backup_offline_title">"Kalitlaringiz hamon zaxiralanmoqda"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"Tizimdan chiqishdan oldin bu jarayon tugashini kuting."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Bu qurilmani olib tashlashdan oldin uning tugashini kuting."</string>
   <string name="screen_signout_key_backup_ongoing_title">"Kalitlaringiz hamon zaxiralanmoqda"</string>
-  <string name="screen_signout_preference_item">"Tizimdan chiqish"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"Siz oxirgi sessiyangizdan chiqmoqdasiz. Agar hozir chiqib ketsangiz, shifrlangan xabarlaringizga kira olmaysiz."</string>
+  <string name="screen_signout_preference_item">"Bu qurilmani olib tashlash"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Bu sizning yagona qurilmangiz. Agar uni o‘chirsangiz, keyingi safar tizimga kirganingizda raqamli shaxsingizni tasdiqlash va shifrlangan chatlaringizni tiklash uchun tiklash kaliti kerak bo‘ladi."</string>
   <string name="screen_signout_recovery_disabled_title">"Qayta tiklash sozlanmagan"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"Siz oxirgi sessiyangizdan chiqmoqdasiz. Agar hozir chiqib ketsangiz, shifrlangan xabarlaringizga kira olmay qolishingiz mumkin."</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Bu sizning yagona qurilmangiz. Agar uni olib tashlasangiz, keyingi safar hisobingizga kirganingizda raqamli shaxsingizni tasdiqlash va shifrlangan chatlaringizni tiklash uchun zaxira kaliti kerak bo‘ladi."</string>
+  <string name="screen_signout_save_recovery_key_title">"Bu qurilmani olib tashlashdan oldin zaxira kalitiga ruxsatingiz borligini tekshiring"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-vi/translations.xml b/features/logout/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..6c1a028948
--- /dev/null
+++ b/features/logout/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signout_confirmation_dialog_content">"Bạn có chắc muốn gỡ thiết bị này không?"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"Gỡ bỏ thiết bị này"</string>
+  <string name="screen_signout_confirmation_dialog_title">"Gỡ bỏ thiết bị này"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Đang gỡ thiết bị…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Đây là thiết bị duy nhất của bạn. Nếu xóa nó, bạn sẽ cần khóa khôi phục để xác nhận danh tính kỹ thuật số và khôi phục các cuộc trò chuyện được mã hóa lần tiếp theo khi đăng nhập."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Bạn sắp mất quyền truy cập vào các cuộc trò chuyện được mã hóa"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Bạn đã ngoại tuyến khi các khóa đang được sao lưu. Kết nối lại để hoàn tất sao lưu trước khi gỡ thiết bị."</string>
+  <string name="screen_signout_key_backup_offline_title">"Khóa của bạn vẫn đang được sao lưu."</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Đợi quá trình hoàn tất rồi hãy gỡ thiết bị."</string>
+  <string name="screen_signout_key_backup_ongoing_title">"Khóa của bạn vẫn đang được sao lưu."</string>
+  <string name="screen_signout_preference_item">"Gỡ bỏ thiết bị này"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Bạn sắp đăng xuất khỏi phiên làm việc cuối cùng. Nếu bạn đăng xuất ngay bây giờ, bạn sẽ mất quyền truy cập vào các tin nhắn đã mã hóa của mình."</string>
+  <string name="screen_signout_recovery_disabled_title">"Bạn sắp mất quyền truy cập vào các cuộc trò chuyện được mã hóa"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Đây là thiết bị duy nhất của bạn. Nếu xóa nó, bạn sẽ cần khóa khôi phục để xác nhận danh tính kỹ thuật số và khôi phục các cuộc trò chuyện được mã hóa khi đăng nhập lần tới."</string>
+  <string name="screen_signout_save_recovery_key_title">"Đảm bảo bạn có khóa khôi phục trước khi gỡ thiết bị này."</string>
+</resources>
diff --git a/features/logout/impl/src/main/res/values-zh-rTW/translations.xml b/features/logout/impl/src/main/res/values-zh-rTW/translations.xml
index 12d5bc20a6..e2b71b61df 100644
--- a/features/logout/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/logout/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"您確定要登出嗎？"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"登出"</string>
-  <string name="screen_signout_confirmation_dialog_title">"登出"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"您將要登出上一次作業階段。若您現在登出，將會失去對加密訊息的存取權。"</string>
-  <string name="screen_signout_key_backup_disabled_title">"您已關閉備份"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"當您離線時，您的金鑰仍在備份中。請重新連線才能在您登出前備份金鑰。"</string>
+  <string name="screen_signout_confirmation_dialog_content">"您確定要移除此裝置嗎？"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"移除此裝置"</string>
+  <string name="screen_signout_confirmation_dialog_title">"移除此裝置"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除裝置……"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"這是您唯一的裝置。若您移除它，下次登入時您將需要還原金鑰來確認您的數位身份並還原您的加密聊天。"</string>
+  <string name="screen_signout_key_backup_disabled_title">"您即將失去對您加密聊天的存取權"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"當您離線時，您的金鑰仍在備份中。請重新連線才能在您移除此裝置前備份金鑰。"</string>
   <string name="screen_signout_key_backup_offline_title">"您的金鑰仍在備份中"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"請等待此動作完成後再登出。"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"請等待此動作完成後再移除此裝置。"</string>
   <string name="screen_signout_key_backup_ongoing_title">"您的金鑰仍在備份中"</string>
-  <string name="screen_signout_preference_item">"登出"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"您將要登出上一次作業階段。若您現在登出，將會失去對加密訊息的存取權。"</string>
-  <string name="screen_signout_recovery_disabled_title">"未設定復原金鑰"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"您將要登出上一次作業階段。若您現在登出，將會失去對加密訊息的存取權。"</string>
+  <string name="screen_signout_preference_item">"移除此裝置"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"這是您唯一的裝置。若您移除它，下此登入時將需要還原金鑰來驗證您的數位身份並還原您的加密聊天。"</string>
+  <string name="screen_signout_recovery_disabled_title">"您即將失去對您的加密聊天的存取權"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"這是您唯一的裝置。若您移除它，下此登入時將需要還原金鑰來驗證您的數位身份並還原您的加密聊天。"</string>
+  <string name="screen_signout_save_recovery_key_title">"在移除此裝置前，請確保您可存取您的還原金鑰"</string>
 </resources>
diff --git a/features/logout/impl/src/main/res/values-zh/translations.xml b/features/logout/impl/src/main/res/values-zh/translations.xml
index 0a8ec07e87..f18904d03b 100644
--- a/features/logout/impl/src/main/res/values-zh/translations.xml
+++ b/features/logout/impl/src/main/res/values-zh/translations.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_signout_confirmation_dialog_content">"确定要登出吗？"</string>
-  <string name="screen_signout_confirmation_dialog_submit">"登出"</string>
-  <string name="screen_signout_confirmation_dialog_title">"登出"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
-  <string name="screen_signout_key_backup_disabled_subtitle">"即将登出最后一个会话。如果现在登出，将无法访问加密的消息。"</string>
-  <string name="screen_signout_key_backup_disabled_title">"您已关闭备份"</string>
-  <string name="screen_signout_key_backup_offline_subtitle">"当你离线时，密钥仍在备份中。重新连接以便在登出之前备份密钥。"</string>
-  <string name="screen_signout_key_backup_offline_title">"您的密钥仍在备份中"</string>
-  <string name="screen_signout_key_backup_ongoing_subtitle">"请等待此操作完成后再登出。"</string>
-  <string name="screen_signout_key_backup_ongoing_title">"您的密钥仍在备份中"</string>
-  <string name="screen_signout_preference_item">"登出"</string>
-  <string name="screen_signout_recovery_disabled_subtitle">"即将登出最后一个会话。如果现在登出，将无法访问加密的消息。"</string>
-  <string name="screen_signout_recovery_disabled_title">"未设置恢复"</string>
-  <string name="screen_signout_save_recovery_key_subtitle">"即将登出最后一个会话。如果现在登出，将无法访问加密的消息。"</string>
-  <string name="screen_signout_save_recovery_key_title">"您保存了恢复密钥吗？"</string>
+  <string name="screen_signout_confirmation_dialog_content">"你确定要移除此设备？"</string>
+  <string name="screen_signout_confirmation_dialog_submit">"移除此设备"</string>
+  <string name="screen_signout_confirmation_dialog_title">"移除此设备"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除设备…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"这是你的唯一设备。一旦移除，下次登录时你需要使用恢复密钥验证数字身份并恢复加密聊天。"</string>
+  <string name="screen_signout_key_backup_disabled_title">"你即将失去加密聊天的访问权"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"当你离线时，密钥仍在备份。重新连接以便在移除设备之前备份密钥。"</string>
+  <string name="screen_signout_key_backup_offline_title">"你的密钥仍在备份中"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"请等待此操作完成再移除此设备。"</string>
+  <string name="screen_signout_key_backup_ongoing_title">"你的密钥仍在备份中"</string>
+  <string name="screen_signout_preference_item">"移除此设备"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"这是你的唯一设备。一旦移除，下次登录时你需要使用恢复密钥验证数字身份并恢复加密聊天。"</string>
+  <string name="screen_signout_recovery_disabled_title">"你即将失去加密聊天的访问权"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"这是你的唯一设备。一旦移除，下次登录时你需要使用恢复密钥验证数字身份并恢复加密聊天。"</string>
+  <string name="screen_signout_save_recovery_key_title">"确保你移除此设备前拥有恢复密钥"</string>
 </resources>
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
index 84ca038d7b..3fbae4bbc5 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.logout.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -21,97 +23,92 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressTag
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class LogoutViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class LogoutViewTest : RobolectricTest() {
     @Test
-    fun `clicking on logout sends a LogoutEvents`() {
+    fun `clicking on logout sends a LogoutEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>()
-        rule.setLogoutView(
+        setLogoutView(
             aLogoutState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_signout)
+        clickOn(CommonStrings.action_signout)
         eventsRecorder.assertSingle(LogoutEvents.Logout(false))
     }
 
     @Test
-    fun `confirming logout sends a LogoutEvents`() {
+    fun `confirming logout sends a LogoutEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>()
-        rule.setLogoutView(
+        setLogoutView(
             aLogoutState(
                 logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(LogoutEvents.Logout(false))
     }
 
     @Test
-    fun `clicking on back invoke back callback`() {
+    fun `clicking on back invoke back callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setLogoutView(
+            setLogoutView(
                 aLogoutState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on confirm after error sends a LogoutEvents`() {
+    fun `clicking on confirm after error sends a LogoutEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>()
-        rule.setLogoutView(
+        setLogoutView(
             aLogoutState(
                 logoutAction = AsyncAction.Failure(Exception("Failed to logout")),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_signout_anyway)
+        clickOn(CommonStrings.action_signout_anyway)
         eventsRecorder.assertSingle(LogoutEvents.Logout(true))
     }
 
     @Test
-    fun `clicking on cancel after error sends a LogoutEvents`() {
+    fun `clicking on cancel after error sends a LogoutEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>()
-        rule.setLogoutView(
+        setLogoutView(
             aLogoutState(
                 logoutAction = AsyncAction.Failure(Exception("Failed to logout")),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(LogoutEvents.CloseDialogs)
     }
 
     @Test
-    fun `last session setting button invoke onChangeRecoveryKeyClicked`() {
+    fun `last session setting button invoke onChangeRecoveryKeyClicked`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setLogoutView(
+            setLogoutView(
                 aLogoutState(
                     isLastDevice = true,
                     eventSink = eventsRecorder
                 ),
                 onChangeRecoveryKeyClick = callback,
             )
-            rule.clickOn(CommonStrings.common_settings)
+            clickOn(CommonStrings.common_settings)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLogoutView(
+private fun AndroidComposeUiTest<ComponentActivity>.setLogoutView(
     state: LogoutState,
     onChangeRecoveryKeyClick: () -> Unit = EnsureNeverCalled(),
     onBackClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutViewTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutViewTest.kt
index 8eae534740..db8eed2a54 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutViewTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.logout.impl.direct
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.logout.api.direct.DirectLogoutEvents
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.logout.api.direct.aDirectLogoutState
@@ -20,84 +22,79 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DefaultDirectLogoutViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class DefaultDirectLogoutViewTest : RobolectricTest() {
     @Test
-    fun `clicking on confirm logout sends expected Event`() {
+    fun `clicking on confirm logout sends expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
-        rule.setDefaultDirectLogoutView(
+        setDefaultDirectLogoutView(
             state = aDirectLogoutState(
                 logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_signout)
+        clickOn(CommonStrings.action_signout)
         eventsRecorder.assertSingle(DirectLogoutEvents.Logout(false))
     }
 
     @Test
-    fun `clicking on cancel logout sends expected Event`() {
+    fun `clicking on cancel logout sends expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
-        rule.setDefaultDirectLogoutView(
+        setDefaultDirectLogoutView(
             state = aDirectLogoutState(
                 logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(DirectLogoutEvents.CloseDialogs)
     }
 
     @Ignore("Pressing back key should dismiss the dialog, and so generate the expected event, but it's not the case.")
     @Test
-    fun `clicking on back invoke back callback`() {
+    fun `clicking on back invoke back callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
-        rule.setDefaultDirectLogoutView(
+        setDefaultDirectLogoutView(
             state = aDirectLogoutState(
                 logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(DirectLogoutEvents.CloseDialogs)
     }
 
     @Test
-    fun `clicking on confirm after error sends expected Event`() {
+    fun `clicking on confirm after error sends expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
-        rule.setDefaultDirectLogoutView(
+        setDefaultDirectLogoutView(
             state = aDirectLogoutState(
                 logoutAction = AsyncAction.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_signout_anyway)
+        clickOn(CommonStrings.action_signout_anyway)
         eventsRecorder.assertSingle(DirectLogoutEvents.Logout(true))
     }
 
     @Test
-    fun `clicking on cancel after error sends expected Event`() {
+    fun `clicking on cancel after error sends expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
-        rule.setDefaultDirectLogoutView(
+        setDefaultDirectLogoutView(
             state = aDirectLogoutState(
                 logoutAction = AsyncAction.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(DirectLogoutEvents.CloseDialogs)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setDefaultDirectLogoutView(
+private fun AndroidComposeUiTest<ComponentActivity>.setDefaultDirectLogoutView(
     state: DirectLogoutState,
 ) {
     setContent {
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
index a23e337d2a..3eecd54f3e 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
@@ -38,6 +38,7 @@ interface MessagesEntryPoint : FeatureEntryPoint {
         fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean)
         fun navigateToRoom(roomId: RoomId)
+        fun navigateToDeveloperSettings()
     }
 
     data class Params(val initialTarget: InitialTarget) : NodeInputs
diff --git a/features/messages/impl/build.gradle.kts b/features/messages/impl/build.gradle.kts
index 01482d0df5..b40aebab39 100644
--- a/features/messages/impl/build.gradle.kts
+++ b/features/messages/impl/build.gradle.kts
@@ -51,8 +51,9 @@ dependencies {
     implementation(projects.libraries.mediaupload.api)
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.preferences.api)
-    implementation(projects.libraries.recentemojis.api)
+    implementation(projects.libraries.emoji.api)
     implementation(projects.libraries.roomselect.api)
+    implementation(projects.libraries.slashcommands.api)
     implementation(projects.libraries.audio.api)
     implementation(projects.libraries.voiceplayer.api)
     implementation(projects.libraries.voicerecorder.api)
@@ -61,6 +62,7 @@ dependencies {
     implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.testtags)
     implementation(projects.features.networkmonitor.api)
+    implementation(projects.features.contentscanner.api)
     implementation(projects.services.analytics.compose)
     implementation(projects.services.appnavstate.api)
     implementation(projects.services.toolbox.api)
@@ -69,6 +71,7 @@ dependencies {
     implementation(libs.jsoup)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.constraintlayout.compose)
+    implementation(libs.androidx.exifinterface)
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui)
     implementation(libs.sigpwned.emoji4j)
@@ -103,5 +106,7 @@ dependencies {
     testImplementation(projects.libraries.testtags)
     testImplementation(projects.features.poll.test)
     testImplementation(projects.libraries.eventformatter.test)
-    testImplementation(projects.libraries.recentemojis.test)
+    testImplementation(projects.libraries.emoji.impl)
+    testImplementation(projects.libraries.emoji.test)
+    testImplementation(projects.libraries.slashcommands.test)
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvent.kt
index bef8ca84d6..4d621e417f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvent.kt
@@ -18,6 +18,8 @@ sealed interface MessagesEvent {
     data class ToggleReaction(val emoji: String, val eventOrTransactionId: EventOrTransactionId) : MessagesEvent
     data class InviteDialogDismissed(val action: InviteDialogAction) : MessagesEvent
     data class OnUserClicked(val user: MatrixUser) : MessagesEvent
+    data object StopLiveLocationShare : MessagesEvent
+    data object ShowLiveLocationShare : MessagesEvent
     data object MarkAsFullyReadAndExit : MessagesEvent
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
index 38d0504258..88a90f6c7d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
@@ -11,6 +11,9 @@ package io.element.android.features.messages.impl
 import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.lifecycle.subscribe
@@ -24,11 +27,12 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
 import io.element.android.features.location.api.LocationService
+import io.element.android.features.location.api.RenderingMapsNotSupportedDialog
 import io.element.android.features.location.api.ShareLocationEntryPoint
 import io.element.android.features.location.api.ShowLocationEntryPoint
 import io.element.android.features.location.api.ShowLocationMode
@@ -39,19 +43,25 @@ import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimel
 import io.element.android.features.messages.impl.pinned.list.PinnedMessagesListNode
 import io.element.android.features.messages.impl.report.ReportMessageNode
 import io.element.android.features.messages.impl.threads.ThreadedMessagesNode
+import io.element.android.features.messages.impl.threads.list.ThreadsListNode
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.debug.EventDebugInfoNode
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentWithAttachment
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
+import io.element.android.features.messages.impl.timeline.model.event.blurHash
 import io.element.android.features.messages.impl.timeline.model.event.duration
 import io.element.android.features.poll.api.create.CreatePollEntryPoint
 import io.element.android.features.poll.api.create.CreatePollMode
+import io.element.android.libraries.androidutils.system.DeviceHasVulkanSupport
 import io.element.android.libraries.architecture.BackstackWithOverlayBox
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.callback
@@ -80,6 +90,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
 import io.element.android.libraries.matrix.ui.messages.RoomNamesCache
+import io.element.android.libraries.mediaviewer.api.GalleryInfo
+import io.element.android.libraries.mediaviewer.api.GalleryItemData
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.textcomposer.mentions.LocalMentionSpanUpdater
@@ -120,6 +132,7 @@ class MessagesFlowNode(
     private val knockRequestsListEntryPoint: KnockRequestsListEntryPoint,
     private val dateFormatter: DateFormatter,
     private val coroutineDispatchers: CoroutineDispatchers,
+    private val hasVulkanSupport: DeviceHasVulkanSupport,
 ) : BaseFlowNode<MessagesFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = plugins.filterIsInstance<MessagesEntryPoint.Params>().first().initialTarget.toNavTarget(),
@@ -142,10 +155,21 @@ class MessagesFlowNode(
             val mediaInfo: MediaInfo,
             val mediaSource: MediaSource,
             val thumbnailSource: MediaSource?,
+            val canUseOverlay: Boolean,
+            val blurHash: String?,
         ) : NavTarget
 
         @Parcelize
-        data class AttachmentPreview(val timelineMode: Timeline.Mode, val attachment: Attachment, val inReplyToEventId: EventId?) : NavTarget
+        data class GalleryViewer(
+            val fromPinnedMessages: Boolean,
+            val eventId: EventId?,
+            val galleryInfo: GalleryInfo,
+            val canUseOverlay: Boolean,
+            val galleryItems: List<GalleryItemData> = emptyList(),
+        ) : NavTarget
+
+        @Parcelize
+        data class AttachmentPreview(val timelineMode: Timeline.Mode, val attachments: ImmutableList<Attachment>, val inReplyToEventId: EventId?) : NavTarget
 
         @Parcelize
         data class LocationViewer(val mode: ShowLocationMode) : NavTarget
@@ -179,10 +203,18 @@ class MessagesFlowNode(
 
         @Parcelize
         data class Thread(val threadRootId: ThreadId, val focusedEventId: EventId?) : NavTarget
+
+        @Parcelize
+        data object ThreadsList : NavTarget
+
+        @Parcelize
+        data class AvatarPreview(val name: String, val avatarUrl: String) : NavTarget
     }
 
     private val callback: MessagesEntryPoint.Callback = callback()
 
+    private var displayVulkanNotSupportedError by mutableStateOf(false)
+
     override fun onBuilt() {
         super.onBuilt()
         lifecycle.subscribe(
@@ -223,17 +255,36 @@ class MessagesFlowNode(
                         callback.navigateToRoomDetails()
                     }
 
-                    override fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
+                    override fun handleEventClick(
+                        timelineMode: Timeline.Mode,
+                        event: TimelineItem.Event,
+                        canUseOverlay: Boolean,
+                    ): Boolean {
                         return processEventClick(
                             timelineMode = timelineMode,
                             event = event,
+                            canUseOverlay = canUseOverlay,
+                        )
+                    }
+
+                    override fun handleGalleryItemClick(
+                        timelineMode: Timeline.Mode,
+                        event: TimelineItem.Event,
+                        galleryItemIndex: Int,
+                        canUseOverlay: Boolean,
+                    ): Boolean {
+                        return processGalleryEventClick(
+                            timelineMode = timelineMode,
+                            event = event,
+                            canUseOverlay = canUseOverlay,
+                            galleryItemIndex = galleryItemIndex,
                         )
                     }
 
                     override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
                         backstack.push(
                             NavTarget.AttachmentPreview(
-                                attachment = attachments.first(),
+                                attachments = attachments,
                                 timelineMode = Timeline.Mode.Live,
                                 inReplyToEventId = inReplyToEventId,
                             )
@@ -261,7 +312,11 @@ class MessagesFlowNode(
                     }
 
                     override fun navigateToSendLocation() {
-                        backstack.push(NavTarget.SendLocation(Timeline.Mode.Live))
+                        if (hasVulkanSupport()) {
+                            backstack.push(NavTarget.SendLocation(Timeline.Mode.Live))
+                        } else {
+                            displayVulkanNotSupportedError = true
+                        }
                     }
 
                     override fun navigateToCreatePoll() {
@@ -272,14 +327,22 @@ class MessagesFlowNode(
                         backstack.push(NavTarget.EditPoll(Timeline.Mode.Live, eventId))
                     }
 
+                    override fun navigateToCurrentLiveLocation() {
+                        if (hasVulkanSupport()) {
+                            backstack.push(NavTarget.LocationViewer(ShowLocationMode.Live(senderId = sessionId)))
+                        } else {
+                            displayVulkanNotSupportedError = true
+                        }
+                    }
+
                     override fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean) {
-                        val callType = CallType.RoomCall(
+                        val callData = CallData(
                             sessionId = sessionId,
                             roomId = roomId,
-                            isAudioCall = isAudioCall
+                            isAudioCall = isAudioCall,
                         )
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
-                        elementCallEntryPoint.startCall(callType)
+                        elementCallEntryPoint.startCall(callData)
                     }
 
                     override fun navigateToPinnedMessagesList() {
@@ -293,22 +356,70 @@ class MessagesFlowNode(
                     override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
                         backstack.push(NavTarget.Thread(threadRootId, focusedEventId))
                     }
+
+                    override fun navigateToThreadsList() {
+                        backstack.push(NavTarget.ThreadsList)
+                    }
+
+                    override fun navigateToDeveloperSettings() {
+                        callback.navigateToDeveloperSettings()
+                    }
+
+                    override fun navigateToAvatarPreview(username: String, avatarUrl: String) {
+                        overlay.show(NavTarget.AvatarPreview(username, avatarUrl))
+                    }
                 }
                 val inputs = MessagesNode.Inputs(focusedEventId = navTarget.focusedEventId)
                 createNode<MessagesNode>(buildContext, listOf(callback, inputs))
             }
             is NavTarget.MediaViewer -> {
-                val params = MediaViewerEntryPoint.Params(
+                val params = MediaViewerEntryPoint.Params.RoomMedia(
                     mode = navTarget.mode,
                     eventId = navTarget.eventId,
                     mediaInfo = navTarget.mediaInfo,
                     mediaSource = navTarget.mediaSource,
                     thumbnailSource = navTarget.thumbnailSource,
-                    canShowInfo = true,
+                    blurHash = navTarget.blurHash,
                 )
                 val callback = object : MediaViewerEntryPoint.Callback {
                     override fun onDone() {
-                        overlay.hide()
+                        if (navTarget.canUseOverlay) {
+                            overlay.hide()
+                        } else {
+                            backstack.pop()
+                        }
+                    }
+
+                    override fun viewInTimeline(eventId: EventId) {
+                        this@MessagesFlowNode.viewInTimeline(eventId)
+                    }
+
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                        // Need to go to the parent because of the overlay
+                        callback.forwardEvent(eventId, fromPinnedEvents)
+                    }
+                }
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback
+                )
+            }
+            is NavTarget.GalleryViewer -> {
+                val params = MediaViewerEntryPoint.Params.EventGallery(
+                    eventId = navTarget.eventId,
+                    galleryInfo = navTarget.galleryInfo,
+                    galleryItems = navTarget.galleryItems,
+                    fromPinnedMessages = navTarget.fromPinnedMessages,
+                )
+                val callback = object : MediaViewerEntryPoint.Callback {
+                    override fun onDone() {
+                        if (navTarget.canUseOverlay) {
+                            overlay.hide()
+                        } else {
+                            backstack.pop()
+                        }
                     }
 
                     override fun viewInTimeline(eventId: EventId) {
@@ -329,7 +440,7 @@ class MessagesFlowNode(
             }
             is NavTarget.AttachmentPreview -> {
                 val inputs = AttachmentsPreviewNode.Inputs(
-                    attachment = navTarget.attachment,
+                    attachments = navTarget.attachments,
                     timelineMode = navTarget.timelineMode,
                     inReplyToEventId = navTarget.inReplyToEventId,
                 )
@@ -402,10 +513,24 @@ class MessagesFlowNode(
             }
             NavTarget.PinnedMessagesList -> {
                 val callback = object : PinnedMessagesListNode.Callback {
-                    override fun handleEventClick(event: TimelineItem.Event) {
+                    override fun handleEventClick(event: TimelineItem.Event, canUseOverlay: Boolean) {
                         processEventClick(
                             timelineMode = Timeline.Mode.PinnedEvents,
                             event = event,
+                            canUseOverlay = canUseOverlay,
+                        )
+                    }
+
+                    override fun handleGalleryItemClick(
+                        event: TimelineItem.Event,
+                        galleryItemIndex: Int,
+                        canUseOverlay: Boolean,
+                    ) {
+                        processGalleryEventClick(
+                            timelineMode = Timeline.Mode.PinnedEvents,
+                            event = event,
+                            galleryItemIndex = galleryItemIndex,
+                            canUseOverlay = canUseOverlay,
                         )
                     }
 
@@ -428,6 +553,10 @@ class MessagesFlowNode(
                     override fun handleForwardEventClick(eventId: EventId) {
                         backstack.push(NavTarget.ForwardEvent(eventId = eventId, fromPinnedEvents = true))
                     }
+
+                    override fun navigateToThread(threadRootId: ThreadId) {
+                        backstack.push(NavTarget.Thread(threadRootId, null))
+                    }
                 }
                 createNode<PinnedMessagesListNode>(buildContext, plugins = listOf(callback))
             }
@@ -440,17 +569,36 @@ class MessagesFlowNode(
                     focusedEventId = navTarget.focusedEventId,
                 )
                 val callback = object : ThreadedMessagesNode.Callback {
-                    override fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean {
+                    override fun handleEventClick(
+                        timelineMode: Timeline.Mode,
+                        event: TimelineItem.Event,
+                        canUseOverlay: Boolean,
+                    ): Boolean {
                         return processEventClick(
                             timelineMode = timelineMode,
                             event = event,
+                            canUseOverlay = canUseOverlay,
+                        )
+                    }
+
+                    override fun handleGalleryItemClick(
+                        timelineMode: Timeline.Mode,
+                        event: TimelineItem.Event,
+                        galleryItemIndex: Int,
+                        canUseOverlay: Boolean,
+                    ): Boolean {
+                        return processGalleryEventClick(
+                            timelineMode = timelineMode,
+                            event = event,
+                            canUseOverlay = canUseOverlay,
+                            galleryItemIndex = galleryItemIndex,
                         )
                     }
 
                     override fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) {
                         backstack.push(
                             NavTarget.AttachmentPreview(
-                                attachment = attachments.first(),
+                                attachments = attachments,
                                 timelineMode = Timeline.Mode.Thread(navTarget.threadRootId),
                                 inReplyToEventId = inReplyToEventId,
                             )
@@ -478,7 +626,11 @@ class MessagesFlowNode(
                     }
 
                     override fun navigateToSendLocation() {
-                        backstack.push(NavTarget.SendLocation(Timeline.Mode.Thread(navTarget.threadRootId)))
+                        if (hasVulkanSupport()) {
+                            backstack.push(NavTarget.SendLocation(Timeline.Mode.Thread(navTarget.threadRootId)))
+                        } else {
+                            displayVulkanNotSupportedError = true
+                        }
                     }
 
                     override fun navigateToCreatePoll() {
@@ -489,22 +641,71 @@ class MessagesFlowNode(
                         backstack.push(NavTarget.EditPoll(Timeline.Mode.Thread(navTarget.threadRootId), eventId))
                     }
 
+                    override fun navigateToCurrentLiveLocation() {
+                        if (hasVulkanSupport()) {
+                            backstack.push(NavTarget.LocationViewer(ShowLocationMode.Live(senderId = sessionId)))
+                        } else {
+                            displayVulkanNotSupportedError = true
+                        }
+                    }
+
                     override fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean) {
-                        val callType = CallType.RoomCall(
+                        val callData = CallData(
                             sessionId = sessionId,
                             roomId = roomId,
                             isAudioCall = isAudioCall
                         )
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
-                        elementCallEntryPoint.startCall(callType)
+                        elementCallEntryPoint.startCall(callData)
                     }
 
                     override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
                         backstack.push(NavTarget.Thread(threadRootId, focusedEventId))
                     }
+
+                    override fun navigateToDeveloperSettings() {
+                        callback.navigateToDeveloperSettings()
+                    }
+
+                    override fun navigateToAvatarPreview(username: String, avatarUrl: String) {
+                        overlay.show(NavTarget.AvatarPreview(username, avatarUrl))
+                    }
                 }
                 createNode<ThreadedMessagesNode>(buildContext, listOf(inputs, callback))
             }
+            NavTarget.ThreadsList -> {
+                val callback = object : ThreadsListNode.Callback {
+                    override fun openThread(threadId: ThreadId) {
+                        backstack.push(NavTarget.Thread(threadId, focusedEventId = null))
+                    }
+                }
+                createNode<ThreadsListNode>(buildContext, listOf(callback))
+            }
+            is NavTarget.AvatarPreview -> {
+                val callback = object : MediaViewerEntryPoint.Callback {
+                    override fun onDone() {
+                        overlay.hide()
+                    }
+
+                    override fun viewInTimeline(eventId: EventId) {
+                        // Cannot happen
+                    }
+
+                    override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                        // Cannot happen
+                    }
+                }
+                val params = mediaViewerEntryPoint.createParamsForAvatar(
+                    filename = navTarget.name,
+                    avatarUrl = navTarget.avatarUrl,
+                )
+                mediaViewerEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
+            }
         }
     }
 
@@ -519,6 +720,7 @@ class MessagesFlowNode(
     private fun processEventClick(
         timelineMode: Timeline.Mode,
         event: TimelineItem.Event,
+        canUseOverlay: Boolean,
     ): Boolean {
         val navTarget = when (event.content) {
             is TimelineItemImageContent -> {
@@ -528,6 +730,7 @@ class MessagesFlowNode(
                     content = event.content,
                     mediaSource = event.content.mediaSource,
                     thumbnailSource = event.content.thumbnailSource,
+                    canUseOverlay = canUseOverlay,
                 )
             }
             is TimelineItemVideoContent -> {
@@ -537,6 +740,7 @@ class MessagesFlowNode(
                     content = event.content,
                     mediaSource = event.content.mediaSource,
                     thumbnailSource = event.content.thumbnailSource,
+                    canUseOverlay = canUseOverlay,
                 )
             }
             is TimelineItemFileContent -> {
@@ -546,6 +750,7 @@ class MessagesFlowNode(
                     content = event.content,
                     mediaSource = event.content.mediaSource,
                     thumbnailSource = event.content.thumbnailSource,
+                    canUseOverlay = canUseOverlay,
                 )
             }
             is TimelineItemAudioContent -> {
@@ -555,26 +760,37 @@ class MessagesFlowNode(
                     content = event.content,
                     mediaSource = event.content.mediaSource,
                     thumbnailSource = null,
+                    canUseOverlay = canUseOverlay,
                 )
             }
             is TimelineItemLocationContent -> {
-                val mode = ShowLocationMode.Static(
-                    location = event.content.location,
-                    senderName = event.safeSenderName,
-                    senderId = event.senderId,
-                    senderAvatarUrl = event.senderAvatar.url,
-                    timestamp = event.sentTimeMillis,
-                    assetType = event.content.assetType,
-                )
-                NavTarget.LocationViewer(
-                   mode = mode
-                ).takeIf { locationService.isServiceAvailable() }
+                if (hasVulkanSupport()) {
+                    val mode = when (event.content.mode) {
+                        is TimelineItemLocationContent.Mode.Live -> ShowLocationMode.Live(event.senderId)
+                        is TimelineItemLocationContent.Mode.Static -> ShowLocationMode.Static(
+                            location = event.content.mode.location,
+                            senderName = event.safeSenderName,
+                            senderId = event.senderId,
+                            senderAvatarUrl = event.senderAvatar.url,
+                            timestamp = event.sentTimeMillis,
+                            assetType = event.content.assetType,
+                        )
+                    }
+                    NavTarget.LocationViewer(mode = mode).takeIf { locationService.isServiceAvailable() }
+                } else {
+                    displayVulkanNotSupportedError = true
+                    null
+                }
             }
             else -> null
         }
         return when (navTarget) {
             is NavTarget.MediaViewer -> {
-                overlay.show(navTarget)
+                if (canUseOverlay) {
+                    overlay.show(navTarget)
+                } else {
+                    backstack.push(navTarget)
+                }
                 true
             }
             is NavTarget.LocationViewer -> {
@@ -585,12 +801,101 @@ class MessagesFlowNode(
         }
     }
 
+    private fun processGalleryEventClick(
+        timelineMode: Timeline.Mode,
+        event: TimelineItem.Event,
+        galleryItemIndex: Int,
+        canUseOverlay: Boolean,
+    ): Boolean {
+        val navTarget = when (event.content) {
+            is TimelineItemGalleryContent -> {
+                val galleryInfo = GalleryInfo(
+                    caption = event.content.caption,
+                    senderId = event.senderId,
+                    senderName = event.safeSenderName,
+                    senderAvatar = event.senderAvatar.url,
+                    dateSent = dateFormatter.format(
+                        event.sentTimeMillis,
+                        mode = DateFormatterMode.Day,
+                    ),
+                    dateSentFull = dateFormatter.format(
+                        timestamp = event.sentTimeMillis,
+                        mode = DateFormatterMode.Full,
+                    ),
+                    initialIndex = galleryItemIndex,
+                )
+                val galleryItems = event.content.items.map { galleryItem ->
+                    GalleryItemData(
+                        filename = galleryItem.filename,
+                        mimeType = galleryItem.mimeType,
+                        mediaSource = galleryItem.mediaSource,
+                        thumbnailSource = galleryItem.thumbnailSource,
+                        type = galleryItem.type.toMediaViewerType(),
+                        blurHash = galleryItem.blurhash,
+                    )
+                }.reversed()
+                NavTarget.GalleryViewer(
+                    eventId = event.eventId,
+                    galleryInfo = galleryInfo,
+                    canUseOverlay = canUseOverlay,
+                    galleryItems = galleryItems,
+                    fromPinnedMessages = timelineMode is Timeline.Mode.PinnedEvents
+                )
+            }
+            is TimelineItemAttachmentsContent -> {
+                val galleryInfo = GalleryInfo(
+                    caption = event.content.caption,
+                    senderId = event.senderId,
+                    senderName = event.safeSenderName,
+                    senderAvatar = event.senderAvatar.url,
+                    dateSent = dateFormatter.format(
+                        event.sentTimeMillis,
+                        mode = DateFormatterMode.Day,
+                    ),
+                    dateSentFull = dateFormatter.format(
+                        timestamp = event.sentTimeMillis,
+                        mode = DateFormatterMode.Full,
+                    ),
+                    initialIndex = galleryItemIndex,
+                )
+                val galleryItems = event.content.attachments.map { attachment ->
+                    GalleryItemData(
+                        filename = attachment.filename,
+                        mimeType = attachment.mimeType,
+                        mediaSource = attachment.mediaSource,
+                        thumbnailSource = attachment.thumbnailSource,
+                        type = GalleryItemData.Type.File,
+                        blurHash = null,
+                    )
+                }.reversed()
+                NavTarget.GalleryViewer(
+                    eventId = event.eventId,
+                    galleryInfo = galleryInfo,
+                    canUseOverlay = canUseOverlay,
+                    galleryItems = galleryItems,
+                    fromPinnedMessages = timelineMode is Timeline.Mode.PinnedEvents
+                )
+            }
+            else -> null
+        }
+        if (navTarget != null) {
+            if (canUseOverlay) {
+                overlay.show(navTarget)
+            } else {
+                backstack.push(navTarget)
+            }
+            return true
+        }
+        return false
+    }
+
     private fun buildMediaViewerNavTarget(
         mode: MediaViewerEntryPoint.MediaViewerMode,
         event: TimelineItem.Event,
         content: TimelineItemEventContentWithAttachment,
         mediaSource: MediaSource,
         thumbnailSource: MediaSource?,
+        canUseOverlay: Boolean,
     ): NavTarget {
         return NavTarget.MediaViewer(
             mode = mode,
@@ -599,6 +904,7 @@ class MessagesFlowNode(
                 filename = content.filename,
                 fileSize = content.fileSize,
                 caption = content.caption,
+                formattedCaption = content.formattedCaption,
                 mimeType = content.mimeType,
                 formattedFileSize = content.formattedFileSize,
                 fileExtension = content.fileExtension,
@@ -618,6 +924,8 @@ class MessagesFlowNode(
             ),
             mediaSource = mediaSource,
             thumbnailSource = thumbnailSource,
+            canUseOverlay = canUseOverlay,
+            blurHash = content.blurHash(),
         )
     }
 
@@ -634,6 +942,11 @@ class MessagesFlowNode(
     @Composable
     override fun View(modifier: Modifier) {
         mentionSpanTheme.updateStyles()
+
+        if (displayVulkanNotSupportedError) {
+            RenderingMapsNotSupportedDialog { displayVulkanNotSupportedError = false }
+        }
+
         CompositionLocalProvider(
             LocalMentionSpanUpdater provides mentionSpanUpdater
         ) {
@@ -641,3 +954,12 @@ class MessagesFlowNode(
         }
     }
 }
+
+private fun GalleryItem.Type.toMediaViewerType(): GalleryItemData.Type {
+    return when (this) {
+        GalleryItem.Type.Image -> GalleryItemData.Type.Image
+        GalleryItem.Type.Video -> GalleryItemData.Type.Video
+        GalleryItem.Type.Audio -> GalleryItemData.Type.Audio
+        GalleryItem.Type.File -> GalleryItemData.Type.File
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
index 2ec5c0bcbf..6113b68aab 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
@@ -23,6 +23,9 @@ interface MessagesNavigator {
     fun navigateToEditPoll(eventId: EventId)
     fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
     fun navigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List<String>)
+    fun navigateToMember(userId: UserId)
     fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
+    fun navigateToDeveloperSettings()
+    fun navigateToCurrentLiveLocation()
     fun close()
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
index 0c0b3e5448..d4fce982e8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -38,6 +38,7 @@ import io.element.android.features.messages.impl.messagecomposer.MessageComposer
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.timeline.TimelineEvent
 import io.element.android.features.messages.impl.timeline.TimelinePresenter
+import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionBottomSheet
 import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories
 import io.element.android.features.messages.impl.timeline.di.TimelineItemPresenterFactories
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
@@ -54,6 +55,7 @@ import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
 import io.element.android.libraries.matrix.api.analytics.toAnalyticsViewRoom
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -66,8 +68,13 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.alias.matches
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.LocalEventContentValidationState
+import io.element.android.libraries.matrix.ui.model.getBestName
 import io.element.android.libraries.mediaplayer.api.MediaPlayer
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.utils.a11y.hasExternalKeyboard
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction.LoadMessagesUi
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.api.finishLongRunningTransaction
@@ -94,6 +101,8 @@ class MessagesNode(
     private val permalinkParser: PermalinkParser,
     private val knockRequestsBannerRenderer: KnockRequestsBannerRenderer,
     private val roomMemberModerationRenderer: RoomMemberModerationRenderer,
+    private val eventContentValidationCache: EventContentValidationCache,
+    private val emojiPickerRenderer: EmojiPickerRenderer,
 ) : Node(buildContext, plugins = plugins), MessagesNavigator {
     data class Inputs(
         val focusedEventId: EventId?,
@@ -105,7 +114,7 @@ class MessagesNode(
     private val timelineController = TimelineController(room, room.liveTimeline)
     private val presenter = presenterFactory.create(
         navigator = this,
-        composerPresenter = messageComposerPresenterFactory.create(timelineController, this),
+        composerPresenter = messageComposerPresenterFactory.create(timelineController, this, threadRoot = null),
         timelinePresenter = timelinePresenterFactory.create(timelineController = timelineController, this),
         actionListPresenter = actionListPresenterFactory.create(
             postProcessor = TimelineItemActionPostProcessor.Default,
@@ -115,7 +124,8 @@ class MessagesNode(
     )
 
     interface Callback : Plugin {
-        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
+        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event, canUseOverlay: Boolean): Boolean
+        fun handleGalleryItemClick(timelineMode: Timeline.Mode, event: TimelineItem.Event, galleryItemIndex: Int, canUseOverlay: Boolean): Boolean
         fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
         fun navigateToRoomMemberDetails(userId: UserId)
         fun handlePermalinkClick(data: PermalinkData)
@@ -125,11 +135,17 @@ class MessagesNode(
         fun navigateToSendLocation()
         fun navigateToCreatePoll()
         fun navigateToEditPoll(eventId: EventId)
+        fun navigateToCurrentLiveLocation()
         fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean)
         fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
         fun navigateToRoomDetails()
         fun navigateToPinnedMessagesList()
         fun navigateToKnockRequestsList()
+        fun navigateToDeveloperSettings()
+
+        fun navigateToThreadsList()
+
+        fun navigateToAvatarPreview(username: String, avatarUrl: String)
     }
 
     override fun onBuilt() {
@@ -222,10 +238,22 @@ class MessagesNode(
         }
     }
 
+    override fun navigateToMember(userId: UserId) {
+        callback.navigateToRoomMemberDetails(userId)
+    }
+
     override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
         callback.navigateToThread(threadRootId, focusedEventId)
     }
 
+    override fun navigateToDeveloperSettings() {
+        callback.navigateToDeveloperSettings()
+    }
+
+    override fun navigateToCurrentLiveLocation() {
+        callback.navigateToCurrentLiveLocation()
+    }
+
     private fun displaySameRoomToast() {
         context.toast(CommonStrings.screen_room_permalink_same_room_android)
     }
@@ -236,8 +264,10 @@ class MessagesNode(
     override fun View(modifier: Modifier) {
         val activity = requireNotNull(LocalActivity.current)
         val isDark = ElementTheme.isLightTheme.not()
+        val canUseOverlay = !isTalkbackActive() && !hasExternalKeyboard()
         CompositionLocalProvider(
             LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories,
+            LocalEventContentValidationState provides eventContentValidationCache,
         ) {
             val state = presenter.present()
 
@@ -257,11 +287,23 @@ class MessagesNode(
                 onRoomDetailsClick = callback::navigateToRoomDetails,
                 onEventContentClick = { isLive, event ->
                     if (isLive) {
-                        callback.handleEventClick(timelineController.mainTimelineMode(), event)
+                        callback.handleEventClick(timelineController.mainTimelineMode(), event, canUseOverlay)
                     } else {
                         val detachedTimelineMode = timelineController.detachedTimelineMode()
                         if (detachedTimelineMode != null) {
-                            callback.handleEventClick(detachedTimelineMode, event)
+                            callback.handleEventClick(detachedTimelineMode, event, canUseOverlay)
+                        } else {
+                            false
+                        }
+                    }
+                },
+                onGalleryEventItemClick = { isLive, event, index ->
+                    if (isLive) {
+                        callback.handleGalleryItemClick(timelineController.mainTimelineMode(), event, index, canUseOverlay)
+                    } else {
+                        val detachedTimelineMode = timelineController.detachedTimelineMode()
+                        if (detachedTimelineMode != null) {
+                            callback.handleGalleryItemClick(detachedTimelineMode, event, index, canUseOverlay)
                         } else {
                             false
                         }
@@ -290,6 +332,16 @@ class MessagesNode(
                         onViewRequestsClick = callback::navigateToKnockRequestsList,
                     )
                 },
+                customReactionBottomSheet = {
+                    CustomReactionBottomSheet(
+                        state = state.customReactionState,
+                        onSelectEmoji = { uniqueId, emoji ->
+                            state.eventSink(MessagesEvent.ToggleReaction(emoji.unicode, uniqueId))
+                        },
+                        emojiPickerRenderer = emojiPickerRenderer,
+                    )
+                },
+                onThreadsListClick = callback::navigateToThreadsList,
             )
             roomMemberModerationRenderer.Render(
                 state = state.roomMemberModerationState,
@@ -299,6 +351,11 @@ class MessagesNode(
                         else -> state.roomMemberModerationState.eventSink(RoomMemberModerationEvents.ProcessAction(action, target))
                     }
                 },
+                onAvatarClick = { user ->
+                    user.avatarUrl?.let { url ->
+                        callback.navigateToAvatarPreview(user.getBestName(), url)
+                    }
+                },
                 modifier = Modifier,
             )
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index d9c3d17afa..dd3afb0ea6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -26,7 +27,10 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.PinUnpinAction
 import io.element.android.appconfig.MessageComposerConfig
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
+import io.element.android.features.location.api.live.isCurrentlySharing
 import io.element.android.features.messages.api.timeline.HtmlConverterProvider
+import io.element.android.features.messages.impl.MessagesState.Threads
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.crypto.identity.IdentityChangeState
@@ -43,10 +47,10 @@ import io.element.android.features.messages.impl.timeline.components.reactionsum
 import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetState
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
-import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentWithAttachment
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
+import io.element.android.features.messages.impl.timeline.model.event.captionOrNull
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.messages.impl.voicemessages.composer.DefaultVoiceMessageComposerPresenter
 import io.element.android.features.roomcall.api.RoomCallState
@@ -65,6 +69,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.emoji.api.recentemojis.AddRecentEmoji
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.toThreadId
@@ -75,18 +80,21 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
+import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.ui.messages.reply.map
+import io.element.android.libraries.matrix.ui.model.dmUserStatus
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
-import io.element.android.libraries.recentemojis.api.AddRecentEmoji
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -121,6 +129,7 @@ class MessagesPresenter(
     private val featureFlagService: FeatureFlagService,
     private val addRecentEmoji: AddRecentEmoji,
     private val markAsFullyRead: MarkAsFullyRead,
+    private val liveLocationShareManager: ActiveLiveLocationShareManager,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
 ) : Presenter<MessagesState> {
     @AssistedFactory
@@ -160,6 +169,14 @@ class MessagesPresenter(
         val pinnedMessagesBannerState = pinnedMessagesBannerPresenter.present()
         val roomCallState = roomCallStatePresenter.present()
         val roomMemberModerationState = roomMemberModerationPresenter.present()
+        val threadsList by produceState(persistentListOf()) {
+            room.threadsListService.subscribeToItemUpdates()
+                .onStart { room.threadsListService.paginate() }
+                .collectLatest { value = it.toImmutableList() }
+        }
+
+        val canOpenThreadList by featureFlagService.isFeatureEnabledFlow(FeatureFlags.RoomThreadList).collectAsState(initial = false)
+        val isCurrentlySharingLiveLocationInRoom by remember { liveLocationShareManager.isCurrentlySharing(room.roomId) }.collectAsState()
 
         val userEventPermissions by room.permissionsAsState(UserEventPermissions.DEFAULT) { perms ->
             perms.userEventPermissions()
@@ -205,12 +222,10 @@ class MessagesPresenter(
         val dmRoomMember by room.getDirectRoomMember(membersState)
         val roomMemberIdentityStateChanges = identityChangeState.roomMemberIdentityStateChanges
 
-        val isKeyShareOnInviteEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.EnableKeyShareOnInvite).collectAsState(initial = false)
         // The top bar should show a "history" icon if:
-        //   * History sharing is enabled,
         //   * The room is encrypted, and:
         //   * The room's history_visibility allows future users to see content.
-        val topBarSharedHistoryIcon = if (isKeyShareOnInviteEnabled) roomInfo.sharedHistoryIcon() else SharedHistoryIcon.NONE
+        val topBarSharedHistoryIcon = roomInfo.sharedHistoryIcon()
 
         LifecycleResumeEffect(dmRoomMember, roomInfo.isEncrypted) {
             if (roomInfo.isEncrypted == true) {
@@ -250,12 +265,23 @@ class MessagesPresenter(
                 is MessagesEvent.OnUserClicked -> {
                     roomMemberModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.user))
                 }
-                is MessagesEvent.MarkAsFullyReadAndExit -> coroutineScope.launch {
-                    if (!markingAsReadAndExiting.getAndSet(true)) {
+                MessagesEvent.StopLiveLocationShare -> {
+                    localCoroutineScope.launch {
+                        liveLocationShareManager.stopShare(room.roomId)
+                            .onFailure {
+                                Timber.e(it, "Failed to stop live location share for roomId=${room.roomId}")
+                                snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_error))
+                            }
+                    }
+                }
+                MessagesEvent.ShowLiveLocationShare -> {
+                    navigator.navigateToCurrentLiveLocation()
+                }
+                is MessagesEvent.MarkAsFullyReadAndExit -> if (!markingAsReadAndExiting.getAndSet(true)) {
+                    coroutineScope.launch {
                         val latestEventId = room.liveTimeline.getLatestEventId().getOrElse {
                             Timber.w(it, "Failed to get latest event id to mark as fully read")
-                            navigator.close()
-                            return@launch
+                            null
                         }
                         latestEventId?.let { eventId ->
                             sessionCoroutineScope.launch {
@@ -263,6 +289,7 @@ class MessagesPresenter(
                             }
                         }
                         navigator.close()
+                    }.invokeOnCompletion {
                         markingAsReadAndExiting.set(false)
                     }
                 }
@@ -293,9 +320,16 @@ class MessagesPresenter(
             appName = buildMeta.applicationName,
             pinnedMessagesBannerState = pinnedMessagesBannerState,
             dmUserVerificationState = dmUserVerificationState,
+            dmUserStatus = roomInfo.dmUserStatus(),
             roomMemberModerationState = roomMemberModerationState,
             topBarSharedHistoryIcon = topBarSharedHistoryIcon,
             successorRoom = roomInfo.successorRoom,
+            threads = Threads(
+                hasThreads = canOpenThreadList && threadsList.isNotEmpty(),
+                // TODO calculate this properly based on the thread list and the read state of each thread
+                hasUnreadThreads = false,
+            ),
+            showLiveLocationShareBanner = isCurrentlySharingLiveLocationInRoom && timelineState.timelineMode !is Timeline.Mode.Thread,
             eventSink = ::handleEvent,
         )
     }
@@ -501,7 +535,7 @@ class MessagesPresenter(
     ) {
         val composerMode = MessageComposerMode.EditCaption(
             eventOrTransactionId = targetEvent.eventOrTransactionId,
-            content = (targetEvent.content as? TimelineItemEventContentWithAttachment)?.caption.orEmpty(),
+            content = targetEvent.content.captionOrNull().orEmpty(),
         )
         composerState.eventSink(
             MessageComposerEvent.SetMode(composerMode)
@@ -518,7 +552,7 @@ class MessagesPresenter(
             val replyToDetails = loadReplyDetails(targetEvent.eventId).map(permalinkParser)
             val composerMode = MessageComposerMode.Reply(
                 replyToDetails = replyToDetails,
-                hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId),
+                hideImage = timelineProtectionState.hideMediaContent(targetEvent.eventId, targetEvent.isMine),
             )
             composerState.eventSink(
                 MessageComposerEvent.SetMode(composerMode)
@@ -574,7 +608,7 @@ class MessagesPresenter(
     }
 
     private fun handleCopyCaption(event: TimelineItem.Event) {
-        val content = (event.content as? TimelineItemEventContentWithAttachment)?.caption ?: return
+        val content = event.content.captionOrNull() ?: return
         clipboardHelper.copyPlainText(content)
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_copied_to_clipboard))
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt
index c18fb461e0..d9ec875320 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesState.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.collections.immutable.ImmutableList
 
 data class MessagesState(
@@ -53,13 +54,21 @@ data class MessagesState(
     val appName: String,
     val pinnedMessagesBannerState: PinnedMessagesBannerState,
     val dmUserVerificationState: IdentityState?,
+    val dmUserStatus: DisplayedStatus?,
     val roomMemberModerationState: RoomMemberModerationState,
     /** Type of "shared history" icon to show in the top bar. */
     val topBarSharedHistoryIcon: SharedHistoryIcon,
     val successorRoom: SuccessorRoom?,
+    val threads: Threads,
+    val showLiveLocationShareBanner: Boolean,
     val eventSink: (MessagesEvent) -> Unit
 ) {
     val isTombstoned = successorRoom != null
+
+    data class Threads(
+        val hasThreads: Boolean,
+        val hasUnreadThreads: Boolean,
+    )
 }
 
 /** Type of "shared history" icon to show in the top bar. */
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt
index d969ae1491..7315ace96e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt
@@ -44,15 +44,16 @@ import io.element.android.features.roommembermoderation.api.RoomMemberModeration
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.aTextEditorStateMarkdown
 import io.element.android.libraries.textcomposer.model.aTextEditorStateRich
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
 
@@ -79,6 +80,7 @@ open class MessagesStateProvider : PreviewParameterProvider<MessagesState> {
                     currentPinnedMessageIndex = 0,
                 ),
             ),
+            aMessagesState(isCurrentlySharingLiveLocationInRoom = true),
             aMessagesState(successorRoom = SuccessorRoom(RoomId("!id:domain"), null)),
             aMessagesState(
                 timelineState = aTimelineState(
@@ -94,8 +96,8 @@ open class MessagesStateProvider : PreviewParameterProvider<MessagesState> {
 }
 
 fun aMessagesState(
-    roomName: String? = "Room name",
-    roomAvatar: AvatarData = AvatarData("!id:domain", "Room name", size = AvatarSize.TimelineRoom),
+    roomName: String? = ROOM_NAME,
+    roomAvatar: AvatarData = AvatarData("!id:domain", ROOM_NAME, size = AvatarSize.TimelineRoom),
     userEventPermissions: UserEventPermissions = aUserEventPermissions(),
     composerState: MessageComposerState = aMessageComposerState(
         textEditorState = aTextEditorStateRich(initialText = "Hello", initialFocus = true),
@@ -122,6 +124,12 @@ fun aMessagesState(
     roomMemberModerationState: RoomMemberModerationState = aRoomMemberModerationState(),
     topBarSharedHistoryIcon: SharedHistoryIcon = SharedHistoryIcon.NONE,
     successorRoom: SuccessorRoom? = null,
+    threads: MessagesState.Threads = MessagesState.Threads(
+        hasThreads = false,
+        hasUnreadThreads = false,
+    ),
+    isCurrentlySharingLiveLocationInRoom: Boolean = false,
+    dmUserStatus: DisplayedStatus? = null,
     eventSink: (MessagesEvent) -> Unit = {},
 ) = MessagesState(
     roomId = RoomId("!id:domain"),
@@ -150,6 +158,9 @@ fun aMessagesState(
     roomMemberModerationState = roomMemberModerationState,
     topBarSharedHistoryIcon = topBarSharedHistoryIcon,
     successorRoom = successorRoom,
+    threads = threads,
+    showLiveLocationShareBanner = isCurrentlySharingLiveLocationInRoom,
+    dmUserStatus = dmUserStatus,
     eventSink = eventSink,
 )
 
@@ -184,11 +195,9 @@ fun aReactionSummaryState(
 
 fun aCustomReactionState(
     target: CustomReactionState.Target = CustomReactionState.Target.None,
-    recentEmojis: ImmutableList<String> = persistentListOf(),
     eventSink: (CustomReactionEvent) -> Unit = {},
 ) = CustomReactionState(
     target = target,
-    recentEmojis = recentEmojis,
     selectedEmoji = persistentSetOf(),
     eventSink = eventSink,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index 0caebea8d5..5911de7372 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -12,20 +12,27 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.width
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -39,6 +46,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
@@ -51,6 +59,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.location.api.LiveLocationSharingBanner
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerEvent
 import io.element.android.features.messages.impl.actionlist.ActionListEvent
 import io.element.android.features.messages.impl.actionlist.ActionListView
@@ -73,7 +83,7 @@ import io.element.android.features.messages.impl.timeline.aGroupedEvents
 import io.element.android.features.messages.impl.timeline.aTimelineItemDaySeparator
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.aTimelineState
-import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionBottomSheet
+import io.element.android.features.messages.impl.timeline.components.CallMenuItem
 import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionEvent
 import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryEvent
 import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryView
@@ -87,6 +97,7 @@ import io.element.android.features.messages.impl.topbars.MessagesViewTopBar
 import io.element.android.features.messages.impl.topbars.ThreadTopBar
 import io.element.android.features.messages.impl.voicemessages.composer.VoiceMessagePermissionRationaleDialog
 import io.element.android.features.messages.impl.voicemessages.composer.VoiceMessageSendingFailedDialog
+import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.libraries.androidutils.ui.hideKeyboard
 import io.element.android.libraries.designsystem.atomic.molecules.ComposerAlertMolecule
 import io.element.android.libraries.designsystem.components.ExpandableBottomSheetLayout
@@ -98,11 +109,13 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toAnnotatedString
 import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.BottomSheetDragHandle
+import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.HideKeyboardWhenDisposed
 import io.element.android.libraries.designsystem.utils.KeepScreenOn
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.core.EventId
@@ -113,6 +126,8 @@ import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.LocalEventContentValidationState
 import io.element.android.libraries.textcomposer.model.TextEditorState
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.wysiwyg.link.Link
@@ -126,16 +141,21 @@ fun MessagesView(
     onBackClick: () -> Unit,
     onRoomDetailsClick: () -> Unit,
     onEventContentClick: (isLive: Boolean, event: TimelineItem.Event) -> Boolean,
+    onGalleryEventItemClick: (isLive: Boolean, event: TimelineItem.Event, index: Int) -> Boolean,
     onUserDataClick: (UserId) -> Unit,
     onLinkClick: (String, Boolean) -> Unit,
     onSendLocationClick: () -> Unit,
     onCreatePollClick: () -> Unit,
     onJoinCallClick: (isAudioCall: Boolean) -> Unit,
     onViewAllPinnedMessagesClick: () -> Unit,
+    onThreadsListClick: () -> Unit,
+    knockRequestsBannerView: @Composable () -> Unit,
     modifier: Modifier = Modifier,
     forceJumpToBottomVisibility: Boolean = false,
-    knockRequestsBannerView: @Composable () -> Unit,
+    customReactionBottomSheet: @Composable () -> Unit,
 ) {
+    val eventContentValidationState = LocalEventContentValidationState.current
+
     OnLifecycleEvent { _, event ->
         state.voiceMessageComposerState.eventSink(VoiceMessageComposerEvent.LifecycleEvent(event))
     }
@@ -158,6 +178,9 @@ fun MessagesView(
 
     fun onContentClick(event: TimelineItem.Event) {
         Timber.v("onMessageClick= ${event.id}")
+        val eventId = event.eventId ?: return
+        if (eventContentValidationState[eventId].getCurrentOverallState() != ContentValidationValue.Valid) return
+
         val hideKeyboard = onEventContentClick(state.timelineState.isLive, event)
         if (hideKeyboard) {
             localView.hideKeyboard()
@@ -207,7 +230,7 @@ fun MessagesView(
             },
         content = {
             Scaffold(
-                contentWindowInsets = WindowInsets.statusBars,
+                contentWindowInsets = scaffoldScrollableContentInsets,
                 topBar = {
                     if (state.timelineState.timelineMode is Timeline.Mode.Thread) {
                         ThreadTopBar(
@@ -223,12 +246,19 @@ fun MessagesView(
                             roomAvatar = state.roomAvatar,
                             isTombstoned = state.isTombstoned,
                             heroes = state.heroes,
-                            roomCallState = state.roomCallState,
                             dmUserIdentityState = state.dmUserVerificationState,
                             sharedHistoryIcon = state.topBarSharedHistoryIcon,
+                            dmUserStatus = state.dmUserStatus,
                             onBackClick = { hidingKeyboard { onBackClick() } },
                             onRoomDetailsClick = { hidingKeyboard { onRoomDetailsClick() } },
-                            onJoinCallClick = onJoinCallClick,
+                            menuActions = {
+                                MessagesMenuActions(
+                                    displayThreads = state.timelineState.timelineMode !is Timeline.Mode.Thread && state.threads.hasThreads,
+                                    roomCallState = state.roomCallState,
+                                    onJoinCallClick = onJoinCallClick,
+                                    onThreadsListClick = onThreadsListClick
+                                )
+                            }
                         )
                     }
                 },
@@ -241,6 +271,16 @@ fun MessagesView(
                         MessagesViewContent(
                             state = state,
                             onContentClick = ::onContentClick,
+                            onGalleryItemClick = { event, index ->
+                                val hideKeyboard = onGalleryEventItemClick(
+                                    state.timelineState.isLive,
+                                    event,
+                                    index,
+                                )
+                                if (hideKeyboard) {
+                                    localView.hideKeyboard()
+                                }
+                            },
                             onMessageLongClick = ::onMessageLongClick,
                             onUserDataClick = {
                                 hidingKeyboard {
@@ -266,8 +306,8 @@ fun MessagesView(
                             onSwipeToReply = { targetEvent ->
                                 state.eventSink(MessagesEvent.HandleAction(TimelineItemAction.Reply, targetEvent))
                             },
-                            forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                             onJoinCallClick = onJoinCallClick,
+                            forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                             onViewAllPinnedMessagesClick = onViewAllPinnedMessagesClick,
                             knockRequestsBannerView = knockRequestsBannerView,
                         )
@@ -375,12 +415,7 @@ fun MessagesView(
         },
     )
 
-    CustomReactionBottomSheet(
-        state = state.customReactionState,
-        onSelectEmoji = { uniqueId, emoji ->
-            state.eventSink(MessagesEvent.ToggleReaction(emoji.unicode, uniqueId))
-        }
-    )
+    customReactionBottomSheet()
 
     ReactionSummaryView(state = state.reactionSummaryState)
     ReadReceiptBottomSheet(
@@ -396,6 +431,28 @@ fun MessagesView(
     )
 }
 
+@Composable
+internal fun RowScope.MessagesMenuActions(
+    displayThreads: Boolean,
+    roomCallState: RoomCallState,
+    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    onThreadsListClick: () -> Unit,
+) {
+    if (displayThreads) {
+        Icon(
+            modifier = Modifier.clickable(enabled = true, onClick = onThreadsListClick),
+            imageVector = CompoundIcons.ThreadsSolid(),
+            contentDescription = stringResource(CommonStrings.common_threads),
+        )
+        Spacer(Modifier.width(8.dp))
+    }
+    CallMenuItem(
+        roomCallState = roomCallState,
+        onJoinCallClick = onJoinCallClick,
+    )
+    Spacer(Modifier.width(8.dp))
+}
+
 @Composable
 private fun ReinviteDialog(state: MessagesState) {
     if (state.showReinvitePrompt) {
@@ -421,10 +478,11 @@ private fun MessagesViewContent(
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
     onMessageLongClick: (TimelineItem.Event) -> Unit,
+    onGalleryItemClick: ((TimelineItem.Event, Int) -> Unit),
     onSendLocationClick: () -> Unit,
     onCreatePollClick: () -> Unit,
-    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
     onViewAllPinnedMessagesClick: () -> Unit,
+    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
     forceJumpToBottomVisibility: Boolean,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
     modifier: Modifier = Modifier,
@@ -464,42 +522,60 @@ private fun MessagesViewContent(
             val scrollBehavior = PinnedMessagesBannerViewDefaults.rememberScrollBehavior(
                 pinnedMessagesCount = (state.pinnedMessagesBannerState as? PinnedMessagesBannerState.Visible)?.pinnedMessagesCount() ?: 0,
             )
+            val density = LocalDensity.current
+            // Combined height of the banners overlaid above the timeline. Drives the floating
+            // date badge offset so the badge sits below whichever banners are currently showing.
+            var topBannersHeightDp by remember { mutableStateOf(0.dp) }
+
             TimelineView(
                 state = state.timelineState,
                 timelineProtectionState = state.timelineProtectionState,
                 onUserDataClick = onUserDataClick,
                 onLinkClick = { link -> onLinkClick(link, false) },
                 onContentClick = onContentClick,
+                onGalleryItemClick = onGalleryItemClick,
                 onMessageLongClick = onMessageLongClick,
                 onSwipeToReply = onSwipeToReply,
                 onReactionClick = onReactionClick,
                 onReactionLongClick = onReactionLongClick,
                 onMoreReactionsClick = onMoreReactionsClick,
                 onReadReceiptClick = onReadReceiptClick,
-                forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                 onJoinCallClick = onJoinCallClick,
+                forceJumpToBottomVisibility = forceJumpToBottomVisibility,
                 nestedScrollConnection = scrollBehavior.nestedScrollConnection,
+                floatingDateTopOffset = topBannersHeightDp,
             )
 
             if (state.timelineState.timelineMode !is Timeline.Mode.Thread) {
-                AnimatedVisibility(
-                    visible = state.pinnedMessagesBannerState is PinnedMessagesBannerState.Visible && scrollBehavior.isVisible,
-                    enter = expandVertically(),
-                    exit = shrinkVertically(),
+                Column(
+                    modifier = Modifier.onSizeChanged { topBannersHeightDp = with(density) { it.height.toDp() } },
                 ) {
-                    fun focusOnPinnedEvent(eventId: EventId) {
-                        state.timelineState.eventSink(
-                            TimelineEvent.FocusOnEvent(eventId = eventId, debounce = FOCUS_ON_PINNED_EVENT_DEBOUNCE_DURATION_IN_MILLIS.milliseconds)
+                    AnimatedVisibility(
+                        visible = state.pinnedMessagesBannerState is PinnedMessagesBannerState.Visible && scrollBehavior.isVisible,
+                        enter = expandVertically(),
+                        exit = shrinkVertically(),
+                    ) {
+                        fun focusOnPinnedEvent(eventId: EventId) {
+                            state.timelineState.eventSink(
+                                TimelineEvent.FocusOnEvent(eventId = eventId, debounce = FOCUS_ON_PINNED_EVENT_DEBOUNCE_DURATION_IN_MILLIS.milliseconds)
+                            )
+                        }
+                        PinnedMessagesBannerView(
+                            state = state.pinnedMessagesBannerState,
+                            onClick = ::focusOnPinnedEvent,
+                            onViewAllClick = onViewAllPinnedMessagesClick,
+                        )
+                    }
+                    if (state.showLiveLocationShareBanner) {
+                        LiveLocationSharingBanner(
+                            onClick = { state.eventSink(MessagesEvent.ShowLiveLocationShare) },
+                            onStopClick = { state.eventSink(MessagesEvent.StopLiveLocationShare) }
                         )
                     }
-                    PinnedMessagesBannerView(
-                        state = state.pinnedMessagesBannerState,
-                        onClick = ::focusOnPinnedEvent,
-                        onViewAllClick = onViewAllPinnedMessagesClick,
-                    )
                 }
-                knockRequestsBannerView()
             }
+
+            knockRequestsBannerView()
         }
     }
 }
@@ -510,12 +586,17 @@ private fun MessagesViewComposerBottomSheetContents(
     onRoomSuccessorClick: (RoomId) -> Unit,
     onLinkClick: (String, Boolean) -> Unit,
 ) {
+    val contentPadding = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()
     when {
         state.successorRoom != null -> {
-            SuccessorRoomBanner(roomSuccessor = state.successorRoom, onRoomSuccessorClick = onRoomSuccessorClick)
+            SuccessorRoomBanner(
+                modifier = Modifier.fillMaxWidth().padding(contentPadding),
+                roomSuccessor = state.successorRoom,
+                onRoomSuccessorClick = onRoomSuccessorClick
+            )
         }
         state.userEventPermissions.canSendMessage -> {
-            Column(modifier = Modifier.fillMaxWidth()) {
+            Column(modifier = Modifier.fillMaxWidth().padding(contentPadding)) {
                 // Do not show the identity change if user is composing a Rich message or is seeing suggestion(s).
                 if (state.composerState.suggestions.isEmpty() &&
                     state.composerState.textEditorState is TextEditorState.Markdown) {
@@ -539,15 +620,15 @@ private fun MessagesViewComposerBottomSheetContents(
             }
         }
         else -> {
-            CantSendMessageBanner()
+            CantSendMessageBanner(Modifier.padding(contentPadding))
         }
     }
 }
 
 @Composable
-private fun CantSendMessageBanner() {
+private fun CantSendMessageBanner(modifier: Modifier = Modifier) {
     Row(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .background(ElementTheme.colors.bgSubtleSecondary)
             .padding(16.dp),
@@ -587,6 +668,7 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class)
         onBackClick = {},
         onRoomDetailsClick = {},
         onEventContentClick = { _, _ -> false },
+        onGalleryEventItemClick = { _, _, _ -> false },
         onUserDataClick = {},
         onLinkClick = { _, _ -> },
         onSendLocationClick = {},
@@ -595,6 +677,8 @@ internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class)
         onViewAllPinnedMessagesClick = { },
         forceJumpToBottomVisibility = true,
         knockRequestsBannerView = {},
+        customReactionBottomSheet = {},
+        onThreadsListClick = {},
     )
 }
 
@@ -641,13 +725,16 @@ internal fun MessagesViewA11yPreview() = ElementPreview {
         onBackClick = {},
         onRoomDetailsClick = {},
         onEventContentClick = { _, _ -> false },
+        onGalleryEventItemClick = { _, _, _ -> false },
         onUserDataClick = {},
         onLinkClick = { _, _ -> },
         onSendLocationClick = {},
         onCreatePollClick = {},
         onJoinCallClick = {},
-        onViewAllPinnedMessagesClick = { },
+        onViewAllPinnedMessagesClick = {},
+        onThreadsListClick = {},
         forceJumpToBottomVisibility = true,
         knockRequestsBannerView = {},
+        customReactionBottomSheet = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
index f9d97f6d9d..8caa95f31d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
@@ -27,8 +27,10 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailureFactory
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentWithAttachment
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
@@ -37,17 +39,18 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.canBeCopied
 import io.element.android.features.messages.impl.timeline.model.event.canBeForwarded
 import io.element.android.features.messages.impl.timeline.model.event.canReact
+import io.element.android.features.messages.impl.timeline.model.event.captionOrNull
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
-import io.element.android.libraries.recentemojis.api.GetRecentEmojis
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -198,9 +201,12 @@ class DefaultActionListPresenter(
                 add(TimelineItemAction.Forward)
             }
             if (timelineItem.isEditable && usersEventPermissions.canSendMessage) {
-                if (timelineItem.content is TimelineItemEventContentWithAttachment) {
+                if (timelineItem.content is TimelineItemEventContentWithAttachment ||
+                    timelineItem.content is TimelineItemGalleryContent ||
+                    timelineItem.content is TimelineItemAttachmentsContent) {
                     // Caption
-                    if (timelineItem.content.caption == null) {
+                    val caption = timelineItem.content.captionOrNull()
+                    if (caption == null) {
                         add(TimelineItemAction.AddCaption)
                     } else {
                         add(TimelineItemAction.EditCaption)
@@ -225,7 +231,7 @@ class DefaultActionListPresenter(
             }
             if (timelineItem.content.canBeCopied()) {
                 add(TimelineItemAction.CopyText)
-            } else if ((timelineItem.content as? TimelineItemEventContentWithAttachment)?.caption.isNullOrBlank().not()) {
+            } else if (timelineItem.content.captionOrNull().isNullOrBlank().not()) {
                 add(TimelineItemAction.CopyCaption)
             }
             if (timelineItem.isRemote) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt
index a69c6d7612..56bac5be33 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt
@@ -15,6 +15,7 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.anUnsignedDeviceSendFailure
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
+import io.element.android.features.messages.impl.timeline.model.event.aStaticLocationMode
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
@@ -127,7 +128,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                 anActionListState(
                     target = ActionListState.Target.Success(
                         event = aTimelineItemEvent(
-                            content = aTimelineItemLocationContent(),
+                            content = aTimelineItemLocationContent(mode = aStaticLocationMode()),
                             timelineItemReactions = reactionsState
                         ),
                         sentTimeFull = "January 1, 1970 at 12:00 AM",
@@ -140,7 +141,7 @@ open class ActionListStateProvider : PreviewParameterProvider<ActionListState> {
                 anActionListState(
                     target = ActionListState.Target.Success(
                         event = aTimelineItemEvent(
-                            content = aTimelineItemLocationContent(),
+                            content = aTimelineItemLocationContent(mode = aStaticLocationMode()),
                             timelineItemReactions = reactionsState
                         ),
                         sentTimeFull = "January 1, 1970 at 12:00 AM",
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
index 53f15066b6..669a696111 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -31,7 +31,8 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ListItemDefaults
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
@@ -63,9 +64,11 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.timeline.a11y.a11yReactionAction
 import io.element.android.features.messages.impl.timeline.components.MessageShieldView
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@@ -109,7 +112,9 @@ fun ActionListView(
     onVerifiedUserSendFailureClick: (TimelineItem.Event) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val sheetState = rememberModalBottomSheetState()
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+    )
     val coroutineScope = rememberCoroutineScope()
     val targetItem = (state.target as? ActionListState.Target.Success)?.event
 
@@ -156,6 +161,7 @@ fun ActionListView(
             sheetState = sheetState,
             onDismissRequest = ::onDismiss,
             modifier = modifier,
+            scrollable = false,
         ) {
             ActionListViewContent(
                 state = state,
@@ -242,13 +248,13 @@ private fun ActionListViewContent(
                         modifier = Modifier.clickable {
                             onActionClick(action)
                         },
-                        headlineContent = {
+                        content = {
                             Text(text = stringResource(id = action.titleRes))
                         },
                         leadingContent = ListItemContent.Icon(IconSource.Resource(action.icon)),
                         style = when {
                             action.destructive -> ListItemStyle.Destructive
-                            else -> ListItemStyle.Primary
+                            else -> ListItemStyle.Default
                         }
                     )
                 }
@@ -289,11 +295,21 @@ private fun MessageSummary(
         is TimelineItemRedactedContent,
         is TimelineItemUnknownContent -> content = { ContentForBody(textContent) }
         is TimelineItemLocationContent -> {
-            content = { ContentForBody(stringResource(CommonStrings.common_shared_location)) }
+            val body = when (event.content.mode) {
+                is TimelineItemLocationContent.Mode.Live -> stringResource(CommonStrings.common_shared_live_location)
+                is TimelineItemLocationContent.Mode.Static -> stringResource(CommonStrings.common_shared_location)
+            }
+            content = { ContentForBody(body) }
         }
         is TimelineItemImageContent -> {
             content = { ContentForBody(event.content.bestDescription) }
         }
+        is TimelineItemGalleryContent -> {
+            content = { ContentForBody(event.content.body) }
+        }
+        is TimelineItemAttachmentsContent -> {
+            content = { ContentForBody(event.content.body) }
+        }
         is TimelineItemStickerContent -> {
             content = { ContentForBody(event.content.bestDescription) }
         }
@@ -396,7 +412,9 @@ private fun EmojiReactionsRow(
         }
 
         Box(
-            modifier = Modifier.padding(end = 10.dp).requiredSize(48.dp),
+            modifier = Modifier
+                .padding(end = 10.dp)
+                .requiredSize(48.dp),
             contentAlignment = Alignment.CenterEnd,
         ) {
             Icon(
@@ -443,7 +461,7 @@ private fun VerifiedUserSendFailureView(
             .padding(horizontal = 16.dp, vertical = 8.dp),
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ErrorSolid())),
         trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChevronRight())),
-        headlineContent = {
+        content = {
             Text(
                 text = sendFailure.headline(),
                 style = ElementTheme.typography.fontBodySmMedium,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/Attachment.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/Attachment.kt
index d989b34ab3..73fa55228d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/Attachment.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/Attachment.kt
@@ -16,5 +16,12 @@ import kotlinx.parcelize.Parcelize
 @Immutable
 sealed interface Attachment : Parcelable {
     @Parcelize
-    data class Media(val localMedia: LocalMedia) : Attachment
+    data class Media(
+        val localMedia: LocalMedia,
+        // When true, the media was picked through the "Files" picker and should be
+        // uploaded without image recompression; videos still use the highest available
+        // / best-fit preset rather than an additional size-reduction optimization pass.
+        // See https://github.com/element-hq/element-x-android/issues/6365
+        val sendAsFile: Boolean = false,
+    ) : Attachment
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentMediaInfo.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentMediaInfo.kt
new file mode 100644
index 0000000000..7feeff18dd
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentMediaInfo.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview
+
+import io.element.android.libraries.core.mimetype.MimeTypes
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAnimatedImage
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
+import io.element.android.libraries.mediaviewer.api.MediaInfo
+import java.util.Locale
+
+internal fun MediaInfo.canEditImage(): Boolean {
+    val resolvedMimeType = resolvedImageMimeType() ?: return false
+    return resolvedMimeType.isMimeTypeImage() &&
+        !resolvedMimeType.isMimeTypeAnimatedImage() &&
+        resolvedMimeType != MimeTypes.Svg
+}
+
+internal fun MediaInfo.isImageAttachment(): Boolean {
+    return resolvedImageMimeType().isMimeTypeImage()
+}
+
+internal fun MediaInfo.resolvedImageMimeType(): String? {
+    return mimeType.takeIf { it.isMimeTypeImage() } ?: fileExtension.toImageMimeTypeOrNull()
+}
+
+private fun String.toImageMimeTypeOrNull(): String? {
+    return when (lowercase(Locale.ROOT)) {
+        "png" -> MimeTypes.Png
+        "jpg", "jpeg" -> MimeTypes.Jpeg
+        "gif" -> MimeTypes.Gif
+        "webp" -> MimeTypes.WebP
+        "svg" -> MimeTypes.Svg
+        "bmp" -> "image/bmp"
+        "heic" -> "image/heic"
+        "heif" -> "image/heif"
+        "avif" -> "image/avif"
+        else -> null
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt
index d473d4c3f4..7ef14f26ff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt
@@ -8,8 +8,20 @@
 
 package io.element.android.features.messages.impl.attachments.preview
 
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.NormalizedCropRect
+
 sealed interface AttachmentsPreviewEvent {
     data object SendAttachment : AttachmentsPreviewEvent
     data object CancelAndDismiss : AttachmentsPreviewEvent
     data object CancelAndClearSendState : AttachmentsPreviewEvent
+    data object OpenImageEditor : AttachmentsPreviewEvent
+    data object CloseImageEditor : AttachmentsPreviewEvent
+    data object RotateImageToTheLeft : AttachmentsPreviewEvent
+    data object FlipImageHorizontally : AttachmentsPreviewEvent
+    data object FlipImageVertically : AttachmentsPreviewEvent
+    data object ApplyImageEdits : AttachmentsPreviewEvent
+    data object ResetImageEdits : AttachmentsPreviewEvent
+    data class UpdateImageCropRect(val cropRect: NormalizedCropRect) : AttachmentsPreviewEvent
+    data object ClearImageEditError : AttachmentsPreviewEvent
+    data class SetCurrentCarouselIndex(val index: Int) : AttachmentsPreviewEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewNode.kt
index 451398d7d3..c3b8d7780f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewNode.kt
@@ -30,6 +30,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaRenderer
+import kotlinx.collections.immutable.ImmutableList
 
 @ContributesNode(RoomScope::class)
 @AssistedInject
@@ -42,7 +43,7 @@ class AttachmentsPreviewNode(
     private val enterpriseService: EnterpriseService,
 ) : Node(buildContext, plugins = plugins) {
     data class Inputs(
-        val attachment: Attachment,
+        val attachments: ImmutableList<Attachment>,
         val timelineMode: Timeline.Mode,
         val inReplyToEventId: EventId?,
     ) : NodeInputs
@@ -54,7 +55,7 @@ class AttachmentsPreviewNode(
     }
 
     private val presenter = presenterFactory.create(
-        attachment = inputs.attachment,
+        attachments = inputs.attachments,
         timelineMode = inputs.timelineMode,
         onDoneListener = onDoneListener,
         inReplyToEventId = inputs.inReplyToEventId,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt
index 8e92e53f6a..8ebb580a90 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt
@@ -11,7 +11,9 @@ package io.element.android.features.messages.impl.attachments.preview
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -22,7 +24,12 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.features.messages.impl.attachments.Attachment
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditor
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditorState
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEdits
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorPresenter
+import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorState
+import io.element.android.features.messages.impl.attachments.video.VideoCompressionPresetSelector
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.androidutils.file.safeDelete
 import io.element.android.libraries.androidutils.hash.hash
@@ -30,7 +37,6 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.firstInstanceOf
 import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.core.EventId
@@ -44,23 +50,28 @@ import io.element.android.libraries.mediaupload.api.allFiles
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.libraries.textcomposer.model.TextEditorState
 import io.element.android.libraries.textcomposer.model.rememberMarkdownTextEditorState
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.io.File
 
 @AssistedInject
 class AttachmentsPreviewPresenter(
-    @Assisted private val attachment: Attachment,
+    @Assisted private val attachments: ImmutableList<Attachment>,
     @Assisted private val onDoneListener: OnDoneListener,
     @Assisted private val timelineMode: Timeline.Mode,
     @Assisted private val inReplyToEventId: EventId?,
     mediaSenderFactory: MediaSenderFactory,
     private val permalinkBuilder: PermalinkBuilder,
     private val temporaryUriDeleter: TemporaryUriDeleter,
+    private val attachmentImageEditor: AttachmentImageEditor,
     private val mediaOptimizationSelectorPresenterFactory: MediaOptimizationSelectorPresenter.Factory,
+    private val videoCompressionPresetSelector: VideoCompressionPresetSelector,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
@@ -68,13 +79,18 @@ class AttachmentsPreviewPresenter(
     @AssistedFactory
     interface Factory {
         fun create(
-            attachment: Attachment,
+            attachments: ImmutableList<Attachment>,
             timelineMode: Timeline.Mode,
             onDoneListener: OnDoneListener,
             inReplyToEventId: EventId?,
         ): AttachmentsPreviewPresenter
     }
 
+    data class AttachmentAndEdits(
+        val attachment: Attachment,
+        val edits: AttachmentImageEdits,
+    )
+
     private val mediaSender = mediaSenderFactory.create(timelineMode)
 
     @Composable
@@ -84,6 +100,11 @@ class AttachmentsPreviewPresenter(
         val sendActionState = remember {
             mutableStateOf<SendActionState>(SendActionState.Idle)
         }
+        var canEditImage by remember { mutableStateOf(false) }
+        var imageEditorState by remember { mutableStateOf<AttachmentImageEditorState?>(null) }
+        var isApplyingImageEdits by remember { mutableStateOf(false) }
+        var displayImageEditError by remember { mutableStateOf(false) }
+        var editedTempFiles by remember { mutableStateOf<Map<Int, File>>(emptyMap()) }
 
         val markdownTextEditorState = rememberMarkdownTextEditorState(initialText = null, initialFocus = false)
         val textEditorState by rememberUpdatedState(
@@ -92,51 +113,115 @@ class AttachmentsPreviewPresenter(
 
         val ongoingSendAttachmentJob = remember { mutableStateOf<Job?>(null) }
 
+        var currentIndex by remember { mutableIntStateOf(0) }
+
+        var attachmentsAndEdits by remember {
+            mutableStateOf(
+                attachments.map {
+                    AttachmentAndEdits(it, AttachmentImageEdits())
+                }
+            )
+        }
+
+        val editedAttachments by remember {
+            derivedStateOf {
+                attachmentsAndEdits.map { it.attachment }.toImmutableList()
+            }
+        }
+
         var preprocessMediaJob by remember { mutableStateOf<Job?>(null) }
 
-        val mediaAttachment = attachment as Attachment.Media
-        val mediaOptimizationSelectorPresenter = remember {
-            mediaOptimizationSelectorPresenterFactory.create(mediaAttachment.localMedia)
+        val mediaOptimizationSelectorPresenters = remember {
+            attachments
+                .filterIsInstance<Attachment.Media>()
+                .mapIndexed { index, attachment ->
+                    mediaOptimizationSelectorPresenterFactory.create(
+                        index = index,
+                        localMedia = attachment.localMedia,
+                        sendAsFile = attachment.sendAsFile,
+                    )
+                }
         }
-        val mediaOptimizationSelectorState by rememberUpdatedState(mediaOptimizationSelectorPresenter.present())
+        val mediaOptimizationSelectorStates by rememberUpdatedState(
+            mediaOptimizationSelectorPresenters.map {
+                it.present()
+            }.toImmutableList()
+        )
 
         val observableSendState = snapshotFlow { sendActionState.value }
 
         var displayFileTooLargeError by remember { mutableStateOf(false) }
 
-        LaunchedEffect(mediaOptimizationSelectorState.displayMediaSelectorViews) {
+        LaunchedEffect(
+            mediaOptimizationSelectorStates,
+            imageEditorState,
+            isApplyingImageEdits,
+            editedAttachments,
+        ) {
+            if (mediaOptimizationSelectorStates.any { it.displayMediaSelectorViews == true } ||
+                imageEditorState != null ||
+                isApplyingImageEdits
+            ) {
+                // If any of the media optimization selectors are displayed, we don't want to pre-process the media yet
+                return@LaunchedEffect
+            }
             // If the media optimization selector is not displayed, we can pre-process the media
             // to prepare it for sending. This is done to avoid blocking the UI thread when the
             // user clicks on the send button.
-            if (mediaOptimizationSelectorState.displayMediaSelectorViews == false) {
-                preprocessMediaJob = preProcessAttachment(
-                    attachment = attachment,
-                    mediaOptimizationConfig = mediaOptimizationConfigProvider.get(),
+            val configs = mediaOptimizationSelectorStates.mapIndexed { index, mediaOptimizationSelectorState ->
+                getAutoPreprocessMediaOptimizationConfig(
+                    mediaAttachment = editedAttachments[index] as Attachment.Media,
+                    mediaOptimizationSelectorState = mediaOptimizationSelectorState,
+                )
+            }
+            preprocessMediaJob?.cancel()
+            preprocessMediaJob = coroutineScope.launch(dispatchers.io) {
+                preProcessAttachments(
+                    attachments = editedAttachments,
+                    mediaOptimizationConfigs = configs,
                     displayProgress = false,
                     sendActionState = sendActionState,
                 )
             }
         }
 
-        val maxUploadSize = mediaOptimizationSelectorState.maxUploadSize.dataOrNull()
+        LaunchedEffect(currentIndex) {
+            val currentMedia = (attachments.getOrNull(currentIndex) as? Attachment.Media)?.localMedia
+            if (currentMedia != null) {
+                canEditImage = currentMedia.info.canEditImage() || attachmentImageEditor.canEdit(currentMedia)
+            }
+        }
+
+        val maxUploadSize = mediaOptimizationSelectorStates.firstNotNullOfOrNull {
+            it.maxUploadSize.dataOrNull()
+        }
         LaunchedEffect(maxUploadSize) {
-            // Check file upload size if the media won't be processed for upload
-            val isImageFile = mediaAttachment.localMedia.info.mimeType.isMimeTypeImage()
-            val isVideoFile = mediaAttachment.localMedia.info.mimeType.isMimeTypeVideo()
-            if (maxUploadSize != null && !(isImageFile || isVideoFile)) {
+            if (maxUploadSize != null) {
                 // If file size is not known, we're permissive and allow sending. The SDK will cancel the upload if needed.
-                val fileSize = mediaAttachment.localMedia.info.fileSize ?: 0L
-                if (maxUploadSize < fileSize) {
-                    displayFileTooLargeError = true
+                displayFileTooLargeError = attachments.any { attachment ->
+                    when (attachment) {
+                        is Attachment.Media -> {
+                            val isImageFile = attachment.localMedia.info.isImageAttachment()
+                            val isVideoFile = attachment.localMedia.info.mimeType.isMimeTypeVideo()
+                            if (isImageFile || isVideoFile) {
+                                false
+                            } else {
+                                val fileSize = attachment.localMedia.info.fileSize ?: 0L
+                                maxUploadSize < fileSize
+                            }
+                        }
+                    }
                 }
             }
         }
 
-        val videoSizeEstimations = mediaOptimizationSelectorState.videoSizeEstimations.dataOrNull()
-        LaunchedEffect(videoSizeEstimations) {
-            if (videoSizeEstimations != null) {
-                // Check if the video size estimations are too large for the max upload size
-                displayFileTooLargeError = videoSizeEstimations.none { it.canUpload }
+        mediaOptimizationSelectorStates.forEach { mediaOptimizationSelectorState ->
+            val videoSizeEstimations = mediaOptimizationSelectorState.videoSizeEstimations.dataOrNull()
+            LaunchedEffect(videoSizeEstimations) {
+                if (videoSizeEstimations != null) {
+                    // Check if the video size estimations are too large for the max upload size
+                    displayFileTooLargeError = videoSizeEstimations.none { it.canUpload }
+                }
             }
         }
 
@@ -144,19 +229,23 @@ class AttachmentsPreviewPresenter(
             when (event) {
                 is AttachmentsPreviewEvent.SendAttachment -> {
                     ongoingSendAttachmentJob.value = coroutineScope.launch {
-                        // If the media optimization selector is displayed, we need to wait for the user to select the options
-                        // before we can pre-process the media.
-                        if (mediaOptimizationSelectorState.displayMediaSelectorViews == true) {
-                            val config = MediaOptimizationConfig(
-                                compressImages = mediaOptimizationSelectorState.isImageOptimizationEnabled == true,
-                                videoCompressionPreset = mediaOptimizationSelectorState.selectedVideoPreset ?: VideoCompressionPreset.STANDARD,
-                            )
-                            preprocessMediaJob = preProcessAttachment(
-                                attachment = attachment,
-                                mediaOptimizationConfig = config,
-                                displayProgress = true,
-                                sendActionState = sendActionState,
-                            )
+                        if (preprocessMediaJob?.isActive != true && sendActionState.value !is SendActionState.Sending.ReadyToUpload) {
+                            val configs = mediaOptimizationSelectorStates.map {
+                                MediaOptimizationConfig(
+                                    compressImages = it.isImageOptimizationEnabled
+                                        ?: mediaOptimizationConfigProvider.get().compressImages,
+                                    videoCompressionPreset = it.selectedVideoPreset
+                                        ?: mediaOptimizationConfigProvider.get().videoCompressionPreset,
+                                )
+                            }
+                            preprocessMediaJob = coroutineScope.launch(dispatchers.io) {
+                                preProcessAttachments(
+                                    attachments = editedAttachments,
+                                    mediaOptimizationConfigs = configs,
+                                    displayProgress = true,
+                                    sendActionState = sendActionState,
+                                )
+                            }
                         }
 
                         // If the processing was hidden before, make it visible now
@@ -165,45 +254,47 @@ class AttachmentsPreviewPresenter(
                         }
 
                         // Wait until the media is ready to be uploaded
-                        val mediaUploadInfo = observableSendState.firstInstanceOf<SendActionState.Sending.ReadyToUpload>().mediaInfo
+                        val allMediaUploadInfos = observableSendState.firstInstanceOf<SendActionState.Sending.ReadyToUpload>().mediaInfos
 
                         // Pre-processing is done, send the attachment
                         val caption = markdownTextEditorState.getMessageMarkdown(permalinkBuilder)
                             .takeIf { it.isNotEmpty() }
 
-                        // If we're supposed to send the media as a background job, we can dismiss this screen already
-                        if (coroutineContext.isActive) {
-                            onDoneListener()
-                        }
+                        val editedTempFilesToDelete = editedTempFiles
+                        editedTempFiles = emptyMap()
 
                         // Send the media using the session coroutine scope so it doesn't matter if this screen or the chat one are closed
                         sessionCoroutineScope.launch(dispatchers.io) {
-                            sendPreProcessedMedia(
-                                mediaUploadInfo = mediaUploadInfo,
+                            sendMedia(
+                                mediaUploadInfos = allMediaUploadInfos,
                                 caption = caption,
                                 sendActionState = sendActionState,
-                                dismissAfterSend = false,
                                 inReplyToEventId = inReplyToEventId,
                             )
 
                             // Clean up the pre-processed media after it's been sent
                             mediaSender.cleanUp()
+                            editedTempFilesToDelete.values.forEach { it.safeDelete() }
                         }
                     }
                 }
                 AttachmentsPreviewEvent.CancelAndDismiss -> {
                     displayFileTooLargeError = false
+                    displayImageEditError = false
+                    isApplyingImageEdits = false
 
                     // Cancel media preprocessing and sending
                     preprocessMediaJob?.cancel()
+                    preprocessMediaJob = null
                     // If we couldn't send the pre-processed media, remove it
                     mediaSender.cleanUp()
                     ongoingSendAttachmentJob.value?.cancel()
 
                     // Dismiss the screen
                     dismiss(
-                        attachment,
-                        sendActionState,
+                        attachments = editedAttachments,
+                        sendActionState = sendActionState,
+                        editedTempFiles = editedTempFiles,
                     )
                 }
                 AttachmentsPreviewEvent.CancelAndClearSendState -> {
@@ -213,85 +304,207 @@ class AttachmentsPreviewPresenter(
                         ongoingSendAttachmentJob.value = null
                     }
 
-                    val mediaUploadInfo = sendActionState.value.mediaUploadInfo()
-                    sendActionState.value = if (mediaUploadInfo != null) {
-                        SendActionState.Sending.ReadyToUpload(mediaUploadInfo)
+                    val mediaUploadInfoList = sendActionState.value.mediaUploadInfoList()
+                    sendActionState.value = if (mediaUploadInfoList != null) {
+                        SendActionState.Sending.ReadyToUpload(mediaUploadInfoList)
                     } else {
                         SendActionState.Idle
                     }
                 }
+                AttachmentsPreviewEvent.OpenImageEditor -> {
+                    val currentLocalMedia = (attachments.getOrNull(currentIndex) as? Attachment.Media)?.localMedia ?: return
+                    val resolvedCanEditImage = canEditImage || currentLocalMedia.info.canEditImage()
+                    if (resolvedCanEditImage) {
+                        preprocessMediaJob?.cancel()
+                        preprocessMediaJob = null
+                        resetPreparedMedia(sendActionState)
+                        imageEditorState = AttachmentImageEditorState(
+                            localMedia = currentLocalMedia,
+                            edits = attachmentsAndEdits.get(currentIndex).edits,
+                            previewDebug = false,
+                        )
+                    }
+                }
+                AttachmentsPreviewEvent.CloseImageEditor -> {
+                    imageEditorState = null
+                }
+                is AttachmentsPreviewEvent.UpdateImageCropRect -> {
+                    val pendingState = imageEditorState ?: return
+                    imageEditorState = pendingState.copy(
+                        edits = pendingState.edits.copy(cropRect = event.cropRect)
+                    )
+                }
+                AttachmentsPreviewEvent.RotateImageToTheLeft -> {
+                    val pendingState = imageEditorState ?: return
+                    imageEditorState = pendingState.copy(
+                        edits = pendingState.edits.rotateAntiClockwise()
+                    )
+                }
+                AttachmentsPreviewEvent.FlipImageHorizontally -> {
+                    val pendingState = imageEditorState ?: return
+                    imageEditorState = pendingState.copy(
+                        edits = pendingState.edits.flipHorizontally()
+                    )
+                }
+                AttachmentsPreviewEvent.FlipImageVertically -> {
+                    val pendingState = imageEditorState ?: return
+                    imageEditorState = pendingState.copy(
+                        edits = pendingState.edits.flipVertically()
+                    )
+                }
+                AttachmentsPreviewEvent.ResetImageEdits -> {
+                    imageEditorState = imageEditorState?.copy(
+                        edits = AttachmentImageEdits()
+                    )
+                }
+                AttachmentsPreviewEvent.ApplyImageEdits -> {
+                    val pendingState = imageEditorState ?: return
+                    if (!pendingState.edits.hasChanges) {
+                        editedTempFiles[currentIndex]?.safeDelete()
+                        editedTempFiles = editedTempFiles - currentIndex
+                        val currentAttachment = attachmentsAndEdits[currentIndex].attachment
+                        attachmentsAndEdits = attachmentsAndEdits.toMutableList().also {
+                            it[currentIndex] = AttachmentAndEdits(
+                                currentAttachment,
+                                pendingState.edits,
+                            )
+                        }.toImmutableList()
+                        imageEditorState = null
+                        resetPreparedMedia(sendActionState)
+                        return
+                    }
+                    isApplyingImageEdits = true
+                    displayImageEditError = false
+                    coroutineScope.launch {
+                        val result = withContext(dispatchers.io) {
+                            attachmentImageEditor.exportEdits(
+                                localMedia = pendingState.localMedia,
+                                edits = pendingState.edits,
+                            )
+                        }
+                        result.fold(
+                            onSuccess = { editedMedia ->
+                                editedTempFiles[currentIndex]?.safeDelete()
+                                editedTempFiles = editedTempFiles + (currentIndex to editedMedia.file)
+                                val currentAttachment = Attachment.Media(editedMedia.localMedia)
+                                attachmentsAndEdits = attachmentsAndEdits.toMutableList().also {
+                                    it[currentIndex] = AttachmentAndEdits(
+                                        currentAttachment,
+                                        pendingState.edits,
+                                    )
+                                }.toImmutableList()
+                                imageEditorState = null
+                                resetPreparedMedia(sendActionState)
+                            },
+                            onFailure = {
+                                Timber.e(it, "Failed to apply image edits")
+                                displayImageEditError = true
+                            }
+                        )
+                        isApplyingImageEdits = false
+                    }
+                }
+                AttachmentsPreviewEvent.ClearImageEditError -> {
+                    displayImageEditError = false
+                }
+                is AttachmentsPreviewEvent.SetCurrentCarouselIndex -> {
+                    currentIndex = event.index
+                }
             }
         }
 
         return AttachmentsPreviewState(
-            attachment = attachment,
+            attachments = editedAttachments,
+            imageEditorState = imageEditorState,
+            canEditImage = canEditImage,
+            isApplyingImageEdits = isApplyingImageEdits,
+            displayImageEditError = displayImageEditError,
             sendActionState = sendActionState.value,
             textEditorState = textEditorState,
-            mediaOptimizationSelectorState = mediaOptimizationSelectorState,
+            mediaOptimizationSelectorState = mediaOptimizationSelectorStates[currentIndex],
             displayFileTooLargeError = displayFileTooLargeError,
+            currentIndex = currentIndex,
             eventSink = ::handleEvent,
         )
     }
 
-    private fun CoroutineScope.preProcessAttachment(
-        attachment: Attachment,
-        mediaOptimizationConfig: MediaOptimizationConfig,
-        displayProgress: Boolean,
-        sendActionState: MutableState<SendActionState>,
-    ) = launch(dispatchers.io) {
-        when (attachment) {
-            is Attachment.Media -> {
-                preProcessMedia(
-                    mediaAttachment = attachment,
-                    mediaOptimizationConfig = mediaOptimizationConfig,
-                    displayProgress = displayProgress,
-                    sendActionState = sendActionState,
-                )
-            }
+    private suspend fun getAutoPreprocessMediaOptimizationConfig(
+        mediaAttachment: Attachment.Media,
+        mediaOptimizationSelectorState: MediaOptimizationSelectorState,
+    ): MediaOptimizationConfig {
+        return if (mediaAttachment.sendAsFile) {
+            // If we're sending the media as a file, we can skip image compression and we should select the highest video compression preset that still fits
+            // the upload limit (if the estimations are available)
+            val videoCompressionPreset = videoCompressionPresetSelector.selectBestVideoPreset(
+                expectedVideoPreset = VideoCompressionPreset.HIGH,
+                videoSizeEstimations = mediaOptimizationSelectorState.videoSizeEstimations,
+            ).dataOrNull() ?: VideoCompressionPreset.HIGH
+
+            MediaOptimizationConfig(
+                compressImages = false,
+                videoCompressionPreset = videoCompressionPreset,
+            )
+        } else {
+            MediaOptimizationConfig(
+                compressImages = mediaOptimizationSelectorState.isImageOptimizationEnabled
+                    ?: mediaOptimizationConfigProvider.get().compressImages,
+                videoCompressionPreset = mediaOptimizationSelectorState.selectedVideoPreset
+                    ?: mediaOptimizationConfigProvider.get().videoCompressionPreset,
+            )
         }
     }
 
-    private suspend fun preProcessMedia(
-        mediaAttachment: Attachment.Media,
-        mediaOptimizationConfig: MediaOptimizationConfig,
+    private suspend fun preProcessAttachments(
+        attachments: List<Attachment>,
+        mediaOptimizationConfigs: List<MediaOptimizationConfig>,
         displayProgress: Boolean,
         sendActionState: MutableState<SendActionState>,
     ) {
         sendActionState.value = SendActionState.Sending.Processing(displayProgress = displayProgress)
-        mediaSender.preProcessMedia(
-            uri = mediaAttachment.localMedia.uri,
-            mimeType = mediaAttachment.localMedia.info.mimeType,
-            mediaOptimizationConfig = mediaOptimizationConfig,
-        ).fold(
-            onSuccess = { mediaUploadInfo ->
-                Timber.d("Media ${mediaUploadInfo.file.path.orEmpty().hash()} finished processing, it's now ready to upload")
-                sendActionState.value = SendActionState.Sending.ReadyToUpload(mediaUploadInfo)
-            },
-            onFailure = {
-                Timber.e(it, "Failed to pre-process media")
-                if (it is CancellationException) {
-                    throw it
-                } else {
-                    sendActionState.value = SendActionState.Failure(it, null)
-                }
-            }
-        )
-    }
-
-    private fun dismiss(
-        attachment: Attachment,
-        sendActionState: MutableState<SendActionState>,
-    ) {
-        // Delete the temporary file
-        when (attachment) {
-            is Attachment.Media -> {
-                temporaryUriDeleter.delete(attachment.localMedia.uri)
-                sendActionState.value.mediaUploadInfo()?.let { data ->
-                    cleanUp(data)
+        val mediaUploadInfos = mutableListOf<MediaUploadInfo>()
+        attachments.forEachIndexed { index, attachment ->
+            when (attachment) {
+                is Attachment.Media -> {
+                    mediaSender.preProcessMedia(
+                        uri = attachment.localMedia.uri,
+                        mimeType = attachment.localMedia.info.mimeType,
+                        mediaOptimizationConfig = mediaOptimizationConfigs[index],
+                    ).fold(
+                        onSuccess = { mediaUploadInfo ->
+                            Timber.d("Media ${mediaUploadInfo.file.path.orEmpty().hash()} finished processing")
+                            mediaUploadInfos.add(mediaUploadInfo)
+                        },
+                        onFailure = {
+                            Timber.e(it, "Failed to pre-process media")
+                            if (it is CancellationException) {
+                                throw it
+                            } else {
+                                sendActionState.value = SendActionState.Failure(it, emptyList())
+                                return
+                            }
+                        }
+                    )
                 }
             }
         }
-        // Reset the sendActionState to ensure that dialog is closed before the screen
+        sendActionState.value = SendActionState.Sending.ReadyToUpload(mediaUploadInfos)
+    }
+
+    private fun dismiss(
+        attachments: List<Attachment>,
+        sendActionState: MutableState<SendActionState>,
+        editedTempFiles: Map<Int, File> = emptyMap(),
+    ) {
+        for (attachment in attachments) {
+            when (attachment) {
+                is Attachment.Media -> {
+                    temporaryUriDeleter.delete(attachment.localMedia.uri)
+                }
+            }
+        }
+        val uploadInfos = (sendActionState.value as? SendActionState.Sending.ReadyToUpload)?.mediaInfos
+        uploadInfos?.forEach { cleanUp(it) }
+        editedTempFiles.values.forEach { it.safeDelete() }
         sendActionState.value = SendActionState.Done
         onDoneListener()
     }
@@ -304,36 +517,46 @@ class AttachmentsPreviewPresenter(
         }
     }
 
-    private suspend fun sendPreProcessedMedia(
-        mediaUploadInfo: MediaUploadInfo,
+    private fun resetPreparedMedia(sendActionState: MutableState<SendActionState>) {
+        sendActionState.value.mediaUploadInfoList()?.forEach(::cleanUp)
+        mediaSender.cleanUp()
+        sendActionState.value = SendActionState.Idle
+    }
+
+    private suspend fun sendMedia(
+        mediaUploadInfos: List<MediaUploadInfo>,
         caption: String?,
         sendActionState: MutableState<SendActionState>,
-        dismissAfterSend: Boolean,
         inReplyToEventId: EventId?,
     ) = runCatchingExceptions {
-        sendActionState.value = SendActionState.Sending.Uploading(mediaUploadInfo)
-        mediaSender.sendPreProcessedMedia(
-            mediaUploadInfo = mediaUploadInfo,
-            caption = caption,
-            formattedCaption = null,
-            inReplyToEventId = inReplyToEventId,
-        ).getOrThrow()
+        if (mediaUploadInfos.size == 1) {
+            sendActionState.value = SendActionState.Sending.Uploading(mediaUploadInfos)
+            mediaSender.sendPreProcessedMedia(
+                mediaUploadInfo = mediaUploadInfos.first(),
+                caption = caption,
+                formattedCaption = null,
+                inReplyToEventId = inReplyToEventId,
+            ).getOrThrow()
+        } else {
+            mediaSender.sendGallery(
+                mediaUploadInfos = mediaUploadInfos,
+                caption = caption,
+                formattedCaption = null,
+                inReplyToEventId = inReplyToEventId,
+            ).getOrThrow()
+        }
     }.fold(
         onSuccess = {
-            cleanUp(mediaUploadInfo)
-            // Reset the sendActionState to ensure that dialog is closed before the screen
+            mediaUploadInfos.forEach { cleanUp(it) }
             sendActionState.value = SendActionState.Done
-
-            if (dismissAfterSend) {
-                onDoneListener()
-            }
+            onDoneListener()
         },
         onFailure = { error ->
             Timber.e(error, "Failed to send attachment")
             if (error is CancellationException) {
                 throw error
             } else {
-                sendActionState.value = SendActionState.Failure(error, mediaUploadInfo)
+                sendActionState.value = SendActionState.Failure(error, mediaUploadInfos)
             }
         }
     )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt
index 97ca230d77..8d74844c80 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt
@@ -10,18 +10,28 @@ package io.element.android.features.messages.impl.attachments.preview
 
 import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.attachments.Attachment
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditorState
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorState
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
 import io.element.android.libraries.textcomposer.model.TextEditorState
+import kotlinx.collections.immutable.ImmutableList
 
 data class AttachmentsPreviewState(
-    val attachment: Attachment,
+    val attachments: ImmutableList<Attachment>,
+    val imageEditorState: AttachmentImageEditorState?,
+    val canEditImage: Boolean,
+    val isApplyingImageEdits: Boolean,
+    val displayImageEditError: Boolean,
     val sendActionState: SendActionState,
     val textEditorState: TextEditorState,
     val mediaOptimizationSelectorState: MediaOptimizationSelectorState,
     val displayFileTooLargeError: Boolean,
+    val currentIndex: Int,
     val eventSink: (AttachmentsPreviewEvent) -> Unit,
-)
+) {
+    val isGallery: Boolean get() = attachments.size > 1
+    val totalCount: Int get() = attachments.size
+}
 
 @Immutable
 sealed interface SendActionState {
@@ -30,17 +40,17 @@ sealed interface SendActionState {
     @Immutable
     sealed interface Sending : SendActionState {
         data class Processing(val displayProgress: Boolean) : Sending
-        data class ReadyToUpload(val mediaInfo: MediaUploadInfo) : Sending
-        data class Uploading(val mediaUploadInfo: MediaUploadInfo) : Sending
+        data class ReadyToUpload(val mediaInfos: List<MediaUploadInfo>) : Sending
+        data class Uploading(val mediaInfos: List<MediaUploadInfo>) : Sending
     }
 
-    data class Failure(val error: Throwable, val mediaUploadInfo: MediaUploadInfo?) : SendActionState
+    data class Failure(val error: Throwable, val mediaInfos: List<MediaUploadInfo>) : SendActionState
     data object Done : SendActionState
 
-    fun mediaUploadInfo(): MediaUploadInfo? = when (this) {
-        is Sending.ReadyToUpload -> mediaInfo
-        is Sending.Uploading -> mediaUploadInfo
-        is Failure -> mediaUploadInfo
+    fun mediaUploadInfoList(): List<MediaUploadInfo>? = when (this) {
+        is Sending.ReadyToUpload -> mediaInfos
+        is Sending.Uploading -> mediaInfos
+        is Failure -> mediaInfos
         else -> null
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt
index 70d7ab006e..a7d4e14436 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewStateProvider.kt
@@ -11,6 +11,8 @@ package io.element.android.features.messages.impl.attachments.preview
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.core.net.toUri
 import io.element.android.features.messages.impl.attachments.Attachment
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditorState
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.anAttachmentImageEditorState
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorState
 import io.element.android.features.messages.impl.attachments.video.VideoUploadEstimation
 import io.element.android.libraries.architecture.AsyncData
@@ -39,9 +41,12 @@ open class AttachmentsPreviewStateProvider : PreviewParameterProvider<Attachment
                 )
             ),
             anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Processing(displayProgress = true)),
-            anAttachmentsPreviewState(sendActionState = SendActionState.Sending.ReadyToUpload(aMediaUploadInfo())),
-            anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Uploading(aMediaUploadInfo())),
-            anAttachmentsPreviewState(sendActionState = SendActionState.Failure(RuntimeException("error"), aMediaUploadInfo())),
+            anAttachmentsPreviewState(sendActionState = SendActionState.Sending.ReadyToUpload(listOf(aMediaUploadInfo()))),
+            anAttachmentsPreviewState(sendActionState = SendActionState.Sending.Uploading(listOf(aMediaUploadInfo()))),
+            anAttachmentsPreviewState(sendActionState = SendActionState.Failure(RuntimeException("error"), listOf(aMediaUploadInfo()))),
+            anAttachmentsPreviewState(
+                imageEditorState = anAttachmentImageEditorState(),
+            ),
             anAttachmentsPreviewState(displayFileTooLargeError = true),
             anAttachmentsPreviewState(
                 mediaInfo = aVideoMediaInfo(),
@@ -64,16 +69,55 @@ fun anAttachmentsPreviewState(
     mediaInfo: MediaInfo = anImageMediaInfo(),
     textEditorState: TextEditorState = aTextEditorStateMarkdown(),
     sendActionState: SendActionState = SendActionState.Idle,
+    imageEditorState: AttachmentImageEditorState? = null,
     mediaOptimizationSelectorState: MediaOptimizationSelectorState = aMediaOptimisationSelectorState(),
     displayFileTooLargeError: Boolean = false,
+    currentIndex: Int = 0,
 ) = AttachmentsPreviewState(
-    attachment = Attachment.Media(
-        localMedia = LocalMedia("file://path".toUri(), mediaInfo),
+    attachments = persistentListOf(
+        Attachment.Media(
+            localMedia = LocalMedia("file://path".toUri(), mediaInfo),
+        ),
     ),
+    imageEditorState = imageEditorState,
+    canEditImage = true,
+    isApplyingImageEdits = false,
+    displayImageEditError = false,
     sendActionState = sendActionState,
     textEditorState = textEditorState,
     mediaOptimizationSelectorState = mediaOptimizationSelectorState,
     displayFileTooLargeError = displayFileTooLargeError,
+    currentIndex = currentIndex,
+    eventSink = {}
+)
+
+fun anAttachmentsPreviewGalleryState(
+    mediaInfo: MediaInfo = anImageMediaInfo(),
+    textEditorState: TextEditorState = aTextEditorStateMarkdown(),
+    sendActionState: SendActionState = SendActionState.Idle,
+    mediaOptimizationSelectorState: MediaOptimizationSelectorState = aMediaOptimisationSelectorState(),
+    currentIndex: Int = 0,
+) = AttachmentsPreviewState(
+    attachments = persistentListOf(
+        Attachment.Media(
+            localMedia = LocalMedia("file://path1".toUri(), mediaInfo),
+        ),
+        Attachment.Media(
+            localMedia = LocalMedia("file://path2".toUri(), mediaInfo),
+        ),
+        Attachment.Media(
+            localMedia = LocalMedia("file://path3".toUri(), mediaInfo),
+        ),
+    ),
+    imageEditorState = null,
+    canEditImage = false,
+    isApplyingImageEdits = false,
+    displayImageEditError = false,
+    sendActionState = sendActionState,
+    textEditorState = textEditorState,
+    mediaOptimizationSelectorState = mediaOptimizationSelectorState,
+    displayFileTooLargeError = false,
+    currentIndex = currentIndex,
     eventSink = {}
 )
 
@@ -102,6 +146,7 @@ fun aMediaOptimisationSelectorState(
     displayMediaSelectorViews: Boolean = true,
     displayVideoPresetSelectorDialog: Boolean = false,
 ) = MediaOptimizationSelectorState(
+    index = 0,
     maxUploadSize = AsyncData.Success(maxUploadSize),
     videoSizeEstimations = videoSizeEstimations,
     isImageOptimizationEnabled = isImageOptimizationEnabled,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
index bb3a07c2ff..077d086720 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
@@ -9,11 +9,15 @@
 package io.element.android.features.messages.impl.attachments.preview
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.Image
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -21,16 +25,22 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 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.semantics.heading
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -39,11 +49,11 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.messages.impl.R
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.features.messages.impl.attachments.preview.error.sendAttachmentError
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditorView
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorEvent
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorState
 import io.element.android.features.messages.impl.attachments.video.VideoUploadEstimation
 import io.element.android.libraries.core.bool.orFalse
-import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.ProgressDialogType
@@ -56,13 +66,15 @@ import io.element.android.libraries.designsystem.modifiers.niceClickable
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Switch
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
-import io.element.android.libraries.designsystem.utils.CommonDrawables
-import io.element.android.libraries.mediaviewer.api.local.LocalMedia
+import io.element.android.libraries.designsystem.theme.floatingDateBadgeBackground
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaRenderer
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.libraries.textcomposer.TextComposer
@@ -73,7 +85,13 @@ import io.element.android.libraries.ui.utils.formatter.rememberFileSizeFormatter
 import io.element.android.wysiwyg.display.TextDisplay
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlin.time.Duration.Companion.milliseconds
 
+/**
+ * Ref: https://www.figma.com/design/zftpgS6LjiczobJZ1GUNpt/Updates-to-Media---File-Upload?node-id=51-3514
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AttachmentsPreviewView(
@@ -81,6 +99,13 @@ fun AttachmentsPreviewView(
     localMediaRenderer: LocalMediaRenderer,
     modifier: Modifier = Modifier,
 ) {
+    val canShowEditAction = when (state.sendActionState) {
+        is SendActionState.Sending.Uploading -> false
+        is SendActionState.Sending.Processing -> !state.sendActionState.displayProgress
+        SendActionState.Done -> false
+        else -> true
+    }
+
     fun postSendAttachment() {
         state.eventSink(AttachmentsPreviewEvent.SendAttachment)
     }
@@ -93,33 +118,90 @@ fun AttachmentsPreviewView(
         state.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState)
     }
 
-    BackHandler(enabled = state.sendActionState !is SendActionState.Sending.Uploading && state.sendActionState !is SendActionState.Done) {
-        postCancel()
+    fun postOpenImageEditor() {
+        state.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
     }
 
-    Scaffold(
-        modifier = modifier,
-        topBar = {
-            TopAppBar(
-                navigationIcon = {
-                    BackButton(
-                        imageVector = CompoundIcons.Close(),
-                        onClick = ::postCancel,
-                    )
-                },
-                title = {},
+    fun postCloseImageEditor() {
+        state.eventSink(AttachmentsPreviewEvent.CloseImageEditor)
+    }
+
+    fun postResetImageEditor() {
+        state.eventSink(AttachmentsPreviewEvent.ResetImageEdits)
+    }
+
+    fun postApplyImageEdits() {
+        state.eventSink(AttachmentsPreviewEvent.ApplyImageEdits)
+    }
+
+    BackHandler(enabled = state.sendActionState !is SendActionState.Sending.Uploading && state.sendActionState !is SendActionState.Done) {
+        if (state.imageEditorState != null) {
+            postCloseImageEditor()
+        } else {
+            postCancel()
+        }
+    }
+
+    if (state.imageEditorState != null) {
+        AttachmentImageEditorView(
+            state = state.imageEditorState,
+            onCropRectChange = { cropRect ->
+                state.eventSink(AttachmentsPreviewEvent.UpdateImageCropRect(cropRect))
+            },
+            onRotateClick = { state.eventSink(AttachmentsPreviewEvent.RotateImageToTheLeft) },
+            onFlipHorizontallyClick = { state.eventSink(AttachmentsPreviewEvent.FlipImageHorizontally) },
+            onFlipVerticallyClick = { state.eventSink(AttachmentsPreviewEvent.FlipImageVertically) },
+            onCancelClick = ::postCloseImageEditor,
+            onResetClick = ::postResetImageEditor,
+            onDoneClick = ::postApplyImageEdits,
+            modifier = modifier,
+        )
+    } else {
+        Scaffold(
+            modifier = modifier,
+            topBar = {
+                TopAppBar(
+                    navigationIcon = {
+                        BackButton(
+                            onClick = ::postCancel,
+                        )
+                    },
+                    title = {
+                        Text(
+                            modifier = Modifier.semantics {
+                                heading()
+                            },
+                            text = stringResource(R.string.screen_media_upload_preview_title),
+                        )
+                    },
+                    actions = {
+                        if (state.canEditImage && canShowEditAction) {
+                            IconButton(
+                                onClick = ::postOpenImageEditor,
+                            ) {
+                                Icon(
+                                    imageVector = CompoundIcons.Crop(),
+                                    contentDescription = stringResource(CommonStrings.action_edit),
+                                )
+                            }
+                        }
+                    }
+                )
+            }
+        ) { paddingValues ->
+            AttachmentPreviewContent(
+                modifier = Modifier.padding(paddingValues),
+                state = state,
+                localMediaRenderer = localMediaRenderer,
+                onSendClick = ::postSendAttachment,
             )
         }
-    ) { paddingValues ->
-        AttachmentPreviewContent(
-            modifier = Modifier.padding(paddingValues),
-            state = state,
-            localMediaRenderer = localMediaRenderer,
-            onSendClick = ::postSendAttachment,
-        )
     }
     AttachmentSendStateView(
         sendActionState = state.sendActionState,
+        isApplyingImageEdits = state.isApplyingImageEdits,
+        displayImageEditError = state.displayImageEditError,
+        onDismissImageEditError = { state.eventSink(AttachmentsPreviewEvent.ClearImageEditError) },
         onDismissClick = ::postClearSendState,
         onRetryClick = ::postSendAttachment
     )
@@ -128,39 +210,60 @@ fun AttachmentsPreviewView(
 @Composable
 private fun AttachmentSendStateView(
     sendActionState: SendActionState,
+    isApplyingImageEdits: Boolean,
+    displayImageEditError: Boolean,
+    onDismissImageEditError: () -> Unit,
     onDismissClick: () -> Unit,
     onRetryClick: () -> Unit
 ) {
-    when (sendActionState) {
-        is SendActionState.Sending.Processing -> {
-            if (sendActionState.displayProgress) {
+    when {
+        isApplyingImageEdits -> {
+            ProgressDialog(
+                type = ProgressDialogType.Indeterminate,
+                text = stringResource(CommonStrings.common_preparing),
+                showCancelButton = false,
+                onDismissRequest = {},
+            )
+        }
+        displayImageEditError -> {
+            AlertDialog(
+                title = stringResource(CommonStrings.common_error),
+                content = stringResource(CommonStrings.common_something_went_wrong_message),
+                onDismiss = onDismissImageEditError,
+            )
+        }
+        else -> when (sendActionState) {
+            is SendActionState.Sending.Processing -> {
+                if (sendActionState.displayProgress) {
+                    ProgressDialog(
+                        type = ProgressDialogType.Indeterminate,
+                        text = stringResource(CommonStrings.common_preparing),
+                        showCancelButton = true,
+                        onDismissRequest = onDismissClick,
+                    )
+                }
+            }
+            is SendActionState.Sending.Uploading -> {
                 ProgressDialog(
                     type = ProgressDialogType.Indeterminate,
-                    text = stringResource(CommonStrings.common_preparing),
+                    text = stringResource(id = CommonStrings.common_sending),
                     showCancelButton = true,
                     onDismissRequest = onDismissClick,
                 )
             }
+            is SendActionState.Failure -> {
+                RetryDialog(
+                    content = stringResource(sendAttachmentError(sendActionState.error)),
+                    onDismiss = onDismissClick,
+                    onRetry = onRetryClick
+                )
+            }
+            else -> Unit
         }
-        is SendActionState.Sending.Uploading -> {
-            ProgressDialog(
-                type = ProgressDialogType.Indeterminate,
-                text = stringResource(id = CommonStrings.common_sending),
-                showCancelButton = true,
-                onDismissRequest = onDismissClick,
-            )
-        }
-        is SendActionState.Failure -> {
-            RetryDialog(
-                content = stringResource(sendAttachmentError(sendActionState.error)),
-                onDismiss = onDismissClick,
-                onRetry = onRetryClick
-            )
-        }
-        else -> Unit
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
 @Composable
 private fun AttachmentPreviewContent(
     state: AttachmentsPreviewState,
@@ -176,18 +279,77 @@ private fun AttachmentPreviewContent(
         Box(
             modifier = Modifier
                 .weight(1f),
-            contentAlignment = Alignment.Center
+            contentAlignment = Alignment.Center,
         ) {
-            when (val attachment = state.attachment) {
-                is Attachment.Media -> {
-                    localMediaRenderer.Render(attachment.localMedia)
+            if (state.isGallery) {
+                val pagerState = rememberPagerState(
+                    initialPage = state.currentIndex,
+                    pageCount = { state.attachments.size },
+                )
+                var isPillVisible by remember { mutableStateOf(true) }
+
+                HorizontalPager(
+                    state = pagerState,
+                    modifier = Modifier.fillMaxSize(),
+                    beyondViewportPageCount = 1,
+                    contentPadding = PaddingValues(horizontal = 20.dp),
+                    pageSpacing = 10.dp,
+                ) { page ->
+                    Box(
+                        modifier = Modifier.fillMaxSize(),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        val attachment = state.attachments[page]
+                        when (attachment) {
+                            is Attachment.Media -> {
+                                localMediaRenderer.Render(attachment.localMedia)
+                            }
+                        }
+                    }
+                }
+
+                LaunchedEffect(pagerState) {
+                    snapshotFlow { pagerState.isScrollInProgress }
+                        .collectLatest { isScrolling ->
+                            if (isScrolling) {
+                                isPillVisible = true
+                            } else {
+                                delay(2000.milliseconds)
+                                isPillVisible = false
+                            }
+                        }
+                }
+
+                androidx.compose.animation.AnimatedVisibility(
+                    visible = isPillVisible,
+                    enter = fadeIn(animationSpec = tween(150)),
+                    exit = fadeOut(animationSpec = tween(300)),
+                    modifier = Modifier
+                        .align(Alignment.TopCenter)
+                        .padding(top = 8.dp),
+                ) {
+                    GalleryCarouselPill(
+                        currentIndex = pagerState.currentPage + 1,
+                        totalCount = state.totalCount,
+                    )
+                }
+
+                LaunchedEffect(pagerState.currentPage) {
+                    state.eventSink(AttachmentsPreviewEvent.SetCurrentCarouselIndex(pagerState.currentPage))
+                }
+            } else {
+                val firstAttachment = state.attachments.first()
+                when (firstAttachment) {
+                    is Attachment.Media -> {
+                        localMediaRenderer.Render(firstAttachment.localMedia)
+                    }
                 }
             }
         }
-        val mimeType = (state.attachment as? Attachment.Media)?.localMedia?.info?.mimeType
-        if (mimeType?.isMimeTypeImage() == true) {
+        val mediaInfo = (state.attachments[state.currentIndex] as? Attachment.Media)?.localMedia?.info
+        if (mediaInfo?.isImageAttachment() == true) {
             ImageOptimizationSelector(state.mediaOptimizationSelectorState)
-        } else if (mimeType?.isMimeTypeVideo() == true) {
+        } else if (mediaInfo?.mimeType?.isMimeTypeVideo() == true) {
             VideoPresetSelector(state = state.mediaOptimizationSelectorState)
         }
 
@@ -220,7 +382,8 @@ private fun AttachmentPreviewContent(
 private fun ImageOptimizationSelector(state: MediaOptimizationSelectorState) {
     if (state.displayMediaSelectorViews == true) {
         Row(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .niceClickable {
                     state.isImageOptimizationEnabled?.let { value ->
                         state.eventSink(MediaOptimizationSelectorEvent.SelectImageOptimization(!value))
@@ -229,7 +392,9 @@ private fun ImageOptimizationSelector(state: MediaOptimizationSelectorState) {
                 .padding(horizontal = 16.dp, vertical = 16.dp)
         ) {
             Text(
-                modifier = Modifier.weight(1f).align(Alignment.CenterVertically),
+                modifier = Modifier
+                    .weight(1f)
+                    .align(Alignment.CenterVertically),
                 text = stringResource(R.string.screen_media_upload_preview_optimize_image_quality_title),
                 style = ElementTheme.typography.fontBodyLgRegular,
             )
@@ -255,7 +420,8 @@ private fun VideoPresetSelector(
 
     if (state.displayMediaSelectorViews == true && videoPresets != null && state.selectedVideoPreset != null) {
         Column(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(horizontal = 16.dp, vertical = 16.dp)
                 .niceClickable { state.eventSink(MediaOptimizationSelectorEvent.OpenVideoPresetSelectorDialog) }
         ) {
@@ -328,7 +494,7 @@ private fun VideoQualitySelectorDialog(
                 val estimationMb = sizeFormatter.format(videoEstimation.sizeInBytes, true)
                 val title = "${preset.title()} ($estimationMb)"
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = title,
                             style = ElementTheme.typography.fontBodyLgMedium,
@@ -390,16 +556,16 @@ private fun AttachmentsPreviewBottomActions(
 internal fun AttachmentsPreviewViewPreview(@PreviewParameter(AttachmentsPreviewStateProvider::class) state: AttachmentsPreviewState) = ElementPreviewDark {
     AttachmentsPreviewView(
         state = state,
-        localMediaRenderer = object : LocalMediaRenderer {
-            @Composable
-            override fun Render(localMedia: LocalMedia) {
-                Image(
-                    painter = painterResource(id = CommonDrawables.sample_background),
-                    modifier = Modifier.fillMaxSize(),
-                    contentDescription = null,
-                )
-            }
-        }
+        localMediaRenderer = SampleMediaRenderer(),
+    )
+}
+
+@Preview
+@Composable
+internal fun AttachmentsPreviewGalleryViewPreview() = ElementPreviewDark {
+    AttachmentsPreviewView(
+        state = anAttachmentsPreviewGalleryState(),
+        localMediaRenderer = SampleMediaRenderer(),
     )
 }
 
@@ -442,3 +608,24 @@ fun VideoCompressionPreset.subtitle(): String {
         }
     )
 }
+
+@Composable
+internal fun GalleryCarouselPill(
+    currentIndex: Int,
+    totalCount: Int,
+    modifier: Modifier = Modifier,
+) {
+    Surface(
+        modifier = modifier,
+        shape = RoundedCornerShape(16.dp),
+        color = ElementTheme.colors.floatingDateBadgeBackground,
+        shadowElevation = 4.dp,
+    ) {
+        Text(
+            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            text = stringResource(R.string.screen_media_upload_preview_item_count, currentIndex, totalCount),
+            style = ElementTheme.typography.fontBodyMdMedium,
+            color = ElementTheme.colors.textPrimary,
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/SampleMediaRenderer.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/SampleMediaRenderer.kt
new file mode 100644
index 0000000000..df981a5d08
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/SampleMediaRenderer.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import io.element.android.libraries.designsystem.utils.CommonDrawables
+import io.element.android.libraries.mediaviewer.api.local.LocalMedia
+import io.element.android.libraries.mediaviewer.api.local.LocalMediaRenderer
+
+/**
+ * An implementation of [LocalMediaRenderer] that displays a sample background image.
+ * To be used for Previews only.
+ */
+internal class SampleMediaRenderer : LocalMediaRenderer {
+    @Composable
+    override fun Render(localMedia: LocalMedia) {
+        Image(
+            painter = painterResource(id = CommonDrawables.sample_background),
+            modifier = Modifier.fillMaxSize(),
+            contentDescription = null,
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditor.kt
new file mode 100644
index 0000000000..f8d199a74e
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditor.kt
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Matrix
+import android.net.Uri
+import androidx.exifinterface.media.ExifInterface
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.messages.impl.attachments.preview.resolvedImageMimeType
+import io.element.android.libraries.androidutils.bitmap.rotateToExifMetadataOrientation
+import io.element.android.libraries.androidutils.bitmap.writeBitmap
+import io.element.android.libraries.androidutils.file.createTmpFile
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.core.mimetype.MimeTypes
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAnimatedImage
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.mediaviewer.api.local.LocalMedia
+import kotlinx.coroutines.withContext
+import java.io.File
+import kotlin.math.roundToInt
+
+private const val EDITED_MEDIA_DIR_NAME = "edited-media"
+
+interface AttachmentImageEditor {
+    suspend fun canEdit(localMedia: LocalMedia): Boolean
+
+    suspend fun exportEdits(
+        localMedia: LocalMedia,
+        edits: AttachmentImageEdits,
+    ): Result<EditedLocalMedia>
+}
+
+data class EditedLocalMedia(
+    val localMedia: LocalMedia,
+    val file: File,
+)
+
+@ContributesBinding(AppScope::class)
+class DefaultAttachmentImageEditor(
+    @ApplicationContext private val context: Context,
+    private val dispatchers: CoroutineDispatchers,
+) : AttachmentImageEditor {
+    override suspend fun canEdit(localMedia: LocalMedia): Boolean = withContext(dispatchers.io) {
+        localMedia.info.resolvedImageMimeType()
+            ?.takeIf { it.isEditableStillImageMimeType() }
+            ?.let { return@withContext true }
+
+        val decodedMimeType = context.contentResolver.openInputStream(localMedia.uri)?.use { input ->
+            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+            BitmapFactory.decodeStream(input, null, options)
+            options.outMimeType
+        }
+
+        decodedMimeType.isEditableStillImageMimeType()
+    }
+
+    override suspend fun exportEdits(
+        localMedia: LocalMedia,
+        edits: AttachmentImageEdits,
+    ): Result<EditedLocalMedia> = withContext(dispatchers.io) {
+        runCatchingExceptions {
+            val sourceMimeType = localMedia.info.resolvedImageMimeType() ?: localMedia.info.mimeType
+            val exportedMimeType = exportedMimeTypeFor(sourceMimeType)
+            val exifOrientation = context.contentResolver.openInputStream(localMedia.uri)?.let { input ->
+                input.use {
+                    ExifInterface(it).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)
+                }
+            } ?: ExifInterface.ORIENTATION_UNDEFINED
+
+            val decodedBitmap = context.contentResolver.openInputStream(localMedia.uri)?.use { input ->
+                BitmapFactory.decodeStream(input)
+            } ?: error("Unable to decode image from ${localMedia.uri}")
+
+            val normalizedBitmap = decodedBitmap.rotateToExifMetadataOrientation(exifOrientation)
+            if (normalizedBitmap !== decodedBitmap) {
+                decodedBitmap.recycle()
+            }
+
+            val transformedBitmap = normalizedBitmap.applyEdits(edits)
+            if (transformedBitmap !== normalizedBitmap) {
+                normalizedBitmap.recycle()
+            }
+
+            val cropRect = edits.cropRect.toPixelRect(
+                imageWidth = transformedBitmap.width,
+                imageHeight = transformedBitmap.height,
+            )
+            val isCropUnchanged = cropRect.left == 0 && cropRect.top == 0 &&
+                cropRect.width() == transformedBitmap.width && cropRect.height() == transformedBitmap.height
+            val croppedBitmap = if (isCropUnchanged) {
+                transformedBitmap
+            } else {
+                Bitmap.createBitmap(
+                    transformedBitmap,
+                    cropRect.left,
+                    cropRect.top,
+                    cropRect.width(),
+                    cropRect.height(),
+                )
+            }
+            if (croppedBitmap !== transformedBitmap) {
+                transformedBitmap.recycle()
+            }
+
+            val editedMediaDir = File(context.cacheDir, EDITED_MEDIA_DIR_NAME).apply { mkdirs() }
+            val outputFile = context.createTmpFile(baseDir = editedMediaDir, extension = compressFileExtension(exportedMimeType))
+            outputFile.writeBitmap(
+                bitmap = croppedBitmap,
+                format = compressFormat(exportedMimeType),
+                quality = 90,
+            )
+            croppedBitmap.recycle()
+
+            EditedLocalMedia(
+                localMedia = localMedia.copy(
+                    uri = Uri.fromFile(outputFile),
+                    info = localMedia.info.copy(mimeType = exportedMimeType),
+                ),
+                file = outputFile,
+            )
+        }
+    }
+}
+
+internal fun exportedMimeTypeFor(sourceMimeType: String?): String {
+    return if (sourceMimeType == MimeTypes.Png) {
+        MimeTypes.Png
+    } else {
+        MimeTypes.Jpeg
+    }
+}
+
+private fun Bitmap.applyEdits(edits: AttachmentImageEdits): Bitmap {
+    val normalizedTurns = (edits.rotationQuarterTurns % 4 + 4) % 4
+    if (normalizedTurns == 0 && !edits.isFlippedHorizontally && !edits.isFlippedVertically) {
+        return this
+    }
+    val centerX = width / 2f
+    val centerY = height / 2f
+    val matrix = Matrix().apply {
+        val scaleX = if (edits.isFlippedHorizontally) -1f else 1f
+        val scaleY = if (edits.isFlippedVertically) -1f else 1f
+        if (scaleX < 0f || scaleY < 0f) {
+            postScale(scaleX, scaleY, centerX, centerY)
+        }
+        if (normalizedTurns != 0) {
+            postRotate(normalizedTurns * 90f, centerX, centerY)
+        }
+    }
+    return Bitmap.createBitmap(this, 0, 0, width, height, matrix, true)
+}
+
+private data class PixelCropRect(
+    val left: Int,
+    val top: Int,
+    val right: Int,
+    val bottom: Int,
+) {
+    fun width() = right - left
+    fun height() = bottom - top
+}
+
+private fun NormalizedCropRect.toPixelRect(imageWidth: Int, imageHeight: Int): PixelCropRect {
+    val leftPx = (left * imageWidth).roundToInt().coerceIn(0, imageWidth - 1)
+    val topPx = (top * imageHeight).roundToInt().coerceIn(0, imageHeight - 1)
+    val rightPx = (right * imageWidth).roundToInt().coerceIn(leftPx + 1, imageWidth)
+    val bottomPx = (bottom * imageHeight).roundToInt().coerceIn(topPx + 1, imageHeight)
+    return PixelCropRect(
+        left = leftPx,
+        top = topPx,
+        right = rightPx,
+        bottom = bottomPx,
+    )
+}
+
+private fun compressFormat(mimeType: String) = when (mimeType) {
+    MimeTypes.Png -> Bitmap.CompressFormat.PNG
+    else -> Bitmap.CompressFormat.JPEG
+}
+
+private fun compressFileExtension(mimeType: String) = when (mimeType) {
+    MimeTypes.Png -> "png"
+    else -> "jpeg"
+}
+
+private fun String?.isEditableStillImageMimeType(): Boolean {
+    return this != null &&
+        this.isMimeTypeImage() &&
+        !this.isMimeTypeAnimatedImage() &&
+        this != MimeTypes.Svg
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorState.kt
new file mode 100644
index 0000000000..b798df2747
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorState.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import androidx.annotation.FloatRange
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.mediaviewer.api.local.LocalMedia
+
+private const val DEFAULT_CROP_MARGIN = 0f
+private const val MIN_CROP_SIZE = 0.1f
+
+@Immutable
+data class AttachmentImageEditorState(
+    val localMedia: LocalMedia,
+    val edits: AttachmentImageEdits,
+    // For preview only
+    val previewDebug: Boolean,
+)
+
+@Immutable
+data class AttachmentImageEdits(
+    val cropRect: NormalizedCropRect = NormalizedCropRect.default(),
+    val rotationQuarterTurns: Int = 0,
+    val isFlippedHorizontally: Boolean = false,
+    val isFlippedVertically: Boolean = false,
+) {
+    val normalizedRotationQuarterTurns: Int
+        get() = rotationQuarterTurns % 4
+
+    val rotationDegrees: Int
+        get() = normalizedRotationQuarterTurns * 90
+
+    val hasChanges: Boolean
+        get() = cropRect != NormalizedCropRect.default() ||
+            normalizedRotationQuarterTurns != 0 ||
+            isFlippedHorizontally ||
+            isFlippedVertically
+
+    fun rotateAntiClockwise(): AttachmentImageEdits {
+        return copy(
+            rotationQuarterTurns = (normalizedRotationQuarterTurns + 3) % 4,
+            // Also update the crop rect to keep the same selected area
+            cropRect = cropRect.rotateAntiClockwise()
+        )
+    }
+
+    fun flipHorizontally(): AttachmentImageEdits {
+        return copy(
+            isFlippedHorizontally = !isFlippedHorizontally,
+            // Also update the crop rect to keep the same selected area
+            cropRect = cropRect.flipHorizontally(),
+        )
+    }
+
+    fun flipVertically(): AttachmentImageEdits {
+        return copy(
+            isFlippedVertically = !isFlippedVertically,
+            // Also update the crop rect to keep the same selected area
+            cropRect = cropRect.flipVertically(),
+        )
+    }
+}
+
+@Immutable
+data class NormalizedCropRect(
+    @FloatRange(from = 0.0, to = 1.0) val left: Float,
+    @FloatRange(from = 0.0, to = 1.0) val top: Float,
+    @FloatRange(from = 0.0, to = 1.0) val right: Float,
+    @FloatRange(from = 0.0, to = 1.0) val bottom: Float,
+) {
+    init {
+        require(left in 0f..1f)
+        require(top in 0f..1f)
+        require(right in 0f..1f)
+        require(bottom in 0f..1f)
+        require(left < right)
+        require(top < bottom)
+    }
+
+    val width: Float
+        get() = right - left
+
+    val height: Float
+        get() = bottom - top
+
+    fun applyChange(
+        dragTarget: CropDragTarget,
+        deltaX: Float,
+        deltaY: Float,
+    ): NormalizedCropRect = when (dragTarget) {
+        is CropDragTarget.Move -> translate(deltaX, deltaY)
+        is CropDragTarget.Corner -> dragWithCorner(dragTarget, deltaX, deltaY)
+        is CropDragTarget.Edge -> dragWithEdge(dragTarget, deltaX, deltaY)
+    }
+
+    private fun translate(deltaX: Float, deltaY: Float): NormalizedCropRect {
+        val clampedLeft = (left + deltaX).coerceIn(0f, 1f - width)
+        val clampedTop = (top + deltaY).coerceIn(0f, 1f - height)
+        return copy(
+            left = clampedLeft,
+            top = clampedTop,
+            right = clampedLeft + width,
+            bottom = clampedTop + height,
+        )
+    }
+
+    private fun dragWithCorner(
+        dragTarget: CropDragTarget.Corner,
+        deltaX: Float,
+        deltaY: Float,
+    ) = when (dragTarget) {
+        CropDragTarget.Corner.TopLeft -> copy(
+            left = (left + deltaX).coerceIn(0f, right - MIN_CROP_SIZE),
+            top = (top + deltaY).coerceIn(0f, bottom - MIN_CROP_SIZE),
+        )
+        CropDragTarget.Corner.TopRight -> copy(
+            right = (right + deltaX).coerceIn(left + MIN_CROP_SIZE, 1f),
+            top = (top + deltaY).coerceIn(0f, bottom - MIN_CROP_SIZE),
+        )
+        CropDragTarget.Corner.BottomRight -> copy(
+            right = (right + deltaX).coerceIn(left + MIN_CROP_SIZE, 1f),
+            bottom = (bottom + deltaY).coerceIn(top + MIN_CROP_SIZE, 1f),
+        )
+        CropDragTarget.Corner.BottomLeft -> copy(
+            left = (left + deltaX).coerceIn(0f, right - MIN_CROP_SIZE),
+            bottom = (bottom + deltaY).coerceIn(top + MIN_CROP_SIZE, 1f),
+        )
+    }
+
+    private fun dragWithEdge(
+        dragTarget: CropDragTarget.Edge,
+        deltaX: Float,
+        deltaY: Float,
+    ) = when (dragTarget) {
+        CropDragTarget.Edge.Top -> copy(
+            top = (top + deltaY).coerceIn(0f, bottom - MIN_CROP_SIZE),
+        )
+        CropDragTarget.Edge.Right -> copy(
+            right = (right + deltaX).coerceIn(left + MIN_CROP_SIZE, 1f),
+        )
+        CropDragTarget.Edge.Bottom -> copy(
+            bottom = (bottom + deltaY).coerceIn(top + MIN_CROP_SIZE, 1f),
+        )
+        CropDragTarget.Edge.Left -> copy(
+            left = (left + deltaX).coerceIn(0f, right - MIN_CROP_SIZE),
+        )
+    }
+
+    fun rotateAntiClockwise() = copy(
+        left = top,
+        top = 1f - right,
+        right = bottom,
+        bottom = 1f - left,
+    )
+
+    fun flipHorizontally() = copy(
+        left = 1f - right,
+        right = 1f - left,
+    )
+
+    fun flipVertically() = copy(
+        top = 1f - bottom,
+        bottom = 1f - top,
+    )
+
+    companion object {
+        fun default() = NormalizedCropRect(
+            left = DEFAULT_CROP_MARGIN,
+            top = DEFAULT_CROP_MARGIN,
+            right = 1f - DEFAULT_CROP_MARGIN,
+            bottom = 1f - DEFAULT_CROP_MARGIN,
+        )
+    }
+}
+
+sealed interface CropDragTarget {
+    data object Move : CropDragTarget
+
+    sealed interface Corner : CropDragTarget {
+        data object TopLeft : Corner
+        data object TopRight : Corner
+        data object BottomRight : Corner
+        data object BottomLeft : Corner
+    }
+
+    sealed interface Edge : CropDragTarget {
+        data object Top : Edge
+        data object Right : Edge
+        data object Bottom : Edge
+        data object Left : Edge
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorStateProvider.kt
new file mode 100644
index 0000000000..7c542fd1a8
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorStateProvider.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.core.net.toUri
+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
+import io.element.android.libraries.mediaviewer.api.local.LocalMedia
+
+open class AttachmentImageEditorStateProvider : PreviewParameterProvider<AttachmentImageEditorState> {
+    private val caterpillarCrop = NormalizedCropRect(
+        left = 0.3f,
+        top = 0.3f,
+        right = 0.8f,
+        bottom = 0.75f,
+    )
+
+    override val values: Sequence<AttachmentImageEditorState>
+        get() = sequenceOf(
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    // Cheat a bit so that the crop match the sample image size (1024 * 682)
+                    cropRect = 0.17f.let { correction ->
+                        NormalizedCropRect(
+                            left = 0f,
+                            top = correction,
+                            right = 1f,
+                            bottom = 1 - correction,
+                        )
+                    },
+                ),
+            ),
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = caterpillarCrop,
+                ),
+            ),
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = caterpillarCrop,
+                ),
+                previewDebug = true,
+            ),
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = caterpillarCrop,
+                ).rotateAntiClockwise(),
+            ),
+            // Small crop
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = NormalizedCropRect(
+                        left = 0.3f,
+                        top = 0.6f,
+                        right = 0.4f,
+                        bottom = 0.7f,
+                    ),
+                ),
+                previewDebug = true,
+            ),
+            // Big crop
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = NormalizedCropRect(
+                        left = 0.05f,
+                        top = 0.05f,
+                        right = 0.95f,
+                        bottom = 0.95f,
+                    ),
+                ),
+                previewDebug = true,
+            ),
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = caterpillarCrop,
+                ).flipHorizontally(),
+            ),
+            anAttachmentImageEditorState(
+                edits = AttachmentImageEdits(
+                    cropRect = caterpillarCrop,
+                ).flipVertically(),
+            ),
+        )
+}
+
+internal fun anAttachmentImageEditorState(
+    localMedia: LocalMedia = LocalMedia(
+        uri = "file://preview-image".toUri(),
+        info = anImageMediaInfo(),
+    ),
+    edits: AttachmentImageEdits = AttachmentImageEdits(),
+    previewDebug: Boolean = false,
+) = AttachmentImageEditorState(
+    localMedia = localMedia,
+    edits = edits,
+    previewDebug = previewDebug,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt
new file mode 100644
index 0000000000..a5317b96c6
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditorView.kt
@@ -0,0 +1,691 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.layout.boundsInParent
+import androidx.compose.ui.layout.onPlaced
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.stateDescription
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import coil3.compose.AsyncImagePainter
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.R
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.text.toPx
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.CommonDrawables
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlin.math.min
+
+private val minHandleTouchRadius = 16.dp
+private val maxHandleTouchRadius = 56.dp
+
+/**
+ * Ref: https://www.figma.com/design/zftpgS6LjiczobJZ1GUNpt/Updates-to-Media---File-Upload?node-id=51-3539
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AttachmentImageEditorView(
+    state: AttachmentImageEditorState,
+    onCropRectChange: (NormalizedCropRect) -> Unit,
+    onRotateClick: () -> Unit,
+    onFlipHorizontallyClick: () -> Unit,
+    onFlipVerticallyClick: () -> Unit,
+    onResetClick: () -> Unit,
+    onCancelClick: () -> Unit,
+    onDoneClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val rotateContentDescription = stringResource(R.string.screen_image_edition_a11y_rotate_to_the_left)
+    val rotationStateDescription = pluralStringResource(
+        R.plurals.screen_image_edition_a11y_rotation_state,
+        state.edits.rotationDegrees,
+        state.edits.rotationDegrees,
+    )
+    val flipHorizontalLabel = stringResource(R.string.screen_image_edition_a11y_flip_image_horizontally)
+    val flipHorizontalState = if (state.edits.isFlippedHorizontally) {
+        stringResource(R.string.screen_image_edition_a11y_flip_image_horizontally_state_flipped)
+    } else {
+        stringResource(R.string.screen_image_edition_a11y_flip_image_horizontally_state_original)
+    }
+    val flipVerticalLabel = stringResource(R.string.screen_image_edition_a11y_flip_image_vertically)
+    val flipVerticalState = if (state.edits.isFlippedVertically) {
+        stringResource(R.string.screen_image_edition_a11y_flip_image_vertically_state_flipped)
+    } else {
+        stringResource(R.string.screen_image_edition_a11y_flip_image_vertically_state_original)
+    }
+    Scaffold(
+        modifier = modifier.fillMaxSize(),
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    BackButton(
+                        imageVector = CompoundIcons.Close(),
+                        onClick = onCancelClick,
+                    )
+                },
+                title = {
+                    Text(
+                        modifier = Modifier.semantics {
+                            heading()
+                        },
+                        text = stringResource(R.string.screen_image_edition_title),
+                    )
+                },
+            )
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(ElementTheme.colors.bgCanvasDefault)
+                .padding(paddingValues)
+        ) {
+            Box(
+                modifier = Modifier.weight(1f),
+                contentAlignment = Alignment.Center,
+            ) {
+                CropEditorCanvas(
+                    state = state,
+                    onCropRectChange = onCropRectChange,
+                )
+            }
+            Row(
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .widthIn(max = 360.dp)
+                    .navigationBarsPadding()
+                    .padding(start = 20.dp, top = 18.dp, end = 20.dp, bottom = 18.dp),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Box(
+                    modifier = Modifier.weight(1f),
+                    contentAlignment = Alignment.CenterStart,
+                ) {
+                    TextButton(
+                        text = stringResource(CommonStrings.action_reset),
+                        destructive = true,
+                        onClick = onResetClick,
+                    )
+                }
+                Row(
+                    modifier = Modifier.weight(2f),
+                    // Center the content horizontally
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    IconButton(
+                        onClick = onFlipHorizontallyClick,
+                        modifier = Modifier
+                            .clearAndSetSemantics {
+                                contentDescription = flipHorizontalLabel
+                                stateDescription = flipHorizontalState
+                            }
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.FlipHorizontal(),
+                            contentDescription = null,
+                        )
+                    }
+                    IconButton(
+                        onClick = onRotateClick,
+                        modifier = Modifier
+                            .clearAndSetSemantics {
+                                contentDescription = rotateContentDescription
+                                stateDescription = rotationStateDescription
+                            }
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.RotateLeft(),
+                            contentDescription = null,
+                        )
+                    }
+                    IconButton(
+                        onClick = onFlipVerticallyClick,
+                        modifier = Modifier
+                            .clearAndSetSemantics {
+                                contentDescription = flipVerticalLabel
+                                stateDescription = flipVerticalState
+                            }
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.FlipVertical(),
+                            contentDescription = null,
+                        )
+                    }
+                }
+                Box(
+                    modifier = Modifier.weight(1f),
+                    contentAlignment = Alignment.CenterEnd,
+                ) {
+                    TextButton(
+                        text = stringResource(CommonStrings.action_save),
+                        onClick = onDoneClick,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun BoxScope.CropEditorCanvas(
+    state: AttachmentImageEditorState,
+    onCropRectChange: (NormalizedCropRect) -> Unit,
+) {
+    var imageSize by remember(state.localMedia.uri) { mutableStateOf(IntSize.Zero) }
+    val rotationQuarterTurns = state.edits.normalizedRotationQuarterTurns
+    val flipScaleX = if (state.edits.isFlippedHorizontally) -1f else 1f
+    val flipScaleY = if (state.edits.isFlippedVertically) -1f else 1f
+
+    var imageRect by remember { mutableStateOf(Rect.Zero) }
+
+    BoxWithConstraints(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(20.dp),
+    ) {
+        val displayedSize = remember(maxWidth, maxHeight, imageSize, rotationQuarterTurns) {
+            val sourceWidth = imageSize.width.takeIf { it > 0 } ?: 1
+            val sourceHeight = imageSize.height.takeIf { it > 0 } ?: 1
+            val aspectRatio = if (rotationQuarterTurns % 2 == 0) {
+                sourceWidth.toFloat() / sourceHeight.toFloat()
+            } else {
+                sourceHeight.toFloat() / sourceWidth.toFloat()
+            }
+            fitSize(
+                containerWidth = constraints.maxWidth.toFloat(),
+                containerHeight = constraints.maxHeight.toFloat(),
+                aspectRatio = aspectRatio,
+            )
+        }
+        val density = LocalDensity.current
+        val displayedWidthDp = with(density) { displayedSize.width.toDp() }
+        val displayedHeightDp = with(density) { displayedSize.height.toDp() }
+        val imageLayoutSize = remember(displayedSize, rotationQuarterTurns) {
+            if (rotationQuarterTurns % 2 == 0) {
+                displayedSize
+            } else {
+                Size(
+                    width = displayedSize.height,
+                    height = displayedSize.width,
+                )
+            }
+        }
+        val imageLayoutWidthDp = with(density) { imageLayoutSize.width.toDp() }
+        val imageLayoutHeightDp = with(density) { imageLayoutSize.height.toDp() }
+
+        Box(
+            modifier = Modifier
+                .size(displayedWidthDp, displayedHeightDp)
+                .align(Alignment.Center)
+                .onPlaced {
+                    imageRect = it.boundsInParent()
+                },
+            contentAlignment = Alignment.Center,
+        ) {
+            if (LocalInspectionMode.current) {
+                Image(
+                    painter = painterResource(id = CommonDrawables.sample_background),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .requiredSize(imageLayoutWidthDp, imageLayoutHeightDp)
+                        .graphicsLayer {
+                            scaleX = flipScaleX
+                            scaleY = flipScaleY
+                        }
+                        .graphicsLayer { rotationZ = rotationQuarterTurns * 90f },
+                    contentScale = ContentScale.Fit,
+                )
+            } else {
+                AsyncImage(
+                    model = state.localMedia.uri,
+                    contentDescription = stringResource(CommonStrings.common_image),
+                    modifier = Modifier
+                        .requiredSize(imageLayoutWidthDp, imageLayoutHeightDp)
+                        .graphicsLayer {
+                            scaleX = flipScaleX
+                            scaleY = flipScaleY
+                        }
+                        .graphicsLayer { rotationZ = rotationQuarterTurns * 90f },
+                    contentScale = ContentScale.Fit,
+                    onState = { painterState ->
+                        if (painterState is AsyncImagePainter.State.Success) {
+                            imageSize = IntSize(
+                                width = painterState.result.image.width,
+                                height = painterState.result.image.height,
+                            )
+                        }
+                    }
+                )
+            }
+        }
+        val minHandleTouchRadiusPx = minHandleTouchRadius.toPx()
+        val maxHandleTouchRadiusPx = maxHandleTouchRadius.toPx()
+        val touchRadiusPx by rememberUpdatedState(
+            (min(
+                state.edits.cropRect.width * imageRect.width,
+                state.edits.cropRect.height * imageRect.height,
+            ) / 4f).coerceIn(
+                minHandleTouchRadiusPx,
+                maxHandleTouchRadiusPx,
+            )
+        )
+        var dragTarget by remember { mutableStateOf<CropDragTarget?>(null) }
+        val latestCropRect by rememberUpdatedState(state.edits.cropRect)
+        val drawGuidelines = dragTarget == CropDragTarget.Move || state.previewDebug
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .pointerInput(Unit) {
+                    detectDragGestures(
+                        onDragStart = { offset ->
+                            dragTarget = detectDragTarget(
+                                touchPoint = offset,
+                                imageOffset = imageRect.topLeft,
+                                cropRect = latestCropRect,
+                                canvasSize = Size(imageRect.width, imageRect.height),
+                                handleTouchRadius = touchRadiusPx,
+                            )
+                        },
+                        onDragCancel = {
+                            dragTarget = null
+                        },
+                        onDragEnd = {
+                            dragTarget = null
+                        },
+                    ) { change, dragAmount ->
+                        val activeTarget = dragTarget ?: return@detectDragGestures
+                        change.consume()
+                        val gestureAreaWidth = imageRect.width.takeIf { it > 0f } ?: size.width.toFloat()
+                        val gestureAreaHeight = imageRect.height.takeIf { it > 0f } ?: size.height.toFloat()
+                        onCropRectChange(
+                            latestCropRect.applyChange(
+                                dragTarget = activeTarget,
+                                deltaX = dragAmount.x / gestureAreaWidth,
+                                deltaY = dragAmount.y / gestureAreaHeight,
+                            )
+                        )
+                    }
+                },
+            contentAlignment = Alignment.Center,
+        ) {
+            CropOverlay(
+                imageSize = DpSize(displayedWidthDp, displayedHeightDp),
+                cropRect = state.edits.cropRect,
+                drawGuidelines = drawGuidelines,
+                previewDebug = state.previewDebug,
+                touchRadiusPx = touchRadiusPx,
+                dragTarget = dragTarget,
+            )
+        }
+    }
+}
+
+@Composable
+private fun CropOverlay(
+    imageSize: DpSize,
+    cropRect: NormalizedCropRect,
+    drawGuidelines: Boolean,
+    previewDebug: Boolean,
+    touchRadiusPx: Float,
+    dragTarget: CropDragTarget?,
+) {
+    val borderColor = ElementTheme.colors.iconPrimary
+    val guideColor = ElementTheme.colors.iconPrimary
+
+    Canvas(
+        modifier = Modifier.size(imageSize.width, imageSize.height)
+    ) {
+        val cropLeft = cropRect.left * size.width
+        val cropTop = cropRect.top * size.height
+        val cropRight = cropRect.right * size.width
+        val cropBottom = cropRect.bottom * size.height
+        // Hardcoded black: the crop overlay must always darken the image regardless of theme.
+        // No semantic token exists for this use case in the Compound design system.
+        val overlayColor = Color.Black.copy(alpha = 0.48f)
+        // Overlay above the crop area
+        drawRect(
+            color = overlayColor,
+            topLeft = Offset.Zero,
+            size = Size(width = size.width, height = cropTop),
+        )
+        // Overlay on the left of the crop area
+        drawRect(
+            color = overlayColor,
+            topLeft = Offset(0f, cropTop),
+            size = Size(width = cropLeft, height = cropBottom - cropTop),
+        )
+        // Overlay on the right of the crop area
+        drawRect(
+            color = overlayColor,
+            topLeft = Offset(cropRight, cropTop),
+            size = Size(width = size.width - cropRight, height = cropBottom - cropTop),
+        )
+        // Overlay below the crop area
+        drawRect(
+            color = overlayColor,
+            topLeft = Offset(0f, cropBottom),
+            size = Size(width = size.width, height = size.height - cropBottom),
+        )
+        // Main frame of the crop area
+        drawRect(
+            color = borderColor,
+            topLeft = Offset(cropLeft, cropTop),
+            size = Size(width = cropRight - cropLeft, height = cropBottom - cropTop),
+            style = Stroke(width = 1.dp.toPx()),
+        )
+        // Guidelines dividing the crop area into 9 equal parts
+        if (drawGuidelines) {
+            val thirdWidth = (cropRight - cropLeft) / 3f
+            val thirdHeight = (cropBottom - cropTop) / 3f
+            for (index in 1..2) {
+                val offsetX = cropLeft + thirdWidth * index
+                val offsetY = cropTop + thirdHeight * index
+                // Vertical guide line
+                drawLine(
+                    color = guideColor,
+                    start = Offset(offsetX, cropTop),
+                    end = Offset(offsetX, cropBottom),
+                    strokeWidth = 1.dp.toPx(),
+                )
+                // Horizontal guide line
+                drawLine(
+                    color = guideColor,
+                    start = Offset(cropLeft, offsetY),
+                    end = Offset(cropRight, offsetY),
+                    strokeWidth = 1.dp.toPx(),
+                )
+            }
+        }
+        // Corner handles
+        val handleLength = 18.dp.toPx()
+        val handleOffset = 2.dp.toPx()
+        // Top left corner
+        drawCornerHandle(
+            x = cropLeft - handleOffset,
+            y = cropTop - handleOffset,
+            handleLength = handleLength,
+            color = borderColor,
+            position = CropDragTarget.Corner.TopLeft,
+        )
+        // Top right corner
+        drawCornerHandle(
+            x = cropRight + handleOffset,
+            y = cropTop - handleOffset,
+            handleLength = handleLength,
+            color = borderColor,
+            position = CropDragTarget.Corner.TopRight,
+        )
+        // Bottom left corner
+        drawCornerHandle(
+            x = cropLeft - handleOffset,
+            y = cropBottom + handleOffset,
+            handleLength = handleLength,
+            color = borderColor,
+            position = CropDragTarget.Corner.BottomLeft,
+        )
+        // Bottom right corner
+        drawCornerHandle(
+            x = cropRight + handleOffset,
+            y = cropBottom + handleOffset,
+            handleLength = handleLength,
+            color = borderColor,
+            position = CropDragTarget.Corner.BottomRight,
+        )
+        val handleColor = borderColor
+        // Top handle
+        drawEdgeHandle(
+            center = Offset((cropLeft + cropRight) / 2f, cropTop - handleOffset),
+            horizontal = true,
+            handleLength = handleLength,
+            color = handleColor,
+        )
+        // Right handle
+        drawEdgeHandle(
+            center = Offset(cropRight + handleOffset, (cropTop + cropBottom) / 2f),
+            horizontal = false,
+            handleLength = handleLength,
+            color = handleColor,
+        )
+        // Bottom handle
+        drawEdgeHandle(
+            center = Offset((cropLeft + cropRight) / 2f, cropBottom + handleOffset),
+            horizontal = true,
+            handleLength = handleLength,
+            color = handleColor,
+        )
+        // Left handle
+        drawEdgeHandle(
+            center = Offset(cropLeft - handleOffset, (cropTop + cropBottom) / 2f),
+            horizontal = false,
+            handleLength = handleLength,
+            color = handleColor,
+        )
+
+        if (previewDebug) {
+            // Draw disk around touchable area
+            listOf(
+                CropDragTarget.Edge.Top,
+                CropDragTarget.Edge.Right,
+                CropDragTarget.Edge.Bottom,
+                CropDragTarget.Edge.Left,
+                CropDragTarget.Corner.TopLeft,
+                CropDragTarget.Corner.TopRight,
+                CropDragTarget.Corner.BottomRight,
+                CropDragTarget.Corner.BottomLeft,
+                CropDragTarget.Move,
+            ).forEach { target ->
+                val color = when (target) {
+                    is CropDragTarget.Move -> Color.Red
+                    is CropDragTarget.Corner -> Color.Blue
+                    is CropDragTarget.Edge -> Color.Green
+                }.copy(alpha = if (dragTarget == target) 9f else 0.5f)
+                drawCircle(
+                    color = color,
+                    radius = touchRadiusPx,
+                    center = computeOffset(target, cropRect, Size(size.width, size.height)),
+                )
+            }
+        }
+    }
+}
+
+private fun fitSize(
+    containerWidth: Float,
+    containerHeight: Float,
+    aspectRatio: Float,
+): Size {
+    val widthBasedHeight = containerWidth / aspectRatio
+    return if (widthBasedHeight <= containerHeight) {
+        Size(width = containerWidth, height = widthBasedHeight)
+    } else {
+        Size(width = containerHeight * aspectRatio, height = containerHeight)
+    }
+}
+
+private fun detectDragTarget(
+    touchPoint: Offset,
+    imageOffset: Offset,
+    cropRect: NormalizedCropRect,
+    canvasSize: Size,
+    handleTouchRadius: Float,
+): CropDragTarget? {
+    // Give priority on Move (extra detection of the center of crop area)
+    // to ensure that user can move a small crop, then to corners and at last to edges.
+    val handlesArea = mapOf(
+        CropDragTarget.Move to computeOffset(CropDragTarget.Move, cropRect, canvasSize),
+        CropDragTarget.Corner.TopLeft to computeOffset(CropDragTarget.Corner.TopLeft, cropRect, canvasSize),
+        CropDragTarget.Corner.TopRight to computeOffset(CropDragTarget.Corner.TopRight, cropRect, canvasSize),
+        CropDragTarget.Corner.BottomRight to computeOffset(CropDragTarget.Corner.BottomRight, cropRect, canvasSize),
+        CropDragTarget.Corner.BottomLeft to computeOffset(CropDragTarget.Corner.BottomLeft, cropRect, canvasSize),
+        CropDragTarget.Edge.Top to computeOffset(CropDragTarget.Edge.Top, cropRect, canvasSize),
+        CropDragTarget.Edge.Right to computeOffset(CropDragTarget.Edge.Right, cropRect, canvasSize),
+        CropDragTarget.Edge.Bottom to computeOffset(CropDragTarget.Edge.Bottom, cropRect, canvasSize),
+        CropDragTarget.Edge.Left to computeOffset(CropDragTarget.Edge.Left, cropRect, canvasSize),
+    )
+    handlesArea.forEach { (target, corner) ->
+        if ((corner - touchPoint + imageOffset).getDistance() <= handleTouchRadius) {
+            return target
+        }
+    }
+    val cropLeft = imageOffset.x + cropRect.left * canvasSize.width
+    val cropTop = imageOffset.y + cropRect.top * canvasSize.height
+    val cropRight = imageOffset.x + cropRect.right * canvasSize.width
+    val cropBottom = imageOffset.y + cropRect.bottom * canvasSize.height
+    return if (touchPoint.x in cropLeft..cropRight && touchPoint.y in cropTop..cropBottom) {
+        CropDragTarget.Move
+    } else {
+        null
+    }
+}
+
+private fun computeOffset(
+    target: CropDragTarget,
+    cropRect: NormalizedCropRect,
+    canvasSize: Size,
+) = when (target) {
+    CropDragTarget.Move -> Offset((cropRect.left + cropRect.right) * canvasSize.width / 2f, (cropRect.top + cropRect.bottom) * canvasSize.height / 2f)
+    CropDragTarget.Corner.TopLeft -> Offset(cropRect.left * canvasSize.width, cropRect.top * canvasSize.height)
+    CropDragTarget.Edge.Top -> Offset((cropRect.left + cropRect.right) * canvasSize.width / 2f, cropRect.top * canvasSize.height)
+    CropDragTarget.Corner.TopRight -> Offset(cropRect.right * canvasSize.width, cropRect.top * canvasSize.height)
+    CropDragTarget.Edge.Right -> Offset(cropRect.right * canvasSize.width, (cropRect.top + cropRect.bottom) * canvasSize.height / 2f)
+    CropDragTarget.Corner.BottomRight -> Offset(cropRect.right * canvasSize.width, cropRect.bottom * canvasSize.height)
+    CropDragTarget.Edge.Bottom -> Offset((cropRect.left + cropRect.right) * canvasSize.width / 2f, cropRect.bottom * canvasSize.height)
+    CropDragTarget.Corner.BottomLeft -> Offset(cropRect.left * canvasSize.width, cropRect.bottom * canvasSize.height)
+    CropDragTarget.Edge.Left -> Offset(cropRect.left * canvasSize.width, (cropRect.top + cropRect.bottom) * canvasSize.height / 2f)
+}
+
+// x and y are the coordinates of the corner
+private fun DrawScope.drawCornerHandle(
+    x: Float,
+    y: Float,
+    handleLength: Float,
+    color: Color,
+    position: CropDragTarget.Corner,
+) {
+    val strokeWidth = 4.dp.toPx()
+    val correction = strokeWidth / 2
+    val horizontalCorrection = if (position.isLeft()) -correction else correction
+    val horizontalEndX = if (position.isLeft()) x + handleLength else x - handleLength
+    val verticalEndY = if (position.isTop()) y + handleLength else y - handleLength
+    val verticalCorrection = if (position.isTop()) -correction else correction
+    // Horizontal line
+    drawLine(
+        color = color,
+        start = Offset(x + horizontalCorrection, y),
+        end = Offset(horizontalEndX + horizontalCorrection, y),
+        strokeWidth = strokeWidth,
+    )
+    // Vertical line
+    drawLine(
+        color = color,
+        start = Offset(x, y + verticalCorrection),
+        end = Offset(x, verticalEndY + verticalCorrection),
+        strokeWidth = strokeWidth,
+    )
+}
+
+private fun CropDragTarget.Corner.isLeft() = this == CropDragTarget.Corner.TopLeft || this == CropDragTarget.Corner.BottomLeft
+private fun CropDragTarget.Corner.isTop() = this == CropDragTarget.Corner.TopLeft || this == CropDragTarget.Corner.TopRight
+
+private fun DrawScope.drawEdgeHandle(
+    center: Offset,
+    horizontal: Boolean,
+    handleLength: Float,
+    color: Color,
+) {
+    val start = if (horizontal) {
+        Offset(center.x - handleLength / 2f, center.y)
+    } else {
+        Offset(center.x, center.y - handleLength / 2f)
+    }
+    val end = if (horizontal) {
+        Offset(center.x + handleLength / 2f, center.y)
+    } else {
+        Offset(center.x, center.y + handleLength / 2f)
+    }
+    drawLine(
+        color = color,
+        start = start,
+        end = end,
+        strokeWidth = 4.dp.toPx(),
+    )
+}
+
+// Only preview in dark, dark theme is forced on the Node.
+@Preview
+@Composable
+internal fun AttachmentImageEditorViewPreview(
+    @PreviewParameter(AttachmentImageEditorStateProvider::class) state: AttachmentImageEditorState,
+) = ElementPreviewDark {
+    AttachmentImageEditorView(
+        state = state,
+        onCropRectChange = {},
+        onRotateClick = {},
+        onFlipHorizontallyClick = {},
+        onFlipVerticallyClick = {},
+        onResetClick = {},
+        onCancelClick = {},
+        onDoneClick = {},
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenter.kt
index c81c306f90..c194bda507 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenter.kt
@@ -36,17 +36,22 @@ import kotlin.math.roundToLong
 
 @AssistedInject
 class DefaultMediaOptimizationSelectorPresenter(
+    @Assisted private val index: Int,
     @Assisted private val localMedia: LocalMedia,
+    @Assisted private val sendAsFile: Boolean,
     private val maxUploadSizeProvider: MaxUploadSizeProvider,
     private val featureFlagService: FeatureFlagService,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
+    private val videoCompressionPresetSelector: VideoCompressionPresetSelector,
     mediaExtractorFactory: VideoMetadataExtractor.Factory,
 ) : MediaOptimizationSelectorPresenter {
     @ContributesBinding(SessionScope::class)
     @AssistedFactory
     interface Factory : MediaOptimizationSelectorPresenter.Factory {
         override fun create(
+            index: Int,
             localMedia: LocalMedia,
+            sendAsFile: Boolean,
         ): DefaultMediaOptimizationSelectorPresenter
     }
 
@@ -55,7 +60,9 @@ class DefaultMediaOptimizationSelectorPresenter(
     @Composable
     override fun present(): MediaOptimizationSelectorState {
         val displayMediaSelectorViews by produceState<Boolean?>(null) {
-            value = featureFlagService.isFeatureEnabled(FeatureFlags.SelectableMediaQuality)
+            // When sending as a raw file, never show the optimization selector: images skip
+            // recompression, while videos use the highest available best-fit preset.
+            value = !sendAsFile && featureFlagService.isFeatureEnabled(FeatureFlags.SelectableMediaQuality)
         }
 
         var displayVideoPresetSelectorDialog by remember { mutableStateOf(false) }
@@ -123,12 +130,23 @@ class DefaultMediaOptimizationSelectorPresenter(
         var selectedVideoOptimizationPreset by remember { mutableStateOf<AsyncData<VideoCompressionPreset>>(AsyncData.Loading()) }
 
         LaunchedEffect(videoSizeEstimations.dataOrNull()) {
+            if (sendAsFile) {
+                // Send-as-file path: pin to no image compression, and pick the highest-quality
+                // video preset that still fits the upload limit (we have no true "do not re-encode
+                // video" path in the pre-processor right now).
+                selectedImageOptimization = AsyncData.Success(false)
+                selectedVideoOptimizationPreset = videoCompressionPresetSelector.selectBestVideoPreset(
+                    expectedVideoPreset = VideoCompressionPreset.HIGH,
+                    videoSizeEstimations = videoSizeEstimations,
+                )
+                return@LaunchedEffect
+            }
             val mediaOptimizationConfig = mediaOptimizationConfigProvider.get()
             selectedImageOptimization = AsyncData.Success(mediaOptimizationConfig.compressImages)
             // Find the best video preset based on the default preset and the video size estimations
             // Since the estimation for the current preset may be way too large to upload, we check the ones that provide lower file sizes
-            selectedVideoOptimizationPreset = findBestVideoPreset(
-                defaultVideoPreset = mediaOptimizationConfig.videoCompressionPreset,
+            selectedVideoOptimizationPreset = videoCompressionPresetSelector.selectBestVideoPreset(
+                expectedVideoPreset = mediaOptimizationConfig.videoCompressionPreset,
                 videoSizeEstimations = videoSizeEstimations,
             )
         }
@@ -167,6 +185,7 @@ class DefaultMediaOptimizationSelectorPresenter(
         }
 
         return MediaOptimizationSelectorState(
+            index = index,
             maxUploadSize = maxUploadSize,
             videoSizeEstimations = videoSizeEstimations,
             isImageOptimizationEnabled = selectedImageOptimization.dataOrNull(),
@@ -176,20 +195,4 @@ class DefaultMediaOptimizationSelectorPresenter(
             eventSink = ::handleEvent,
         )
     }
-
-    private fun findBestVideoPreset(
-        defaultVideoPreset: VideoCompressionPreset,
-        videoSizeEstimations: AsyncData<ImmutableList<VideoUploadEstimation>>,
-    ): AsyncData<VideoCompressionPreset> {
-        val estimations = videoSizeEstimations.dataOrNull() ?: return AsyncData.Loading()
-        // This will find the best video preset that can be used to produce a video that can be uploaded
-        val bestEstimation = estimations.find { it.preset.ordinal >= defaultVideoPreset.ordinal && it.canUpload }?.preset
-        return if (bestEstimation != null) {
-            AsyncData.Success(bestEstimation)
-        } else {
-            AsyncData.Failure(
-                IllegalStateException("No suitable video preset found for default preset: $defaultVideoPreset")
-            )
-        }
-    }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorPresenter.kt
index 80cdfd9467..6c97557c37 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorPresenter.kt
@@ -14,7 +14,9 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 fun interface MediaOptimizationSelectorPresenter : Presenter<MediaOptimizationSelectorState> {
     interface Factory {
         fun create(
+            index: Int,
             localMedia: LocalMedia,
+            sendAsFile: Boolean,
         ): MediaOptimizationSelectorPresenter
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorState.kt
index 29e51d39af..bc8bf90d55 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/MediaOptimizationSelectorState.kt
@@ -13,6 +13,8 @@ import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import kotlinx.collections.immutable.ImmutableList
 
 data class MediaOptimizationSelectorState(
+    // Adding an index helps to fix a Compose issue where the state of the wrong item is updated
+    val index: Int,
     val maxUploadSize: AsyncData<Long>,
     val videoSizeEstimations: AsyncData<ImmutableList<VideoUploadEstimation>>,
     val isImageOptimizationEnabled: Boolean?,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelector.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelector.kt
new file mode 100644
index 0000000000..f25da6132a
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelector.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.video
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
+import kotlinx.collections.immutable.ImmutableList
+
+@Inject
+class VideoCompressionPresetSelector {
+    fun selectBestVideoPreset(
+        expectedVideoPreset: VideoCompressionPreset,
+        videoSizeEstimations: AsyncData<ImmutableList<VideoUploadEstimation>>,
+    ): AsyncData<VideoCompressionPreset> {
+        val estimations = videoSizeEstimations.dataOrNull() ?: return AsyncData.Loading()
+        val bestEstimation = estimations.find { it.preset.ordinal >= expectedVideoPreset.ordinal && it.canUpload }?.preset
+        return if (bestEstimation != null) {
+            AsyncData.Success(bestEstimation)
+        } else {
+            AsyncData.Failure(
+                IllegalStateException("No suitable video preset found for expected preset: $expectedVideoPreset")
+            )
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoMetadataExtractor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoMetadataExtractor.kt
index a6945b5ebe..b0ff50dc72 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoMetadataExtractor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/video/VideoMetadataExtractor.kt
@@ -30,7 +30,6 @@ interface VideoMetadataExtractor : AutoCloseable {
     }
 }
 
-@ContributesBinding(AppScope::class)
 @AssistedInject
 class DefaultVideoMetadataExtractor(
     @ApplicationContext private val context: Context,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
index 47d1947766..be53de5f66 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
@@ -11,6 +11,7 @@ package io.element.android.features.messages.impl.crypto.identity
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.ui.room.IdentityRoomMember
@@ -32,7 +33,7 @@ class IdentityChangeStateProvider : PreviewParameterProvider<IdentityChangeState
             anIdentityChangeState(
                 roomMemberIdentityStateChanges = listOf(
                     aRoomMemberIdentityStateChange(
-                        identityRoomMember = anIdentityRoomMember(displayNameOrDefault = "Alice"),
+                        identityRoomMember = anIdentityRoomMember(displayNameOrDefault = USER_NAME_ALICE),
                         identityState = IdentityState.VerificationViolation,
                     ),
                 ),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt
index b434656f7a..4e9bf9249a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/MessagesViewWithIdentityChangePreview.kt
@@ -35,12 +35,15 @@ internal fun MessagesViewWithIdentityChangePreview(
         onBackClick = {},
         onRoomDetailsClick = {},
         onEventContentClick = { _, _ -> false },
+        onGalleryEventItemClick = { _, _, _ -> false },
         onUserDataClick = {},
         onLinkClick = { _, _ -> },
         onSendLocationClick = {},
         onCreatePollClick = {},
         onJoinCallClick = {},
         onViewAllPinnedMessagesClick = {},
-        knockRequestsBannerView = {}
+        knockRequestsBannerView = {},
+        customReactionBottomSheet = {},
+        onThreadsListClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureStateProvider.kt
index e167ac3221..ee4b749c8f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureStateProvider.kt
@@ -11,6 +11,7 @@ package io.element.android.features.messages.impl.crypto.sendfailure.resolve
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailure
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 
 open class ResolveVerifiedUserSendFailureStateProvider : PreviewParameterProvider<ResolveVerifiedUserSendFailureState> {
     override val values: Sequence<ResolveVerifiedUserSendFailureState>
@@ -37,10 +38,10 @@ fun aResolveVerifiedUserSendFailureState(
     eventSink = eventSink
 )
 
-fun anUnsignedDeviceSendFailure(userDisplayName: String = "Alice") = VerifiedUserSendFailure.UnsignedDevice.FromOther(
+fun anUnsignedDeviceSendFailure(userDisplayName: String = USER_NAME_ALICE) = VerifiedUserSendFailure.UnsignedDevice.FromOther(
     userDisplayName = userDisplayName,
 )
 
-fun aChangedIdentitySendFailure(userDisplayName: String = "Alice") = VerifiedUserSendFailure.ChangedIdentity(
+fun aChangedIdentitySendFailure(userDisplayName: String = USER_NAME_ALICE) = VerifiedUserSendFailure.ChangedIdentity(
     userDisplayName = userDisplayName,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureView.kt
index 98e2bba3be..a430d4621f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureView.kt
@@ -14,7 +14,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -43,7 +44,10 @@ fun ResolveVerifiedUserSendFailureView(
     state: ResolveVerifiedUserSendFailureState,
     modifier: Modifier = Modifier,
 ) {
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+    )
     var showSheet by remember { mutableStateOf(false) }
 
     fun dismiss() {
@@ -75,6 +79,7 @@ fun ResolveVerifiedUserSendFailureView(
                     .navigationBarsPadding(),
                 sheetState = sheetState,
                 onDismissRequest = ::dismiss,
+                scrollable = true,
             ) {
                 IconTitleSubtitleMolecule(
                     modifier = Modifier.padding(24.dp),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
index 1fdb61f484..e7006b5aef 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
@@ -13,8 +13,11 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -32,7 +35,6 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ListItem
-import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
 import io.element.android.libraries.designsystem.theme.components.Text
 
@@ -71,10 +73,12 @@ internal fun AttachmentsBottomSheet(
     if (isVisible) {
         ModalBottomSheet(
             modifier = modifier,
-            sheetState = rememberModalBottomSheetState(
-                skipPartiallyExpanded = true
+            sheetState = rememberBottomSheetState(
+                initialValue = SheetValue.Hidden,
+                enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
             ),
-            onDismissRequest = { isVisible = false }
+            onDismissRequest = { isVisible = false },
+            scrollable = false,
         ) {
             AttachmentSourcePickerMenu(
                 state = state,
@@ -97,30 +101,27 @@ private fun AttachmentSourcePickerMenu(
         modifier = Modifier
             .navigationBarsPadding()
             .imePadding()
+            .verticalScroll(rememberScrollState())
     ) {
         ListItem(
             modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.PickAttachmentSource.PhotoFromCamera) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.TakePhoto())),
-            headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_camera_photo)) },
-            style = ListItemStyle.Primary,
+            content = { Text(stringResource(R.string.screen_room_attachment_source_camera_photo)) },
         )
         ListItem(
             modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.PickAttachmentSource.VideoFromCamera) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.VideoCall())),
-            headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_camera_video)) },
-            style = ListItemStyle.Primary,
+            content = { Text(stringResource(R.string.screen_room_attachment_source_camera_video)) },
         )
         ListItem(
             modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Image())),
-            headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_gallery)) },
-            style = ListItemStyle.Primary,
+            content = { Text(stringResource(R.string.screen_room_attachment_source_gallery)) },
         )
         ListItem(
             modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.PickAttachmentSource.FromFiles) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Attachment())),
-            headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_files)) },
-            style = ListItemStyle.Primary,
+            content = { Text(stringResource(R.string.screen_room_attachment_source_files)) },
         )
         if (state.canShareLocation) {
             ListItem(
@@ -129,8 +130,7 @@ private fun AttachmentSourcePickerMenu(
                     onSendLocationClick()
                 },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.LocationPin())),
-                headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_location)) },
-                style = ListItemStyle.Primary,
+                content = { Text(stringResource(R.string.screen_room_attachment_source_location)) },
             )
         }
         ListItem(
@@ -139,15 +139,13 @@ private fun AttachmentSourcePickerMenu(
                 onCreatePollClick()
             },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Polls())),
-            headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_poll)) },
-            style = ListItemStyle.Primary,
+            content = { Text(stringResource(R.string.screen_room_attachment_source_poll)) },
         )
         if (enableTextFormatting) {
             ListItem(
                 modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.ToggleTextFormatting(enabled = true)) },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.TextFormatting())),
-                headlineContent = { Text(stringResource(R.string.screen_room_attachment_text_formatting)) },
-                style = ListItemStyle.Primary,
+                content = { Text(stringResource(R.string.screen_room_attachment_text_formatting)) },
             )
         }
     }
@@ -155,10 +153,11 @@ private fun AttachmentSourcePickerMenu(
 
 @PreviewsDayNight
 @Composable
-internal fun AttachmentSourcePickerMenuPreview() = ElementPreview {
-    AttachmentSourcePickerMenu(
+internal fun AttachmentsBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
+    AttachmentsBottomSheet(
         state = aMessageComposerState(
             canShareLocation = true,
+            showAttachmentSourcePicker = true,
         ),
         onSendLocationClick = {},
         onCreatePollClick = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
index ae82c60f2a..982ca7dfd7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerEvent.kt
@@ -36,4 +36,5 @@ sealed interface MessageComposerEvent {
     data class SuggestionReceived(val suggestion: Suggestion?) : MessageComposerEvent
     data class InsertSuggestion(val resolvedSuggestion: ResolvedSuggestion) : MessageComposerEvent
     data object SaveDraft : MessageComposerEvent
+    data object ClearSlashError : MessageComposerEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
index ed22a5e2ee..18252ee17d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
@@ -15,6 +15,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
@@ -30,6 +31,7 @@ import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Composer
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.features.location.api.LocationService
 import io.element.android.features.messages.impl.MessagesNavigator
 import io.element.android.features.messages.impl.attachments.Attachment
@@ -39,13 +41,17 @@ import io.element.android.features.messages.impl.messagecomposer.suggestions.Roo
 import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsProcessor
 import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.utils.TextPillificationHelper
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
@@ -54,11 +60,14 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
 import io.element.android.libraries.matrix.api.room.getDirectRoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.use
 import io.element.android.libraries.matrix.api.timeline.TimelineException
+import io.element.android.libraries.matrix.api.timeline.item.event.mediaSources
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+import io.element.android.libraries.matrix.ui.messages.reply.content
+import io.element.android.libraries.matrix.ui.messages.reply.eventId
 import io.element.android.libraries.matrix.ui.messages.reply.map
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
@@ -68,6 +77,9 @@ import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.api.SlashCommandService
+import io.element.android.libraries.slashcommands.api.message
 import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.MarkdownTextEditorState
@@ -104,6 +116,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes.Any as AnyMimeTypes
 class MessageComposerPresenter(
     @Assisted private val navigator: MessagesNavigator,
     @Assisted private val timelineController: TimelineController,
+    @Assisted private val threadRoot: ThreadId?,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
     private val room: JoinedRoom,
     private val mediaPickerProvider: PickerProvider,
@@ -125,12 +138,21 @@ class MessageComposerPresenter(
     private val suggestionsProcessor: SuggestionsProcessor,
     private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
     private val notificationConversationService: NotificationConversationService,
+    private val slashCommandService: SlashCommandService,
+    private val featureFlagService: FeatureFlagService,
+    private val contentScannerService: ContentScannerService,
+    private val contentValidationCache: EventContentValidationCache,
 ) : Presenter<MessageComposerState> {
     @AssistedFactory
     interface Factory {
-        fun create(timelineController: TimelineController, navigator: MessagesNavigator): MessageComposerPresenter
+        fun create(
+            timelineController: TimelineController,
+            navigator: MessagesNavigator,
+            threadRoot: ThreadId?,
+        ): MessageComposerPresenter
     }
 
+    private val isInThread = threadRoot != null
     private val mediaSender = mediaSenderFactory.create(timelineMode = timelineController.mainTimelineMode())
 
     private val cameraPermissionPresenter = permissionsPresenterFactory.create(Manifest.permission.CAMERA)
@@ -164,11 +186,20 @@ class MessageComposerPresenter(
             canShareLocation.value = locationService.isServiceAvailable()
         }
 
+        val isSendGalleryMessagesEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.SendGalleryMessages)
+            .collectAsState(initial = false)
+
         val galleryMediaPicker = mediaPickerProvider.registerGalleryPicker { uri, mimeType ->
             handlePickedMedia(uri, mimeType)
         }
-        val filesPicker = mediaPickerProvider.registerFilePicker(AnyMimeTypes) { uri, mimeType ->
-            handlePickedMedia(uri, mimeType ?: MimeTypes.OctetStream)
+        val galleryMultiMediaPicker = mediaPickerProvider.registerGalleryMultiPicker { uris ->
+            handlePickedMediaList(uris)
+        }
+        val filesPicker = mediaPickerProvider.registerFileMultiPicker(AnyMimeTypes) { uris ->
+            handlePickedMediaList(uris, sendAsFile = true)
+        }
+        val fileSinglePicker = mediaPickerProvider.registerFilePicker(AnyMimeTypes) { uri, mimeType ->
+            handlePickedMedia(uri, mimeType ?: MimeTypes.OctetStream, sendAsFile = true)
         }
         val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker { uri ->
             handlePickedMedia(uri, MimeTypes.Jpeg)
@@ -218,11 +249,12 @@ class MessageComposerPresenter(
             }
         )
 
+        val slashCommandAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
+
         LaunchedEffect(Unit) {
             val draft = draftService.loadDraft(
                 roomId = room.roomId,
-                // TODO support threads in composer
-                threadRoot = null,
+                threadRoot = threadRoot,
                 isVolatile = false
             )
             if (draft != null) {
@@ -246,6 +278,7 @@ class MessageComposerPresenter(
                     sessionCoroutineScope.sendMessage(
                         markdownTextEditorState = markdownTextEditorState,
                         richTextEditorState = richTextEditorState,
+                        slashCommandAction = slashCommandAction,
                     )
                 }
                 is MessageComposerEvent.SendUri -> {
@@ -262,8 +295,7 @@ class MessageComposerPresenter(
                         inReplyToEventId = inReplyToEventId,
                     )
 
-                    // Reset composer since the attachment has been sent
-                    messageComposerContext.composerMode = MessageComposerMode.Normal
+                    resetComposerModeAfterAttaching()
                 }
                 is MessageComposerEvent.SetMode -> {
                     localCoroutineScope.setMode(event.composerMode, markdownTextEditorState, richTextEditorState)
@@ -274,11 +306,19 @@ class MessageComposerPresenter(
                 MessageComposerEvent.DismissAttachmentMenu -> showAttachmentSourcePicker = false
                 MessageComposerEvent.PickAttachmentSource.FromGallery -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
-                    galleryMediaPicker.launch()
+                    if (isSendGalleryMessagesEnabled) {
+                        galleryMultiMediaPicker.launch()
+                    } else {
+                        galleryMediaPicker.launch()
+                    }
                 }
                 MessageComposerEvent.PickAttachmentSource.FromFiles -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
-                    filesPicker.launch()
+                    if (isSendGalleryMessagesEnabled) {
+                        filesPicker.launch()
+                    } else {
+                        fileSinglePicker.launch()
+                    }
                 }
                 MessageComposerEvent.PickAttachmentSource.PhotoFromCamera -> localCoroutineScope.launch {
                     showAttachmentSourcePicker = false
@@ -340,6 +380,9 @@ class MessageComposerPresenter(
                                     val link = permalinkBuilder.permalinkForRoomAlias(suggestion.roomAlias).getOrNull() ?: return@launch
                                     richTextEditorState.insertMentionAtSuggestion(text = text, link = link)
                                 }
+                                is ResolvedSuggestion.Command -> {
+                                    richTextEditorState.replaceSuggestion(suggestion.command.command)
+                                }
                             }
                         } else if (markdownTextEditorState.currentSuggestion != null) {
                             markdownTextEditorState.insertSuggestion(
@@ -354,6 +397,9 @@ class MessageComposerPresenter(
                     val draft = createDraftFromState(markdownTextEditorState, richTextEditorState)
                     sessionCoroutineScope.updateDraft(draft, isVolatile = false)
                 }
+                MessageComposerEvent.ClearSlashError -> {
+                    slashCommandAction.value = AsyncAction.Uninitialized
+                }
             }
         }
 
@@ -385,6 +431,7 @@ class MessageComposerPresenter(
             suggestions = suggestions.toImmutableList(),
             resolveMentionDisplay = resolveMentionDisplay,
             resolveAtRoomMentionDisplay = resolveAtRoomMentionDisplay,
+            slashCommandAction = slashCommandAction.value,
             eventSink = ::handleEvent,
         )
     }
@@ -422,6 +469,7 @@ class MessageComposerPresenter(
                     roomAliasSuggestions = roomAliasSuggestions,
                     currentUserId = currentUserId,
                     canSendRoomMention = ::canSendRoomMention,
+                    isInThread = isInThread,
                 )
                 suggestions.clear()
                 suggestions.addAll(result)
@@ -433,9 +481,69 @@ class MessageComposerPresenter(
     private fun CoroutineScope.sendMessage(
         markdownTextEditorState: MarkdownTextEditorState,
         richTextEditorState: RichTextEditorState,
+        slashCommandAction: MutableState<AsyncAction<Unit>>,
     ) = launch {
         val message = currentComposerMessage(markdownTextEditorState, richTextEditorState, withMentions = true)
         val capturedMode = messageComposerContext.composerMode
+
+        val slashCommand = if (capturedMode is MessageComposerMode.Normal) {
+            slashCommandService.parse(
+                textMessage = message.markdown,
+                formattedMessage = message.html,
+                isInThreadTimeline = isInThread,
+            )
+        } else {
+            SlashCommand.NotACommand
+        }
+
+        when (slashCommand) {
+            is SlashCommand.NotACommand -> Unit
+            is SlashCommand.Error -> {
+                slashCommandAction.value = AsyncAction.Failure(Exception(slashCommand.message()))
+                return@launch
+            }
+            is SlashCommand.SlashCommandNavigation -> {
+                when (slashCommand) {
+                    is SlashCommand.ShowUser -> {
+                        navigator.navigateToMember(slashCommand.userId)
+                    }
+                    SlashCommand.DevTools -> {
+                        navigator.navigateToDeveloperSettings()
+                    }
+                }
+                resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = capturedMode is MessageComposerMode.Edit)
+                return@launch
+            }
+            is SlashCommand.SlashCommandSendMessage -> {
+                timelineController.invokeOnCurrentTimeline {
+                    slashCommandService.proceedSendMessage(slashCommand, this)
+                        .onFailure { cause ->
+                            Timber.e(cause, "Failed to proceed with admin slash command")
+                            slashCommandAction.value = AsyncAction.Failure(cause)
+                        }
+                        .onSuccess {
+                            // Reset composer
+                            resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = capturedMode is MessageComposerMode.Edit)
+                        }
+                }
+                return@launch
+            }
+            is SlashCommand.SlashCommandAdmin -> {
+                slashCommandAction.value = AsyncAction.Loading
+                slashCommandService.proceedAdmin(slashCommand)
+                    .onFailure { cause ->
+                        Timber.e(cause, "Failed to proceed with admin slash command")
+                        slashCommandAction.value = AsyncAction.Failure(cause)
+                    }
+                    .onSuccess {
+                        // Reset composer
+                        resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = capturedMode is MessageComposerMode.Edit)
+                        slashCommandAction.value = AsyncAction.Uninitialized
+                    }
+                return@launch
+            }
+        }
+
         // Reset composer right away
         resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = capturedMode is MessageComposerMode.Edit)
         when (capturedMode) {
@@ -489,7 +597,7 @@ class MessageComposerPresenter(
         notificationConversationService.onSendMessage(
             sessionId = room.sessionId,
             roomId = roomInfo.id,
-            roomName = roomInfo.name ?: roomInfo.id.value,
+            roomName = roomInfo.name,
             roomIsDirect = roomInfo.isDm,
             roomAvatarUrl = roomInfo.avatarUrl ?: roomMembers.getDirectRoomMember(roomInfo = roomInfo, sessionId = room.sessionId)?.avatarUrl,
         )
@@ -523,6 +631,7 @@ class MessageComposerPresenter(
     private fun handlePickedMedia(
         uri: Uri?,
         mimeType: String? = null,
+        sendAsFile: Boolean = false,
     ) {
         uri ?: return
         val localMedia = localMediaFactory.createFromUri(
@@ -531,12 +640,43 @@ class MessageComposerPresenter(
             name = null,
             formattedFileSize = null
         )
-        val mediaAttachment = Attachment.Media(localMedia)
+        val mediaAttachment = Attachment.Media(localMedia, sendAsFile = sendAsFile)
         val inReplyToEventId = (messageComposerContext.composerMode as? MessageComposerMode.Reply)?.eventId
         navigator.navigateToPreviewAttachments(persistentListOf(mediaAttachment), inReplyToEventId)
 
-        // Reset composer since the attachment will be sent in a separate flow
-        messageComposerContext.composerMode = MessageComposerMode.Normal
+        resetComposerModeAfterAttaching()
+    }
+
+    private fun handlePickedMediaList(
+        uris: List<Uri>,
+        sendAsFile: Boolean = false,
+    ) {
+        if (uris.isEmpty()) return
+        if (uris.size == 1) {
+            handlePickedMedia(uris.first(), sendAsFile = sendAsFile)
+            return
+        }
+        val attachments = uris.map { uri ->
+            val localMedia = localMediaFactory.createFromUri(
+                uri = uri,
+                mimeType = null,
+                name = null,
+                formattedFileSize = null,
+            )
+            Attachment.Media(localMedia, sendAsFile = sendAsFile)
+        }.toImmutableList()
+        val inReplyToEventId = (messageComposerContext.composerMode as? MessageComposerMode.Reply)?.eventId
+        navigator.navigateToPreviewAttachments(attachments, inReplyToEventId)
+
+        resetComposerModeAfterAttaching()
+    }
+
+    private fun resetComposerModeAfterAttaching() {
+        // An attachment is sent as its own message, so a Reply/Normal mode is consumed and reset.
+        // An in-progress edit must survive: the typed text still edits the original on the next send.
+        if (!messageComposerContext.composerMode.isEditing) {
+            messageComposerContext.composerMode = MessageComposerMode.Normal
+        }
     }
 
     private suspend fun sendMedia(
@@ -569,8 +709,7 @@ class MessageComposerPresenter(
             roomId = room.roomId,
             draft = draft,
             isVolatile = isVolatile,
-            // TODO support threads in composer
-            threadRoot = null,
+            threadRoot = threadRoot,
         )
     }
 
@@ -716,6 +855,11 @@ class MessageComposerPresenter(
                 setText(newComposerMode.content, markdownTextEditorState, richTextEditorState, requestFocus = true)
             }
             else -> {
+                if (currentComposerMode is MessageComposerMode.Reply) {
+                    val mediaSources = currentComposerMode.replyToDetails.content()?.mediaSources() ?: return@launch
+                    val contentValidationState = contentValidationCache[currentComposerMode.replyToDetails.eventId()]
+                    contentScannerService.scan(mediaSources, contentValidationState)
+                }
                 // When coming from edit, just clear the composer as it'd be weird to reset a volatile draft in this scenario.
                 if (currentComposerMode.isEditing) {
                     setText("", markdownTextEditorState, richTextEditorState)
@@ -733,8 +877,7 @@ class MessageComposerPresenter(
         // Use the volatile draft only when coming from edit mode otherwise.
         val draft = draftService.loadDraft(
             roomId = room.roomId,
-            // TODO support threads in composer
-            threadRoot = null,
+            threadRoot = threadRoot,
             isVolatile = true
         ).takeIf { fromEdit }
         if (draft != null) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt
index 424e8c07b9..f3fdb3d59a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerState.kt
@@ -9,6 +9,7 @@
 package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.runtime.Stable
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.TextEditorState
@@ -26,5 +27,6 @@ data class MessageComposerState(
     val suggestions: ImmutableList<ResolvedSuggestion>,
     val resolveMentionDisplay: (String, String) -> TextDisplay,
     val resolveAtRoomMentionDisplay: () -> TextDisplay,
+    val slashCommandAction: AsyncAction<Unit>,
     val eventSink: (MessageComposerEvent) -> Unit,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
index a06bf30dad..ef9cd7933b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
@@ -9,6 +9,7 @@
 package io.element.android.features.messages.impl.messagecomposer
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.TextEditorState
@@ -32,6 +33,7 @@ fun aMessageComposerState(
     showAttachmentSourcePicker: Boolean = false,
     canShareLocation: Boolean = true,
     suggestions: ImmutableList<ResolvedSuggestion> = persistentListOf(),
+    slashCommandAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (MessageComposerEvent) -> Unit = {},
 ) = MessageComposerState(
     textEditorState = textEditorState,
@@ -43,5 +45,6 @@ fun aMessageComposerState(
     suggestions = suggestions,
     resolveMentionDisplay = { _, _ -> TextDisplay.Plain },
     resolveAtRoomMentionDisplay = { TextDisplay.Plain },
+    slashCommandAction = slashCommandAction,
     eventSink = eventSink,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
index 4b346e0c15..245b23cf8e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
@@ -22,6 +22,7 @@ import io.element.android.features.messages.api.timeline.voicemessages.composer.
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerState
 import io.element.android.features.messages.api.timeline.voicemessages.composer.VoiceMessageComposerStateProvider
 import io.element.android.features.messages.api.timeline.voicemessages.composer.aVoiceMessageComposerState
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.textcomposer.TextComposer
@@ -83,6 +84,7 @@ internal fun MessageComposerView(
 
     val onSendVoiceMessage = {
         voiceMessageState.eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
+        state.eventSink(MessageComposerEvent.CloseSpecialMode)
     }
 
     val onDeleteVoiceMessage = {
@@ -115,6 +117,12 @@ internal fun MessageComposerView(
         onTyping = ::onTyping,
         onSelectRichContent = ::sendUri,
     )
+
+    AsyncActionView(
+        async = state.slashCommandAction,
+        onSuccess = {},
+        onErrorDismiss = { state.eventSink(MessageComposerEvent.ClearSlashError) },
+    )
 }
 
 @PreviewsDayNight
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
index e9e38e1730..a4d8453d10 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
@@ -29,9 +29,11 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
+import io.element.android.libraries.designsystem.components.avatar.AvatarType.Room
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -39,7 +41,10 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.room.getBestName
+import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -63,6 +68,7 @@ fun SuggestionsPickerView(
                     is ResolvedSuggestion.AtRoom -> "@room"
                     is ResolvedSuggestion.Member -> suggestion.roomMember.userId.value
                     is ResolvedSuggestion.Alias -> suggestion.roomId.value
+                    is ResolvedSuggestion.Command -> suggestion.command.command
                 }
             }
         ) {
@@ -91,54 +97,85 @@ private fun SuggestionItemView(
     modifier: Modifier = Modifier,
 ) {
     Row(
-        modifier = modifier.clickable { onSelectSuggestion(suggestion) },
-        horizontalArrangement = Arrangement.spacedBy(16.dp),
+        modifier = modifier
+            .clickable { onSelectSuggestion(suggestion) }
+            .padding(horizontal = 16.dp),
     ) {
         val avatarSize = AvatarSize.Suggestion
         val avatarData = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> roomAvatar?.copy(size = avatarSize) ?: AvatarData(roomId, roomName, null, avatarSize)
             is ResolvedSuggestion.Member -> suggestion.roomMember.getAvatarData(avatarSize)
             is ResolvedSuggestion.Alias -> suggestion.getAvatarData(avatarSize)
+            is ResolvedSuggestion.Command -> null
         }
         val avatarType = when (suggestion) {
-            is ResolvedSuggestion.Alias -> AvatarType.Room()
+            is ResolvedSuggestion.Alias -> Room()
             ResolvedSuggestion.AtRoom,
             is ResolvedSuggestion.Member -> AvatarType.User
+            is ResolvedSuggestion.Command -> null
         }
-        val title = when (suggestion) {
+        val title: String? = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> stringResource(R.string.screen_room_mentions_at_room_title)
-            is ResolvedSuggestion.Member -> suggestion.roomMember.displayName
+            is ResolvedSuggestion.Member -> suggestion.roomMember.getBestName()
             is ResolvedSuggestion.Alias -> suggestion.roomName
+            is ResolvedSuggestion.Command -> suggestion.command.command
+        }
+        val status = when (suggestion) {
+            is ResolvedSuggestion.Member -> suggestion.roomMember.displayedStatus
+            else -> null
+        }
+        val details = when (suggestion) {
+            is ResolvedSuggestion.AtRoom,
+            is ResolvedSuggestion.Member,
+            is ResolvedSuggestion.Alias -> null
+            is ResolvedSuggestion.Command -> suggestion.command.parameters
         }
         val subtitle = when (suggestion) {
             is ResolvedSuggestion.AtRoom -> "@room"
             is ResolvedSuggestion.Member -> suggestion.roomMember.userId.value
             is ResolvedSuggestion.Alias -> suggestion.roomAlias.value
+            is ResolvedSuggestion.Command -> suggestion.command.description
+        }
+        if (avatarData != null && avatarType != null) {
+            Avatar(
+                avatarData = avatarData,
+                avatarType = avatarType,
+                modifier = Modifier.padding(top = 12.dp, bottom = 12.dp, end = 16.dp),
+            )
         }
-        Avatar(
-            avatarData = avatarData,
-            avatarType = avatarType,
-            modifier = Modifier.padding(start = 16.dp, top = 12.dp, bottom = 12.dp),
-        )
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(end = 16.dp, top = 8.dp, bottom = 8.dp)
+                .padding(top = 8.dp, bottom = 8.dp)
                 .align(Alignment.CenterVertically),
         ) {
-            title?.let {
-                Text(
-                    text = it,
-                    style = ElementTheme.typography.fontBodyLgRegular,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(4.dp)
+            ) {
+                title?.let {
+                    DisplayNameWithStatus(
+                        name = title,
+                        status = status,
+                        style = ElementTheme.typography.fontBodyLgRegular,
+                        nameColor = ElementTheme.colors.textPrimary,
+                    )
+                }
+                details?.let {
+                    Text(
+                        text = it,
+                        style = ElementTheme.typography.fontBodyMdRegular,
+                        maxLines = 1,
+                        color = ElementTheme.colors.textSecondary,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
             }
             Text(
                 text = subtitle,
                 style = ElementTheme.typography.fontBodySmRegular,
                 color = ElementTheme.colors.textSecondary,
-                maxLines = 1,
+                maxLines = 2,
                 overflow = TextOverflow.Ellipsis,
             )
         }
@@ -159,6 +196,8 @@ internal fun SuggestionsPickerViewPreview() {
             isIgnored = false,
             role = RoomMember.Role.User,
             membershipChangeReason = null,
+            isServiceMember = false,
+            displayedStatus = null,
         )
         val anAlias = remember { RoomAlias("#room:domain.org") }
         SuggestionsPickerView(
@@ -168,13 +207,27 @@ internal fun SuggestionsPickerViewPreview() {
             suggestions = persistentListOf(
                 ResolvedSuggestion.AtRoom,
                 ResolvedSuggestion.Member(roomMember),
-                ResolvedSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = "Bob")),
+                ResolvedSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = USER_NAME_BOB)),
                 ResolvedSuggestion.Alias(
                     roomAlias = anAlias,
                     roomId = RoomId("!room:matrix.org"),
                     roomName = "My room",
                     roomAvatarUrl = null,
-                )
+                ),
+                ResolvedSuggestion.Command(
+                    command = SlashCommandSuggestion(
+                        command = "/noparam",
+                        parameters = null,
+                        description = "A slash command without parameters",
+                    )
+                ),
+                ResolvedSuggestion.Command(
+                    command = SlashCommandSuggestion(
+                        command = "/withparam",
+                        parameters = "<user-id> [reason]",
+                        description = "A slash command with parameters",
+                    )
+                ),
             ),
             onSelectSuggestion = {}
         )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
index 789a027cf7..010aff5d4b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
@@ -15,6 +15,7 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.roomMembers
+import io.element.android.libraries.slashcommands.api.SlashCommandService
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.Suggestion
 import io.element.android.libraries.textcomposer.model.SuggestionType
@@ -23,7 +24,9 @@ import io.element.android.libraries.textcomposer.model.SuggestionType
  * This class is responsible for processing suggestions when `@`, `/` or `#` are type in the composer.
  */
 @Inject
-class SuggestionsProcessor {
+class SuggestionsProcessor(
+    private val slashCommandService: SlashCommandService,
+) {
     /**
      *  Process the suggestion.
      *  @param suggestion The current suggestion input
@@ -31,6 +34,7 @@ class SuggestionsProcessor {
      *  @param roomAliasSuggestions The available room alias suggestions
      *  @param currentUserId The current user id
      *  @param canSendRoomMention Should return true if the current user can send room mentions
+     *  @param isInThread Whether the composer is in a thread or not, used to filter slash commands suggestions
      *  @return The list of suggestions to display
      */
     suspend fun process(
@@ -39,6 +43,7 @@ class SuggestionsProcessor {
         roomAliasSuggestions: List<RoomAliasSuggestion>,
         currentUserId: UserId,
         canSendRoomMention: suspend () -> Boolean,
+        isInThread: Boolean,
     ): List<ResolvedSuggestion> {
         suggestion ?: return emptyList()
         return when (suggestion.type) {
@@ -69,7 +74,16 @@ class SuggestionsProcessor {
                         )
                     }
             }
-            SuggestionType.Command,
+            SuggestionType.Command -> {
+                // Command suggestions are valid only if this is the beginning of the message
+                if (suggestion.start == 0) {
+                    slashCommandService.getSuggestions(suggestion.text, isInThread).map {
+                        ResolvedSuggestion.Command(it)
+                    }
+                } else {
+                    emptyList()
+                }
+            }
             SuggestionType.Emoji,
             is SuggestionType.Custom -> {
                 // Clear suggestions
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt
index 21b89da5d1..bc80d6b014 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt
@@ -16,10 +16,15 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
@@ -98,7 +103,8 @@ private fun PinnedMessagesBannerRow(
                     onClick(state.currentPinnedMessage.eventId)
                     state.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned)
                 }
-            },
+            }
+            .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()),
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Spacer(modifier = Modifier.width(26.dp))
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvent.kt
index 6ad4fbefe6..73ba08b29d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListEvent.kt
@@ -10,7 +10,9 @@ package io.element.android.features.messages.impl.pinned.list
 
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.libraries.matrix.api.core.ThreadId
 
 sealed interface PinnedMessagesListEvent {
     data class HandleAction(val action: TimelineItemAction, val event: TimelineItem.Event) : PinnedMessagesListEvent
+    data class OpenThread(val threadRootId: ThreadId) : PinnedMessagesListEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNavigator.kt
index a3728cb9f4..9633802f77 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNavigator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNavigator.kt
@@ -9,10 +9,12 @@
 package io.element.android.features.messages.impl.pinned.list
 
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 
 interface PinnedMessagesListNavigator {
     fun viewInTimeline(eventId: EventId)
     fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
     fun forwardEvent(eventId: EventId)
+    fun navigateToThread(threadRootId: ThreadId)
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNode.kt
index 292a77ba6a..06d97f167c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListNode.kt
@@ -31,12 +31,15 @@ import io.element.android.libraries.androidutils.system.openUrlInExternalApp
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.utils.a11y.hasExternalKeyboard
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 
 @ContributesNode(RoomScope::class)
 @AssistedInject
@@ -49,12 +52,14 @@ class PinnedMessagesListNode(
     private val permalinkParser: PermalinkParser,
 ) : Node(buildContext, plugins = plugins), PinnedMessagesListNavigator {
     interface Callback : Plugin {
-        fun handleEventClick(event: TimelineItem.Event)
+        fun handleEventClick(event: TimelineItem.Event, canUseOverlay: Boolean)
+        fun handleGalleryItemClick(event: TimelineItem.Event, galleryItemIndex: Int, canUseOverlay: Boolean)
         fun navigateToRoomMemberDetails(userId: UserId)
         fun viewInTimeline(eventId: EventId)
         fun handlePermalinkClick(data: PermalinkData.RoomLink)
         fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
         fun handleForwardEventClick(eventId: EventId)
+        fun navigateToThread(threadRootId: ThreadId)
     }
 
     private val callback: Callback = callback()
@@ -95,8 +100,13 @@ class PinnedMessagesListNode(
         callback.handleForwardEventClick(eventId)
     }
 
+    override fun navigateToThread(threadRootId: ThreadId) {
+        callback.navigateToThread(threadRootId)
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
+        val canUseOverlay = !isTalkbackActive() && !hasExternalKeyboard()
         CompositionLocalProvider(
             LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories,
         ) {
@@ -107,7 +117,12 @@ class PinnedMessagesListNode(
             PinnedMessagesListView(
                 state = state,
                 onBackClick = ::navigateUp,
-                onEventClick = callback::handleEventClick,
+                onEventClick = {
+                    callback.handleEventClick(it, canUseOverlay)
+                },
+                onGalleryItemClick = { event, index ->
+                    callback.handleGalleryItemClick(event, index, canUseOverlay)
+                },
                 onUserDataClick = { callback.navigateToRoomMemberDetails(it.userId) },
                 onLinkClick = { link -> onLinkClick(context, link.url) },
                 onLinkLongClick = {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
index f884cdac84..6e8974b871 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
@@ -44,7 +44,6 @@ import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -137,6 +136,7 @@ class PinnedMessagesListPresenter(
         fun handleEvent(event: PinnedMessagesListEvent) {
             when (event) {
                 is PinnedMessagesListEvent.HandleAction -> sessionCoroutineScope.handleTimelineAction(event.action, event.event)
+                is PinnedMessagesListEvent.OpenThread -> navigator.navigateToThread(event.threadRootId)
             }
         }
 
@@ -208,7 +208,8 @@ class PinnedMessagesListPresenter(
                     combine(timelineItemsFlow, room.membersStateFlow) { items, membersState ->
                         timelineItemsFactory.replaceWith(
                             timelineItems = items,
-                            roomMembers = membersState.roomMembers().orEmpty()
+                            roomMembers = membersState.roomMembers().orEmpty(),
+                            renderReadReceipts = false,
                         )
                     }.launchIn(this)
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt
index b125bdcf6f..4f69bacd28 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -30,12 +31,12 @@ import io.element.android.features.messages.impl.actionlist.ActionListView
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.link.LinkEvent
 import io.element.android.features.messages.impl.link.LinkView
+import io.element.android.features.messages.impl.timeline.TimelineEvent
 import io.element.android.features.messages.impl.timeline.components.TimelineItemRow
 import io.element.android.features.messages.impl.timeline.components.event.TimelineItemEventContentView
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
-import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.poll.api.pollcontent.PollTitleView
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
@@ -47,6 +48,8 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -59,6 +62,7 @@ fun PinnedMessagesListView(
     state: PinnedMessagesListState,
     onBackClick: () -> Unit,
     onEventClick: (event: TimelineItem.Event) -> Unit,
+    onGalleryItemClick: (event: TimelineItem.Event, index: Int) -> Unit,
     onUserDataClick: (MatrixUser) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
@@ -80,6 +84,7 @@ fun PinnedMessagesListView(
             PinnedMessagesListContent(
                 state = state,
                 onEventClick = onEventClick,
+                onGalleryItemClick = onGalleryItemClick,
                 onUserDataClick = onUserDataClick,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
@@ -88,7 +93,8 @@ fun PinnedMessagesListView(
                     .padding(padding)
                     .consumeWindowInsets(padding),
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     )
 }
 
@@ -110,6 +116,7 @@ private fun PinnedMessagesListTopBar(
 private fun PinnedMessagesListContent(
     state: PinnedMessagesListState,
     onEventClick: (event: TimelineItem.Event) -> Unit,
+    onGalleryItemClick: (event: TimelineItem.Event, index: Int) -> Unit,
     onUserDataClick: (MatrixUser) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
@@ -130,6 +137,7 @@ private fun PinnedMessagesListContent(
                 state = state,
                 displayThreadSummaries = state.displayThreadSummaries,
                 onEventClick = onEventClick,
+                onGalleryItemClick = onGalleryItemClick,
                 onUserDataClick = onUserDataClick,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
@@ -168,6 +176,7 @@ private fun PinnedMessagesListLoaded(
     state: PinnedMessagesListState.Filled,
     displayThreadSummaries: Boolean,
     onEventClick: (event: TimelineItem.Event) -> Unit,
+    onGalleryItemClick: (event: TimelineItem.Event, index: Int) -> Unit,
     onUserDataClick: (MatrixUser) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
@@ -201,11 +210,12 @@ private fun PinnedMessagesListLoaded(
         onEmojiReactionClick = { _, _ -> },
         onVerifiedUserSendFailureClick = {}
     )
+
     LazyColumn(
         modifier = modifier.fillMaxSize(),
         state = rememberLazyListState(),
         reverseLayout = true,
-        contentPadding = PaddingValues(vertical = 8.dp),
+        contentPadding = lazyColumnContentPadding + PaddingValues(vertical = 8.dp),
     ) {
         items(
             items = state.timelineItems,
@@ -216,7 +226,6 @@ private fun PinnedMessagesListLoaded(
                 timelineItem = timelineItem,
                 timelineMode = Timeline.Mode.PinnedEvents,
                 timelineRoomInfo = state.timelineRoomInfo,
-                renderReadReceipts = false,
                 timelineProtectionState = state.timelineProtectionState,
                 isLastOutgoingMessage = false,
                 focusedEventId = null,
@@ -226,6 +235,7 @@ private fun PinnedMessagesListLoaded(
                 },
                 onLinkLongClick = onLinkLongClick,
                 onContentClick = onEventClick,
+                onGalleryItemClick = onGalleryItemClick,
                 onLongClick = ::onMessageLongClick,
                 displayThreadSummaries = displayThreadSummaries,
                 inReplyToClick = {},
@@ -235,12 +245,18 @@ private fun PinnedMessagesListLoaded(
                 onReadReceiptClick = {},
                 onSwipeToReply = {},
                 onJoinCallClick = {},
-                eventSink = {},
+                eventSink = { timelineItemEvent ->
+                    when (timelineItemEvent) {
+                        is TimelineEvent.OpenThread -> state.eventSink(PinnedMessagesListEvent.OpenThread(timelineItemEvent.threadRootEventId))
+                        else -> Unit
+                    }
+                },
                 eventContentView = { event, contentModifier, onContentLayoutChange ->
                     TimelineItemEventContentViewWrapper(
                         event = event,
                         timelineProtectionState = state.timelineProtectionState,
                         onContentClick = { onEventClick(event) },
+                        onGalleryItemClick = { index -> onGalleryItemClick(event, index) },
                         onLongClick = { onMessageLongClick(event) },
                         onLinkClick = { link ->
                             state.linkState.eventSink(LinkEvent.OnLinkClick(link))
@@ -264,6 +280,7 @@ private fun TimelineItemEventContentViewWrapper(
     event: TimelineItem.Event,
     timelineProtectionState: TimelineProtectionState,
     onContentClick: () -> Unit,
+    onGalleryItemClick: (index: Int) -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
     onLongClick: (() -> Unit)?,
@@ -278,9 +295,10 @@ private fun TimelineItemEventContentViewWrapper(
         )
     } else {
         TimelineItemEventContentView(
+            eventId = event.eventId,
             content = event.content,
-            hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
-            onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
+            timelineProtectionState = timelineProtectionState,
+            onGalleryItemClick = onGalleryItemClick,
             onLinkClick = onLinkClick,
             onLinkLongClick = onLinkLongClick,
             eventSink = { },
@@ -300,6 +318,7 @@ internal fun PinnedMessagesListViewPreview(@PreviewParameter(PinnedMessagesListS
             state = state,
             onBackClick = {},
             onEventClick = { },
+            onGalleryItemClick = { _, _ -> },
             onUserDataClick = {},
             onLinkClick = {},
             onLinkLongClick = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
index 23bcbe99bd..b56268eb02 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
@@ -67,7 +67,9 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.alias.matches
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
-import io.element.android.libraries.mediaplayer.api.MediaPlayer
+import io.element.android.libraries.matrix.ui.model.getBestName
+import io.element.android.libraries.ui.utils.a11y.hasExternalKeyboard
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.collections.immutable.ImmutableList
@@ -86,7 +88,6 @@ class ThreadedMessagesNode(
     private val presenterFactory: MessagesPresenter.Factory,
     private val actionListPresenterFactory: ActionListPresenter.Factory,
     private val timelineItemPresenterFactories: TimelineItemPresenterFactories,
-    private val mediaPlayer: MediaPlayer,
     private val permalinkParser: PermalinkParser,
     private val appNavigationStateService: AppNavigationStateService,
     private val roomMemberModerationRenderer: RoomMemberModerationRenderer,
@@ -112,7 +113,7 @@ class ThreadedMessagesNode(
         this.timelineController = timelineController
         return presenterFactory.create(
             navigator = this,
-            composerPresenter = messageComposerPresenterFactory.create(timelineController, this),
+            composerPresenter = messageComposerPresenterFactory.create(timelineController, this, threadRoot = inputs.threadRootEventId),
             timelinePresenter = timelinePresenterFactory.create(timelineController = timelineController, this),
             // TODO add special processor for threaded timeline
             actionListPresenter = actionListPresenterFactory.create(
@@ -124,7 +125,8 @@ class ThreadedMessagesNode(
     }
 
     interface Callback : Plugin {
-        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event): Boolean
+        fun handleEventClick(timelineMode: Timeline.Mode, event: TimelineItem.Event, canUseOverlay: Boolean): Boolean
+        fun handleGalleryItemClick(timelineMode: Timeline.Mode, event: TimelineItem.Event, galleryItemIndex: Int, canUseOverlay: Boolean): Boolean
         fun navigateToPreviewAttachments(attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?)
         fun navigateToRoomMemberDetails(userId: UserId)
         fun handlePermalinkClick(data: PermalinkData)
@@ -134,8 +136,12 @@ class ThreadedMessagesNode(
         fun navigateToSendLocation()
         fun navigateToCreatePoll()
         fun navigateToEditPoll(eventId: EventId)
+        fun navigateToCurrentLiveLocation()
         fun navigateToRoomCall(roomId: RoomId, isAudioCall: Boolean)
         fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?)
+        fun navigateToDeveloperSettings()
+
+        fun navigateToAvatarPreview(username: String, avatarUrl: String)
     }
 
     override fun onBuilt() {
@@ -153,9 +159,6 @@ class ThreadedMessagesNode(
             onStop = {
                 appNavigationStateService.onLeavingThread(id)
             },
-            onDestroy = {
-                mediaPlayer.close()
-            }
         )
     }
 
@@ -233,16 +236,30 @@ class ThreadedMessagesNode(
         callback.handlePermalinkClick(permalinkData)
     }
 
+    override fun navigateToMember(userId: UserId) {
+        callback.navigateToRoomMemberDetails(userId)
+    }
+
     override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
         callback.navigateToThread(threadRootId, focusedEventId)
     }
 
+    override fun navigateToDeveloperSettings() {
+        callback.navigateToDeveloperSettings()
+    }
+
+    override fun navigateToCurrentLiveLocation() {
+        // Shouldn't happen because LiveLocationSharingBanner is not shown in threads.
+        callback.navigateToCurrentLiveLocation()
+    }
+
     override fun close() = navigateUp()
 
     @Composable
     override fun View(modifier: Modifier) {
         val activity = requireNotNull(LocalActivity.current)
         val isDark = ElementTheme.isLightTheme.not()
+        val canUseOverlay = !isTalkbackActive() && !hasExternalKeyboard()
         CompositionLocalProvider(
             LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories,
         ) {
@@ -262,11 +279,25 @@ class ThreadedMessagesNode(
                     onEventContentClick = { isLive, event ->
                         timelineController?.let { controller ->
                             if (isLive) {
-                                callback.handleEventClick(controller.mainTimelineMode(), event)
+                                callback.handleEventClick(controller.mainTimelineMode(), event, canUseOverlay)
                             } else {
                                 val detachedTimelineMode = controller.detachedTimelineMode()
                                 if (detachedTimelineMode != null) {
-                                    callback.handleEventClick(detachedTimelineMode, event)
+                                    callback.handleEventClick(detachedTimelineMode, event, canUseOverlay)
+                                } else {
+                                    false
+                                }
+                            }
+                        } == true
+                    },
+                    onGalleryEventItemClick = { isLive, event, index ->
+                        timelineController?.let { controller ->
+                            if (isLive) {
+                                callback.handleGalleryItemClick(controller.mainTimelineMode(), event, index, canUseOverlay)
+                            } else {
+                                val detachedTimelineMode = controller.detachedTimelineMode()
+                                if (detachedTimelineMode != null) {
+                                    callback.handleGalleryItemClick(detachedTimelineMode, event, index, canUseOverlay)
                                 } else {
                                     false
                                 }
@@ -291,6 +322,8 @@ class ThreadedMessagesNode(
                     onViewAllPinnedMessagesClick = {},
                     modifier = modifier,
                     knockRequestsBannerView = {},
+                    customReactionBottomSheet = {},
+                    onThreadsListClick = {},
                 )
 
                 roomMemberModerationRenderer.Render(
@@ -301,6 +334,11 @@ class ThreadedMessagesNode(
                             else -> state.roomMemberModerationState.eventSink(RoomMemberModerationEvents.ProcessAction(action, target))
                         }
                     },
+                    onAvatarClick = { user ->
+                        user.avatarUrl?.let { url ->
+                            callback.navigateToAvatarPreview(user.getBestName(), url)
+                        }
+                    },
                     modifier = Modifier,
                 )
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadListRowItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadListRowItem.kt
new file mode 100644
index 0000000000..3380a32f61
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadListRowItem.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.threads.list
+
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItem
+
+data class ThreadListRowItem(
+    val item: ThreadListItem,
+    val rootEventText: String?,
+    val latestEventText: String?,
+    val formattedTimestamp: String,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListNode.kt
new file mode 100644
index 0000000000..1954dc60a5
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListNode.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.threads.list
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.core.ThreadId
+
+@ContributesNode(RoomScope::class)
+@AssistedInject
+class ThreadsListNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: ThreadsListPresenter,
+) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun openThread(threadId: ThreadId)
+    }
+
+    private val callback: Callback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        ThreadsListView(
+            state = presenter.present(),
+            modifier = modifier,
+            onThreadClick = callback::openThread,
+            onBackClick = this::navigateUp,
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListPresenter.kt
new file mode 100644
index 0000000000..ba10df46f2
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListPresenter.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.threads.list
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
+import io.element.android.features.messages.impl.timeline.factories.event.TimelineItemContentFactory
+import io.element.android.features.messages.impl.utils.messagesummary.MessageSummaryFormatter
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.dateformatter.api.DateFormatter
+import io.element.android.libraries.dateformatter.api.DateFormatterMode
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.threads.ThreadListPaginationStatus
+import io.element.android.libraries.matrix.ui.model.getAvatarData
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@Inject
+class ThreadsListPresenter(
+    private val room: JoinedRoom,
+    private val timelineItemContentFactory: TimelineItemContentFactory,
+    private val messageSummaryFormatter: MessageSummaryFormatter,
+    private val dateFormatter: DateFormatter,
+) : Presenter<ThreadsListState> {
+    @Composable
+    override fun present(): ThreadsListState {
+        val coroutineScope = rememberCoroutineScope()
+        val threadsListService = room.threadsListService
+
+        val threads by produceState(initialValue = persistentListOf(), key1 = threadsListService) {
+            threadsListService.subscribeToItemUpdates()
+                .onStart { threadsListService.paginate() }
+                .collect { items ->
+                    Timber.d("Received thread list update with ${items.size} items")
+                    value = items.map { item ->
+                        val rootTimelineEvent = item.rootEvent.content?.let {
+                            timelineItemContentFactory.create(
+                                itemContent = it,
+                                eventId = item.rootEvent.eventId,
+                                isEditable = false,
+                                sender = item.rootEvent.senderId,
+                                senderProfile = item.rootEvent.senderProfile,
+                            )
+                        }
+                        val rootEventText = rootTimelineEvent?.let { messageSummaryFormatter.format(it) }
+
+                        val latestTimelineEvent = item.latestEvent?.content?.let {
+                            timelineItemContentFactory.create(
+                                itemContent = it,
+                                eventId = item.latestEvent!!.eventId,
+                                isEditable = false,
+                                sender = item.latestEvent!!.senderId,
+                                senderProfile = item.latestEvent!!.senderProfile,
+                            )
+                        }
+                        val latestEventText = latestTimelineEvent?.let { messageSummaryFormatter.format(it) }
+
+                        val formattedTimestamp = dateFormatter.format(
+                            timestamp = item.latestEvent?.timestamp ?: item.rootEvent.timestamp,
+                            mode = DateFormatterMode.TimeOrDate,
+                            useRelative = true,
+                        )
+
+                        ThreadListRowItem(
+                            item = item,
+                            rootEventText = rootEventText,
+                            latestEventText = latestEventText,
+                            formattedTimestamp = formattedTimestamp,
+                        )
+                    }.toImmutableList()
+                }
+        }
+
+        val paginationStatus by produceState<ThreadListPaginationStatus>(
+            initialValue = ThreadListPaginationStatus.Idle(hasMoreToLoad = true),
+            key1 = threadsListService
+        ) {
+            threadsListService
+                .subscribeToPaginationUpdates()
+                .collect { value = it }
+        }
+
+        val roomInfo by room.roomInfoFlow.collectAsState()
+
+        val heroes by remember {
+            derivedStateOf { roomInfo.heroes.map { it.getAvatarData(AvatarSize.CurrentUserTopBar) }.toImmutableList() }
+        }
+
+        fun handleEvent(event: ThreadsListEvents) {
+            when (event) {
+                ThreadsListEvents.Paginate -> if ((paginationStatus as? ThreadListPaginationStatus.Idle)?.hasMoreToLoad == true) {
+                    coroutineScope.launch {
+                        Timber.d("Paginating thread list: $paginationStatus")
+                        threadsListService.paginate()
+                            .onFailure { Timber.w(it, "Failed to paginate thread list") }
+                    }
+                } else {
+                    Timber.d("Not paginating, current status: $paginationStatus")
+                }
+            }
+        }
+
+        return ThreadsListState(
+            threads = threads,
+            roomId = room.roomId,
+            roomName = roomInfo.name ?: room.roomId.value,
+            roomAvatarUrl = roomInfo.avatarUrl,
+            isRoomTombstoned = roomInfo.successorRoom != null,
+            heroes = heroes,
+            eventSink = ::handleEvent,
+        )
+    }
+}
+
+data class ThreadsListState(
+    val roomId: RoomId,
+    val roomName: String,
+    val roomAvatarUrl: String?,
+    val isRoomTombstoned: Boolean,
+    val heroes: ImmutableList<AvatarData>,
+    val threads: ImmutableList<ThreadListRowItem>,
+    val eventSink: (ThreadsListEvents) -> Unit,
+)
+
+sealed interface ThreadsListEvents {
+    data object Paginate : ThreadsListEvents
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListView.kt
new file mode 100644
index 0000000000..6480dacfcf
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/list/ThreadsListView.kt
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.threads.list
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
+import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.components.avatar.AvatarType
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.core.asEventId
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItem
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItemEvent
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.delay
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ThreadsListView(
+    state: ThreadsListState,
+    onThreadClick: (ThreadId) -> Unit,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            TopAppBar(
+                title = {
+                    val description = stringResource(
+                        CommonStrings.a11y_threads_in_room,
+                        state.roomName,
+                    )
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.clearAndSetSemantics {
+                            heading()
+                            contentDescription = description
+                        },
+                    ) {
+                        Avatar(
+                            avatarData = AvatarData(
+                                id = state.roomId.value,
+                                name = state.roomName,
+                                url = state.roomAvatarUrl,
+                                size = AvatarSize.CurrentUserTopBar,
+                            ),
+                            avatarType = AvatarType.Room(
+                                heroes = state.heroes,
+                                isTombstoned = state.isRoomTombstoned,
+                            ),
+                            contentDescription = null,
+                        )
+                        Column {
+                            Text(
+                                text = stringResource(CommonStrings.common_threads),
+                                style = ElementTheme.typography.fontBodyLgMedium,
+                                color = ElementTheme.colors.textPrimary,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                            Text(
+                                text = state.roomName,
+                                style = ElementTheme.typography.fontBodyXsRegular,
+                                color = ElementTheme.colors.textSecondary,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                            )
+                        }
+                    }
+                },
+                navigationIcon = {
+                    BackButton(onBackClick)
+                },
+                windowInsets = scaffoldScrollableContentInsets,
+            )
+        }
+    ) { padding ->
+        val lazyListState = rememberLazyListState()
+        LazyColumn(
+            modifier = Modifier.fillMaxSize(),
+            contentPadding = padding + lazyColumnContentPadding,
+            state = lazyListState,
+        ) {
+            itemsIndexed(state.threads, key = { _, row -> row.item.threadId }) { index, row ->
+                ThreadListItemRow(
+                    threadItem = row,
+                    onClick = onThreadClick,
+                )
+
+                if (index < state.threads.size - 1) {
+                    HorizontalDivider()
+                }
+            }
+        }
+
+        ScrollHelper(lazyListState) {
+            state.eventSink(ThreadsListEvents.Paginate)
+        }
+    }
+}
+
+@Composable
+private fun ScrollHelper(
+    listState: LazyListState,
+    onPaginate: () -> Unit,
+) {
+    val updatedOnPaginate by rememberUpdatedState(onPaginate)
+    val lastVisibleItemIndex by remember {
+        derivedStateOf { listState.firstVisibleItemIndex + listState.layoutInfo.visibleItemsInfo.size - 1 }
+    }
+    val shouldPaginate by remember {
+        derivedStateOf {
+            val canLoadNewItems = listState.isScrollInProgress || listState.layoutInfo.totalItemsCount == 0
+            canLoadNewItems && lastVisibleItemIndex >= listState.layoutInfo.totalItemsCount - 1
+        }
+    }
+    LaunchedEffect(shouldPaginate, lastVisibleItemIndex) {
+        if (shouldPaginate) {
+            updatedOnPaginate()
+            delay(400L)
+        }
+    }
+}
+
+@Composable
+private fun ThreadListItemRow(
+    threadItem: ThreadListRowItem,
+    onClick: (ThreadId) -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .clickable { onClick(threadItem.item.threadId) }
+            .fillMaxWidth()
+            .padding(top = 4.dp, bottom = 8.dp, start = 16.dp, end = 16.dp),
+    ) {
+        val rootEvent = threadItem.item.rootEvent
+        val senderProfile = rootEvent.senderProfile
+        Avatar(
+            modifier = Modifier.align(Alignment.CenterVertically),
+            avatarData = AvatarData(
+                id = rootEvent.senderId.value,
+                name = senderProfile.getDisambiguatedDisplayName(rootEvent.senderId),
+                url = senderProfile.getAvatarUrl(),
+                size = AvatarSize.ThreadsListItem,
+            ),
+            avatarType = AvatarType.User,
+            contentDescription = null,
+        )
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(modifier = Modifier.fillMaxWidth()) {
+            // TODO actually compute these values based on the thread state (not available yet)
+            val hasMentions = false
+            val hasUnreadNotifications = false
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = senderProfile.getDisambiguatedDisplayName(rootEvent.senderId),
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                    color = ElementTheme.colors.textPrimary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                Text(
+                    text = threadItem.formattedTimestamp,
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = if (hasUnreadNotifications || hasMentions) ElementTheme.colors.textActionAccent else ElementTheme.colors.textSecondary,
+                )
+            }
+
+            Spacer(modifier = Modifier.height(2.dp))
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = threadItem.rootEventText.orEmpty(),
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(7.dp)
+                ) {
+                    if (hasMentions) {
+                        Icon(
+                            modifier = Modifier.size(14.dp),
+                            imageVector = CompoundIcons.Mention(),
+                            contentDescription = null,
+                            tint = ElementTheme.colors.textActionAccent,
+                        )
+                    }
+
+                    UnreadIndicatorAtom(
+                        size = 14.dp,
+                        isVisible = hasUnreadNotifications,
+                    )
+                }
+            }
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    text = "${threadItem.item.numberOfReplies}",
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                Spacer(modifier = Modifier.width(4.dp))
+
+                Icon(
+                    modifier = Modifier.size(20.dp),
+                    imageVector = CompoundIcons.ThreadsSolid(),
+                    contentDescription = null,
+                    tint = ElementTheme.colors.iconSecondary
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                threadItem.item.latestEvent?.let { latestEvent ->
+                    Avatar(
+                        avatarData = AvatarData(
+                            id = latestEvent.senderId.value,
+                            name = latestEvent.senderProfile.getDisambiguatedDisplayName(latestEvent.senderId),
+                            url = latestEvent.senderProfile.getAvatarUrl(),
+                            size = AvatarSize.TimelineThreadLatestEventSender,
+                        ),
+                        avatarType = AvatarType.User,
+                        contentDescription = null,
+                    )
+
+                    Spacer(modifier = Modifier.width(8.dp))
+
+                    Text(
+                        text = threadItem.latestEventText.orEmpty(),
+                        style = ElementTheme.typography.fontBodySmRegular,
+                        color = ElementTheme.colors.textSecondary,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ThreadsListViewPreview() {
+    ElementPreview {
+        ThreadsListView(
+            state = ThreadsListState(
+                roomId = RoomId("!room-id:server"),
+                roomName = ROOM_NAME,
+                roomAvatarUrl = null,
+                heroes = persistentListOf(),
+                threads = List(10) { aThreadListRowItem(threadId = ThreadId("\$thread-$it")) }.toImmutableList(),
+                isRoomTombstoned = false,
+                eventSink = {},
+            ),
+            onThreadClick = {},
+            onBackClick = {},
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ThreadListItemRowPreview() {
+    ElementPreview {
+        ThreadListItemRow(
+            threadItem = aThreadListRowItem(),
+            onClick = {},
+        )
+    }
+}
+
+fun aThreadListRowItem(
+    threadId: ThreadId = ThreadId("\$a-thread-id"),
+    rootEvent: ThreadListItemEvent = aThreadListItemEvent(threadId = threadId),
+    latestEvent: ThreadListItemEvent? = aThreadListItemEvent(threadId = threadId),
+    numberOfReplies: Long = 42,
+    rootEventText: String? = "Hello world!",
+    latestEventText: String? = "Hello again!",
+    formattedTimestamp: String = "12:34",
+) = ThreadListRowItem(
+    item = aThreadListItem(
+        threadId = threadId,
+        rootEvent = rootEvent,
+        latestEvent = latestEvent,
+        numberOfReplies = numberOfReplies,
+    ),
+    rootEventText = rootEventText,
+    latestEventText = latestEventText,
+    formattedTimestamp = formattedTimestamp,
+)
+
+fun aThreadListItem(
+    threadId: ThreadId = ThreadId("\$a-thread-id"),
+    rootEvent: ThreadListItemEvent = aThreadListItemEvent(threadId = threadId),
+    latestEvent: ThreadListItemEvent? = aThreadListItemEvent(threadId = threadId),
+    numberOfReplies: Long = 42,
+) = ThreadListItem(
+    rootEvent = rootEvent,
+    latestEvent = latestEvent,
+    numberOfReplies = numberOfReplies,
+)
+
+fun aThreadListItemEvent(
+    threadId: ThreadId = ThreadId("\$a-thread-id"),
+    senderId: UserId = UserId("@a-user-id:server"),
+    senderProfile: ProfileDetails = ProfileDetails.Ready(
+        displayName = USER_NAME_ALICE,
+        displayNameAmbiguous = false,
+        avatarUrl = null,
+        displayedStatus = null,
+    ),
+    isOwn: Boolean = false,
+    content: EventContent = MessageContent(
+        body = "Hello world!",
+        inReplyTo = null,
+        isEdited = false,
+        threadInfo = null,
+        type = TextMessageType("Hello world!", null),
+    ),
+    timestamp: Long = 0L,
+) = ThreadListItemEvent(
+    eventId = threadId.asEventId(),
+    senderId = senderId,
+    senderProfile = senderProfile,
+    isOwn = isOwn,
+    content = content,
+    timestamp = timestamp,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvent.kt
index 74acfe96e3..f51103197d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvent.kt
@@ -13,7 +13,9 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
 import kotlin.time.Duration
 
 sealed interface TimelineEvent {
@@ -25,6 +27,8 @@ sealed interface TimelineEvent {
 
     data object HideShieldDialog : TimelineEvent
 
+    data object MarkAllAsRead : TimelineEvent
+
     /**
      * Events coming from a timeline item.
      */
@@ -57,4 +61,12 @@ sealed interface TimelineEvent {
     data class EditPoll(
         val pollStartId: EventId,
     ) : TimelineItemPollEvent
+
+    data object StopLiveLocationShare : TimelineItemEvent
+
+    data class ValidateMedia(
+        val eventId: EventId,
+        val mediaSources: List<MediaSource>,
+        val validationState: ContentValidationState
+    ) : TimelineItemEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index c64ffd7b0c..da274445fd 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.location.api.live.ActiveLiveLocationShareManager
 import io.element.android.features.messages.impl.MessagesNavigator
 import io.element.android.features.messages.impl.UserEventPermissions
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailureEvent
@@ -32,7 +33,10 @@ import io.element.android.features.messages.impl.timeline.factories.TimelineItem
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactoryConfig
 import io.element.android.features.messages.impl.timeline.model.NewEventState
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemTypingNotificationModel
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.messages.impl.typing.TypingNotificationState
 import io.element.android.features.messages.impl.userEventPermissions
 import io.element.android.features.messages.impl.voicemessages.timeline.RedactedVoiceMessageManager
@@ -48,7 +52,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.asEventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
@@ -63,9 +66,11 @@ import io.element.android.services.analytics.api.finishLongRunningTransaction
 import io.element.android.services.analyticsproviders.api.AnalyticsUserData
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -94,6 +99,9 @@ class TimelinePresenter(
     private val roomCallStatePresenter: Presenter<RoomCallState>,
     private val featureFlagService: FeatureFlagService,
     private val analyticsService: AnalyticsService,
+    private val liveLocationShareManager: ActiveLiveLocationShareManager,
+    private val markAsFullyRead: MarkAsFullyRead,
+    private val timelineProtectionPresenter: Presenter<TimelineProtectionState>,
 ) : Presenter<TimelineState> {
     private val tag = "TimelinePresenter"
 
@@ -132,16 +140,16 @@ class TimelinePresenter(
 
         val prevMostRecentItemId = rememberSaveable { mutableStateOf<UniqueId?>(null) }
 
-        val newEventState = remember { mutableStateOf(NewEventState.None) }
+        val newEventState = remember { mutableStateOf<NewEventState>(NewEventState.None) }
         val messageShieldDialogData: MutableState<MessageShieldData?> = remember { mutableStateOf(null) }
 
+        // Forces [JumpToUnreadState.Hidden] until the next RoomInfo push. Set after a
+        // [TimelineEvent.MarkAllAsRead] await completes so the FAB hides without waiting for
+        // the SDK to push a refreshed fully-read marker; the after-await ordering means any
+        // RoomInfo update racing the mark-as-read call has already landed and can't undo this.
+        val suppressJumpToUnread = remember { mutableStateOf(false) }
+
         val resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailurePresenter.present()
-        val isSendPublicReadReceiptsEnabled by remember {
-            sessionPreferencesStore.isSendPublicReadReceiptsEnabled()
-        }.collectAsState(initial = true)
-        val renderReadReceipts by remember {
-            sessionPreferencesStore.isRenderReadReceiptsEnabled()
-        }.collectAsState(initial = true)
         val isLive by remember {
             timelineController.isLive()
         }.collectAsState(initial = true)
@@ -149,6 +157,11 @@ class TimelinePresenter(
         val displayThreadSummaries by produceState(false) {
             value = featureFlagService.isFeatureEnabled(FeatureFlags.Threads)
         }
+        val displayJumpToUnread by produceState(false) {
+            value = featureFlagService.isFeatureEnabled(FeatureFlags.JumpToUnread)
+        }
+
+        val timelineProtectionState = timelineProtectionPresenter.present()
 
         fun handleEvent(event: TimelineEvent) {
             when (event) {
@@ -167,12 +180,15 @@ class TimelinePresenter(
                             newEventState.value = NewEventState.None
                         }
                         Timber.tag(tag).d("## sendReadReceiptIfNeeded firstVisibleIndex: ${event.firstIndex}")
-                        sessionCoroutineScope.sendReadReceiptIfNeeded(
-                            firstVisibleIndex = event.firstIndex,
-                            timelineItems = timelineItems,
-                            lastReadReceiptId = lastReadReceiptId,
-                            readReceiptType = if (isSendPublicReadReceiptsEnabled) ReceiptType.READ else ReceiptType.READ_PRIVATE,
-                        )
+                        sessionCoroutineScope.launch {
+                            val sendPublicReadReceipts = sessionPreferencesStore.isSendPublicReadReceiptsEnabled().first()
+                            sendReadReceiptIfNeeded(
+                                firstVisibleIndex = event.firstIndex,
+                                timelineItems = timelineItems,
+                                lastReadReceiptId = lastReadReceiptId,
+                                readReceiptType = if (sendPublicReadReceipts) ReceiptType.READ else ReceiptType.READ_PRIVATE,
+                            )
+                        }
                     } else {
                         newEventState.value = NewEventState.None
                     }
@@ -199,6 +215,9 @@ class TimelinePresenter(
                 is TimelineEvent.EditPoll -> {
                     navigator.navigateToEditPoll(event.pollStartId)
                 }
+                is TimelineEvent.StopLiveLocationShare -> sessionCoroutineScope.launch {
+                    liveLocationShareManager.stopShare(room.roomId)
+                }
                 is TimelineEvent.FocusOnEvent -> sessionCoroutineScope.launch {
                     focusRequestState.value = FocusRequestState.Requested(event.eventId, event.debounce)
                     delay(event.debounce)
@@ -218,6 +237,14 @@ class TimelinePresenter(
                     timelineController.focusOnLive()
                 }
                 TimelineEvent.HideShieldDialog -> messageShieldDialogData.value = null
+                TimelineEvent.MarkAllAsRead -> sessionCoroutineScope.launch {
+                    val latestEventId = room.liveTimeline.getLatestEventId().getOrElse {
+                        Timber.tag(tag).w(it, "Failed to get latest event id to mark as fully read")
+                        null
+                    } ?: return@launch
+                    markAsFullyRead(room.roomId, latestEventId)
+                    suppressJumpToUnread.value = true
+                }
                 is TimelineEvent.ShowShieldDialog -> messageShieldDialogData.value = event.messageShieldData
                 is TimelineEvent.ComputeVerifiedUserSendFailure -> {
                     resolveVerifiedUserSendFailureState.eventSink(ResolveVerifiedUserSendFailureEvent.ComputeForMessage(event.event))
@@ -233,6 +260,9 @@ class TimelinePresenter(
                         focusedEventId = event.focusedEvent,
                     )
                 }
+                is TimelineEvent.ValidateMedia -> {
+                    timelineProtectionState.eventSink(TimelineProtectionEvent.ValidateContent(event.mediaSources, event.validationState))
+                }
             }
         }
 
@@ -240,7 +270,7 @@ class TimelinePresenter(
             timelineItemsFactory.timelineItems
                 .onEach { newTimelineItems ->
                     timelineItemIndexer.process(newTimelineItems)
-                    timelineItems = newTimelineItems
+                    timelineItems = newTimelineItems.toImmutableList()
 
                     analyticsService.run {
                         finishLongRunningTransaction(DisplayFirstTimelineItems)
@@ -249,13 +279,18 @@ class TimelinePresenter(
                 }
                 .launchIn(this)
 
-            combine(timelineController.timelineItems(), room.membersStateFlow) { items, membersState ->
+            combine(
+                timelineController.timelineItems(),
+                room.membersStateFlow,
+                sessionPreferencesStore.isRenderReadReceiptsEnabled(),
+            ) { items, membersState, renderReadReceipts ->
                 val parent = analyticsService.getLongRunningTransaction(DisplayFirstTimelineItems)
                 val transaction = parent?.startChild("timelineItemsFactory.replaceWith", "Processing timeline items")
                 transaction?.putExtraData(AnalyticsUserData.TIMELINE_ITEM_COUNT, items.count().toString())
                 timelineItemsFactory.replaceWith(
                     timelineItems = items,
-                    roomMembers = membersState.roomMembers().orEmpty()
+                    roomMembers = membersState.roomMembers().orEmpty(),
+                    renderReadReceipts = renderReadReceipts,
                 )
                 transaction?.finish()
                 items
@@ -269,7 +304,67 @@ class TimelinePresenter(
             computeNewItemState(timelineItems, prevMostRecentItemId, newEventState)
         }
 
-        LaunchedEffect(timelineItems.size, focusRequestState.value) {
+        // Keyed on the full [timelineItems] reference (not just .size) so we re-scan when the
+        // read marker advances in place — the SDK swaps the marker virtual item to a new position
+        // without changing the list length, e.g. when [markRoomAsFullyRead] is sent while at the
+        // bottom of the room.
+        //
+        // The state has three shapes:
+        //  - InWindow: the SDK has materialised a virtual ReadMarker item in the loaded window;
+        //    tapping the FAB smoothly scrolls to its index.
+        //  - OutOfWindow: the marker event is older than the loaded window, so the SDK gives us
+        //    only the event id via RoomInfo.fullyReadEventId; tapping triggers a focused-event
+        //    load via the existing TimelineEvent.FocusOnEvent path.
+        //  - Hidden: feature flag off, no marker, caught-up (marker loaded but no virtual item),
+        //    or initial load (no items yet).
+        val jumpToUnread = remember { mutableStateOf<JumpToUnreadState>(JumpToUnreadState.Hidden) }
+        // The SDK is authoritative again once it pushes a new fully-read marker, so drop the
+        // post-mark-as-read suppression and let the recompute below pick up the new value.
+        LaunchedEffect(roomInfo.fullyReadEventId) {
+            suppressJumpToUnread.value = false
+        }
+        LaunchedEffect(
+            timelineItems.map { it.identifier() },
+            displayJumpToUnread,
+            roomInfo.fullyReadEventId,
+            roomInfo.numUnreadMessages,
+            suppressJumpToUnread.value,
+        ) {
+            if (!displayJumpToUnread || suppressJumpToUnread.value) {
+                jumpToUnread.value = JumpToUnreadState.Hidden
+                return@LaunchedEffect
+            }
+            val items = timelineItems
+            val fullyReadEventId = roomInfo.fullyReadEventId
+            val hasUnreadMessages = roomInfo.numUnreadMessages > 0
+            val markerIndex = withContext(dispatchers.computation) {
+                items.indexOfFirst {
+                    (it as? TimelineItem.Virtual)?.model is TimelineItemReadMarkerModel
+                }
+            }
+            jumpToUnread.value = when {
+                markerIndex >= 0 -> JumpToUnreadState.InWindow(markerIndex)
+                // Out-of-window only when there is genuinely unread *displayable* content
+                // (numUnreadMessages counts "interesting" messages, never state/hidden events) AND
+                // the marker event isn't merely an in-window item we don't render. isKnown is the
+                // cheap display-index check; isEventLoaded falls back to the SDK to tell
+                // "in window but not displayed" apart from "genuinely out of window".
+                fullyReadEventId != null &&
+                    hasUnreadMessages &&
+                    items.isNotEmpty() &&
+                    !timelineItemIndexer.isKnown(fullyReadEventId) &&
+                    !timelineController.activeTimelineFlow().value.isEventLoaded(fullyReadEventId) ->
+                    JumpToUnreadState.OutOfWindow(fullyReadEventId)
+                else -> JumpToUnreadState.Hidden
+            }
+        }
+
+        // Keyed on the full [timelineItems] reference (not just .size) so we re-resolve the index
+        // when a focused timeline loads with the same item count as the window it replaced — e.g.
+        // jumping to an out-of-window read marker in a busy room, where both windows fill to the
+        // same page size. With .size as the key the effect wouldn't re-run, the focused event's
+        // index would stay unresolved, and the scroll would never fire until a second tap.
+        LaunchedEffect(timelineItems.map { it.identifier() }, focusRequestState.value) {
             val currentFocusRequestState = focusRequestState.value
             if (currentFocusRequestState is FocusRequestState.Success && !currentFocusRequestState.rendered) {
                 val eventId = currentFocusRequestState.eventId
@@ -310,13 +405,14 @@ class TimelinePresenter(
             timelineItems = timelineItems,
             timelineMode = timelineMode,
             timelineRoomInfo = timelineRoomInfo,
-            renderReadReceipts = renderReadReceipts,
             newEventState = newEventState.value,
             isLive = isLive,
             focusRequestState = focusRequestState.value,
             messageShieldDialogData = messageShieldDialogData.value,
             resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
             displayThreadSummaries = displayThreadSummaries,
+            displayJumpToUnread = displayJumpToUnread,
+            jumpToUnread = jumpToUnread.value,
             eventSink = ::handleEvent,
         )
     }
@@ -378,7 +474,7 @@ class TimelinePresenter(
     private suspend fun computeNewItemState(
         timelineItems: ImmutableList<TimelineItem>,
         prevMostRecentItemId: MutableState<UniqueId?>,
-        newEventState: MutableState<NewEventState>
+        newEventState: MutableState<NewEventState>,
     ) = withContext(dispatchers.computation) {
         // FromMe is prioritized over FromOther, so skip if we already have a FromMe
         if (newEventState.value == NewEventState.FromMe) {
@@ -397,12 +493,7 @@ class TimelinePresenter(
 
         if (hasNewEvent) {
             // Scroll to bottom if the new event is from me, even if sent from another device
-            val fromMe = newMostRecentItem.isMine
-            newEventState.value = if (fromMe) {
-                NewEventState.FromMe
-            } else {
-                NewEventState.FromOther
-            }
+            newEventState.value = if (newMostRecentItem.isMine) NewEventState.FromMe else NewEventState.FromOther
         }
         prevMostRecentItemId.value = newMostRecentItemId
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt
index 03f0083856..7836c17563 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineState.kt
@@ -26,7 +26,6 @@ data class TimelineState(
     val timelineItems: ImmutableList<TimelineItem>,
     val timelineRoomInfo: TimelineRoomInfo,
     val timelineMode: Timeline.Mode,
-    val renderReadReceipts: Boolean,
     val newEventState: NewEventState,
     val isLive: Boolean,
     val focusRequestState: FocusRequestState,
@@ -34,6 +33,8 @@ data class TimelineState(
     val messageShieldDialogData: MessageShieldData?,
     val resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState,
     val displayThreadSummaries: Boolean,
+    val displayJumpToUnread: Boolean,
+    val jumpToUnread: JumpToUnreadState,
     val eventSink: (TimelineEvent) -> Unit,
 ) {
     private val lastTimelineEvent = timelineItems.firstOrNull { it is TimelineItem.Event } as? TimelineItem.Event
@@ -82,3 +83,18 @@ data class TimelineRoomInfo(
     val typingNotificationState: TypingNotificationState,
     val predecessorRoom: PredecessorRoom?,
 )
+
+/**
+ * Whether the jump-to-unread FAB should be shown, and if so, how tapping it
+ * should bring the user to the read marker.
+ */
+@Immutable
+sealed interface JumpToUnreadState {
+    data object Hidden : JumpToUnreadState
+
+    /** The read marker is materialised at [index] in the loaded timeline — smooth scroll to it. */
+    data class InWindow(val index: Int) : JumpToUnreadState
+
+    /** The read marker event is older than the loaded window — load it via focused-event navigation. */
+    data class OutOfWindow(val eventId: EventId) : JumpToUnreadState
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
index 184acf1386..61b5c690a4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
@@ -21,6 +21,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemRead
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.anAggregatedReaction
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
 import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
@@ -29,6 +30,8 @@ import io.element.android.features.messages.impl.typing.aTypingNotificationState
 import io.element.android.features.roomcall.api.aStandByCallState
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_SENDER
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UniqueId
@@ -49,13 +52,15 @@ import kotlin.random.Random
 fun aTimelineState(
     timelineItems: ImmutableList<TimelineItem> = persistentListOf(),
     timelineMode: Timeline.Mode = Timeline.Mode.Live,
-    renderReadReceipts: Boolean = false,
     timelineRoomInfo: TimelineRoomInfo = aTimelineRoomInfo(),
     focusedEventIndex: Int = -1,
     isLive: Boolean = true,
     messageShield: MessageShield? = null,
     resolveVerifiedUserSendFailureState: ResolveVerifiedUserSendFailureState = aResolveVerifiedUserSendFailureState(),
     displayThreadSummaries: Boolean = false,
+    displayJumpToUnread: Boolean = false,
+    jumpToUnread: JumpToUnreadState = JumpToUnreadState.Hidden,
+    newEventState: NewEventState = NewEventState.None,
     eventSink: (TimelineEvent) -> Unit = {},
 ): TimelineState {
     val focusedEventId = timelineItems.filterIsInstance<TimelineItem.Event>().getOrNull(focusedEventIndex)?.eventId
@@ -68,13 +73,14 @@ fun aTimelineState(
         timelineItems = timelineItems,
         timelineMode = timelineMode,
         timelineRoomInfo = timelineRoomInfo,
-        renderReadReceipts = renderReadReceipts,
-        newEventState = NewEventState.None,
+        newEventState = newEventState,
         isLive = isLive,
         focusRequestState = focusRequestState,
         messageShieldDialogData = messageShield?.let { MessageShieldData(it) },
         resolveVerifiedUserSendFailureState = resolveVerifiedUserSendFailureState,
         displayThreadSummaries = displayThreadSummaries,
+        displayJumpToUnread = displayJumpToUnread,
+        jumpToUnread = jumpToUnread,
         eventSink = eventSink,
     )
 }
@@ -141,7 +147,7 @@ internal fun aTimelineItemEvent(
     isMine: Boolean = false,
     isEditable: Boolean = false,
     canBeRepliedTo: Boolean = false,
-    senderDisplayName: String = "Sender",
+    senderDisplayName: String = USER_NAME_SENDER,
     displayNameAmbiguous: Boolean = false,
     content: TimelineItemEventContent = aTimelineItemTextContent(),
     groupPosition: TimelineItemGroupPosition = TimelineItemGroupPosition.None,
@@ -158,7 +164,7 @@ internal fun aTimelineItemEvent(
         eventId = eventId,
         transactionId = transactionId,
         senderId = UserId("@senderId:domain"),
-        senderAvatar = AvatarData("@senderId:domain", "sender", size = AvatarSize.TimelineSender),
+        senderAvatar = AvatarData("@senderId:domain", USER_NAME_SENDER, size = AvatarSize.TimelineSender),
         content = content,
         reactionsState = timelineItemReactions,
         readReceiptState = readReceiptState,
@@ -250,8 +256,25 @@ internal fun aGroupedEvents(
     )
 }
 
+internal fun aRedactedMessagesGroupedEvents(
+    id: UniqueId = UniqueId("redacted_group"),
+    count: Int = 4,
+): TimelineItem.GroupedEvents {
+    val events = (0 until count).map { index ->
+        aTimelineItemEvent(
+            eventId = EventId("\$redacted_$index"),
+            content = TimelineItemRedactedContent,
+        )
+    }
+    return TimelineItem.GroupedEvents(
+        id = id,
+        events = events.toImmutableList(),
+        aggregatedReadReceipts = persistentListOf(),
+    )
+}
+
 internal fun aTimelineRoomInfo(
-    name: String = "Room name",
+    name: String = ROOM_NAME,
     isDm: Boolean = false,
     userHasPermissionToSendMessage: Boolean = true,
     pinnedEventIds: List<EventId> = emptyList(),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
index 08a7191f3f..78c067eed1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
@@ -10,22 +10,40 @@ package io.element.android.features.messages.impl.timeline
 
 import android.view.HapticFeedbackConstants
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
 import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -39,18 +57,31 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntRect
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Popup
+import androidx.compose.ui.window.PopupPositionProvider
+import androidx.compose.ui.window.PopupProperties
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailureView
+import io.element.android.features.messages.impl.timeline.components.FloatingDateBadgeOverlay
 import io.element.android.features.messages.impl.timeline.components.TimelineItemRow
 import io.element.android.features.messages.impl.timeline.components.toText
 import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories
@@ -63,25 +94,29 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState
 import io.element.android.libraries.androidutils.system.copyToClipboard
+import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.components.dialogs.AlertDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.FloatingActionButton
+import io.element.android.libraries.designsystem.text.roundToPx
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.animateScrollToItemCenter
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.testtags.TestTag
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
 import io.element.android.wysiwyg.link.Link
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transform
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -94,6 +129,7 @@ fun TimelineView(
     onUserDataClick: (MatrixUser) -> Unit,
     onLinkClick: (Link) -> Unit,
     onContentClick: (TimelineItem.Event) -> Unit,
+    onGalleryItemClick: ((TimelineItem.Event, Int) -> Unit),
     onMessageLongClick: (TimelineItem.Event) -> Unit,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
     onReactionClick: (emoji: String, TimelineItem.Event) -> Unit,
@@ -104,7 +140,9 @@ fun TimelineView(
     modifier: Modifier = Modifier,
     lazyListState: LazyListState = rememberLazyListState(),
     forceJumpToBottomVisibility: Boolean = false,
+    forceJumpToReadMarkerVisibility: Boolean = false,
     nestedScrollConnection: NestedScrollConnection = rememberNestedScrollInteropConnection(),
+    floatingDateTopOffset: Dp = 0.dp,
 ) {
     fun clearFocusRequestState() {
         state.eventSink(TimelineEvent.ClearFocusRequestState)
@@ -122,12 +160,17 @@ fun TimelineView(
         state.eventSink(TimelineEvent.JumpToLive)
     }
 
+    fun onMarkAllAsRead() {
+        state.eventSink(TimelineEvent.MarkAllAsRead)
+    }
+
+    fun onFocusOnEvent(eventId: EventId) {
+        state.eventSink(TimelineEvent.FocusOnEvent(eventId))
+    }
+
     val context = LocalContext.current
     val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
     val view = LocalView.current
-    // Disable reverse layout when TalkBack is enabled to avoid incorrect ordering issues seen in the current Compose UI version
-    val useReverseLayout = !isTalkbackActive()
-
     fun inReplyToClick(eventId: EventId) {
         state.eventSink(TimelineEvent.FocusOnEvent(eventId))
     }
@@ -155,8 +198,8 @@ fun TimelineView(
                     .nestedScroll(nestedScrollConnection)
                     .testTag(TestTags.timeline),
                 state = lazyListState,
-                reverseLayout = useReverseLayout,
-                contentPadding = PaddingValues(top = 64.dp, bottom = 8.dp),
+                reverseLayout = true,
+                contentPadding = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues() + PaddingValues(top = 64.dp, bottom = 8.dp),
             ) {
                 items(
                     items = state.timelineItems,
@@ -168,7 +211,6 @@ fun TimelineView(
                         timelineMode = state.timelineMode,
                         timelineRoomInfo = state.timelineRoomInfo,
                         timelineProtectionState = timelineProtectionState,
-                        renderReadReceipts = state.renderReadReceipts,
                         isLastOutgoingMessage = state.isLastOutgoingMessage(timelineItem.identifier()),
                         focusedEventId = state.focusedEventId,
                         displayThreadSummaries = state.displayThreadSummaries,
@@ -176,6 +218,7 @@ fun TimelineView(
                         onLinkClick = onLinkClick,
                         onLinkLongClick = ::onLinkLongClick,
                         onContentClick = onContentClick,
+                        onGalleryItemClick = onGalleryItemClick,
                         onLongClick = onMessageLongClick,
                         inReplyToClick = ::inReplyToClick,
                         onReactionClick = onReactionClick,
@@ -203,12 +246,24 @@ fun TimelineView(
                 hasAnyEvent = state.hasAnyEvent,
                 lazyListState = lazyListState,
                 forceJumpToBottomVisibility = forceJumpToBottomVisibility,
+                forceJumpToReadMarkerVisibility = forceJumpToReadMarkerVisibility,
                 newEventState = state.newEventState,
                 isLive = state.isLive,
                 focusRequestState = state.focusRequestState,
+                displayJumpToUnread = state.displayJumpToUnread,
+                jumpToUnread = state.jumpToUnread,
                 onScrollFinishAt = ::onScrollFinishAt,
                 onJumpToLive = ::onJumpToLive,
                 onFocusEventRender = ::onFocusEventRender,
+                onMarkAllAsRead = ::onMarkAllAsRead,
+                onFocusOnEvent = ::onFocusOnEvent,
+            )
+
+            FloatingDateBadgeOverlay(
+                lazyListState = lazyListState,
+                timelineItems = state.timelineItems,
+                isLive = state.isLive,
+                topOffset = floatingDateTopOffset,
             )
         }
     }
@@ -250,11 +305,16 @@ private fun TimelinePrefetchingHelper(
             firstVisibleItemIndex + layoutInfo.visibleItemsInfo.size >= layoutInfo.totalItemsCount - 40
         }
 
+        // If we have no timeline items, we need to back paginate to load some messages. This usually happens on all timelines except for live ones.
+        // This automatic pagination was previously done by the SDK, and we received a `Reset` update, but now we need to do it ourselves.
+        val isEmptyTimelineFlow = layoutInfoFlow.map { it.totalItemsCount == 0 }
+
         combine(
             isCloseToStartOfLoadedTimelineFlow.distinctUntilChanged(),
             isScrollingFlow.distinctUntilChanged(),
-        ) { needsPrefetch, isScrolling ->
-            needsPrefetch && isScrolling
+            isEmptyTimelineFlow,
+        ) { needsPrefetch, isScrolling, isEmptyAndNeedsBackPagination ->
+            isEmptyAndNeedsBackPagination || needsPrefetch && isScrolling
         }
             .distinctUntilChanged()
             .collectLatest { needsPrefetch ->
@@ -273,10 +333,15 @@ private fun BoxScope.TimelineScrollHelper(
     newEventState: NewEventState,
     isLive: Boolean,
     forceJumpToBottomVisibility: Boolean,
+    forceJumpToReadMarkerVisibility: Boolean,
     focusRequestState: FocusRequestState,
+    displayJumpToUnread: Boolean,
+    jumpToUnread: JumpToUnreadState,
     onScrollFinishAt: (Int) -> Unit,
     onJumpToLive: () -> Unit,
     onFocusEventRender: () -> Unit,
+    onMarkAllAsRead: () -> Unit,
+    onFocusOnEvent: (EventId) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
     val isScrollFinished by remember { derivedStateOf { !lazyListState.isScrollInProgress } }
@@ -285,6 +350,22 @@ private fun BoxScope.TimelineScrollHelper(
             lazyListState.firstVisibleItemIndex < 3 && isLive
         }
     }
+    val isJumpToUnreadVisible by remember(jumpToUnread, forceJumpToReadMarkerVisibility) {
+        derivedStateOf {
+            if (forceJumpToReadMarkerVisibility) return@derivedStateOf true
+            when (val jtu = jumpToUnread) {
+                JumpToUnreadState.Hidden -> false
+                // Marker is outside the loaded window — we have no on-screen anchor, so just show.
+                is JumpToUnreadState.OutOfWindow -> true
+                // Marker is in the loaded window — hide once it's scrolled into the visible range.
+                is JumpToUnreadState.InWindow -> {
+                    val lastVisibleIndex = lazyListState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: return@derivedStateOf false
+                    jtu.index > lastVisibleIndex
+                }
+            }
+        }
+    }
+    val isJumpToBottomVisible = !canAutoScroll || forceJumpToBottomVisibility || !isLive
     var jumpToLiveHandled by remember { mutableStateOf(true) }
 
     /**
@@ -311,6 +392,16 @@ private fun BoxScope.TimelineScrollHelper(
         }
     }
 
+    fun jumpToReadMarker() {
+        when (val jtu = jumpToUnread) {
+            JumpToUnreadState.Hidden -> Unit
+            is JumpToUnreadState.InWindow -> coroutineScope.launch {
+                lazyListState.animateScrollToItemCenter(jtu.index)
+            }
+            is JumpToUnreadState.OutOfWindow -> onFocusOnEvent(jtu.eventId)
+        }
+    }
+
     LaunchedEffect(jumpToLiveHandled, isLive) {
         if (!jumpToLiveHandled && isLive) {
             lazyListState.scrollToItem(0)
@@ -327,8 +418,11 @@ private fun BoxScope.TimelineScrollHelper(
     }
 
     LaunchedEffect(canAutoScroll, newEventState) {
-        val shouldScrollToBottom = isScrollFinished &&
-            (canAutoScroll && newEventState == NewEventState.FromOther || newEventState == NewEventState.FromMe)
+        val shouldScrollToBottom = isScrollFinished && when (newEventState) {
+            is NewEventState.FromOther -> canAutoScroll
+            NewEventState.FromMe -> true
+            NewEventState.None -> false
+        }
         if (shouldScrollToBottom) {
             scrollToBottom(force = true)
         }
@@ -342,43 +436,145 @@ private fun BoxScope.TimelineScrollHelper(
         }
     }
 
-    JumpToBottomButton(
-        // Use inverse of canAutoScroll otherwise we might briefly see the before the scroll animation is triggered
-        isVisible = !canAutoScroll || forceJumpToBottomVisibility || !isLive,
+    Column(
         modifier = Modifier
             .align(Alignment.BottomEnd)
-            .padding(end = 24.dp, bottom = 12.dp),
-        onClick = { jumpToBottom() },
-    )
+            .padding(end = 24.dp, bottom = 16.dp)
+    ) {
+        JumpToPositionButton(
+            icon = CompoundIcons.ChevronUp(),
+            contentDescription = stringResource(id = CommonStrings.a11y_jump_to_unread_messages),
+            modifier = Modifier.padding(bottom = 12.dp),
+            isVisible = isJumpToUnreadVisible,
+            hasUnread = true,
+            onClick = ::jumpToReadMarker,
+            onMarkAsRead = onMarkAllAsRead,
+            testTag = TestTags.jumpToUnreadButton,
+        )
+        // Reserves space for the jump to bottom button so the jump to unread button above
+        // stays in the same position regardless of whether the jump to bottom button is visible.
+        Box(modifier = Modifier.size(36.dp)) {
+            JumpToPositionButton(
+                icon = CompoundIcons.ChevronDown(),
+                contentDescription = stringResource(id = CommonStrings.a11y_jump_to_bottom),
+                isVisible = isJumpToBottomVisible,
+                hasUnread = displayJumpToUnread && newEventState is NewEventState.FromOther,
+                onClick = ::jumpToBottom,
+                onMarkAsRead = onMarkAllAsRead,
+                testTag = TestTags.jumpToBottomButton,
+                dotAlignment = Alignment.BottomCenter,
+            )
+        }
+    }
 }
 
 @Composable
-private fun JumpToBottomButton(
+private fun JumpToPositionButton(
+    icon: ImageVector,
+    contentDescription: String,
     isVisible: Boolean,
+    hasUnread: Boolean,
     onClick: () -> Unit,
+    onMarkAsRead: () -> Unit,
+    testTag: TestTag,
     modifier: Modifier = Modifier,
+    dotAlignment: Alignment = Alignment.TopCenter,
 ) {
     AnimatedVisibility(
         modifier = modifier,
         visible = isVisible,
-        enter = scaleIn(animationSpec = tween(100)),
-        exit = scaleOut(animationSpec = tween(100)),
+        enter = scaleIn(animationSpec = tween(220), initialScale = 0.8f) + fadeIn(animationSpec = tween(220)),
+        exit = scaleOut(animationSpec = tween(180), targetScale = 0.8f) + fadeOut(animationSpec = tween(180)),
     ) {
-        FloatingActionButton(
-            onClick = onClick,
-            elevation = FloatingActionButtonDefaults.elevation(4.dp, 4.dp, 4.dp, 4.dp),
-            shape = CircleShape,
-            modifier = Modifier.size(36.dp),
-            containerColor = ElementTheme.colors.bgSubtleSecondary,
-            contentColor = ElementTheme.colors.iconSecondary,
-        ) {
-            Icon(
+        var menuExpanded by remember { mutableStateOf(false) }
+        Box {
+            Box(
                 modifier = Modifier
-                    .size(24.dp)
-                    .rotate(90f),
-                imageVector = CompoundIcons.ArrowRight(),
-                contentDescription = stringResource(id = CommonStrings.a11y_jump_to_bottom)
-            )
+                    .size(36.dp)
+                    .background(color = ElementTheme.colors.bgCanvasDefault, shape = CircleShape)
+                    .clip(CircleShape)
+                    .border(1.dp, ElementTheme.colors.borderDisabled, CircleShape)
+                    .combinedClickable(
+                        onClick = onClick,
+                        onLongClick = { menuExpanded = true },
+                        onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                    )
+                    .testTag(testTag),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    modifier = Modifier.size(24.dp),
+                    imageVector = icon,
+                    contentDescription = contentDescription,
+                    tint = ElementTheme.colors.iconSecondary,
+                )
+                val menuTransitionState = remember { MutableTransitionState(false) }
+                    .apply { targetState = menuExpanded }
+                if (menuTransitionState.currentState || menuTransitionState.targetState) {
+                    val gapPx = with(LocalDensity.current) { 8.dp.roundToPx() }
+                    val positionProvider = remember(gapPx) { CenterStartOfAnchorPositionProvider(gapPx) }
+                    Popup(
+                        popupPositionProvider = positionProvider,
+                        onDismissRequest = { menuExpanded = false },
+                        properties = PopupProperties(focusable = true),
+                    ) {
+                        // Anchor the scale to the right-center edge so the menu visually grows
+                        // outward from the FAB it's attached to.
+                        val transformOrigin = TransformOrigin(pivotFractionX = 1f, pivotFractionY = 0.5f)
+                        AnimatedVisibility(
+                            visibleState = menuTransitionState,
+                            enter = scaleIn(
+                                animationSpec = tween(180),
+                                initialScale = 0.9f,
+                                transformOrigin = transformOrigin,
+                            ) + fadeIn(animationSpec = tween(180)),
+                            exit = scaleOut(
+                                animationSpec = tween(140),
+                                targetScale = 0.9f,
+                                transformOrigin = transformOrigin,
+                            ) + fadeOut(animationSpec = tween(140)),
+                        ) {
+                            // Hand-rolled instead of DropdownMenuItem: padding here is tighter
+                            // than DropdownMenuItem's 12.dp default to match the Figma spec.
+                            Row(
+                                modifier = Modifier
+                                    .shadow(elevation = 1.dp, shape = RoundedCornerShape(8.dp))
+                                    .clip(RoundedCornerShape(8.dp))
+                                    .background(ElementTheme.colors.bgCanvasDefaultLevel1)
+                                    .border(1.dp, ElementTheme.colors.borderDisabled, RoundedCornerShape(8.dp))
+                                    .clickable {
+                                        menuExpanded = false
+                                        onMarkAsRead()
+                                    }
+                                    .padding(horizontal = 12.dp, vertical = 12.dp),
+                                verticalAlignment = Alignment.CenterVertically,
+                            ) {
+                                Icon(
+                                    imageVector = CompoundIcons.MarkAsRead(),
+                                    contentDescription = null,
+                                    tint = ElementTheme.colors.iconTertiary,
+                                )
+                                Spacer(modifier = Modifier.width(8.dp))
+                                Text(
+                                    text = stringResource(id = CommonStrings.action_mark_as_read),
+                                    color = ElementTheme.colors.textPrimary,
+                                    style = ElementTheme.typography.fontBodyLgRegular,
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+            val dotYOffset = if (dotAlignment == Alignment.BottomCenter) 4.dp else (-4).dp
+            if (hasUnread) {
+                UnreadIndicatorAtom(
+                    modifier = Modifier
+                        .align(dotAlignment)
+                        .offset { IntOffset(x = 0, y = dotYOffset.roundToPx()) },
+                    color = ElementTheme.colors.iconSuccessPrimary,
+                    border = BorderStroke(2.dp, ElementTheme.colors.bgCanvasDefault),
+                )
+            }
         }
     }
 }
@@ -411,10 +607,93 @@ internal fun TimelineViewPreview(
             onSwipeToReply = {},
             onReactionClick = { _, _ -> },
             onReactionLongClick = { _, _ -> },
+            onJoinCallClick = {},
             onMoreReactionsClick = {},
             onReadReceiptClick = {},
-            onJoinCallClick = {},
+            onGalleryItemClick = { _, _ -> },
             forceJumpToBottomVisibility = true,
         )
     }
 }
+
+// The jump-to-unread FAB's indicator is always rendered when the FAB is visible — in
+// production the FAB only appears when unread content exists above. So `hasUnreadAbove`
+// here only varies the scroll-target state, not the upper indicator's visibility.
+@Composable
+private fun TimelineViewWithReadMarker(
+    hasUnreadAbove: Boolean,
+    hasUnreadBelow: Boolean,
+) {
+    val timelineItems = persistentListOf<TimelineItem>(
+        aTimelineItemEvent(isMine = false),
+        aTimelineItemEvent(isMine = false),
+        aTimelineItemEvent(isMine = true),
+        aTimelineItemEvent(isMine = false),
+        aTimelineItemEvent(isMine = false),
+        aTimelineItemEvent(isMine = false),
+    )
+    CompositionLocalProvider(
+        LocalTimelineItemPresenterFactories provides aFakeTimelineItemPresenterFactories(),
+    ) {
+        TimelineView(
+            state = aTimelineState(
+                timelineItems = timelineItems,
+                displayJumpToUnread = true,
+                // Index points past the loaded items, mirroring the real-world state the FAB
+                // represents: the user has scrolled past the read marker, so it's no longer in
+                // view. The actual scroll target doesn't matter for a static preview.
+                jumpToUnread = if (hasUnreadAbove) JumpToUnreadState.InWindow(timelineItems.size) else JumpToUnreadState.Hidden,
+                newEventState = if (hasUnreadBelow) NewEventState.FromOther else NewEventState.None,
+            ),
+            timelineProtectionState = aTimelineProtectionState(),
+            onUserDataClick = {},
+            onLinkClick = {},
+            onContentClick = {},
+            onGalleryItemClick = { _, _ -> },
+            onMessageLongClick = {},
+            onSwipeToReply = {},
+            onReactionClick = { _, _ -> },
+            onReactionLongClick = { _, _ -> },
+            onMoreReactionsClick = {},
+            onReadReceiptClick = {},
+            forceJumpToBottomVisibility = true,
+            forceJumpToReadMarkerVisibility = true,
+            onJoinCallClick = { },
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineViewWithReadMarkerJumpToUnreadIndicatorOnlyPreview() = ElementPreview {
+    TimelineViewWithReadMarker(hasUnreadAbove = false, hasUnreadBelow = false)
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineViewWithReadMarkerBothIndicatorsPreview() = ElementPreview {
+    TimelineViewWithReadMarker(hasUnreadAbove = true, hasUnreadBelow = true)
+}
+
+/**
+ * Anchors the popup so its right edge sits [gapPx] to the left of the anchor and its vertical
+ * center matches the anchor's. Adapts to localized menu widths and FAB size; coerced to stay
+ * on-screen.
+ */
+private class CenterStartOfAnchorPositionProvider(
+    private val gapPx: Int,
+) : PopupPositionProvider {
+    override fun calculatePosition(
+        anchorBounds: IntRect,
+        windowSize: IntSize,
+        layoutDirection: LayoutDirection,
+        popupContentSize: IntSize,
+    ): IntOffset {
+        val x = anchorBounds.left - popupContentSize.width - gapPx
+        val y = anchorBounds.top + (anchorBounds.height - popupContentSize.height) / 2
+        return IntOffset(
+            x = x.coerceIn(0, (windowSize.width - popupContentSize.width).coerceAtLeast(0)),
+            y = y.coerceIn(0, (windowSize.height - popupContentSize.height).coerceAtLeast(0)),
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt
index 5f9c3d0364..4c80641659 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewMessageShieldPreview.kt
@@ -50,6 +50,7 @@ internal fun TimelineViewMessageShieldPreview() = ElementPreview {
             onMoreReactionsClick = {},
             onReadReceiptClick = {},
             onJoinCallClick = {},
+            onGalleryItemClick = { _, _ -> },
             forceJumpToBottomVisibility = true,
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
index 6be00fc14a..36deec0468 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
@@ -22,7 +22,6 @@ internal fun ATimelineItemEventRow(
     event: TimelineItem.Event,
     timelineMode: Timeline.Mode = Timeline.Mode.Live,
     timelineRoomInfo: TimelineRoomInfo = aTimelineRoomInfo(),
-    renderReadReceipts: Boolean = false,
     isLastOutgoingMessage: Boolean = false,
     timelineProtectionState: TimelineProtectionState = aTimelineProtectionState(),
     displayThreadSummaries: Boolean = false,
@@ -30,11 +29,11 @@ internal fun ATimelineItemEventRow(
     event = event,
     timelineMode = timelineMode,
     timelineRoomInfo = timelineRoomInfo,
-    renderReadReceipts = renderReadReceipts,
     timelineProtectionState = timelineProtectionState,
     isLastOutgoingMessage = isLastOutgoingMessage,
     displayThreadSummaries = displayThreadSummaries,
     onEventClick = {},
+    onGalleryItemClick = {},
     onLongClick = {},
     onLinkClick = {},
     onLinkLongClick = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ActiveCallTimelineItemView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ActiveCallTimelineItemView.kt
new file mode 100644
index 0000000000..9b3702c4d3
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ActiveCallTimelineItemView.kt
@@ -0,0 +1,378 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.aTimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.aTimelineRoomInfo
+import io.element.android.features.messages.impl.timeline.components.receipt.ReadReceiptViewState
+import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView
+import io.element.android.features.messages.impl.timeline.components.receipt.aReadReceiptData
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
+import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
+import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarRow
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.designsystem.components.avatar.AvatarType
+import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_CHARLIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
+import io.element.android.libraries.designsystem.preview.USER_NAME_JOHN_DOE
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ButtonSize
+import io.element.android.libraries.designsystem.utils.CommonDrawables
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.ui.strings.CommonPlurals
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.delay
+import kotlin.time.Duration.Companion.seconds
+
+@Composable
+internal fun ActiveCallTimelineItemView(
+    timelineRoomInfo: TimelineRoomInfo,
+    event: TimelineItem.Event,
+    state: RtcNotificationState.Active,
+    isLastOutgoingMessage: Boolean,
+    onLongClick: (TimelineItem.Event) -> Unit,
+    onReadReceiptsClick: (TimelineItem.Event) -> Unit,
+    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(modifier = modifier) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(IntrinsicSize.Min)
+                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                .border(1.dp, ElementTheme.colors.borderInteractivePrimary, RoundedCornerShape(8.dp))
+                .combinedClickable(
+                    enabled = true,
+                    onClick = {},
+                    onLongClick = { onLongClick(event) },
+                    onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                )
+                .onKeyboardContextMenuAction { onLongClick(event) }
+                .padding(start = 12.dp, end = 12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                modifier = Modifier
+                    .padding(top = 12.dp, bottom = 12.dp)
+                    .size(40.dp)
+                    .background(ElementTheme.colors.bgSubtleSecondary, RoundedCornerShape(8.dp))
+                    .padding(10.dp),
+                imageVector = if (state.callIntent == CallIntent.AUDIO) CompoundIcons.VoiceCallSolid() else CompoundIcons.VideoCallSolid(),
+                contentDescription = null,
+                tint = ElementTheme.colors.iconPrimary,
+            )
+
+            if (timelineRoomInfo.isDm) {
+                DirectMessageCallBody(state, Modifier.weight(1f))
+            } else {
+                GroupCallBody(
+                    event,
+                    state,
+                    Modifier
+                        .weight(1f)
+                        .padding(top = 12.dp, bottom = 12.dp)
+                )
+            }
+
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.padding(top = 12.dp, bottom = 12.dp)
+            ) {
+                if (!state.isJoined) {
+                    Button(
+                        text = stringResource(CommonStrings.action_join),
+                        size = ButtonSize.Small,
+                        onClick = { onJoinCallClick(state.callIntent == CallIntent.AUDIO) }
+                    )
+                }
+                if (state.callStartTsMillis != null) {
+                    CallDurationText(
+                        state.callStartTsMillis,
+                    )
+                }
+            }
+        }
+
+        TimelineItemReadReceiptView(
+            state = ReadReceiptViewState(
+                sendState = event.localSendState,
+                isLastOutgoingMessage = isLastOutgoingMessage,
+                receipts = event.readReceiptState.receipts,
+            ),
+            onReadReceiptsClick = { onReadReceiptsClick(event) },
+            modifier = Modifier.padding(top = 4.dp),
+        )
+    }
+}
+
+@Composable
+private fun DirectMessageCallBody(state: RtcNotificationState.Active, modifier: Modifier = Modifier) {
+    Row(
+        verticalAlignment = Alignment.Top,
+        modifier = modifier
+    ) {
+        if (state.joinedMembers.size == 1) {
+            val caller = state.joinedMembers.first()
+            Avatar(
+                avatarData = AvatarData(
+                    id = caller.userId.value,
+                    name = caller.displayName,
+                    url = caller.avatarUrl,
+                    size = AvatarSize.ActiveCallItem,
+                ),
+                avatarType = AvatarType.User
+            )
+            Text(
+                modifier = Modifier.padding(start = 6.dp),
+                text = stringResource(CommonStrings.common_user_started_a_call, caller.displayName ?: caller.userId),
+                style = ElementTheme.typography.fontBodyMdMedium,
+                color = ElementTheme.colors.textPrimary,
+            )
+        } else {
+            AvatarRow(
+                avatarDataList = state.joinedMembers
+                    .map { user ->
+                        AvatarData(
+                            id = user.userId.value,
+                            name = user.displayName,
+                            url = user.avatarUrl,
+                            size = AvatarSize.ActiveCallItem
+                        )
+                    }
+                    .toImmutableList(),
+                avatarType = AvatarType.User,
+                overlapRatio = 0.5f,
+                lastOnTop = true,
+            )
+            Text(
+                modifier = Modifier.padding(start = 6.dp),
+                text = stringResource(CommonStrings.common_call_in_progress),
+                style = ElementTheme.typography.fontBodyMdMedium,
+                color = ElementTheme.colors.textPrimary,
+            )
+        }
+    }
+}
+
+@Composable
+private fun GroupCallBody(event: TimelineItem.Event, state: RtcNotificationState.Active, modifier: Modifier = Modifier) {
+    Column(modifier = modifier) {
+        Text(
+            text = stringResource(CommonStrings.common_group_call_in_progress),
+            style = ElementTheme.typography.fontBodyMdMedium,
+            color = ElementTheme.colors.textPrimary,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            if (state.joinedMembers.size == 1) {
+                val caller = state.joinedMembers.first()
+                Avatar(
+                    avatarData = AvatarData(
+                        id = caller.userId.value,
+                        name = caller.displayName,
+                        url = caller.avatarUrl,
+                        size = AvatarSize.ActiveCallItem,
+                    ),
+                    avatarType = AvatarType.User
+                )
+                // Only show started a call if the last remaining user in the call
+                // is really the one who started the call
+                if (caller.userId == event.senderId) {
+                    Text(
+                        modifier = Modifier.padding(start = 6.dp),
+                        text = stringResource(CommonStrings.common_user_started_a_call, caller.displayName ?: caller.userId),
+                        style = ElementTheme.typography.fontBodySmRegular,
+                        color = ElementTheme.colors.textSecondary,
+                    )
+                }
+            } else {
+                val displayMembers = state.joinedMembers.take(3)
+                AvatarRow(
+                    avatarDataList = displayMembers
+                        .map { user ->
+                            AvatarData(
+                                id = user.userId.value,
+                                name = user.displayName,
+                                url = user.avatarUrl,
+                                size = AvatarSize.ActiveCallItem
+                            )
+                        }
+                        .toImmutableList(),
+                    avatarType = AvatarType.User,
+                    overlapRatio = 0.5f,
+                    lastOnTop = true,
+                )
+                Text(
+                    text = pluralStringResource(
+                        CommonPlurals.screen_timeline_active_call_joined_count,
+                        count = state.joinedMembers.size,
+                        state.joinedMembers.size
+                    ),
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun CallDurationText(
+    startTsMillis: Long,
+    modifier: Modifier = Modifier,
+) {
+    fun formatElapsed(startTsMillis: Long): String =
+        (System.currentTimeMillis() - startTsMillis).coerceAtLeast(0).toHumanReadableDuration()
+
+    val duration by produceState(
+        initialValue = formatElapsed(startTsMillis),
+        startTsMillis,
+    ) {
+        while (true) {
+            delay(1.seconds)
+            value = formatElapsed(startTsMillis)
+        }
+    }
+    Text(
+        modifier = modifier,
+        text = "($duration)",
+        style = ElementTheme.typography.fontBodyXsRegular,
+        color = ElementTheme.colors.textSecondary,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+    )
+}
+
+@PreviewsDayNight
+@PreviewWithLargeHeight
+@Composable
+internal fun ActiveCallTimelineItemViewPreview() = ElementPreview(
+    drawableFallbackForImages = CommonDrawables.sample_avatar
+) {
+    val readReceiptState = mutableListOf(
+        aTimelineItemReadReceipts(
+            receipts = List(3) { aReadReceiptData(it) },
+        )
+    )
+    Column(modifier = Modifier.padding(bottom = 16.dp)) {
+        listOf(CallIntent.AUDIO, CallIntent.VIDEO).forEach { callIntent ->
+            listOf(
+                RtcNotificationState.Active(
+                    listOf(aMatrixUser(displayName = USER_NAME_ALICE, avatarUrl = "anUrl")),
+                    isJoined = true,
+                    callStartTsMillis = System.currentTimeMillis() - 60_000,
+                    callIntent = callIntent
+                ) to true,
+                RtcNotificationState.Active(
+                    listOf(
+                        aMatrixUser(displayName = USER_NAME_ALICE, avatarUrl = "anUrl"),
+                        aMatrixUser(displayName = USER_NAME_BOB)
+                    ),
+                    isJoined = true,
+                    callStartTsMillis = System.currentTimeMillis() - 60_000,
+                    callIntent = callIntent
+                ) to true,
+                RtcNotificationState.Active(
+                    listOf(
+                        aMatrixUser(displayName = USER_NAME_ALICE),
+                        aMatrixUser(displayName = USER_NAME_BOB, avatarUrl = "anUrlB"),
+                        aMatrixUser(displayName = USER_NAME_CAROL),
+                        aMatrixUser(displayName = USER_NAME_DAVID),
+                        aMatrixUser(displayName = USER_NAME_CHARLIE),
+                        aMatrixUser(displayName = USER_NAME_JOHN_DOE, avatarUrl = "anUrlC"),
+                    ),
+                    isJoined = false,
+                    callStartTsMillis = System.currentTimeMillis(),
+                    callIntent = callIntent
+                ) to false,
+                // Group call only one member still in call, but it is not the creator
+                RtcNotificationState.Active(
+                    listOf(
+                        aMatrixUser(displayName = USER_NAME_ALICE, avatarUrl = "aliceURl"),
+                    ),
+                    isJoined = true,
+                    callStartTsMillis = System.currentTimeMillis(),
+                    callIntent = callIntent
+                ) to false,
+                // Group call only one member that is the call creator
+                RtcNotificationState.Active(
+                    listOf(
+                        aMatrixUser(
+                            id = "@senderId:domain",
+                            displayName = "Sender"
+                        ),
+                    ),
+                    isJoined = true,
+                    callStartTsMillis = System.currentTimeMillis(),
+                    callIntent = callIntent
+                ) to false,
+            ).forEach { (state, isDm) ->
+                val content = TimelineItemRtcNotificationContent(callIntent, state)
+                ActiveCallTimelineItemView(
+                    timelineRoomInfo = aTimelineRoomInfo(isDm = isDm),
+                    event = aTimelineItemEvent(
+                        content = content,
+                        // Only display read receipts for the first item
+                        readReceiptState = readReceiptState.removeFirstOrNull() ?: aTimelineItemReadReceipts(),
+                    ),
+                    state,
+                    isLastOutgoingMessage = false,
+                    onLongClick = {},
+                    onReadReceiptsClick = {},
+                    onJoinCallClick = {},
+                )
+            }
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ContentPadding.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ContentPadding.kt
index f7c3627b2a..d6f2bd3161 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ContentPadding.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ContentPadding.kt
@@ -11,5 +11,6 @@ package io.element.android.features.messages.impl.timeline.components
 enum class ContentPadding {
     Textual,
     Media,
-    CaptionedMedia
+    CaptionedMedia,
+    InvalidContent,
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/FloatingDateBadge.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/FloatingDateBadge.kt
new file mode 100644
index 0000000000..5946798a76
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/FloatingDateBadge.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Surface
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.floatingDateBadgeBackground
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlin.time.Duration.Companion.milliseconds
+
+@Composable
+internal fun BoxScope.FloatingDateBadgeOverlay(
+    lazyListState: LazyListState,
+    timelineItems: ImmutableList<TimelineItem>,
+    isLive: Boolean,
+    topOffset: Dp = 0.dp,
+) {
+    // This needs to be a state to trigger a `derivedState` recalculation
+    val updatedTimelineItems by rememberUpdatedState(timelineItems)
+
+    // Look for the last visible item with a timestamp, starting from the last visible item and going backwards until we find one or reach the start of the list
+    val lastVisibleItemWithTimestamp by remember {
+        derivedStateOf {
+            var index = lazyListState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: return@derivedStateOf null
+            while (index >= 0) {
+                when (val item = updatedTimelineItems.getOrNull(index)) {
+                    is TimelineItem.Event -> return@derivedStateOf item
+                    is TimelineItem.Virtual -> if (item.model is TimelineItemDaySeparatorModel) return@derivedStateOf item
+                    is TimelineItem.GroupedEvents -> return@derivedStateOf item.events.firstOrNull()
+                    null -> Unit
+                }
+                index--
+            }
+            null
+        }
+    }
+
+    // Store the formatted date so we recompute it lazily and can keep it around even if we need to dispose the badge because the timeline items changed
+    var formattedDate: String? by remember { mutableStateOf(null) }
+    // Update the formatted date when we have a new non-null timestamp
+    LaunchedEffect(lastVisibleItemWithTimestamp) {
+        lastVisibleItemWithTimestamp?.formattedDate()?.let { formattedDate = it }
+    }
+
+    val isAtBottom by remember {
+        derivedStateOf {
+            lazyListState.firstVisibleItemIndex < 3 && isLive
+        }
+    }
+
+    var isBadgeVisible by remember { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        snapshotFlow { lazyListState.isScrollInProgress }
+            .collectLatest { isScrolling ->
+                if (isScrolling) {
+                    isBadgeVisible = true
+                } else {
+                    delay(2000.milliseconds)
+                    isBadgeVisible = false
+                }
+            }
+    }
+
+    val showBadge = isBadgeVisible && !isAtBottom && formattedDate != null
+
+    AnimatedVisibility(
+        visible = showBadge,
+        modifier = Modifier
+            .align(Alignment.TopCenter)
+            .padding(top = 8.dp + topOffset)
+            .clearAndSetSemantics {
+                hideFromAccessibility()
+            },
+        enter = fadeIn(animationSpec = tween(150)),
+        exit = fadeOut(animationSpec = tween(300)),
+    ) {
+        formattedDate?.let { dateText ->
+            FloatingDateBadge(
+                modifier = Modifier.padding(8.dp),
+                dateText = dateText,
+            )
+        }
+    }
+}
+
+@Composable
+internal fun FloatingDateBadge(
+    dateText: String,
+    modifier: Modifier = Modifier,
+) {
+    Surface(
+        modifier = modifier,
+        shape = RoundedCornerShape(16.dp),
+        color = ElementTheme.colors.floatingDateBadgeBackground,
+        shadowElevation = 4.dp,
+    ) {
+        Text(
+            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            text = dateText,
+            style = ElementTheme.typography.fontBodyMdMedium,
+            color = ElementTheme.colors.textPrimary,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun FloatingDateBadgePreview() = ElementPreview {
+    Box(modifier = Modifier.padding(16.dp)) {
+        FloatingDateBadge(dateText = "March 9, 2026")
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
index aa5aaa2075..1ebdc34c6c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageEventBubble.kt
@@ -19,7 +19,9 @@ import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawWithCache
@@ -27,6 +29,8 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.drawOutline
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.layer.CompositingStrategy
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.LayoutDirection
@@ -47,8 +51,8 @@ import io.element.android.libraries.designsystem.theme.messageFromMeBackground
 import io.element.android.libraries.designsystem.theme.messageFromOtherBackground
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import io.element.android.libraries.ui.utils.graphics.drawInLayer
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
 
 private val BUBBLE_RADIUS = 12.dp
 private val avatarRadius = AvatarSize.TimelineSender.dp / 2
@@ -62,6 +66,8 @@ fun MessageEventBubble(
     onClick: () -> Unit,
     onLongClick: () -> Unit,
     modifier: Modifier = Modifier,
+    customBackgroundColor: Color? = null,
+    borderColor: Color? = null,
     content: @Composable BoxScope.() -> Unit = {},
 ) {
     val clickableModifier = if (isTalkbackActive()) {
@@ -79,10 +85,12 @@ fun MessageEventBubble(
 
     val cutTopStart = state.cutTopStart
     // Ignore state.isHighlighted for now, we need a design decision on it.
-    val backgroundBubbleColor = MessageEventBubbleDefaults.backgroundBubbleColor(state.isMine)
+    val backgroundBubbleColor by rememberUpdatedState(customBackgroundColor ?: MessageEventBubbleDefaults.backgroundBubbleColor(state.isMine))
     val bubbleShape = remember(state) { MessageEventBubbleDefaults.shape(state.cutTopStart, state.groupPosition, state.isMine) }
     val radiusPx = (avatarRadius + SENDER_AVATAR_BORDER_WIDTH).toPx()
     val yOffsetPx = -(NEGATIVE_MARGIN_FOR_BUBBLE + avatarRadius).toPx()
+
+    val updatedBorderColor by rememberUpdatedState(borderColor)
     BoxWithConstraints(
         modifier = modifier
             .drawWithCache {
@@ -103,6 +111,9 @@ fun MessageEventBubble(
                         // Then draw the content on top of it
                         drawContent()
 
+                        // Draw border color, if any
+                        updatedBorderColor?.let { drawOutline(outline, it, style = Stroke(width = 1.dp.toPx())) }
+
                         // And then clip the top start corner if needed to make room for the avatar
                         if (cutTopStart) {
                             drawCircle(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt
index 096ab018e2..a68d115e08 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessageShieldView.kt
@@ -26,6 +26,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.messages.impl.R
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
@@ -162,9 +163,10 @@ internal fun MessageShieldViewPreview() {
                     MessageShield.AuthenticityNotGuaranteed(false),
                     forwarder = UserId("@alice:example.com"),
                     forwarderProfile = ProfileDetails.Ready(
-                        displayName = "Alice",
+                        displayName = USER_NAME_ALICE,
                         displayNameAmbiguous = false,
                         avatarUrl = null,
+                        displayedStatus = null,
                     ),
                 )
             )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
index 21ef7c5b09..b6af359269 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt
@@ -15,9 +15,12 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -40,6 +43,7 @@ fun TimelineEventTimestampView(
     event: TimelineItem.Event,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
+    isLayoutDirectionMismatched: Boolean = false,
 ) {
     val formattedTime = event.sentTime
     val hasError = event.failedToSend
@@ -47,9 +51,46 @@ fun TimelineEventTimestampView(
     val isMessageEdited = event.content.isEdited()
     val isMessageRedacted = event.content.isRedacted()
     val tint = if (hasError || hasEncryptionCritical && !isMessageRedacted) ElementTheme.colors.textCriticalPrimary else ElementTheme.colors.textSecondary
+
+    val shield = event.messageShield
+    val isVerifiedUserSendFailure = event.localSendState is LocalEventSendState.Failed.VerifiedUser
+    val onClickLabel = when {
+        shield != null -> stringResource(CommonStrings.a11y_view_details)
+        hasError && isVerifiedUserSendFailure -> stringResource(CommonStrings.action_open_context_menu)
+        else -> null
+    }
+    val clickableModifier = remember(shield, hasError) {
+        when {
+            shield != null -> {
+                Modifier.clickable(
+                    onClickLabel = onClickLabel,
+                ) {
+                    eventSink(TimelineEvent.ShowShieldDialog(shield))
+                }
+            }
+            hasError -> Modifier
+                .clickable(
+                    enabled = isVerifiedUserSendFailure,
+                    onClickLabel = onClickLabel,
+                ) {
+                    eventSink(TimelineEvent.ComputeVerifiedUserSendFailure(event))
+                }
+            else -> Modifier
+        }
+    }
+
+    val padding = if (!isLayoutDirectionMismatched) {
+        PaddingValues(start = TimelineEventTimestampViewDefaults.spacing)
+    } else {
+        PaddingValues(end = TimelineEventTimestampViewDefaults.spacing)
+    }
+
     Row(
         modifier = Modifier
-            .padding(PaddingValues(start = TimelineEventTimestampViewDefaults.spacing))
+            .padding(padding)
+            // For a better click target, make the corners rounded
+            .clip(RoundedCornerShape(8.dp))
+            .then(clickableModifier)
             .then(modifier),
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -67,36 +108,22 @@ fun TimelineEventTimestampView(
             color = tint,
         )
         if (hasError) {
-            val isVerifiedUserSendFailure = event.localSendState is LocalEventSendState.Failed.VerifiedUser
             Spacer(modifier = Modifier.width(2.dp))
             Icon(
                 imageVector = CompoundIcons.ErrorSolid(),
                 contentDescription = stringResource(id = CommonStrings.common_sending_failed),
                 tint = tint,
-                modifier = Modifier
-                    .size(15.dp, 18.dp)
-                    .clickable(
-                        enabled = isVerifiedUserSendFailure,
-                        onClickLabel = stringResource(CommonStrings.action_open_context_menu),
-                    ) {
-                        eventSink(TimelineEvent.ComputeVerifiedUserSendFailure(event))
-                    }
+                modifier = Modifier.size(15.dp, 18.dp),
             )
         }
 
         if (!isMessageRedacted) {
-            event.messageShield?.let { shield ->
+            shield?.let { shield ->
                 Spacer(modifier = Modifier.width(2.dp))
                 Icon(
                     imageVector = shield.toIcon(),
                     contentDescription = stringResource(id = CommonStrings.a11y_encryption_details),
-                    modifier = Modifier
-                        .size(15.dp)
-                        .clickable(
-                            onClickLabel = stringResource(CommonStrings.a11y_view_details),
-                        ) {
-                            eventSink(TimelineEvent.ShowShieldDialog(shield))
-                        },
+                    modifier = Modifier.size(15.dp),
                     tint = shield.toIconColor(),
                 )
                 Spacer(modifier = Modifier.width(4.dp))
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
index a6ae2d9ee5..6c86767dd4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemCallNotifyView.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.features.messages.impl.timeline.components
 
+import androidx.annotation.StringRes
 import androidx.compose.foundation.border
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
@@ -22,84 +23,74 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.aTimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.aTimelineRoomInfo
+import io.element.android.features.messages.impl.timeline.components.receipt.ReadReceiptViewState
+import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView
+import io.element.android.features.messages.impl.timeline.components.receipt.aReadReceiptData
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
-import io.element.android.features.roomcall.api.RoomCallState
-import io.element.android.features.roomcall.api.RoomCallStateProvider
-import io.element.android.libraries.designsystem.components.avatar.Avatar
-import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toDp
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 internal fun TimelineItemCallNotifyView(
+    timelineRoomInfo: TimelineRoomInfo,
     event: TimelineItem.Event,
-    roomCallState: RoomCallState,
+    content: TimelineItemRtcNotificationContent,
+    state: RtcNotificationState.Tombstoned,
+    isLastOutgoingMessage: Boolean,
     onLongClick: (TimelineItem.Event) -> Unit,
-    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    onReadReceiptsClick: (TimelineItem.Event) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(8.dp))
-            .combinedClickable(
-                enabled = true,
-                onClick = {},
-                onLongClick = { onLongClick(event) },
-                onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+    Column(modifier = modifier) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                .border(1.dp, ElementTheme.colors.borderInteractiveSecondary, RoundedCornerShape(8.dp))
+                .combinedClickable(
+                    enabled = true,
+                    onClick = {},
+                    onLongClick = { onLongClick(event) },
+                    onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                )
+                .onKeyboardContextMenuAction { onLongClick(event) }
+                .padding(12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                modifier = Modifier.size(20.sp.toDp()),
+                imageVector = getIcon(timelineRoomInfo, content),
+                contentDescription = null,
+                tint = ElementTheme.colors.iconSecondary,
             )
-            .onKeyboardContextMenuAction { onLongClick(event) }
-            .padding(12.dp),
-        horizontalArrangement = Arrangement.spacedBy(12.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Avatar(
-            avatarData = event.senderAvatar,
-            avatarType = AvatarType.User,
-        )
-        Column(modifier = Modifier.weight(1f)) {
+
             Text(
-                text = event.safeSenderName,
-                style = ElementTheme.typography.fontBodyLgMedium,
+                modifier = Modifier.weight(1f),
+                text = stringResource(getTextRes(timelineRoomInfo, state)),
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
             )
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(4.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Icon(
-                    modifier = Modifier.size(20.sp.toDp()),
-                    imageVector = CompoundIcons.VideoCallSolid(),
-                    contentDescription = null,
-                    tint = ElementTheme.colors.iconSecondary,
-                )
-                Text(
-                    text = stringResource(CommonStrings.common_call_started),
-                    style = ElementTheme.typography.fontBodyMdRegular,
-                    color = ElementTheme.colors.textSecondary,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-        }
-        if (roomCallState is RoomCallState.OnGoing) {
-            CallMenuItem(
-                roomCallState = roomCallState,
-                onJoinCallClick = onJoinCallClick,
-            )
-        } else {
+
             Text(
                 text = event.sentTime,
                 style = ElementTheme.typography.fontBodyMdRegular,
@@ -108,23 +99,81 @@ internal fun TimelineItemCallNotifyView(
                 overflow = TextOverflow.Ellipsis,
             )
         }
+
+        TimelineItemReadReceiptView(
+            state = ReadReceiptViewState(
+                sendState = event.localSendState,
+                isLastOutgoingMessage = isLastOutgoingMessage,
+                receipts = event.readReceiptState.receipts,
+            ),
+            onReadReceiptsClick = { onReadReceiptsClick(event) },
+            modifier = Modifier.padding(top = 4.dp),
+        )
     }
 }
 
+@StringRes
+private fun getTextRes(
+    timelineRoomInfo: TimelineRoomInfo,
+    state: RtcNotificationState.Tombstoned
+): Int = if (timelineRoomInfo.isDm) {
+    when (state) {
+        is RtcNotificationState.Declined -> {
+            if (state.byMe) CommonStrings.common_call_you_declined else CommonStrings.common_call_declined
+        }
+        else -> CommonStrings.common_call_started
+    }
+} else {
+    // In Rooms, do not show declined info.
+    CommonStrings.common_call_started
+}
+
+@Composable
+private fun getIcon(
+    timelineRoomInfo: TimelineRoomInfo,
+    content: TimelineItemRtcNotificationContent
+): ImageVector {
+    val showAsDeclined = timelineRoomInfo.isDm && content.state is RtcNotificationState.Declined
+    val icon = if (showAsDeclined) {
+        if (content.callIntent == CallIntent.AUDIO) CompoundIcons.VoiceCallDeclinedSolid() else CompoundIcons.VideoCallDeclinedSolid()
+    } else {
+        if (content.callIntent == CallIntent.AUDIO) CompoundIcons.VoiceCallSolid() else CompoundIcons.VideoCallSolid()
+    }
+    return icon
+}
+
 @PreviewsDayNight
 @Composable
 internal fun TimelineItemCallNotifyViewPreview() = ElementPreview {
-    Column(modifier = Modifier.padding(16.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {
-        RoomCallStateProvider()
-            .values
-            .filter { it !is RoomCallState.Unavailable }
-            .forEach { roomCallState ->
-                TimelineItemCallNotifyView(
-                    event = aTimelineItemEvent(content = TimelineItemRtcNotificationContent()),
-                    roomCallState = roomCallState,
-                    onLongClick = {},
-                    onJoinCallClick = {},
-                )
+    val readReceiptState = mutableListOf(
+        aTimelineItemReadReceipts(
+            receipts = List(3) { aReadReceiptData(it) },
+        )
+    )
+    Column(modifier = Modifier.padding(bottom = 16.dp)) {
+        listOf(false, true).forEach { isDm ->
+            listOf(CallIntent.AUDIO, CallIntent.VIDEO).forEach { callIntent ->
+                listOf(
+                    RtcNotificationState.Started,
+                    RtcNotificationState.Declined(byMe = false),
+                    RtcNotificationState.Declined(byMe = true),
+                ).forEach { state ->
+                    val content = TimelineItemRtcNotificationContent(callIntent, state)
+                    TimelineItemCallNotifyView(
+                        timelineRoomInfo = aTimelineRoomInfo(isDm = isDm),
+                        event = aTimelineItemEvent(
+                            content = content,
+                            // Only display read receipts for the first item
+                            readReceiptState = readReceiptState.removeFirstOrNull() ?: aTimelineItemReadReceipts(),
+                        ),
+                        content = content,
+                        state,
+                        isLastOutgoingMessage = false,
+                        onLongClick = {},
+                        onReadReceiptsClick = {},
+                    )
+                }
             }
+        }
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemContentScannerPreviews.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemContentScannerPreviews.kt
new file mode 100644
index 0000000000..7ef6b2dffe
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemContentScannerPreviews.kt
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.ui.unit.dp
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.components.event.ElementTimelineItemPreview
+import io.element.android.features.messages.impl.timeline.components.event.aGalleryItem
+import io.element.android.features.messages.impl.timeline.components.event.aTimelineItemGalleryContent
+import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories
+import io.element.android.features.messages.impl.timeline.di.aFakeTimelineItemPresenterFactories
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAttachmentsContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAudioContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStickerContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVideoContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVoiceContent
+import io.element.android.features.messages.impl.timeline.model.event.anAttachmentItem
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InMemoryEventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.LocalEventContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
+
+private val AN_EVENT_ID = EventId($$"$eventId")
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemImageViewScanningContentPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        ATimelineItemEventRow(
+            event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemImageContent()),
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemStickerViewScanningContentPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        ATimelineItemEventRow(
+            event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemStickerContent(aspectRatio = 1.5f)),
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemVideoViewScanningContentPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        ATimelineItemEventRow(
+            event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemVideoContent()),
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemFileViewScanningContentPreview() {
+    ElementTimelineItemPreview {
+        val cache = remember {
+            InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+        }
+        CompositionLocalProvider(
+            LocalEventContentValidationState provides cache
+        ) {
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemFileContent()))
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemAudioViewScanningContentPreview() {
+    ElementTimelineItemPreview {
+        val cache = remember {
+            InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+        }
+        CompositionLocalProvider(
+            LocalEventContentValidationState provides cache
+        ) {
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemAudioContent()))
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemVoiceViewScanningContentPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Loading)))
+    }
+    ElementTimelineItemPreview {
+        CompositionLocalProvider(
+            LocalEventContentValidationState provides cache,
+            LocalTimelineItemPresenterFactories provides aFakeTimelineItemPresenterFactories(),
+        ) {
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemVoiceContent()),
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemScanningContentFailedPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Invalid)))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemImageContent()))
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemImageContent(caption = "A caption")))
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemScanningContentNotFoundPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(
+            AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.UnrecoverableError(IllegalStateException("Not found")))
+        ))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemImageContent()))
+            ATimelineItemEventRow(event = aTimelineItemEvent(eventId = AN_EVENT_ID, content = aTimelineItemImageContent(caption = "A caption")))
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemScanningContentWithInvalidRepliesPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.Invalid)))
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    content = aTimelineItemTextContent(),
+                    inReplyTo = inReplyToInvalidContent(),
+                )
+            )
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    eventId = AN_EVENT_ID,
+                    content = aTimelineItemImageContent(),
+                    inReplyTo = inReplyToInvalidContent(),
+                )
+            )
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    eventId = AN_EVENT_ID,
+                    content = aTimelineItemImageContent(),
+                    inReplyTo = inReplyToTextContent(),
+                )
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemScanningContentWithRepliesFailedPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(
+            initial = mapOf(AN_EVENT_ID to NoopContentValidationState(ContentValidationValue.UnrecoverableError(IllegalStateException("BOOM"))))
+        )
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    content = aTimelineItemTextContent(),
+                    inReplyTo = inReplyToInvalidContent(),
+                )
+            )
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    eventId = AN_EVENT_ID,
+                    content = aTimelineItemImageContent(),
+                    inReplyTo = inReplyToInvalidContent(),
+                )
+            )
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    eventId = AN_EVENT_ID,
+                    content = aTimelineItemImageContent(),
+                    inReplyTo = inReplyToTextContent(),
+                )
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemGalleryViewScanningContentFailedPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(
+            initial =
+                mapOf(
+                    AN_EVENT_ID to DefaultContentValidationState(mapOf(
+                        "invalid" to ContentValidationValue.Invalid,
+                        "error" to ContentValidationValue.UnrecoverableError(IllegalStateException("BOOM")),
+                        "" to ContentValidationValue.Valid
+                    ))
+                )
+        )
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        ATimelineItemEventRow(
+            event = aTimelineItemEvent(
+                eventId = AN_EVENT_ID,
+                content = aTimelineItemGalleryContent(
+                    items = listOf(
+                        aGalleryItem(),
+                        aGalleryItem(mediaSource = MediaSource("invalid", "{}")),
+                        aGalleryItem(),
+                        aGalleryItem(mediaSource = MediaSource("invalid", "{}")),
+                        aGalleryItem(mediaSource = MediaSource("error", "{}")),
+                        aGalleryItem(mediaSource = MediaSource("invalid", "{}")),
+                        aGalleryItem(),
+                    )
+                )
+            )
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemAttachmentsViewScanningContentFailedPreview() = ElementPreview {
+    val cache = remember {
+        InMemoryEventContentValidationCache(
+            initial =
+            mapOf(
+                AN_EVENT_ID to DefaultContentValidationState(mapOf(
+                    "invalid" to ContentValidationValue.Invalid,
+                    "error" to ContentValidationValue.UnrecoverableError(IllegalStateException("BOOM")),
+                    "" to ContentValidationValue.Valid
+                ))
+            )
+        )
+    }
+    CompositionLocalProvider(LocalEventContentValidationState provides cache) {
+        ATimelineItemEventRow(
+            event = aTimelineItemEvent(
+                eventId = AN_EVENT_ID,
+                content = aTimelineItemAttachmentsContent(
+                    attachments = listOf(
+                        anAttachmentItem(),
+                        anAttachmentItem(mediaSource = MediaSource("invalid", "{}")),
+                        anAttachmentItem(),
+                        anAttachmentItem(),
+                        anAttachmentItem(mediaSource = MediaSource("error", "{}")),
+                        anAttachmentItem(mediaSource = MediaSource("invalid", "{}")),
+                    )
+                )
+            )
+        )
+    }
+}
+
+private fun inReplyToInvalidContent(): InReplyToDetails.Ready = InReplyToDetails.Ready(
+    eventId = AN_EVENT_ID,
+    senderId = UserId("@sender:matrix.org"),
+    eventContent = MessageContent(
+        body = "A body",
+        inReplyTo = null,
+        isEdited = false,
+        threadInfo = null,
+        type = ImageMessageType(
+            filename = "A file",
+            caption = "A caption",
+            formattedCaption = null,
+            source = MediaSource("", ""),
+            info = null,
+        )
+    ),
+    textContent = "A text content",
+    senderProfile = ProfileDetails.Ready(
+        displayName = "Sender",
+        displayNameAmbiguous = false,
+        avatarUrl = null,
+        displayedStatus = null
+    )
+)
+
+private fun inReplyToTextContent(): InReplyToDetails.Ready = InReplyToDetails.Ready(
+    eventId = EventId($$"$text_eventId"),
+    senderId = UserId("@sender:matrix.org"),
+    eventContent = MessageContent(
+        body = "A body",
+        inReplyTo = null,
+        isEdited = false,
+        threadInfo = null,
+        type = TextMessageType(
+            body = "A body",
+            formatted = null,
+        )
+    ),
+    textContent = "A text content",
+    senderProfile = ProfileDetails.Ready(
+        displayName = "Sender",
+        displayNameAmbiguous = false,
+        avatarUrl = null,
+        displayedStatus = null
+    )
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventContentForGalleryViewProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventContentForGalleryViewProvider.kt
new file mode 100644
index 0000000000..ed790da8a2
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventContentForGalleryViewProvider.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.messages.impl.timeline.components.event.aGalleryItem
+import io.element.android.features.messages.impl.timeline.components.event.aTimelineItemGalleryContent
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAttachmentsContent
+import io.element.android.features.messages.impl.timeline.model.event.anAttachmentItem
+import kotlin.time.Duration
+
+class TimelineItemEventContentForGalleryViewProvider :
+    PreviewParameterProvider<TimelineItemEventContent> {
+    override val values: Sequence<TimelineItemEventContent>
+        get() = sequenceOf(
+            aTimelineItemGalleryContent(
+                caption = "My vacation photos",
+                items = listOf(
+                    aGalleryItem(),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                caption = "Three photos",
+                items = listOf(
+                    aGalleryItem(),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                caption = "Many photos",
+                items = (1..8).map { aGalleryItem() },
+            ),
+            aTimelineItemGalleryContent(
+                caption = "Videos",
+                items = listOf(
+                    aGalleryItem(
+                        type = GalleryItem.Type.Video,
+                        duration = Duration.parse("PT1M30S")
+                    ),
+                    aGalleryItem(
+                        type = GalleryItem.Type.Video,
+                        duration = Duration.parse("PT45S")
+                    ),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemAttachmentsContent(
+                caption = "Documents",
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "document.pdf",
+                        fileExtension = "pdf",
+                    ),
+                    anAttachmentItem(
+                        filename = "presentation.pdf",
+                        fileExtension = "pdf",
+                    ),
+                    anAttachmentItem(
+                        filename = "spreadsheet.xlsx",
+                        fileExtension = "xlsx",
+                    ),
+                ),
+            ),
+            aTimelineItemAttachmentsContent(
+                caption = "Photos",
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "photo1.jpg",
+                        fileExtension = "jpg",
+                        hasThumbnail = true,
+                    ),
+                    anAttachmentItem(
+                        filename = "photo2.jpg",
+                        fileExtension = "jpg",
+                        hasThumbnail = true,
+                    ),
+                    anAttachmentItem(
+                        filename = "photo3.jpg",
+                        fileExtension = "jpg",
+                        hasThumbnail = true,
+                    ),
+                ),
+            ),
+            aTimelineItemAttachmentsContent(
+                caption = "Videos",
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "video1.mp4",
+                        fileExtension = "mp4",
+                        hasThumbnail = true,
+                        fileSize = 150_000_000L,
+                        formattedFileSize = "150MB",
+                    ),
+                    anAttachmentItem(
+                        filename = "video2.mov",
+                        fileExtension = "mov",
+                        hasThumbnail = true,
+                        fileSize = 85_000_000L,
+                        formattedFileSize = "85MB",
+                    ),
+                ),
+            ),
+            aTimelineItemAttachmentsContent(
+                caption = "Audio",
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "recording.mp3",
+                        fileExtension = "mp3",
+                        fileSize = 4_500_000L,
+                        formattedFileSize = "4.5MB",
+                    ),
+                    anAttachmentItem(
+                        filename = "voice_message.m4a",
+                        fileExtension = "m4a",
+                        fileSize = 1_200_000L,
+                        formattedFileSize = "1.2MB",
+                    ),
+                ),
+            ),
+        )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index b253f45937..fed2ab6577 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -10,6 +10,7 @@ package io.element.android.features.messages.impl.timeline.components
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.draggable
@@ -32,13 +33,18 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 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.graphicsLayer
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalViewConfiguration
 import androidx.compose.ui.platform.ViewConfiguration
 import androidx.compose.ui.res.pluralStringResource
@@ -48,9 +54,12 @@ import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.isTraversalGroup
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.traversalIndex
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDirection
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.constraintlayout.compose.ConstrainScope
@@ -67,17 +76,21 @@ import io.element.android.features.messages.impl.timeline.components.receipt.Rea
 import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
 import io.element.android.features.messages.impl.timeline.model.bubble.BubbleState
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
-import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
+import io.element.android.features.messages.impl.timeline.model.event.ensureActiveLiveLocation
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.messages.impl.timeline.protection.mustBeProtected
 import io.element.android.libraries.architecture.AsyncData
@@ -89,7 +102,9 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.niceClickable
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewWithExtraLargeHeight
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.swipe.SwipeableActionsState
 import io.element.android.libraries.designsystem.swipe.rememberSwipeableActionsState
 import io.element.android.libraries.designsystem.text.toPx
@@ -103,14 +118,19 @@ import io.element.android.libraries.matrix.api.timeline.item.EmbeddedEventInfo
 import io.element.android.libraries.matrix.api.timeline.item.ThreadSummary
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisplayName
+import io.element.android.libraries.matrix.api.timeline.item.event.mediaSources
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.rememberEventContentValidationState
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToView
+import io.element.android.libraries.matrix.ui.messages.reply.content
 import io.element.android.libraries.matrix.ui.messages.reply.eventId
 import io.element.android.libraries.matrix.ui.messages.sender.SenderName
 import io.element.android.libraries.matrix.ui.messages.sender.SenderNameMode
@@ -118,8 +138,10 @@ import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
+import io.element.android.libraries.ui.utils.text.detect
 import io.element.android.wysiwyg.link.Link
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.launch
 import kotlin.math.abs
 import kotlin.math.roundToInt
@@ -139,10 +161,10 @@ fun TimelineItemEventRow(
     timelineMode: Timeline.Mode,
     timelineRoomInfo: TimelineRoomInfo,
     timelineProtectionState: TimelineProtectionState,
-    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     displayThreadSummaries: Boolean,
     onEventClick: () -> Unit,
+    onGalleryItemClick: ((Int) -> Unit),
     onLongClick: () -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
@@ -160,16 +182,17 @@ fun TimelineItemEventRow(
         val onContentClick = onEventClick.takeUnless { event.isWholeContentClickable }
 
         TimelineItemEventContentView(
+            eventId = event.eventId,
             content = event.content,
-            hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
+            timelineProtectionState = timelineProtectionState,
             onContentClick = onContentClick,
+            onGalleryItemClick = onGalleryItemClick,
             onLongClick = onLongClick,
-            onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
             onLinkClick = onLinkClick,
             onLinkLongClick = onLinkLongClick,
             eventSink = eventSink,
             modifier = contentModifier,
-            onContentLayoutChange = onContentLayoutChange
+            onContentLayoutChange = onContentLayoutChange,
         )
     },
 ) {
@@ -269,7 +292,9 @@ fun TimelineItemEventRow(
         if (displayThreadSummaries && timelineMode !is Timeline.Mode.Thread && event.threadInfo is TimelineItemThreadInfo.ThreadRoot) {
             ThreadSummaryView(
                 modifier = if (event.isMine) {
-                    Modifier.align(Alignment.End).padding(end = 16.dp)
+                    Modifier
+                        .align(Alignment.End)
+                        .padding(end = 16.dp)
                 } else {
                     if (timelineRoomInfo.isDm) Modifier else Modifier.padding(start = 16.dp)
                 }.padding(top = 2.dp),
@@ -291,7 +316,6 @@ fun TimelineItemEventRow(
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 receipts = event.readReceiptState.receipts,
             ),
-            renderReadReceipts = renderReadReceipts,
             onReadReceiptsClick = { onReadReceiptClick(event) },
             modifier = Modifier.padding(top = 4.dp)
         )
@@ -450,6 +474,23 @@ private fun TimelineItemEventRowContent(
             )
         }
 
+        val currentContentValidationState by rememberEventContentValidationState(eventId = event.eventId, needsValidation = event.content.isMedia)
+            .collectOverallState()
+        val needsInvalidContentCustomisations =
+            // Gallery events should not apply the custom bubble color, instead each item will apply some custom color if needed
+            event.content !is TimelineItemGalleryContent &&
+                event.content !is TimelineItemAttachmentsContent &&
+                currentContentValidationState.hasError() &&
+                event.content.isMedia
+
+        // If the event has a dangerous media content we need to set custom message bubble background and border colors
+        val themeColors = ElementTheme.colors
+        val (dangerousContentBubbleColor, borderColor) = remember(themeColors.isLight, needsInvalidContentCustomisations, event.content.type) {
+            val background = themeColors.bgCriticalSubtle.takeIf { needsInvalidContentCustomisations }
+            val border = themeColors.borderCriticalSubtle.takeIf { needsInvalidContentCustomisations }
+            background to border
+        }
+
         // Message bubble
         val bubbleState = BubbleState(
             groupPosition = event.groupPosition,
@@ -476,6 +517,8 @@ private fun TimelineItemEventRowContent(
             interactionSource = interactionSource,
             onClick = onContentClick,
             onLongClick = onLongClick,
+            customBackgroundColor = dangerousContentBubbleColor,
+            borderColor = borderColor,
         ) {
             MessageEventBubbleContent(
                 event = event,
@@ -646,23 +689,44 @@ private fun MessageEventBubbleContent(
                             .padding(horizontal = 4.dp, vertical = 2.dp)
                     )
                 }
-            TimestampPosition.Aligned ->
-                ContentAvoidingLayout(
-                    modifier = modifier,
-                    // The spacing is negative to make the content overlap the empty space at the start of the timestamp
-                    spacing = (-4).dp,
-                    overlayOffset = DpOffset(0.dp, -1.dp),
-                    shrinkContent = canShrinkContent,
-                    content = { content(this::onContentLayoutChange) },
-                    overlay = {
-                        TimelineEventTimestampView(
-                            event = event,
-                            eventSink = eventSink,
-                            modifier = Modifier
-                                .padding(horizontal = 8.dp, vertical = 4.dp)
-                        )
+            TimestampPosition.Aligned -> @Composable {
+                val originalLayoutDirection = LocalLayoutDirection.current
+                // Detect if the direction of the text content (if any) does not match the layout direction, to place the content and timestamp correctly
+                val contentDirection = if (event.content is TimelineItemTextContent) {
+                    remember(event.content.body) {
+                        when (TextDirection.detect(event.content.body)) {
+                            TextDirection.Ltr, TextDirection.ContentOrLtr -> LayoutDirection.Ltr
+                            TextDirection.Rtl, TextDirection.ContentOrRtl -> LayoutDirection.Rtl
+                            else -> originalLayoutDirection
+                        }
                     }
-                )
+                } else {
+                    originalLayoutDirection
+                }
+
+                CompositionLocalProvider(LocalLayoutDirection provides contentDirection) {
+                    ContentAvoidingLayout(
+                        modifier = modifier,
+                        // The spacing is negative to make the content overlap the empty space at the start of the timestamp
+                        spacing = (-4).dp,
+                        overlayOffset = DpOffset(0.dp, -1.dp),
+                        shrinkContent = canShrinkContent,
+                        content = { content(this::onContentLayoutChange) },
+                        overlay = {
+                            // Use the original layout direction for the timestamp
+                            CompositionLocalProvider(LocalLayoutDirection provides originalLayoutDirection) {
+                                TimelineEventTimestampView(
+                                    event = event,
+                                    eventSink = eventSink,
+                                    isLayoutDirectionMismatched = originalLayoutDirection != contentDirection,
+                                    modifier = Modifier
+                                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                                )
+                            }
+                        }
+                    )
+                }
+            }
             TimestampPosition.Below ->
                 Column(modifier) {
                     content {}
@@ -674,6 +738,7 @@ private fun MessageEventBubbleContent(
                             .padding(horizontal = 8.dp, vertical = 4.dp)
                     )
                 }
+            TimestampPosition.Hidden -> Box(modifier) { content {} }
         }
     }
 
@@ -707,6 +772,7 @@ private fun MessageEventBubbleContent(
             }
             ContentPadding.CaptionedMedia ->
                 Modifier.padding(start = 8.dp, end = 8.dp, top = topPadding, bottom = 8.dp)
+            ContentPadding.InvalidContent -> Modifier.padding(top = topPadding, bottom = 8.dp)
         }
 
         val threadDecoration = @Composable {
@@ -730,10 +796,13 @@ private fun MessageEventBubbleContent(
         }
 
         val inReplyTo = @Composable { inReplyTo: InReplyToDetails ->
+            val currentContentValidationState by rememberEventContentValidationState(eventId = inReplyTo.eventId(), eventContent = inReplyTo.content())
+                .collectOverallState()
             val topPadding = if (showThreadDecoration) 0.dp else 8.dp
+            val shape = RoundedCornerShape(6.dp)
             val inReplyToModifier = Modifier
                 .padding(top = topPadding, start = 8.dp, end = 8.dp)
-                .clip(RoundedCornerShape(6.dp))
+                .clip(shape)
 
             val talkbackCompatModifier = if (isTalkbackActive()) {
                 // Use z-index to make the replied to text being read after the message
@@ -742,11 +811,28 @@ private fun MessageEventBubbleContent(
             } else {
                 inReplyToModifier.clickable(onClick = inReplyToClick)
             }
-            InReplyToView(
-                inReplyTo = inReplyTo,
-                hideImage = timelineProtectionState.hideMediaContent(inReplyTo.eventId()),
-                modifier = talkbackCompatModifier,
-            )
+
+            val contentHasError = currentContentValidationState.hasError()
+            val borderColor = if (contentHasError) ElementTheme.colors.borderCriticalSubtle else ElementTheme.colors.separatorPrimary
+            val backgroundColor = if (contentHasError) ElementTheme.colors.bgCriticalSubtle else ElementTheme.colors.bgCanvasDefault
+            Box(
+                modifier = talkbackCompatModifier
+                    .border(1.dp, borderColor, shape)
+                    .background(backgroundColor, shape)
+                    .padding(4.dp)
+            ) {
+                val contentValidationState = rememberEventContentValidationState(eventId = inReplyTo.eventId(), eventContent = inReplyTo.content())
+                val updatedEventSink by rememberUpdatedState(eventSink)
+                LaunchedEffect(inReplyTo) {
+                    val mediaSources = inReplyTo.content()?.mediaSources() ?: return@LaunchedEffect
+                    updatedEventSink(TimelineEvent.ValidateMedia(inReplyTo.eventId(), mediaSources, contentValidationState))
+                }
+                InReplyToView(
+                    inReplyTo = inReplyTo,
+                    contentValidationValue = currentContentValidationState,
+                    hideImage = timelineProtectionState.hideMediaContent(inReplyTo.eventId()),
+                )
+            }
         }
         if (inReplyToDetails != null) {
             // Use SubComposeLayout only if necessary as it can have consequences on the performance.
@@ -763,20 +849,47 @@ private fun MessageEventBubbleContent(
         }
     }
 
-    val timestampPosition = when (event.content) {
-        is TimelineItemImageContent -> if (event.content.showCaption) TimestampPosition.Aligned else TimestampPosition.Overlay
-        is TimelineItemVideoContent -> if (event.content.showCaption) TimestampPosition.Aligned else TimestampPosition.Overlay
-        is TimelineItemStickerContent,
-        is TimelineItemLocationContent -> TimestampPosition.Overlay
-        is TimelineItemPollContent -> TimestampPosition.Below
-        else -> TimestampPosition.Default
+    val contentValidationState by rememberEventContentValidationState(eventId = event.eventId, needsValidation = event.content.isMedia).collectOverallState()
+    val needsInvalidContentLayout =
+        // Gallery events should not apply custom paddings or layout dispositions
+        event.content !is TimelineItemGalleryContent &&
+            event.content !is TimelineItemAttachmentsContent &&
+            contentValidationState.hasError()
+
+    val timestampPosition = if (needsInvalidContentLayout) {
+        // The invalid content view will be displayed in all these cases, independent of the event content
+        TimestampPosition.Aligned
+    } else {
+        when (val content = event.content) {
+            is TimelineItemImageContent -> if (content.showCaption) TimestampPosition.Aligned else TimestampPosition.Overlay
+            is TimelineItemVideoContent -> if (content.showCaption) TimestampPosition.Aligned else TimestampPosition.Overlay
+            is TimelineItemGalleryContent -> if (content.showCaption) TimestampPosition.Aligned else TimestampPosition.Below
+            is TimelineItemAttachmentsContent -> if (content.showCaption) TimestampPosition.Aligned else TimestampPosition.Below
+            is TimelineItemStickerContent -> TimestampPosition.Overlay
+            is TimelineItemLocationContent -> {
+                val content = content.ensureActiveLiveLocation()
+                val shouldHide = content.mode is TimelineItemLocationContent.Mode.Live &&
+                    content.mode.isActive &&
+                    content.mode.isOwnUser
+                if (shouldHide) TimestampPosition.Hidden else TimestampPosition.Overlay
+            }
+            is TimelineItemPollContent -> TimestampPosition.Below
+            else -> TimestampPosition.Default
+        }
     }
-    val paddingBehaviour = when (event.content) {
-        is TimelineItemImageContent -> if (event.content.showCaption) ContentPadding.CaptionedMedia else ContentPadding.Media
-        is TimelineItemVideoContent -> if (event.content.showCaption) ContentPadding.CaptionedMedia else ContentPadding.Media
-        is TimelineItemStickerContent,
-        is TimelineItemLocationContent -> ContentPadding.Media
-        else -> ContentPadding.Textual
+
+    val paddingBehaviour = if (needsInvalidContentLayout) {
+        ContentPadding.InvalidContent
+    } else {
+        when (event.content) {
+            is TimelineItemImageContent -> if (event.content.showCaption) ContentPadding.CaptionedMedia else ContentPadding.Media
+            is TimelineItemVideoContent -> if (event.content.showCaption) ContentPadding.CaptionedMedia else ContentPadding.Media
+            is TimelineItemGalleryContent -> ContentPadding.CaptionedMedia
+            is TimelineItemAttachmentsContent -> ContentPadding.CaptionedMedia
+            is TimelineItemStickerContent,
+            is TimelineItemLocationContent -> ContentPadding.Media
+            else -> ContentPadding.Textual
+        }
     }
     CommonLayout(
         showThreadDecoration = timelineMode !is Timeline.Mode.Thread && event.threadInfo is TimelineItemThreadInfo.ThreadResponse,
@@ -833,25 +946,29 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
                     groupPosition = TimelineItemGroupPosition.First,
                     threadInfo = TimelineItemThreadInfo.ThreadRoot(
                         latestEventText = "This is the latest message in the thread",
-                        summary = ThreadSummary(AsyncData.Success(
-                            EmbeddedEventInfo(
-                                eventOrTransactionId = EventOrTransactionId.Event(EventId("\$event-id")),
-                                content = MessageContent(
-                                    body = "This is the latest message in the thread",
-                                    inReplyTo = null,
-                                    isEdited = false,
-                                    threadInfo = null,
-                                    type = TextMessageType("This is the latest message in the thread", null)
-                                ),
-                                senderId = UserId("@user:id"),
-                                senderProfile = ProfileDetails.Ready(
-                                    displayName = "Alice",
-                                    avatarUrl = null,
-                                    displayNameAmbiguous = false,
-                                ),
-                                timestamp = 0L,
-                            )
-                        ), numberOfReplies = 20L)
+                        summary = ThreadSummary(
+                            latestEvent = AsyncData.Success(
+                                EmbeddedEventInfo(
+                                    eventOrTransactionId = EventOrTransactionId.Event(EventId("\$event-id")),
+                                    content = MessageContent(
+                                        body = "This is the latest message in the thread",
+                                        inReplyTo = null,
+                                        isEdited = false,
+                                        threadInfo = null,
+                                        type = TextMessageType("This is the latest message in the thread", null)
+                                    ),
+                                    senderId = UserId("@user:id"),
+                                    senderProfile = ProfileDetails.Ready(
+                                        displayName = USER_NAME_ALICE,
+                                        avatarUrl = null,
+                                        displayNameAmbiguous = false,
+                                        displayedStatus = null,
+                                    ),
+                                    timestamp = 0L,
+                                )
+                            ),
+                            numberOfReplies = 20L,
+                        )
                     )
                 ),
                 displayThreadSummaries = true,
@@ -860,6 +977,149 @@ internal fun TimelineItemEventRowWithThreadSummaryPreview() = ElementPreview {
     }
 }
 
+@PreviewWithExtraLargeHeight
+@Composable
+internal fun TimelineItemEventRowRtlContentPreview() = ElementPreview {
+    Column {
+        Text(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(Color.LightGray)
+                .padding(8.dp),
+            text = "LTR layout direction",
+            textAlign = TextAlign.Center,
+            style = ElementTheme.typography.fontHeadingMdBold,
+        )
+        CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
+            sequenceOf(false, true).forEach { isMine ->
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "ظَة وَدَاع يَسْتَغْرِب فِيهَ"
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.First,
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "ظَة وَدَاع يَسْتَغْرِب فِيهَ",
+                            isEdited = true,
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                        messageShield = MessageShield.UnknownDevice(isCritical = true),
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "ظَة وَدَاع \nيَسْتَغْرِب فِيهَ"
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "ظَة وَدَاع يَسْتَغْرِب فِيهَا اَلشَّاعِر أَنْ لَا يَبْكِي مِنْ أَلَم اَلْفِرَاق،" +
+                                " وَيَصِف حَالَة اَلْمُودِعِينَ"
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                    )
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Text(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(Color.LightGray)
+                .padding(8.dp),
+            text = "RTL layout direction",
+            textAlign = TextAlign.Center,
+            style = ElementTheme.typography.fontHeadingMdBold,
+        )
+
+        CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
+            sequenceOf(false, true).forEach { isMine ->
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "ظَة وَدَاع يَسْتَغْرِب فِيهَا اَلشَّاعِر أَنْ لَا يَبْكِي مِنْ أَلَم اَلْفِرَاق،" +
+                                " وَيَصِف حَالَة اَلْمُودِعِينَ",
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.First,
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "Testing\nLTR Line\nBreaks.",
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "Testing a very long LTR text in an RTL layout."
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "Testing LTR in RTL layout.",
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                        messageShield = MessageShield.UnknownDevice(isCritical = true),
+                    )
+                )
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        senderDisplayName = "Sender with a super long name that should ellipsize",
+                        isMine = isMine,
+                        content = aTimelineItemTextContent(
+                            body = "Testing LTR in RTL layout.",
+                            isEdited = true,
+                        ),
+                        timelineItemReactions = TimelineItemReactions(persistentListOf()),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                        messageShield = MessageShield.UnknownDevice(isCritical = true),
+                    )
+                )
+            }
+        }
+    }
+}
+
 @PreviewsDayNight
 @Composable
 internal fun ThreadSummaryViewPreview() {
@@ -878,9 +1138,10 @@ internal fun ThreadSummaryViewPreview() {
                     ),
                     senderId = UserId("@user:id"),
                     senderProfile = ProfileDetails.Ready(
-                        displayName = "Alice",
+                        displayName = USER_NAME_ALICE,
                         avatarUrl = null,
                         displayNameAmbiguous = true,
+                        displayedStatus = null,
                     ),
                     timestamp = 0L,
                 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowGalleryPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowGalleryPreview.kt
new file mode 100644
index 0000000000..22c3f354f2
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowGalleryPreview.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemEventRowWithGalleryPreview(
+    @PreviewParameter(TimelineItemEventContentForGalleryViewProvider::class) content: TimelineItemEventContent,
+) = ElementPreview {
+    Column {
+        sequenceOf(false, true).forEach { isMine ->
+            ATimelineItemEventRow(
+                event = aTimelineItemEvent(
+                    isMine = isMine,
+                    content = content,
+                    groupPosition = TimelineItemGroupPosition.Last,
+                ),
+            )
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowUtdPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowUtdPreview.kt
index 49328ac025..abacc45ef8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowUtdPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowUtdPreview.kt
@@ -16,6 +16,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemGrou
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UtdCause
 
@@ -25,7 +27,7 @@ internal fun TimelineItemEventRowUtdPreview() = ElementPreview {
     Column {
         ATimelineItemEventRow(
             event = aTimelineItemEvent(
-                senderDisplayName = "Alice",
+                senderDisplayName = USER_NAME_ALICE,
                 isMine = false,
                 content = TimelineItemEncryptedContent(
                     data = UnableToDecryptContent.Data.MegolmV1AesSha2(
@@ -39,7 +41,7 @@ internal fun TimelineItemEventRowUtdPreview() = ElementPreview {
         )
         ATimelineItemEventRow(
             event = aTimelineItemEvent(
-                senderDisplayName = "Bob",
+                senderDisplayName = USER_NAME_BOB,
                 isMine = false,
                 content = TimelineItemEncryptedContent(
                     data = UnableToDecryptContent.Data.MegolmV1AesSha2(
@@ -54,7 +56,7 @@ internal fun TimelineItemEventRowUtdPreview() = ElementPreview {
 
         ATimelineItemEventRow(
             event = aTimelineItemEvent(
-                senderDisplayName = "Bob",
+                senderDisplayName = USER_NAME_BOB,
                 isMine = false,
                 content = TimelineItemEncryptedContent(
                     data = UnableToDecryptContent.Data.MegolmV1AesSha2(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithRRPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithRRPreview.kt
index f46ba780f3..6ea1161605 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithRRPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithRRPreview.kt
@@ -37,7 +37,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            renderReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // A message from current user
@@ -49,7 +48,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            renderReadReceipts = true,
             isLastOutgoingMessage = false,
         )
         // Another message from current user
@@ -61,7 +59,6 @@ internal fun TimelineItemEventRowWithRRPreview(
                 timelineItemReactions = aTimelineItemReactions(count = 0),
                 readReceiptState = TimelineItemReadReceipts(state.receipts),
             ),
-            renderReadReceipts = true,
             isLastOutgoingMessage = true,
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
index 505d76b24b..5b620a7dc3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
@@ -19,14 +19,15 @@ import io.element.android.features.messages.impl.R
 import io.element.android.features.messages.impl.timeline.TimelineEvent
 import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.aGroupedEvents
+import io.element.android.features.messages.impl.timeline.aRedactedMessagesGroupedEvents
 import io.element.android.features.messages.impl.timeline.aTimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.components.event.TimelineItemEventContentView
 import io.element.android.features.messages.impl.timeline.components.group.GroupHeaderView
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
 import io.element.android.features.messages.impl.timeline.components.receipt.ReadReceiptViewState
 import io.element.android.features.messages.impl.timeline.components.receipt.TimelineItemReadReceiptView
+import io.element.android.features.messages.impl.timeline.groups.isRedactedMessagesGroup
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -34,7 +35,6 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
 import io.element.android.wysiwyg.link.Link
 
 @Composable
@@ -43,7 +43,6 @@ fun TimelineItemGroupedEventsRow(
     timelineMode: Timeline.Mode,
     timelineRoomInfo: TimelineRoomInfo,
     timelineProtectionState: TimelineProtectionState,
-    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     focusedEventId: EventId?,
     displayThreadSummaries: Boolean,
@@ -62,14 +61,15 @@ fun TimelineItemGroupedEventsRow(
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
+                eventId = event.eventId,
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
-                onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
+                timelineProtectionState = timelineProtectionState,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
                 eventSink = eventSink,
                 modifier = contentModifier,
                 onContentClick = null,
+                onGalleryItemClick = {},
                 onLongClick = null,
                 onContentLayoutChange = onContentLayoutChange
             )
@@ -89,7 +89,6 @@ fun TimelineItemGroupedEventsRow(
         timelineRoomInfo = timelineRoomInfo,
         timelineProtectionState = timelineProtectionState,
         focusedEventId = focusedEventId,
-        renderReadReceipts = renderReadReceipts,
         isLastOutgoingMessage = isLastOutgoingMessage,
         displayThreadSummaries = displayThreadSummaries,
         onClick = onClick,
@@ -117,7 +116,6 @@ private fun TimelineItemGroupedEventsRowContent(
     timelineRoomInfo: TimelineRoomInfo,
     timelineProtectionState: TimelineProtectionState,
     focusedEventId: EventId?,
-    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     displayThreadSummaries: Boolean,
     onClick: (TimelineItem.Event) -> Unit,
@@ -135,45 +133,45 @@ private fun TimelineItemGroupedEventsRowContent(
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
+                eventId = event.eventId,
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
-                onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
+                timelineProtectionState = timelineProtectionState,
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
                 eventSink = eventSink,
                 modifier = contentModifier,
                 onContentClick = null,
+                onGalleryItemClick = {},
                 onLongClick = null,
                 onContentLayoutChange = onContentLayoutChange
             )
         },
 ) {
     Column(modifier = modifier.animateContentSize()) {
+        val count = timelineItem.events.size
+        // A group made entirely of redacted events is a collapsed run of deleted messages
+        // (element-web style); anything else is the regular run of room state changes. For the
+        // redacted case we show only the count: the SDK does not expose who performed the redaction,
+        // and showing the original authors would be misleading.
+        val headerText = if (timelineItem.isRedactedMessagesGroup()) {
+            pluralStringResource(R.plurals.screen_room_timeline_redacted_messages, count, count)
+        } else {
+            pluralStringResource(R.plurals.screen_room_timeline_state_changes, count, count)
+        }
         GroupHeaderView(
-            text = pluralStringResource(
-                id = R.plurals.screen_room_timeline_state_changes,
-                count = timelineItem.events.size,
-                timelineItem.events.size
-            ),
+            text = headerText,
             isExpanded = isExpanded,
             isHighlighted = !isExpanded && timelineItem.events.any { it.isEvent(focusedEventId) },
             onClick = onExpandGroupClick,
         )
         if (isExpanded) {
             Column {
-                timelineItem.events.let {
-                    if (isTalkbackActive()) {
-                        it.reversed()
-                    } else {
-                        it
-                    }
-                }.forEach { subGroupEvent ->
+                timelineItem.events.forEach { subGroupEvent ->
                     TimelineItemRow(
                         timelineMode = timelineMode,
                         timelineItem = subGroupEvent,
                         timelineRoomInfo = timelineRoomInfo,
                         timelineProtectionState = timelineProtectionState,
-                        renderReadReceipts = renderReadReceipts,
                         isLastOutgoingMessage = isLastOutgoingMessage,
                         focusedEventId = focusedEventId,
                         displayThreadSummaries = displayThreadSummaries,
@@ -181,27 +179,27 @@ private fun TimelineItemGroupedEventsRowContent(
                         onLinkClick = onLinkClick,
                         onLinkLongClick = onLinkLongClick,
                         onContentClick = onClick,
+                        onGalleryItemClick = { _, _ -> },
                         onLongClick = onLongClick,
                         inReplyToClick = inReplyToClick,
                         onReactionClick = onReactionClick,
                         onReactionLongClick = onReactionLongClick,
                         onMoreReactionsClick = onMoreReactionsClick,
                         onReadReceiptClick = onReadReceiptClick,
-                        onSwipeToReply = {},
                         onJoinCallClick = {},
+                        onSwipeToReply = {},
                         eventSink = eventSink,
                         eventContentView = eventContentView,
                     )
                 }
             }
-        } else if (renderReadReceipts) {
+        } else if (timelineItem.aggregatedReadReceipts.isNotEmpty()) {
             TimelineItemReadReceiptView(
                 state = ReadReceiptViewState(
                     sendState = null,
                     isLastOutgoingMessage = false,
                     receipts = timelineItem.aggregatedReadReceipts,
                 ),
-                renderReadReceipts = true,
                 onReadReceiptsClick = onExpandGroupClick
             )
         }
@@ -220,7 +218,6 @@ internal fun TimelineItemGroupedEventsRowContentExpandedPreview() = ElementPrevi
         timelineRoomInfo = aTimelineRoomInfo(),
         timelineProtectionState = aTimelineProtectionState(),
         focusedEventId = events.events.first().eventId,
-        renderReadReceipts = true,
         isLastOutgoingMessage = false,
         displayThreadSummaries = false,
         onClick = {},
@@ -248,7 +245,34 @@ internal fun TimelineItemGroupedEventsRowContentCollapsePreview() = ElementPrevi
         timelineRoomInfo = aTimelineRoomInfo(),
         timelineProtectionState = aTimelineProtectionState(),
         focusedEventId = null,
-        renderReadReceipts = true,
+        isLastOutgoingMessage = false,
+        displayThreadSummaries = false,
+        onClick = {},
+        onLongClick = {},
+        onLinkLongClick = {},
+        inReplyToClick = {},
+        onUserDataClick = {},
+        onLinkClick = {},
+        onReactionClick = { _, _ -> },
+        onReactionLongClick = { _, _ -> },
+        onMoreReactionsClick = {},
+        onReadReceiptClick = {},
+        eventSink = {},
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemRedactedMessagesGroupPreview() = ElementPreview {
+    // A collapsed run of deleted messages, shown as a single "N removed messages" header.
+    TimelineItemGroupedEventsRowContent(
+        isExpanded = false,
+        onExpandGroupClick = {},
+        timelineItem = aRedactedMessagesGroupedEvents(count = 11),
+        timelineMode = Timeline.Mode.Live,
+        timelineRoomInfo = aTimelineRoomInfo(),
+        timelineProtectionState = aTimelineProtectionState(),
+        focusedEventId = null,
         isLastOutgoingMessage = false,
         displayThreadSummaries = false,
         onClick = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
index 469afe494e..fb9659ff70 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
@@ -31,12 +31,12 @@ import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.components.event.TimelineItemEventContentView
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
-import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.libraries.designsystem.colors.gradientSubtleColors
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
@@ -47,7 +47,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import io.element.android.wysiwyg.link.Link
 import kotlin.time.DurationUnit
 
@@ -56,7 +56,6 @@ internal fun TimelineItemRow(
     timelineItem: TimelineItem,
     timelineMode: Timeline.Mode,
     timelineRoomInfo: TimelineRoomInfo,
-    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     timelineProtectionState: TimelineProtectionState,
     focusedEventId: EventId?,
@@ -65,29 +64,31 @@ internal fun TimelineItemRow(
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
     onContentClick: (TimelineItem.Event) -> Unit,
+    onGalleryItemClick: (TimelineItem.Event, Int) -> Unit,
     onLongClick: (TimelineItem.Event) -> Unit,
     inReplyToClick: (EventId) -> Unit,
     onReactionClick: (key: String, TimelineItem.Event) -> Unit,
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
-    onSwipeToReply: (TimelineItem.Event) -> Unit,
     onJoinCallClick: (isAudioCall: Boolean) -> Unit,
+    onSwipeToReply: (TimelineItem.Event) -> Unit,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
     eventContentView: @Composable (TimelineItem.Event, Modifier, (ContentAvoidingLayoutData) -> Unit) -> Unit =
         { event, contentModifier, onContentLayoutChange ->
             TimelineItemEventContentView(
+                eventId = event.eventId,
                 content = event.content,
-                hideMediaContent = timelineProtectionState.hideMediaContent(event.eventId),
-                onShowContentClick = { timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(event.eventId)) },
+                timelineProtectionState = timelineProtectionState,
                 onContentClick = { onContentClick(event) },
+                onGalleryItemClick = { index -> onGalleryItemClick(event, index) },
                 onLongClick = { onLongClick(event) },
                 onLinkClick = onLinkClick,
                 onLinkLongClick = onLinkLongClick,
                 eventSink = eventSink,
                 modifier = contentModifier,
-                onContentLayoutChange = onContentLayoutChange
+                onContentLayoutChange = onContentLayoutChange,
             )
         },
 ) {
@@ -115,22 +116,36 @@ internal fun TimelineItemRow(
                     is TimelineItemStateContent, is TimelineItemLegacyCallInviteContent -> {
                         TimelineItemStateEventRow(
                             event = timelineItem,
-                            renderReadReceipts = renderReadReceipts,
                             isLastOutgoingMessage = isLastOutgoingMessage,
                             onClick = { onContentClick(timelineItem) },
                             onReadReceiptsClick = onReadReceiptClick,
                             onLongClick = { onLongClick(timelineItem) },
+                            timelineProtectionState = timelineProtectionState,
                             eventSink = eventSink,
                         )
                     }
                     is TimelineItemRtcNotificationContent -> {
-                        TimelineItemCallNotifyView(
-                            modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp),
-                            event = timelineItem,
-                            roomCallState = timelineRoomInfo.roomCallState,
-                            onLongClick = onLongClick,
-                            onJoinCallClick = onJoinCallClick,
-                        )
+                        when (timelineItem.content.state) {
+                            is RtcNotificationState.Active -> ActiveCallTimelineItemView(
+                                timelineRoomInfo = timelineRoomInfo,
+                                event = timelineItem,
+                                state = timelineItem.content.state,
+                                isLastOutgoingMessage = isLastOutgoingMessage,
+                                onLongClick = onLongClick,
+                                onReadReceiptsClick = onReadReceiptClick,
+                                onJoinCallClick = onJoinCallClick,
+                            )
+                            is RtcNotificationState.Started, is RtcNotificationState.Declined ->
+                                TimelineItemCallNotifyView(
+                                    timelineRoomInfo = timelineRoomInfo,
+                                    event = timelineItem,
+                                    content = timelineItem.content,
+                                    state = timelineItem.content.state,
+                                    isLastOutgoingMessage = isLastOutgoingMessage,
+                                    onLongClick = onLongClick,
+                                    onReadReceiptsClick = onReadReceiptClick,
+                                )
+                        }
                     }
                     else -> {
                         val a11yVoiceMessage = stringResource(CommonStrings.a11y_voice_message)
@@ -166,7 +181,6 @@ internal fun TimelineItemRow(
                             event = timelineItem,
                             timelineMode = timelineMode,
                             timelineRoomInfo = timelineRoomInfo,
-                            renderReadReceipts = renderReadReceipts,
                             timelineProtectionState = timelineProtectionState,
                             isLastOutgoingMessage = isLastOutgoingMessage,
                             displayThreadSummaries = displayThreadSummaries,
@@ -181,6 +195,7 @@ internal fun TimelineItemRow(
                             onMoreReactionsClick = onMoreReactionsClick,
                             onReadReceiptClick = onReadReceiptClick,
                             onSwipeToReply = { onSwipeToReply(timelineItem) },
+                            onGalleryItemClick = { index -> onGalleryItemClick(timelineItem, index) },
                             eventSink = eventSink,
                             eventContentView = { contentModifier, onContentLayoutChange ->
                                 eventContentView(timelineItem, contentModifier, onContentLayoutChange)
@@ -195,7 +210,6 @@ internal fun TimelineItemRow(
                     timelineMode = timelineMode,
                     timelineRoomInfo = timelineRoomInfo,
                     timelineProtectionState = timelineProtectionState,
-                    renderReadReceipts = renderReadReceipts,
                     isLastOutgoingMessage = isLastOutgoingMessage,
                     focusedEventId = focusedEventId,
                     displayThreadSummaries = displayThreadSummaries,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
index 6e409f2b8d..eb27134065 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
@@ -31,6 +31,8 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
+import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState
 import io.element.android.features.messages.impl.timeline.util.defaultTimelineContentPadding
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -39,11 +41,11 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 fun TimelineItemStateEventRow(
     event: TimelineItem.Event,
-    renderReadReceipts: Boolean,
     isLastOutgoingMessage: Boolean,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
     onReadReceiptsClick: (event: TimelineItem.Event) -> Unit,
+    timelineProtectionState: TimelineProtectionState,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -68,13 +70,14 @@ fun TimelineItemStateEventRow(
                     .widthIn(max = 320.dp)
             ) {
                 TimelineItemEventContentView(
+                    eventId = event.eventId,
                     content = event.content,
                     onLinkClick = {},
                     onLinkLongClick = {},
-                    hideMediaContent = false,
-                    onShowContentClick = {},
+                    timelineProtectionState = timelineProtectionState,
                     eventSink = eventSink,
                     onContentClick = null,
+                    onGalleryItemClick = {},
                     onLongClick = null,
                     modifier = Modifier.defaultTimelineContentPadding()
                 )
@@ -86,7 +89,6 @@ fun TimelineItemStateEventRow(
                 isLastOutgoingMessage = isLastOutgoingMessage,
                 receipts = event.readReceiptState.receipts,
             ),
-            renderReadReceipts = renderReadReceipts,
             onReadReceiptsClick = { onReadReceiptsClick(event) },
         )
     }
@@ -104,11 +106,11 @@ internal fun TimelineItemStateEventRowPreview() = ElementPreview {
                 receipts = persistentListOf(aReadReceiptData(0)),
             )
         ),
-        renderReadReceipts = true,
         isLastOutgoingMessage = false,
         onClick = {},
         onLongClick = {},
         onReadReceiptsClick = {},
+        timelineProtectionState = aTimelineProtectionState(),
         eventSink = {}
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimestampPosition.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimestampPosition.kt
index 605db65da3..505edeef15 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimestampPosition.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimestampPosition.kt
@@ -22,7 +22,12 @@ enum class TimestampPosition {
     /**
      * Timestamp should always be rendered below the timeline event content (eg. poll).
      */
-    Below;
+    Below,
+
+    /**
+     * Timestamp should be hidden.
+     */
+    Hidden;
 
     companion object {
         /**
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
index f42a26cf65..c90a0e5acc 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
@@ -10,17 +10,16 @@ package io.element.android.features.messages.impl.timeline.components.customreac
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import io.element.android.emojibasebindings.Emoji
-import io.element.android.features.messages.impl.timeline.components.customreaction.picker.EmojiPicker
-import io.element.android.features.messages.impl.timeline.components.customreaction.picker.EmojiPickerPresenter
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.features.messages.impl.timeline.a11y.a11yReactionAction
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
 import io.element.android.libraries.designsystem.theme.components.hide
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -28,43 +27,43 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransa
 fun CustomReactionBottomSheet(
     state: CustomReactionState,
     onSelectEmoji: (EventOrTransactionId, Emoji) -> Unit,
+    emojiPickerRenderer: EmojiPickerRenderer,
     modifier: Modifier = Modifier,
 ) {
-    val sheetState = rememberModalBottomSheetState()
+    val sheetState = rememberBottomSheetState(initialValue = SheetValue.Hidden)
     val coroutineScope = rememberCoroutineScope()
-    val target = state.target as? CustomReactionState.Target.Success
 
-    fun onDismiss() {
-        state.eventSink(CustomReactionEvent.DismissCustomReactionSheet)
-    }
+    when (state.target) {
+        CustomReactionState.Target.None,
+        is CustomReactionState.Target.Loading -> Unit
+        is CustomReactionState.Target.Success -> {
+            fun onEmojiSelectedDismiss(emoji: Emoji) {
+                sheetState.hide(coroutineScope) {
+                    state.eventSink(CustomReactionEvent.DismissCustomReactionSheet)
+                    onSelectEmoji(state.target.event.eventOrTransactionId, emoji)
+                }
+            }
 
-    fun onEmojiSelectedDismiss(emoji: Emoji) {
-        if (target?.event == null) return
-        sheetState.hide(coroutineScope) {
-            state.eventSink(CustomReactionEvent.DismissCustomReactionSheet)
-            onSelectEmoji(target.event.eventOrTransactionId, emoji)
-        }
-    }
+            fun onDismiss() {
+                state.eventSink(CustomReactionEvent.DismissCustomReactionSheet)
+            }
 
-    if (target?.emojibaseStore != null && target.event.eventId != null) {
-        ModalBottomSheet(
-            onDismissRequest = ::onDismiss,
-            sheetState = sheetState,
-            modifier = modifier
-        ) {
-            val presenter = remember {
-                EmojiPickerPresenter(
-                    emojibaseStore = target.emojibaseStore,
-                    recentEmojis = state.recentEmojis,
-                    coroutineDispatchers = CoroutineDispatchers.Default,
+            ModalBottomSheet(
+                onDismissRequest = ::onDismiss,
+                sheetState = sheetState,
+                modifier = modifier,
+                scrollable = false,
+            ) {
+                emojiPickerRenderer.Render(
+                    state = state.target.emojiPickerState,
+                    onSelectEmoji = ::onEmojiSelectedDismiss,
+                    selectedEmojis = state.selectedEmoji,
+                    modifier = Modifier.fillMaxSize(),
+                    contentDescription = { emoji, isSelected ->
+                        a11yReactionAction(emoji = emoji.unicode, userAlreadyReacted = isSelected)
+                    },
                 )
             }
-            EmojiPicker(
-                onSelectEmoji = ::onEmojiSelectedDismiss,
-                state = presenter.present(),
-                selectedEmojis = state.selectedEmoji,
-                modifier = Modifier.fillMaxSize(),
-            )
         }
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt
index a1ebb66ea7..fe68092be0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenter.kt
@@ -9,59 +9,53 @@
 package io.element.android.features.messages.impl.timeline.components.customreaction
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.recentemojis.api.EmojibaseProvider
-import io.element.android.libraries.recentemojis.api.GetRecentEmojis
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
+import io.element.android.libraries.emoji.api.picker.EmojiPickerPresenter
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
 import kotlinx.collections.immutable.toImmutableSet
-import kotlinx.coroutines.launch
 
 @Inject
 class CustomReactionPresenter(
-    private val emojibaseProvider: EmojibaseProvider,
-    private val getRecentEmojis: GetRecentEmojis,
+    emojiPickerPresenterFactory: EmojiPickerPresenter.Factory,
+    getRecentEmojis: GetRecentEmojis,
 ) : Presenter<CustomReactionState> {
+    private val emojiPickerPresenter = emojiPickerPresenterFactory.create(getRecentEmojis)
     @Composable
     override fun present(): CustomReactionState {
-        val localCoroutineScope = rememberCoroutineScope()
-        var recentEmojis by remember { mutableStateOf<ImmutableList<String>>(persistentListOf()) }
-
-        val target: MutableState<CustomReactionState.Target> = remember {
-            mutableStateOf(CustomReactionState.Target.None)
-        }
-
-        fun handleShowCustomReactionSheet(event: TimelineItem.Event) {
-            target.value = CustomReactionState.Target.Loading(event)
-            localCoroutineScope.launch {
-                recentEmojis = getRecentEmojis().getOrNull() ?: persistentListOf()
-                target.value = CustomReactionState.Target.Success(
-                    event = event,
-                    emojibaseStore = emojibaseProvider.emojibaseStore
-                )
-            }
-        }
-
-        fun handleDismissCustomReactionSheet() {
-            target.value = CustomReactionState.Target.None
-        }
+        var internalTarget by remember { mutableStateOf<InternalTarget>(InternalTarget.None) }
+        val emojiPickerState = emojiPickerPresenter.present()
 
         fun handleEvent(event: CustomReactionEvent) {
             when (event) {
-                is CustomReactionEvent.ShowCustomReactionSheet -> handleShowCustomReactionSheet(event.event)
-                is CustomReactionEvent.DismissCustomReactionSheet -> handleDismissCustomReactionSheet()
+                is CustomReactionEvent.ShowCustomReactionSheet -> {
+                    internalTarget = InternalTarget.Showing(event.event)
+                }
+                is CustomReactionEvent.DismissCustomReactionSheet -> {
+                    internalTarget = InternalTarget.None
+                }
             }
         }
-        val event = (target.value as? CustomReactionState.Target.Success)?.event
-        val selectedEmoji = event
+
+        val computedTarget = when (val target = internalTarget) {
+            InternalTarget.None -> CustomReactionState.Target.None
+            is InternalTarget.Showing -> if (emojiPickerState.isReady) {
+                CustomReactionState.Target.Success(
+                    event = target.event,
+                    emojiPickerState = emojiPickerState,
+                )
+            } else {
+                CustomReactionState.Target.Loading(target.event)
+            }
+        }
+
+        val eventForSelection = (computedTarget as? CustomReactionState.Target.Success)?.event
+        val selectedEmoji = eventForSelection
             ?.reactionsState
             ?.reactions
             ?.mapNotNull { if (it.isHighlighted) it.key else null }
@@ -69,10 +63,14 @@ class CustomReactionPresenter(
             .toImmutableSet()
 
         return CustomReactionState(
-            target = target.value,
+            target = computedTarget,
             selectedEmoji = selectedEmoji,
-            recentEmojis = recentEmojis,
             eventSink = ::handleEvent,
         )
     }
 }
+
+private sealed interface InternalTarget {
+    data object None : InternalTarget
+    data class Showing(val event: TimelineItem.Event) : InternalTarget
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionState.kt
index 1897d4e5a7..566453b32b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionState.kt
@@ -8,15 +8,13 @@
 
 package io.element.android.features.messages.impl.timeline.components.customreaction
 
-import io.element.android.emojibasebindings.EmojibaseStore
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import kotlinx.collections.immutable.ImmutableList
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
 import kotlinx.collections.immutable.ImmutableSet
 
 data class CustomReactionState(
     val target: Target,
     val selectedEmoji: ImmutableSet<String>,
-    val recentEmojis: ImmutableList<String>,
     val eventSink: (CustomReactionEvent) -> Unit,
 ) {
     sealed interface Target {
@@ -24,7 +22,7 @@ data class CustomReactionState(
         data class Loading(val event: TimelineItem.Event) : Target
         data class Success(
             val event: TimelineItem.Event,
-            val emojibaseStore: EmojibaseStore,
+            val emojiPickerState: EmojiPickerState,
         ) : Target
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
deleted file mode 100644
index 629eaa72ab..0000000000
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.messages.impl.timeline.components.customreaction
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.ripple
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.emojibasebindings.Emoji
-import io.element.android.features.messages.impl.timeline.a11y.a11yReactionAction
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.text.toDp
-import io.element.android.libraries.designsystem.theme.components.Text
-import kotlinx.collections.immutable.persistentListOf
-
-@Composable
-fun EmojiItem(
-    item: Emoji,
-    isSelected: Boolean,
-    onSelectEmoji: (Emoji) -> Unit,
-    modifier: Modifier = Modifier,
-    emojiSize: TextUnit = 20.sp,
-) {
-    val backgroundColor = if (isSelected) {
-        ElementTheme.colors.bgActionPrimaryRest
-    } else {
-        Color.Transparent
-    }
-    val description = a11yReactionAction(
-        emoji = item.unicode,
-        userAlreadyReacted = isSelected,
-    )
-    Box(
-        modifier = modifier
-            .sizeIn(minWidth = 40.dp, minHeight = 40.dp)
-            .background(backgroundColor, CircleShape)
-            .clickable(
-                enabled = true,
-                onClick = { onSelectEmoji(item) },
-                indication = ripple(bounded = false, radius = emojiSize.toDp() / 2 + 10.dp),
-                interactionSource = remember { MutableInteractionSource() }
-            )
-            .clearAndSetSemantics {
-                contentDescription = description
-            },
-        contentAlignment = Alignment.Center
-    ) {
-        Text(
-            text = item.unicode,
-            style = LocalTextStyle.current.copy(fontSize = emojiSize),
-        )
-    }
-}
-
-@PreviewsDayNight
-@Composable
-internal fun EmojiItemPreview() = ElementPreview {
-    Row(
-        horizontalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        for (isSelected in listOf(true, false)) {
-            EmojiItem(
-                item = Emoji(
-                    hexcode = "",
-                    label = "",
-                    tags = null,
-                    shortcodes = persistentListOf(),
-                    unicode = "👍",
-                    skins = null
-                ),
-                isSelected = isSelected,
-                onSelectEmoji = {},
-            )
-        }
-    }
-}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenter.kt
deleted file mode 100644
index 3a4cf6c9ce..0000000000
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenter.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
-
-import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalInspectionMode
-import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.emojibasebindings.Emoji
-import io.element.android.emojibasebindings.EmojibaseStore
-import io.element.android.features.messages.impl.R
-import io.element.android.features.messages.impl.timeline.components.customreaction.icon
-import io.element.android.features.messages.impl.timeline.components.customreaction.title
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.designsystem.theme.components.IconSource
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.withContext
-import kotlin.time.Duration.Companion.milliseconds
-
-class EmojiPickerPresenter(
-    private val emojibaseStore: EmojibaseStore,
-    private val recentEmojis: ImmutableList<String>,
-    private val coroutineDispatchers: CoroutineDispatchers,
-) : Presenter<EmojiPickerState> {
-    @Composable
-    override fun present(): EmojiPickerState {
-        val queryState = rememberTextFieldState()
-        var isSearchActive by remember { mutableStateOf(false) }
-        var emojiResults by remember { mutableStateOf<SearchBarResultState<ImmutableList<Emoji>>>(SearchBarResultState.Initial()) }
-
-        val recentEmojiIcon = CompoundIcons.History()
-        val categories = remember {
-            val providedCategories = emojibaseStore.categories.map { (category, emojis) ->
-                EmojiCategory(
-                    titleId = category.title,
-                    icon = IconSource.Vector(category.icon),
-                    emojis = emojis
-                )
-            }
-            if (recentEmojis.isNotEmpty()) {
-                val recentEmojis = recentEmojis.mapNotNull { recentEmoji ->
-                    emojibaseStore.allEmojis.find { it.unicode == recentEmoji }
-                }.toImmutableList()
-                val recentCategory =
-                    EmojiCategory(
-                        titleId = R.string.emoji_picker_category_recent,
-                        icon = IconSource.Vector(recentEmojiIcon),
-                        emojis = recentEmojis
-                    )
-                (listOf(recentCategory) + providedCategories).toImmutableList()
-            } else {
-                providedCategories.toImmutableList()
-            }
-        }
-
-        val searchQuery = queryState.text.toString()
-        LaunchedEffect(searchQuery) {
-            emojiResults = if (searchQuery.isEmpty()) {
-                SearchBarResultState.Initial()
-            } else {
-                // Add a small delay to avoid doing too many computations when the user is typing quickly
-                delay(100.milliseconds)
-
-                val lowercaseQuery = searchQuery.lowercase()
-                val results = withContext(coroutineDispatchers.computation) {
-                    emojibaseStore.allEmojis
-                        .asSequence()
-                        .filter { emoji ->
-                            emoji.tags.orEmpty().any { it.contains(lowercaseQuery) } ||
-                                emoji.shortcodes.any { it.contains(lowercaseQuery) }
-                        }
-                        .take(60)
-                        .toImmutableList()
-                }
-
-                SearchBarResultState.Results(results)
-            }
-        }
-
-        val isInPreview = LocalInspectionMode.current
-        fun handleEvent(event: EmojiPickerEvent) {
-            when (event) {
-                // For some reason, in preview mode the SearchBar emits this event with an `isActive = true` value automatically
-                is EmojiPickerEvent.ToggleSearchActive -> if (!isInPreview) {
-                    isSearchActive = event.isActive
-                }
-            }
-        }
-
-        return EmojiPickerState(
-            categories = categories,
-            allEmojis = emojibaseStore.allEmojis,
-            searchQuery = queryState,
-            isSearchActive = isSearchActive,
-            searchResults = emojiResults,
-            eventSink = ::handleEvent,
-        )
-    }
-}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentView.kt
index 4aa41a472b..38d575718f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentView.kt
@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -25,8 +24,10 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayout
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 
 /**
  * package-private, you should only use TimelineItemFileView and TimelineItemAudioView.
@@ -38,9 +39,9 @@ fun TimelineItemAttachmentView(
     iconContentDescription: String?,
     filename: String,
     fileExtensionAndSize: String,
-    caption: String?,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
+    contentValidationValue: ContentValidationValue = ContentValidationValue.Valid,
 ) {
     Column(
         modifier = modifier,
@@ -50,16 +51,9 @@ fun TimelineItemAttachmentView(
             iconContentDescription = iconContentDescription,
             filename = filename,
             fileExtensionAndSize = fileExtensionAndSize,
-            hasCaption = caption != null,
+            isLoading = !contentValidationValue.isValidated(),
             onContentLayoutChange = onContentLayoutChange,
         )
-        if (caption != null) {
-            TimelineItemAttachmentCaptionView(
-                modifier = Modifier.padding(top = 4.dp),
-                caption = caption,
-                onContentLayoutChange = onContentLayoutChange,
-            )
-        }
     }
 }
 
@@ -69,7 +63,7 @@ private fun TimelineItemAttachmentHeaderView(
     iconContentDescription: String?,
     filename: String,
     fileExtensionAndSize: String,
-    hasCaption: Boolean,
+    isLoading: Boolean,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -86,12 +80,19 @@ private fun TimelineItemAttachmentHeaderView(
                 .background(ElementTheme.colors.bgCanvasDefault, RoundedCornerShape(4.dp)),
             contentAlignment = Alignment.Center,
         ) {
-            Icon(
-                imageVector = icon,
-                contentDescription = iconContentDescription,
-                tint = ElementTheme.colors.iconPrimary,
-                modifier = Modifier.size(24.dp),
-            )
+            if (isLoading) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(24.dp),
+                    color = ElementTheme.colors.iconPrimary,
+                )
+            } else {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = iconContentDescription,
+                    tint = ElementTheme.colors.iconPrimary,
+                    modifier = Modifier.size(24.dp),
+                )
+            }
         }
         Column {
             Text(
@@ -107,32 +108,11 @@ private fun TimelineItemAttachmentHeaderView(
                 style = ElementTheme.typography.fontBodySmRegular,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
-                onTextLayout = if (hasCaption) {
-                    {}
-                } else {
-                    ContentAvoidingLayout.measureLastTextLine(
-                        onContentLayoutChange = onContentLayoutChange,
-                        extraWidth = iconSize + spacing
-                    )
-                },
+                onTextLayout = ContentAvoidingLayout.measureLastTextLine(
+                    onContentLayoutChange = onContentLayoutChange,
+                    extraWidth = iconSize + spacing
+                ),
             )
         }
     }
 }
-
-@Composable
-private fun TimelineItemAttachmentCaptionView(
-    caption: String,
-    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    Text(
-        modifier = modifier,
-        text = caption,
-        color = ElementTheme.colors.textPrimary,
-        style = ElementTheme.typography.fontBodyLgRegular,
-        onTextLayout = ContentAvoidingLayout.measureLastTextLine(
-            onContentLayoutChange = onContentLayoutChange,
-        )
-    )
-}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsContentProvider.kt
new file mode 100644
index 0000000000..c63d68e062
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsContentProvider.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.event
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAttachmentsContent
+import io.element.android.features.messages.impl.timeline.model.event.anAttachmentItem
+import io.element.android.libraries.matrix.api.media.MediaSource
+
+class TimelineItemAttachmentsContentProvider : PreviewParameterProvider<TimelineItemAttachmentsContent> {
+    override val values: Sequence<TimelineItemAttachmentsContent>
+        get() = sequenceOf(
+            aTimelineItemAttachmentsContent(
+                body = "Files",
+                caption = null,
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "document.pdf",
+                        mimeType = "application/pdf",
+                        fileSize = null,
+                        formattedFileSize = "2.5 MB",
+                        fileExtension = "PDF",
+                    ),
+                    anAttachmentItem(
+                        filename = "spreadsheet.xlsx",
+                        mimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                        fileSize = null,
+                        formattedFileSize = "450 KB",
+                        fileExtension = "XLSX",
+                    ),
+                ),
+            ),
+            aTimelineItemAttachmentsContent(
+                body = "Files",
+                attachments = listOf(
+                    anAttachmentItem(
+                        filename = "report.pdf",
+                        mimeType = "application/pdf",
+                        fileSize = null,
+                        formattedFileSize = "3.2 MB",
+                        fileExtension = "PDF",
+                    ),
+                    anAttachmentItem(
+                        filename = "notes.txt",
+                        mimeType = "text/plain",
+                        fileSize = null,
+                        formattedFileSize = "12 KB",
+                        fileExtension = "TXT",
+                    ),
+                    anAttachmentItem(
+                        filename = "photo.jpg",
+                        mimeType = "image/jpeg",
+                        thumbnailSource = MediaSource(url = "thumb", json = ""),
+                        fileSize = null,
+                        formattedFileSize = "1.2 MB",
+                        fileExtension = "JPG",
+                    ),
+                    anAttachmentItem(
+                        filename = "video.mp4",
+                        mimeType = "video/mp4",
+                        thumbnailSource = MediaSource(url = "thumb", json = ""),
+                        fileSize = null,
+                        formattedFileSize = "15 MB",
+                        fileExtension = "MP4",
+                    ),
+                ),
+            ),
+        )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsListView.kt
new file mode 100644
index 0000000000..f3745b2c5a
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAttachmentsListView.kt
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.event
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.toMutableStateList
+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.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.timeline.model.event.AttachmentItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
+import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InvalidContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NotFoundContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectMediaState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.rememberEventContentValidationState
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlin.math.max
+
+@Composable
+fun TimelineItemAttachmentsListView(
+    eventId: EventId?,
+    content: TimelineItemAttachmentsContent,
+    onGalleryItemClick: (Int) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val contentValidationState = rememberEventContentValidationState(
+        eventId = eventId,
+        needsValidation = content.isMedia,
+    )
+
+    Column(modifier = modifier.fillMaxWidth()) {
+        val validationStates = remember(content.attachments) {
+            buildList {
+                for (attachment in content.attachments) {
+                    add(validationStateForAttachment(attachment, contentValidationState))
+                }
+            }.toMutableStateList()
+        }
+        content.attachments.forEachIndexed { index, attachment ->
+            Column(modifier = Modifier.fillMaxWidth()) {
+                val thumbnailContentValidationState by contentValidationState.collectMediaState(attachment.thumbnailSource?.safeUrl)
+                val mediaContentValidationState by contentValidationState.collectMediaState(attachment.mediaSource.safeUrl)
+
+                val itemContentValidationState = remember(thumbnailContentValidationState, mediaContentValidationState) {
+                    validationStateForAttachment(attachment, contentValidationState)
+                }
+
+                LaunchedEffect(itemContentValidationState) {
+                    validationStates[index] = itemContentValidationState
+                }
+
+                val needsSeparator = index in 1..max(1, content.attachments.lastIndex)
+                val isPreviousItemInvalid = validationStates.getOrNull(index - 1)?.hasError() == true
+                if (needsSeparator && !itemContentValidationState.hasError() && !isPreviousItemInvalid) {
+                    HorizontalDivider(
+                        color = ElementTheme.colors.borderInteractiveSecondary,
+                    )
+                }
+
+                when (itemContentValidationState) {
+                    ContentValidationValue.Invalid -> {
+                        val shape = RoundedCornerShape(6.dp)
+                        InvalidContentView(
+                            modifier = Modifier
+                                .padding(vertical = 6.dp)
+                                .border(width = 1.dp, color = ElementTheme.colors.borderCriticalSubtle, shape = shape)
+                                .clip(shape),
+                            contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                        )
+                    }
+                    is ContentValidationValue.UnrecoverableError -> {
+                        val shape = RoundedCornerShape(6.dp)
+                        NotFoundContentView(
+                            modifier = Modifier
+                                .padding(vertical = 6.dp)
+                                .border(width = 1.dp, color = ElementTheme.colors.borderCriticalSubtle, shape = shape)
+                                .clip(shape),
+                            contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                        )
+                    }
+                    ContentValidationValue.Loading -> {
+                        CircularProgressIndicator(modifier = Modifier.padding(8.dp).align(Alignment.CenterHorizontally))
+                    }
+                    ContentValidationValue.Valid -> {
+                        AttachmentListItem(
+                            attachment = attachment,
+                            onClick = { onGalleryItemClick(index) },
+                        )
+                    }
+                    else -> {
+                        // TODO handle cases where either the content hasn't started validation or it failed to do so
+                    }
+                }
+
+                if (index == content.attachments.lastIndex && content.showCaption && !itemContentValidationState.isInvalid()) {
+                    HorizontalDivider(
+                        color = ElementTheme.colors.borderInteractiveSecondary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun validationStateForAttachment(
+    attachment: AttachmentItem,
+    contentValidationState: ContentValidationState,
+): ContentValidationValue {
+    val thumbnailValue = attachment.thumbnailSource?.safeUrl?.let { contentValidationState.getCurrentMediaState(it) } ?: ContentValidationValue.Unknown
+    val mediaValue = contentValidationState.getCurrentMediaState(attachment.mediaSource.safeUrl)
+    return validationStateForAttachment(thumbnailValue, mediaValue)
+}
+
+private fun validationStateForAttachment(
+    thumbnailValue: ContentValidationValue,
+    mediaValue: ContentValidationValue,
+): ContentValidationValue {
+    return if (thumbnailValue.isInvalid() || mediaValue.isInvalid()) {
+        ContentValidationValue.Invalid
+    } else if (thumbnailValue.hasUnrecoverableError() || mediaValue.hasUnrecoverableError()) {
+        listOf(thumbnailValue, mediaValue).first { it.hasUnrecoverableError() }
+    } else if (thumbnailValue.isLoading() || mediaValue.isLoading()) {
+        ContentValidationValue.Loading
+    } else {
+        mediaValue
+    }
+}
+
+@Composable
+private fun AttachmentListItem(
+    attachment: AttachmentItem,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val iconSize = 36.dp
+    val thumbnailSize = 36L
+    val spacing = 8.dp
+    Row(
+        modifier = modifier
+            .clickable(onClick = onClick)
+            .padding(vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(spacing),
+    ) {
+        Box(
+            modifier = Modifier
+                .size(iconSize)
+                .clip(RoundedCornerShape(4.dp))
+                .background(ElementTheme.colors.bgCanvasDefault),
+            contentAlignment = Alignment.Center,
+        ) {
+            if (attachment.thumbnailSource != null) {
+                val isVideo = attachment.mimeType.isMimeTypeVideo()
+                AsyncImage(
+                    model = MediaRequestData(
+                        source = attachment.thumbnailSource,
+                        kind = MediaRequestData.Kind.Thumbnail(thumbnailSize),
+                    ),
+                    contentDescription = attachment.filename,
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier
+                        .size(iconSize)
+                        .clip(RoundedCornerShape(4.dp)),
+                )
+                if (isVideo) {
+                    Box(
+                        modifier = Modifier
+                            .size(iconSize)
+                            .background(
+                                color = Color.Black.copy(alpha = 0.3f),
+                                shape = RoundedCornerShape(4.dp)
+                            ),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.VideoCallSolid(),
+                            contentDescription = stringResource(CommonStrings.common_video),
+                            tint = Color.White,
+                            modifier = Modifier.size(20.dp),
+                        )
+                    }
+                }
+            } else {
+                val isImage = attachment.mimeType.isMimeTypeImage()
+                val isVideo = attachment.mimeType.isMimeTypeVideo()
+                val isAudio = attachment.mimeType.isMimeTypeAudio()
+                val icon = when {
+                    isImage -> CompoundIcons.Image()
+                    isVideo -> CompoundIcons.VideoCall()
+                    isAudio -> CompoundIcons.Audio()
+                    else -> CompoundIcons.Attachment()
+                }
+                Icon(
+                    imageVector = icon,
+                    contentDescription = null,
+                    tint = ElementTheme.colors.iconPrimary,
+                    modifier = Modifier.size(24.dp),
+                )
+            }
+        }
+
+        Column(
+            modifier = Modifier.weight(1f),
+        ) {
+            Text(
+                text = attachment.filename,
+                color = ElementTheme.colors.textPrimary,
+                style = ElementTheme.typography.fontBodyLgRegular,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+            Text(
+                text = "${attachment.fileExtension} • ${attachment.formattedFileSize}",
+                color = ElementTheme.colors.textSecondary,
+                style = ElementTheme.typography.fontBodySmRegular,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemAttachmentsListViewPreview(
+    @PreviewParameter(TimelineItemAttachmentsContentProvider::class) content: TimelineItemAttachmentsContent
+) = ElementPreview {
+    TimelineItemAttachmentsListView(
+        eventId = EventId("\$eventId"),
+        content = content,
+        onGalleryItemClick = {},
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
index d5a07194cf..221ba2ca6f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
@@ -16,11 +16,13 @@ import io.element.android.features.messages.impl.timeline.components.layout.Cont
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContentProvider
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 
 @Composable
 fun TimelineItemAudioView(
     content: TimelineItemAudioContent,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
     TimelineItemAttachmentView(
@@ -28,9 +30,9 @@ fun TimelineItemAudioView(
         iconContentDescription = null,
         filename = content.filename,
         fileExtensionAndSize = content.fileExtensionAndSize,
-        caption = content.caption,
         onContentLayoutChange = onContentLayoutChange,
         modifier = modifier,
+        contentValidationValue = contentValidationValue,
     )
 }
 
@@ -41,5 +43,6 @@ internal fun TimelineItemAudioViewPreview(@PreviewParameter(TimelineItemAudioCon
         TimelineItemAudioView(
             content,
             onContentLayoutChange = {},
+            contentValidationValue = ContentValidationValue.Valid,
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
index 4fc243864c..4b7ab9372d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
@@ -8,16 +8,32 @@
 
 package io.element.android.features.messages.impl.timeline.components.event
 
+import android.text.SpannedString
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.messages.impl.timeline.TimelineEvent
+import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayout
 import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
 import io.element.android.features.messages.impl.timeline.di.LocalTimelineItemPresenterFactories
 import io.element.android.features.messages.impl.timeline.di.rememberPresenter
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@@ -30,110 +46,265 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
+import io.element.android.features.messages.impl.timeline.model.event.captionOrNull
+import io.element.android.features.messages.impl.timeline.model.event.ensureActiveLiveLocation
+import io.element.android.features.messages.impl.timeline.model.event.formattedCaptionOrNull
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.designsystem.components.EqualWidthColumn
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InvalidContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NotFoundContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.rememberEventContentValidationState
+import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
 import io.element.android.libraries.voiceplayer.api.VoiceMessageState
+import io.element.android.wysiwyg.compose.EditorStyledText
 import io.element.android.wysiwyg.link.Link
 
 @Composable
 fun TimelineItemEventContentView(
+    eventId: EventId?,
     content: TimelineItemEventContent,
-    hideMediaContent: Boolean,
     onContentClick: (() -> Unit)?,
+    onGalleryItemClick: ((Int) -> Unit),
+    timelineProtectionState: TimelineProtectionState,
     onLongClick: (() -> Unit)?,
-    onShowContentClick: () -> Unit,
     onLinkClick: (Link) -> Unit,
     onLinkLongClick: (Link) -> Unit,
     eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
     modifier: Modifier = Modifier,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit = {},
 ) {
-    val presenterFactories = LocalTimelineItemPresenterFactories.current
-    when (content) {
-        is TimelineItemEncryptedContent -> TimelineItemEncryptedView(
-            content = content,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemRedactedContent -> TimelineItemRedactedView(
-            content = content,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemTextBasedContent -> TimelineItemTextView(
-            content = content,
-            modifier = modifier,
-            onLinkClick = onLinkClick,
-            onLinkLongClick = onLinkLongClick,
-            onContentLayoutChange = onContentLayoutChange
-        )
-        is TimelineItemUnknownContent -> TimelineItemUnknownView(
-            content = content,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemLocationContent -> TimelineItemLocationView(
-            content = content,
-            modifier = modifier
-        )
-        is TimelineItemImageContent -> TimelineItemImageView(
-            content = content,
-            hideMediaContent = hideMediaContent,
-            onContentClick = onContentClick,
-            onLongClick = onLongClick,
-            onShowContentClick = onShowContentClick,
-            onLinkClick = onLinkClick,
-            onLinkLongClick = onLinkLongClick,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier,
-        )
-        is TimelineItemStickerContent -> TimelineItemStickerView(
-            content = content,
-            hideMediaContent = hideMediaContent,
-            onContentClick = onContentClick,
-            onLongClick = onLongClick,
-            onShowClick = onShowContentClick,
-            modifier = modifier,
-        )
-        is TimelineItemVideoContent -> TimelineItemVideoView(
-            content = content,
-            hideMediaContent = hideMediaContent,
-            onContentClick = onContentClick,
-            onLongClick = onLongClick,
-            onShowContentClick = onShowContentClick,
-            onLinkClick = onLinkClick,
-            onLinkLongClick = onLinkLongClick,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemFileContent -> TimelineItemFileView(
-            content = content,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemAudioContent -> TimelineItemAudioView(
-            content = content,
-            onContentLayoutChange = onContentLayoutChange,
-            modifier = modifier
-        )
-        is TimelineItemLegacyCallInviteContent -> TimelineItemLegacyCallInviteView(modifier = modifier)
-        is TimelineItemStateContent -> TimelineItemStateView(
-            content = content,
-            modifier = modifier
-        )
-        is TimelineItemPollContent -> TimelineItemPollView(
-            content = content,
-            eventSink = eventSink,
-            modifier = modifier,
-        )
-        is TimelineItemVoiceContent -> {
-            val presenter: Presenter<VoiceMessageState> = presenterFactories.rememberPresenter(content)
-            TimelineItemVoiceView(
-                state = presenter.present(),
-                content = content,
+    val hideMediaContent = remember(eventId, timelineProtectionState.protectionState) {
+        timelineProtectionState.hideMediaContent(eventId)
+    }
+
+    val onShowContentClick = remember(timelineProtectionState.eventSink) {
+        {
+            timelineProtectionState.eventSink(TimelineProtectionEvent.ShowContent(eventId))
+        }
+    }
+
+    val contentValidationState = rememberEventContentValidationState(eventId = eventId, needsValidation = content.isMedia)
+    val overallValidationState by contentValidationState.collectOverallState()
+    val needsContentValidationPerItem = remember(content) { content is TimelineItemGalleryContent || content is TimelineItemAttachmentsContent }
+
+    if (eventId != null) {
+        ValidateMediaHelper(eventId, content, contentValidationState, eventSink)
+    }
+
+    val caption = content.captionOrNull()
+    val showCaption = caption != null && content !is TimelineItemStickerContent && content !is TimelineItemVoiceContent
+    // If a caption is added, it will be used to get the free space for the overlay, so we don't need to add onContentLayoutChange to the actual content
+    val calculatedOnContentLayoutChange = remember(onContentLayoutChange, showCaption) {
+        if (showCaption) {
+            {}
+        } else {
+            onContentLayoutChange
+        }
+    }
+
+    val displayInvalidContent = overallValidationState.isInvalid() && !needsContentValidationPerItem
+    val displayContentNotFound = overallValidationState.hasUnrecoverableError() && !needsContentValidationPerItem
+    EqualWidthColumn(modifier = modifier) {
+        if (displayInvalidContent) {
+            InvalidContentView(
+                contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                onTextLayout = ContentAvoidingLayout.measureLastTextLine(
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                    // Icon + horizontal paddings
+                    extraWidth = 24.dp + 20.dp,
+                )
+            )
+        } else if (displayContentNotFound) {
+            NotFoundContentView(
+                contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                onTextLayout = ContentAvoidingLayout.measureLastTextLine(
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                    // Icon + horizontal paddings
+                    extraWidth = 24.dp + 20.dp,
+                )
+            )
+        } else {
+            val presenterFactories = LocalTimelineItemPresenterFactories.current
+            when (content) {
+                is TimelineItemEncryptedContent -> TimelineItemEncryptedView(
+                    content = content,
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                )
+                is TimelineItemRedactedContent -> TimelineItemRedactedView(
+                    content = content,
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                )
+                is TimelineItemTextBasedContent -> TimelineItemTextView(
+                    content = content,
+                    onLinkClick = onLinkClick,
+                    onLinkLongClick = onLinkLongClick,
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                )
+                is TimelineItemUnknownContent -> TimelineItemUnknownView(
+                    content = content,
+                    onContentLayoutChange = calculatedOnContentLayoutChange,
+                )
+                is TimelineItemLocationContent -> {
+                    TimelineItemLocationView(
+                        content = content.ensureActiveLiveLocation(),
+                        onStopLiveLocationClick = { eventSink(TimelineEvent.StopLiveLocationShare) },
+                    )
+                }
+                is TimelineItemImageContent -> {
+                    TimelineItemImageView(
+                        content = content,
+                        hideMediaContent = hideMediaContent,
+                        onContentClick = onContentClick,
+                        onLongClick = onLongClick,
+                        onShowContentClick = onShowContentClick,
+                        contentValidationState = contentValidationState,
+                    )
+                }
+                is TimelineItemStickerContent -> {
+                    TimelineItemStickerView(
+                        content = content,
+                        hideMediaContent = hideMediaContent,
+                        onContentClick = onContentClick,
+                        onLongClick = onLongClick,
+                        onShowClick = onShowContentClick,
+                        contentValidationState = contentValidationState,
+                    )
+                }
+                is TimelineItemVideoContent -> {
+                    TimelineItemVideoView(
+                        content = content,
+                        hideMediaContent = hideMediaContent,
+                        onContentClick = onContentClick,
+                        onLongClick = onLongClick,
+                        onShowContentClick = onShowContentClick,
+                        contentValidationState = contentValidationState,
+                    )
+                }
+                is TimelineItemGalleryContent -> TimelineItemGalleryView(
+                    eventId = eventId,
+                    content = content,
+                    onGalleryItemClick = { index -> onGalleryItemClick(index) },
+                    onLongClick = onLongClick,
+                )
+                is TimelineItemAttachmentsContent -> TimelineItemAttachmentsListView(
+                    eventId = eventId,
+                    content = content,
+                    onGalleryItemClick = { index -> onGalleryItemClick(index) },
+                )
+                is TimelineItemFileContent -> {
+                    TimelineItemFileView(
+                        content = content,
+                        onContentLayoutChange = calculatedOnContentLayoutChange,
+                        contentValidationValue = overallValidationState,
+                    )
+                }
+                is TimelineItemAudioContent -> {
+                    TimelineItemAudioView(
+                        content = content,
+                        onContentLayoutChange = calculatedOnContentLayoutChange,
+                        contentValidationValue = overallValidationState,
+                    )
+                }
+                is TimelineItemLegacyCallInviteContent -> TimelineItemLegacyCallInviteView()
+                is TimelineItemStateContent -> TimelineItemStateView(
+                    content = content,
+                )
+                is TimelineItemPollContent -> TimelineItemPollView(
+                    content = content,
+                    eventSink = eventSink,
+                )
+                is TimelineItemVoiceContent -> {
+                    val presenter: Presenter<VoiceMessageState> = presenterFactories.rememberPresenter(content)
+                    TimelineItemVoiceView(
+                        state = presenter.present(),
+                        content = content,
+                        onContentLayoutChange = calculatedOnContentLayoutChange,
+                        contentValidationValue = overallValidationState,
+                    )
+                }
+                is TimelineItemRtcNotificationContent -> error("This shouldn't be rendered as the content of a bubble")
+            }
+        }
+
+        if (showCaption) {
+            val padding = if (displayInvalidContent || displayContentNotFound) {
+                PaddingValues(start = 12.dp, end = 12.dp, top = 4.dp, bottom = 0.dp)
+            } else {
+                when (content) {
+                    is TimelineItemImageContent,
+                    is TimelineItemVideoContent,
+                    is TimelineItemGalleryContent,
+                    is TimelineItemAttachmentsContent -> PaddingValues(start = 4.dp, end = 4.dp, top = 8.dp, bottom = 0.dp)
+                    else -> PaddingValues(horizontal = 12.dp, vertical = 8.dp)
+                }
+            }
+            CaptionView(
+                modifier = Modifier.padding(padding),
+                caption = caption,
+                formattedCaption = content.formattedCaptionOrNull(),
+                onLinkClick = onLinkClick,
+                onLinkLongClick = onLinkLongClick,
                 onContentLayoutChange = onContentLayoutChange,
-                modifier = modifier
             )
         }
-        is TimelineItemRtcNotificationContent -> error("This shouldn't be rendered as the content of a bubble")
+    }
+}
+
+@Composable
+private fun CaptionView(
+    caption: String,
+    formattedCaption: CharSequence?,
+    onLinkClick: (Link) -> Unit,
+    onLinkLongClick: (Link) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val caption = if (LocalInspectionMode.current) {
+        SpannedString(caption)
+    } else {
+        formattedCaption ?: SpannedString(caption)
+    }
+    CompositionLocalProvider(
+        LocalContentColor provides ElementTheme.colors.textPrimary,
+        LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular
+    ) {
+        EditorStyledText(
+            modifier = modifier,
+            text = caption,
+            style = ElementRichTextEditorStyle.textStyle(),
+            onLinkClickedListener = onLinkClick,
+            onLinkLongClickedListener = onLinkLongClick,
+            releaseOnDetach = false,
+            onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
+        )
+    }
+}
+
+@Composable
+private fun ValidateMediaHelper(
+    eventId: EventId,
+    content: TimelineItemEventContent,
+    contentValidationState: ContentValidationState,
+    eventSink: (TimelineEvent.TimelineItemEvent) -> Unit,
+) {
+    val mediaSources = when (content) {
+        is TimelineItemImageContent -> listOfNotNull(content.thumbnailSource, content.mediaSource)
+        is TimelineItemStickerContent -> listOfNotNull(content.thumbnailSource, content.mediaSource)
+        is TimelineItemVideoContent -> listOfNotNull(content.thumbnailSource, content.mediaSource)
+        is TimelineItemFileContent -> listOfNotNull(content.thumbnailSource, content.mediaSource)
+        is TimelineItemAudioContent -> listOf(content.mediaSource)
+        is TimelineItemVoiceContent -> listOf(content.mediaSource)
+        is TimelineItemGalleryContent -> content.items.flatMap { listOfNotNull(it.thumbnailSource, it.mediaSource) }
+        is TimelineItemAttachmentsContent -> content.attachments.flatMap { listOfNotNull(it.thumbnailSource, it.mediaSource) }
+        else -> return
+    }
+    val updatedEventSink by rememberUpdatedState(eventSink)
+    LaunchedEffect(eventId, mediaSources) {
+        updatedEventSink(TimelineEvent.ValidateMedia(eventId, mediaSources, contentValidationState))
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
index 7f8be6e60a..cd0632282e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
@@ -17,6 +17,7 @@ import io.element.android.features.messages.impl.timeline.components.layout.Cont
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContentProvider
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.ui.strings.CommonStrings
 
 /**
@@ -26,6 +27,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun TimelineItemFileView(
     content: TimelineItemFileContent,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
     TimelineItemAttachmentView(
@@ -33,9 +35,9 @@ fun TimelineItemFileView(
         iconContentDescription = stringResource(CommonStrings.common_file),
         filename = content.filename,
         fileExtensionAndSize = content.fileExtensionAndSize,
-        caption = content.caption,
         onContentLayoutChange = onContentLayoutChange,
         modifier = modifier,
+        contentValidationValue = contentValidationValue,
     )
 }
 
@@ -46,6 +48,7 @@ internal fun TimelineItemFileViewPreview(@PreviewParameter(TimelineItemFileConte
         TimelineItemFileView(
             content,
             onContentLayoutChange = {},
+            contentValidationValue = ContentValidationValue.Valid,
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryContentProvider.kt
new file mode 100644
index 0000000000..9d88d8c0fb
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryContentProvider.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.event
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
+import io.element.android.libraries.matrix.api.media.MediaSource
+import kotlinx.collections.immutable.toImmutableList
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+class TimelineItemGalleryContentProvider : PreviewParameterProvider<TimelineItemGalleryContent> {
+    override val values: Sequence<TimelineItemGalleryContent>
+        get() = sequenceOf(
+            aTimelineItemGalleryContent(
+                caption = "My vacation photos",
+                items = listOf(
+                    aGalleryItem(),
+                    aGalleryItem(type = GalleryItem.Type.Video, duration = 65.seconds),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(width = 1920, height = 1080),
+                    aGalleryItem(width = 1600, height = 900),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(width = 1080, height = 1920),
+                    aGalleryItem(width = 900, height = 1600),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(width = 1920, height = 1080),
+                    aGalleryItem(width = 1080, height = 1920),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(type = GalleryItem.Type.Video, duration = 45.seconds),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                caption = "2 landscape + 1 portrait",
+                items = listOf(
+                    aGalleryItem(width = 1920, height = 1080),
+                    aGalleryItem(width = 1600, height = 900),
+                    aGalleryItem(width = 1080, height = 1920),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                caption = "1 landscape + 2 portrait",
+                items = listOf(
+                    aGalleryItem(width = 1920, height = 1080),
+                    aGalleryItem(width = 1080, height = 1920),
+                    aGalleryItem(width = 900, height = 1600),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                items = listOf(
+                    aGalleryItem(),
+                    aGalleryItem(),
+                    aGalleryItem(type = GalleryItem.Type.Video, duration = 120.seconds),
+                    aGalleryItem(),
+                    aGalleryItem(),
+                ),
+            ),
+            aTimelineItemGalleryContent(
+                caption = "Many photos",
+                items = (1..12).map {
+                    aGalleryItem(
+                        type = if (it == 3) GalleryItem.Type.Video else GalleryItem.Type.Image,
+                    )
+                },
+            ),
+        )
+}
+
+fun aTimelineItemGalleryContent(
+    body: String = "Gallery",
+    caption: String? = null,
+    items: List<GalleryItem> = listOf(
+        aGalleryItem(),
+        aGalleryItem(),
+        aGalleryItem(),
+        aGalleryItem(),
+    ),
+) = TimelineItemGalleryContent(
+    body = body,
+    caption = caption,
+    formattedCaption = null,
+    isEdited = false,
+    items = items.toImmutableList(),
+)
+
+fun aGalleryItem(
+    filename: String = "photo.jpg",
+    type: GalleryItem.Type = GalleryItem.Type.Image,
+    width: Int = 400,
+    height: Int = 300,
+    duration: Duration = Duration.ZERO,
+    mediaSource: MediaSource = MediaSource(url = "", json = ""),
+): GalleryItem {
+    return GalleryItem(
+        filename = filename,
+        mimeType = when (type) {
+            GalleryItem.Type.Video -> "video/mp4"
+            GalleryItem.Type.Audio -> "audio/mpeg"
+            GalleryItem.Type.File -> "application/pdf"
+            GalleryItem.Type.Image -> "image/jpeg"
+        },
+        mediaSource = mediaSource,
+        thumbnailSource = null,
+        width = width,
+        height = height,
+        thumbnailWidth = width,
+        thumbnailHeight = height,
+        blurhash = null,
+        type = type,
+        duration = duration,
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryView.kt
new file mode 100644
index 0000000000..3212d789f9
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemGalleryView.kt
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.event
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
+import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectMediaState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.rememberEventContentValidationState
+import io.element.android.libraries.ui.utils.time.formatShort
+import kotlinx.collections.immutable.ImmutableList
+
+private const val MAX_TILES = 5
+private val GALLERY_WIDTH = 264.dp
+private val GRID_SPACING = 4.dp
+private val GROUP_CORNER_RADIUS = 6.dp
+
+private val SINGLE_IMAGE_HEIGHT = 130.dp
+private val TWO_IMAGE_ROW_HEIGHT = 130.dp
+private val THREE_IMAGE_ROW_HEIGHT = 85.dp
+
+@Composable
+fun TimelineItemGalleryView(
+    eventId: EventId?,
+    content: TimelineItemGalleryContent,
+    onGalleryItemClick: (Int) -> Unit,
+    onLongClick: (() -> Unit)?,
+    modifier: Modifier = Modifier,
+) {
+    val totalItems = content.items.size
+    val showOverflow = totalItems > MAX_TILES
+    val overflowCount = totalItems - MAX_TILES
+    Column(modifier = modifier) {
+        val containerModifier = Modifier.clip(RoundedCornerShape(GROUP_CORNER_RADIUS))
+        Column(
+            modifier = containerModifier.width(GALLERY_WIDTH),
+            verticalArrangement = Arrangement.spacedBy(GRID_SPACING),
+        ) {
+            when (totalItems) {
+                0 -> Unit
+                1 -> SingleItemLayout(
+                    eventId = eventId,
+                    item = content.items[0],
+                    onClick = { onGalleryItemClick(0) },
+                    onLongClick = onLongClick,
+                )
+                2 -> TwoItemLayout(
+                    eventId = eventId,
+                    items = content.items,
+                    onItemClick = onGalleryItemClick,
+                    onLongClick = onLongClick,
+                )
+                3 -> ThreeItemLayout(
+                    eventId = eventId,
+                    items = content.items,
+                    onItemClick = onGalleryItemClick,
+                    onLongClick = onLongClick,
+                )
+                else -> FourPlusItemLayout(
+                    eventId = eventId,
+                    items = content.items,
+                    showOverflow = showOverflow,
+                    overflowCount = overflowCount,
+                    onItemClick = onGalleryItemClick,
+                    onLongClick = onLongClick,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun SingleItemLayout(
+    eventId: EventId?,
+    item: GalleryItem,
+    onClick: () -> Unit,
+    onLongClick: (() -> Unit)?,
+) {
+    GalleryItemCell(
+        eventId = eventId,
+        item = item,
+        isLast = false,
+        remainingCount = 0,
+        onClick = onClick,
+        onLongClick = onLongClick,
+        modifier = Modifier
+            .width(GALLERY_WIDTH)
+            .height(SINGLE_IMAGE_HEIGHT),
+    )
+}
+
+@Composable
+private fun TwoItemLayout(
+    eventId: EventId?,
+    items: ImmutableList<GalleryItem>,
+    onItemClick: (Int) -> Unit,
+    onLongClick: (() -> Unit)?,
+) {
+    Column(
+        modifier = Modifier.width(GALLERY_WIDTH),
+        verticalArrangement = Arrangement.spacedBy(GRID_SPACING),
+    ) {
+        items.forEachIndexed { index, item ->
+            GalleryItemCell(
+                eventId = eventId,
+                item = item,
+                isLast = false,
+                remainingCount = 0,
+                onClick = { onItemClick(index) },
+                onLongClick = onLongClick,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(TWO_IMAGE_ROW_HEIGHT),
+            )
+        }
+    }
+}
+
+@Composable
+private fun ThreeItemLayout(
+    eventId: EventId?,
+    items: ImmutableList<GalleryItem>,
+    onItemClick: (Int) -> Unit,
+    onLongClick: (() -> Unit)?,
+) {
+    Column(
+        modifier = Modifier.width(GALLERY_WIDTH),
+        verticalArrangement = Arrangement.spacedBy(GRID_SPACING),
+    ) {
+        GalleryItemCell(
+            eventId = eventId,
+            item = items[0],
+            isLast = false,
+            remainingCount = 0,
+            onClick = { onItemClick(0) },
+            onLongClick = onLongClick,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(SINGLE_IMAGE_HEIGHT),
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(GRID_SPACING),
+        ) {
+            for (it in 1..2) {
+                GalleryItemCell(
+                    eventId = eventId,
+                    item = items[it],
+                    isLast = false,
+                    remainingCount = 0,
+                    onClick = { onItemClick(it) },
+                    onLongClick = onLongClick,
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(TWO_IMAGE_ROW_HEIGHT),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun FourPlusItemLayout(
+    eventId: EventId?,
+    items: ImmutableList<GalleryItem>,
+    showOverflow: Boolean,
+    overflowCount: Int,
+    onItemClick: (Int) -> Unit,
+    onLongClick: (() -> Unit)?,
+) {
+    Column(
+        modifier = Modifier.width(GALLERY_WIDTH),
+        verticalArrangement = Arrangement.spacedBy(GRID_SPACING),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(GRID_SPACING),
+        ) {
+            for (it in 0..1) {
+                GalleryItemCell(
+                    eventId = eventId,
+                    item = items[it],
+                    isLast = false,
+                    remainingCount = 0,
+                    onClick = { onItemClick(it) },
+                    onLongClick = onLongClick,
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(TWO_IMAGE_ROW_HEIGHT),
+                )
+            }
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(GRID_SPACING),
+        ) {
+            val bottomRowItems = if (showOverflow) 3 else minOf(items.size - 2, 3)
+            val bottomRowHeight = if (bottomRowItems == 3) THREE_IMAGE_ROW_HEIGHT else TWO_IMAGE_ROW_HEIGHT
+            for (i in 0 until bottomRowItems) {
+                val itemIndex = 2 + i
+                if (itemIndex < items.size) {
+                    val isOverflowItem = showOverflow && i == bottomRowItems - 1
+                    GalleryItemCell(
+                        eventId = eventId,
+                        item = items[itemIndex],
+                        isLast = isOverflowItem,
+                        remainingCount = if (isOverflowItem) overflowCount else 0,
+                        onClick = { onItemClick(itemIndex) },
+                        onLongClick = onLongClick,
+                        modifier = Modifier
+                            .weight(1f)
+                            .height(bottomRowHeight),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun GalleryItemCell(
+    eventId: EventId?,
+    item: GalleryItem,
+    isLast: Boolean,
+    remainingCount: Int,
+    onClick: () -> Unit,
+    onLongClick: (() -> Unit)?,
+    modifier: Modifier = Modifier,
+) {
+    val eventContentValidationState = rememberEventContentValidationState(eventId, needsValidation = true)
+    val thumbnailContentValidationState by eventContentValidationState.collectMediaState(item.thumbnailSource?.safeUrl)
+    val mediaContentValidationState by eventContentValidationState.collectMediaState(item.mediaSource.safeUrl)
+
+    val itemContentValidationState = remember(thumbnailContentValidationState, mediaContentValidationState) {
+        if (thumbnailContentValidationState.isInvalid() || mediaContentValidationState.isInvalid()) {
+            ContentValidationValue.Invalid
+        } else if (thumbnailContentValidationState.hasUnrecoverableError() || mediaContentValidationState.hasUnrecoverableError()) {
+            listOf(thumbnailContentValidationState, mediaContentValidationState).first { it is ContentValidationValue.UnrecoverableError }
+        } else if (thumbnailContentValidationState.isLoading() || mediaContentValidationState.isLoading()) {
+            ContentValidationValue.Loading
+        } else {
+            mediaContentValidationState
+        }
+    }
+
+    Box(
+        modifier = modifier
+            .blurHashBackground(item.blurhash, alpha = 0.9f)
+            .then(
+                if (itemContentValidationState.isValid()) {
+                    Modifier.combinedClickable(
+                        onClick = onClick,
+                        onLongClick = onLongClick,
+                    )
+                } else {
+                    Modifier
+                }
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        AsyncImage(
+            modifier = Modifier.fillMaxSize(),
+            model = item.thumbnailMediaRequestData,
+            contentScale = ContentScale.Crop,
+            alignment = Alignment.Center,
+            contentDescription = item.filename,
+        )
+
+        if (item.type == GalleryItem.Type.Video) {
+            VideoOverlay(duration = item.duration)
+        }
+
+        if (itemContentValidationState.isLoading()) {
+            CircularProgressIndicator()
+        } else if (itemContentValidationState.hasError()) {
+            Box(
+                modifier = Modifier.fillMaxSize().background(ElementTheme.colors.bgCriticalSubtle)
+            ) {
+                Icon(
+                    modifier = Modifier.align(Alignment.Center),
+                    imageVector = CompoundIcons.Error(),
+                    tint = ElementTheme.colors.iconCriticalPrimary,
+                    contentDescription = null,
+                )
+            }
+        } else if (isLast && remainingCount > 0) {
+            RemainingCountOverlay(count = remainingCount)
+        }
+    }
+}
+
+@Composable
+private fun VideoOverlay(duration: kotlin.time.Duration) {
+    val gradientColor = ElementTheme.colors.bgCanvasDefault
+
+    Box(modifier = Modifier.fillMaxSize()) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(80.dp)
+                .align(Alignment.BottomCenter)
+                .background(
+                    brush = Brush.verticalGradient(
+                        colors = listOf(gradientColor.copy(alpha = 0f), gradientColor.copy(alpha = 1f))
+                    )
+                )
+        )
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.BottomCenter)
+                .padding(8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                imageVector = CompoundIcons.VideoCallSolid(),
+                contentDescription = null,
+                tint = ElementTheme.colors.textPrimary,
+                modifier = Modifier.size(16.dp),
+            )
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                text = duration.formatShort(),
+                color = ElementTheme.colors.textPrimary,
+                style = ElementTheme.typography.fontBodySmMedium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+    }
+}
+
+@Composable
+private fun RemainingCountOverlay(count: Int) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(ElementTheme.colors.bgSubtleTertiary.copy(alpha = 0.7f)),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = "+$count",
+            color = Color.White,
+            style = ElementTheme.typography.fontHeadingSmMedium,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemGalleryViewPreview(
+    @PreviewParameter(TimelineItemGalleryContentProvider::class) content: TimelineItemGalleryContent,
+) = ElementPreview {
+    TimelineItemGalleryView(
+        eventId = null,
+        content = content,
+        onGalleryItemClick = {},
+        onLongClick = {},
+    )
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
index a8cbb89e96..3e79fd6fd9 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
@@ -8,18 +8,12 @@
 
 package io.element.android.features.messages.impl.timeline.components.event
 
-import android.text.SpannedString
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
@@ -31,32 +25,31 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import coil3.compose.AsyncImagePainter
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.components.ATimelineItemEventRow
-import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayout
-import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
 import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContentProvider
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.protection.ProtectedView
 import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
+import io.element.android.features.messages.impl.timeline.util.handleAsyncImageStateChange
 import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.LocalEventContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
-import io.element.android.wysiwyg.compose.EditorStyledText
-import io.element.android.wysiwyg.link.Link
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 
 @Composable
 fun TimelineItemImageView(
@@ -64,77 +57,67 @@ fun TimelineItemImageView(
     hideMediaContent: Boolean,
     onContentClick: (() -> Unit)?,
     onLongClick: (() -> Unit)?,
-    onLinkClick: (Link) -> Unit,
-    onLinkLongClick: (Link) -> Unit,
     onShowContentClick: () -> Unit,
-    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    contentValidationState: ContentValidationState,
     modifier: Modifier = Modifier,
 ) {
     val a11yLabel = stringResource(CommonStrings.common_image)
     val description = content.caption?.let { "$a11yLabel: $it" } ?: a11yLabel
-    Column(modifier = modifier) {
+    Column(modifier = modifier.wrapContentWidth(Alignment.CenterHorizontally)) {
         val containerModifier = if (content.showCaption) {
             Modifier.clip(RoundedCornerShape(10.dp))
         } else {
             Modifier
         }
+
+        val eventContentValidation by contentValidationState.collectOverallState()
+        val isContentBeingValidated = !eventContentValidation.isValidated()
         TimelineItemAspectRatioBox(
-            modifier = containerModifier.blurHashBackground(content.blurhash, alpha = 0.9f),
+            modifier = containerModifier
+                .blurHashBackground(content.blurhash, alpha = 0.9f)
+                .align(Alignment.CenterHorizontally),
             aspectRatio = coerceRatioWhenHidingContent(content.aspectRatio, hideMediaContent),
         ) {
-            ProtectedView(
-                hideContent = hideMediaContent,
-                onShowClick = onShowContentClick,
-            ) {
-                var isLoaded by remember { mutableStateOf(false) }
-                AsyncImage(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .then(if (isLoaded) Modifier.background(Color.White) else Modifier)
-                        .then(
-                            if (!isTalkbackActive() && onContentClick != null) {
-                                Modifier
-                                    .combinedClickable(
-                                        onClick = onContentClick,
-                                        onLongClick = onLongClick,
-                                    )
-                                    .onKeyboardContextMenuAction(onLongClick)
-                            } else {
-                                Modifier
-                            }
-                        ),
-                    model = content.thumbnailMediaRequestData,
-                    contentScale = ContentScale.Crop,
-                    alignment = Alignment.Center,
-                    contentDescription = description,
-                    onState = { isLoaded = it is AsyncImagePainter.State.Success },
-                )
-            }
-        }
-
-        if (content.showCaption) {
-            Spacer(modifier = Modifier.height(8.dp))
-            val caption = if (LocalInspectionMode.current) {
-                SpannedString(content.caption)
+            if (isContentBeingValidated) {
+                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
             } else {
-                content.formattedCaption ?: SpannedString(content.caption)
-            }
-            CompositionLocalProvider(
-                LocalContentColor provides ElementTheme.colors.textPrimary,
-                LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular
-            ) {
-                val aspectRatio = content.aspectRatio ?: DEFAULT_ASPECT_RATIO
-                EditorStyledText(
-                    modifier = Modifier
-                        .padding(horizontal = 4.dp) // This is (12.dp - 8.dp) contentPadding from CommonLayout
-                        .widthIn(min = MIN_HEIGHT_IN_DP.dp * aspectRatio, max = MAX_HEIGHT_IN_DP.dp * aspectRatio),
-                    text = caption,
-                    style = ElementRichTextEditorStyle.textStyle(),
-                    onLinkClickedListener = onLinkClick,
-                    onLinkLongClickedListener = onLinkLongClick,
-                    releaseOnDetach = false,
-                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
-                )
+                ProtectedView(
+                    hideContent = hideMediaContent,
+                    onShowClick = onShowContentClick,
+                ) {
+                    var isLoaded by remember { mutableStateOf(false) }
+                    AsyncImage(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .then(if (isLoaded) Modifier.background(Color.White) else Modifier)
+                            .then(
+                                if (!isTalkbackActive() && onContentClick != null) {
+                                    Modifier
+                                        .combinedClickable(
+                                            onClick = onContentClick,
+                                            onLongClick = onLongClick,
+                                        )
+                                        .onKeyboardContextMenuAction(onLongClick)
+                                } else {
+                                    Modifier
+                                }
+                            ),
+                        model = content.thumbnailMediaRequestData,
+                        contentScale = ContentScale.Crop,
+                        alignment = Alignment.Center,
+                        contentDescription = description,
+                        onState = { state ->
+                            val url = content.thumbnailMediaRequestData.source?.safeUrl
+                            if (url != null) {
+                                handleAsyncImageStateChange(
+                                    state = state,
+                                    onLoaded = { isLoaded = true },
+                                    updateContentValidationState = { contentValidationState.update(url, it) },
+                                )
+                            }
+                        },
+                    )
+                }
             }
         }
     }
@@ -149,54 +132,56 @@ internal fun TimelineItemImageViewPreview(@PreviewParameter(TimelineItemImageCon
         onShowContentClick = {},
         onContentClick = {},
         onLongClick = {},
-        onLinkClick = {},
-        onLinkLongClick = {},
-        onContentLayoutChange = {},
+        contentValidationState = NoopContentValidationState(),
     )
 }
 
 @PreviewsDayNight
 @Composable
 internal fun TimelineItemImageViewHideMediaContentPreview() = ElementPreview {
-    TimelineItemImageView(
-        content = aTimelineItemImageContent(),
-        hideMediaContent = true,
-        onShowContentClick = {},
-        onContentClick = {},
-        onLongClick = {},
-        onLinkClick = {},
-        onLinkLongClick = {},
-        onContentLayoutChange = {},
-    )
+        TimelineItemImageView(
+            content = aTimelineItemImageContent(),
+            hideMediaContent = true,
+            onShowContentClick = {},
+            onContentClick = {},
+            onLongClick = {},
+            contentValidationState = NoopContentValidationState(),
+        )
 }
 
 @PreviewsDayNight
 @Composable
-internal fun TimelineImageWithCaptionRowPreview() = ElementPreview {
-    Column {
-        sequenceOf(false, true).forEach { isMine ->
+internal fun ATimelineItemEventRowPreview() = ElementPreview {
+    CompositionLocalProvider(LocalEventContentValidationState provides NoopEventContentValidationCache()) {
+        Column {
+            sequenceOf(false, true).forEach { isMine ->
+                ATimelineItemEventRow(
+                    event = aTimelineItemEvent(
+                        isMine = isMine,
+                        content = aTimelineItemImageContent(
+                            filename = "image.jpg",
+                            caption = "A long caption that may wrap into several lines",
+                            width = 40,
+                            height = 20,
+                            aspectRatio = 40f / 20f,
+                        ),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                    ),
+                )
+            }
             ATimelineItemEventRow(
                 event = aTimelineItemEvent(
-                    isMine = isMine,
+                    isMine = false,
                     content = aTimelineItemImageContent(
                         filename = "image.jpg",
-                        caption = "A long caption that may wrap into several lines",
-                        aspectRatio = 2.5f,
+                        caption = "Narrow image with null aspectRatio",
+                        width = 80,
+                        height = 150,
+                        aspectRatio = null,
                     ),
                     groupPosition = TimelineItemGroupPosition.Last,
                 ),
             )
         }
-        ATimelineItemEventRow(
-            event = aTimelineItemEvent(
-                isMine = false,
-                content = aTimelineItemImageContent(
-                    filename = "image.jpg",
-                    caption = "Image with null aspectRatio",
-                    aspectRatio = null,
-                ),
-                groupPosition = TimelineItemGroupPosition.Last,
-            ),
-        )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
index 592b95a337..4ab4ee84a6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
@@ -8,33 +8,154 @@
 
 package io.element.android.features.messages.impl.timeline.components.event
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.minimumInteractiveComponentSize
 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.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.location.api.StaticMapView
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContentProvider
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun TimelineItemLocationView(
     content: TimelineItemLocationContent,
+    onStopLiveLocationClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    StaticMapView(
+    Box(modifier = modifier.fillMaxWidth()) {
+        StaticMapView(
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(max = 188.dp),
+            pinVariant = content.pinVariant,
+            location = content.location,
+            zoom = 15.0,
+            contentDescription = content.description
+        )
+
+        if (content.mode is TimelineItemLocationContent.Mode.Live) {
+            LiveLocationOverlay(
+                mode = content.mode,
+                onStopClick = onStopLiveLocationClick,
+                modifier = Modifier.align(Alignment.BottomStart)
+            )
+        }
+    }
+}
+
+@Composable
+private fun LiveLocationOverlay(
+    mode: TimelineItemLocationContent.Mode.Live,
+    onStopClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Row(
         modifier = modifier
             .fillMaxWidth()
-            .heightIn(max = 188.dp),
-        pinVariant = content.pinVariant,
-        lat = content.location.lat,
-        lon = content.location.lon,
-        zoom = 15.0,
-        contentDescription = content.body
-    )
+            .background(ElementTheme.colors.bgCanvasDefault.copy(alpha = 0.9f)),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        val iconShape = RoundedCornerShape(8.dp)
+        Box(
+            modifier = Modifier
+                // Ensure this Box uses same spacings than the Stop IconButton.
+                .minimumInteractiveComponentSize()
+                .size(32.dp)
+                .border(
+                    width = 1.dp,
+                    color = if (mode.isActive) ElementTheme.colors.iconQuaternaryAlpha else Color.Transparent,
+                    shape = iconShape,
+                )
+                .background(
+                    color = if (mode.isActive) {
+                        ElementTheme.colors.bgCanvasDefault
+                    } else {
+                        ElementTheme.colors.bgSubtleSecondary
+                    },
+                    shape = iconShape
+                )
+        ) {
+            if (mode.isLoading) {
+                CircularProgressIndicator(
+                    strokeWidth = 2.dp,
+                    color = ElementTheme.colors.iconSecondary,
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(20.dp)
+                )
+            } else {
+                Icon(
+                    imageVector = CompoundIcons.LocationPinSolid(),
+                    contentDescription = null,
+                    tint = if (mode.isActive) {
+                        ElementTheme.colors.iconAccentPrimary
+                    } else {
+                        ElementTheme.colors.iconDisabled
+                    },
+                    modifier = Modifier.align(Alignment.Center)
+                )
+            }
+        }
+        Column(modifier = Modifier.weight(1f)) {
+            Text(
+                text = if (mode.isActive) {
+                    stringResource(CommonStrings.common_live_location)
+                } else {
+                    stringResource(CommonStrings.common_live_location_ended)
+                },
+                style = ElementTheme.typography.fontBodySmMedium,
+                color = ElementTheme.colors.textPrimary,
+            )
+            if (mode.isActive) {
+                Text(
+                    text = mode.endsAt,
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textPrimary,
+                )
+            }
+        }
+
+        if (mode.canStopSharing) {
+            IconButton(
+                onClick = onStopClick,
+                colors = IconButtonDefaults.iconButtonColors(
+                    containerColor = ElementTheme.colors.bgCriticalPrimary,
+                    contentColor = ElementTheme.colors.iconOnSolidPrimary,
+                ),
+                modifier = Modifier
+                    .minimumInteractiveComponentSize()
+                    .size(30.dp)
+            ) {
+                Icon(
+                    imageVector = CompoundIcons.Stop(),
+                    contentDescription = null,
+                )
+            }
+        }
+    }
 }
 
 @PreviewsDayNight
@@ -43,5 +164,6 @@ internal fun TimelineItemLocationViewPreview(@PreviewParameter(TimelineItemLocat
     ElementPreview {
         TimelineItemLocationView(
             content = content,
+            onStopLiveLocationClick = {},
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt
index 104e420d51..7e240f8b51 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemStickerView.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -26,16 +27,20 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import coil3.compose.AsyncImage
-import coil3.compose.AsyncImagePainter
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContentProvider
 import io.element.android.features.messages.impl.timeline.protection.ProtectedView
 import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
+import io.element.android.features.messages.impl.timeline.util.handleAsyncImageStateChange
 import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
 import io.element.android.libraries.ui.strings.CommonStrings
 
 private const val STICKER_SIZE_IN_DP = 128
@@ -47,11 +52,15 @@ fun TimelineItemStickerView(
     onContentClick: (() -> Unit)?,
     onLongClick: (() -> Unit)?,
     onShowClick: () -> Unit,
+    contentValidationState: ContentValidationState,
     modifier: Modifier = Modifier,
 ) {
     val description = content.bestDescription.takeIf { it.isNotEmpty() } ?: stringResource(CommonStrings.common_image)
+
+    val eventContentValidation by contentValidationState.collectOverallState()
+    val isContentBeingValidated = !eventContentValidation.isValidated()
     Column(
-        modifier = modifier.semantics { contentDescription = description },
+        modifier = modifier.semantics { contentDescription = description }.wrapContentWidth(Alignment.CenterHorizontally),
     ) {
         TimelineItemAspectRatioBox(
             modifier = Modifier.blurHashBackground(content.blurhash, alpha = 0.9f),
@@ -63,11 +72,12 @@ fun TimelineItemStickerView(
                 hideContent = hideMediaContent,
                 onShowClick = onShowClick,
             ) {
-                var isLoaded by remember { mutableStateOf(false) }
+                var isThumbnailLoaded by remember { mutableStateOf(false) }
+
                 AsyncImage(
                     modifier = Modifier
                         .fillMaxSize()
-                        .then(if (isLoaded) Modifier.background(Color.White) else Modifier)
+                        .then(if (isThumbnailLoaded) Modifier.background(Color.White) else Modifier)
                         .then(
                             if (onContentClick != null) {
                                 Modifier
@@ -91,9 +101,22 @@ fun TimelineItemStickerView(
                     contentScale = ContentScale.Crop,
                     alignment = Alignment.Center,
                     contentDescription = description,
-                    onState = { isLoaded = it is AsyncImagePainter.State.Success },
+                    onState = { state ->
+                        val url = content.preferredMediaSource?.safeUrl
+                        if (url != null) {
+                            handleAsyncImageStateChange(
+                                state = state,
+                                onLoaded = { isThumbnailLoaded = true },
+                                updateContentValidationState = { contentValidationState.update(url, it) },
+                            )
+                        }
+                    },
                 )
             }
+
+            if (isContentBeingValidated) {
+                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+            }
         }
     }
 }
@@ -107,5 +130,6 @@ internal fun TimelineItemStickerViewPreview(@PreviewParameter(TimelineItemSticke
         onContentClick = {},
         onLongClick = {},
         onShowClick = {},
+        contentValidationState = NoopContentValidationState(),
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
index 0449ef26f0..1a4be5d2e5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
@@ -30,6 +30,7 @@ import io.element.android.features.messages.impl.utils.containsOnlyEmojis
 import io.element.android.libraries.androidutils.text.LinkifyHelper
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.utils.LocalUiTestMode
 import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
 import io.element.android.libraries.textcomposer.mentions.LocalMentionSpanUpdater
 import io.element.android.wysiwyg.compose.EditorStyledText
@@ -43,6 +44,9 @@ fun TimelineItemTextView(
     modifier: Modifier = Modifier,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit = {},
 ) {
+    // The View <-> Compose interop is not working well with Compose UI tests (it loops indefinitely), so we skip it in the UI test mode.
+    if (LocalUiTestMode.current) return
+
     val emojiOnly = content.formattedBody.toString() == content.body &&
         content.body.replace(" ", "").containsOnlyEmojis()
     val textStyle = when {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
index f5e760736e..b47220fa5e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
@@ -8,22 +8,17 @@
 
 package io.element.android.features.messages.impl.timeline.components.event
 
-import android.text.SpannedString
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -34,26 +29,19 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
-import coil3.compose.AsyncImagePainter
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
-import io.element.android.features.messages.impl.timeline.components.ATimelineItemEventRow
-import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayout
-import io.element.android.features.messages.impl.timeline.components.layout.ContentAvoidingLayoutData
-import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContentProvider
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVideoContent
 import io.element.android.features.messages.impl.timeline.protection.ProtectedView
 import io.element.android.features.messages.impl.timeline.protection.coerceRatioWhenHidingContent
+import io.element.android.features.messages.impl.timeline.util.handleAsyncImageStateChange
 import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.modifiers.roundedBackground
@@ -62,11 +50,11 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_HEIGHT
 import io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_WIDTH
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
-import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
-import io.element.android.wysiwyg.compose.EditorStyledText
-import io.element.android.wysiwyg.link.Link
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 
 @Composable
 fun TimelineItemVideoView(
@@ -75,15 +63,13 @@ fun TimelineItemVideoView(
     onContentClick: (() -> Unit)?,
     onLongClick: (() -> Unit)?,
     onShowContentClick: () -> Unit,
-    onLinkClick: (Link) -> Unit,
-    onLinkLongClick: (Link) -> Unit,
-    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    contentValidationState: ContentValidationState,
     modifier: Modifier = Modifier,
 ) {
     val isTalkbackActive = isTalkbackActive()
     val a11yLabel = stringResource(CommonStrings.common_video)
     val description = content.caption?.let { "$a11yLabel: $it" } ?: a11yLabel
-    Column(modifier = modifier) {
+    Column(modifier = modifier.wrapContentWidth(Alignment.CenterHorizontally)) {
         val containerModifier = if (content.showCaption) {
             Modifier
                 .padding(top = 6.dp)
@@ -91,6 +77,9 @@ fun TimelineItemVideoView(
         } else {
             Modifier
         }
+
+        val eventContentValidation by contentValidationState.collectOverallState()
+        val isContentBeingValidated = !eventContentValidation.isValidated()
         TimelineItemAspectRatioBox(
             modifier = containerModifier.blurHashBackground(content.blurHash, alpha = 0.9f),
             aspectRatio = coerceRatioWhenHidingContent(content.aspectRatio, hideMediaContent),
@@ -127,48 +116,35 @@ fun TimelineItemVideoView(
                     contentScale = ContentScale.Crop,
                     alignment = Alignment.Center,
                     contentDescription = description,
-                    onState = { isLoaded = it is AsyncImagePainter.State.Success },
+                    onState = { state ->
+                        val url = content.thumbnailSource?.safeUrl
+                        if (url != null) {
+                            handleAsyncImageStateChange(
+                                state = state,
+                                onLoaded = { isLoaded = true },
+                                updateContentValidationState = { contentValidationState.update(url, it) },
+                            )
+                        }
+                    },
                 )
 
-                Box(
-                    modifier = Modifier.roundedBackground(),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Image(
-                        imageVector = CompoundIcons.PlaySolid(),
-                        contentDescription = stringResource(id = CommonStrings.a11y_play),
-                        colorFilter = ColorFilter.tint(Color.White),
-                        modifier = Modifier.semantics { hideFromAccessibility() }
-                    )
+                if (!isContentBeingValidated) {
+                    Box(
+                        modifier = Modifier.roundedBackground(),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Image(
+                            imageVector = CompoundIcons.PlaySolid(),
+                            contentDescription = stringResource(id = CommonStrings.a11y_play),
+                            colorFilter = ColorFilter.tint(Color.White),
+                            modifier = Modifier.semantics { hideFromAccessibility() }
+                        )
+                    }
+                } else {
+                    CircularProgressIndicator()
                 }
             }
         }
-
-        if (content.showCaption) {
-            Spacer(modifier = Modifier.height(8.dp))
-            val caption = if (LocalInspectionMode.current) {
-                SpannedString(content.caption)
-            } else {
-                content.formattedCaption ?: SpannedString(content.caption)
-            }
-            CompositionLocalProvider(
-                LocalContentColor provides ElementTheme.colors.textPrimary,
-                LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular,
-            ) {
-                val aspectRatio = content.aspectRatio ?: DEFAULT_ASPECT_RATIO
-                EditorStyledText(
-                    modifier = Modifier
-                        .padding(horizontal = 4.dp) // This is (12.dp - 8.dp) contentPadding from CommonLayout
-                        .widthIn(min = MIN_HEIGHT_IN_DP.dp * aspectRatio, max = MAX_HEIGHT_IN_DP.dp * aspectRatio),
-                    text = caption,
-                    onLinkClickedListener = onLinkClick,
-                    onLinkLongClickedListener = onLinkLongClick,
-                    style = ElementRichTextEditorStyle.textStyle(),
-                    releaseOnDetach = false,
-                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
-                )
-            }
-        }
     }
 }
 
@@ -181,9 +157,7 @@ internal fun TimelineItemVideoViewPreview(@PreviewParameter(TimelineItemVideoCon
         onShowContentClick = {},
         onContentClick = {},
         onLongClick = {},
-        onLinkClick = {},
-        onLinkLongClick = {},
-        onContentLayoutChange = {},
+        contentValidationState = NoopContentValidationState(),
     )
 }
 
@@ -196,39 +170,6 @@ internal fun TimelineItemVideoViewHideMediaContentPreview() = ElementPreview {
         onShowContentClick = {},
         onContentClick = {},
         onLongClick = {},
-        onLinkClick = {},
-        onLinkLongClick = {},
-        onContentLayoutChange = {},
+        contentValidationState = NoopContentValidationState(),
     )
 }
-
-@PreviewsDayNight
-@Composable
-internal fun TimelineVideoWithCaptionRowPreview() = ElementPreview {
-    Column {
-        sequenceOf(false, true).forEach { isMine ->
-            ATimelineItemEventRow(
-                event = aTimelineItemEvent(
-                    isMine = isMine,
-                    content = aTimelineItemVideoContent().copy(
-                        filename = "video.mp4",
-                        caption = "A long caption that may wrap into several lines",
-                        aspectRatio = 2.5f,
-                    ),
-                    groupPosition = TimelineItemGroupPosition.Last,
-                ),
-            )
-        }
-        ATimelineItemEventRow(
-            event = aTimelineItemEvent(
-                isMine = false,
-                content = aTimelineItemVideoContent().copy(
-                    filename = "video.mp4",
-                    caption = "Video with null aspect ratio",
-                    aspectRatio = null,
-                ),
-                groupPosition = TimelineItemGroupPosition.Last,
-            ),
-        )
-    }
-}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
index 5dbd0c478f..15387f51c0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
@@ -51,8 +51,9 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.libraries.ui.utils.time.isTalkbackActive
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import io.element.android.libraries.voiceplayer.api.VoiceMessageEvent
 import io.element.android.libraries.voiceplayer.api.VoiceMessageState
 import io.element.android.libraries.voiceplayer.api.VoiceMessageStateProvider
@@ -63,6 +64,7 @@ fun TimelineItemVoiceView(
     state: VoiceMessageState,
     content: TimelineItemVoiceContent,
     onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
     fun playPause() {
@@ -103,12 +105,16 @@ fun TimelineItemVoiceView(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         if (!isTalkbackActive()) {
-            when (state.buttonType) {
-                VoiceMessageState.ButtonType.Play -> PlayButton(onClick = ::playPause)
-                VoiceMessageState.ButtonType.Pause -> PauseButton(onClick = ::playPause)
-                VoiceMessageState.ButtonType.Downloading -> ProgressButton()
-                VoiceMessageState.ButtonType.Retry -> RetryButton(onClick = ::playPause)
-                VoiceMessageState.ButtonType.Disabled -> PlayButton(onClick = {}, enabled = false)
+            if (contentValidationValue.isValid()) {
+                when (state.buttonType) {
+                    VoiceMessageState.ButtonType.Play -> PlayButton(onClick = ::playPause)
+                    VoiceMessageState.ButtonType.Pause -> PauseButton(onClick = ::playPause)
+                    VoiceMessageState.ButtonType.Downloading -> ProgressButton()
+                    VoiceMessageState.ButtonType.Retry -> RetryButton(onClick = ::playPause)
+                    VoiceMessageState.ButtonType.Disabled -> PlayButton(onClick = {}, enabled = false)
+                }
+            } else {
+                ProgressButton(displayImmediately = true)
             }
         }
         Spacer(Modifier.width(8.dp))
@@ -283,6 +289,7 @@ internal fun TimelineItemVoiceViewPreview(
         state = timelineItemVoiceViewParameters.state,
         content = timelineItemVoiceViewParameters.content,
         onContentLayoutChange = {},
+        contentValidationValue = ContentValidationValue.Valid,
     )
 }
 
@@ -296,6 +303,7 @@ internal fun TimelineItemVoiceViewUnifiedPreview() = ElementPreview {
                 state = it.state,
                 content = it.content,
                 onContentLayoutChange = {},
+                contentValidationValue = ContentValidationValue.Valid,
             )
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
index 883c591fd2..9dbeb83a3c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/group/GroupHeaderView.kt
@@ -26,9 +26,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -37,6 +39,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.ui.strings.CommonStrings
 
 private val CORNER_RADIUS = 8.dp
 
@@ -52,6 +55,8 @@ fun GroupHeaderView(
     val backgroundColor = Color.Transparent
     val shape = RoundedCornerShape(CORNER_RADIUS)
 
+    val expandedStateDescription = stringResource(CommonStrings.a11y_state_expanded)
+    val collapsedStateDescription = stringResource(CommonStrings.a11y_state_collapsed)
     Box(
         modifier = modifier
             .fillMaxWidth()
@@ -62,6 +67,7 @@ fun GroupHeaderView(
             )
             .clearAndSetSemantics {
                 contentDescription = text
+                stateDescription = if (isExpanded) expandedStateDescription else collapsedStateDescription
             },
         contentAlignment = Alignment.Center
     ) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
index 04974dfbc5..cebe7f93b2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
@@ -9,20 +9,22 @@
 package io.element.android.features.messages.impl.timeline.components.layout
 
 import android.text.Layout
+import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.style.ResolvedTextDirection
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpOffset
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.designsystem.text.roundToPx
+import io.element.android.libraries.designsystem.utils.LocalUiTestMode
 import io.element.android.wysiwyg.compose.EditorStyledText
 import kotlin.math.max
 import kotlin.math.min
@@ -41,6 +43,7 @@ import kotlin.math.roundToInt
  * @param shrinkContent Whether the content should be shrunk to fit the available width or not. Defaults to `false`.
  * @param content The 'content' component of the layout.
  */
+@Suppress("ContentSlotReused") // Since we added an exception for `LocalUiTestMode`, detekt thinks the layout can change in runtime: it won't
 @Composable
 fun ContentAvoidingLayout(
     overlay: @Composable () -> Unit,
@@ -52,6 +55,15 @@ fun ContentAvoidingLayout(
 ) {
     val scope = remember { ContentAvoidingLayoutScopeInstance() }
 
+    // Custom layouts don't seem to work well with Compose UI tests (they crash), so we use a Column instead when running in test mode.
+    if (LocalUiTestMode.current) {
+        Column {
+            scope.content()
+            overlay()
+        }
+        return
+    }
+
     Layout(
         modifier = modifier,
         content = {
@@ -149,13 +161,13 @@ object ContentAvoidingLayout {
         onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
         extraWidth: Dp = 0.dp,
     ): ((TextLayoutResult) -> Unit) {
-        val layoutDirection = LocalLayoutDirection.current
         val extraWidthPx = extraWidth.roundToPx()
         return { textLayout: TextLayoutResult ->
             // We need to add the external extra width so it's not taken into account as 'free space'
-            val lastLineWidth = when (layoutDirection) {
-                LayoutDirection.Ltr -> textLayout.getLineRight(textLayout.lineCount - 1).roundToInt()
-                LayoutDirection.Rtl -> textLayout.getLineLeft(textLayout.lineCount - 1).roundToInt()
+            val textDirection = tryOrNull { textLayout.getParagraphDirection(0) }
+            val lastLineWidth = when (textDirection) {
+                ResolvedTextDirection.Rtl -> textLayout.getLineLeft(textLayout.lineCount - 1).roundToInt()
+                else -> textLayout.getLineRight(textLayout.lineCount - 1).roundToInt()
             }
             val lastLineHeight = textLayout.getLineBottom(textLayout.lineCount - 1).roundToInt()
             onContentLayoutChange(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt
index 03ce564eff..2a902fd692 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt
@@ -90,7 +90,8 @@ fun ReactionSummaryView(
     if (state.target != null) {
         ModalBottomSheet(
             onDismissRequest = ::onDismiss,
-            modifier = modifier
+            modifier = modifier,
+            scrollable = false,
         ) {
             ReactionSummaryViewContent(summary = state.target)
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
index b03aaf01c1..c9b712eba7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
@@ -25,9 +25,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -53,27 +54,15 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun TimelineItemReadReceiptView(
     state: ReadReceiptViewState,
-    renderReadReceipts: Boolean,
     onReadReceiptsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.receipts.isNotEmpty()) {
-        if (renderReadReceipts) {
-            ReadReceiptsRow(
-                modifier = modifier.clearAndSetSemantics {
-                    hideFromAccessibility()
-                }
-            ) {
-                ReadReceiptsAvatars(
-                    receipts = state.receipts,
-                    modifier = Modifier
-                        .clip(RoundedCornerShape(4.dp))
-                        .clickable {
-                            onReadReceiptsClick()
-                        }
-                        .padding(2.dp)
-                )
-            }
+        ReadReceiptsRow(modifier = modifier) {
+            ReadReceiptsAvatars(
+                receipts = state.receipts,
+                onClick = onReadReceiptsClick,
+            )
         }
     } else {
         when (state.sendState) {
@@ -132,7 +121,8 @@ private fun ReadReceiptsRow(
 @Composable
 private fun ReadReceiptsAvatars(
     receipts: ImmutableList<ReadReceiptData>,
-    modifier: Modifier = Modifier
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     val avatarSize = AvatarSize.TimelineReadReceipt.dp
     val avatarStrokeSize = 1.dp
@@ -140,9 +130,16 @@ private fun ReadReceiptsAvatars(
     val receiptDescription = computeReceiptDescription(receipts)
     Row(
         modifier = modifier
+            .clip(RoundedCornerShape(4.dp))
+            .clickable(
+                onClick = onClick,
+                onClickLabel = stringResource(id = CommonStrings.a11y_read_receipts_tap_to_show_all_android),
+            )
+            .padding(2.dp)
             .clearAndSetSemantics {
                 testTag = TestTags.messageReadReceipts.value
                 contentDescription = receiptDescription
+                role = Role.Button
             },
         horizontalArrangement = Arrangement.spacedBy(4.dp - avatarStrokeSize),
         verticalAlignment = Alignment.CenterVertically,
@@ -209,7 +206,6 @@ internal fun TimelineItemReadReceiptViewPreview(
 ) = ElementPreview {
     TimelineItemReadReceiptView(
         state = state,
-        renderReadReceipts = true,
         onReadReceiptsClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
index b65e326045..407cd29026 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
@@ -9,13 +9,13 @@
 package io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
@@ -44,7 +44,9 @@ internal fun ReadReceiptBottomSheet(
 ) {
     val isVisible = state.selectedEvent != null
 
-    val sheetState = rememberModalBottomSheetState()
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+    )
     val coroutineScope = rememberCoroutineScope()
     if (isVisible) {
         ModalBottomSheet(
@@ -57,7 +59,8 @@ internal fun ReadReceiptBottomSheet(
                     sheetState.hide()
                     state.eventSink(ReadReceiptBottomSheetEvent.Dismiss)
                 }
-            }
+            },
+            scrollable = false,
         ) {
             ReadReceiptBottomSheetContent(
                 state = state,
@@ -83,7 +86,7 @@ private fun ReadReceiptBottomSheetContent(
     LazyColumn {
         item {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(text = stringResource(id = CommonStrings.common_seen_by))
                 }
             )
@@ -114,9 +117,9 @@ private fun ReadReceiptBottomSheetContent(
 
 @PreviewsDayNight
 @Composable
-internal fun ReadReceiptBottomSheetPreview(@PreviewParameter(ReadReceiptBottomSheetStateProvider::class) state: ReadReceiptBottomSheetState) = ElementPreview {
-    Column {
-        ReadReceiptBottomSheetContent(
+internal fun ReadReceiptBottomSheetPreview(@PreviewParameter(ReadReceiptBottomSheetStateProvider::class) state: ReadReceiptBottomSheetState) {
+    ElementPreview(fillMaxSize = true) {
+        ReadReceiptBottomSheet(
             state = state,
             onUserDataClick = {},
         )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
index f812b40e61..d59526d8bb 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemRoomBeginningView.kt
@@ -24,6 +24,7 @@ import io.element.android.features.messages.impl.R
 import io.element.android.libraries.designsystem.atomic.molecules.ComposerAlertMolecule
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.designsystem.text.toAnnotatedString
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.allBooleans
@@ -86,13 +87,13 @@ internal fun TimelineItemRoomBeginningViewPreview() = ElementPreview {
             )
             TimelineItemRoomBeginningView(
                 predecessorRoom = null,
-                roomName = "Room Name",
+                roomName = ROOM_NAME,
                 isDm = isDm,
                 onPredecessorRoomClick = {},
             )
             TimelineItemRoomBeginningView(
                 predecessorRoom = PredecessorRoom(RoomId("!roomId:matrix.org")),
-                roomName = "Room Name",
+                roomName = ROOM_NAME,
                 isDm = isDm,
                 onPredecessorRoomClick = {},
             )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/FakeTimelineItemPresenterFactories.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/FakeTimelineItemPresenterFactories.kt
index 7c36521fc0..0d51d9f5b8 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/FakeTimelineItemPresenterFactories.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/di/FakeTimelineItemPresenterFactories.kt
@@ -8,7 +8,9 @@
 
 package io.element.android.features.messages.impl.timeline.di
 
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVoiceContent
+import io.element.android.features.messages.impl.timeline.model.event.ensureActiveLiveLocation
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.voiceplayer.api.VoiceMessageState
 import io.element.android.libraries.voiceplayer.api.aVoiceMessageState
@@ -18,6 +20,12 @@ import io.element.android.libraries.voiceplayer.api.aVoiceMessageState
  */
 fun aFakeTimelineItemPresenterFactories() = TimelineItemPresenterFactories(
     mapOf(
+        Pair(
+            TimelineItemLocationContent::class,
+            TimelineItemPresenterFactory<TimelineItemLocationContent, TimelineItemLocationContent> { content ->
+                Presenter { content.ensureActiveLiveLocation() }
+            },
+        ),
         Pair(
             TimelineItemVoiceContent::class,
             TimelineItemPresenterFactory<TimelineItemVoiceContent, VoiceMessageState> { Presenter { aVoiceMessageState() } },
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
index 7b369fe6b7..1679a6030a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
@@ -64,22 +64,24 @@ class TimelineItemsFactory(
     suspend fun replaceWith(
         timelineItems: List<MatrixTimelineItem>,
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ) = withContext(dispatchers.computation) {
         lock.withLock {
             diffCacheUpdater.updateWith(timelineItems)
-            buildAndEmitTimelineItemStates(timelineItems, roomMembers)
+            buildAndEmitTimelineItemStates(timelineItems, roomMembers, renderReadReceipts)
         }
     }
 
     private suspend fun buildAndEmitTimelineItemStates(
         timelineItems: List<MatrixTimelineItem>,
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ) {
         val newTimelineItemStates = ArrayList<TimelineItem>()
         for (index in diffCache.indices().reversed()) {
             val cacheItem = diffCache.get(index)
             if (cacheItem == null) {
-                buildAndCacheItem(timelineItems, index, roomMembers)?.also { timelineItemState ->
+                buildAndCacheItem(timelineItems, index, roomMembers, renderReadReceipts)?.also { timelineItemState ->
                     newTimelineItemStates.add(timelineItemState)
                 }
             } else {
@@ -87,7 +89,8 @@ class TimelineItemsFactory(
                     eventItemFactory.update(
                         timelineItem = cacheItem,
                         receivedMatrixTimelineItem = timelineItems[index] as MatrixTimelineItem.Event,
-                        roomMembers = roomMembers
+                        roomMembers = roomMembers,
+                        renderReadReceipts = renderReadReceipts,
                     )
                 } else {
                     cacheItem
@@ -103,10 +106,11 @@ class TimelineItemsFactory(
         timelineItems: List<MatrixTimelineItem>,
         index: Int,
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ): TimelineItem? {
         val timelineItem =
             when (val currentTimelineItem = timelineItems[index]) {
-                is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem, index, timelineItems, roomMembers)
+                is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem, index, timelineItems, roomMembers, renderReadReceipts)
                 is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem)
                 MatrixTimelineItem.Other -> null
             }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
index 2b5c0fa98a..3bc7f9f070 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt
@@ -10,14 +10,19 @@ package io.element.android.features.messages.impl.timeline.factories.event
 
 import dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.Location
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
+import io.element.android.libraries.dateformatter.api.DateFormatter
+import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
@@ -36,6 +41,9 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.services.toolbox.api.strings.StringProvider
 
 @Inject
 class TimelineItemContentFactory(
@@ -50,14 +58,17 @@ class TimelineItemContentFactory(
     private val failedToParseMessageFactory: TimelineItemContentFailedToParseMessageFactory,
     private val failedToParseStateFactory: TimelineItemContentFailedToParseStateFactory,
     private val sessionId: SessionId,
+    private val dateFormatter: DateFormatter,
+    private val stringProvider: StringProvider,
 ) {
-    suspend fun create(eventTimelineItem: EventTimelineItem): TimelineItemEventContent {
+    suspend fun create(eventTimelineItem: EventTimelineItem, roomMembers: List<RoomMember>): TimelineItemEventContent {
         return create(
             itemContent = eventTimelineItem.content,
             eventId = eventTimelineItem.eventId,
             isEditable = eventTimelineItem.isEditable,
             sender = eventTimelineItem.sender,
             senderProfile = eventTimelineItem.senderProfile,
+            roomMembers = roomMembers,
         )
     }
 
@@ -67,6 +78,7 @@ class TimelineItemContentFactory(
         isEditable: Boolean,
         sender: UserId,
         senderProfile: ProfileDetails,
+        roomMembers: List<RoomMember> = emptyList(),
     ): TimelineItemEventContent {
         val isOutgoing = sessionId == sender
         return when (itemContent) {
@@ -97,25 +109,54 @@ class TimelineItemContentFactory(
             is StickerContent -> stickerFactory.create(itemContent)
             is PollContent -> pollFactory.create(eventId, isEditable, isOutgoing, itemContent)
             is UnableToDecryptContent -> utdFactory.create(itemContent)
-            is CallNotifyContent -> TimelineItemRtcNotificationContent()
+            is CallNotifyContent -> TimelineItemRtcNotificationContent(
+                callIntent = itemContent.callIntent,
+                state = when {
+                    itemContent.activeMembers.isNotEmpty() -> {
+                        RtcNotificationState.Active(
+                            joinedMembers = itemContent.activeMembers.map { active ->
+                                roomMembers.find {
+                                    it.userId == active
+                                }?.toMatrixUser() ?: MatrixUser(active)
+                            },
+                            isJoined = itemContent.isJoined,
+                            callStartTsMillis = itemContent.callStartTsMillis,
+                            callIntent = itemContent.callIntent
+                        )
+                    }
+                    else -> {
+                        if (itemContent.declinedBy.isEmpty()) {
+                            RtcNotificationState.Started
+                        } else {
+                            RtcNotificationState.Declined(itemContent.declinedBy.any { it == sessionId })
+                        }
+                    }
+                }
+            )
             is UnknownContent -> TimelineItemUnknownContent
             is LiveLocationContent -> {
                 val lastKnownLocation = itemContent.locations.mapNotNull { beacon ->
                     Location.fromGeoUri(beacon.geoUri)
                 }.lastOrNull()
-                if (lastKnownLocation != null) {
-                    TimelineItemLocationContent(
-                        body = itemContent.body.trimEnd(),
-                        description = itemContent.description?.trimEnd(),
-                        assetType = itemContent.assetType,
-                        senderId = sender,
-                        senderProfile = senderProfile,
-                        location = lastKnownLocation,
-                        mode = TimelineItemLocationContent.Mode.Live(isActive = itemContent.isLive)
-                    )
-                } else {
-                    TimelineItemUnknownContent
-                }
+
+                val endsAt = dateFormatter.format(
+                    timestamp = itemContent.endTimestamp,
+                    mode = DateFormatterMode.TimeOnly
+                )
+                // Always create content, location can be null for "loading/waiting" state
+                TimelineItemLocationContent(
+                    description = itemContent.description?.trimEnd(),
+                    assetType = itemContent.assetType,
+                    senderId = sender,
+                    senderProfile = senderProfile,
+                    mode = TimelineItemLocationContent.Mode.Live(
+                        lastKnownLocation = lastKnownLocation,
+                        isActive = itemContent.isLive,
+                        endsAt = stringProvider.getString(CommonStrings.common_ends_at, endsAt),
+                        endTimestamp = itemContent.endTimestamp,
+                        isOwnUser = sessionId == sender
+                    ),
+                )
             }
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
index 723ab6feac..040d0450ff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
@@ -14,10 +14,14 @@ import androidx.core.text.toSpannable
 import dev.zacsweers.metro.Inject
 import io.element.android.features.location.api.Location
 import io.element.android.features.messages.api.timeline.HtmlConverterProvider
+import io.element.android.features.messages.impl.timeline.model.event.AttachmentItem
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEmoteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
@@ -35,6 +39,8 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
@@ -150,13 +156,11 @@ class TimelineItemContentMessageFactory(
                     )
                 } else {
                     TimelineItemLocationContent(
-                        body = body,
-                        location = location,
                         description = messageType.description,
                         senderId = senderId,
                         senderProfile = senderProfile,
                         assetType = messageType.assetType,
-                        mode = TimelineItemLocationContent.Mode.Static
+                        mode = TimelineItemLocationContent.Mode.Static(location = location)
                     )
                 }
             }
@@ -265,6 +269,144 @@ class TimelineItemContentMessageFactory(
                     isEdited = content.isEdited,
                 )
             }
+            is GalleryMessageType -> {
+                val dom = messageType.formatted?.toHtmlDocument(permalinkParser = permalinkParser)
+                val formattedCaption = dom?.let(::parseHtml)
+                    ?: messageType.body.withLinks()
+                val galleryItems = messageType.items.mapNotNull { item ->
+                    when (item) {
+                        is GalleryItemType.Image -> {
+                            GalleryItem(
+                                filename = item.content.filename,
+                                mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                mediaSource = item.content.source,
+                                type = GalleryItem.Type.Image,
+                                thumbnailSource = item.content.info?.thumbnailSource,
+                                width = item.content.info?.width?.toInt(),
+                                height = item.content.info?.height?.toInt(),
+                                thumbnailWidth = item.content.info?.thumbnailInfo?.width?.toInt(),
+                                thumbnailHeight = item.content.info?.thumbnailInfo?.height?.toInt(),
+                                blurhash = item.content.info?.blurhash,
+                            )
+                        }
+                        is GalleryItemType.Video -> {
+                            GalleryItem(
+                                filename = item.content.filename,
+                                mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                mediaSource = item.content.source,
+                                type = GalleryItem.Type.Video,
+                                thumbnailSource = item.content.info?.thumbnailSource,
+                                width = item.content.info?.width?.toInt(),
+                                height = item.content.info?.height?.toInt(),
+                                thumbnailWidth = item.content.info?.thumbnailInfo?.width?.toInt(),
+                                thumbnailHeight = item.content.info?.thumbnailInfo?.height?.toInt(),
+                                blurhash = item.content.info?.blurhash,
+                                duration = item.content.info?.duration ?: Duration.ZERO,
+                            )
+                        }
+                        is GalleryItemType.Audio -> {
+                            GalleryItem(
+                                filename = item.content.filename,
+                                mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                mediaSource = item.content.source,
+                                type = GalleryItem.Type.Audio,
+                                thumbnailSource = null,
+                                width = null,
+                                height = null,
+                                thumbnailWidth = null,
+                                thumbnailHeight = null,
+                                blurhash = null,
+                                duration = item.content.info?.duration ?: Duration.ZERO,
+                            )
+                        }
+                        is GalleryItemType.File -> {
+                            GalleryItem(
+                                filename = item.content.filename,
+                                mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                mediaSource = item.content.source,
+                                type = GalleryItem.Type.File,
+                                thumbnailSource = item.content.info?.thumbnailSource,
+                                width = null,
+                                height = null,
+                                thumbnailWidth = null,
+                                thumbnailHeight = null,
+                                blurhash = null,
+                            )
+                        }
+                        is GalleryItemType.Other -> null
+                    }
+                }
+                val hasPreviews = galleryItems.any { it.thumbnailSource != null }
+                val isOnlyVisualMedia = galleryItems.all { item ->
+                    item.type.isVisualMedia()
+                }
+                if (isOnlyVisualMedia && hasPreviews) {
+                    TimelineItemGalleryContent(
+                        body = messageType.body,
+                        caption = messageType.body.trimEnd().takeIf { it.isNotEmpty() },
+                        formattedCaption = formattedCaption,
+                        isEdited = content.isEdited,
+                        items = galleryItems.toImmutableList(),
+                    )
+                } else {
+                    val attachments = messageType.items.mapNotNull { item ->
+                        when (item) {
+                            is GalleryItemType.File -> {
+                                AttachmentItem(
+                                    filename = item.content.filename,
+                                    mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                    mediaSource = item.content.source,
+                                    thumbnailSource = item.content.info?.thumbnailSource,
+                                    fileSize = item.content.info?.size,
+                                    formattedFileSize = fileSizeFormatter.format(item.content.info?.size ?: 0L),
+                                    fileExtension = fileExtensionExtractor.extractFromName(item.content.filename),
+                                )
+                            }
+                            is GalleryItemType.Image -> {
+                                AttachmentItem(
+                                    filename = item.content.filename,
+                                    mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                    mediaSource = item.content.source,
+                                    thumbnailSource = item.content.info?.thumbnailSource,
+                                    fileSize = item.content.info?.size,
+                                    formattedFileSize = fileSizeFormatter.format(item.content.info?.size ?: 0L),
+                                    fileExtension = fileExtensionExtractor.extractFromName(item.content.filename),
+                                )
+                            }
+                            is GalleryItemType.Video -> {
+                                AttachmentItem(
+                                    filename = item.content.filename,
+                                    mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                    mediaSource = item.content.source,
+                                    thumbnailSource = item.content.info?.thumbnailSource,
+                                    fileSize = item.content.info?.size,
+                                    formattedFileSize = fileSizeFormatter.format(item.content.info?.size ?: 0L),
+                                    fileExtension = fileExtensionExtractor.extractFromName(item.content.filename),
+                                )
+                            }
+                            is GalleryItemType.Audio -> {
+                                AttachmentItem(
+                                    filename = item.content.filename,
+                                    mimeType = item.content.info?.mimetype ?: MimeTypes.OctetStream,
+                                    mediaSource = item.content.source,
+                                    thumbnailSource = null,
+                                    fileSize = item.content.info?.size,
+                                    formattedFileSize = fileSizeFormatter.format(item.content.info?.size ?: 0L),
+                                    fileExtension = fileExtensionExtractor.extractFromName(item.content.filename),
+                                )
+                            }
+                            is GalleryItemType.Other -> null
+                        }
+                    }
+                    TimelineItemAttachmentsContent(
+                        body = messageType.body,
+                        caption = messageType.body.trimEnd().takeIf { it.isNotEmpty() },
+                        formattedCaption = formattedCaption,
+                        isEdited = content.isEdited,
+                        attachments = attachments.toImmutableList(),
+                    )
+                }
+            }
             is OtherMessageType -> {
                 val body = messageType.body.trimEnd()
                 TimelineItemTextContent(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
index 366c88157e..f29f23e903 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
@@ -57,6 +57,7 @@ class TimelineItemEventFactory(
         index: Int,
         timelineItems: List<MatrixTimelineItem>,
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ): TimelineItem.Event {
         val currentSender = currentTimelineItem.event.sender
         val groupPosition =
@@ -66,6 +67,11 @@ class TimelineItemEventFactory(
             timestamp = currentTimelineItem.event.timestamp,
             mode = DateFormatterMode.TimeOnly,
         )
+        val sentDate = dateFormatter.format(
+            timestamp = currentTimelineItem.event.timestamp,
+            mode = DateFormatterMode.Day,
+            useRelative = true,
+        )
         val senderAvatarData = AvatarData(
             id = currentSender.value,
             name = senderProfile.getDisambiguatedDisplayName(currentSender),
@@ -102,15 +108,16 @@ class TimelineItemEventFactory(
             senderId = currentSender,
             senderProfile = senderProfile,
             senderAvatar = senderAvatarData,
-            content = contentFactory.create(currentTimelineItem.event),
+            content = contentFactory.create(currentTimelineItem.event, roomMembers),
             isMine = currentTimelineItem.event.isOwn,
             isEditable = currentTimelineItem.event.isEditable,
             canBeRepliedTo = currentTimelineItem.event.canBeRepliedTo,
             sentTimeMillis = currentTimelineItem.event.timestamp,
             sentTime = sentTime,
+            sentDate = sentDate,
             groupPosition = groupPosition,
             reactionsState = currentTimelineItem.computeReactionsState(),
-            readReceiptState = currentTimelineItem.computeReadReceiptState(roomMembers),
+            readReceiptState = currentTimelineItem.computeReadReceiptState(roomMembers, renderReadReceipts),
             localSendState = currentTimelineItem.event.localSendState,
             inReplyTo = currentTimelineItem.event.inReplyTo()?.map(permalinkParser = permalinkParser),
             threadInfo = mappedThreadInfo,
@@ -127,9 +134,10 @@ class TimelineItemEventFactory(
         timelineItem: TimelineItem.Event,
         receivedMatrixTimelineItem: MatrixTimelineItem.Event,
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ): TimelineItem.Event {
         return timelineItem.copy(
-            readReceiptState = receivedMatrixTimelineItem.computeReadReceiptState(roomMembers)
+            readReceiptState = receivedMatrixTimelineItem.computeReadReceiptState(roomMembers, renderReadReceipts)
         )
     }
 
@@ -174,8 +182,9 @@ class TimelineItemEventFactory(
 
     private fun MatrixTimelineItem.Event.computeReadReceiptState(
         roomMembers: List<RoomMember>,
+        renderReadReceipts: Boolean,
     ): TimelineItemReadReceipts {
-        if (!config.computeReadReceipts) {
+        if (!config.computeReadReceipts || !renderReadReceipts) {
             return TimelineItemReadReceipts(receipts = persistentListOf())
         }
         return TimelineItemReadReceipts(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/Groupability.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/Groupability.kt
index 6f369417dd..431942378a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/Groupability.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/Groupability.kt
@@ -9,9 +9,11 @@
 package io.element.android.features.messages.impl.timeline.groups
 
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@@ -42,6 +44,14 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StickerConten
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
 
+/**
+ * Return true when every event in the group is a redacted (deleted) message, i.e. the group is a
+ * collapsed run of deleted messages rather than the usual run of room state changes. Used to pick
+ * the group header label. An empty group is not considered a redacted group.
+ */
+internal fun TimelineItem.GroupedEvents.isRedactedMessagesGroup(): Boolean =
+    events.isNotEmpty() && events.all { it.content is TimelineItemRedactedContent }
+
 /**
  * Return true if the Event can be grouped in a collapse/expand block
  * When [canBeGrouped] returns a value, [canBeDisplayedInBubbleBlock] MUST return the opposite value.
@@ -52,6 +62,8 @@ internal fun TimelineItem.Event.canBeGrouped(): Boolean {
         is TimelineItemTextBasedContent,
         is TimelineItemEncryptedContent,
         is TimelineItemImageContent,
+        is TimelineItemGalleryContent,
+        is TimelineItemAttachmentsContent,
         is TimelineItemStickerContent,
         is TimelineItemFileContent,
         is TimelineItemVideoContent,
@@ -90,7 +102,7 @@ internal fun MatrixTimelineItem.Event.canBeDisplayedInBubbleBlock(): Boolean {
         is RoomMembershipContent,
         UnknownContent,
         is LegacyCallInviteContent,
-        CallNotifyContent,
+        is CallNotifyContent,
         is StateContent -> false
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
index 6af4f8be6a..2e01e53828 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouper.kt
@@ -12,6 +12,7 @@ import androidx.annotation.VisibleForTesting
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UniqueId
 import kotlinx.collections.immutable.toImmutableList
@@ -47,7 +48,8 @@ class TimelineItemGrouper {
         if (currentGroup.isNotEmpty()) {
             result.addGroup(groupIds, currentGroup)
         }
-        return result
+        // Finally, fold runs of consecutive deleted messages into a single group (element-web style).
+        return result.collapseRedactedRuns(groupIds)
     }
 }
 
@@ -89,3 +91,56 @@ private fun MutableMap<String, String>.getOrPutGroupId(timelineItems: List<Timel
 
 @VisibleForTesting
 internal fun computeGroupIdWith(timelineItem: TimelineItem): UniqueId = UniqueId("${timelineItem.identifier()}_group")
+
+// Runs shorter than this are left as individual "Message removed" tiles, like element-web.
+internal const val MIN_REDACTED_RUN_SIZE = 3
+
+/**
+ * Fold runs of [MIN_REDACTED_RUN_SIZE] or more consecutive deleted (redacted) messages into a single
+ * [TimelineItem.GroupedEvents], so a long stretch of "Message removed" tiles shows as one expandable
+ * "N removed messages" line, like element-web. Shorter runs, and anything that is not a redacted event
+ * (day dividers included), are left untouched.
+ *
+ * This runs as the final step of [TimelineItemGrouper.group], after the state and membership events
+ * have been grouped. It is deliberately kept out of the normal grouping: a run needs a higher minimum
+ * than an ordinary group, and a redacted group has to stay entirely redacted so its header can show a
+ * plain count rather than being mixed in with the surrounding state changes.
+ *
+ * Events are kept oldest-first to match the other groups, and the group id is resolved through the
+ * grouper's [getOrPutGroupId] registry, also like the other groups, so it stays stable however the
+ * run grows: older history loading in, or a new adjacent message being redacted. A stable id keeps
+ * the user's expand/collapse state across timeline updates.
+ */
+internal fun List<TimelineItem>.collapseRedactedRuns(groupIds: MutableMap<String, String>): List<TimelineItem> {
+    val result = mutableListOf<TimelineItem>()
+    val run = mutableListOf<TimelineItem.Event>()
+
+    fun flushRun() {
+        when {
+            run.isEmpty() -> Unit
+            run.size < MIN_REDACTED_RUN_SIZE -> result.addAll(run)
+            else -> {
+                val events = run.reversed()
+                result.add(
+                    TimelineItem.GroupedEvents(
+                        id = UniqueId(groupIds.getOrPutGroupId(events)),
+                        events = events.toImmutableList(),
+                        aggregatedReadReceipts = events.flatMap { it.readReceiptState.receipts }.toImmutableList(),
+                    )
+                )
+            }
+        }
+        run.clear()
+    }
+
+    for (item in this) {
+        if (item is TimelineItem.Event && item.content is TimelineItemRedactedContent) {
+            run.add(item)
+        } else {
+            flushRun()
+            result.add(item)
+        }
+    }
+    flushRun()
+    return result
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/NewEventState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/NewEventState.kt
index cac2798fdd..f80640dd0f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/NewEventState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/NewEventState.kt
@@ -8,12 +8,15 @@
 
 package io.element.android.features.messages.impl.timeline.model
 
+import androidx.compose.runtime.Immutable
+
 /**
  * Model if there is a new event in the timeline and if it is from me or from other.
  * This can be used to scroll to the bottom of the list when a new event is added.
  */
-enum class NewEventState {
-    None,
-    FromMe,
-    FromOther
+@Immutable
+sealed interface NewEventState {
+    data object None : NewEventState
+    data object FromMe : NewEventState
+    data object FromOther : NewEventState
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
index e169b10403..1cbc2ec29c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt
@@ -10,11 +10,14 @@ package io.element.android.features.messages.impl.timeline.model
 
 import androidx.compose.runtime.Immutable
 import io.element.android.features.messages.impl.timeline.components.MessageShieldData
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStickerContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemVideoContent
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.EventId
@@ -59,6 +62,12 @@ sealed interface TimelineItem {
         is GroupedEvents -> "groupedEvent"
     }
 
+    fun formattedDate(): String? = when (this) {
+        is Event -> sentDate.takeIf { it.isNotEmpty() }
+        is Virtual -> (model as? TimelineItemDaySeparatorModel)?.formattedDate?.takeIf { it.isNotEmpty() }
+        is GroupedEvents -> null
+    }
+
     data class Virtual(
         val id: UniqueId,
         val model: TimelineItemVirtualModel
@@ -75,6 +84,7 @@ sealed interface TimelineItem {
         val content: TimelineItemEventContent,
         val sentTimeMillis: Long = 0L,
         val sentTime: String = "",
+        val sentDate: String = "",
         val isMine: Boolean = false,
         val isEditable: Boolean,
         val canBeRepliedTo: Boolean,
@@ -116,6 +126,8 @@ sealed interface TimelineItem {
             is TimelineItemStickerContent -> content.formattedCaption == null && content.caption == null
             is TimelineItemImageContent -> content.formattedCaption == null && content.caption == null
             is TimelineItemVideoContent -> content.formattedCaption == null && content.caption == null
+            is TimelineItemGalleryContent -> false
+            is TimelineItemAttachmentsContent -> false
             else -> true
         }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAttachmentsContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAttachmentsContent.kt
new file mode 100644
index 0000000000..66d28598a1
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAttachmentsContent.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.model.event
+
+import io.element.android.libraries.matrix.api.media.MediaSource
+import kotlinx.collections.immutable.ImmutableList
+
+data class TimelineItemAttachmentsContent(
+    val body: String,
+    val caption: String?,
+    val formattedCaption: CharSequence?,
+    override val isEdited: Boolean,
+    val attachments: ImmutableList<AttachmentItem>,
+) : TimelineItemEventContent, TimelineItemEventMutableContent {
+    override val type: String = "TimelineItemAttachmentsContent"
+
+    val showCaption = caption != null
+
+    val hasPreviews = attachments.any { it.thumbnailSource != null }
+}
+
+data class AttachmentItem(
+    val filename: String,
+    val mimeType: String,
+    val mediaSource: MediaSource,
+    val thumbnailSource: MediaSource?,
+    val fileSize: Long?,
+    val formattedFileSize: String,
+    val fileExtension: String,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContentProvider.kt
index 9fddfa98ff..3b60a48c78 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContentProvider.kt
@@ -19,8 +19,6 @@ open class TimelineItemAudioContentProvider : PreviewParameterProvider<TimelineI
             aTimelineItemAudioContent("A sound.mp3"),
             aTimelineItemAudioContent("A bigger name sound.mp3"),
             aTimelineItemAudioContent("An even bigger bigger bigger bigger bigger bigger bigger sound name which doesn't fit.mp3"),
-            aTimelineItemAudioContent(caption = "A caption"),
-            aTimelineItemAudioContent(caption = "An even bigger bigger bigger bigger bigger bigger bigger caption"),
         )
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt
index 9c4c48d11e..c60e3847da 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt
@@ -15,6 +15,9 @@ import kotlin.time.Duration
 @Immutable
 sealed interface TimelineItemEventContent {
     val type: String
+
+    val isMedia: Boolean
+        get() = this is TimelineItemEventContentWithAttachment || this is TimelineItemGalleryContent || this is TimelineItemAttachmentsContent
 }
 
 interface TimelineItemEventMutableContent {
@@ -56,7 +59,9 @@ fun TimelineItemEventContent.canBeForwarded(): Boolean =
         is TimelineItemAudioContent,
         is TimelineItemVideoContent,
         is TimelineItemLocationContent,
-        is TimelineItemVoiceContent -> true
+        is TimelineItemVoiceContent,
+        is TimelineItemGalleryContent,
+        is TimelineItemAttachmentsContent -> true
         // Stickers can't be forwarded (yet) so we don't show the option
         // See https://github.com/element-hq/element-x-android/issues/2161
         is TimelineItemStickerContent -> false
@@ -78,7 +83,9 @@ fun TimelineItemEventContent.canReact(): Boolean =
         is TimelineItemLocationContent,
         is TimelineItemPollContent,
         is TimelineItemVoiceContent,
-        is TimelineItemVideoContent -> true
+        is TimelineItemVideoContent,
+        is TimelineItemGalleryContent,
+        is TimelineItemAttachmentsContent -> true
         is TimelineItemStateContent,
         is TimelineItemRedactedContent,
         is TimelineItemLegacyCallInviteContent,
@@ -99,6 +106,25 @@ fun TimelineItemEventContent.isEdited(): Boolean = when (this) {
  */
 fun TimelineItemEventContent.isRedacted(): Boolean = this is TimelineItemRedactedContent
 
+/**
+ * Returns the caption text for content types that support captions.
+ * Gallery and attachments content types have captions but don't implement
+ * [TimelineItemEventContentWithAttachment].
+ */
+fun TimelineItemEventContent.captionOrNull(): String? = when (this) {
+    is TimelineItemEventContentWithAttachment -> caption
+    is TimelineItemGalleryContent -> caption
+    is TimelineItemAttachmentsContent -> caption
+    else -> null
+}
+
+fun TimelineItemEventContent.formattedCaptionOrNull(): CharSequence? = when (this) {
+    is TimelineItemEventContentWithAttachment -> formattedCaption
+    is TimelineItemGalleryContent -> formattedCaption
+    is TimelineItemAttachmentsContent -> formattedCaption
+    else -> null
+}
+
 fun TimelineItemEventContentWithAttachment.duration(): Duration? {
     return when (this) {
         is TimelineItemAudioContent -> duration
@@ -107,3 +133,12 @@ fun TimelineItemEventContentWithAttachment.duration(): Duration? {
         else -> null
     }
 }
+
+fun TimelineItemEventContentWithAttachment.blurHash(): String? {
+    return when (this) {
+        is TimelineItemImageContent -> blurhash
+        is TimelineItemVideoContent -> blurHash
+        is TimelineItemStickerContent -> blurhash
+        else -> null
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt
index f3d70f44e7..1d4c7c04ec 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt
@@ -13,7 +13,9 @@ import android.text.style.StyleSpan
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
+import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
+import kotlinx.collections.immutable.toImmutableList
 import org.jsoup.nodes.Document
 
 class TimelineItemEventContentProvider : PreviewParameterProvider<TimelineItemEventContent> {
@@ -27,7 +29,7 @@ class TimelineItemEventContentProvider : PreviewParameterProvider<TimelineItemEv
         aTimelineItemAudioContent(),
         aTimelineItemAudioContent("An even bigger bigger bigger bigger bigger bigger bigger sound name which doesn't fit .mp3"),
         aTimelineItemVoiceContent(),
-        aTimelineItemLocationContent(),
+        aTimelineItemLocationContent(mode = aStaticLocationMode()),
         aTimelineItemPollContent(),
         aTimelineItemNoticeContent(),
         aTimelineItemRedactedContent(),
@@ -35,7 +37,9 @@ class TimelineItemEventContentProvider : PreviewParameterProvider<TimelineItemEv
         aTimelineItemUnknownContent(),
         aTimelineItemTextContent().copy(isEdited = true),
         aTimelineItemTextContent(body = AN_EMOJI_ONLY_TEXT),
-        aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = true)),
+        aTimelineItemLocationContent(
+            mode = aLiveLocationMode(isActive = true, endsAt = "Ends at 12:34", endTimestamp = 0L, lastKnownLocation = null)
+        ),
     )
 }
 
@@ -109,3 +113,40 @@ fun aTimelineItemStateEventContent(
 ) = TimelineItemStateEventContent(
     body = body,
 )
+
+fun aTimelineItemAttachmentsContent(
+    body: String = "Attachments",
+    caption: String? = null,
+    attachments: List<AttachmentItem> = listOf(
+        anAttachmentItem(filename = "document.pdf", fileExtension = "pdf"),
+        anAttachmentItem(filename = "recording.mp3", fileExtension = "mp3", fileSize = 4_500_000L, formattedFileSize = "4.5MB"),
+    ),
+) = TimelineItemAttachmentsContent(
+    body = body,
+    caption = caption,
+    formattedCaption = null,
+    isEdited = false,
+    attachments = attachments.toImmutableList(),
+)
+
+fun anAttachmentItem(
+    filename: String = "file.pdf",
+    fileExtension: String = "pdf",
+    fileSize: Long? = 1_000_000L,
+    formattedFileSize: String = "1MB",
+    mimeType: String? = null,
+    mediaSource: MediaSource = MediaSource(url = "", json = ""),
+    thumbnailSource: MediaSource? = null,
+    hasThumbnail: Boolean = false,
+) = AttachmentItem(
+    filename = filename,
+    mimeType = mimeType ?: when {
+        hasThumbnail -> "image/jpeg"
+        else -> "application/$fileExtension"
+    },
+    mediaSource = mediaSource,
+    thumbnailSource = thumbnailSource ?: if (hasThumbnail) MediaSource(url = "", json = "") else null,
+    fileSize = fileSize,
+    formattedFileSize = formattedFileSize,
+    fileExtension = fileExtension,
+)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt
index 58e25e5dcd..e2021e9646 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt
@@ -18,8 +18,6 @@ open class TimelineItemFileContentProvider : PreviewParameterProvider<TimelineIt
             aTimelineItemFileContent(),
             aTimelineItemFileContent("A bigger name file.pdf"),
             aTimelineItemFileContent("An even bigger bigger bigger bigger bigger bigger bigger file name which doesn't fit.pdf"),
-            aTimelineItemFileContent(caption = "A caption"),
-            aTimelineItemFileContent(caption = "An even bigger bigger bigger bigger bigger bigger bigger caption"),
         )
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemGalleryContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemGalleryContent.kt
new file mode 100644
index 0000000000..f376a2a00a
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemGalleryContent.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.model.event
+
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import kotlinx.collections.immutable.ImmutableList
+import kotlin.time.Duration
+
+data class TimelineItemGalleryContent(
+    val body: String,
+    val caption: String?,
+    val formattedCaption: CharSequence?,
+    override val isEdited: Boolean,
+    val items: ImmutableList<GalleryItem>,
+) : TimelineItemEventContent, TimelineItemEventMutableContent {
+    override val type: String = "TimelineItemGalleryContent"
+
+    val showCaption = caption != null
+}
+
+data class GalleryItem(
+    val filename: String,
+    val mimeType: String,
+    val mediaSource: MediaSource,
+    val type: Type,
+    val thumbnailSource: MediaSource?,
+    val width: Int?,
+    val height: Int?,
+    val thumbnailWidth: Int?,
+    val thumbnailHeight: Int?,
+    val blurhash: String?,
+    val duration: Duration = Duration.ZERO,
+) {
+    enum class Type {
+        Image,
+        Video,
+        Audio,
+        File;
+
+        fun isVisualMedia() = this in setOf(Image, Video)
+    }
+
+    val thumbnailMediaRequestData: MediaRequestData by lazy {
+        MediaRequestData(
+            source = thumbnailSource ?: mediaSource,
+            kind = MediaRequestData.Kind.Thumbnail(
+                width = thumbnailWidth?.toLong() ?: io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_WIDTH,
+                height = thumbnailHeight?.toLong() ?: io.element.android.libraries.matrix.ui.media.MAX_THUMBNAIL_HEIGHT,
+            ),
+        )
+    }
+
+    val aspectRatio: Float? by lazy {
+        if (width != null && height != null && height > 0) {
+            width.toFloat() / height.toFloat()
+        } else {
+            null
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContentProvider.kt
index d07d5db6a4..6d3b114428 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContentProvider.kt
@@ -28,6 +28,8 @@ fun aTimelineItemImageContent(
     blurhash: String? = A_BLUR_HASH,
     filename: String = "A picture.jpg",
     caption: String? = null,
+    width: Int? = null,
+    height: Int? = 300,
 ) = TimelineItemImageContent(
     filename = filename,
     fileSize = 4 * 1024 * 1024L,
@@ -38,8 +40,8 @@ fun aTimelineItemImageContent(
     thumbnailSource = null,
     mimeType = MimeTypes.IMAGE_JPEG,
     blurhash = blurhash,
-    width = null,
-    height = 300,
+    width = width,
+    height = height,
     thumbnailWidth = null,
     thumbnailHeight = 150,
     aspectRatio = aspectRatio,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
index aa9fb6b71e..12368530a3 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
@@ -8,6 +8,10 @@
 
 package io.element.android.features.messages.impl.timeline.model.event
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.rememberUpdatedState
 import io.element.android.features.location.api.Location
 import io.element.android.libraries.designsystem.components.PinVariant
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -17,17 +21,25 @@ import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisplayName
+import kotlinx.coroutines.delay
 
 data class TimelineItemLocationContent(
-    val body: String,
     val senderId: UserId,
     val senderProfile: ProfileDetails,
-    val location: Location,
     val description: String? = null,
     val assetType: AssetType? = null,
     val mode: Mode,
 ) : TimelineItemEventContent {
-    val pinVariant = when (mode) {
+    val location = when (mode) {
+        is Mode.Live -> mode.lastKnownLocation
+        is Mode.Static -> mode.location
+    }
+
+    /**
+     * The pin variant to display on the map.
+     * Returns a default variant when location is null (map will show loading placeholder anyway).
+     */
+    val pinVariant: PinVariant = when (mode) {
         is Mode.Live -> {
             if (mode.isActive) {
                 PinVariant.UserLocation(avatarData = senderAvatar(), isLive = true)
@@ -35,7 +47,7 @@ data class TimelineItemLocationContent(
                 PinVariant.StaleLocation
             }
         }
-        Mode.Static -> {
+        is Mode.Static -> {
             when (assetType) {
                 AssetType.PIN -> PinVariant.PinnedLocation
                 AssetType.SENDER,
@@ -53,9 +65,59 @@ data class TimelineItemLocationContent(
     )
 
     sealed interface Mode {
-        data object Static : Mode
-        data class Live(val isActive: Boolean) : Mode
+        data class Static(
+            val location: Location,
+        ) : Mode
+
+        data class Live(
+            val lastKnownLocation: Location?,
+            val isActive: Boolean,
+            val endsAt: String,
+            val endTimestamp: Long,
+            val isOwnUser: Boolean,
+        ) : Mode {
+            val isLoading = lastKnownLocation == null && isActive
+            val canStopSharing = isActive && isOwnUser
+        }
     }
 
     override val type: String = "TimelineItemLocationContent"
 }
+
+/**
+ * Overrides the isActive value if needed, to make sure endTimestamp is used in absence of stop event.
+ */
+@Composable
+internal fun TimelineItemLocationContent.ensureActiveLiveLocation(
+    currentTimeMillis: () -> Long = System::currentTimeMillis,
+): TimelineItemLocationContent {
+    return when (mode) {
+        is TimelineItemLocationContent.Mode.Live -> {
+            val isActive = rememberIsLiveLocationActive(mode, currentTimeMillis)
+            copy(mode = mode.copy(isActive = isActive))
+        }
+        is TimelineItemLocationContent.Mode.Static -> this
+    }
+}
+
+@Composable
+private fun rememberIsLiveLocationActive(
+    mode: TimelineItemLocationContent.Mode.Live,
+    currentTimeMillis: () -> Long,
+): Boolean {
+    val updatedCurrentTimeMillis by rememberUpdatedState(currentTimeMillis)
+    fun TimelineItemLocationContent.Mode.Live.isActive(): Boolean {
+        return isActive && endTimestamp > updatedCurrentTimeMillis()
+    }
+    return produceState(
+        initialValue = mode.isActive(),
+        key1 = mode.endTimestamp,
+        key2 = mode.isActive,
+    ) {
+        if (mode.isActive) {
+            val remainingMillis = mode.endTimestamp - updatedCurrentTimeMillis()
+            delay(remainingMillis)
+        }
+        value = false
+    }.value
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContentProvider.kt
index 362e9b4cda..6c095c828e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContentProvider.kt
@@ -17,25 +17,53 @@ import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsRead
 open class TimelineItemLocationContentProvider : PreviewParameterProvider<TimelineItemLocationContent> {
     override val values: Sequence<TimelineItemLocationContent>
         get() = sequenceOf(
-            aTimelineItemLocationContent(),
-            aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = true)),
-            aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = false)),
+            aTimelineItemLocationContent(
+                mode = aStaticLocationMode()
+            ),
+            aTimelineItemLocationContent(
+                mode = aLiveLocationMode(isActive = true)
+            ),
+            aTimelineItemLocationContent(
+                mode = aLiveLocationMode(isActive = true, lastKnownLocation = null)
+            ),
+            aTimelineItemLocationContent(
+                mode = aLiveLocationMode(isActive = true, isOwnUser = false)
+            ),
+            aTimelineItemLocationContent(
+                mode = aLiveLocationMode(isActive = false)
+            ),
         )
 }
+fun aLiveLocationMode(
+    isActive: Boolean,
+    isOwnUser: Boolean = true,
+    lastKnownLocation: Location? = aLocation(),
+    endsAt: String = "Ends at 12:34",
+    endTimestamp: Long = 0L,
+): TimelineItemLocationContent.Mode = TimelineItemLocationContent.Mode.Live(
+    isActive = isActive,
+    endsAt = endsAt,
+    endTimestamp = endTimestamp,
+    isOwnUser = isOwnUser,
+    lastKnownLocation = lastKnownLocation
+)
+
+fun aStaticLocationMode(location: Location = aLocation()) = TimelineItemLocationContent.Mode.Static(location)
 
 fun aTimelineItemLocationContent(
-    body: String = "",
     senderId: UserId = UserId("@sender:matrix.org"),
     senderProfile: ProfileDetails = aProfileDetailsReady(),
-    mode: TimelineItemLocationContent.Mode = TimelineItemLocationContent.Mode.Static,
+    description: String? = null,
+    mode: TimelineItemLocationContent.Mode,
 ) = TimelineItemLocationContent(
-    body = body,
-    location = Location(
-        lat = 52.2445,
-        lon = 0.7186,
-        accuracy = 5000f,
-    ),
     senderId = senderId,
     senderProfile = senderProfile,
-    mode = mode
+    description = description,
+    mode = mode,
+)
+
+fun aLocation() = Location(
+    lat = 52.2445,
+    lon = 0.7186,
+    accuracy = 5000f,
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
index 00ad32ba5f..c0db3a7547 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemRtcNotificationContent.kt
@@ -8,6 +8,34 @@
 
 package io.element.android.features.messages.impl.timeline.model.event
 
-class TimelineItemRtcNotificationContent : TimelineItemEventContent {
-    override val type: String = "org.matrix.msc4075.rtc.notification"
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.api.timeline.item.event.EventType
+import io.element.android.libraries.matrix.api.user.MatrixUser
+
+// State of the call, for now only isDeclined but in the future could be missed, active.
+sealed interface RtcNotificationState {
+    /** Call is currently active. **/
+    data class Active(
+        val joinedMembers: List<MatrixUser>,
+        val isJoined: Boolean,
+        val callStartTsMillis: Long?,
+        val callIntent: CallIntent,
+    ) : RtcNotificationState
+
+    /** Some users have declined, byMe indicates if the current user is one of them. */
+    data class Declined(val byMe: Boolean) : RtcNotificationState, Tombstoned
+
+    object Started : RtcNotificationState, Tombstoned
+
+    /**
+     * Tag for Tombstoned/Past calls.
+     */
+    interface Tombstoned
+}
+
+class TimelineItemRtcNotificationContent(
+    val callIntent: CallIntent,
+    val state: RtcNotificationState,
+) : TimelineItemEventContent {
+    override val type: String = EventType.RTC_NOTIFICATION
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt
index 0fadb6c9a6..627dbf3dd7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt
@@ -20,6 +20,7 @@ open class TimelineItemVideoContentProvider : PreviewParameterProvider<TimelineI
             aTimelineItemVideoContent(),
             aTimelineItemVideoContent(aspectRatio = 1.0f),
             aTimelineItemVideoContent(aspectRatio = 1.5f),
+            aTimelineItemVideoContent(thumbnailMediaSource = MediaSource("https://example.com/thumbnail.jpg")),
             aTimelineItemVideoContent(blurhash = null),
         )
 }
@@ -27,17 +28,20 @@ open class TimelineItemVideoContentProvider : PreviewParameterProvider<TimelineI
 fun aTimelineItemVideoContent(
     aspectRatio: Float = 0.5f,
     blurhash: String? = A_BLUR_HASH,
+    caption: String? = null,
+    mediaSource: MediaSource = MediaSource(""),
+    thumbnailMediaSource: MediaSource? = null,
 ) = TimelineItemVideoContent(
     filename = "Video.mp4",
     fileSize = 14 * 1024 * 1024L,
-    caption = null,
+    caption = caption,
     formattedCaption = null,
     isEdited = false,
-    thumbnailSource = null,
+    thumbnailSource = thumbnailMediaSource,
     blurHash = blurhash,
     aspectRatio = aspectRatio,
     duration = 100.milliseconds,
-    mediaSource = MediaSource(""),
+    mediaSource = mediaSource,
     width = 150,
     height = 300,
     thumbnailWidth = 150,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedView.kt
index de55735b76..2dbe47e9e4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedView.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.features.messages.impl.timeline.components.event.TimelineItemAspectRatioBox
 import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -49,7 +50,7 @@ fun ProtectedView(
                 .background(Color(0x99000000)),
             contentAlignment = Alignment.Center,
         ) {
-            ElementTheme(darkTheme = false, applySystemBarsUpdate = false) {
+            ElementTheme(theme = Theme.Light, applySystemBarsUpdate = false) {
                 // Not using a button to be able to have correct size
                 Text(
                     modifier = Modifier
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineItem.kt
index 5a5363f0c6..1106c3809e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineItem.kt
@@ -9,10 +9,12 @@
 package io.element.android.features.messages.impl.timeline.protection
 
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEmoteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@@ -34,26 +36,34 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
  */
 fun TimelineItem.mustBeProtected(): Boolean {
     return when (this) {
-        is TimelineItem.Event -> when (content) {
-            is TimelineItemImageContent,
-            is TimelineItemVideoContent,
-            is TimelineItemStickerContent -> true
-            is TimelineItemAudioContent,
-            is TimelineItemRtcNotificationContent,
-            is TimelineItemEncryptedContent,
-            is TimelineItemFileContent,
-            TimelineItemLegacyCallInviteContent,
-            is TimelineItemLocationContent,
-            is TimelineItemPollContent,
-            TimelineItemRedactedContent,
-            is TimelineItemProfileChangeContent,
-            is TimelineItemRoomMembershipContent,
-            is TimelineItemStateEventContent,
-            is TimelineItemEmoteContent,
-            is TimelineItemNoticeContent,
-            is TimelineItemTextContent,
-            TimelineItemUnknownContent,
-            is TimelineItemVoiceContent -> false
+        is TimelineItem.Event -> {
+            if (isMine) {
+                false
+            } else {
+                when (content) {
+                    is TimelineItemImageContent,
+                    is TimelineItemGalleryContent,
+                    is TimelineItemAttachmentsContent,
+                    is TimelineItemVideoContent,
+                    is TimelineItemStickerContent -> true
+                    is TimelineItemAudioContent,
+                    is TimelineItemRtcNotificationContent,
+                    is TimelineItemEncryptedContent,
+                    is TimelineItemFileContent,
+                    TimelineItemLegacyCallInviteContent,
+                    is TimelineItemLocationContent,
+                    is TimelineItemPollContent,
+                    TimelineItemRedactedContent,
+                    is TimelineItemProfileChangeContent,
+                    is TimelineItemRoomMembershipContent,
+                    is TimelineItemStateEventContent,
+                    is TimelineItemEmoteContent,
+                    is TimelineItemNoticeContent,
+                    is TimelineItemTextContent,
+                    TimelineItemUnknownContent,
+                    is TimelineItemVoiceContent -> false
+                }
+            }
         }
         is TimelineItem.Virtual -> false
         is TimelineItem.GroupedEvents -> false
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionEvent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionEvent.kt
index 3d75268777..72c5eb7a30 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionEvent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionEvent.kt
@@ -9,7 +9,13 @@
 package io.element.android.features.messages.impl.timeline.protection
 
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
 
 sealed interface TimelineProtectionEvent {
     data class ShowContent(val eventId: EventId?) : TimelineProtectionEvent
+    data class ValidateContent(
+        val mediaSources: List<MediaSource>,
+        val validationState: ContentValidationState,
+    ) : TimelineProtectionEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
index b2ea1d6bd8..22be4acb2d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
@@ -12,23 +12,28 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.mutableStateSetOf
 import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.mapState
+import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.media.isPreviewEnabled
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import kotlinx.collections.immutable.toImmutableSet
 
+@SingleIn(RoomScope::class)
 @Inject
 class TimelineProtectionPresenter(
     private val mediaPreviewService: MediaPreviewService,
     private val room: BaseRoom,
+    private val contentScannerService: ContentScannerService,
 ) : Presenter<TimelineProtectionState> {
-    private val allowedEvents = mutableStateOf<Set<EventId>>(setOf())
+    private val allowedEvents = mutableStateSetOf<EventId>()
 
     @Composable
     override fun present(): TimelineProtectionState {
@@ -36,13 +41,14 @@ class TimelineProtectionPresenter(
             mediaPreviewService.mediaPreviewConfigFlow.mapState { config -> config.mediaPreviewValue }
         }.collectAsState()
         val roomInfo = room.roomInfoFlow.collectAsState()
+
         val protectionState by remember {
             derivedStateOf {
                 val isPreviewEnabled = mediaPreviewValue.value.isPreviewEnabled(roomInfo.value.joinRule)
                 if (isPreviewEnabled) {
                     ProtectionState.RenderAll
                 } else {
-                    ProtectionState.RenderOnly(eventIds = allowedEvents.value.toImmutableSet())
+                    ProtectionState.RenderOnly(eventIds = allowedEvents.toImmutableSet())
                 }
             }
         }
@@ -50,7 +56,10 @@ class TimelineProtectionPresenter(
         fun handleEvent(event: TimelineProtectionEvent) {
             when (event) {
                 is TimelineProtectionEvent.ShowContent -> {
-                    allowedEvents.value = allowedEvents.value + setOfNotNull(event.eventId)
+                    allowedEvents += setOfNotNull(event.eventId)
+                }
+                is TimelineProtectionEvent.ValidateContent -> {
+                    contentScannerService.scan(event.mediaSources, event.validationState)
                 }
             }
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionState.kt
index 169e5ba7f4..df31c205e9 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionState.kt
@@ -16,9 +16,13 @@ data class TimelineProtectionState(
     val protectionState: ProtectionState,
     val eventSink: (TimelineProtectionEvent) -> Unit,
 ) {
-    fun hideMediaContent(eventId: EventId?) = when (protectionState) {
-        is ProtectionState.RenderAll -> false
-        is ProtectionState.RenderOnly -> eventId !in protectionState.eventIds
+    fun hideMediaContent(eventId: EventId?, isMine: Boolean = false) = if (isMine) {
+        false
+    } else {
+        when (protectionState) {
+            is ProtectionState.RenderAll -> false
+            is ProtectionState.RenderOnly -> eventId !in protectionState.eventIds
+        }
     }
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandler.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandler.kt
new file mode 100644
index 0000000000..546d37de3d
--- /dev/null
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandler.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.util
+
+import coil3.compose.AsyncImagePainter
+import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import okio.IOException
+
+fun handleAsyncImageStateChange(
+    state: AsyncImagePainter.State,
+    onLoaded: () -> Unit,
+    updateContentValidationState: ((ContentValidationValue) -> Unit)?,
+) {
+    if (state is AsyncImagePainter.State.Success) {
+        onLoaded()
+    }
+
+    val updatedContentValidationValue = when (state) {
+        is AsyncImagePainter.State.Empty -> ContentValidationValue.Unknown
+        is AsyncImagePainter.State.Loading -> ContentValidationValue.Loading
+        is AsyncImagePainter.State.Success -> ContentValidationValue.Valid
+        is AsyncImagePainter.State.Error -> {
+            when (val cause = state.result.throwable) {
+                is ClientException.ContentScanner if cause.reason.isDangerous() -> ContentValidationValue.Invalid
+                is IOException -> {
+                    // Use `Unknown` instead of `Invalid` to allow retrying the download later
+                    ContentValidationValue.Unknown
+                }
+                else -> ContentValidationValue.UnrecoverableError(cause)
+            }
+        }
+    }
+
+    updateContentValidationState?.invoke(updatedContentValidationValue)
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
index 24cd71ae84..6aabf97f2c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
@@ -12,10 +12,14 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -26,12 +30,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.messages.impl.MessagesMenuActions
 import io.element.android.features.messages.impl.SharedHistoryIcon
-import io.element.android.features.messages.impl.timeline.components.CallMenuItem
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.features.roomcall.api.aStandByCallState
 import io.element.android.features.roomcall.api.anOngoingCallState
@@ -43,11 +46,13 @@ import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.ui.components.DisplayNameWithStatus
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -62,16 +67,16 @@ internal fun MessagesViewTopBar(
     roomAvatar: AvatarData,
     isTombstoned: Boolean,
     heroes: ImmutableList<AvatarData>,
-    roomCallState: RoomCallState,
     dmUserIdentityState: IdentityState?,
     sharedHistoryIcon: SharedHistoryIcon,
+    dmUserStatus: DisplayedStatus?,
     onRoomDetailsClick: () -> Unit,
-    onJoinCallClick: (isAudioCall: Boolean) -> Unit,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
+    menuActions: @Composable RowScope.() -> Unit,
 ) {
     TopAppBar(
-        modifier = modifier,
+        modifier = modifier.padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()),
         navigationIcon = {
             BackButton(onClick = onBackClick)
         },
@@ -80,7 +85,8 @@ internal fun MessagesViewTopBar(
             Row(
                 modifier = Modifier
                     .clip(roundedCornerShape)
-                    .clickable { onRoomDetailsClick() },
+                    .clickable { onRoomDetailsClick() }
+                    .semantics { heading() },
                 horizontalArrangement = Arrangement.spacedBy(4.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
@@ -90,12 +96,16 @@ internal fun MessagesViewTopBar(
                     roomAvatar = roomAvatar,
                     isTombstoned = isTombstoned,
                     heroes = heroes,
+                    dmUserStatus = dmUserStatus,
                     modifier = titleModifier
                 )
 
+                val iconModifier = Modifier.size(16.dp)
+
                 when (dmUserIdentityState) {
                     IdentityState.Verified -> {
                         Icon(
+                            modifier = iconModifier,
                             imageVector = CompoundIcons.Verified(),
                             tint = ElementTheme.colors.iconSuccessPrimary,
                             contentDescription = null,
@@ -103,6 +113,7 @@ internal fun MessagesViewTopBar(
                     }
                     IdentityState.VerificationViolation -> {
                         Icon(
+                            modifier = iconModifier,
                             imageVector = CompoundIcons.ErrorSolid(),
                             tint = ElementTheme.colors.iconCriticalPrimary,
                             contentDescription = null,
@@ -114,11 +125,13 @@ internal fun MessagesViewTopBar(
                 when (sharedHistoryIcon) {
                     SharedHistoryIcon.NONE -> Unit
                     SharedHistoryIcon.SHARED -> Icon(
+                        modifier = iconModifier,
                         imageVector = CompoundIcons.History(),
                         tint = ElementTheme.colors.iconInfoPrimary,
                         contentDescription = stringResource(CommonStrings.common_shared_history),
                     )
                     SharedHistoryIcon.WORLD_READABLE -> Icon(
+                        modifier = iconModifier,
                         imageVector = CompoundIcons.UserProfileSolid(),
                         tint = ElementTheme.colors.iconInfoPrimary,
                         contentDescription = stringResource(CommonStrings.common_world_readable_history),
@@ -126,13 +139,7 @@ internal fun MessagesViewTopBar(
                 }
             }
         },
-        actions = {
-            CallMenuItem(
-                roomCallState = roomCallState,
-                onJoinCallClick = onJoinCallClick,
-            )
-            Spacer(Modifier.width(8.dp))
-        },
+        actions = menuActions,
         windowInsets = WindowInsets(0.dp)
     )
 }
@@ -143,6 +150,7 @@ private fun RoomAvatarAndNameRow(
     roomAvatar: AvatarData,
     heroes: ImmutableList<AvatarData>,
     isTombstoned: Boolean,
+    dmUserStatus: DisplayedStatus?,
     modifier: Modifier = Modifier
 ) {
     Row(
@@ -156,17 +164,13 @@ private fun RoomAvatarAndNameRow(
                 isTombstoned = isTombstoned,
             ),
         )
-        Text(
-            modifier = Modifier
-                .padding(horizontal = 8.dp)
-                .semantics {
-                    heading()
-                },
-            text = roomName ?: stringResource(CommonStrings.common_no_room_name),
+        DisplayNameWithStatus(
+            name = roomName ?: stringResource(CommonStrings.common_no_room_name),
+            status = dmUserStatus,
+            modifier = Modifier.padding(start = 8.dp),
             style = ElementTheme.typography.fontBodyLgMedium,
-            fontStyle = FontStyle.Italic.takeIf { roomName == null },
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            nameColor = ElementTheme.colors.textPrimary,
+            nameFontStyle = FontStyle.Italic.takeIf { roomName == null },
         )
     }
 }
@@ -176,9 +180,9 @@ private fun RoomAvatarAndNameRow(
 internal fun MessagesViewTopBarPreview() = ElementPreview {
     @Composable
     fun AMessagesViewTopBar(
-        roomName: String? = "Room name",
+        roomName: String? = ROOM_NAME,
         roomAvatar: AvatarData = anAvatarData(
-            name = "Room name",
+            name = ROOM_NAME,
             size = AvatarSize.TimelineRoom,
         ),
         isTombstoned: Boolean = false,
@@ -186,17 +190,26 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
         roomCallState: RoomCallState = RoomCallState.Unavailable,
         dmUserIdentityState: IdentityState? = null,
         sharedHistoryIcon: SharedHistoryIcon = SharedHistoryIcon.NONE,
+        dmUserStatus: DisplayedStatus? = null,
+        displayThreads: Boolean = false,
     ) = MessagesViewTopBar(
         roomName = roomName,
         roomAvatar = roomAvatar,
         isTombstoned = isTombstoned,
         heroes = heroes,
-        roomCallState = roomCallState,
         dmUserIdentityState = dmUserIdentityState,
         sharedHistoryIcon = sharedHistoryIcon,
+        dmUserStatus = dmUserStatus,
         onRoomDetailsClick = {},
-        onJoinCallClick = {},
         onBackClick = {},
+        menuActions = {
+            MessagesMenuActions(
+                roomCallState = roomCallState,
+                displayThreads = displayThreads,
+                onJoinCallClick = {},
+                onThreadsListClick = {},
+            )
+        }
     )
     Column {
         AMessagesViewTopBar()
@@ -237,5 +250,15 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
             roomName = "A room with world_readable history",
             sharedHistoryIcon = SharedHistoryIcon.WORLD_READABLE,
         )
+        HorizontalDivider()
+        AMessagesViewTopBar(
+            displayThreads = true,
+        )
+        HorizontalDivider()
+        AMessagesViewTopBar(
+            roomName = "A DM with a very very very long name",
+            dmUserIdentityState = IdentityState.Verified,
+            dmUserStatus = DisplayedStatus.InCall(0L)
+        )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
index 2247566531..5ef4541f06 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
@@ -17,8 +17,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.heading
-import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -31,6 +32,7 @@ import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
@@ -57,7 +59,18 @@ internal fun ThreadTopBar(
             BackButton(onClick = onBackClick)
         },
         title = {
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            val name = roomName ?: stringResource(CommonStrings.common_no_room_name)
+            val description = stringResource(
+                CommonStrings.a11y_thread_in_room,
+                name,
+            )
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.clearAndSetSemantics {
+                    heading()
+                    contentDescription = description
+                },
+            ) {
                 Avatar(
                     avatarData = roomAvatarData,
                     avatarType = AvatarType.Room(
@@ -68,17 +81,14 @@ internal fun ThreadTopBar(
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = 8.dp)
-                        .semantics {
-                            heading()
-                        },
+                        .padding(horizontal = 8.dp),
                 ) {
                     Text(
                         text = stringResource(CommonStrings.common_thread),
                         style = ElementTheme.typography.fontBodyLgMedium,
                     )
                     Text(
-                        text = roomName ?: stringResource(CommonStrings.common_no_room_name),
+                        text = name,
                         style = ElementTheme.typography.fontBodySmRegular,
                         fontStyle = FontStyle.Italic.takeIf { roomName == null },
                         color = ElementTheme.colors.textSecondary,
@@ -96,9 +106,9 @@ internal fun ThreadTopBar(
 internal fun ThreadTopBarPreview() = ElementPreview {
     @Composable
     fun AThreadTopBar(
-        roomName: String? = "Room name",
+        roomName: String? = ROOM_NAME,
         roomAvatarData: AvatarData = anAvatarData(
-            name = "Room name",
+            name = ROOM_NAME,
             size = AvatarSize.TimelineRoom,
         ),
         isTombstoned: Boolean = false,
@@ -123,7 +133,7 @@ internal fun ThreadTopBarPreview() = ElementPreview {
         HorizontalDivider()
         AThreadTopBar(
             roomAvatarData = anAvatarData(
-                name = "Room name",
+                name = ROOM_NAME,
                 url = "https://some-avatar.jpg",
                 size = AvatarSize.TimelineRoom,
             ),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationStateProvider.kt
index 0506026b86..e298b3af26 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationStateProvider.kt
@@ -9,6 +9,11 @@
 package io.element.android.features.messages.impl.typing
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CHARLIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
+import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
 import kotlinx.collections.immutable.toImmutableList
 
 class TypingNotificationStateProvider : PreviewParameterProvider<TypingNotificationState> {
@@ -22,7 +27,7 @@ class TypingNotificationStateProvider : PreviewParameterProvider<TypingNotificat
             ),
             aTypingNotificationState(
                 typingMembers = listOf(
-                    aTypingRoomMember(disambiguatedDisplayName = "Alice"),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_ALICE),
                 ),
             ),
             aTypingNotificationState(
@@ -32,24 +37,24 @@ class TypingNotificationStateProvider : PreviewParameterProvider<TypingNotificat
             ),
             aTypingNotificationState(
                 typingMembers = listOf(
-                    aTypingRoomMember(disambiguatedDisplayName = "Alice"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Bob"),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_ALICE),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_BOB),
                 ),
             ),
             aTypingNotificationState(
                 typingMembers = listOf(
-                    aTypingRoomMember(disambiguatedDisplayName = "Alice"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Bob"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Charlie"),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_ALICE),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_BOB),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_CHARLIE),
                 ),
             ),
             aTypingNotificationState(
                 typingMembers = listOf(
-                    aTypingRoomMember(disambiguatedDisplayName = "Alice"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Bob"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Charlie"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Dan"),
-                    aTypingRoomMember(disambiguatedDisplayName = "Eve"),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_ALICE),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_BOB),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_CHARLIE),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_DAVID),
+                    aTypingRoomMember(disambiguatedDisplayName = USER_NAME_EVE),
                 ),
             ),
             aTypingNotificationState(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
index 0aeb3bb8fc..efbbbee01e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
@@ -10,10 +10,13 @@ package io.element.android.features.messages.impl.utils.messagesummary
 
 import android.content.Context
 import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEncryptedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@@ -41,7 +44,10 @@ class DefaultMessageSummaryFormatter(
             is TimelineItemTextBasedContent -> content.plainText
             is TimelineItemProfileChangeContent -> content.body
             is TimelineItemStateContent -> content.body
-            is TimelineItemLocationContent -> context.getString(CommonStrings.common_shared_location)
+            is TimelineItemLocationContent -> when (content.mode) {
+                is TimelineItemLocationContent.Mode.Live -> context.getString(CommonStrings.common_shared_live_location)
+                is TimelineItemLocationContent.Mode.Static -> context.getString(CommonStrings.common_shared_location)
+            }
             is TimelineItemEncryptedContent -> context.getString(CommonStrings.common_unable_to_decrypt)
             is TimelineItemRedactedContent -> context.getString(CommonStrings.common_message_removed)
             is TimelineItemPollContent -> content.question
@@ -52,8 +58,28 @@ class DefaultMessageSummaryFormatter(
             is TimelineItemVideoContent -> context.getString(CommonStrings.common_video)
             is TimelineItemFileContent -> context.getString(CommonStrings.common_file)
             is TimelineItemAudioContent -> context.getString(CommonStrings.common_audio)
+            is TimelineItemGalleryContent -> context.getString(CommonStrings.common_gallery)
+            is TimelineItemAttachmentsContent -> {
+                val count = content.attachments.size
+                val extensions = content.attachments.take(3).joinToString { it.fileExtension }
+                if (count <= 3) {
+                    extensions
+                } else {
+                    "$extensions +${count - 3}"
+                }
+            }
             is TimelineItemLegacyCallInviteContent -> context.getString(CommonStrings.common_unsupported_call)
-            is TimelineItemRtcNotificationContent -> context.getString(CommonStrings.common_call_started)
+            is TimelineItemRtcNotificationContent -> when (content.state) {
+                is RtcNotificationState.Declined -> {
+                    if (content.state.byMe) {
+                        context.getString(CommonStrings.common_call_you_declined)
+                    } else {
+                        context.getString(CommonStrings.common_call_declined)
+                    }
+                }
+                RtcNotificationState.Started, is RtcNotificationState.Active
+                    -> context.getString(CommonStrings.common_call_started)
+            }
         }
             // Truncate the message to a safe length to avoid crashes in Compose
             .toSafeLength()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
index 6fdd2f1752..96d1787085 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenter.kt
@@ -34,10 +34,12 @@ import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.permissions.api.PermissionsEvent
 import io.element.android.libraries.permissions.api.PermissionsPresenter
+import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
 import io.element.android.libraries.textcomposer.model.VoiceMessageState
@@ -151,7 +153,7 @@ class DefaultVoiceMessageComposerPresenter(
             }
         }
 
-        fun sendVoiceMessage() {
+        fun sendVoiceMessage(inReplyToEventId: EventId?) {
             val finishedState = recorderState as? VoiceRecorderState.Finished
             if (finishedState == null) {
                 val exception = VoiceMessageException.FileException("No file to send")
@@ -170,6 +172,7 @@ class DefaultVoiceMessageComposerPresenter(
                     file = finishedState.file,
                     mimeType = finishedState.mimeType,
                     waveform = finishedState.waveform,
+                    inReplyToEventId = inReplyToEventId,
                 )
                 if (result.isFailure) {
                     showSendFailureDialog = true
@@ -183,8 +186,13 @@ class DefaultVoiceMessageComposerPresenter(
             when (event) {
                 is VoiceMessageComposerEvent.RecorderEvent -> handleVoiceMessageRecorderEvent(event.recorderEvent)
                 is VoiceMessageComposerEvent.PlayerEvent -> handleVoiceMessagePlayerEvent(event.playerEvent)
-                is VoiceMessageComposerEvent.SendVoiceMessage -> localCoroutineScope.launch {
-                    sendVoiceMessage()
+                is VoiceMessageComposerEvent.SendVoiceMessage -> {
+                    // Capture reply info eagerly before any coroutine dispatch, since CloseSpecialMode
+                    // may reset composerMode before the coroutine runs.
+                    val inReplyToEventId = (messageComposerContext.composerMode as? MessageComposerMode.Reply)?.eventId
+                    localCoroutineScope.launch {
+                        sendVoiceMessage(inReplyToEventId)
+                    }
                 }
                 VoiceMessageComposerEvent.DeleteVoiceMessage -> {
                     player.pause()
@@ -280,11 +288,13 @@ class DefaultVoiceMessageComposerPresenter(
         file: File,
         mimeType: String,
         waveform: List<Float>,
+        inReplyToEventId: EventId? = null,
     ): Result<Unit> {
         val result = mediaSender.sendVoiceMessage(
             uri = file.toUri(),
             mimeType = mimeType,
             waveForm = waveform,
+            inReplyToEventId = inReplyToEventId,
         )
 
         if (result.isFailure) {
diff --git a/features/messages/impl/src/main/res/values-be/translations.xml b/features/messages/impl/src/main/res/values-be/translations.xml
index 80a5df8d6b..b6cac43616 100644
--- a/features/messages/impl/src/main/res/values-be/translations.xml
+++ b/features/messages/impl/src/main/res/values-be/translations.xml
@@ -6,16 +6,10 @@
   <string name="crypto_event_authenticity_unknown_device">"Зашыфравана невядомай ці выдаленай прыладай."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Зашыфравана прыладай, не пацверджанай яе ўладальнікам."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Зашыфравана неправераным карыстальнікам."</string>
-  <string name="emoji_picker_category_activity">"Актыўнасці"</string>
-  <string name="emoji_picker_category_flags">"Сцягі"</string>
-  <string name="emoji_picker_category_foods">"Ежа &amp; Напоі"</string>
-  <string name="emoji_picker_category_nature">"Жывёлы &amp; Прырода"</string>
-  <string name="emoji_picker_category_objects">"Аб\'екты"</string>
-  <string name="emoji_picker_category_people">"Усмешкі &amp; Удзельнікі"</string>
-  <string name="emoji_picker_category_places">"Падарожжы &amp; Месцы"</string>
-  <string name="emoji_picker_category_symbols">"Сімвалы"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не атрымалася апрацаваць медыяфайл для загрузкі, паспрабуйце яшчэ раз."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Не атрымалася загрузіць медыяфайлы, паспрабуйце яшчэ раз."</string>
+  <string name="screen_media_upload_preview_processing">"Апрацоўка…"</string>
+  <string name="screen_media_upload_preview_title">"Дадаць медыя"</string>
   <string name="screen_report_content_block_user">"Заблакіраваць карыстальніка"</string>
   <string name="screen_report_content_block_user_hint">"Адзначце, ці хочаце вы схаваць усе бягучыя і будучыя паведамленні ад гэтага карыстальніка"</string>
   <string name="screen_report_content_explanation">"Гэтае паведамленне будзе перададзена адміністратару вашага хатняга сервера. Яны не змогуць прачытаць зашыфраваныя паведамленні."</string>
@@ -25,7 +19,7 @@
   <string name="screen_room_attachment_source_camera_video">"Запісаць відэа"</string>
   <string name="screen_room_attachment_source_files">"Далучэнне"</string>
   <string name="screen_room_attachment_source_gallery">"Бібліятэка фота &amp; відэа"</string>
-  <string name="screen_room_attachment_source_location">"Месцазнаходжанне"</string>
+  <string name="screen_room_attachment_source_location">"Абагуліць месцазнаходжанне"</string>
   <string name="screen_room_attachment_source_poll">"Апытанне"</string>
   <string name="screen_room_attachment_text_formatting">"Фармаціраванне тэксту"</string>
   <string name="screen_room_encrypted_history_banner">"Гісторыя паведамленняў зараз недаступна."</string>
diff --git a/features/messages/impl/src/main/res/values-bg/translations.xml b/features/messages/impl/src/main/res/values-bg/translations.xml
index 1e675f52ae..2db2e6930f 100644
--- a/features/messages/impl/src/main/res/values-bg/translations.xml
+++ b/features/messages/impl/src/main/res/values-bg/translations.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crypto_event_authenticity_sent_in_clear">"Без шифроване"</string>
-  <string name="emoji_picker_category_activity">"Дейности"</string>
-  <string name="emoji_picker_category_flags">"Знамена"</string>
-  <string name="emoji_picker_category_foods">"Храна &amp; Напитки"</string>
-  <string name="emoji_picker_category_nature">"Животни &amp; Природа"</string>
-  <string name="emoji_picker_category_objects">"Обекти"</string>
-  <string name="emoji_picker_category_people">"Усмивки &amp; Хора"</string>
-  <string name="emoji_picker_category_places">"Пътуване &amp; Места"</string>
-  <string name="emoji_picker_category_symbols">"Символи"</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Докоснете, за да промените качеството на качване на видео"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Файлът не можа да бъде качен."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Неуспешна обработка на мултимедия за качване, моля, опитайте отново."</string>
diff --git a/features/messages/impl/src/main/res/values-ca/translations.xml b/features/messages/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..44fe948683
--- /dev/null
+++ b/features/messages/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_event_authenticity_mismatched_sender">"El remitent de l\'esdeveniment no coincideix amb el propietari del dispositiu que l\'ha enviat."</string>
+  <string name="crypto_event_authenticity_not_guaranteed">"L\'autenticitat d\'aquest missatge xifrat en aquest dispositiu no es pot garantir."</string>
+  <string name="crypto_event_authenticity_previously_verified">"Xifrat per un usuari prèviament verificat."</string>
+  <string name="crypto_event_authenticity_sent_in_clear">"No xifrat."</string>
+  <string name="crypto_event_authenticity_unknown_device">"Xifrat per un dispositiu desconegut o eliminat."</string>
+  <string name="crypto_event_authenticity_unsigned_device">"Xifrat per un dispositiu no verificat pel seu propietari."</string>
+  <string name="crypto_event_authenticity_unverified_identity">"Xifrat per un usuari no verificat."</string>
+  <string name="screen_media_upload_preview_caption_warning">"És possible que les llegendes no siguin visibles pels que utilitzin aplicacions antigues."</string>
+  <string name="screen_media_upload_preview_error_failed_processing">"No s\'ha pogut processar el contingut que s\'havia de pujar. Torna-ho a provar."</string>
+  <string name="screen_media_upload_preview_error_failed_sending">"No s\'ha pogut pujar el contingut. Torna-ho a provar."</string>
+  <string name="screen_report_content_block_user">"Bloqueja usuari"</string>
+  <string name="screen_report_content_block_user_hint">"Marca si vols ocultar tots els missatges actuals i futurs d\'aquest usuari"</string>
+  <string name="screen_report_content_explanation">"Aquest missatge s\'enviarà a l\'administrador del teu servidor. No podrà llegir cap missatge xifrat."</string>
+  <string name="screen_report_content_hint">"Motiu de la denúncia del contingut"</string>
+  <string name="screen_room_attachment_source_camera">"Càmera"</string>
+  <string name="screen_room_attachment_source_camera_photo">"Fes una foto"</string>
+  <string name="screen_room_attachment_source_camera_video">"Enregistra vídeo"</string>
+  <string name="screen_room_attachment_source_files">"Fitxer adjunt"</string>
+  <string name="screen_room_attachment_source_gallery">"Galeria de fotos i vídeos"</string>
+  <string name="screen_room_attachment_source_location">"Ubicació"</string>
+  <string name="screen_room_attachment_source_poll">"Votació"</string>
+  <string name="screen_room_attachment_text_formatting">"Format de text"</string>
+  <string name="screen_room_encrypted_history_banner">"L\'historial de missatges no està disponible actualment."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"L\'historial de missatges no està disponible en aquesta sala. Verifica aquest dispositiu per veure l\'historial de missatges."</string>
+  <string name="screen_room_invite_again_alert_message">"Vols tornar-los a convidar-los?"</string>
+  <string name="screen_room_invite_again_alert_title">"No hi ha ningú més al xat"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"Notifica tota la sala"</string>
+  <string name="screen_room_mentions_at_room_title">"Tothom"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Torna a enviar"</string>
+  <string name="screen_room_retry_send_menu_title">"No s\'han pogut enviar els missatges"</string>
+  <string name="screen_room_timeline_add_reaction">"Afegeix reacció"</string>
+  <string name="screen_room_timeline_beginning_of_room">"Aquest és el principi de %1$s."</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"Principi d\'aquesta conversa."</string>
+  <string name="screen_room_timeline_legacy_call">"Trucada no compatible. Comprova si la persona que truca està utilitzant la nova aplicació Element X."</string>
+  <string name="screen_room_timeline_less_reactions">"Mostra\'n menys"</string>
+  <string name="screen_room_timeline_message_copied">"Missatge copiat"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"No tens permís per enviar res en aquesta sala"</string>
+  <string name="screen_room_timeline_reactions_show_less">"Mostra\'n menys"</string>
+  <string name="screen_room_timeline_reactions_show_more">"Mostra\'n més"</string>
+  <string name="screen_room_timeline_read_marker_title">"Nous"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="one">"%1$d canvi a la sala"</item>
+    <item quantity="other">"%1$d canvis a la sala"</item>
+  </plurals>
+  <string name="screen_room_timeline_tombstoned_room_message">"Aquesta sala ha estat substituïda i ja no està activa"</string>
+  <string name="screen_room_timeline_upgraded_room_action">"Mostra els missatges antics"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"Aquesta sala és la continuació d\'una altra"</string>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="one">"%1$s, %2$s i %3$d més"</item>
+    <item quantity="other">"%1$s, %2$s i %3$d més"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="one">"%1$s està escrivint"</item>
+    <item quantity="other">"%1$s estan escrivint"</item>
+  </plurals>
+  <string name="screen_room_typing_two_members">"%1$s i %2$s"</string>
+</resources>
diff --git a/features/messages/impl/src/main/res/values-cs/translations.xml b/features/messages/impl/src/main/res/values-cs/translations.xml
index 93ea0d8178..6c39d67583 100644
--- a/features/messages/impl/src/main/res/values-cs/translations.xml
+++ b/features/messages/impl/src/main/res/values-cs/translations.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crypto_event_authenticity_mismatched_sender">"Odesílatel události se neshoduje s vlastníkem zařízení, které ji odeslalo."</string>
-  <string name="crypto_event_authenticity_not_guaranteed">"Autenticitu této zašifrované zprávy nelze na tomto zařízení zaručit."</string>
+  <string name="crypto_event_authenticity_not_guaranteed">"Pravost této šifrované zprávy nelze na tomto zařízení zaručit."</string>
   <string name="crypto_event_authenticity_previously_verified">"Zašifrováno dříve ověřeným uživatelem."</string>
   <string name="crypto_event_authenticity_sent_in_clear">"Není zašifrováno."</string>
   <string name="crypto_event_authenticity_unknown_device">"Šifrováno neznámým nebo smazaným zařízením."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Šifrováno zařízením, které nebylo ověřeno jeho vlastníkem."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Šifrováno neověřeným uživatelem."</string>
-  <string name="emoji_picker_category_activity">"Aktivity"</string>
-  <string name="emoji_picker_category_flags">"Vlajky"</string>
-  <string name="emoji_picker_category_foods">"Jídlo a nápoje"</string>
-  <string name="emoji_picker_category_nature">"Zvířata a příroda"</string>
-  <string name="emoji_picker_category_objects">"Předměty"</string>
-  <string name="emoji_picker_category_people">"Smajlíci a lidé"</string>
-  <string name="emoji_picker_category_places">"Cestování a místa"</string>
-  <string name="emoji_picker_category_recent">"Nedávné emotikony"</string>
-  <string name="emoji_picker_category_symbols">"Symboly"</string>
   <string name="screen_media_upload_preview_caption_warning">"Titulky nemusí být viditelné pro lidi, kteří používají starší aplikace."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Klepnutím změníte kvalitu nahrávání videa"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Soubor nelze nahrát."</string>
diff --git a/features/messages/impl/src/main/res/values-cy/translations.xml b/features/messages/impl/src/main/res/values-cy/translations.xml
index 736a9a34f9..f0db099f8e 100644
--- a/features/messages/impl/src/main/res/values-cy/translations.xml
+++ b/features/messages/impl/src/main/res/values-cy/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Wedi\'i amgryptio gan ddyfais anhysbys neu wedi\'i dileu."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Wedi\'i amgryptio gan ddyfais nad yw wedi\'i wirio gan ei pherchennog."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Wedi\'i amgryptio gan ddefnyddiwr heb ei wirio."</string>
-  <string name="emoji_picker_category_activity">"Gweithgareddau"</string>
-  <string name="emoji_picker_category_flags">"Baneri"</string>
-  <string name="emoji_picker_category_foods">"Bwyd a Diod"</string>
-  <string name="emoji_picker_category_nature">"Anifeiliaid a Natur"</string>
-  <string name="emoji_picker_category_objects">"Gwrthrychau"</string>
-  <string name="emoji_picker_category_people">"Wynebau Hapus a Phobl"</string>
-  <string name="emoji_picker_category_places">"Teithio a Llefydd"</string>
-  <string name="emoji_picker_category_recent">"Emojis diweddar"</string>
-  <string name="emoji_picker_category_symbols">"Symbolau"</string>
   <string name="screen_media_upload_preview_caption_warning">"Efallai na fydd capsiynau yn weladwy i bobl sy\'n defnyddio apiau hŷn."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tapiwch i newid ansawdd llwytho\'r fideo"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Nid oedd modd llwytho\'r ffeil."</string>
diff --git a/features/messages/impl/src/main/res/values-da/translations.xml b/features/messages/impl/src/main/res/values-da/translations.xml
index 390d03f451..f168dd7896 100644
--- a/features/messages/impl/src/main/res/values-da/translations.xml
+++ b/features/messages/impl/src/main/res/values-da/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Krypteret af en ukendt eller slettet enhed."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Krypteret af en enhed, der ikke er verificeret af sin ejer."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Krypteret af en ikke-verificeret bruger."</string>
-  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
-  <string name="emoji_picker_category_flags">"Flag"</string>
-  <string name="emoji_picker_category_foods">"Mad og drikke"</string>
-  <string name="emoji_picker_category_nature">"Dyr og natur"</string>
-  <string name="emoji_picker_category_objects">"Objekter"</string>
-  <string name="emoji_picker_category_people">"Smileys og personer"</string>
-  <string name="emoji_picker_category_places">"Rejser og steder"</string>
-  <string name="emoji_picker_category_recent">"Seneste emojis"</string>
-  <string name="emoji_picker_category_symbols">"Symboler"</string>
   <string name="screen_media_upload_preview_caption_warning">"Billedtekster er muligvis ikke synlige for personer, der bruger ældre apps."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tryk for at ændre videokvaliteten i uploadet"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Filen kunne ikke uploades."</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Optag video"</string>
   <string name="screen_room_attachment_source_files">"Vedhæftning"</string>
   <string name="screen_room_attachment_source_gallery">"Foto- og videobibliotek"</string>
-  <string name="screen_room_attachment_source_location">"Del lokation"</string>
+  <string name="screen_room_attachment_source_location">"Del placering"</string>
   <string name="screen_room_attachment_source_poll">"Afstemning"</string>
   <string name="screen_room_attachment_text_formatting">"Tekstformatering"</string>
   <string name="screen_room_encrypted_history_banner">"Beskedhistorikken er i øjeblikket ikke tilgængelig."</string>
diff --git a/features/messages/impl/src/main/res/values-de/translations.xml b/features/messages/impl/src/main/res/values-de/translations.xml
index 5323e731e9..1bdb3e0b16 100644
--- a/features/messages/impl/src/main/res/values-de/translations.xml
+++ b/features/messages/impl/src/main/res/values-de/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Verschlüsselt von einem unbekannten oder gelöschten Gerät."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Verschlüsselt durch ein Gerät, das nicht von seinem Besitzer verifiziert wurde."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Verschlüsselt durch einen nicht verifizierten Nutzer."</string>
-  <string name="emoji_picker_category_activity">"Aktivitäten"</string>
-  <string name="emoji_picker_category_flags">"Flaggen"</string>
-  <string name="emoji_picker_category_foods">"Essen &amp; Trinken"</string>
-  <string name="emoji_picker_category_nature">"Tiere &amp; Natur"</string>
-  <string name="emoji_picker_category_objects">"Objekte"</string>
-  <string name="emoji_picker_category_people">"Smileys &amp; Menschen"</string>
-  <string name="emoji_picker_category_places">"Reisen &amp; Orte"</string>
-  <string name="emoji_picker_category_recent">"Zuletzt verwendete Emojis"</string>
-  <string name="emoji_picker_category_symbols">"Symbole"</string>
   <string name="screen_media_upload_preview_caption_warning">"Bildunterschriften sind für Nutzer älterer Apps möglicherweise nicht sichtbar."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tippe, um die Qualität des Video-Uploads zu ändern"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Die Datei konnte nicht hochgeladen werden."</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Video aufnehmen"</string>
   <string name="screen_room_attachment_source_files">"Anhang"</string>
   <string name="screen_room_attachment_source_gallery">"Foto- und Videogalerie"</string>
-  <string name="screen_room_attachment_source_location">"Standort"</string>
+  <string name="screen_room_attachment_source_location">"Standort teilen"</string>
   <string name="screen_room_attachment_source_poll">"Umfrage"</string>
   <string name="screen_room_attachment_text_formatting">"Textformatierung"</string>
   <string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist derzeit nicht verfügbar"</string>
diff --git a/features/messages/impl/src/main/res/values-el/translations.xml b/features/messages/impl/src/main/res/values-el/translations.xml
index bfecdbb944..4a944d5250 100644
--- a/features/messages/impl/src/main/res/values-el/translations.xml
+++ b/features/messages/impl/src/main/res/values-el/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Κρυπτογραφημένο από άγνωστη ή διαγεγραμμένη συσκευή."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Κρυπτογραφημένο από μια συσκευή που δεν έχει επαληθευτεί από τον ιδιοκτήτη της."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Κρυπτογραφημένο από μη επαληθευμένο χρήστη."</string>
-  <string name="emoji_picker_category_activity">"Δραστηριότητες"</string>
-  <string name="emoji_picker_category_flags">"Σημαίες"</string>
-  <string name="emoji_picker_category_foods">"Φαγητό &amp; Ποτό"</string>
-  <string name="emoji_picker_category_nature">"Ζώα &amp; Φύση"</string>
-  <string name="emoji_picker_category_objects">"Αντικείμενα"</string>
-  <string name="emoji_picker_category_people">"Φατσούλες &amp; Άνθρωποι"</string>
-  <string name="emoji_picker_category_places">"Ταξίδια &amp; Μέρη"</string>
-  <string name="emoji_picker_category_recent">"Πρόσφατα emoji"</string>
-  <string name="emoji_picker_category_symbols">"Σύμβολα"</string>
   <string name="screen_media_upload_preview_caption_warning">"Οι λεζάντες ενδέχεται να μην είναι ορατές σε άτομα που χρησιμοποιούν παλαιότερες εφαρμογές."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Πατήστε για να αλλάξετε την ποιότητα μεταφόρτωσης βίντεο"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Δεν ήταν δυνατή η μεταφόρτωση του αρχείου."</string>
diff --git a/features/messages/impl/src/main/res/values-es/translations.xml b/features/messages/impl/src/main/res/values-es/translations.xml
index 81ca655676..0a0b57cc5e 100644
--- a/features/messages/impl/src/main/res/values-es/translations.xml
+++ b/features/messages/impl/src/main/res/values-es/translations.xml
@@ -7,14 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Cifrado por un dispositivo desconocido o eliminado."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Cifrado por un dispositivo no verificado por su propietario."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Cifrado por un usuario no verificado."</string>
-  <string name="emoji_picker_category_activity">"Actividades"</string>
-  <string name="emoji_picker_category_flags">"Banderas"</string>
-  <string name="emoji_picker_category_foods">"Comida y bebida"</string>
-  <string name="emoji_picker_category_nature">"Animales y naturaleza"</string>
-  <string name="emoji_picker_category_objects">"Objetos"</string>
-  <string name="emoji_picker_category_people">"Emojis y personas"</string>
-  <string name="emoji_picker_category_places">"Viajes y lugares"</string>
-  <string name="emoji_picker_category_symbols">"Símbolos"</string>
   <string name="screen_media_upload_preview_caption_warning">"Es posible que las leyendas no sean visibles para las personas que usan aplicaciones más antiguas."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Error al procesar el contenido multimedia, por favor inténtalo de nuevo."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Error al subir el contenido multimedia, por favor inténtalo de nuevo."</string>
diff --git a/features/messages/impl/src/main/res/values-et/translations.xml b/features/messages/impl/src/main/res/values-et/translations.xml
index 8da4d23f79..ab46eeee45 100644
--- a/features/messages/impl/src/main/res/values-et/translations.xml
+++ b/features/messages/impl/src/main/res/values-et/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Krüptitud tundmatu või kustutatud seadme poolt."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Krüptitud seadme poolt, mida tema omanik pole verifitseerinud."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Krüptitud verifitseerimata kasutaja poolt."</string>
-  <string name="emoji_picker_category_activity">"Tegevused"</string>
-  <string name="emoji_picker_category_flags">"Lipud"</string>
-  <string name="emoji_picker_category_foods">"Toit ja jook"</string>
-  <string name="emoji_picker_category_nature">"Loomad ja loodus"</string>
-  <string name="emoji_picker_category_objects">"Esemed"</string>
-  <string name="emoji_picker_category_people">"Emotikonid ja inimesed"</string>
-  <string name="emoji_picker_category_places">"Reisimine ja kohad"</string>
-  <string name="emoji_picker_category_recent">"Hiljutised emojid"</string>
-  <string name="emoji_picker_category_symbols">"Sümbolid"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Pööra pilti ümber rõhttelje"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Pilt on pööratud ümber rõhttelje"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Pildi algne variant"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Pööra pilti ümber püsttelje"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Pilt on pööratud ümber püsttelje"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Pildi algne variant"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Pööra pilti vasakule"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d kraad"</item>
+    <item quantity="other">"%1$d kraadi"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Muuda fotot"</string>
   <string name="screen_media_upload_preview_caption_warning">"Selgitused ja alapealkirjad ei pruugi olla nähtavad vanemate rakenduste kasutajatele."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Klõpsa üleslaaditava video kvaliteedi muutmiseks"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Faili üleslaadimine ei õnnestunud."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Objekt %1$d/%2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimeeri pildikvaliteeti"</string>
   <string name="screen_media_upload_preview_processing">"Töötlen…"</string>
+  <string name="screen_media_upload_preview_title">"Lisa meediumi"</string>
   <string name="screen_report_content_block_user">"Blokeeri kasutaja"</string>
   <string name="screen_report_content_block_user_hint">"Vali see eelistus, kui sa soovid peita selle kasutaja kõik senised ja tulevased sõnumid"</string>
   <string name="screen_report_content_explanation">"Teade selle sõnumi kohta edastatakse sinu koduserveri haldajale. Haldajal ei ole võimalik lugeda krüptitud sõnumite sisu."</string>
@@ -35,7 +39,7 @@
   <string name="screen_room_attachment_source_camera_video">"Salvesta video"</string>
   <string name="screen_room_attachment_source_files">"Manus"</string>
   <string name="screen_room_attachment_source_gallery">"Fotode ja videote galerii"</string>
-  <string name="screen_room_attachment_source_location">"Asukoht"</string>
+  <string name="screen_room_attachment_source_location">"Jaga asukohta"</string>
   <string name="screen_room_attachment_source_poll">"Küsitlus"</string>
   <string name="screen_room_attachment_text_formatting">"Tekstivorming"</string>
   <string name="screen_room_encrypted_history_banner">"Sõnumite ajalugu pole hetkel saadaval"</string>
@@ -66,6 +70,10 @@
   <string name="screen_room_timeline_reactions_show_more">"Näita rohkem"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Näita reageerimiste kokkuvõtet"</string>
   <string name="screen_room_timeline_read_marker_title">"Uus"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d eemaldas sõnumi"</item>
+    <item quantity="other">"%1$d eemaldas sõnumid"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d jututoa muudatus"</item>
     <item quantity="other">"%1$d jututoa muudatust"</item>
diff --git a/features/messages/impl/src/main/res/values-eu/translations.xml b/features/messages/impl/src/main/res/values-eu/translations.xml
index 6c76b4dfd9..8c158d688a 100644
--- a/features/messages/impl/src/main/res/values-eu/translations.xml
+++ b/features/messages/impl/src/main/res/values-eu/translations.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crypto_event_authenticity_sent_in_clear">"Ez dago zifratuta."</string>
-  <string name="emoji_picker_category_activity">"Jarduerak"</string>
-  <string name="emoji_picker_category_flags">"Banderak"</string>
-  <string name="emoji_picker_category_foods">"Jana eta edana"</string>
-  <string name="emoji_picker_category_nature">"Animaliak eta natura"</string>
-  <string name="emoji_picker_category_objects">"Objektuak"</string>
-  <string name="emoji_picker_category_people">"Irribartxoak eta jendea"</string>
-  <string name="emoji_picker_category_places">"Bidaiak eta tokiak"</string>
-  <string name="emoji_picker_category_symbols">"Ikurrak"</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Huts egin du multimedia igotzeak, saiatu berriro."</string>
   <string name="screen_report_content_block_user">"Blokeatu erabiltzailea"</string>
   <string name="screen_report_content_explanation">"Mezua zure zerbitzariko administratzaileari jakinaraziko zaio. Ezingo dute zifratutako mezurik irakurri."</string>
diff --git a/features/messages/impl/src/main/res/values-fa/translations.xml b/features/messages/impl/src/main/res/values-fa/translations.xml
index 446239c095..4f8f737f9c 100644
--- a/features/messages/impl/src/main/res/values-fa/translations.xml
+++ b/features/messages/impl/src/main/res/values-fa/translations.xml
@@ -6,15 +6,6 @@
   <string name="crypto_event_authenticity_unknown_device">"رمز شده به دست افزاره‌ای ناشناخته یا حذف شده."</string>
   <string name="crypto_event_authenticity_unsigned_device">"رمز شده به دست افزاره‌ای که از سوی مالکش تأیید نشده."</string>
   <string name="crypto_event_authenticity_unverified_identity">"رمز شده به دست کاربری تأیید نشده."</string>
-  <string name="emoji_picker_category_activity">"فعّالیت‌ها"</string>
-  <string name="emoji_picker_category_flags">"پرچم‌ها"</string>
-  <string name="emoji_picker_category_foods">"غذا و نوشیدنی"</string>
-  <string name="emoji_picker_category_nature">"حیوانات و طبعیت"</string>
-  <string name="emoji_picker_category_objects">"اشیا"</string>
-  <string name="emoji_picker_category_people">"شکلک‌ها و افراد"</string>
-  <string name="emoji_picker_category_places">"سفر و مکان‌ها"</string>
-  <string name="emoji_picker_category_recent">"شکلک‌های اخیر"</string>
-  <string name="emoji_picker_category_symbols">"نمادها"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"پردازش رسانه برای بارگذاری شکست خورد. لطفاً دوباره تلاش کنید."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"بارگذاری رسانه شکست خورد. لطفاً دوباره تلاش کنید."</string>
   <string name="screen_media_upload_preview_processing">"پردازش کردن…"</string>
@@ -27,7 +18,7 @@
   <string name="screen_room_attachment_source_camera_video">"ضبط ویدیو"</string>
   <string name="screen_room_attachment_source_files">"پیوست"</string>
   <string name="screen_room_attachment_source_gallery">"کتابخانهٔ عکس و ویدیو"</string>
-  <string name="screen_room_attachment_source_location">"مکان"</string>
+  <string name="screen_room_attachment_source_location">"هم‌رسانی مکان"</string>
   <string name="screen_room_attachment_source_poll">"نظرسنجی"</string>
   <string name="screen_room_attachment_text_formatting">"قالب‌بندی متن"</string>
   <string name="screen_room_encrypted_history_banner">"تاریخچه پیام درحال حاضر دردسترس نیست."</string>
@@ -56,5 +47,13 @@
   <string name="screen_room_timeline_tombstoned_room_message">"این اتاق جایگزین شده و دیگر فعّال نیست"</string>
   <string name="screen_room_timeline_upgraded_room_action">"دیدن پیام‌های قدیمی"</string>
   <string name="screen_room_timeline_upgraded_room_message">"این اتاق ادامهٔ اتاقی دیگر است"</string>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="one">"%1$s، %2$s و %3$d سایر"</item>
+    <item quantity="other">"%1$s، %2$s و %3$d موارد دیگر"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="one">"%1$s در حال تایپ است"</item>
+    <item quantity="other">"%1$s در حال تایپ هستند"</item>
+  </plurals>
   <string name="screen_room_typing_two_members">"%1$s و %2$s"</string>
 </resources>
diff --git a/features/messages/impl/src/main/res/values-fi/translations.xml b/features/messages/impl/src/main/res/values-fi/translations.xml
index 33e8f64d57..3705047087 100644
--- a/features/messages/impl/src/main/res/values-fi/translations.xml
+++ b/features/messages/impl/src/main/res/values-fi/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Tuntemattoman tai poistetun laitteen salaama."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Salattu laitteella, jota sen omistaja ei ole vahvistanut."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Vahvistamattoman käyttäjän salaama."</string>
-  <string name="emoji_picker_category_activity">"Aktiviteetit"</string>
-  <string name="emoji_picker_category_flags">"Liput"</string>
-  <string name="emoji_picker_category_foods">"Ruoka ja juoma"</string>
-  <string name="emoji_picker_category_nature">"Eläimet ja luonto"</string>
-  <string name="emoji_picker_category_objects">"Esineet"</string>
-  <string name="emoji_picker_category_people">"Hymiöt ja ihmiset"</string>
-  <string name="emoji_picker_category_places">"Matkustaminen ja paikat"</string>
-  <string name="emoji_picker_category_recent">"Viimeaikaiset emojit"</string>
-  <string name="emoji_picker_category_symbols">"Symbolit"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Käännä kuva vaakasuunnassa"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Käännetty vaakasuunnassa"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Alkuperäinen"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Käännä kuva pystysuunnassa"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Käännetty pystysuunnassa"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Alkuperäinen"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Kierrä kuvaa vasemmalle"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d aste"</item>
+    <item quantity="other">"%1$d astetta"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Muokkaa kuvaa"</string>
   <string name="screen_media_upload_preview_caption_warning">"Kuvatekstit eivät välttämättä näy ihmisille, jotka käyttävät vanhempia sovelluksia."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Napauta muuttaaksesi videon lähetyslaatua"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Tiedostoa ei voitu lähettää."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Kohde %1$d / %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimoi kuvanlaatu"</string>
   <string name="screen_media_upload_preview_processing">"Käsitellään…"</string>
+  <string name="screen_media_upload_preview_title">"Lisää mediaa"</string>
   <string name="screen_report_content_block_user">"Estä käyttäjä"</string>
   <string name="screen_report_content_block_user_hint">"Valitse tämä, jos haluat piilottaa kaikki nykyiset ja tulevat viestit tältä käyttäjältä"</string>
   <string name="screen_report_content_explanation">"Tämä viesti ilmoitetaan kotipalvelimesi ylläpitäjälle. Ylläpitäjä ei pysty lukemaan salattuja viestejä."</string>
diff --git a/features/messages/impl/src/main/res/values-fr/translations.xml b/features/messages/impl/src/main/res/values-fr/translations.xml
index 0d8dab284f..0062421326 100644
--- a/features/messages/impl/src/main/res/values-fr/translations.xml
+++ b/features/messages/impl/src/main/res/values-fr/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Chiffré par un appareil inconnu ou supprimé."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Chiffré par un appareil non vérifié par son propriétaire."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Chiffré par un utilisateur non vérifié."</string>
-  <string name="emoji_picker_category_activity">"Activités"</string>
-  <string name="emoji_picker_category_flags">"Drapeaux"</string>
-  <string name="emoji_picker_category_foods">"Nourriture et boissons"</string>
-  <string name="emoji_picker_category_nature">"Animaux et nature"</string>
-  <string name="emoji_picker_category_objects">"Objets"</string>
-  <string name="emoji_picker_category_people">"Émoticônes et personnes"</string>
-  <string name="emoji_picker_category_places">"Voyages &amp; lieux"</string>
-  <string name="emoji_picker_category_recent">"Emojis récents"</string>
-  <string name="emoji_picker_category_symbols">"Symboles"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Retourner l’image horizontalement"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Retournée horizontalement"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Originale"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Retourner l’image verticalement"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Retournée verticalement"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Originale"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Pivoter l’image vers la gauche"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d degré"</item>
+    <item quantity="other">"%1$d degrés"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Modifier la photo"</string>
   <string name="screen_media_upload_preview_caption_warning">"Les légendes peuvent ne pas être visibles pour les utilisateurs d’anciennes applications."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Cliquez pour modifier la qualité d’envoi de la vidéo"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Le fichier n’a pas pu être envoyé."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Élément %1$d sur %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimiser la qualité de l’image"</string>
   <string name="screen_media_upload_preview_processing">"Traitement en cours…"</string>
+  <string name="screen_media_upload_preview_title">"Ajouter un média"</string>
   <string name="screen_report_content_block_user">"Bloquer l’utilisateur"</string>
   <string name="screen_report_content_block_user_hint">"Cochez si vous souhaitez masquer tous les messages actuels et futurs de cet utilisateur."</string>
   <string name="screen_report_content_explanation">"Ce message sera signalé à l’administrateur de votre serveur d’accueil. Il ne pourra lire aucun message chiffré."</string>
diff --git a/features/messages/impl/src/main/res/values-hr/translations.xml b/features/messages/impl/src/main/res/values-hr/translations.xml
index 3da55fc4d7..2fe73bf7de 100644
--- a/features/messages/impl/src/main/res/values-hr/translations.xml
+++ b/features/messages/impl/src/main/res/values-hr/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Šifrirano nepoznatim ili izbrisanim uređajem."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Šifrirano uređajem koji vlasnik nije potvrdio."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Šifrirao neprovjereni korisnik."</string>
-  <string name="emoji_picker_category_activity">"Aktivnosti"</string>
-  <string name="emoji_picker_category_flags">"Zastave"</string>
-  <string name="emoji_picker_category_foods">"Hrana i piće"</string>
-  <string name="emoji_picker_category_nature">"Životinje i priroda"</string>
-  <string name="emoji_picker_category_objects">"Objekti"</string>
-  <string name="emoji_picker_category_people">"Emotikoni i osobe"</string>
-  <string name="emoji_picker_category_places">"Putovanja i mjesta"</string>
-  <string name="emoji_picker_category_recent">"Nedavni emotikoni"</string>
-  <string name="emoji_picker_category_symbols">"Simboli"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Okreni sliku vodoravno"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Okrenuto vodoravno"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Izvornik"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Okreni sliku okomito"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Okrenuto okomito"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Izvornik"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Okrenite sliku ulijevo"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d stupanj"</item>
+    <item quantity="other">"%1$d stupnjevi"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Uredi fotografiju"</string>
   <string name="screen_media_upload_preview_caption_warning">"Opisi možda neće biti vidljivi osobama koji se služe starijim aplikacijama."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Dodirnite za promjenu kvalitete prijenosa videozapisa"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Datoteka se nije mogla prenijeti."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Stavka %1$d od %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimiziraj kvalitetu slike"</string>
   <string name="screen_media_upload_preview_processing">"Obrada…"</string>
+  <string name="screen_media_upload_preview_title">"Dodaj medij"</string>
   <string name="screen_report_content_block_user">"Blokiraj korisnika"</string>
   <string name="screen_report_content_block_user_hint">"Označite ako želite sakriti sve trenutačne i buduće poruke od ovog korisnika"</string>
   <string name="screen_report_content_explanation">"Ova poruka bit će prijavljena administratoru vašeg matičnog poslužitelja. On neće moći pročitati nijednu šifriranu poruku."</string>
@@ -35,7 +39,7 @@
   <string name="screen_room_attachment_source_camera_video">"Snimi videozapis"</string>
   <string name="screen_room_attachment_source_files">"Privitak"</string>
   <string name="screen_room_attachment_source_gallery">"Biblioteka fotografija i videozapisa"</string>
-  <string name="screen_room_attachment_source_location">"Lokacija"</string>
+  <string name="screen_room_attachment_source_location">"Dijeli lokaciju"</string>
   <string name="screen_room_attachment_source_poll">"Anketa"</string>
   <string name="screen_room_attachment_text_formatting">"Oblikovanje teksta"</string>
   <string name="screen_room_encrypted_history_banner">"Povijest poruka trenutačno nije dostupna."</string>
@@ -68,6 +72,10 @@
   <string name="screen_room_timeline_reactions_show_more">"Prikaži više"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Prikaži sažetak reakcija"</string>
   <string name="screen_room_timeline_read_marker_title">"Novo"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d uklonjena poruka"</item>
+    <item quantity="other">"%1$d uklonjene poruke"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d promjena sobe"</item>
     <item quantity="few">"%1$d promjene sobe"</item>
diff --git a/features/messages/impl/src/main/res/values-hu/translations.xml b/features/messages/impl/src/main/res/values-hu/translations.xml
index 3cbd86e8d1..2b428f92b2 100644
--- a/features/messages/impl/src/main/res/values-hu/translations.xml
+++ b/features/messages/impl/src/main/res/values-hu/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Ismeretlen vagy törölt eszköz által titkosítva."</string>
   <string name="crypto_event_authenticity_unsigned_device">"A tulajdonos által nem ellenőrzött eszköz által titkosítva."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Nem ellenőrzött felhasználó által titkosítva."</string>
-  <string name="emoji_picker_category_activity">"Tevékenységek"</string>
-  <string name="emoji_picker_category_flags">"Zászlók"</string>
-  <string name="emoji_picker_category_foods">"Étel és ital"</string>
-  <string name="emoji_picker_category_nature">"Állatok és természet"</string>
-  <string name="emoji_picker_category_objects">"Tárgyak"</string>
-  <string name="emoji_picker_category_people">"Mosolyok és emberek"</string>
-  <string name="emoji_picker_category_places">"Utazás és helyek"</string>
-  <string name="emoji_picker_category_recent">"Legutóbbi emodzsik"</string>
-  <string name="emoji_picker_category_symbols">"Szimbólumok"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Kép vízszintes tükrözése"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Vízszintesen tükrözve"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Eredeti"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Kép függőleges tükrözése"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Függőlegesen tükrözve"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Eredeti"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Kép elforgatása balra"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d fok"</item>
+    <item quantity="other">"%1$d fok"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Fotó szerkesztése"</string>
   <string name="screen_media_upload_preview_caption_warning">"Előfordulhat, hogy a feliratok nem láthatók a régebbi alkalmazásokat használók számára."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Koppintson a feltöltött videók minőségének módosításához"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"A fájl nem tölthető fel."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"%1$d. elem / %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Képminőség optimalizációja"</string>
   <string name="screen_media_upload_preview_processing">"Feldolgozás…"</string>
+  <string name="screen_media_upload_preview_title">"Média hozzáadása"</string>
   <string name="screen_report_content_block_user">"Felhasználó letiltása"</string>
   <string name="screen_report_content_block_user_hint">"Jelölje be, ha el akarja rejteni az összes jelenlegi és jövőbeli üzenetet ettől a felhasználótól"</string>
   <string name="screen_report_content_explanation">"Ez az üzenet jelentve lesz a Matrix-kiszolgáló adminisztrátorának. Nem fogja tudni elolvasni a titkosított üzeneteket."</string>
diff --git a/features/messages/impl/src/main/res/values-in/translations.xml b/features/messages/impl/src/main/res/values-in/translations.xml
index 508f4d5476..00233facfd 100644
--- a/features/messages/impl/src/main/res/values-in/translations.xml
+++ b/features/messages/impl/src/main/res/values-in/translations.xml
@@ -7,15 +7,11 @@
   <string name="crypto_event_authenticity_unknown_device">"Dienkripsi oleh perangkat yang tidak dikenal atau dihapus."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Dienkripsi oleh perangkat yang tidak diverifikasi oleh pemiliknya."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Dienkripsi oleh pengguna yang tidak terverifikasi."</string>
-  <string name="emoji_picker_category_activity">"Aktivitas"</string>
-  <string name="emoji_picker_category_flags">"Bendera"</string>
-  <string name="emoji_picker_category_foods">"Makanan &amp; Minuman"</string>
-  <string name="emoji_picker_category_nature">"Hewan &amp; Alam"</string>
-  <string name="emoji_picker_category_objects">"Objek"</string>
-  <string name="emoji_picker_category_people">"Senyuman &amp; Orang"</string>
-  <string name="emoji_picker_category_places">"Wisata &amp; Tempat"</string>
-  <string name="emoji_picker_category_recent">"Emojis Sebelumnya"</string>
-  <string name="emoji_picker_category_symbols">"Simbol"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Putar gambar ke kiri"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="other">"%1$d derajat"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Sunting Foto"</string>
   <string name="screen_media_upload_preview_caption_warning">"Keterangan mungkin tidak terlihat oleh orang yang menggunakan aplikasi lama."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Ketuk untuk mengubah kualitas unggahan video"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Dokumen tidak dapat diunggah."</string>
@@ -23,8 +19,10 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Gagal mengunggah media, silakan coba lagi."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"Ukuran file maksimum yang diizinkan adalah%1$s ."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Ukuran file terlalu besar untuk diunggah."</string>
+  <string name="screen_media_upload_preview_item_count">"Item %1$d dari %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimalkan kualitas gambar"</string>
   <string name="screen_media_upload_preview_processing">"Memproses…"</string>
+  <string name="screen_media_upload_preview_title">"Tambahkan media"</string>
   <string name="screen_report_content_block_user">"Blokir pengguna"</string>
   <string name="screen_report_content_block_user_hint">"Centang jika Anda ingin menyembunyikan semua pesan saat ini dan yang akan datang dari pengguna ini"</string>
   <string name="screen_report_content_explanation">"Pesan ini akan dilaporkan ke administrator homeserver Anda. Mereka tidak akan dapat membaca pesan terenkripsi apa pun."</string>
@@ -34,7 +32,7 @@
   <string name="screen_room_attachment_source_camera_video">"Rekam video"</string>
   <string name="screen_room_attachment_source_files">"Lampiran"</string>
   <string name="screen_room_attachment_source_gallery">"Pustaka Foto &amp; Video"</string>
-  <string name="screen_room_attachment_source_location">"Lokasi"</string>
+  <string name="screen_room_attachment_source_location">"Membagi Lokasi"</string>
   <string name="screen_room_attachment_source_poll">"Jajak pendapat"</string>
   <string name="screen_room_attachment_text_formatting">"Pemformatan Teks"</string>
   <string name="screen_room_encrypted_history_banner">"Riwayat pesan saat ini tidak tersedia di ruangan ini"</string>
diff --git a/features/messages/impl/src/main/res/values-it/translations.xml b/features/messages/impl/src/main/res/values-it/translations.xml
index 0d750e7ed5..273efe803f 100644
--- a/features/messages/impl/src/main/res/values-it/translations.xml
+++ b/features/messages/impl/src/main/res/values-it/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Cifrato da un dispositivo sconosciuto o eliminato."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Cifrato da un dispositivo non verificato dal proprietario."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Cifrato da un utente non verificato."</string>
-  <string name="emoji_picker_category_activity">"Attività"</string>
-  <string name="emoji_picker_category_flags">"Bandiere"</string>
-  <string name="emoji_picker_category_foods">"Cibi &amp; Bevande"</string>
-  <string name="emoji_picker_category_nature">"Animali &amp; Natura"</string>
-  <string name="emoji_picker_category_objects">"Oggetti"</string>
-  <string name="emoji_picker_category_people">"Faccine &amp; Persone"</string>
-  <string name="emoji_picker_category_places">"Viaggi &amp; Luoghi"</string>
-  <string name="emoji_picker_category_recent">"Emoji recenti"</string>
-  <string name="emoji_picker_category_symbols">"Simboli"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Capovolgi l\'immagine orizzontalmente"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Capovolto orizzontalmente"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Originale"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Capovolgi l\'immagine verticalmente"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Capovolto verticalmente"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Originale"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Ruota l\'immagine verso sinistra"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d grado"</item>
+    <item quantity="other">"%1$d gradi"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Modifica foto"</string>
   <string name="screen_media_upload_preview_caption_warning">"Le didascalie potrebbero non essere visibili agli utenti di app meno recenti."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tocca per modificare la qualità di caricamento del video"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Impossibile caricare il file."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Elemento %1$d di %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Ottimizza la qualità delle immagini"</string>
   <string name="screen_media_upload_preview_processing">"Elaborazione…"</string>
+  <string name="screen_media_upload_preview_title">"Aggiungi contenuti multimediali"</string>
   <string name="screen_report_content_block_user">"Blocca utente"</string>
   <string name="screen_report_content_block_user_hint">"Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente"</string>
   <string name="screen_report_content_explanation">"Questo messaggio verrà segnalato all\'amministratore dell\'homeserver. Questi non sarà in grado di leggere i messaggi cifrati."</string>
@@ -34,8 +38,8 @@
   <string name="screen_room_attachment_source_camera_photo">"Scatta foto"</string>
   <string name="screen_room_attachment_source_camera_video">"Registra video"</string>
   <string name="screen_room_attachment_source_files">"Allegato"</string>
-  <string name="screen_room_attachment_source_gallery">"Libreria di foto e video"</string>
-  <string name="screen_room_attachment_source_location">"Posizione"</string>
+  <string name="screen_room_attachment_source_gallery">"Libreria foto e video"</string>
+  <string name="screen_room_attachment_source_location">"Condividi posizione"</string>
   <string name="screen_room_attachment_source_poll">"Sondaggio"</string>
   <string name="screen_room_attachment_text_formatting">"Formattazione del testo"</string>
   <string name="screen_room_encrypted_history_banner">"La cronologia dei messaggi non è attualmente disponibile."</string>
diff --git a/features/messages/impl/src/main/res/values-ja/translations.xml b/features/messages/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..15851b893e
--- /dev/null
+++ b/features/messages/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_event_authenticity_mismatched_sender">"イベントの送信者と、使用された端末の所有者が一致しません。"</string>
+  <string name="crypto_event_authenticity_not_guaranteed">"この暗号化されたメッセージの真正性を、この端末では保証できません。"</string>
+  <string name="crypto_event_authenticity_previously_verified">"以前に検証されたユーザーにより暗号化されています。"</string>
+  <string name="crypto_event_authenticity_sent_in_clear">"暗号化されていません。"</string>
+  <string name="crypto_event_authenticity_unknown_device">"削除されたまたは不明な端末により暗号化されています。"</string>
+  <string name="crypto_event_authenticity_unsigned_device">"所有者に検証されていない端末により暗号化されています。"</string>
+  <string name="crypto_event_authenticity_unverified_identity">"未検証のユーザーにより暗号化されています。"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"水平に反転"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"垂直に反転"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"元画像"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"垂直に反転"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"水平に反転"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"編集前"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"画像を左に回転"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="other">"%1$d°"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"写真を編集"</string>
+  <string name="screen_media_upload_preview_caption_warning">"古いアプリケーションを使用しているユーザーはキャプションを見られない可能性があります。"</string>
+  <string name="screen_media_upload_preview_change_video_quality_prompt">"動画のアップロード画質を変更するにはタップしてください"</string>
+  <string name="screen_media_upload_preview_error_could_not_be_uploaded">"ファイルをアップロードに失敗しました。"</string>
+  <string name="screen_media_upload_preview_error_failed_processing">"ファイルの処理に失敗しました。再試行してください。"</string>
+  <string name="screen_media_upload_preview_error_failed_sending">"ファイルのアップロードに失敗しました。再試行してください。"</string>
+  <string name="screen_media_upload_preview_error_too_large_message">"許容されている最大サイズは %1$s です。"</string>
+  <string name="screen_media_upload_preview_error_too_large_title">"ファイルが大きすぎるためアップロードできません"</string>
+  <string name="screen_media_upload_preview_item_count">"個数 %1$d / %2$d"</string>
+  <string name="screen_media_upload_preview_optimize_image_quality_title">"画像の品質を最適化"</string>
+  <string name="screen_media_upload_preview_processing">"処理中…"</string>
+  <string name="screen_media_upload_preview_title">"メディアを追加"</string>
+  <string name="screen_report_content_block_user">"ユーザーをブロック"</string>
+  <string name="screen_report_content_block_user_hint">"このユーザーからのメッセージをすべて非表示にする場合はチェックしてください。"</string>
+  <string name="screen_report_content_explanation">"このメッセージはホームサーバーの管理者に報告されます。暗号化されたメッセージを確認することはできません。"</string>
+  <string name="screen_report_content_hint">"このコンテンツを通報する理由"</string>
+  <string name="screen_room_attachment_source_camera">"カメラ"</string>
+  <string name="screen_room_attachment_source_camera_photo">"写真を撮影"</string>
+  <string name="screen_room_attachment_source_camera_video">"動画を撮影"</string>
+  <string name="screen_room_attachment_source_files">"ファイルを添付"</string>
+  <string name="screen_room_attachment_source_gallery">"アルバムの写真と動画"</string>
+  <string name="screen_room_attachment_source_location">"場所を共有"</string>
+  <string name="screen_room_attachment_source_poll">"投票"</string>
+  <string name="screen_room_attachment_text_formatting">"書式設定"</string>
+  <string name="screen_room_encrypted_history_banner">"過去のメッセージを現在表示できません。"</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"このルームの過去のメッセージを表示できません。確認するには、この端末を検証してください。"</string>
+  <string name="screen_room_invite_again_alert_message">"招待し直しますか？"</string>
+  <string name="screen_room_invite_again_alert_title">"このチャットにはあなた一人だけです"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"ルーム全体に通知"</string>
+  <string name="screen_room_mentions_at_room_title">"全員"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"再送信する"</string>
+  <string name="screen_room_retry_send_menu_title">"メッセージの送信に失敗しました"</string>
+  <string name="screen_room_timeline_add_reaction">"リアクションを追加"</string>
+  <string name="screen_room_timeline_beginning_of_room">"%1$s の始まりです。"</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"ここが会話の開始点です。"</string>
+  <string name="screen_room_timeline_legacy_call">"非対応の着信です。新しい Element X を使用できないか確認してください。"</string>
+  <string name="screen_room_timeline_less_reactions">"一部を表示"</string>
+  <string name="screen_room_timeline_message_copied">"メッセージをコピーしました"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"このルームに発言する権限がありません"</string>
+  <plurals name="screen_room_timeline_reaction_a11y">
+    <item quantity="other">"%1$d 人の反応 %2$s"</item>
+  </plurals>
+  <plurals name="screen_room_timeline_reaction_including_you_a11y">
+    <item quantity="other">"あなたと %1$d 人の反応 %2$s"</item>
+  </plurals>
+  <string name="screen_room_timeline_reaction_you_a11y">"%1$s と反応"</string>
+  <string name="screen_room_timeline_reactions_show_less">"一部を表示"</string>
+  <string name="screen_room_timeline_reactions_show_more">"さらに表示"</string>
+  <string name="screen_room_timeline_reactions_show_reactions_summary">"リアクションのまとめを表示"</string>
+  <string name="screen_room_timeline_read_marker_title">"新着"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="other">"%1$d 個のルーム更新点"</item>
+  </plurals>
+  <string name="screen_room_timeline_tombstoned_room_action">"新しいルームに移動"</string>
+  <string name="screen_room_timeline_tombstoned_room_message">"このルームは移行して非アクティブ状態です"</string>
+  <string name="screen_room_timeline_upgraded_room_action">"古いメッセージを表示"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"このルームは他のルームからの移行先です"</string>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="other">"%1$s, %2$s 他 %3$d 人"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="other">"%1$s が入力中"</item>
+  </plurals>
+  <string name="screen_room_typing_two_members">"%1$s と %2$s"</string>
+</resources>
diff --git a/features/messages/impl/src/main/res/values-ka/translations.xml b/features/messages/impl/src/main/res/values-ka/translations.xml
index 842fa4bf5b..54002be4b2 100644
--- a/features/messages/impl/src/main/res/values-ka/translations.xml
+++ b/features/messages/impl/src/main/res/values-ka/translations.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="emoji_picker_category_activity">"აქტივობები"</string>
-  <string name="emoji_picker_category_flags">"დროშები"</string>
-  <string name="emoji_picker_category_foods">"Საჭმელ-სასმელი"</string>
-  <string name="emoji_picker_category_nature">"ცხოველები &amp; ბუნება"</string>
-  <string name="emoji_picker_category_objects">"ობიექტები"</string>
-  <string name="emoji_picker_category_people">"ღიმილები &amp; ხალხი"</string>
-  <string name="emoji_picker_category_places">"მოგზაურობა და ადგილები"</string>
-  <string name="emoji_picker_category_symbols">"სიმბოლოები"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"მედიის ატვირთვა ვერ მოხერხდა. გთხოვთ, სცადოთ ხელახლა."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"მედიის ატვირთვა ვერ მოხერხდა, გთხოვთ, სცადოთ ხელახლა."</string>
   <string name="screen_report_content_block_user">"მომხმარებლის დაბლოკვა"</string>
diff --git a/features/messages/impl/src/main/res/values-ko/translations.xml b/features/messages/impl/src/main/res/values-ko/translations.xml
index daede9ec1d..82d81f42cd 100644
--- a/features/messages/impl/src/main/res/values-ko/translations.xml
+++ b/features/messages/impl/src/main/res/values-ko/translations.xml
@@ -7,15 +7,11 @@
   <string name="crypto_event_authenticity_unknown_device">"알 수 없거나 삭제된 장치에 의해 암호화됩니다."</string>
   <string name="crypto_event_authenticity_unsigned_device">"소유자가 확인하지 않은 장치에 의해 암호화되었습니다."</string>
   <string name="crypto_event_authenticity_unverified_identity">"검증되지 않은 사용자에 의해 암호화되었습니다."</string>
-  <string name="emoji_picker_category_activity">"활동"</string>
-  <string name="emoji_picker_category_flags">"깃발"</string>
-  <string name="emoji_picker_category_foods">"음식 &amp; 음료"</string>
-  <string name="emoji_picker_category_nature">"동물 &amp; 자연"</string>
-  <string name="emoji_picker_category_objects">"사물"</string>
-  <string name="emoji_picker_category_people">"표정 &amp; 사람"</string>
-  <string name="emoji_picker_category_places">"여행 &amp; 장소"</string>
-  <string name="emoji_picker_category_recent">"최근 이모지"</string>
-  <string name="emoji_picker_category_symbols">"상징"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"이미지를 왼쪽으로 회전"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="other">"%1$d도"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"사진 편집"</string>
   <string name="screen_media_upload_preview_caption_warning">"캡션은 오래된 앱을 사용하는 사용자에게 표시되지 않을 수 있습니다."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"비디오 업로드 품질을 변경하려면 탭하세요"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"파일을 업로드할 수 없습니다."</string>
@@ -26,6 +22,7 @@
   <string name="screen_media_upload_preview_item_count">"전체 %2$d개 중 %1$d번째 파일"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"이미지 품질 최적화"</string>
   <string name="screen_media_upload_preview_processing">"처리 중…"</string>
+  <string name="screen_media_upload_preview_title">"미디어 추가"</string>
   <string name="screen_report_content_block_user">"사용자 차단하기"</string>
   <string name="screen_report_content_block_user_hint">"이 사용자의 현재 및 향후 모든 메시지를 숨기려면 확인하세요."</string>
   <string name="screen_report_content_explanation">"이 메시지는 홈서버의 관리자에게 보고되었습니다. 암호화된 메시지는 읽을 수 없습니다."</string>
diff --git a/features/messages/impl/src/main/res/values-lt/translations.xml b/features/messages/impl/src/main/res/values-lt/translations.xml
index 379f9ae853..39f1b43627 100644
--- a/features/messages/impl/src/main/res/values-lt/translations.xml
+++ b/features/messages/impl/src/main/res/values-lt/translations.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="emoji_picker_category_activity">"Veikla"</string>
-  <string name="emoji_picker_category_flags">"Vėliavos"</string>
-  <string name="emoji_picker_category_foods">"Maistas ir Gėrimai"</string>
-  <string name="emoji_picker_category_nature">"Gyvūnai ir Gamta"</string>
-  <string name="emoji_picker_category_objects">"Objektai"</string>
-  <string name="emoji_picker_category_people">"Šypsenėlės ir Žmonės"</string>
-  <string name="emoji_picker_category_places">"Kelionės ir Vietovės"</string>
-  <string name="emoji_picker_category_symbols">"Simboliai"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nepavyko apdoroti įkeliamos laikmenos, bandykite dar kartą."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Nepavyko įkelti laikmenos, pabandykite dar kartą."</string>
   <string name="screen_report_content_block_user">"Blokuoti vartotoją"</string>
diff --git a/features/messages/impl/src/main/res/values-nb/translations.xml b/features/messages/impl/src/main/res/values-nb/translations.xml
index a0dafdd136..9faf74130c 100644
--- a/features/messages/impl/src/main/res/values-nb/translations.xml
+++ b/features/messages/impl/src/main/res/values-nb/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Kryptert av en ukjent eller slettet enhet."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Kryptert med en enhet som ikke er verifisert av eieren."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Kryptert av en ubekreftet bruker."</string>
-  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
-  <string name="emoji_picker_category_flags">"Flagg"</string>
-  <string name="emoji_picker_category_foods">"Mat og drikke"</string>
-  <string name="emoji_picker_category_nature">"Dyr og natur"</string>
-  <string name="emoji_picker_category_objects">"Gjenstander"</string>
-  <string name="emoji_picker_category_people">"Smilefjes og mennesker"</string>
-  <string name="emoji_picker_category_places">"Reising og steder"</string>
-  <string name="emoji_picker_category_recent">"Nylige emojier"</string>
-  <string name="emoji_picker_category_symbols">"Symboler"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Snu bildet horisontalt"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Vendt horisontalt"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Opprinnelig"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Snu bildet vertikalt"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Vendt vertikalt"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Opprinnelig"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Roter bildet mot venstre"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d grad"</item>
+    <item quantity="other">"%1$d grader"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Rediger bilde"</string>
   <string name="screen_media_upload_preview_caption_warning">"Teksting er kanskje ikke synlig for personer som bruker eldre apper."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Trykk for å endre kvaliteten på videoopplastingen"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Filen kunne ikke lastes opp."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Fil %1$d av %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimaliser bildekvaliteten"</string>
   <string name="screen_media_upload_preview_processing">"Behandler…"</string>
+  <string name="screen_media_upload_preview_title">"Legg til medier"</string>
   <string name="screen_report_content_block_user">"Blokker bruker"</string>
   <string name="screen_report_content_block_user_hint">"Kryss av for om du vil skjule alle nåværende og fremtidige meldinger fra denne brukeren"</string>
   <string name="screen_report_content_explanation">"Denne meldingen vil bli rapportert til hjemmeserverens administratorer. De vil ikke kunne lese noen krypterte meldinger."</string>
@@ -35,7 +39,7 @@
   <string name="screen_room_attachment_source_camera_video">"Ta opp video"</string>
   <string name="screen_room_attachment_source_files">"Vedlegg"</string>
   <string name="screen_room_attachment_source_gallery">"Foto- og videobibliotek"</string>
-  <string name="screen_room_attachment_source_location">"Del posisjon"</string>
+  <string name="screen_room_attachment_source_location">"Del lokasjon"</string>
   <string name="screen_room_attachment_source_poll">"Avstemning"</string>
   <string name="screen_room_attachment_text_formatting">"Tekstformatering"</string>
   <string name="screen_room_encrypted_history_banner">"Meldingshistorikken er for øyeblikket ikke tilgjengelig."</string>
@@ -66,6 +70,10 @@
   <string name="screen_room_timeline_reactions_show_more">"Vis mer"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Vis sammendrag av reaksjoner"</string>
   <string name="screen_room_timeline_read_marker_title">"Ny"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d fjernet meldingen"</item>
+    <item quantity="other">"%1$d fjernet meldinger"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d romendring"</item>
     <item quantity="other">"%1$d romendringer"</item>
diff --git a/features/messages/impl/src/main/res/values-nl/translations.xml b/features/messages/impl/src/main/res/values-nl/translations.xml
index d2305229a7..dbce48fc97 100644
--- a/features/messages/impl/src/main/res/values-nl/translations.xml
+++ b/features/messages/impl/src/main/res/values-nl/translations.xml
@@ -6,14 +6,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Versleuteld door een onbekend of verwijderd apparaat."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Versleuteld door een apparaat dat niet is geverifieerd door de eigenaar."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Versleuteld door een niet-geverifieerde gebruiker."</string>
-  <string name="emoji_picker_category_activity">"Activiteiten"</string>
-  <string name="emoji_picker_category_flags">"Vlaggen"</string>
-  <string name="emoji_picker_category_foods">"Eten &amp; Drinken"</string>
-  <string name="emoji_picker_category_nature">"Dieren &amp; Natuur"</string>
-  <string name="emoji_picker_category_objects">"Voorwerpen"</string>
-  <string name="emoji_picker_category_people">"Smileys &amp; Mensen"</string>
-  <string name="emoji_picker_category_places">"Reizen &amp; Locaties"</string>
-  <string name="emoji_picker_category_symbols">"Symbolen"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Het verwerken van media voor uploaden is mislukt. Probeer het opnieuw."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Het uploaden van media is mislukt. Probeer het opnieuw."</string>
   <string name="screen_report_content_block_user">"Gebruiker blokkeren"</string>
diff --git a/features/messages/impl/src/main/res/values-pl/translations.xml b/features/messages/impl/src/main/res/values-pl/translations.xml
index 18a8af6cb0..87ed6250c0 100644
--- a/features/messages/impl/src/main/res/values-pl/translations.xml
+++ b/features/messages/impl/src/main/res/values-pl/translations.xml
@@ -7,15 +7,19 @@
   <string name="crypto_event_authenticity_unknown_device">"Zaszyfrowana przez nieznane lub usunięte urządzenie."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Zaszyfrowana przez urządzenie niezweryfikowane przez jego właściciela."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Zaszyfrowana przez niezweryfikowanego użytkownika."</string>
-  <string name="emoji_picker_category_activity">"Aktywności"</string>
-  <string name="emoji_picker_category_flags">"Flagi"</string>
-  <string name="emoji_picker_category_foods">"Jedzenie i napoje"</string>
-  <string name="emoji_picker_category_nature">"Zwierzęta i natura"</string>
-  <string name="emoji_picker_category_objects">"Obiekty"</string>
-  <string name="emoji_picker_category_people">"Buźki i osoby"</string>
-  <string name="emoji_picker_category_places">"Podróż i miejsca"</string>
-  <string name="emoji_picker_category_recent">"Ostatnie emoji"</string>
-  <string name="emoji_picker_category_symbols">"Symbole"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Odwróć obraz w poziomie"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Odwrócono w poziomie"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Oryginalny"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Odwróć obraz w pionie"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Odwrócono w pionie"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Oryginalny"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Obróć obraz w lewo"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d stopień"</item>
+    <item quantity="few">"%1$d stopnie"</item>
+    <item quantity="many">"%1$d stopni"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Edytuj zdjęcie"</string>
   <string name="screen_media_upload_preview_caption_warning">"Opis może być niedostępny dla osób korzystających ze starszej wersji aplikacji."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Dotknij, aby zmienić jakość przesyłania wideo."</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Nie udało się przesłać pliku."</string>
@@ -26,16 +30,17 @@
   <string name="screen_media_upload_preview_item_count">"Pozycja %1$d z %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Zoptymalizuj jakość obrazu"</string>
   <string name="screen_media_upload_preview_processing">"Przetwarzanie…"</string>
+  <string name="screen_media_upload_preview_title">"Dodaj media"</string>
   <string name="screen_report_content_block_user">"Zablokuj użytkownika"</string>
   <string name="screen_report_content_block_user_hint">"Sprawdź, czy chcesz ukryć wszystkie bieżące i przyszłe wiadomości od tego użytkownika."</string>
   <string name="screen_report_content_explanation">"Ta wiadomość zostanie zgłoszona do administratora Twojego serwera domowego. Nie będzie mógł on przeczytać żadnych zaszyfrowanych wiadomości."</string>
   <string name="screen_report_content_hint">"Powód zgłoszenia treści"</string>
   <string name="screen_room_attachment_source_camera">"Kamera"</string>
   <string name="screen_room_attachment_source_camera_photo">"Zrób zdjęcie"</string>
-  <string name="screen_room_attachment_source_camera_video">"Nagraj film"</string>
+  <string name="screen_room_attachment_source_camera_video">"Nagraj wideo"</string>
   <string name="screen_room_attachment_source_files">"Załącznik"</string>
   <string name="screen_room_attachment_source_gallery">"Zdjęcia i filmy"</string>
-  <string name="screen_room_attachment_source_location">"Lokalizacja"</string>
+  <string name="screen_room_attachment_source_location">"Udostępnij lokalizację"</string>
   <string name="screen_room_attachment_source_poll">"Ankieta"</string>
   <string name="screen_room_attachment_text_formatting">"Formatowanie tekstu"</string>
   <string name="screen_room_encrypted_history_banner">"Historia wiadomości jest obecnie niedostępna."</string>
@@ -68,6 +73,11 @@
   <string name="screen_room_timeline_reactions_show_more">"Pokaż więcej"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Pokaż podsumowanie reakcji"</string>
   <string name="screen_room_timeline_read_marker_title">"Nowe"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d usunięta wiadomość"</item>
+    <item quantity="few">"%1$d usunięte wiadomości"</item>
+    <item quantity="many">"%1$d usuniętych wiadomości"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d zmiana pokoju"</item>
     <item quantity="few">"%1$d zmiany pokoju"</item>
diff --git a/features/messages/impl/src/main/res/values-pt-rBR/translations.xml b/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
index 3e3fcf08d1..5c8b62e5dd 100644
--- a/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/messages/impl/src/main/res/values-pt-rBR/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Criptografado por um dispositivo desconhecido ou apagado."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Criptografado por um dispositivo que não foi verificado pelo seu dono."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Criptografado por um usuário não verificado."</string>
-  <string name="emoji_picker_category_activity">"Atividades"</string>
-  <string name="emoji_picker_category_flags">"Bandeiras"</string>
-  <string name="emoji_picker_category_foods">"Comida &amp; Bebida"</string>
-  <string name="emoji_picker_category_nature">"Animais &amp; Natureza"</string>
-  <string name="emoji_picker_category_objects">"Objetos"</string>
-  <string name="emoji_picker_category_people">"Sorrisos &amp; Pessoas"</string>
-  <string name="emoji_picker_category_places">"Viagens &amp; Lugares"</string>
-  <string name="emoji_picker_category_recent">"Emojis recentes"</string>
-  <string name="emoji_picker_category_symbols">"Símbolos"</string>
   <string name="screen_media_upload_preview_caption_warning">"As legendas podem não ser visíveis para pessoas que usam apps mais antigos."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Toque para alterar a qualidade do envio do vídeo"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"O arquivo não pôde ser enviado."</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Gravar vídeo"</string>
   <string name="screen_room_attachment_source_files">"Anexo"</string>
   <string name="screen_room_attachment_source_gallery">"Biblioteca de fotos e vídeos"</string>
-  <string name="screen_room_attachment_source_location">"Localização"</string>
+  <string name="screen_room_attachment_source_location">"Compartilhar localização"</string>
   <string name="screen_room_attachment_source_poll">"Enquete"</string>
   <string name="screen_room_attachment_text_formatting">"Formatação de texto"</string>
   <string name="screen_room_encrypted_history_banner">"O histórico de mensagens não está disponível no momento."</string>
diff --git a/features/messages/impl/src/main/res/values-pt/translations.xml b/features/messages/impl/src/main/res/values-pt/translations.xml
index 054d2a1759..6329956b05 100644
--- a/features/messages/impl/src/main/res/values-pt/translations.xml
+++ b/features/messages/impl/src/main/res/values-pt/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Cifragem com origem num dispositivo eliminado ou desconhecido."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Cifragem com origem num dispositivo não verificado pelo seu dono."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Cifragem com origem num utilizador não verificado."</string>
-  <string name="emoji_picker_category_activity">"Atividades"</string>
-  <string name="emoji_picker_category_flags">"Bandeiras"</string>
-  <string name="emoji_picker_category_foods">"Comidas e Bebidas"</string>
-  <string name="emoji_picker_category_nature">"Animais e Natureza"</string>
-  <string name="emoji_picker_category_objects">"Objetos"</string>
-  <string name="emoji_picker_category_people">"Caras e Pessoas"</string>
-  <string name="emoji_picker_category_places">"Viagens e Lugares"</string>
-  <string name="emoji_picker_category_recent">"Emojis recentes"</string>
-  <string name="emoji_picker_category_symbols">"Símbolos"</string>
   <string name="screen_media_upload_preview_caption_warning">"As legendas poderão não ser visíveis em versões mais antigas da aplicação."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Toca para alterar a qualidade de carregamento do vídeo"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Não foi possível enviar o ficheiro"</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Gravar vídeo"</string>
   <string name="screen_room_attachment_source_files">"Anexo"</string>
   <string name="screen_room_attachment_source_gallery">"Biblioteca de fotos e vídeos"</string>
-  <string name="screen_room_attachment_source_location">"Localização"</string>
+  <string name="screen_room_attachment_source_location">"Partilhar localização"</string>
   <string name="screen_room_attachment_source_poll">"Sondagem"</string>
   <string name="screen_room_attachment_text_formatting">"Formatação de texto"</string>
   <string name="screen_room_encrypted_history_banner">"De momento, o histórico de mensagens está indisponível."</string>
diff --git a/features/messages/impl/src/main/res/values-ro/translations.xml b/features/messages/impl/src/main/res/values-ro/translations.xml
index ff380874ea..e9e4da87c3 100644
--- a/features/messages/impl/src/main/res/values-ro/translations.xml
+++ b/features/messages/impl/src/main/res/values-ro/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Criptat de un dispozitiv necunoscut sau șters."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Criptat de un dispozitiv care nu este verificat de proprietarul său."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Criptat de un utilizator neverificat."</string>
-  <string name="emoji_picker_category_activity">"Activități"</string>
-  <string name="emoji_picker_category_flags">"Steaguri"</string>
-  <string name="emoji_picker_category_foods">"Mâncare &amp; Băutură"</string>
-  <string name="emoji_picker_category_nature">"Animale și Natură"</string>
-  <string name="emoji_picker_category_objects">"Obiecte"</string>
-  <string name="emoji_picker_category_people">"Fețe zâmbitoare &amp; Oameni"</string>
-  <string name="emoji_picker_category_places">"Călătorii &amp; Locuri"</string>
-  <string name="emoji_picker_category_recent">"Emoticoane recente"</string>
-  <string name="emoji_picker_category_symbols">"Simboluri"</string>
   <string name="screen_media_upload_preview_caption_warning">"Este posibil ca descrierile să nu fie vizibile pentru persoanele care folosesc aplicații mai vechi."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Atingeți pentru a modifica calitatea încărcării videoclipului"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Fișierul nu a putut fi încărcat."</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Înregistrați un videoclip"</string>
   <string name="screen_room_attachment_source_files">"Atașament"</string>
   <string name="screen_room_attachment_source_gallery">"Bibliotecă foto și video"</string>
-  <string name="screen_room_attachment_source_location">"Locație"</string>
+  <string name="screen_room_attachment_source_location">"Partajați locația"</string>
   <string name="screen_room_attachment_source_poll">"Sondaj"</string>
   <string name="screen_room_attachment_text_formatting">"Formatarea textului"</string>
   <string name="screen_room_encrypted_history_banner">"Mesajele anterioare nu sunt momentan disponibile în această cameră"</string>
diff --git a/features/messages/impl/src/main/res/values-ru/translations.xml b/features/messages/impl/src/main/res/values-ru/translations.xml
index a7d22b6542..32e6e16980 100644
--- a/features/messages/impl/src/main/res/values-ru/translations.xml
+++ b/features/messages/impl/src/main/res/values-ru/translations.xml
@@ -7,25 +7,30 @@
   <string name="crypto_event_authenticity_unknown_device">"Зашифровано неизвестным или удаленным устройством."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Зашифровано устройством, не проверенным его владельцем."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Зашифровано непроверенным пользователем."</string>
-  <string name="emoji_picker_category_activity">"Активности"</string>
-  <string name="emoji_picker_category_flags">"Флаги"</string>
-  <string name="emoji_picker_category_foods">"Еда и напитки"</string>
-  <string name="emoji_picker_category_nature">"Животные и природа"</string>
-  <string name="emoji_picker_category_objects">"Объекты"</string>
-  <string name="emoji_picker_category_people">"Эмодзи и люди"</string>
-  <string name="emoji_picker_category_places">"Путешествия и места"</string>
-  <string name="emoji_picker_category_recent">"Недавние эмодзи"</string>
-  <string name="emoji_picker_category_symbols">"Символы"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Перевернуть изображение по горизонтали"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Перевернуто по горизонтали"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Оригинал"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Перевернуть изображение по вертикали"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Перевернуто по вертикали"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Оригинал"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Повернуть изображение влево."</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d градус"</item>
+    <item quantity="few">"%1$d градуса"</item>
+    <item quantity="many">"%1$d градусов"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Редактировать фото"</string>
   <string name="screen_media_upload_preview_caption_warning">"Подпись может быть не видна пользователям старых приложений."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Нажмите, чтобы изменить качество загружаемого видео."</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Файл не может быть загружен."</string>
-  <string name="screen_media_upload_preview_error_failed_processing">"Не удалось обработать медиафайл для загрузки, попробуйте еще раз."</string>
-  <string name="screen_media_upload_preview_error_failed_sending">"Не удалось загрузить медиафайлы, попробуйте еще раз."</string>
+  <string name="screen_media_upload_preview_error_failed_processing">"Не удалось обработать медиафайл для загрузки, попробуйте ещё раз."</string>
+  <string name="screen_media_upload_preview_error_failed_sending">"Не удалось загрузить медиафайлы, попробуйте ещё раз."</string>
   <string name="screen_media_upload_preview_error_too_large_message">"Максимальный размер файла: %1$s."</string>
   <string name="screen_media_upload_preview_error_too_large_title">"Файл слишком большой для загрузки."</string>
   <string name="screen_media_upload_preview_item_count">"%1$d из %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Оптимизировать качество изображения"</string>
   <string name="screen_media_upload_preview_processing">"Обработка…"</string>
+  <string name="screen_media_upload_preview_title">"Добавить медиа"</string>
   <string name="screen_report_content_block_user">"Заблокировать пользователя"</string>
   <string name="screen_report_content_block_user_hint">"Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя"</string>
   <string name="screen_report_content_explanation">"Это сообщение будет передано администратору вашего домашнего сервера. Они не смогут прочитать зашифрованные сообщения."</string>
diff --git a/features/messages/impl/src/main/res/values-sk/translations.xml b/features/messages/impl/src/main/res/values-sk/translations.xml
index 4f267d8552..c64e5ba62e 100644
--- a/features/messages/impl/src/main/res/values-sk/translations.xml
+++ b/features/messages/impl/src/main/res/values-sk/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Zašifrované neznámym alebo odstráneným zariadením."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Šifrované zariadením, ktoré nie je overené jeho majiteľom."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Šifrované neovereným používateľom."</string>
-  <string name="emoji_picker_category_activity">"Aktivity"</string>
-  <string name="emoji_picker_category_flags">"Vlajky"</string>
-  <string name="emoji_picker_category_foods">"Jedlo a nápoje"</string>
-  <string name="emoji_picker_category_nature">"Zvieratá a príroda"</string>
-  <string name="emoji_picker_category_objects">"Predmety"</string>
-  <string name="emoji_picker_category_people">"Smajlíky a ľudia"</string>
-  <string name="emoji_picker_category_places">"Cestovanie a miesta"</string>
-  <string name="emoji_picker_category_recent">"Nedávne emotikony"</string>
-  <string name="emoji_picker_category_symbols">"Symboly"</string>
   <string name="screen_media_upload_preview_caption_warning">"Titulky nemusia byť viditeľné pre ľudí používajúcich staršie aplikácie."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Ťuknutím zmeníte kvalitu nahratého videa"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Súbor sa nepodarilo nahrať."</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"Nahrať video"</string>
   <string name="screen_room_attachment_source_files">"Príloha"</string>
   <string name="screen_room_attachment_source_gallery">"Knižnica fotografií a videí"</string>
-  <string name="screen_room_attachment_source_location">"Poloha"</string>
+  <string name="screen_room_attachment_source_location">"Zdieľať polohu"</string>
   <string name="screen_room_attachment_source_poll">"Anketa"</string>
   <string name="screen_room_attachment_text_formatting">"Formátovanie textu"</string>
   <string name="screen_room_encrypted_history_banner">"História správ v tejto miestnosti nie je momentálne k dispozícii"</string>
diff --git a/features/messages/impl/src/main/res/values-sv/translations.xml b/features/messages/impl/src/main/res/values-sv/translations.xml
index 21d2cd5fe2..6de0b1ebcc 100644
--- a/features/messages/impl/src/main/res/values-sv/translations.xml
+++ b/features/messages/impl/src/main/res/values-sv/translations.xml
@@ -7,14 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Krypterad av en okänd eller raderad enhet."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Krypterad av en enhet som inte verifierats av ägaren."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Krypterad av en overifierad användare."</string>
-  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
-  <string name="emoji_picker_category_flags">"Flaggor"</string>
-  <string name="emoji_picker_category_foods">"Mat &amp; dryck"</string>
-  <string name="emoji_picker_category_nature">"Djur &amp; natur"</string>
-  <string name="emoji_picker_category_objects">"Föremål"</string>
-  <string name="emoji_picker_category_people">"Smileys &amp; personer"</string>
-  <string name="emoji_picker_category_places">"Resor &amp; platser"</string>
-  <string name="emoji_picker_category_symbols">"Symboler"</string>
   <string name="screen_media_upload_preview_caption_warning">"Bildtexter kanske inte är synliga för personer som använder äldre appar."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tryck för att ändra videouppladdningskvaliteten"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Filen kunde inte laddas upp."</string>
@@ -33,7 +25,7 @@
   <string name="screen_room_attachment_source_camera_video">"Spela in video"</string>
   <string name="screen_room_attachment_source_files">"Bilaga"</string>
   <string name="screen_room_attachment_source_gallery">"Foto- och videobibliotek"</string>
-  <string name="screen_room_attachment_source_location">"Plats"</string>
+  <string name="screen_room_attachment_source_location">"Dela plats"</string>
   <string name="screen_room_attachment_source_poll">"Omröstning"</string>
   <string name="screen_room_attachment_text_formatting">"Textformatering"</string>
   <string name="screen_room_encrypted_history_banner">"Meddelandehistoriken är för närvarande otillgänglig."</string>
diff --git a/features/messages/impl/src/main/res/values-tr/translations.xml b/features/messages/impl/src/main/res/values-tr/translations.xml
index a40687444b..a987f63ce3 100644
--- a/features/messages/impl/src/main/res/values-tr/translations.xml
+++ b/features/messages/impl/src/main/res/values-tr/translations.xml
@@ -7,14 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"Bilinmeyen veya silinmiş bir cihaz tarafından şifrelenmiştir."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Sahibi tarafından doğrulanmamış bir cihaz tarafından şifrelenmiştir."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Doğrulanmamış bir kullanıcı tarafından şifrelenmiştir."</string>
-  <string name="emoji_picker_category_activity">"Aktiviteler"</string>
-  <string name="emoji_picker_category_flags">"Bayraklar"</string>
-  <string name="emoji_picker_category_foods">"Yiyecek ve İçecek"</string>
-  <string name="emoji_picker_category_nature">"Hayvanlar ve Doğa"</string>
-  <string name="emoji_picker_category_objects">"Nesneler"</string>
-  <string name="emoji_picker_category_people">"İfadeler ve İnsanlar"</string>
-  <string name="emoji_picker_category_places">"Seyahat ve Yerler"</string>
-  <string name="emoji_picker_category_symbols">"Simgeler"</string>
   <string name="screen_media_upload_preview_caption_warning">"Açıklamalar, eski uygulamaları kullanan kişiler tarafından görülemeyebilir."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Medya yüklenemedi, lütfen tekrar deneyin."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Medya yüklenemedi, lütfen tekrar deneyin."</string>
diff --git a/features/messages/impl/src/main/res/values-uk/translations.xml b/features/messages/impl/src/main/res/values-uk/translations.xml
index c51744a408..1e35a2eee1 100644
--- a/features/messages/impl/src/main/res/values-uk/translations.xml
+++ b/features/messages/impl/src/main/res/values-uk/translations.xml
@@ -2,20 +2,24 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crypto_event_authenticity_mismatched_sender">"Відправник події не збігається з власником пристрою, який його надіслав."</string>
   <string name="crypto_event_authenticity_not_guaranteed">"Автентичність цього зашифрованого повідомлення не може бути гарантована на цьому пристрої."</string>
-  <string name="crypto_event_authenticity_previously_verified">"Зашифровано попередньо перевіреним користувачем."</string>
+  <string name="crypto_event_authenticity_previously_verified">"Зашифровано звіреним раніше користувачем."</string>
   <string name="crypto_event_authenticity_sent_in_clear">"Не зашифровано."</string>
   <string name="crypto_event_authenticity_unknown_device">"Зашифровано невідомим або видаленим пристроєм."</string>
-  <string name="crypto_event_authenticity_unsigned_device">"Зашифровано пристроєм, який не верифіковано його власником."</string>
-  <string name="crypto_event_authenticity_unverified_identity">"Зашифровано неверифікованим користувачем."</string>
-  <string name="emoji_picker_category_activity">"Дії"</string>
-  <string name="emoji_picker_category_flags">"Прапори"</string>
-  <string name="emoji_picker_category_foods">"Їжа та напої"</string>
-  <string name="emoji_picker_category_nature">"Тварини та природа"</string>
-  <string name="emoji_picker_category_objects">"Об\'єкти"</string>
-  <string name="emoji_picker_category_people">"Смайлики та люди"</string>
-  <string name="emoji_picker_category_places">"Подорожі та місця"</string>
-  <string name="emoji_picker_category_recent">"Нещодавні емодзі"</string>
-  <string name="emoji_picker_category_symbols">"Символи"</string>
+  <string name="crypto_event_authenticity_unsigned_device">"Зашифровано пристроєм, який не звірено його власником."</string>
+  <string name="crypto_event_authenticity_unverified_identity">"Зашифровано не звіреним користувачем."</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Повернути зображення по горизонталі"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Перевернуто по горизонталі"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Оригінал"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Повернути зображення по вертикалі"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Перевернуто по вертикалі"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Оригінал"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Повернути зображення вліво"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d градус"</item>
+    <item quantity="few">"%1$d градуси"</item>
+    <item quantity="many">"%1$d градусів"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Редагувати фото"</string>
   <string name="screen_media_upload_preview_caption_warning">"Користувачі старих застосунків можуть не бачити підписи."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Натисніть, щоб змінити якість вивантажуваного відео"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Файл не може бути вивантажено."</string>
@@ -26,6 +30,7 @@
   <string name="screen_media_upload_preview_item_count">"Елемент %1$d з %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Оптимізувати якість зображення"</string>
   <string name="screen_media_upload_preview_processing">"Обробка…"</string>
+  <string name="screen_media_upload_preview_title">"Додати медіа"</string>
   <string name="screen_report_content_block_user">"Заблокувати користувача"</string>
   <string name="screen_report_content_block_user_hint">"Перевірте, чи хочете ви приховати всі поточні та майбутні повідомлення від цього користувача"</string>
   <string name="screen_report_content_explanation">"Це повідомлення буде надіслано адміністраторам вашого домашнього сервера. Вони не зможуть прочитати зашифровані повідомлення."</string>
@@ -35,11 +40,11 @@
   <string name="screen_room_attachment_source_camera_video">"Записати відео"</string>
   <string name="screen_room_attachment_source_files">"Вкладення"</string>
   <string name="screen_room_attachment_source_gallery">"Бібліотека фото та відео"</string>
-  <string name="screen_room_attachment_source_location">"Розташування"</string>
+  <string name="screen_room_attachment_source_location">"Поділитися місцеперебуванням"</string>
   <string name="screen_room_attachment_source_poll">"Опитування"</string>
   <string name="screen_room_attachment_text_formatting">"Форматування тексту"</string>
   <string name="screen_room_encrypted_history_banner">"Історія повідомлень наразі недоступна."</string>
-  <string name="screen_room_encrypted_history_banner_unverified">"Історія повідомлень недоступна в цій кімнаті. Перевірте цей пристрій, щоб побачити історію повідомлень."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"Історія повідомлень недоступна в цій кімнаті. Звірте цей пристрій, щоб побачити історію повідомлень."</string>
   <string name="screen_room_invite_again_alert_message">"Чи хотіли б ви запросити їх знову?"</string>
   <string name="screen_room_invite_again_alert_title">"Ви одні в цій бесіді"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Сповістити всю кімнату"</string>
@@ -68,6 +73,11 @@
   <string name="screen_room_timeline_reactions_show_more">"Показати більше"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Показати підсумок реакцій"</string>
   <string name="screen_room_timeline_read_marker_title">"Нове"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d вилучене повідомлення"</item>
+    <item quantity="few">"%1$d вилучені повідомлення"</item>
+    <item quantity="many">"%1$d вилучених повідомлень"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d зміна в кімнаті"</item>
     <item quantity="few">"%1$d зміни в кімнаті"</item>
diff --git a/features/messages/impl/src/main/res/values-ur/translations.xml b/features/messages/impl/src/main/res/values-ur/translations.xml
index cb110ef5c6..6f549a5ba3 100644
--- a/features/messages/impl/src/main/res/values-ur/translations.xml
+++ b/features/messages/impl/src/main/res/values-ur/translations.xml
@@ -6,14 +6,6 @@
   <string name="crypto_event_authenticity_unknown_device">"کسی نامعلوم یا حذف شدہ آلے کے ذریعے مرموز کردہ۔"</string>
   <string name="crypto_event_authenticity_unsigned_device">"کسی ایسے آلے کے ذریعے مرموز کردہ جس کی توثیق اسکے مالک سے نہیں ہوئی۔"</string>
   <string name="crypto_event_authenticity_unverified_identity">"ایک غیر توثیق شدہ صارف کے ذریعے مرموز کردہ۔"</string>
-  <string name="emoji_picker_category_activity">"سرگرمیاں"</string>
-  <string name="emoji_picker_category_flags">"جھنڈے"</string>
-  <string name="emoji_picker_category_foods">"طعم و مشروب"</string>
-  <string name="emoji_picker_category_nature">"حیوانات و فطرت"</string>
-  <string name="emoji_picker_category_objects">"اشیاء"</string>
-  <string name="emoji_picker_category_people">"مسکراہٹیں و لوگ"</string>
-  <string name="emoji_picker_category_places">"سفر و مقامات"</string>
-  <string name="emoji_picker_category_symbols">"علامتیں"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"وسائط کا معالجہ برائے ترفیع ناکام، برائے مہربانی دوبارہ کوشش کریں۔"</string>
   <string name="screen_media_upload_preview_error_failed_sending">"وسائط رفع کرنے میں ناکام، برائے مہربانی دوبارہ کوشش کریں۔"</string>
   <string name="screen_report_content_block_user">"صارف کو مسدود کریں"</string>
diff --git a/features/messages/impl/src/main/res/values-uz/translations.xml b/features/messages/impl/src/main/res/values-uz/translations.xml
index 9c0246ee60..8941917f5f 100644
--- a/features/messages/impl/src/main/res/values-uz/translations.xml
+++ b/features/messages/impl/src/main/res/values-uz/translations.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Nomaʼlum yoki oʻchirib tashlangan qurilma tomonidan shifrlangan."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Egasi tasdiqlamagan qurilma tomonidan shifrlangan."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Tasdiqlanmagan foydalanuvchi tomonidan shifrlangan."</string>
-  <string name="emoji_picker_category_activity">"Faoliyatlar"</string>
-  <string name="emoji_picker_category_flags">"Bayroqlar"</string>
-  <string name="emoji_picker_category_foods">"Oziq-ovqat va ichimliklar"</string>
-  <string name="emoji_picker_category_nature">"Hayvonlar va tabiat"</string>
-  <string name="emoji_picker_category_objects">"Ob\'ektlar"</string>
-  <string name="emoji_picker_category_people">"Smayllar va odamlar"</string>
-  <string name="emoji_picker_category_places">"Sayohat va Joylar"</string>
-  <string name="emoji_picker_category_recent">"Oxirgi kulgichlar"</string>
-  <string name="emoji_picker_category_symbols">"Belgilar"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Rasmni gorizontal ravishda aylantiring"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Gorizontal ravishda aylantirildi"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Asl nusxasi"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Rasmni vertikal ravishda aylantirish"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Vertikal ravishda aylantirildi"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Asl nusxasi"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Rasmni chapga aylantiring"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d daraja"</item>
+    <item quantity="other">"%1$d daraja"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Suratni tahrirlash"</string>
   <string name="screen_media_upload_preview_caption_warning">"Taglavhalar eski ilovalardan foydalanuvchilarga ko‘rinmasligi mumkin."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Video yuklash sifatini oʻzgartirish uchun bosing"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"Faylni yuklab boʻlmadi."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Element%1$d ning %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Tasvir sifatini optimallashtirish"</string>
   <string name="screen_media_upload_preview_processing">"Qayta ishlanmoqda…"</string>
+  <string name="screen_media_upload_preview_title">"Media qoʻshish"</string>
   <string name="screen_report_content_block_user">"Foydalanuvchini bloklash"</string>
   <string name="screen_report_content_block_user_hint">"Ushbu foydalanuvchidan barcha joriy va kelajakdagi xabarlarni yashirishni xohlayotganingizni tekshiring"</string>
   <string name="screen_report_content_explanation">"Bu xabar uy serveringiz administratoriga xabar qilinadi. Ular hech qanday shifrlangan xabarlarni o\'qiy olmaydi."</string>
diff --git a/features/messages/impl/src/main/res/values-vi/translations.xml b/features/messages/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..a16d7378b3
--- /dev/null
+++ b/features/messages/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_event_authenticity_mismatched_sender">"Người gửi sự kiện không khớp với chủ sở hữu của thiết bị đã gửi nó."</string>
+  <string name="crypto_event_authenticity_not_guaranteed">"Tin nhắn mã hóa này không thể được xác thực trên thiết bị này."</string>
+  <string name="crypto_event_authenticity_previously_verified">"Được mã hóa bởi một người dùng đã từng được xác minh."</string>
+  <string name="crypto_event_authenticity_sent_in_clear">"Không được mã hóa"</string>
+  <string name="crypto_event_authenticity_unknown_device">"Được mã hóa bởi một thiết bị không xác định hoặc đã bị xóa."</string>
+  <string name="crypto_event_authenticity_unsigned_device">"Được mã hóa bởi một thiết bị chưa được chủ sở hữu xác minh."</string>
+  <string name="crypto_event_authenticity_unverified_identity">"Được mã hóa bởi một người dùng chưa được xác minh."</string>
+  <string name="screen_media_upload_preview_error_failed_processing">"Xử lý phương tiện tải lên không thành công, vui lòng thử lại."</string>
+  <string name="screen_media_upload_preview_error_failed_sending">"Không thể tải lên tệp phương tiện. Vui lòng thử lại."</string>
+  <string name="screen_report_content_block_user">"Chặn người dùng"</string>
+  <string name="screen_report_content_block_user_hint">"Chọn tùy chọn này nếu bạn muốn ẩn tất cả tin nhắn hiện tại và tương lai từ người dùng này."</string>
+  <string name="screen_report_content_explanation">"Tin nhắn này sẽ được báo cáo cho quản trị viên máy chủ của bạn. Họ sẽ không thể đọc bất kỳ tin nhắn được mã hóa nào."</string>
+  <string name="screen_report_content_hint">"Lý do báo cáo nội dung này"</string>
+  <string name="screen_room_attachment_source_camera">"Máy ảnh"</string>
+  <string name="screen_room_attachment_source_camera_photo">"Chụp ảnh"</string>
+  <string name="screen_room_attachment_source_camera_video">"Quay video"</string>
+  <string name="screen_room_attachment_source_files">"Tệp đính kèm"</string>
+  <string name="screen_room_attachment_source_gallery">"Thư viện ảnh và video"</string>
+  <string name="screen_room_attachment_source_location">"Chia sẻ vị trí"</string>
+  <string name="screen_room_attachment_source_poll">"Bỏ phiếu"</string>
+  <string name="screen_room_attachment_text_formatting">"Định dạng văn bản"</string>
+  <string name="screen_room_encrypted_history_banner">"Lịch sử tin nhắn hiện không khả dụng."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"Lịch sử tin nhắn không khả dụng trong phòng này. Vui lòng xác minh thiết bị này để xem lịch sử tin nhắn của bạn."</string>
+  <string name="screen_room_invite_again_alert_message">"Bạn có muốn mời họ quay lại không?"</string>
+  <string name="screen_room_invite_again_alert_title">"Bạn đang một mình trong cuộc trò chuyện này"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"Thông báo cho cả phòng"</string>
+  <string name="screen_room_mentions_at_room_title">"Mọi người"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Gửi lại"</string>
+  <string name="screen_room_retry_send_menu_title">"Gửi tin nhắn không thành công"</string>
+  <string name="screen_room_timeline_add_reaction">"Thêm biểu cảm"</string>
+  <string name="screen_room_timeline_beginning_of_room">"Đây là sự kiện khởi đầu của phòng %1$s ."</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"Đây là khởi đầu của cuộc trò chuyện này."</string>
+  <string name="screen_room_timeline_legacy_call">"Cuộc gọi không được hỗ trợ. Hãy hỏi xem người gọi có thể sử dụng ứng dụng Element X mới hay không."</string>
+  <string name="screen_room_timeline_less_reactions">"Thu gọn"</string>
+  <string name="screen_room_timeline_message_copied">"Đã sao chép tin nhắn"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"Bạn không có quyền gửi tin nhắn trong phòng này"</string>
+  <plurals name="screen_room_timeline_reaction_a11y">
+    <item quantity="other">"%1$d thành viên đã phản ứng với %2$s"</item>
+  </plurals>
+  <plurals name="screen_room_timeline_reaction_including_you_a11y">
+    <item quantity="other">"Bạn và thành viên %1$d đã phản ứng với%2$s"</item>
+  </plurals>
+  <string name="screen_room_timeline_reactions_show_less">"Thu gọn"</string>
+  <string name="screen_room_timeline_reactions_show_more">"Xem thêm"</string>
+  <string name="screen_room_timeline_read_marker_title">"Mới"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="other">"%1$d số lượng phòng thay đổi"</item>
+  </plurals>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="other">"%1$s,%2$s và %3$d người khác"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="other">"%1$s đang gõ"</item>
+  </plurals>
+  <string name="screen_room_typing_two_members">"%1$s và %2$s"</string>
+</resources>
diff --git a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml
index 321c381359..e8cd285b5e 100644
--- a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml
@@ -7,15 +7,6 @@
   <string name="crypto_event_authenticity_unknown_device">"由未知或已刪除的裝置加密。"</string>
   <string name="crypto_event_authenticity_unsigned_device">"由未經其擁有者驗證的裝置加密。"</string>
   <string name="crypto_event_authenticity_unverified_identity">"由未經驗證的使用者加密。"</string>
-  <string name="emoji_picker_category_activity">"活動"</string>
-  <string name="emoji_picker_category_flags">"旗幟"</string>
-  <string name="emoji_picker_category_foods">"食物與飲料"</string>
-  <string name="emoji_picker_category_nature">"動物與大自然"</string>
-  <string name="emoji_picker_category_objects">"物品"</string>
-  <string name="emoji_picker_category_people">"表情與人物"</string>
-  <string name="emoji_picker_category_places">"旅行與景點"</string>
-  <string name="emoji_picker_category_recent">"最近使用的表情符號"</string>
-  <string name="emoji_picker_category_symbols">"標誌"</string>
   <string name="screen_media_upload_preview_caption_warning">"使用舊應用程式的使用者可能看不到標題。"</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"輕點即可變更影片上傳品質"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"無法上傳檔案。"</string>
@@ -35,7 +26,7 @@
   <string name="screen_room_attachment_source_camera_video">"錄影"</string>
   <string name="screen_room_attachment_source_files">"附件"</string>
   <string name="screen_room_attachment_source_gallery">"照片與影片庫"</string>
-  <string name="screen_room_attachment_source_location">"位置"</string>
+  <string name="screen_room_attachment_source_location">"分享位置"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"格式化文字"</string>
   <string name="screen_room_encrypted_history_banner">"目前無法檢視訊息歷史紀錄。"</string>
diff --git a/features/messages/impl/src/main/res/values-zh/translations.xml b/features/messages/impl/src/main/res/values-zh/translations.xml
index 5247193b84..350ade6535 100644
--- a/features/messages/impl/src/main/res/values-zh/translations.xml
+++ b/features/messages/impl/src/main/res/values-zh/translations.xml
@@ -7,72 +7,78 @@
   <string name="crypto_event_authenticity_unknown_device">"由未知或已删除的设备加密。"</string>
   <string name="crypto_event_authenticity_unsigned_device">"由未经其所有者验证的设备加密。"</string>
   <string name="crypto_event_authenticity_unverified_identity">"由未经验证的用户加密。"</string>
-  <string name="emoji_picker_category_activity">"活动"</string>
-  <string name="emoji_picker_category_flags">"旗帜"</string>
-  <string name="emoji_picker_category_foods">"食物和饮料"</string>
-  <string name="emoji_picker_category_nature">"动物和自然"</string>
-  <string name="emoji_picker_category_objects">"物品"</string>
-  <string name="emoji_picker_category_people">"表情和人物"</string>
-  <string name="emoji_picker_category_places">"旅行和地点"</string>
-  <string name="emoji_picker_category_recent">"最近的 Emoji"</string>
-  <string name="emoji_picker_category_symbols">"符号"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"水平翻转图像"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"水平翻转"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"原始"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"垂直翻转图像"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"垂直翻转"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"原始"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"向左旋转图像"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="other">"%1$d 度"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"编辑照片"</string>
   <string name="screen_media_upload_preview_caption_warning">"使用旧版应用程序的用户可能无法看到字幕。"</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"点按以更改视频上传质量"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"无法上传该文件。"</string>
   <string name="screen_media_upload_preview_error_failed_processing">"处理要上传的媒体失败，请重试。"</string>
   <string name="screen_media_upload_preview_error_failed_sending">"上传媒体失败，请重试。"</string>
-  <string name="screen_media_upload_preview_error_too_large_message">"允许的最大文件大小为%1$s 。"</string>
+  <string name="screen_media_upload_preview_error_too_large_message">"允许的最大文件大小为 %1$s。"</string>
   <string name="screen_media_upload_preview_error_too_large_title">"文件太大，无法上传"</string>
-  <string name="screen_media_upload_preview_item_count">"第%1$d/%2$d项"</string>
+  <string name="screen_media_upload_preview_item_count">"第 %1$d 个项目，共 %2$d 个"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"优化图像质量"</string>
   <string name="screen_media_upload_preview_processing">"处理中…"</string>
-  <string name="screen_report_content_block_user">"封禁用户"</string>
-  <string name="screen_report_content_block_user_hint">"请确认是否要隐藏该用户当前和未来的所有信息"</string>
-  <string name="screen_report_content_explanation">"此消息将举报给您的服务器管理员。他们无法读取任何加密消息。"</string>
-  <string name="screen_report_content_hint">"举报此内容的原因"</string>
+  <string name="screen_media_upload_preview_title">"添加媒体"</string>
+  <string name="screen_report_content_block_user">"屏蔽用户"</string>
+  <string name="screen_report_content_block_user_hint">"请确认是否要隐藏该用户当前和未来的所有消息"</string>
+  <string name="screen_report_content_explanation">"此消息将举报给服务器管理员。他们无法读取任何加密消息。"</string>
+  <string name="screen_report_content_hint">"举报此内容的理由"</string>
   <string name="screen_room_attachment_source_camera">"相机"</string>
   <string name="screen_room_attachment_source_camera_photo">"拍摄照片"</string>
   <string name="screen_room_attachment_source_camera_video">"录制视频"</string>
   <string name="screen_room_attachment_source_files">"附件"</string>
   <string name="screen_room_attachment_source_gallery">"照片和视频库"</string>
-  <string name="screen_room_attachment_source_location">"位置"</string>
+  <string name="screen_room_attachment_source_location">"共享位置"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"文本格式化"</string>
   <string name="screen_room_encrypted_history_banner">"消息历史记录当前不可用。"</string>
-  <string name="screen_room_encrypted_history_banner_unverified">"此聊天室无法查看消息历史记录。请验证此设备以查看之。"</string>
-  <string name="screen_room_invite_again_alert_message">"您想邀请他们回来吗？"</string>
-  <string name="screen_room_invite_again_alert_title">"聊天中只有你一个人"</string>
-  <string name="screen_room_mentions_at_room_subtitle">"通知整个聊天室"</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"消息历史在此房间不可用。请验证此设备以查看。"</string>
+  <string name="screen_room_invite_again_alert_message">"你想邀请他们回来吗？"</string>
+  <string name="screen_room_invite_again_alert_title">"此聊天中只有你一人"</string>
+  <string name="screen_room_mentions_at_room_subtitle">"通知整个房间"</string>
   <string name="screen_room_mentions_at_room_title">"所有人"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"再次发送"</string>
   <string name="screen_room_retry_send_menu_title">"消息发送失败"</string>
-  <string name="screen_room_timeline_add_reaction">"添加表情符号"</string>
-  <string name="screen_room_timeline_beginning_of_room">"这是 %1$s 聊天室的开始。"</string>
+  <string name="screen_room_timeline_add_reaction">"添加反应"</string>
+  <string name="screen_room_timeline_beginning_of_room">"这是房间 %1$s 的开头。"</string>
   <string name="screen_room_timeline_beginning_of_room_no_name">"这是本对话的开始。"</string>
-  <string name="screen_room_timeline_legacy_call">"不支持的呼叫。询问呼叫者是否可以使用新的 Element X 应用程序。"</string>
+  <string name="screen_room_timeline_legacy_call">"不受支持的通话。询问呼叫方是否可以使用新的 Element X app。"</string>
   <string name="screen_room_timeline_less_reactions">"折叠"</string>
   <string name="screen_room_timeline_message_copied">"消息已复制"</string>
-  <string name="screen_room_timeline_no_permission_to_post">"您无权在此聊天室发言"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"你无权在此房间发言"</string>
   <plurals name="screen_room_timeline_reaction_a11y">
-    <item quantity="other">"%1$d 个成员添加表情符号 %2$s"</item>
+    <item quantity="other">"%1$d 个成员使用 %2$s 反应"</item>
   </plurals>
   <plurals name="screen_room_timeline_reaction_including_you_a11y">
-    <item quantity="other">"您与 %1$d 个成员添加表情符号 %2$s"</item>
+    <item quantity="other">"你与其他 %1$d 个成员使用 %2$s 反应"</item>
   </plurals>
-  <string name="screen_room_timeline_reaction_you_a11y">"您添加了表情符号%1$s"</string>
+  <string name="screen_room_timeline_reaction_you_a11y">"你使用 %1$s 反应"</string>
   <string name="screen_room_timeline_reactions_show_less">"折叠"</string>
   <string name="screen_room_timeline_reactions_show_more">"展开"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"显示反应摘要"</string>
   <string name="screen_room_timeline_read_marker_title">"新消息"</string>
-  <plurals name="screen_room_timeline_state_changes">
-    <item quantity="other">"%1$d 个聊天室变化"</item>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="other">"%1$d 个已移除的消息"</item>
   </plurals>
-  <string name="screen_room_timeline_tombstoned_room_action">"跳转至新房间"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="other">"%1$d 个房间变化"</item>
+  </plurals>
+  <string name="screen_room_timeline_tombstoned_room_action">"跳转到新房间"</string>
   <string name="screen_room_timeline_tombstoned_room_message">"本房间已被替换，现已失效"</string>
   <string name="screen_room_timeline_upgraded_room_action">"查看历史消息"</string>
-  <string name="screen_room_timeline_upgraded_room_message">"该聊天室是其他聊天室的延续"</string>
+  <string name="screen_room_timeline_upgraded_room_message">"此房间是另一房间的延续"</string>
   <plurals name="screen_room_typing_many_members">
-    <item quantity="other">"%1$s，%2$s 和其他 %3$d 个人"</item>
+    <item quantity="other">"%1$s，%2$s 及其他 %3$d 人"</item>
   </plurals>
   <plurals name="screen_room_typing_notification">
     <item quantity="other">"%1$s 正在输入"</item>
diff --git a/features/messages/impl/src/main/res/values/localazy.xml b/features/messages/impl/src/main/res/values/localazy.xml
index f5629f5e2d..556ab00ee0 100644
--- a/features/messages/impl/src/main/res/values/localazy.xml
+++ b/features/messages/impl/src/main/res/values/localazy.xml
@@ -7,15 +7,18 @@
   <string name="crypto_event_authenticity_unknown_device">"Encrypted by an unknown or deleted device."</string>
   <string name="crypto_event_authenticity_unsigned_device">"Encrypted by a device not verified by its owner."</string>
   <string name="crypto_event_authenticity_unverified_identity">"Encrypted by an unverified user."</string>
-  <string name="emoji_picker_category_activity">"Activities"</string>
-  <string name="emoji_picker_category_flags">"Flags"</string>
-  <string name="emoji_picker_category_foods">"Food &amp; Drink"</string>
-  <string name="emoji_picker_category_nature">"Animals &amp; Nature"</string>
-  <string name="emoji_picker_category_objects">"Objects"</string>
-  <string name="emoji_picker_category_people">"Smileys &amp; People"</string>
-  <string name="emoji_picker_category_places">"Travel &amp; Places"</string>
-  <string name="emoji_picker_category_recent">"Recent emojis"</string>
-  <string name="emoji_picker_category_symbols">"Symbols"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally">"Flip image horizontally"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_flipped">"Flipped horizontally"</string>
+  <string name="screen_image_edition_a11y_flip_image_horizontally_state_original">"Original"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically">"Flip image vertically"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_flipped">"Flipped vertically"</string>
+  <string name="screen_image_edition_a11y_flip_image_vertically_state_original">"Original"</string>
+  <string name="screen_image_edition_a11y_rotate_to_the_left">"Rotate the image to the left"</string>
+  <plurals name="screen_image_edition_a11y_rotation_state">
+    <item quantity="one">"%1$d degree"</item>
+    <item quantity="other">"%1$d degrees"</item>
+  </plurals>
+  <string name="screen_image_edition_title">"Edit photo"</string>
   <string name="screen_media_upload_preview_caption_warning">"Captions might not be visible to people using older apps."</string>
   <string name="screen_media_upload_preview_change_video_quality_prompt">"Tap to change the video upload quality"</string>
   <string name="screen_media_upload_preview_error_could_not_be_uploaded">"The file could not be uploaded."</string>
@@ -26,6 +29,7 @@
   <string name="screen_media_upload_preview_item_count">"Item %1$d of %2$d"</string>
   <string name="screen_media_upload_preview_optimize_image_quality_title">"Optimise image quality"</string>
   <string name="screen_media_upload_preview_processing">"Processing…"</string>
+  <string name="screen_media_upload_preview_title">"Add media"</string>
   <string name="screen_report_content_block_user">"Block user"</string>
   <string name="screen_report_content_block_user_hint">"Check if you want to hide all current and future messages from this user"</string>
   <string name="screen_report_content_explanation">"This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages."</string>
@@ -66,6 +70,10 @@
   <string name="screen_room_timeline_reactions_show_more">"Show more"</string>
   <string name="screen_room_timeline_reactions_show_reactions_summary">"Show reactions summary"</string>
   <string name="screen_room_timeline_read_marker_title">"New"</string>
+  <plurals name="screen_room_timeline_redacted_messages">
+    <item quantity="one">"%1$d removed message"</item>
+    <item quantity="other">"%1$d removed messages"</item>
+  </plurals>
   <plurals name="screen_room_timeline_state_changes">
     <item quantity="one">"%1$d room change"</item>
     <item quantity="other">"%1$d room changes"</item>
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
index a1db09dfda..9679e23a23 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
@@ -23,6 +23,7 @@ import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.messages.impl.pinned.banner.createPinnedEventsTimelineProvider
 import io.element.android.features.messages.impl.timeline.createTimelineController
 import io.element.android.features.poll.test.create.FakeCreatePollEntryPoint
+import io.element.android.libraries.androidutils.system.DeviceHasVulkanSupport
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -42,6 +43,7 @@ import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import io.element.android.tests.testutils.testCoroutineDispatchers
+import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -85,6 +87,7 @@ class DefaultMessagesEntryPointTest {
                 knockRequestsListEntryPoint = FakeKnockRequestsListEntryPoint(),
                 dateFormatter = FakeDateFormatter(),
                 coroutineDispatchers = testCoroutineDispatchers(),
+                hasVulkanSupport = DeviceHasVulkanSupport(mockk(relaxed = true))
             )
         }
         val callback = object : MessagesEntryPoint.Callback {
@@ -93,6 +96,7 @@ class DefaultMessagesEntryPointTest {
             override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
             override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
             override fun navigateToRoom(roomId: RoomId) = lambdaError()
+            override fun navigateToDeveloperSettings() = lambdaError()
         }
         val initialTarget = MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID)
         val params = MessagesEntryPoint.Params(initialTarget)
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
index 68d2cd824b..68f9a8d17a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
@@ -24,8 +24,11 @@ class FakeMessagesNavigator(
     private val onEditPollClickLambda: (eventId: EventId) -> Unit = { _ -> lambdaError() },
     private val onPreviewAttachmentLambda: (attachments: ImmutableList<Attachment>, inReplyToEventId: EventId?) -> Unit = { _, _ -> lambdaError() },
     private val onNavigateToRoomLambda: (roomId: RoomId, threadId: EventId?, serverNames: List<String>) -> Unit = { _, _, _ -> lambdaError() },
+    private val navigateToMemberLambda: (userId: UserId) -> Unit = { lambdaError() },
+    private val navigateToDeveloperSettingsLambda: () -> Unit = { lambdaError() },
     private val onOpenThreadLambda: (threadRootId: ThreadId, focusedEventId: EventId?) -> Unit = { _, _ -> lambdaError() },
     private val closeLambda: () -> Unit = { lambdaError() },
+    private val navigateToCurrentLiveLocationLambda: () -> Unit = { lambdaError() },
 ) : MessagesNavigator {
     override fun navigateToEventDebugInfo(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
         onShowEventDebugInfoClickLambda(eventId, debugInfo)
@@ -51,10 +54,22 @@ class FakeMessagesNavigator(
         onNavigateToRoomLambda(roomId, eventId, serverNames)
     }
 
+    override fun navigateToMember(userId: UserId) {
+        navigateToMemberLambda(userId)
+    }
+
     override fun navigateToThread(threadRootId: ThreadId, focusedEventId: EventId?) {
         onOpenThreadLambda(threadRootId, focusedEventId)
     }
 
+    override fun navigateToDeveloperSettings() {
+        navigateToDeveloperSettingsLambda()
+    }
+
+    override fun navigateToCurrentLiveLocation() {
+        navigateToCurrentLiveLocationLambda()
+    }
+
     override fun close() {
         closeLambda()
     }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
index f6967de0e5..0a0d310b16 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
@@ -13,6 +13,7 @@ package io.element.android.features.messages.impl
 import androidx.lifecycle.Lifecycle
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.PinUnpinAction
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.features.messages.impl.actionlist.ActionListEvent
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.anActionListState
@@ -24,6 +25,7 @@ import io.element.android.features.messages.impl.messagecomposer.MessageComposer
 import io.element.android.features.messages.impl.messagecomposer.MessageComposerState
 import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState
 import io.element.android.features.messages.impl.pinned.banner.aLoadedPinnedMessagesBannerState
+import io.element.android.features.messages.impl.threads.list.aThreadListItem
 import io.element.android.features.messages.impl.timeline.FakeMarkAsFullyRead
 import io.element.android.features.messages.impl.timeline.MarkAsFullyRead
 import io.element.android.features.messages.impl.timeline.TimelineController
@@ -50,6 +52,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.emoji.api.recentemojis.AddRecentEmoji
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
@@ -88,10 +91,10 @@ import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
+import io.element.android.libraries.matrix.test.room.threads.FakeThreadsListService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aTimelineItemDebugInfo
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
-import io.element.android.libraries.recentemojis.api.AddRecentEmoji
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.textcomposer.model.TextEditorState
 import io.element.android.libraries.textcomposer.model.aTextEditorStateMarkdown
@@ -110,6 +113,7 @@ import io.element.android.tests.testutils.testWithLifecycleOwner
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
@@ -117,6 +121,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 @Suppress("LargeClass")
 class MessagesPresenterTest {
@@ -137,6 +142,39 @@ class MessagesPresenterTest {
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.inviteProgress).isEqualTo(AsyncData.Uninitialized)
             assertThat(initialState.showReinvitePrompt).isFalse()
+            assertThat(initialState.showLiveLocationShareBanner).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - exposes live location sharing banner visibility for current room`() = runTest {
+        val liveLocationShareManager = FakeActiveLiveLocationShareManager(
+            startShareLambda = { _, _ -> Result.success(Unit) },
+        )
+        liveLocationShareManager.startShare(A_ROOM_ID, 60.seconds)
+        val presenter = createMessagesPresenter(liveLocationShareManager = liveLocationShareManager)
+
+        presenter.testWithLifecycleOwner {
+            val state = consumeItemsUntilTimeout().last()
+            assertThat(state.showLiveLocationShareBanner).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - stop live location share delegates to manager for current room`() = runTest {
+        val stopShareLambda = lambdaRecorder<RoomId, Result<Unit>> { Result.success(Unit) }
+        val liveLocationShareManager = FakeActiveLiveLocationShareManager(
+            stopShareLambda = stopShareLambda
+        )
+        val presenter = createMessagesPresenter(liveLocationShareManager = liveLocationShareManager)
+
+        presenter.testWithLifecycleOwner {
+            val state = consumeItemsUntilTimeout().last()
+            state.eventSink(MessagesEvent.StopLiveLocationShare)
+            advanceUntilIdle()
+            assert(stopShareLambda)
+                .isCalledOnce()
+                .with(value(A_ROOM_ID))
         }
     }
 
@@ -560,7 +598,7 @@ class MessagesPresenterTest {
             baseRoom = FakeBaseRoom(
                 roomPermissions = roomPermissions(),
             ).apply {
-                givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 1, activeMembersCount = 1))
+                givenRoomInfo(aRoomInfo(isDm = true, joinedMembersCount = 1, activeMembersCount = 1))
             },
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -1074,7 +1112,7 @@ class MessagesPresenterTest {
                     canRedactOwn = true,
                     canPinUnpin = true,
                 ),
-                initialRoomInfo = aRoomInfo(isDirect = true, isEncrypted = true)
+                initialRoomInfo = aRoomInfo(isDm = true, isEncrypted = true)
             ).apply {
                 givenRoomMembersState(RoomMembersState.Ready(persistentListOf(aRoomMember(userId = A_SESSION_ID), aRoomMember(userId = A_USER_ID_2))))
             },
@@ -1225,9 +1263,6 @@ class MessagesPresenterTest {
                     initialRoomInfo = aRoomInfo(isEncrypted = true, historyVisibility = RoomHistoryVisibility.Shared),
                 ),
             ),
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.EnableKeyShareOnInvite.key to true)
-            )
         )
         presenter.testWithLifecycleOwner {
             awaitItem()
@@ -1246,9 +1281,6 @@ class MessagesPresenterTest {
                     initialRoomInfo = aRoomInfo(isEncrypted = true, historyVisibility = RoomHistoryVisibility.WorldReadable),
                 ),
             ),
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.EnableKeyShareOnInvite.key to true)
-            )
         )
         presenter.testWithLifecycleOwner {
             awaitItem()
@@ -1258,6 +1290,35 @@ class MessagesPresenterTest {
         }
     }
 
+    @Test
+    fun `present - only has threads enabled if the feature flag is on`() = runTest {
+        val itemsFlow = MutableStateFlow(listOf(aThreadListItem()))
+        val room = FakeJoinedRoom(
+            threadsListService = FakeThreadsListService(items = itemsFlow)
+        )
+        val featureFlagService = FakeFeatureFlagService(
+            initialState = mapOf(FeatureFlags.Threads.key to false)
+        )
+        val presenter = createMessagesPresenter(
+            joinedRoom = room,
+            featureFlagService = featureFlagService
+        )
+        presenter.testWithLifecycleOwner {
+            val initialState = awaitItem()
+            // The feature flag is disabled, so even if the thread list has items, it will return it doesn't have any
+            assertThat(initialState.threads.hasThreads).isFalse()
+
+            // Enable the feature flag, now it should reflect the thread list state
+            featureFlagService.setFeatureEnabled(FeatureFlags.RoomThreadList, true)
+            skipItems(1)
+            assertThat(awaitItem().threads.hasThreads).isTrue()
+
+            // And if we remove the items, it should update accordingly
+            itemsFlow.value = emptyList()
+            assertThat(awaitItem().threads.hasThreads).isFalse()
+        }
+    }
+
     private fun roomPermissions(
         canStartCall: Boolean = true,
         canRedactOther: Boolean = true,
@@ -1321,6 +1382,7 @@ class MessagesPresenterTest {
         actionListEventSink: (ActionListEvent) -> Unit = {},
         addRecentEmoji: AddRecentEmoji = AddRecentEmoji { _ -> lambdaError() },
         markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead(),
+        liveLocationShareManager: FakeActiveLiveLocationShareManager = FakeActiveLiveLocationShareManager(),
     ): MessagesPresenter {
         return MessagesPresenter(
             navigator = navigator,
@@ -1350,6 +1412,7 @@ class MessagesPresenterTest {
             featureFlagService = featureFlagService,
             addRecentEmoji = addRecentEmoji,
             markAsFullyRead = markAsFullyRead,
+            liveLocationShareManager = liveLocationShareManager,
             sessionCoroutineScope = backgroundScope,
         )
     }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
index c78aa39265..2800c737ad 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
@@ -6,13 +6,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.longClick
 import androidx.compose.ui.test.onAllNodesWithContentDescription
 import androidx.compose.ui.test.onAllNodesWithTag
@@ -25,11 +27,10 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeRight
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import androidx.compose.ui.text.AnnotatedString
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.emojibasebindings.EmojibaseCategory
-import io.element.android.emojibasebindings.EmojibaseStore
 import io.element.android.features.messages.impl.actionlist.ActionListEvent
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.anActionListState
@@ -46,6 +47,7 @@ import io.element.android.features.messages.impl.timeline.aTimelineItemList
 import io.element.android.features.messages.impl.timeline.aTimelineItemReadReceipts
 import io.element.android.features.messages.impl.timeline.aTimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.aTimelineState
+import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionBottomSheet
 import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionEvent
 import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionState
 import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryEvent
@@ -54,6 +56,8 @@ import io.element.android.features.messages.impl.timeline.components.receipt.bot
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
 import io.element.android.features.roomcall.api.aStandByCallState
+import io.element.android.libraries.emoji.impl.picker.DefaultEmojiPickerRenderer
+import io.element.android.libraries.emoji.impl.picker.anEmojiPickerState
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.tombstone.SuccessorRoom
@@ -66,6 +70,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureCalledOnceWithTwoParamsAndResult
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EnsureNeverCalledWithThreeParamsAndResult
 import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
 import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParamsAndResult
 import io.element.android.tests.testutils.EventsRecorder
@@ -73,86 +78,82 @@ import io.element.android.tests.testutils.assertNoNodeWithText
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import kotlin.time.Duration.Companion.milliseconds
 
-@RunWith(AndroidJUnit4::class)
-class MessagesViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class MessagesViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke expected callback`() {
+    fun `clicking on back invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on room name invoke expected callback`() {
+    fun `clicking on room name invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onRoomDetailsClick = callback,
             )
-            rule.onNodeWithText(state.roomName.orEmpty(), useUnmergedTree = true).performClick()
+            onNodeWithText(state.roomName.orEmpty(), useUnmergedTree = true).performClick()
         }
     }
 
     @Test
-    fun `clicking on join call invoke expected callback`() {
+    fun `clicking on join call invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             eventSink = eventsRecorder
         )
         ensureCalledOnceWithParam(false) { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onJoinCallClick = callback,
             )
-            val joinCallContentDescription = rule.activity.getString(CommonStrings.a11y_start_call)
-            rule.onNodeWithContentDescription(joinCallContentDescription).performClick()
+            val joinCallContentDescription = activity!!.getString(CommonStrings.a11y_start_call)
+            onNodeWithContentDescription(joinCallContentDescription).performClick()
         }
     }
 
     @Test
-    fun `clicking on join voice call invoke expected callback`() {
+    fun `clicking on join voice call invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             eventSink = eventsRecorder,
             roomCallState = aStandByCallState(isDM = true)
         )
         ensureCalledOnceWithParam(true) { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onJoinCallClick = callback,
             )
-            val joinVoiceCallContentDescription = rule.activity.getString(CommonStrings.a11y_start_voice_call)
-            rule.onNodeWithContentDescription(joinVoiceCallContentDescription).performClick()
+            val joinVoiceCallContentDescription = activity!!.getString(CommonStrings.a11y_start_voice_call)
+            onNodeWithContentDescription(joinVoiceCallContentDescription).performClick()
         }
     }
 
     @Test
-    fun `clicking on an Event invoke expected callback`() {
+    fun `clicking on an Event invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             timelineState = aTimelineState(
@@ -166,12 +167,12 @@ class MessagesViewTest {
             expectedParam2 = timelineItem,
             result = true,
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
             onEventClick = callback,
         )
         // Cannot perform click on "Text", it's not detected. Use tag instead
-        rule.onAllNodesWithTag(TestTags.messageBubble.value).onFirst().performClick()
+        onAllNodesWithTag(TestTags.messageBubble.value).onFirst().performClick()
         callback.assertSuccess()
     }
 
@@ -201,7 +202,7 @@ class MessagesViewTest {
         userHasPermissionToRedactOther: Boolean = false,
         userHasPermissionToSendReaction: Boolean = false,
         userCanPinEvent: Boolean = false,
-    ) {
+    ) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ActionListEvent>()
         val state = aMessagesState(
             actionListState = anActionListState(
@@ -219,11 +220,11 @@ class MessagesViewTest {
             ),
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
         // Cannot perform click on "Text", it's not detected. Use tag instead
-        rule.onAllNodesWithTag(TestTags.messageBubble.value).onFirst().performTouchInput { longClick() }
+        onAllNodesWithTag(TestTags.messageBubble.value).onFirst().performTouchInput { longClick() }
         eventsRecorder.assertSingle(
             ActionListEvent.ComputeForMessage(
                 event = timelineItem,
@@ -234,11 +235,10 @@ class MessagesViewTest {
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on a read receipt list emits the expected Event`() {
+    fun `clicking on a read receipt list emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReadReceiptBottomSheetEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(
-                renderReadReceipts = true,
                 timelineItems = persistentListOf(
                     aTimelineItemEvent(
                         readReceiptState = aTimelineItemReadReceipts(
@@ -254,10 +254,10 @@ class MessagesViewTest {
             ),
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
-        rule.onNodeWithTag(TestTags.messageReadReceipts.value, useUnmergedTree = true).performClick()
+        onNodeWithTag(TestTags.messageReadReceipts.value, useUnmergedTree = true).performClick()
         eventsRecorder.assertSingle(ReadReceiptBottomSheetEvent.EventSelected(timelineItem))
     }
 
@@ -271,7 +271,7 @@ class MessagesViewTest {
         swipeTest(userHasPermissionToSendMessage = false)
     }
 
-    private fun swipeTest(userHasPermissionToSendMessage: Boolean) {
+    private fun swipeTest(userHasPermissionToSendMessage: Boolean) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>()
         val canBeRepliedEvent = aTimelineItemEvent(canBeRepliedTo = true)
         val cannotBeRepliedEvent = aTimelineItemEvent(canBeRepliedTo = false)
@@ -284,10 +284,10 @@ class MessagesViewTest {
             ),
             eventSink = eventsRecorder,
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
-        rule.onAllNodesWithTag(TestTags.messageBubble.value).apply {
+        onAllNodesWithTag(TestTags.messageBubble.value).apply {
             onFirst().performTouchInput { swipeRight(endX = 200f) }
             onLast().performTouchInput { swipeRight(endX = 200f) }
         }
@@ -299,7 +299,7 @@ class MessagesViewTest {
     }
 
     @Test
-    fun `clicking on send location invoke expected callback`() {
+    fun `clicking on send location invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             composerState = aMessageComposerState(
@@ -308,16 +308,16 @@ class MessagesViewTest {
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onSendLocationClick = callback,
             )
-            rule.clickOn(R.string.screen_room_attachment_source_location)
+            clickOn(R.string.screen_room_attachment_source_location)
         }
     }
 
     @Test
-    fun `clicking on create poll invoke expected callback`() {
+    fun `clicking on create poll invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             composerState = aMessageComposerState(
@@ -326,25 +326,25 @@ class MessagesViewTest {
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMessagesView(
+            setMessagesView(
                 state = state,
                 onCreatePollClick = callback,
             )
             // Then click on the poll action
-            rule.clickOn(R.string.screen_room_attachment_source_poll)
+            clickOn(R.string.screen_room_attachment_source_poll)
         }
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on the avatar of the sender of an Event emits the expected event`() {
+    fun `clicking on the avatar of the sender of an Event emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>()
         val state = aMessagesState(
             eventSink = eventsRecorder
         )
         val timelineEvent = state.timelineState.timelineItems.filterIsInstance<TimelineItem.Event>().first()
-        rule.setMessagesView(state = state)
-        rule.onNodeWithTag(TestTags.timelineItemSenderAvatar.value, useUnmergedTree = true).performClick()
+        setMessagesView(state = state)
+        onNodeWithTag(TestTags.timelineItemSenderAvatar.value, useUnmergedTree = true).performClick()
         eventsRecorder.assertSingle(
             MessagesEvent.OnUserClicked(
                 MatrixUser(
@@ -358,12 +358,12 @@ class MessagesViewTest {
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on the display name of the sender of an Event emits expected event`() {
+    fun `clicking on the display name of the sender of an Event emits expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>()
         val state = aMessagesState(eventSink = eventsRecorder)
         val timelineEvent = state.timelineState.timelineItems.filterIsInstance<TimelineItem.Event>().first()
-        rule.setMessagesView(state = state)
-        rule.onNodeWithTag(TestTags.timelineItemSenderAvatar.value, useUnmergedTree = true).performClick()
+        setMessagesView(state = state)
+        onNodeWithTag(TestTags.timelineItemSenderAvatar.value, useUnmergedTree = true).performClick()
         eventsRecorder.assertSingle(
             MessagesEvent.OnUserClicked(
                 MatrixUser(
@@ -376,7 +376,7 @@ class MessagesViewTest {
     }
 
     @Test
-    fun `selecting a action on a message emits the expected Event`() {
+    fun `selecting a action on a message emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>()
         val state = aMessagesState(
             eventSink = eventsRecorder
@@ -394,17 +394,17 @@ class MessagesViewTest {
                 )
             ),
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = stateWithMessageAction,
         )
-        rule.clickOn(CommonStrings.action_edit)
+        clickOn(CommonStrings.action_edit)
         // Give time for the close animation to complete
-        rule.mainClock.advanceTimeBy(milliseconds = 1_000)
+        mainClock.advanceTimeBy(milliseconds = 1_000)
         eventsRecorder.assertSingle(MessagesEvent.HandleAction(TimelineItemAction.Edit, timelineItem))
     }
 
     @Test
-    fun `clicking on a reaction emits the expected Event`() {
+    fun `clicking on a reaction emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(
@@ -413,10 +413,10 @@ class MessagesViewTest {
             eventSink = eventsRecorder,
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
-        rule.onAllNodesWithText(
+        onAllNodesWithText(
             text = "👍️",
             useUnmergedTree = true,
         ).onFirst().performClick()
@@ -424,7 +424,7 @@ class MessagesViewTest {
     }
 
     @Test
-    fun `long clicking on a reaction emits the expected Event`() {
+    fun `long clicking on a reaction emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReactionSummaryEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(
@@ -436,10 +436,10 @@ class MessagesViewTest {
             ),
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
-        rule.onAllNodesWithText(
+        onAllNodesWithText(
             text = "👍️",
             useUnmergedTree = true,
         ).onFirst().performTouchInput { longClick() }
@@ -447,7 +447,7 @@ class MessagesViewTest {
     }
 
     @Test
-    fun `clicking on more reaction emits the expected Event`() {
+    fun `clicking on more reaction emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<CustomReactionEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(
@@ -458,16 +458,16 @@ class MessagesViewTest {
             ),
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
-        rule.setMessagesView(
+        setMessagesView(
             state = state,
         )
-        val moreReactionContentDescription = rule.activity.getString(R.string.screen_room_timeline_add_reaction)
-        rule.onAllNodesWithContentDescription(moreReactionContentDescription).onFirst().performClick()
+        val moreReactionContentDescription = activity!!.getString(R.string.screen_room_timeline_add_reaction)
+        onAllNodesWithContentDescription(moreReactionContentDescription).onFirst().performClick()
         eventsRecorder.assertSingle(CustomReactionEvent.ShowCustomReactionSheet(timelineItem))
     }
 
     @Test
-    fun `clicking on more reaction from action list emits the expected Event`() {
+    fun `clicking on more reaction from action list emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<CustomReactionEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(
@@ -490,18 +490,18 @@ class MessagesViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = stateWithActionListState,
         )
-        val moreReactionContentDescription = rule.activity.getString(CommonStrings.a11y_react_with_other_emojis)
-        rule.onNodeWithContentDescription(moreReactionContentDescription).performClick()
+        val moreReactionContentDescription = activity!!.getString(CommonStrings.a11y_react_with_other_emojis)
+        onNodeWithContentDescription(moreReactionContentDescription).performClick()
         // Give time for the close animation to complete
-        rule.mainClock.advanceTimeBy(milliseconds = 1_000)
+        mainClock.advanceTimeBy(milliseconds = 1_000)
         eventsRecorder.assertSingle(CustomReactionEvent.ShowCustomReactionSheet(timelineItem))
     }
 
     @Test
-    fun `clicking on verified user send failure from action list emits the expected Event`() {
+    fun `clicking on verified user send failure from action list emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
         val state = aMessagesState()
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
@@ -518,18 +518,21 @@ class MessagesViewTest {
             ),
             timelineState = aTimelineState(eventSink = eventsRecorder)
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = stateWithActionListState,
         )
-        val verifiedUserSendFailure = rule.activity.getString(CommonStrings.screen_timeline_item_menu_send_failure_changed_identity, "Alice")
-        rule.onNodeWithText(verifiedUserSendFailure).performClick()
+        // Clear initial 'LoadMore' event emitted when setting the state
+        eventsRecorder.clear()
+
+        val verifiedUserSendFailure = activity!!.getString(CommonStrings.screen_timeline_item_menu_send_failure_changed_identity, "Alice")
+        onNodeWithText(verifiedUserSendFailure).performClick()
         // Give time for the close animation to complete
-        rule.mainClock.advanceTimeBy(milliseconds = 1_000)
+        mainClock.advanceTimeBy(milliseconds = 1_000)
         eventsRecorder.assertSingle(TimelineEvent.ComputeVerifiedUserSendFailure(timelineItem))
     }
 
     @Test
-    fun `clicking on a custom emoji emits the expected Events`() {
+    fun `clicking on a custom emoji emits the expected Events`() = runAndroidComposeUiTest {
         val aUnicode = "🙈"
         val customReactionStateEventsRecorder = EventsRecorder<CustomReactionEvent>()
         val eventsRecorder = EventsRecorder<MessagesEvent>()
@@ -537,40 +540,39 @@ class MessagesViewTest {
             eventSink = eventsRecorder,
         )
         val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
+        val emojisByCategory = persistentMapOf(
+            EmojibaseCategory.People to persistentListOf(
+                Emoji(
+                    hexcode = "",
+                    label = "",
+                    tags = persistentListOf(),
+                    shortcodes = persistentListOf(),
+                    unicode = aUnicode,
+                    skins = null,
+                )
+            )
+        )
         val stateWithCustomReactionState = state.copy(
             customReactionState = aCustomReactionState(
                 target = CustomReactionState.Target.Success(
                     event = timelineItem,
-                    emojibaseStore = EmojibaseStore(
-                        categories = persistentMapOf(
-                            EmojibaseCategory.People to persistentListOf(
-                                Emoji(
-                                    hexcode = "",
-                                    label = "",
-                                    tags = persistentListOf(),
-                                    shortcodes = persistentListOf(),
-                                    unicode = aUnicode,
-                                    skins = null,
-                                )
-                            )
-                        )
-                    ),
+                    emojiPickerState = anEmojiPickerState(emojis = emojisByCategory),
                 ),
                 eventSink = customReactionStateEventsRecorder
             ),
         )
-        rule.setMessagesView(
+        setMessagesView(
             state = stateWithCustomReactionState,
         )
-        rule.onNodeWithText(aUnicode, useUnmergedTree = true).performClick()
+        onNodeWithText(aUnicode, useUnmergedTree = true).performClick()
         // Give time for the close animation to complete
-        rule.mainClock.advanceTimeBy(milliseconds = 1_000)
+        mainClock.advanceTimeBy(milliseconds = 1_000)
         customReactionStateEventsRecorder.assertSingle(CustomReactionEvent.DismissCustomReactionSheet)
         eventsRecorder.assertSingle(MessagesEvent.ToggleReaction(aUnicode, timelineItem.eventOrTransactionId))
     }
 
     @Test
-    fun `clicking on pinned messages banner emits the expected Event`() {
+    fun `clicking on pinned messages banner emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
         val state = aMessagesState(
             timelineState = aTimelineState(eventSink = eventsRecorder),
@@ -583,13 +585,16 @@ class MessagesViewTest {
                 ),
             ),
         )
-        rule.setMessagesView(state = state)
-        rule.onNodeWithText("This is a pinned message").performClick()
+        setMessagesView(state = state)
+        // Clear initial 'LoadMore' event emitted when setting the state
+        eventsRecorder.clear()
+
+        onNodeWithText("This is a pinned message").performClick()
         eventsRecorder.assertSingle(TimelineEvent.FocusOnEvent(AN_EVENT_ID, debounce = FOCUS_ON_PINNED_EVENT_DEBOUNCE_DURATION_IN_MILLIS.milliseconds))
     }
 
     @Test
-    fun `clicking on successor room button emits expected event`() {
+    fun `clicking on successor room button emits expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
         val successorRoomId = RoomId("!successor:server.org")
         val state = aMessagesState(
@@ -599,38 +604,99 @@ class MessagesViewTest {
             ),
             timelineState = aTimelineState(eventSink = eventsRecorder)
         )
-        rule.setMessagesView(state = state)
-        val text = rule.activity.getString(R.string.screen_room_timeline_tombstoned_room_action)
+        setMessagesView(state = state)
+        // Clear initial 'LoadMore' event emitted when setting the state
+        eventsRecorder.clear()
+
+        val text = activity!!.getString(R.string.screen_room_timeline_tombstoned_room_action)
         // The bottomsheet subcompose seems to make the node to appear twice
-        rule.onAllNodesWithText(text).onFirst().performClick()
+        onAllNodesWithText(text).onFirst().performClick()
         eventsRecorder.assertSingle(TimelineEvent.NavigateToPredecessorOrSuccessorRoom(successorRoomId))
     }
 
     @Test
-    fun `no banner shown when there is no successor room`() {
+    fun `clicking on threads list button calls the expected function`() = runAndroidComposeUiTest {
+        val state = aMessagesState(
+            threads = MessagesState.Threads(
+                hasThreads = true,
+                hasUnreadThreads = false,
+            )
+        )
+        val onThreadsListClicked = lambdaRecorder<Unit> {}
+        setMessagesView(
+            state = state,
+            onThreadsListClicked = onThreadsListClicked,
+        )
+        onNodeWithContentDescription("Threads").performClick()
+        onThreadsListClicked.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `no banner shown when there is no successor room`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<MessagesEvent>(expectEvents = false)
         val state = aMessagesState(
             successorRoom = null,
             eventSink = eventsRecorder
         )
-        rule.setMessagesView(state = state)
-        rule.assertNoNodeWithText(R.string.screen_room_timeline_tombstoned_room_message)
-        rule.assertNoNodeWithText(R.string.screen_room_timeline_tombstoned_room_action)
+        setMessagesView(state = state)
+        assertNoNodeWithText(R.string.screen_room_timeline_tombstoned_room_message)
+        assertNoNodeWithText(R.string.screen_room_timeline_tombstoned_room_action)
+    }
+
+    @Test
+    fun `live location banner is visible when current room is sharing`() = runAndroidComposeUiTest {
+        val state = aMessagesState(isCurrentlySharingLiveLocationInRoom = true)
+        setMessagesView(state = state)
+        onNodeWithText(activity!!.getString(CommonStrings.screen_room_live_location_banner)).assertExists()
+    }
+
+    @Test
+    fun `live location banner is hidden when current room is not sharing`() = runAndroidComposeUiTest {
+        val state = aMessagesState(isCurrentlySharingLiveLocationInRoom = false)
+        setMessagesView(state = state)
+        onNodeWithText(activity!!.getString(CommonStrings.screen_room_live_location_banner)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `clicking stop on live location banner emits expected event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MessagesEvent>()
+        val state = aMessagesState(
+            isCurrentlySharingLiveLocationInRoom = true,
+            eventSink = eventsRecorder,
+        )
+        setMessagesView(state = state)
+        clickOn(CommonStrings.action_stop)
+        eventsRecorder.assertSingle(MessagesEvent.StopLiveLocationShare)
+    }
+
+    @Test
+    fun `clicking live location banner emit expected event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MessagesEvent>()
+        val state = aMessagesState(
+            isCurrentlySharingLiveLocationInRoom = true,
+            eventSink = eventsRecorder,
+        )
+        setMessagesView(state = state)
+        clickOn(CommonStrings.screen_room_live_location_banner)
+        eventsRecorder.assertSingle(MessagesEvent.ShowLiveLocationShare)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMessagesView(
+private fun AndroidComposeUiTest<ComponentActivity>.setMessagesView(
     state: MessagesState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onRoomDetailsClick: () -> Unit = EnsureNeverCalled(),
     onEventClick: (isLive: Boolean, event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithTwoParamsAndResult(),
+    onGalleryEventItemClick: (isLive: Boolean, event: TimelineItem.Event, index: Int) -> Boolean = EnsureNeverCalledWithThreeParamsAndResult(),
     onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),
     onLinkClick: (String, Boolean) -> Unit = EnsureNeverCalledWithTwoParams(),
     onSendLocationClick: () -> Unit = EnsureNeverCalled(),
     onCreatePollClick: () -> Unit = EnsureNeverCalled(),
     onJoinCallClick: (Boolean) -> Unit = EnsureNeverCalledWithParam(),
     onViewAllPinnedMessagesClick: () -> Unit = EnsureNeverCalled(),
+    onThreadsListClicked: () -> Unit = EnsureNeverCalled(),
 ) {
+    val emojiPickerRenderer = DefaultEmojiPickerRenderer()
     setSafeContent {
         // Cannot use the RichTextEditor, so simulate a LocalInspectionMode
         CompositionLocalProvider(LocalInspectionMode provides true) {
@@ -639,6 +705,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMessa
                 onBackClick = onBackClick,
                 onRoomDetailsClick = onRoomDetailsClick,
                 onEventContentClick = onEventClick,
+                onGalleryEventItemClick = onGalleryEventItemClick,
                 onUserDataClick = onUserDataClick,
                 onLinkClick = onLinkClick,
                 onSendLocationClick = onSendLocationClick,
@@ -646,6 +713,16 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMessa
                 onJoinCallClick = onJoinCallClick,
                 onViewAllPinnedMessagesClick = onViewAllPinnedMessagesClick,
                 knockRequestsBannerView = {},
+                customReactionBottomSheet = {
+                    CustomReactionBottomSheet(
+                        state = state.customReactionState,
+                        onSelectEmoji = { uniqueId, emoji ->
+                            state.eventSink(MessagesEvent.ToggleReaction(emoji.unicode, uniqueId))
+                        },
+                        emojiPickerRenderer = emojiPickerRenderer,
+                    )
+                },
+                onThreadsListClick = onThreadsListClicked,
             )
         }
     }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
index 7a99ad39aa..fb597df290 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
@@ -17,6 +17,7 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.model.TimelineItemThreadInfo
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
@@ -26,8 +27,10 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemVoiceContent
 import io.element.android.features.poll.api.pollcontent.aPollAnswerItemList
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
@@ -40,7 +43,6 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
-import io.element.android.libraries.recentemojis.api.GetRecentEmojis
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.persistentListOf
@@ -1168,7 +1170,7 @@ class ActionListPresenterTest {
             val initialState = awaitItem()
             val messageEvent = aMessageEvent(
                 isMine = true,
-                content = TimelineItemRtcNotificationContent(),
+                content = TimelineItemRtcNotificationContent(callIntent = CallIntent.VIDEO, state = RtcNotificationState.Started),
             )
             initialState.eventSink.invoke(
                 ActionListEvent.ComputeForMessage(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
index 384b78471d..8370ec516f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
@@ -11,12 +11,19 @@
 package io.element.android.features.messages.impl.attachments
 
 import android.net.Uri
+import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewEvent
 import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewPresenter
 import io.element.android.features.messages.impl.attachments.preview.OnDoneListener
 import io.element.android.features.messages.impl.attachments.preview.SendActionState
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEditor
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.AttachmentImageEdits
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.EditedLocalMedia
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.NormalizedCropRect
+import io.element.android.features.messages.impl.attachments.preview.imageeditor.assertIsSimilarTo
 import io.element.android.features.messages.impl.attachments.video.MediaOptimizationSelectorState
+import io.element.android.features.messages.impl.attachments.video.VideoCompressionPresetSelector
 import io.element.android.features.messages.impl.attachments.video.VideoUploadEstimation
 import io.element.android.features.messages.impl.fixtures.aMediaAttachment
 import io.element.android.features.messages.test.attachments.video.FakeMediaOptimizationSelectorPresenterFactory
@@ -26,6 +33,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
@@ -45,6 +53,7 @@ import io.element.android.libraries.mediaupload.test.FakeMediaOptimizationConfig
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
 import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.test.viewer.aLocalMedia
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
@@ -56,11 +65,13 @@ import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -68,13 +79,11 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import java.io.File
+import kotlin.io.path.createTempFile
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class AttachmentsPreviewPresenterTest {
+class AttachmentsPreviewPresenterTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -85,6 +94,7 @@ class AttachmentsPreviewPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         createAttachmentsPreviewPresenter().test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
         }
@@ -109,13 +119,14 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))
             initialState.eventSink(AttachmentsPreviewEvent.SendAttachment)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = true))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(listOf(mediaUploadInfo)))
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)
             sendFileResult.assertions().isCalledOnce()
             onDoneListener.assertions().isCalledOnce()
@@ -143,6 +154,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             // Pre-processing finishes
@@ -150,8 +162,8 @@ class AttachmentsPreviewPresenterTest {
             advanceUntilIdle()
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))
             initialState.eventSink(AttachmentsPreviewEvent.SendAttachment)
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(listOf(mediaUploadInfo)))
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)
             sendFileResult.assertions().isCalledOnce()
             onDoneListener.assertions().isCalledOnce()
@@ -179,6 +191,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))
@@ -186,8 +199,8 @@ class AttachmentsPreviewPresenterTest {
             // Pre-processing finishes
             processLatch.complete(Unit)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = true))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(listOf(mediaUploadInfo)))
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done)
             sendFileResult.assertions().isCalledOnce()
             onDoneListener.assertions().isCalledOnce()
@@ -208,6 +221,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.eventSink(AttachmentsPreviewEvent.SendAttachment)
@@ -231,6 +245,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             // Pre-processing finishes
@@ -253,6 +268,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.eventSink(AttachmentsPreviewEvent.CancelAndDismiss)
@@ -284,6 +300,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.textEditorState.setMarkdown(A_CAPTION)
@@ -325,6 +342,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.textEditorState.setMarkdown(A_CAPTION)
@@ -366,6 +384,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = { onDoneListener() },
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.textEditorState.setMarkdown(A_CAPTION)
@@ -400,22 +419,19 @@ class AttachmentsPreviewPresenterTest {
         )
         val presenter = createAttachmentsPreviewPresenter(room = room, onDoneListener = onDoneListenerResult)
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.eventSink(AttachmentsPreviewEvent.SendAttachment)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo))
-
-            // Check that the onDoneListener is called so the screen would be dismissed
-            onDoneListenerResult.assertions().isCalledOnce()
-
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(listOf(mediaUploadInfo)))
             val failureState = awaitItem()
-            assertThat(failureState.sendActionState).isEqualTo(SendActionState.Failure(failure, mediaUploadInfo))
+            assertThat(failureState.sendActionState).isEqualTo(SendActionState.Failure(failure, listOf(mediaUploadInfo)))
             sendFileResult.assertions().isCalledOnce()
             failureState.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState)
             val clearedState = awaitLastSequentialItem()
-            assertThat(clearedState.sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
+            assertThat(clearedState.sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
         }
     }
 
@@ -433,19 +449,17 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = onDoneListenerResult,
         )
         presenter.test {
+            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle)
             initialState.eventSink(AttachmentsPreviewEvent.SendAttachment)
             assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(listOf(mediaUploadInfo)))
             initialState.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState)
-            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo))
+            assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(listOf(mediaUploadInfo)))
             // The sending is cancelled and the state is kept at ReadyToUpload
             ensureAllEventsConsumed()
-
-            // Check that the onDoneListener is called so the screen would be dismissed
-            onDoneListenerResult.assertions().isCalledOnce()
         }
     }
 
@@ -457,7 +471,7 @@ class AttachmentsPreviewPresenterTest {
         val maxUploadSize = 999L // Set a max upload size smaller than the file size
 
         val presenter = createAttachmentsPreviewPresenter(
-            localMedia = localMedia,
+            attachments = listOf(Attachment.Media(localMedia)),
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline().apply {
                     sendFileLambda = { _, _, _, _, _ ->
@@ -468,6 +482,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = onDoneListenerResult,
             mediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory {
                 MediaOptimizationSelectorState(
+                    index = 0,
                     // Set a max upload size smaller than the file size
                     maxUploadSize = AsyncData.Success(maxUploadSize),
                     videoSizeEstimations = AsyncData.Uninitialized,
@@ -496,7 +511,7 @@ class AttachmentsPreviewPresenterTest {
         val localMedia = aLocalMedia(uri = Uri.EMPTY, mediaInfo = aVideoMediaInfo())
 
         val presenter = createAttachmentsPreviewPresenter(
-            localMedia = localMedia,
+            attachments = listOf(Attachment.Media(localMedia)),
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline().apply {
                     sendFileLambda = { _, _, _, _, _ ->
@@ -507,6 +522,7 @@ class AttachmentsPreviewPresenterTest {
             onDoneListener = onDoneListenerResult,
             mediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory {
                 MediaOptimizationSelectorState(
+                    index = 0,
                     // Set a max upload size smaller than the file size
                     maxUploadSize = AsyncData.Success(Long.MAX_VALUE),
                     videoSizeEstimations = AsyncData.Success(
@@ -548,9 +564,382 @@ class AttachmentsPreviewPresenterTest {
         }
     }
 
-    private fun TestScope.createAttachmentsPreviewPresenter(
-        localMedia: LocalMedia = aLocalMedia(
+    @Test
+    fun `present - applying image edits updates the attachment`() = runTest {
+        val editedUri = Uri.parse("file:///tmp/edited.jpeg")
+        val presenter = createAttachmentsPreviewPresenter(
+            displayMediaQualitySelectorViews = true,
+            attachmentImageEditor = FakeAttachmentImageEditor {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = aLocalMedia(uri = editedUri),
+                        file = File("/tmp/edited.jpeg"),
+                    )
+                )
+            }
+        )
+
+        presenter.test {
+            skipItems(1)
+            val initialState = awaitItem()
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = awaitItem()
+            assertThat(editorState.imageEditorState).isNotNull()
+
+            editorState.eventSink(AttachmentsPreviewEvent.RotateImageToTheLeft)
+            val rotatedState = awaitItem()
+            assertThat(rotatedState.imageEditorState?.edits?.rotationQuarterTurns).isEqualTo(3)
+
+            rotatedState.eventSink(AttachmentsPreviewEvent.ApplyImageEdits)
+            assertThat(awaitItem().isApplyingImageEdits).isTrue()
+
+            val appliedState = awaitItem()
+            assertThat((appliedState.attachments.first() as Attachment.Media).localMedia.uri).isEqualTo(editedUri)
+            assertThat(appliedState.imageEditorState).isNull()
+            assertThat(appliedState.isApplyingImageEdits).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - reopening image editor keeps original media and previous edits`() = runTest {
+        val editedUri = Uri.parse("file:///tmp/edited.jpeg")
+        val originalLocalMedia = aLocalMedia(uri = mockMediaUrl)
+        val cropRect = NormalizedCropRect(
+            left = 0.2f,
+            top = 0.15f,
+            right = 0.85f,
+            bottom = 0.9f,
+        )
+        val presenter = createAttachmentsPreviewPresenter(
+            attachments = listOf(Attachment.Media(originalLocalMedia)),
+            displayMediaQualitySelectorViews = true,
+            attachmentImageEditor = FakeAttachmentImageEditor {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = aLocalMedia(uri = editedUri),
+                        file = File("/tmp/edited.jpeg"),
+                    )
+                )
+            }
+        )
+
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+
+            editorState.eventSink(AttachmentsPreviewEvent.UpdateImageCropRect(cropRect))
+            val croppedState = awaitItem()
+            croppedState.eventSink(AttachmentsPreviewEvent.RotateImageToTheLeft)
+            val rotatedState = awaitItem()
+            rotatedState.eventSink(AttachmentsPreviewEvent.FlipImageHorizontally)
+            val flippedHorizontallyState = awaitItem()
+            flippedHorizontallyState.eventSink(AttachmentsPreviewEvent.FlipImageVertically)
+            val flippedState = awaitItem()
+            flippedState.eventSink(AttachmentsPreviewEvent.ApplyImageEdits)
+
+            val appliedState = consumeItemsUntilPredicate { !it.isApplyingImageEdits && it.imageEditorState == null }.last()
+            assertThat((appliedState.attachments.first() as Attachment.Media).localMedia.uri).isEqualTo(editedUri)
+
+            appliedState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val reopenedState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+            assertThat(reopenedState.imageEditorState!!.localMedia.uri).isEqualTo(originalLocalMedia.uri)
+            val rotatedCropRect = NormalizedCropRect(
+                left = cropRect.top,
+                top = 1f - cropRect.right,
+                right = cropRect.bottom,
+                bottom = 1f - cropRect.left,
+            )
+            val flippedCropRect = NormalizedCropRect(
+                left = 1f - rotatedCropRect.right,
+                top = 1f - rotatedCropRect.bottom,
+                right = 1f - rotatedCropRect.left,
+                bottom = 1f - rotatedCropRect.top,
+            )
+            reopenedState.imageEditorState.edits.cropRect.assertIsSimilarTo(flippedCropRect)
+            assertThat(reopenedState.imageEditorState.edits.rotationQuarterTurns).isEqualTo(3)
+            assertThat(reopenedState.imageEditorState.edits.rotationDegrees).isEqualTo(270)
+            assertThat(reopenedState.imageEditorState.edits.isFlippedHorizontally).isTrue()
+            assertThat(reopenedState.imageEditorState.edits.isFlippedVertically).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - image editor flip events update edits`() = runTest {
+        val presenter = createAttachmentsPreviewPresenter(displayMediaQualitySelectorViews = true)
+
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+
+            editorState.eventSink(AttachmentsPreviewEvent.FlipImageHorizontally)
+            val flippedHorizontallyState = awaitItem()
+            assertThat(flippedHorizontallyState.imageEditorState?.edits?.isFlippedHorizontally).isTrue()
+
+            flippedHorizontallyState.eventSink(AttachmentsPreviewEvent.FlipImageVertically)
+            val flippedState = awaitItem()
+            assertThat(flippedState.imageEditorState?.edits?.isFlippedVertically).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - sendAsFile attachment is pre-processed without image compression`() = runTest {
+        // Even though the user has enabled "Optimize media quality" globally, picking the file
+        // through the Files picker (sendAsFile = true) must skip compression. Regression test
+        // for https://github.com/element-hq/element-x-android/issues/6365
+        val mediaPreProcessor = FakeMediaPreProcessor()
+        val presenter = createAttachmentsPreviewPresenter(
+            attachments = listOf(
+                Attachment.Media(
+                    localMedia = aLocalMedia(mockMediaUrl, anImageMediaInfo()),
+                    sendAsFile = true,
+                )
+            ),
+            mediaPreProcessor = mediaPreProcessor,
+            // Selector views are hidden in the sendAsFile flow, which triggers the auto pre-process path.
+            displayMediaQualitySelectorViews = false,
+            mediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(
+                config = MediaOptimizationConfig(
+                    compressImages = false,
+                    videoCompressionPreset = VideoCompressionPreset.HIGH,
+                )
+            ),
+        )
+
+        presenter.test {
+            consumeItemsUntilPredicate { mediaPreProcessor.processCallCount > 0 }
+            assertThat(mediaPreProcessor.lastMediaOptimizationConfig).isEqualTo(
+                MediaOptimizationConfig(
+                    compressImages = false,
+                    videoCompressionPreset = VideoCompressionPreset.HIGH,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - sending edited media keeps the edited file available until upload starts`() = runTest {
+        val editedFile = createTempFile(suffix = ".jpeg").toFile().apply {
+            writeText("edited-media")
+        }
+        val sendFileResult =
+            lambdaRecorder<File, FileInfo, String?, String?, EventId?, Result<FakeMediaUploadHandler>> { file, _, _, _, _ ->
+                assertThat(file.exists()).isTrue()
+                Result.success(FakeMediaUploadHandler())
+            }
+        val room = FakeJoinedRoom(
+            liveTimeline = FakeTimeline().apply {
+                sendFileLambda = sendFileResult
+            },
+        )
+        val presenter = createAttachmentsPreviewPresenter(
+            room = room,
+            displayMediaQualitySelectorViews = true,
+            onDoneListener = OnDoneListener {},
+            mediaPreProcessor = FakeMediaPreProcessor().apply {
+                givenResult(
+                    Result.success(
+                        MediaUploadInfo.AnyFile(
+                            file = editedFile,
+                            fileInfo = FileInfo(
+                                mimetype = MimeTypes.Jpeg,
+                                size = editedFile.length(),
+                                thumbnailInfo = null,
+                                thumbnailSource = null,
+                            )
+                        )
+                    )
+                )
+            },
+            attachmentImageEditor = FakeAttachmentImageEditor {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = aLocalMedia(uri = editedFile.toUri()),
+                        file = editedFile,
+                    )
+                )
+            }
+        )
+
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+
+            editorState.eventSink(AttachmentsPreviewEvent.ApplyImageEdits)
+            val appliedState = consumeItemsUntilPredicate { !it.isApplyingImageEdits && it.imageEditorState == null }.last()
+
+            appliedState.eventSink(AttachmentsPreviewEvent.SendAttachment)
+            consumeItemsUntilPredicate { it.sendActionState == SendActionState.Done }
+
+            sendFileResult.assertions().isCalledOnce()
+        }
+    }
+
+    @Test
+    fun `present - image with generic mime type and png extension is still editable`() = runTest {
+        val localMedia = aLocalMedia(
             uri = mockMediaUrl,
+            mediaInfo = anImageMediaInfo().copy(
+                mimeType = MimeTypes.OctetStream,
+                filename = "Screenshot.png",
+                fileExtension = "png",
+            ),
+        )
+        val presenter = createAttachmentsPreviewPresenter(
+            attachments = listOf(Attachment.Media(localMedia)),
+        )
+        presenter.test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.canEditImage).isTrue()
+
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+            assertThat(editorState.imageEditorState).isNotNull()
+        }
+    }
+
+    @Test
+    fun `present - image can still be edited when editor can decode it despite generic media info`() = runTest {
+        val localMedia = aLocalMedia(
+            uri = mockMediaUrl,
+            mediaInfo = anImageMediaInfo().copy(
+                mimeType = MimeTypes.OctetStream,
+                filename = "",
+                fileExtension = "",
+            ),
+        )
+        val presenter = createAttachmentsPreviewPresenter(
+            attachments = listOf(Attachment.Media(localMedia)),
+            attachmentImageEditor = FakeAttachmentImageEditor(
+                canEditResult = true,
+            ) {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = localMedia.copy(uri = Uri.parse("file:///tmp/decoded.jpeg")),
+                        file = File("/tmp/decoded.jpeg"),
+                    )
+                )
+            }
+        )
+
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate { it.canEditImage }.last()
+            assertThat(initialState.canEditImage).isTrue()
+
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+            assertThat(editorState.imageEditorState).isNotNull()
+        }
+    }
+
+    @Test
+    fun `present - sendAsFile video is pre-processed with best fitting preset`() = runTest {
+        val mediaPreProcessor = FakeMediaPreProcessor()
+        val presenter = createAttachmentsPreviewPresenter(
+            attachments = listOf(
+                Attachment.Media(
+                    localMedia = aLocalMedia(mockMediaUrl, aVideoMediaInfo()),
+                    sendAsFile = true,
+                )
+            ),
+            mediaPreProcessor = mediaPreProcessor,
+            // Selector views are hidden in the sendAsFile flow, which triggers the auto pre-process path.
+            displayMediaQualitySelectorViews = false,
+            mediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory {
+                MediaOptimizationSelectorState(
+                    index = 0,
+                    maxUploadSize = AsyncData.Success(250_000_000L),
+                    videoSizeEstimations = AsyncData.Success(
+                        persistentListOf(
+                            VideoUploadEstimation(VideoCompressionPreset.HIGH, sizeInBytes = 513_216_000L, canUpload = false),
+                            VideoUploadEstimation(VideoCompressionPreset.STANDARD, sizeInBytes = 228_096_000L, canUpload = true),
+                            VideoUploadEstimation(VideoCompressionPreset.LOW, sizeInBytes = 57_024_000L, canUpload = true),
+                        )
+                    ),
+                    isImageOptimizationEnabled = false,
+                    selectedVideoPreset = VideoCompressionPreset.STANDARD,
+                    displayMediaSelectorViews = false,
+                    displayVideoPresetSelectorDialog = false,
+                    eventSink = {},
+                )
+            },
+            mediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(
+                config = MediaOptimizationConfig(
+                    compressImages = true,
+                    videoCompressionPreset = VideoCompressionPreset.LOW,
+                )
+            ),
+        )
+
+        presenter.test {
+            consumeItemsUntilPredicate { mediaPreProcessor.processCallCount > 0 }
+            assertThat(mediaPreProcessor.lastMediaOptimizationConfig).isEqualTo(
+                MediaOptimizationConfig(
+                    compressImages = false,
+                    videoCompressionPreset = VideoCompressionPreset.STANDARD,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - sending gallery after image edits restarts preprocessing`() = runTest {
+        val sendGalleryResult =
+            lambdaRecorder<List<GalleryItemInfo>, String?, String?, EventId?, Result<FakeMediaUploadHandler>> { _, _, _, _ ->
+                Result.success(FakeMediaUploadHandler())
+            }
+        val firstLocalMedia = aLocalMedia(uri = Uri.parse("file:///tmp/original-1.jpeg"))
+        val secondLocalMedia = aLocalMedia(uri = Uri.parse("file:///tmp/original-2.jpeg"))
+        val editedUri = Uri.parse("file:///tmp/edited-1.jpeg")
+        val onDoneListener = lambdaRecorder<Unit> { }
+        val presenter = createAttachmentsPreviewPresenter(
+            room = FakeJoinedRoom(
+                liveTimeline = FakeTimeline().apply {
+                    sendGalleryLambda = sendGalleryResult
+                },
+            ),
+            attachments = persistentListOf(
+                aMediaAttachment(firstLocalMedia),
+                aMediaAttachment(secondLocalMedia),
+            ),
+            displayMediaQualitySelectorViews = false,
+            attachmentImageEditor = FakeAttachmentImageEditor {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = firstLocalMedia.copy(uri = editedUri),
+                        file = File("/tmp/edited-1.jpeg"),
+                    )
+                )
+            },
+            onDoneListener = OnDoneListener { onDoneListener() },
+        )
+
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(AttachmentsPreviewEvent.OpenImageEditor)
+            val editorState = consumeItemsUntilPredicate { it.imageEditorState != null }.last()
+
+            editorState.eventSink(AttachmentsPreviewEvent.ApplyImageEdits)
+            val appliedState = consumeItemsUntilPredicate { !it.isApplyingImageEdits && it.imageEditorState == null }.last()
+
+            appliedState.eventSink(AttachmentsPreviewEvent.SendAttachment)
+            consumeItemsUntilPredicate { it.sendActionState == SendActionState.Done }
+
+            sendGalleryResult.assertions().isCalledOnce()
+            onDoneListener.assertions().isCalledOnce()
+        }
+    }
+
+    private fun TestScope.createAttachmentsPreviewPresenter(
+        attachments: List<Attachment> = listOf(
+            aMediaAttachment(
+                aLocalMedia(
+                    uri = mockMediaUrl,
+                )
+            ),
         ),
         room: JoinedRoom = FakeJoinedRoom(),
         timelineMode: Timeline.Mode = Timeline.Mode.Live,
@@ -562,6 +951,7 @@ class AttachmentsPreviewPresenterTest {
         mediaOptimizationSelectorPresenterFactory: FakeMediaOptimizationSelectorPresenterFactory = FakeMediaOptimizationSelectorPresenterFactory(
             fakePresenter = {
                 MediaOptimizationSelectorState(
+                    index = 0,
                     maxUploadSize = AsyncData.Uninitialized,
                     videoSizeEstimations = AsyncData.Uninitialized,
                     isImageOptimizationEnabled = null,
@@ -573,9 +963,23 @@ class AttachmentsPreviewPresenterTest {
             }
         ),
         mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+        attachmentImageEditor: AttachmentImageEditor = FakeAttachmentImageEditor {
+            val localMediaResult = (attachments.first() as? Attachment.Media)?.localMedia?.copy(uri = Uri.parse("file:///tmp/default-edited.jpeg"))
+            if (localMediaResult != null) {
+                Result.success(
+                    EditedLocalMedia(
+                        localMedia = localMediaResult,
+                        file = File("/tmp/default-edited.jpeg"),
+                    )
+                )
+            } else {
+                Result.failure(IllegalStateException("Check test values"))
+            }
+        },
+        videoCompressionPresetSelector: VideoCompressionPresetSelector = VideoCompressionPresetSelector(),
     ): AttachmentsPreviewPresenter {
         return AttachmentsPreviewPresenter(
-            attachment = aMediaAttachment(localMedia),
+            attachments = attachments.toImmutableList(),
             onDoneListener = onDoneListener,
             mediaSenderFactory = MediaSenderFactory { timelineMode ->
                 DefaultMediaSender(
@@ -589,15 +993,33 @@ class AttachmentsPreviewPresenterTest {
             },
             permalinkBuilder = permalinkBuilder,
             temporaryUriDeleter = temporaryUriDeleter,
+            attachmentImageEditor = attachmentImageEditor,
             sessionCoroutineScope = this,
             dispatchers = testCoroutineDispatchers(),
             mediaOptimizationSelectorPresenterFactory = mediaOptimizationSelectorPresenterFactory,
+            videoCompressionPresetSelector = videoCompressionPresetSelector,
             timelineMode = timelineMode,
             inReplyToEventId = null,
             mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
         )
     }
 
+    private class FakeAttachmentImageEditor(
+        private val canEditResult: Boolean = true,
+        private val result: () -> Result<EditedLocalMedia>,
+    ) : AttachmentImageEditor {
+        override suspend fun canEdit(localMedia: LocalMedia): Boolean {
+            return canEditResult
+        }
+
+        override suspend fun exportEdits(
+            localMedia: LocalMedia,
+            edits: AttachmentImageEdits,
+        ): Result<EditedLocalMedia> {
+            return result()
+        }
+    }
+
     private val mediaUploadInfo = MediaUploadInfo.AnyFile(
         File("test"),
         FileInfo(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/SendActionStateTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/SendActionStateTest.kt
index 208d9cc7c0..b0bc755af8 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/SendActionStateTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/SendActionStateTest.kt
@@ -11,28 +11,27 @@ package io.element.android.features.messages.impl.attachments
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.attachments.preview.SendActionState
 import io.element.android.features.messages.impl.attachments.preview.aMediaUploadInfo
-import io.element.android.libraries.mediaupload.api.MediaUploadInfo
 import org.junit.Test
 
 class SendActionStateTest {
     @Test
-    fun `mediaUploadInfo() should return the value from Uploading class`() {
-        val mediaUploadInfo: MediaUploadInfo = aMediaUploadInfo()
-        val state: SendActionState = SendActionState.Sending.Uploading(mediaUploadInfo = aMediaUploadInfo())
-        assertThat(state.mediaUploadInfo()).isEqualTo(mediaUploadInfo)
+    fun `mediaUploadInfoList() should return the value from Uploading class`() {
+        val data = listOf(aMediaUploadInfo())
+        val state: SendActionState = SendActionState.Sending.Uploading(mediaInfos = data)
+        assertThat(state.mediaUploadInfoList()).isEqualTo(data)
     }
 
     @Test
-    fun `mediaUploadInfo() should return the value from ReadyToUpload class`() {
-        val mediaUploadInfo: MediaUploadInfo = aMediaUploadInfo()
-        val state: SendActionState = SendActionState.Sending.ReadyToUpload(mediaInfo = aMediaUploadInfo())
-        assertThat(state.mediaUploadInfo()).isEqualTo(mediaUploadInfo)
+    fun `mediaUploadInfoList() should return the value from ReadyToUpload class`() {
+        val data = listOf(aMediaUploadInfo())
+        val state: SendActionState = SendActionState.Sending.ReadyToUpload(mediaInfos = data)
+        assertThat(state.mediaUploadInfoList()).isEqualTo(data)
     }
 
     @Test
-    fun `mediaUploadInfo() should return the value from Failure class`() {
-        val mediaUploadInfo: MediaUploadInfo = aMediaUploadInfo()
-        val state: SendActionState = SendActionState.Failure(error = IllegalStateException("An error"), mediaUploadInfo = aMediaUploadInfo())
-        assertThat(state.mediaUploadInfo()).isEqualTo(mediaUploadInfo)
+    fun `mediaUploadInfoList() should return the value from Failure class`() {
+        val data = listOf(aMediaUploadInfo())
+        val state: SendActionState = SendActionState.Failure(error = IllegalStateException("An error"), mediaInfos = data)
+        assertThat(state.mediaUploadInfoList()).isEqualTo(data)
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditsTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditsTest.kt
new file mode 100644
index 0000000000..eb989967ef
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/AttachmentImageEditsTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class AttachmentImageEditsTest {
+    @Test
+    fun `rotate normalizes after a full turn`() {
+        var edits = AttachmentImageEdits()
+        repeat(4) {
+            edits = edits.rotateAntiClockwise()
+        }
+        assertThat(edits.normalizedRotationQuarterTurns).isEqualTo(0)
+        assertThat(edits.rotationDegrees).isEqualTo(0)
+        assertThat(edits.hasChanges).isFalse()
+    }
+
+    @Test
+    fun `rotate updates rotation and crop`() {
+        val sut = AttachmentImageEdits(
+            cropRect = NormalizedCropRect(
+                left = 0.2f,
+                top = 0.3f,
+                right = 0.8f,
+                bottom = 0.9f,
+            ),
+            rotationQuarterTurns = 0,
+        )
+        val result = sut.rotateAntiClockwise()
+        assertThat(result.normalizedRotationQuarterTurns).isEqualTo(3)
+        assertThat(result.rotationDegrees).isEqualTo(270)
+        assertThat(result.cropRect.left).isWithin(0.0001f).of(0.3f)
+        assertThat(result.cropRect.top).isWithin(0.0001f).of(0.2f)
+        assertThat(result.cropRect.right).isWithin(0.0001f).of(0.9f)
+        assertThat(result.cropRect.bottom).isWithin(0.0001f).of(0.8f)
+        assertThat(result.hasChanges).isTrue()
+    }
+
+    @Test
+    fun `flip horizontally updates crop and change tracking`() {
+        val sut = AttachmentImageEdits(
+            cropRect = NormalizedCropRect(
+                left = 0.1f,
+                top = 0.3f,
+                right = 0.6f,
+                bottom = 0.9f,
+            )
+        )
+        val result = sut.flipHorizontally()
+        assertThat(result.isFlippedHorizontally).isTrue()
+        assertThat(result.cropRect.left).isWithin(0.0001f).of(0.4f)
+        assertThat(result.cropRect.right).isWithin(0.0001f).of(0.9f)
+        assertThat(result.cropRect.top).isWithin(0.0001f).of(0.3f)
+        assertThat(result.cropRect.bottom).isWithin(0.0001f).of(0.9f)
+        assertThat(result.hasChanges).isTrue()
+    }
+
+    @Test
+    fun `flip vertical twice resets to default state`() {
+        val edits = AttachmentImageEdits().flipVertically().flipVertically()
+        assertThat(edits.isFlippedVertically).isFalse()
+        assertThat(edits.hasChanges).isFalse()
+    }
+
+    @Test
+    fun `flip horizontally twice resets to default state`() {
+        val edits = AttachmentImageEdits().flipHorizontally().flipHorizontally()
+        assertThat(edits.isFlippedVertically).isFalse()
+        assertThat(edits.hasChanges).isFalse()
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/DefaultAttachmentImageEditorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/DefaultAttachmentImageEditorTest.kt
new file mode 100644
index 0000000000..f9db4f35f9
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/DefaultAttachmentImageEditorTest.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.core.mimetype.MimeTypes
+import org.junit.Test
+
+class DefaultAttachmentImageEditorTest {
+    @Test
+    fun `exported mime type preserves png`() {
+        assertThat(exportedMimeTypeFor(MimeTypes.Png)).isEqualTo(MimeTypes.Png)
+    }
+
+    @Test
+    fun `exported mime type normalizes non-png images to jpeg`() {
+        assertThat(exportedMimeTypeFor("image/heic")).isEqualTo(MimeTypes.Jpeg)
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/NormalizedCropRectTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/NormalizedCropRectTest.kt
new file mode 100644
index 0000000000..c70c6169e1
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/preview/imageeditor/NormalizedCropRectTest.kt
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.preview.imageeditor
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class NormalizedCropRectTest {
+    private val rect = NormalizedCropRect(
+        left = 0.1f,
+        top = 0.2f,
+        right = 0.7f,
+        bottom = 0.8f,
+    )
+
+    @Test
+    fun `applyChange with top handle only updates the top edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Edge.Top,
+            deltaX = 0.3f,
+            deltaY = 0.1f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = rect.left,
+                top = 0.3f,
+                right = rect.right,
+                bottom = rect.bottom,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with left handle only updates the left edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Edge.Left,
+            deltaX = 0.1f,
+            deltaY = 0.3f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = 0.2f,
+                top = rect.top,
+                right = rect.right,
+                bottom = rect.bottom,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with right handle only updates the right edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Edge.Right,
+            deltaX = -0.1f,
+            deltaY = 0.3f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = rect.left,
+                top = rect.top,
+                right = 0.6f,
+                bottom = rect.bottom,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with bottom handle target only updates the bottem edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Edge.Bottom,
+            deltaX = -0.1f,
+            deltaY = -0.3f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = rect.left,
+                top = rect.top,
+                right = rect.right,
+                bottom = 0.5f,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with top left handle updates the top and left bottem edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Corner.TopLeft,
+            deltaX = 0.1f,
+            deltaY = 0.1f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = 0.2f,
+                top = 0.3f,
+                right = rect.right,
+                bottom = rect.bottom,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with top right handle updates the top and right bottem edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Corner.TopRight,
+            deltaX = -0.1f,
+            deltaY = 0.1f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = rect.left,
+                top = 0.3f,
+                right = 0.6f,
+                bottom = rect.bottom,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with bottom left handle updates the bottom and left bottem edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Corner.BottomLeft,
+            deltaX = 0.1f,
+            deltaY = -0.1f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = 0.2f,
+                top = rect.top,
+                right = rect.right,
+                bottom = 0.7f,
+            )
+        )
+    }
+
+    @Test
+    fun `applyChange with bottom right handle updates the bottom and right bottem edge`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Corner.BottomRight,
+            deltaX = -0.1f,
+            deltaY = -0.1f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = rect.left,
+                top = rect.top,
+                right = 0.6f,
+                bottom = 0.7f,
+            )
+        )
+    }
+
+    @Test
+    fun `translate keeps the crop rect inside bounds`() {
+        val result = rect.applyChange(
+            dragTarget = CropDragTarget.Move,
+            deltaX = 0.6f,
+            deltaY = 0.6f,
+        )
+        result.assertIsSimilarTo(
+            NormalizedCropRect(
+                left = 0.4f,
+                top = 0.4f,
+                right = 1.0f,
+                bottom = 1.0f,
+            )
+        )
+    }
+}
+
+internal fun NormalizedCropRect.assertIsSimilarTo(expectedResult: NormalizedCropRect) {
+    assertThat(left).isWithin(0.0001f).of(expectedResult.left)
+    assertThat(top).isWithin(0.0001f).of(expectedResult.top)
+    assertThat(right).isWithin(0.0001f).of(expectedResult.right)
+    assertThat(bottom).isWithin(0.0001f).of(expectedResult.bottom)
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenterTest.kt
index 106fff7375..83c5c5f575 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/DefaultMediaOptimizationSelectorPresenterTest.kt
@@ -10,7 +10,6 @@ package io.element.android.features.messages.impl.attachments.video
 
 import android.net.Uri
 import android.util.Size
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.test.attachments.video.FakeVideoMetadataExtractor
 import io.element.android.features.messages.test.attachments.video.FakeVideoMetadataExtractorFactory
@@ -26,16 +25,15 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.test.viewer.aLocalMedia
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.test
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.time.Duration.Companion.minutes
 
-@RunWith(AndroidJUnit4::class)
-class DefaultMediaOptimizationSelectorPresenterTest {
+class DefaultMediaOptimizationSelectorPresenterTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -210,19 +208,90 @@ class DefaultMediaOptimizationSelectorPresenterTest {
         }
     }
 
+    @Test
+    fun `present - sendAsFile hides selector views and disables image compression for images`() = runTest {
+        val presenter = createDefaultMediaOptimizationSelectorPresenter(
+            localMedia = aLocalMedia(mockMediaUrl, anImageMediaInfo()),
+            // Even with the feature flag on, sendAsFile must hide the selector.
+            featureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SelectableMediaQuality.key to true)),
+            // And it must override the user's "optimize images" preference.
+            mediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+            sendAsFile = true,
+        )
+        presenter.test {
+            // Initial loading state
+            skipItems(1)
+            awaitItem().run {
+                assertThat(displayMediaSelectorViews).isFalse()
+                assertThat(isImageOptimizationEnabled).isFalse()
+            }
+        }
+    }
+
+    @Test
+    fun `present - sendAsFile picks HIGH video preset when the video fits the upload limit`() = runTest {
+        val presenter = createDefaultMediaOptimizationSelectorPresenter(
+            // Plenty of room: even HIGH preset will fit.
+            maxUploadSizeProvider = MaxUploadSizeProvider { Result.success(Long.MAX_VALUE) },
+            mediaExtractorFactory = FakeVideoMetadataExtractorFactory(
+                FakeVideoMetadataExtractor(
+                    sizeResult = Result.success(Size(1920, 1080)),
+                    duration = Result.success(10.minutes)
+                )
+            ),
+            sendAsFile = true,
+        )
+        presenter.test {
+            // Initial loading state, then the one with size estimations loaded.
+            skipItems(1)
+            awaitItem().run {
+                assertThat(displayMediaSelectorViews).isFalse()
+                assertThat(selectedVideoPreset).isEqualTo(VideoCompressionPreset.HIGH)
+            }
+        }
+    }
+
+    @Test
+    fun `present - sendAsFile picks lower video preset when HIGH exceeds the upload limit`() = runTest {
+        val presenter = createDefaultMediaOptimizationSelectorPresenter(
+            maxUploadSizeProvider = MaxUploadSizeProvider { Result.success(250_000_000L) },
+            mediaExtractorFactory = FakeVideoMetadataExtractorFactory(
+                FakeVideoMetadataExtractor(
+                    sizeResult = Result.success(Size(1920, 1080)),
+                    duration = Result.success(10.minutes)
+                )
+            ),
+            sendAsFile = true,
+        )
+        presenter.test {
+            // Initial loading state, then the one with size estimations loaded.
+            skipItems(1)
+            awaitItem().run {
+                assertThat(displayMediaSelectorViews).isFalse()
+                assertThat(selectedVideoPreset).isEqualTo(VideoCompressionPreset.STANDARD)
+            }
+        }
+    }
+
     private fun createDefaultMediaOptimizationSelectorPresenter(
+        index: Int = 0,
         localMedia: LocalMedia = aLocalMedia(mockMediaUrl, aVideoMediaInfo()),
         maxUploadSizeProvider: MaxUploadSizeProvider = MaxUploadSizeProvider { Result.success(1_000L) },
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(mapOf(FeatureFlags.SelectableMediaQuality.key to true)),
         mediaExtractorFactory: FakeVideoMetadataExtractorFactory = FakeVideoMetadataExtractorFactory(),
         mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+        videoCompressionPresetSelector: VideoCompressionPresetSelector = VideoCompressionPresetSelector(),
+        sendAsFile: Boolean = false,
     ): DefaultMediaOptimizationSelectorPresenter {
         return DefaultMediaOptimizationSelectorPresenter(
+            index = index,
             localMedia = localMedia,
+            sendAsFile = sendAsFile,
             maxUploadSizeProvider = maxUploadSizeProvider,
             featureFlagService = featureFlagService,
             mediaExtractorFactory = mediaExtractorFactory,
             mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
+            videoCompressionPresetSelector = videoCompressionPresetSelector,
         )
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelectorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelectorTest.kt
new file mode 100644
index 0000000000..d3864794c2
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/video/VideoCompressionPresetSelectorTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.attachments.video
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
+import kotlinx.collections.immutable.persistentListOf
+import org.junit.Test
+
+class VideoCompressionPresetSelectorTest {
+    private val selector = VideoCompressionPresetSelector()
+
+    @Test
+    fun `selectBestVideoPreset - returns expected preset when it can upload`() {
+        val result = selector.selectBestVideoPreset(
+            expectedVideoPreset = VideoCompressionPreset.HIGH,
+            videoSizeEstimations = AsyncData.Success(
+                persistentListOf(
+                    VideoUploadEstimation(VideoCompressionPreset.HIGH, sizeInBytes = 100, canUpload = true),
+                    VideoUploadEstimation(VideoCompressionPreset.STANDARD, sizeInBytes = 50, canUpload = true),
+                    VideoUploadEstimation(VideoCompressionPreset.LOW, sizeInBytes = 25, canUpload = true),
+                )
+            )
+        )
+
+        assertThat(result.dataOrNull()).isEqualTo(VideoCompressionPreset.HIGH)
+    }
+
+    @Test
+    fun `selectBestVideoPreset - falls back to the highest fitting preset`() {
+        val result = selector.selectBestVideoPreset(
+            expectedVideoPreset = VideoCompressionPreset.HIGH,
+            videoSizeEstimations = AsyncData.Success(
+                persistentListOf(
+                    VideoUploadEstimation(VideoCompressionPreset.HIGH, sizeInBytes = 100, canUpload = false),
+                    VideoUploadEstimation(VideoCompressionPreset.STANDARD, sizeInBytes = 50, canUpload = true),
+                    VideoUploadEstimation(VideoCompressionPreset.LOW, sizeInBytes = 25, canUpload = true),
+                )
+            )
+        )
+
+        assertThat(result.dataOrNull()).isEqualTo(VideoCompressionPreset.STANDARD)
+    }
+
+    @Test
+    fun `selectBestVideoPreset - starts from the expected preset`() {
+        val result = selector.selectBestVideoPreset(
+            expectedVideoPreset = VideoCompressionPreset.STANDARD,
+            videoSizeEstimations = AsyncData.Success(
+                persistentListOf(
+                    VideoUploadEstimation(VideoCompressionPreset.HIGH, sizeInBytes = 100, canUpload = true),
+                    VideoUploadEstimation(VideoCompressionPreset.STANDARD, sizeInBytes = 50, canUpload = true),
+                    VideoUploadEstimation(VideoCompressionPreset.LOW, sizeInBytes = 25, canUpload = true),
+                )
+            )
+        )
+
+        assertThat(result.dataOrNull()).isEqualTo(VideoCompressionPreset.STANDARD)
+    }
+
+    @Test
+    fun `selectBestVideoPreset - returns failure when no preset can upload`() {
+        val result = selector.selectBestVideoPreset(
+            expectedVideoPreset = VideoCompressionPreset.HIGH,
+            videoSizeEstimations = AsyncData.Success(
+                persistentListOf(
+                    VideoUploadEstimation(VideoCompressionPreset.HIGH, sizeInBytes = 100, canUpload = false),
+                    VideoUploadEstimation(VideoCompressionPreset.STANDARD, sizeInBytes = 50, canUpload = false),
+                    VideoUploadEstimation(VideoCompressionPreset.LOW, sizeInBytes = 25, canUpload = false),
+                )
+            )
+        )
+
+        assertThat(result).isInstanceOf(AsyncData.Failure::class.java)
+    }
+
+    @Test
+    fun `selectBestVideoPreset - returns loading while estimations are missing`() {
+        val result = selector.selectBestVideoPreset(
+            expectedVideoPreset = VideoCompressionPreset.HIGH,
+            videoSizeEstimations = AsyncData.Loading(),
+        )
+
+        assertThat(result).isInstanceOf(AsyncData.Loading::class.java)
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt
index 24779ba78a..4d29f10a57 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt
@@ -6,13 +6,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.crypto.identity
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
@@ -21,19 +23,14 @@ import io.element.android.libraries.matrix.ui.room.RoomMemberIdentityStateChange
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class IdentityChangeStateViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class IdentityChangeStateViewTest : RobolectricTest() {
     @Test
-    fun `show and resolve pin violation`() {
+    fun `show and resolve pin violation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IdentityChangeEvent>()
-        rule.setIdentityChangeStateView(
+        setIdentityChangeStateView(
             state = anIdentityChangeState(
                 listOf(
                     RoomMemberIdentityStateChange(
@@ -45,18 +42,18 @@ class IdentityChangeStateViewTest {
             ),
         )
 
-        rule.onNodeWithText("identity was reset", substring = true).assertExists("should display pin violation warning")
-        rule.onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")
-        rule.onNodeWithText("Alice", substring = true).assertExists("should display user displayname")
+        onNodeWithText("identity was reset", substring = true).assertExists("should display pin violation warning")
+        onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")
+        onNodeWithText("Alice", substring = true).assertExists("should display user displayname")
 
-        rule.clickOn(res = CommonStrings.action_dismiss)
+        clickOn(res = CommonStrings.action_dismiss)
         eventsRecorder.assertSingle(IdentityChangeEvent.PinIdentity(UserId("@alice:localhost")))
     }
 
     @Test
-    fun `show and resolve verification violation`() {
+    fun `show and resolve verification violation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IdentityChangeEvent>()
-        rule.setIdentityChangeStateView(
+        setIdentityChangeStateView(
             state = anIdentityChangeState(
                 listOf(
                     RoomMemberIdentityStateChange(
@@ -68,17 +65,17 @@ class IdentityChangeStateViewTest {
             ),
         )
 
-        rule.onNodeWithText("identity was reset", substring = true).assertExists("should display verification violation warning")
-        rule.onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")
-        rule.onNodeWithText("Alice", substring = true).assertExists("should display user displayname")
+        onNodeWithText("identity was reset", substring = true).assertExists("should display verification violation warning")
+        onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")
+        onNodeWithText("Alice", substring = true).assertExists("should display user displayname")
 
-        rule.clickOn(res = CommonStrings.crypto_identity_change_withdraw_verification_action)
+        clickOn(res = CommonStrings.crypto_identity_change_withdraw_verification_action)
         eventsRecorder.assertSingle(IdentityChangeEvent.WithdrawVerification(UserId("@alice:localhost")))
     }
 
     @Test
-    fun `Should not show any banner if no violations`() {
-        rule.setIdentityChangeStateView(
+    fun `Should not show any banner if no violations`() = runAndroidComposeUiTest {
+        setIdentityChangeStateView(
             state = anIdentityChangeState(
                 listOf(
                     RoomMemberIdentityStateChange(
@@ -93,10 +90,10 @@ class IdentityChangeStateViewTest {
             ),
         )
 
-        rule.onNodeWithText("identity was reset", substring = true).assertDoesNotExist()
+        onNodeWithText("identity was reset", substring = true).assertDoesNotExist()
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setIdentityChangeStateView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setIdentityChangeStateView(
         state: IdentityChangeState,
     ) {
         setContent {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureViewTest.kt
index 02767fbeb9..6fe01bb281 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureViewTest.kt
@@ -6,54 +6,51 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.crypto.sendfailure.resolve
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ResolveVerifiedUserSendFailureViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ResolveVerifiedUserSendFailureViewTest : RobolectricTest() {
     @Test
-    fun `clicking on resolve and resend emit the expected event`() {
+    fun `clicking on resolve and resend emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResolveVerifiedUserSendFailureEvent>()
-        rule.setResolveVerifiedUserSendFailureView(
+        setResolveVerifiedUserSendFailureView(
             state = aResolveVerifiedUserSendFailureState(
                 verifiedUserSendFailure = aChangedIdentitySendFailure(),
                 eventSink = eventsRecorder,
             ),
         )
 
-        rule.clickOn(res = CommonStrings.screen_resolve_send_failure_changed_identity_primary_button_title)
+        clickOn(res = CommonStrings.screen_resolve_send_failure_changed_identity_primary_button_title)
         eventsRecorder.assertSingle(ResolveVerifiedUserSendFailureEvent.ResolveAndResend)
     }
 
     @Test
-    fun `clicking on retry emit the expected event`() {
+    fun `clicking on retry emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResolveVerifiedUserSendFailureEvent>()
-        rule.setResolveVerifiedUserSendFailureView(
+        setResolveVerifiedUserSendFailureView(
             state = aResolveVerifiedUserSendFailureState(
                 verifiedUserSendFailure = aChangedIdentitySendFailure(),
                 eventSink = eventsRecorder,
             ),
         )
 
-        rule.clickOn(res = CommonStrings.action_retry)
+        clickOn(res = CommonStrings.action_retry)
         eventsRecorder.assertSingle(ResolveVerifiedUserSendFailureEvent.Retry)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setResolveVerifiedUserSendFailureView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setResolveVerifiedUserSendFailureView(
         state: ResolveVerifiedUserSendFailureState,
     ) {
         setSafeContent {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MediaAttachmentFixtures.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MediaAttachmentFixtures.kt
index 77207d6b52..1dde33714f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MediaAttachmentFixtures.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MediaAttachmentFixtures.kt
@@ -11,6 +11,7 @@ package io.element.android.features.messages.impl.fixtures
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 
-fun aMediaAttachment(localMedia: LocalMedia) = Attachment.Media(
+fun aMediaAttachment(localMedia: LocalMedia, sendAsFile: Boolean = false) = Attachment.Media(
     localMedia = localMedia,
+    sendAsFile = sendAsFile,
 )
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt
index c7eb7c0bce..fb39e67fc5 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/TimelineItemsFactoryFixtures.kt
@@ -37,6 +37,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.TestScope
 
@@ -48,38 +49,44 @@ internal fun TestScope.aTimelineItemsFactoryCreator(): TimelineItemsFactory.Crea
     }
 }
 
+internal fun aTimelineItemContentFactory(
+    timelineEventFormatter: TimelineEventFormatter = aTimelineEventFormatter(),
+    matrixClient: FakeMatrixClient = FakeMatrixClient(),
+): TimelineItemContentFactory = TimelineItemContentFactory(
+    messageFactory = TimelineItemContentMessageFactory(
+        fileSizeFormatter = FakeFileSizeFormatter(),
+        fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
+        htmlConverterProvider = FakeHtmlConverterProvider(),
+        permalinkParser = FakePermalinkParser(),
+        textPillificationHelper = FakeTextPillificationHelper(),
+    ),
+    redactedMessageFactory = TimelineItemContentRedactedFactory(),
+    stickerFactory = TimelineItemContentStickerFactory(
+        fileSizeFormatter = FakeFileSizeFormatter(),
+        fileExtensionExtractor = FileExtensionExtractorWithoutValidation()
+    ),
+    pollFactory = TimelineItemContentPollFactory(FakePollContentStateFactory()),
+    utdFactory = TimelineItemContentUTDFactory(),
+    roomMembershipFactory = TimelineItemContentRoomMembershipFactory(timelineEventFormatter),
+    profileChangeFactory = TimelineItemContentProfileChangeFactory(timelineEventFormatter),
+    stateFactory = TimelineItemContentStateFactory(timelineEventFormatter),
+    failedToParseMessageFactory = TimelineItemContentFailedToParseMessageFactory(),
+    failedToParseStateFactory = TimelineItemContentFailedToParseStateFactory(),
+    sessionId = matrixClient.sessionId,
+    dateFormatter = FakeDateFormatter(),
+    stringProvider = FakeStringProvider(),
+)
+
 internal fun TestScope.aTimelineItemsFactory(
     config: TimelineItemsFactoryConfig,
 ): TimelineItemsFactory {
-    val timelineEventFormatter = aTimelineEventFormatter()
     val matrixClient = FakeMatrixClient()
     return TimelineItemsFactory(
         dispatchers = testCoroutineDispatchers(),
         eventItemFactoryCreator = object : TimelineItemEventFactory.Creator {
             override fun create(config: TimelineItemsFactoryConfig): TimelineItemEventFactory {
                 return TimelineItemEventFactory(
-                    contentFactory = TimelineItemContentFactory(
-                        messageFactory = TimelineItemContentMessageFactory(
-                            fileSizeFormatter = FakeFileSizeFormatter(),
-                            fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
-                            htmlConverterProvider = FakeHtmlConverterProvider(),
-                            permalinkParser = FakePermalinkParser(),
-                            textPillificationHelper = FakeTextPillificationHelper(),
-                        ),
-                        redactedMessageFactory = TimelineItemContentRedactedFactory(),
-                        stickerFactory = TimelineItemContentStickerFactory(
-                            fileSizeFormatter = FakeFileSizeFormatter(),
-                            fileExtensionExtractor = FileExtensionExtractorWithoutValidation()
-                        ),
-                        pollFactory = TimelineItemContentPollFactory(FakePollContentStateFactory()),
-                        utdFactory = TimelineItemContentUTDFactory(),
-                        roomMembershipFactory = TimelineItemContentRoomMembershipFactory(timelineEventFormatter),
-                        profileChangeFactory = TimelineItemContentProfileChangeFactory(timelineEventFormatter),
-                        stateFactory = TimelineItemContentStateFactory(timelineEventFormatter),
-                        failedToParseMessageFactory = TimelineItemContentFailedToParseMessageFactory(),
-                        failedToParseStateFactory = TimelineItemContentFailedToParseStateFactory(),
-                        sessionId = matrixClient.sessionId,
-                    ),
+                    contentFactory = aTimelineItemContentFactory(matrixClient = matrixClient),
                     matrixClient = matrixClient,
                     dateFormatter = FakeDateFormatter(),
                     permalinkParser = FakePermalinkParser(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkViewTest.kt
index e198ea9043..69093e948c 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/link/LinkViewTest.kt
@@ -6,64 +6,60 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.link
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.wysiwyg.link.Link
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class LinkViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class LinkViewTest : RobolectricTest() {
     @Test
-    fun `clicking on cancel emits the expected event`() {
+    fun `clicking on cancel emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LinkEvent>()
-        rule.setLinkView(
+        setLinkView(
             aLinkState(
                 linkClick = ConfirmingLinkClick(aLink),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(
             LinkEvent.Cancel
         )
     }
 
     @Test
-    fun `clicking on continue emits the expected event`() {
+    fun `clicking on continue emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LinkEvent>()
-        rule.setLinkView(
+        setLinkView(
             aLinkState(
                 linkClick = ConfirmingLinkClick(aLink),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(
             LinkEvent.Confirm
         )
     }
 
     @Test
-    fun `success state invokes the callback and emits the expected event`() {
+    fun `success state invokes the callback and emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<LinkEvent>()
         ensureCalledOnceWithParam(aLink) { callback ->
-            rule.setLinkView(
+            setLinkView(
                 aLinkState(
                     linkClick = AsyncAction.Success(aLink),
                     eventSink = eventsRecorder,
@@ -77,7 +73,7 @@ class LinkViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLinkView(
+private fun AndroidComposeUiTest<ComponentActivity>.setLinkView(
     state: LinkState,
     onLinkValid: (Link) -> Unit = EnsureNeverCalledWithParam(),
 ) {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterSlashCommandTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterSlashCommandTest.kt
new file mode 100644
index 0000000000..faf0bbe6ed
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterSlashCommandTest.kt
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.messages.impl.messagecomposer
+
+import android.net.Uri
+import app.cash.turbine.ReceiveTurbine
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.api.LocationService
+import io.element.android.features.location.test.FakeLocationService
+import io.element.android.features.messages.impl.FakeMessagesNavigator
+import io.element.android.features.messages.impl.MessagesNavigator
+import io.element.android.features.messages.impl.draft.ComposerDraftService
+import io.element.android.features.messages.impl.draft.FakeComposerDraftService
+import io.element.android.features.messages.impl.messagecomposer.suggestions.SuggestionsProcessor
+import io.element.android.features.messages.impl.timeline.TimelineController
+import io.element.android.features.messages.impl.utils.FakeMentionSpanFormatter
+import io.element.android.features.messages.impl.utils.FakeTextPillificationHelper
+import io.element.android.features.messages.impl.utils.TextPillificationHelper
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
+import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.test.A_FAILURE_REASON
+import io.element.android.libraries.matrix.test.A_MESSAGE
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
+import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InMemoryEventContentValidationCache
+import io.element.android.libraries.mediapickers.api.PickerProvider
+import io.element.android.libraries.mediapickers.test.FakePickerProvider
+import io.element.android.libraries.mediaupload.api.MediaOptimizationConfig
+import io.element.android.libraries.mediaupload.api.MediaPreProcessor
+import io.element.android.libraries.mediaupload.api.MediaSenderFactory
+import io.element.android.libraries.mediaupload.impl.DefaultMediaSender
+import io.element.android.libraries.mediaupload.test.FakeMediaOptimizationConfigProvider
+import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
+import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory
+import io.element.android.libraries.permissions.api.PermissionsPresenter
+import io.element.android.libraries.permissions.test.FakePermissionsPresenter
+import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
+import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
+import io.element.android.libraries.push.test.notifications.conversations.FakeNotificationConversationService
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.api.SlashCommandService
+import io.element.android.libraries.slashcommands.test.FakeSlashCommandService
+import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
+import io.element.android.libraries.textcomposer.mentions.MentionSpanTheme
+import io.element.android.libraries.textcomposer.model.MessageComposerMode
+import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
+import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class MessageComposerPresenterSlashCommandTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    private val pickerProvider = FakePickerProvider().apply {
+        givenResult(mockk()) // Uri is not available in JVM, so the only way to have a non-null Uri is using Mockk
+    }
+    private val mediaPreProcessor = FakeMediaPreProcessor()
+    private val snackbarDispatcher = SnackbarDispatcher()
+    private val mockMediaUrl: Uri = mockk("localMediaUri")
+    private val localMediaFactory = FakeLocalMediaFactory(mockMediaUrl)
+    private val analyticsService = FakeAnalyticsService()
+    private val notificationConversationService = FakeNotificationConversationService()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
+            val initialState = awaitFirstItem()
+            assertThat(initialState.isFullScreen).isFalse()
+            assertThat(initialState.textEditorState.messageHtml()).isEmpty()
+            assertThat(initialState.mode).isEqualTo(MessageComposerMode.Normal)
+            assertThat(initialState.showAttachmentSourcePicker).isFalse()
+            assertThat(initialState.canShareLocation).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - slash command error sets failure`() = runTest {
+        val presenter = createPresenter(
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.ErrorUnknownSlashCommand(A_FAILURE_REASON) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            val errorState = awaitItem()
+            assertThat(errorState.slashCommandAction.isFailure()).isTrue()
+            assertThat(errorState.slashCommandAction.errorOrNull()?.message).isEqualTo(A_FAILURE_REASON)
+            // Composer should not be reset when command is an error
+            assertThat(errorState.textEditorState.messageHtml()).isEqualTo(A_MESSAGE)
+            // Close the error
+            errorState.eventSink(MessageComposerEvent.ClearSlashError)
+            val finalState = awaitItem()
+            assertThat(finalState.slashCommandAction.isUninitialized()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - slash command navigation ShowUser navigates to member and resets composer`() = runTest {
+        val navigateToMember = lambdaRecorder<UserId, Unit> {}
+        val navigator = FakeMessagesNavigator(navigateToMemberLambda = navigateToMember)
+        val presenter = createPresenter(
+            navigator = navigator,
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.ShowUser(A_USER_ID) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            advanceUntilIdle()
+            // navigation should be invoked and composer reset
+            navigateToMember.assertions().isCalledOnce().with(value(A_USER_ID))
+            assertThat(initialState.textEditorState.messageHtml()).isEmpty()
+        }
+    }
+
+    @Test
+    fun `present - slash command navigation DevTools navigates to developer settings and resets composer`() = runTest {
+        val navigateToDev = lambdaRecorder<Unit> { }
+        val navigator = FakeMessagesNavigator(navigateToDeveloperSettingsLambda = navigateToDev)
+        val presenter = createPresenter(
+            navigator = navigator,
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.DevTools }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            advanceUntilIdle()
+            navigateToDev.assertions().isCalledOnce()
+            assertThat(initialState.textEditorState.messageHtml()).isEmpty()
+        }
+    }
+
+    @Test
+    fun `present - slash command send message proceeds and resets composer`() = runTest {
+        val presenter = createPresenter(
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.SendPlainText(A_MESSAGE) },
+                proceedSendMessageResult = { _, _ -> Result.success(Unit) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            advanceUntilIdle()
+            // Composer reset after successful slash send
+            assertThat(initialState.textEditorState.messageHtml()).isEmpty()
+            // Ensure no failure
+            assertThat(initialState.slashCommandAction.isFailure()).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - slash command send message failure sets failure state`() = runTest {
+        val presenter = createPresenter(
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.SendPlainText("A_MESSAGE") },
+                proceedSendMessageResult = { _, _ -> Result.failure(Exception(A_FAILURE_REASON)) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            val failureState = awaitItem()
+            assertThat(failureState.slashCommandAction.isFailure()).isTrue()
+            assertThat(failureState.slashCommandAction.errorOrNull()?.message).isEqualTo(A_FAILURE_REASON)
+            // Clear the error
+            failureState.eventSink(MessageComposerEvent.ClearSlashError)
+            val finalState = awaitItem()
+            assertThat(finalState.slashCommandAction.isUninitialized()).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - slash command admin proceeds and resets state on success`() = runTest {
+        val presenter = createPresenter(
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.BanUser(A_USER_ID, null) },
+                proceedAdminResult = { _ -> Result.success(Unit) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            val loadingState = awaitItem()
+            assertThat(loadingState.slashCommandAction.isLoading()).isTrue()
+            val successState = awaitItem()
+            // After success, state should be Uninitialized
+            assertThat(successState.slashCommandAction.isUninitialized()).isTrue()
+            assertThat(successState.textEditorState.messageHtml()).isEmpty()
+        }
+    }
+
+    @Test
+    fun `present - slash command admin proceeds and emit failure on error`() = runTest {
+        val presenter = createPresenter(
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.BanUser(A_USER_ID, null) },
+                proceedAdminResult = { _ -> Result.failure(Exception(A_FAILURE_REASON)) }
+            )
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.textEditorState.setHtml(A_MESSAGE)
+            initialState.eventSink(MessageComposerEvent.SendMessage)
+            val loadingState = awaitItem()
+            assertThat(loadingState.slashCommandAction.isLoading()).isTrue()
+            val failureState = awaitItem()
+            assertThat(failureState.slashCommandAction.isFailure()).isTrue()
+            assertThat(failureState.slashCommandAction.errorOrNull()?.message).isEqualTo(A_FAILURE_REASON)
+            // Clear error
+            failureState.eventSink(MessageComposerEvent.ClearSlashError)
+            val finalState = awaitItem()
+            assertThat(finalState.slashCommandAction.isUninitialized()).isTrue()
+        }
+    }
+
+    private fun TestScope.createPresenter(
+        room: JoinedRoom = FakeJoinedRoom(
+            typingNoticeResult = { Result.success(Unit) }
+        ),
+        timeline: Timeline = room.liveTimeline,
+        navigator: MessagesNavigator = FakeMessagesNavigator(),
+        pickerProvider: PickerProvider = this@MessageComposerPresenterSlashCommandTest.pickerProvider,
+        locationService: LocationService = FakeLocationService(true),
+        sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
+        mediaPreProcessor: MediaPreProcessor = this@MessageComposerPresenterSlashCommandTest.mediaPreProcessor,
+        snackbarDispatcher: SnackbarDispatcher = this@MessageComposerPresenterSlashCommandTest.snackbarDispatcher,
+        permissionPresenter: PermissionsPresenter = FakePermissionsPresenter(),
+        permalinkBuilder: PermalinkBuilder = FakePermalinkBuilder(),
+        permalinkParser: PermalinkParser = FakePermalinkParser(),
+        mentionSpanProvider: MentionSpanProvider = MentionSpanProvider(
+            permalinkParser = permalinkParser,
+            mentionSpanFormatter = FakeMentionSpanFormatter(),
+            mentionSpanTheme = MentionSpanTheme(A_USER_ID)
+        ),
+        textPillificationHelper: TextPillificationHelper = FakeTextPillificationHelper(),
+        isRichTextEditorEnabled: Boolean = true,
+        draftService: ComposerDraftService = FakeComposerDraftService(),
+        mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+        threadRoot: ThreadId? = null,
+        slashCommandService: SlashCommandService = FakeSlashCommandService(),
+        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
+    ) = MessageComposerPresenter(
+        navigator = navigator,
+        sessionCoroutineScope = this,
+        threadRoot = threadRoot,
+        room = room,
+        mediaPickerProvider = pickerProvider,
+        sessionPreferencesStore = sessionPreferencesStore,
+        localMediaFactory = localMediaFactory,
+        mediaSenderFactory = MediaSenderFactory { timelineMode ->
+            DefaultMediaSender(
+                preProcessor = mediaPreProcessor,
+                room = room,
+                timelineMode = timelineMode,
+                mediaOptimizationConfigProvider = {
+                    MediaOptimizationConfig(
+                        compressImages = true,
+                        videoCompressionPreset = VideoCompressionPreset.STANDARD
+                    )
+                }
+            )
+        },
+        snackbarDispatcher = snackbarDispatcher,
+        analyticsService = analyticsService,
+        locationService = locationService,
+        messageComposerContext = DefaultMessageComposerContext(),
+        richTextEditorStateFactory = TestRichTextEditorStateFactory(),
+        roomAliasSuggestionsDataSource = FakeRoomAliasSuggestionsDataSource(),
+        permissionsPresenterFactory = FakePermissionsPresenterFactory(permissionPresenter),
+        permalinkParser = permalinkParser,
+        permalinkBuilder = permalinkBuilder,
+        timelineController = TimelineController(room, timeline),
+        draftService = draftService,
+        mentionSpanProvider = mentionSpanProvider,
+        pillificationHelper = textPillificationHelper,
+        suggestionsProcessor = SuggestionsProcessor(slashCommandService = slashCommandService),
+        mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
+        notificationConversationService = notificationConversationService,
+        slashCommandService = slashCommandService,
+        featureFlagService = featureFlagService,
+        contentScannerService = { _, _ -> },
+        contentValidationCache = InMemoryEventContentValidationCache(),
+    ).apply {
+        isTesting = true
+        showTextFormatting = isRichTextEditorEnabled
+    }
+
+    private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
+        skipItems(1)
+        return awaitItem()
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
index e16236f109..fda8621087 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
@@ -31,8 +31,11 @@ import io.element.android.features.messages.impl.timeline.TimelineController
 import io.element.android.features.messages.impl.utils.FakeMentionSpanFormatter
 import io.element.android.features.messages.impl.utils.FakeTextPillificationHelper
 import io.element.android.features.messages.impl.utils.TextPillificationHelper
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.ThreadId
@@ -46,6 +49,7 @@ import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.TimelineException
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
@@ -71,6 +75,7 @@ import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InMemoryEventContentValidationCache
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.mediapickers.api.PickerProvider
 import io.element.android.libraries.mediapickers.test.FakePickerProvider
@@ -89,6 +94,9 @@ import io.element.android.libraries.preferences.api.store.SessionPreferencesStor
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.libraries.push.test.notifications.conversations.FakeNotificationConversationService
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.api.SlashCommandService
+import io.element.android.libraries.slashcommands.test.FakeSlashCommandService
 import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
 import io.element.android.libraries.textcomposer.mentions.MentionSpanTheme
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
@@ -102,6 +110,7 @@ import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.waitForPredicate
 import io.mockk.mockk
@@ -113,14 +122,11 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import uniffi.wysiwyg_composer.MentionsState
 import java.io.File
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class MessageComposerPresenterTest {
+class MessageComposerPresenterTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -144,6 +150,7 @@ class MessageComposerPresenterTest {
             assertThat(initialState.mode).isEqualTo(MessageComposerMode.Normal)
             assertThat(initialState.showAttachmentSourcePicker).isFalse()
             assertThat(initialState.canShareLocation).isTrue()
+            assertThat(initialState.slashCommandAction).isEqualTo(AsyncAction.Uninitialized)
         }
     }
 
@@ -374,10 +381,13 @@ class MessageComposerPresenterTest {
         val presenter = createPresenter(
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline().apply {
-                    sendMessageLambda = { _, _, _ -> Result.success(Unit) }
+                    sendMessageLambda = { _, _, _, _, _ -> Result.success(Unit) }
                 },
                 typingNoticeResult = { Result.success(Unit) }
             ),
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.NotACommand }
+            ),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             val state = presenter.present()
@@ -409,10 +419,13 @@ class MessageComposerPresenterTest {
             isRichTextEditorEnabled = false,
             room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline().apply {
-                    sendMessageLambda = { _, _, _ -> Result.success(Unit) }
+                    sendMessageLambda = { _, _, _, _, _ -> Result.success(Unit) }
                 },
                 typingNoticeResult = { Result.success(Unit) }
             ),
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.NotACommand }
+            ),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             val state = presenter.present()
@@ -602,7 +615,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - reply message`() = runTest {
-        val replyMessageLambda = lambdaRecorder { _: EventId?, _: String, _: String?, _: List<IntentionalMention>, _: Boolean ->
+        val replyMessageLambda = lambdaRecorder { _: EventId?, _: String, _: String?, _: List<IntentionalMention>, _: Boolean, _: MsgType ->
             Result.success(Unit)
         }
         val timeline = FakeTimeline().apply {
@@ -633,7 +646,7 @@ class MessageComposerPresenterTest {
 
             assert(replyMessageLambda)
                 .isCalledOnce()
-                .with(any(), value(A_REPLY), value(A_REPLY), any(), value(false))
+                .with(any(), value(A_REPLY), value(A_REPLY), any(), value(false), value(MsgType.MSG_TYPE_TEXT))
 
             assertThat(analyticsService.capturedEvents).containsExactly(
                 Composer(
@@ -747,6 +760,79 @@ class MessageComposerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - Pick media from gallery while editing keeps the edit pending`() = runTest {
+        val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment>, _: EventId? -> }
+        val navigator = FakeMessagesNavigator(
+            onPreviewAttachmentLambda = onPreviewAttachmentLambda
+        )
+        val presenter = createPresenter(navigator = navigator)
+        pickerProvider.givenMimeType(MimeTypes.Images)
+        presenter.test {
+            var state = awaitFirstItem()
+            val editMode = anEditMode()
+            state.eventSink(MessageComposerEvent.SetMode(editMode))
+            state = awaitItem()
+            assertThat(state.mode).isEqualTo(editMode)
+            // The media is sent as a new message while the edit stays active. If the mode reset,
+            // a Normal-mode state would be emitted and expectNoEvents() below would fail.
+            state.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
+            onPreviewAttachmentLambda.assertions().isCalledOnce()
+            expectNoEvents()
+            assertThat(state.mode).isEqualTo(editMode)
+        }
+    }
+
+    @Test
+    fun `present - Pick media from gallery while replying clears the reply mode`() = runTest {
+        val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment>, _: EventId? -> }
+        val navigator = FakeMessagesNavigator(
+            onPreviewAttachmentLambda = onPreviewAttachmentLambda
+        )
+        val presenter = createPresenter(navigator = navigator)
+        pickerProvider.givenMimeType(MimeTypes.Images)
+        presenter.test {
+            var state = awaitFirstItem()
+            state.eventSink(MessageComposerEvent.SetMode(aReplyMode()))
+            state = awaitItem()
+            assertThat(state.mode).isInstanceOf(MessageComposerMode.Reply::class.java)
+            // The media becomes the reply, so the reply intent is consumed and the composer resets.
+            state.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
+            onPreviewAttachmentLambda.assertions().isCalledOnce()
+            state = awaitItem()
+            assertThat(state.mode).isEqualTo(MessageComposerMode.Normal)
+        }
+    }
+
+    @Test
+    fun `present - Pick multiple media from gallery while editing keeps the edit pending`() = runTest {
+        val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment>, _: EventId? -> }
+        val navigator = FakeMessagesNavigator(
+            onPreviewAttachmentLambda = onPreviewAttachmentLambda
+        )
+        val presenter = createPresenter(
+            navigator = navigator,
+            featureFlagService = FakeFeatureFlagService(
+                initialState = mapOf(FeatureFlags.SendGalleryMessages.key to true)
+            ),
+        )
+        pickerProvider.givenMimeType(MimeTypes.Images)
+        // Two Uris take the multi-item branch (handlePickedMediaList) instead of delegating to the
+        // single-item path, so the edit is preserved for gallery messages too.
+        pickerProvider.givenMultipleResults(listOf(mockk(), mockk()))
+        presenter.test {
+            var state = awaitFirstItem()
+            val editMode = anEditMode()
+            state.eventSink(MessageComposerEvent.SetMode(editMode))
+            state = awaitItem()
+            assertThat(state.mode).isEqualTo(editMode)
+            state.eventSink(MessageComposerEvent.PickAttachmentSource.FromGallery)
+            onPreviewAttachmentLambda.assertions().isCalledOnce()
+            expectNoEvents()
+            assertThat(state.mode).isEqualTo(editMode)
+        }
+    }
+
     @Test
     fun `present - Pick media from gallery & cancel does nothing`() = runTest {
         val presenter = createPresenter()
@@ -967,7 +1053,12 @@ class MessageComposerPresenterTest {
             )
             givenRoomInfo(aRoomInfo(isDirect = false))
         }
-        val presenter = createPresenter(room)
+        val presenter = createPresenter(
+            room = room,
+            slashCommandService = FakeSlashCommandService(
+                getSuggestionsResult = { _, _ -> emptyList() },
+            ),
+        )
         presenter.test {
             val initialState = awaitItem()
 
@@ -1049,7 +1140,7 @@ class MessageComposerPresenterTest {
             )
             givenRoomInfo(
                 aRoomInfo(
-                    isDirect = true,
+                    isDm = true,
                     activeMembersCount = 2,
                 )
             )
@@ -1086,13 +1177,13 @@ class MessageComposerPresenterTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - send messages with intentional mentions`() = runTest {
-        val replyMessageLambda = lambdaRecorder { _: EventId?, _: String, _: String?, _: List<IntentionalMention>, _: Boolean ->
+        val replyMessageLambda = lambdaRecorder { _: EventId?, _: String, _: String?, _: List<IntentionalMention>, _: Boolean, _: MsgType ->
             Result.success(Unit)
         }
         val editMessageLambda = lambdaRecorder { _: EventOrTransactionId, _: String, _: String?, _: List<IntentionalMention> ->
             Result.success(Unit)
         }
-        val sendMessageResult = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention> ->
+        val sendMessageResult = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention>, _: MsgType, _: Boolean ->
             Result.success(Unit)
         }
         val timeline = FakeTimeline().apply {
@@ -1104,7 +1195,12 @@ class MessageComposerPresenterTest {
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) }
         )
-        val presenter = createPresenter(room = room)
+        val presenter = createPresenter(
+            room = room,
+            slashCommandService = FakeSlashCommandService(
+                parseResult = { _, _, _ -> SlashCommand.NotACommand }
+            ),
+        )
         presenter.test {
             val initialState = awaitFirstItem()
 
@@ -1122,7 +1218,7 @@ class MessageComposerPresenterTest {
             advanceUntilIdle()
 
             sendMessageResult.assertions().isCalledOnce()
-                .with(value(A_MESSAGE), any(), value(listOf(IntentionalMention.User(A_USER_ID))))
+                .with(value(A_MESSAGE), any(), value(listOf(IntentionalMention.User(A_USER_ID))), value(MsgType.MSG_TYPE_TEXT), value(false))
 
             // Check intentional mentions on reply sent
             initialState.eventSink(MessageComposerEvent.SetMode(aReplyMode()))
@@ -1139,7 +1235,7 @@ class MessageComposerPresenterTest {
 
             assert(replyMessageLambda)
                 .isCalledOnce()
-                .with(any(), any(), any(), value(listOf(IntentionalMention.User(A_USER_ID_2))), value(false))
+                .with(any(), any(), any(), value(listOf(IntentionalMention.User(A_USER_ID_2))), value(false), value(MsgType.MSG_TYPE_TEXT))
 
             // Check intentional mentions on edit message
             skipItems(1)
@@ -1512,9 +1608,13 @@ class MessageComposerPresenterTest {
         isRichTextEditorEnabled: Boolean = true,
         draftService: ComposerDraftService = FakeComposerDraftService(),
         mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
+        threadRoot: ThreadId? = null,
+        slashCommandService: SlashCommandService = FakeSlashCommandService(),
+        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
     ) = MessageComposerPresenter(
         navigator = navigator,
         sessionCoroutineScope = this,
+        threadRoot = threadRoot,
         room = room,
         mediaPickerProvider = pickerProvider,
         sessionPreferencesStore = sessionPreferencesStore,
@@ -1545,9 +1645,13 @@ class MessageComposerPresenterTest {
         draftService = draftService,
         mentionSpanProvider = mentionSpanProvider,
         pillificationHelper = textPillificationHelper,
-        suggestionsProcessor = SuggestionsProcessor(),
+        suggestionsProcessor = SuggestionsProcessor(slashCommandService = slashCommandService),
         mediaOptimizationConfigProvider = mediaOptimizationConfigProvider,
         notificationConversationService = notificationConversationService,
+        slashCommandService = slashCommandService,
+        featureFlagService = featureFlagService,
+        contentScannerService = { _, _ -> },
+        contentValidationCache = InMemoryEventContentValidationCache(),
     ).apply {
         isTesting = true
         showTextFormatting = isRichTextEditorEnabled
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
index daba41fb3c..6283d7236a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
@@ -17,6 +17,8 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.aRoomSummary
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
+import io.element.android.libraries.slashcommands.test.FakeSlashCommandService
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.Suggestion
 import io.element.android.libraries.textcomposer.model.SuggestionType
@@ -27,10 +29,13 @@ import org.junit.Test
 class SuggestionsProcessorTest {
     private fun aMentionSuggestion(text: String) = Suggestion(0, 1, SuggestionType.Mention, text)
     private fun aRoomSuggestion(text: String) = Suggestion(0, 1, SuggestionType.Room, text)
-    private val aCommandSuggestion = Suggestion(0, 1, SuggestionType.Command, "")
     private val aCustomSuggestion = Suggestion(0, 1, SuggestionType.Custom("*"), "")
 
-    private val suggestionsProcessor = SuggestionsProcessor()
+    private val suggestionsProcessor = SuggestionsProcessor(
+        slashCommandService = FakeSlashCommandService(
+            getSuggestionsResult = { _, _ -> emptyList() },
+        ),
+    )
 
     @Test
     fun `processing null suggestion will return empty suggestion`() = runTest {
@@ -40,18 +45,59 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
 
     @Test
-    fun `processing Command will return empty suggestion`() = runTest {
-        val result = suggestionsProcessor.process(
-            suggestion = aCommandSuggestion,
+    fun `processing Command will return suggestions from the slash service`() = runTest {
+        val suggestionsProcessorWithCommand = SuggestionsProcessor(
+            slashCommandService = FakeSlashCommandService(
+                getSuggestionsResult = { _, _ ->
+                    listOf(
+                        SlashCommandSuggestion(
+                            command = "aCommand",
+                            parameters = null,
+                            description = "A description",
+                        ),
+                    )
+                },
+            ),
+        )
+        val result = suggestionsProcessorWithCommand.process(
+            suggestion = Suggestion(0, 1, SuggestionType.Command, ""),
             roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember())),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
+        )
+        assertThat(result).isNotEmpty()
+    }
+
+    @Test
+    fun `processing Command will return empty list if start of suggestion is not 0`() = runTest {
+        val suggestionsProcessorWithCommand = SuggestionsProcessor(
+            slashCommandService = FakeSlashCommandService(
+                getSuggestionsResult = { _, _ ->
+                    listOf(
+                        SlashCommandSuggestion(
+                            command = "aCommand",
+                            parameters = null,
+                            description = "A description",
+                        ),
+                    )
+                },
+            ),
+        )
+        val result = suggestionsProcessorWithCommand.process(
+            suggestion = Suggestion(1, 2, SuggestionType.Command, ""),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember())),
+            roomAliasSuggestions = emptyList(),
+            currentUserId = A_USER_ID,
+            canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -64,6 +110,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -76,6 +123,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -88,6 +136,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -100,6 +149,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -120,6 +170,7 @@ class SuggestionsProcessorTest {
             ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -149,6 +200,7 @@ class SuggestionsProcessorTest {
             ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -178,6 +230,7 @@ class SuggestionsProcessorTest {
             ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -198,6 +251,7 @@ class SuggestionsProcessorTest {
             ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -227,6 +281,7 @@ class SuggestionsProcessorTest {
             ),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -240,6 +295,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -257,6 +313,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = UserId("@alice:server.org"),
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -270,6 +327,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -283,6 +341,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEmpty()
     }
@@ -296,6 +355,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -313,6 +373,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
@@ -331,6 +392,7 @@ class SuggestionsProcessorTest {
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { false },
+            isInThread = false,
         )
         assertThat(result).isEqualTo(
             listOf(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt
index 2c33e348c0..cbe76d73f7 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.pinned.banner
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -22,49 +24,44 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class PinnedMessagesBannerViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class PinnedMessagesBannerViewTest : RobolectricTest() {
     @Test
-    fun `clicking on the banner invoke expected callback`() {
+    fun `clicking on the banner invoke expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvent>()
         val state = aLoadedPinnedMessagesBannerState(
             eventSink = eventsRecorder
         )
         val pinnedEventId = state.currentPinnedMessage.eventId
         ensureCalledOnceWithParam(pinnedEventId) { callback ->
-            rule.setPinnedMessagesBannerView(
+            setPinnedMessagesBannerView(
                 state = state,
                 onClick = callback
             )
-            rule.onRoot().performClick()
+            onRoot().performClick()
             eventsRecorder.assertSingle(PinnedMessagesBannerEvent.MoveToNextPinned)
         }
     }
 
     @Test
-    fun `clicking on view all emit the expected event`() {
+    fun `clicking on view all emit the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvent>(expectEvents = true)
         val state = aLoadedPinnedMessagesBannerState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setPinnedMessagesBannerView(
+            setPinnedMessagesBannerView(
                 state = state,
                 onViewAllClick = callback
             )
-            rule.clickOn(CommonStrings.screen_room_pinned_banner_view_all_button_title)
+            clickOn(CommonStrings.screen_room_pinned_banner_view_all_button_title)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPinnedMessagesBannerView(
+private fun AndroidComposeUiTest<ComponentActivity>.setPinnedMessagesBannerView(
     state: PinnedMessagesBannerState,
     onClick: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onViewAllClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/FakePinnedMessagesListNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/FakePinnedMessagesListNavigator.kt
index 479139a45b..69eaae3699 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/FakePinnedMessagesListNavigator.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/FakePinnedMessagesListNavigator.kt
@@ -9,6 +9,7 @@
 package io.element.android.features.messages.impl.pinned.list
 
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 
 class FakePinnedMessagesListNavigator : PinnedMessagesListNavigator {
@@ -26,4 +27,9 @@ class FakePinnedMessagesListNavigator : PinnedMessagesListNavigator {
     override fun forwardEvent(eventId: EventId) {
         onForwardEventClickLambda?.invoke(eventId)
     }
+
+    var onOpenThreadLambda: ((ThreadId) -> Unit)? = null
+    override fun navigateToThread(threadRootId: ThreadId) {
+        onOpenThreadLambda?.invoke(threadRootId)
+    }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListViewTest.kt
index 41671b71c1..35e60684a9 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListViewTest.kt
@@ -6,17 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.pinned.list
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.longClick
 import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.messages.impl.actionlist.ActionListEvent
 import io.element.android.features.messages.impl.actionlist.anActionListState
 import io.element.android.features.messages.impl.timeline.aTimelineItemList
@@ -25,39 +27,34 @@ import io.element.android.features.messages.impl.timeline.model.event.aTimelineI
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
 import io.element.android.wysiwyg.link.Link
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class PinnedMessagesListViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class PinnedMessagesListViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back calls the expected callback`() {
+    fun `clicking on back calls the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinnedMessagesListEvent>(expectEvents = false)
         val state = aLoadedPinnedMessagesListState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setPinnedMessagesListView(
+            setPinnedMessagesListView(
                 state = state,
                 onBackClick = callback
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `click on an event calls the expected callback`() {
+    fun `click on an event calls the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PinnedMessagesListEvent>(expectEvents = false)
         val content = aTimelineItemFileContent()
         val state = aLoadedPinnedMessagesListState(
@@ -67,16 +64,16 @@ class PinnedMessagesListViewTest {
 
         val event = state.timelineItems.first() as TimelineItem.Event
         ensureCalledOnceWithParam(event) { callback ->
-            rule.setPinnedMessagesListView(
+            setPinnedMessagesListView(
                 state = state,
                 onEventClick = callback
             )
-            rule.onAllNodesWithText(content.filename).onFirst().performClick()
+            onAllNodesWithText(content.filename).onFirst().performClick()
         }
     }
 
     @Test
-    fun `long click on an event emits the expected event`() {
+    fun `long click on an event emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ActionListEvent>(expectEvents = true)
         val content = aTimelineItemFileContent()
         val state = aLoadedPinnedMessagesListState(
@@ -84,10 +81,10 @@ class PinnedMessagesListViewTest {
             actionListState = anActionListState(eventSink = eventsRecorder)
         )
 
-        rule.setPinnedMessagesListView(
+        setPinnedMessagesListView(
             state = state,
         )
-        rule.onAllNodesWithText(content.filename).onFirst()
+        onAllNodesWithText(content.filename).onFirst()
             .performTouchInput {
                 longClick()
             }
@@ -96,10 +93,11 @@ class PinnedMessagesListViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPinnedMessagesListView(
+private fun AndroidComposeUiTest<ComponentActivity>.setPinnedMessagesListView(
     state: PinnedMessagesListState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onEventClick: (event: TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
+    onGalleryItemClick: (event: TimelineItem.Event, index: Int) -> Unit = EnsureNeverCalledWithTwoParams(),
     onUserDataClick: (MatrixUser) -> Unit = EnsureNeverCalledWithParam(),
     onLinkClick: (Link) -> Unit = EnsureNeverCalledWithParam(),
     onLinkLongClick: (Link) -> Unit = EnsureNeverCalledWithParam(),
@@ -109,6 +107,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPinne
             state = state,
             onBackClick = onBackClick,
             onEventClick = onEventClick,
+            onGalleryItemClick = onGalleryItemClick,
             onUserDataClick = onUserDataClick,
             onLinkClick = onLinkClick,
             onLinkLongClick = onLinkLongClick,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/threads/ThreadsListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/threads/ThreadsListPresenterTest.kt
new file mode 100644
index 0000000000..9f8d210a16
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/threads/ThreadsListPresenterTest.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.threads
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.messages.impl.fixtures.aTimelineItemContentFactory
+import io.element.android.features.messages.impl.messagesummary.FakeMessageSummaryFormatter
+import io.element.android.features.messages.impl.threads.list.ThreadsListEvents
+import io.element.android.features.messages.impl.threads.list.ThreadsListPresenter
+import io.element.android.features.messages.impl.threads.list.aThreadListItem
+import io.element.android.libraries.dateformatter.test.FakeDateFormatter
+import io.element.android.libraries.matrix.test.AN_AVATAR_URL
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.threads.FakeThreadsListService
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class ThreadsListPresenterTest {
+    @Test
+    fun `present - initial state`() = runTest {
+        createThreadsListPresenter().test {
+            awaitItem().run {
+                assertThat(threads).isEmpty()
+                assertThat(roomId).isEqualTo(A_ROOM_ID)
+                assertThat(roomName).isEqualTo(A_ROOM_NAME)
+                assertThat(roomAvatarUrl).isEqualTo(AN_AVATAR_URL)
+            }
+        }
+    }
+
+    @Test
+    fun `present - paginate`() = runTest {
+        val paginateRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val threadsListService = FakeThreadsListService(paginate = paginateRecorder)
+        val room = FakeJoinedRoom(threadsListService = threadsListService)
+        createThreadsListPresenter(room).test {
+            val initialItem = awaitItem()
+
+            // Pagination is automatically triggered on start, so we should have one call to paginate already
+            paginateRecorder.assertions().isCalledOnce()
+
+            initialItem.eventSink(ThreadsListEvents.Paginate)
+
+            // Simulate a pagination result
+            threadsListService.emit(listOf(aThreadListItem()))
+
+            // We should have a second call to paginate after the event is sent
+            paginateRecorder.assertions().isCalledExactly(2)
+
+            // And we receive the new items
+            assertThat(awaitItem().threads).isNotEmpty()
+        }
+    }
+
+    private fun createThreadsListPresenter(
+        room: FakeJoinedRoom = FakeJoinedRoom(),
+    ): ThreadsListPresenter {
+        return ThreadsListPresenter(
+            room = room,
+            timelineItemContentFactory = aTimelineItemContentFactory(),
+            messageSummaryFormatter = FakeMessageSummaryFormatter(),
+            dateFormatter = FakeDateFormatter(),
+        )
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/CollapseRedactedRunsTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/CollapseRedactedRunsTest.kt
new file mode 100644
index 0000000000..8ccce4c995
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/CollapseRedactedRunsTest.kt
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.messages.impl.timeline.components.receipt.aReadReceiptData
+import io.element.android.features.messages.impl.timeline.groups.collapseRedactedRuns
+import io.element.android.features.messages.impl.timeline.groups.computeGroupIdWith
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UniqueId
+import kotlinx.collections.immutable.toImmutableList
+import org.junit.Test
+
+class CollapseRedactedRunsTest {
+    private val groupIds = mutableMapOf<String, String>()
+
+    private fun redacted(id: String) = aTimelineItemEvent(
+        eventId = EventId(id),
+        content = TimelineItemRedactedContent,
+    )
+
+    @Test
+    fun `collapses a run of three or more redacted events into a single group`() {
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val r3 = redacted("\$R3")
+        val result = listOf<TimelineItem>(r1, r2, r3).collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(1)
+        val group = result.single() as TimelineItem.GroupedEvents
+        // Stored oldest-first (the input is newest-first), like the existing grouper.
+        assertThat(group.events.map { it.eventId }).containsExactly(
+            EventId("\$R3"),
+            EventId("\$R2"),
+            EventId("\$R1"),
+        ).inOrder()
+        // Group id comes from the shared registry, keyed like the other groups (oldest member).
+        assertThat(group.id).isEqualTo(computeGroupIdWith(r3))
+    }
+
+    @Test
+    fun `leaves a run shorter than three as individual tiles`() {
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val result = listOf<TimelineItem>(r1, r2).collapseRedactedRuns(groupIds)
+        assertThat(result).containsExactly(r1, r2).inOrder()
+    }
+
+    @Test
+    fun `keeps surrounding events and only collapses the redacted run between them`() {
+        val newest = aTimelineItemEvent(eventId = EventId("\$NEW"))
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val r3 = redacted("\$R3")
+        val oldest = aTimelineItemEvent(eventId = EventId("\$OLD"))
+        val result = listOf<TimelineItem>(newest, r1, r2, r3, oldest).collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(3)
+        assertThat(result.first()).isEqualTo(newest)
+        assertThat(result.last()).isEqualTo(oldest)
+        assertThat(result[1]).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+        assertThat((result[1] as TimelineItem.GroupedEvents).events).hasSize(3)
+    }
+
+    @Test
+    fun `a day separator breaks a run so each side is evaluated on its own`() {
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val r3 = redacted("\$R3")
+        val sep = aTimelineItemDaySeparator()
+        val r4 = redacted("\$R4")
+        val r5 = redacted("\$R5")
+        val result = listOf<TimelineItem>(r1, r2, r3, sep, r4, r5).collapseRedactedRuns(groupIds)
+        // First run (3) collapses, the separator passes through, the second run (2) stays as tiles.
+        assertThat(result).hasSize(4)
+        assertThat(result.first()).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+        assertThat(result[1]).isEqualTo(sep)
+        assertThat(result[2]).isEqualTo(r4)
+        assertThat(result[3]).isEqualTo(r5)
+    }
+
+    @Test
+    fun `does not collapse a run interrupted by a non-redacted event`() {
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val between = aTimelineItemEvent(eventId = EventId("\$MID"))
+        val r3 = redacted("\$R3")
+        val result = listOf<TimelineItem>(r1, r2, between, r3).collapseRedactedRuns(groupIds)
+        assertThat(result).containsExactly(r1, r2, between, r3).inOrder()
+    }
+
+    @Test
+    fun `collapses a long run into a single group keeping every event`() {
+        val run = (1..5).map { redacted("\$R$it") }
+        val result = run.collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(1)
+        assertThat((result.single() as TimelineItem.GroupedEvents).events).hasSize(5)
+    }
+
+    @Test
+    fun `collapses each qualifying run independently`() {
+        val firstRun = (1..3).map { redacted("\$A$it") }
+        val separator = aTimelineItemEvent(eventId = EventId("\$SEP"))
+        val secondRun = (1..3).map { redacted("\$B$it") }
+        val result = (firstRun + separator + secondRun).collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(3)
+        assertThat(result[0]).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+        assertThat(result[1]).isEqualTo(separator)
+        assertThat(result[2]).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+        // The two groups get distinct ids so their expand state does not bleed into one another.
+        assertThat((result[0] as TimelineItem.GroupedEvents).id)
+            .isNotEqualTo((result[2] as TimelineItem.GroupedEvents).id)
+    }
+
+    @Test
+    fun `collapses a run that sits at the very end of the list`() {
+        val newest = aTimelineItemEvent(eventId = EventId("\$NEW"))
+        val run = (1..3).map { redacted("\$R$it") }
+        val result = (listOf<TimelineItem>(newest) + run).collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(2)
+        assertThat(result.first()).isEqualTo(newest)
+        assertThat(result.last()).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+    }
+
+    @Test
+    fun `leaves a single redacted event untouched`() {
+        val r1 = redacted("\$R1")
+        assertThat(listOf<TimelineItem>(r1).collapseRedactedRuns(groupIds)).containsExactly(r1)
+    }
+
+    @Test
+    fun `aggregates the read receipts of every event in the collapsed group`() {
+        fun redactedWithReceipt(id: String, receiptIndex: Int) = aTimelineItemEvent(
+            eventId = EventId(id),
+            content = TimelineItemRedactedContent,
+            readReceiptState = TimelineItemReadReceipts(
+                receipts = listOf(aReadReceiptData(receiptIndex)).toImmutableList(),
+            ),
+        )
+        val run = listOf<TimelineItem>(
+            redactedWithReceipt("\$R1", 0),
+            redactedWithReceipt("\$R2", 1),
+            redactedWithReceipt("\$R3", 2),
+        )
+        val group = run.collapseRedactedRuns(groupIds).single() as TimelineItem.GroupedEvents
+        assertThat(group.aggregatedReadReceipts).hasSize(3)
+    }
+
+    @Test
+    fun `an existing grouped item breaks the run and is passed through untouched`() {
+        val stateGroup = aGroupedEvents(id = UniqueId("state"))
+        val run = (1..3).map { redacted("\$R$it") }
+        val result = (run + stateGroup).collapseRedactedRuns(groupIds)
+        assertThat(result).hasSize(2)
+        assertThat(result.first()).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+        assertThat(result.last()).isEqualTo(stateGroup)
+    }
+
+    @Test
+    fun `is a no-op on an empty list`() {
+        assertThat(emptyList<TimelineItem>().collapseRedactedRuns(groupIds)).isEmpty()
+    }
+
+    @Test
+    fun `the group id survives the run growing at either end`() {
+        val r1 = redacted("\$R1")
+        val r2 = redacted("\$R2")
+        val r3 = redacted("\$R3")
+        val first = listOf<TimelineItem>(r1, r2, r3).collapseRedactedRuns(groupIds).single() as TimelineItem.GroupedEvents
+        // A newer adjacent message gets redacted and older history loads in: the id must not move,
+        // or the user's expanded group would snap shut on the update.
+        val grown = listOf<TimelineItem>(redacted("\$R0"), r1, r2, r3, redacted("\$R4"))
+            .collapseRedactedRuns(groupIds)
+            .single() as TimelineItem.GroupedEvents
+        assertThat(grown.id).isEqualTo(first.id)
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProviderTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProviderTest.kt
index 315d9c459c..3c339aa04e 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProviderTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultHtmlConverterProviderTest.kt
@@ -6,11 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.timeline
 
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runComposeUiTest
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.utils.FakeMentionSpanFormatter
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -18,15 +21,10 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
 import io.element.android.libraries.textcomposer.mentions.MentionSpanTheme
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class DefaultHtmlConverterProviderTest {
-    @get:Rule val composeTestRule = createComposeRule()
 
+class DefaultHtmlConverterProviderTest : RobolectricTest() {
     private val provider = DefaultHtmlConverterProvider(
         mentionSpanProvider = MentionSpanProvider(
             permalinkParser = FakePermalinkParser(),
@@ -43,8 +41,8 @@ class DefaultHtmlConverterProviderTest {
     }
 
     @Test
-    fun `calling provide after calling Update first should return an HtmlConverter`() {
-        composeTestRule.setContent {
+    fun `calling provide after calling Update first should return an HtmlConverter`() = runComposeUiTest {
+        setContent {
             CompositionLocalProvider(LocalInspectionMode provides true) {
                 provider.Update()
             }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
index 034c952f3d..bc36766bac 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
@@ -12,6 +12,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.room.IntentionalMention
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
@@ -154,10 +155,10 @@ class TimelineControllerTest {
 
     @Test
     fun `test invokeOnCurrentTimeline use the detached timeline and not the live timeline`() = runTest {
-        val lambdaForDetached = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention> ->
+        val lambdaForDetached = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention>, _: MsgType, _: Boolean ->
             Result.success(Unit)
         }
-        val lambdaForLive = lambdaRecorder(ensureNeverCalled = true) { _: String, _: String?, _: List<IntentionalMention> ->
+        val lambdaForLive = lambdaRecorder(ensureNeverCalled = true) { _: String, _: String?, _: List<IntentionalMention>, _: MsgType, _: Boolean ->
             Result.success(Unit)
         }
         val liveTimeline = FakeTimeline(name = "live").apply {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
index 176dcca219..2a0f9115fe 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
@@ -10,6 +10,7 @@ package io.element.android.features.messages.impl.timeline
 
 import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.test.FakeActiveLiveLocationShareManager
 import io.element.android.features.messages.impl.FakeMessagesNavigator
 import io.element.android.features.messages.impl.crypto.sendfailure.resolve.aResolveVerifiedUserSendFailureState
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
@@ -18,6 +19,8 @@ import io.element.android.features.messages.impl.timeline.components.MessageShie
 import io.element.android.features.messages.impl.timeline.components.aCriticalShield
 import io.element.android.features.messages.impl.timeline.model.NewEventState
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
+import io.element.android.features.messages.impl.timeline.protection.aTimelineProtectionState
 import io.element.android.features.messages.impl.typing.aTypingNotificationState
 import io.element.android.features.messages.impl.voicemessages.timeline.FakeRedactedVoiceMessageManager
 import io.element.android.features.messages.impl.voicemessages.timeline.RedactedVoiceMessageManager
@@ -27,6 +30,8 @@ import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.features.poll.test.actions.FakeEndPollAction
 import io.element.android.features.poll.test.actions.FakeSendPollResponseAction
 import io.element.android.features.roomcall.api.aStandByCallState
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -42,6 +47,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventReaction
 import io.element.android.libraries.matrix.api.timeline.item.event.ReactionSender
 import io.element.android.libraries.matrix.api.timeline.item.event.Receipt
+import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
+import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
 import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
@@ -53,17 +60,20 @@ import io.element.android.libraries.matrix.test.A_UNIQUE_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
+import io.element.android.tests.testutils.consumeItemsUntilTimeout
 import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -365,6 +375,522 @@ class TimelinePresenterTest {
         }
     }
 
+    @Test
+    fun `present - jumpToUnread is InWindow at the read marker virtual item index`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            // SDK delivers items oldest-first; the factory reverses so output index 0 is the newest.
+            // After processing: [msg-newest, membership, msg-2, read-marker, msg-old]
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("msg-old"), anEventTimelineItem(content = aMessageContent())),
+                    MatrixTimelineItem.Virtual(UniqueId("read-marker"), VirtualTimelineItem.ReadMarker),
+                    MatrixTimelineItem.Event(UniqueId("msg-2"), anEventTimelineItem(content = aMessageContent())),
+                    MatrixTimelineItem.Event(UniqueId("membership"), anEventTimelineItem(content = aRoomMembershipContent())),
+                    MatrixTimelineItem.Event(UniqueId("msg-newest"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.jumpToUnread is JumpToUnreadState.InWindow }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.InWindow(index = 3))
+                assertThat(state.displayJumpToUnread).isTrue()
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when no read marker and no fullyReadEventId`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())),
+                    MatrixTimelineItem.Event(UniqueId("2"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate {
+                it.timelineItems.size == 2 && it.jumpToUnread == JumpToUnreadState.Hidden
+            }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when JumpToUnread feature flag is disabled`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to false)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("msg-old"), anEventTimelineItem(content = aMessageContent())),
+                    MatrixTimelineItem.Virtual(UniqueId("read-marker"), VirtualTimelineItem.ReadMarker),
+                    MatrixTimelineItem.Event(UniqueId("msg-newest"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 3 }.last().also { state ->
+                assertThat(state.displayJumpToUnread).isFalse()
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - newEventState becomes FromOther when an event from another user arrives`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(timeline)
+        presenter.test {
+            val initialState = awaitFirstItem()
+            assertThat(initialState.newEventState).isEqualTo(NewEventState.None)
+            // Seed prevMostRecentItemId so subsequent emissions count as new events.
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Event(UniqueId("seed"), anEventTimelineItem(content = aMessageContent())))
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }
+            timelineItems.getAndUpdate { items ->
+                items + listOf(MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())))
+            }
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.FromOther }.last().also { state ->
+                assertThat(state.newEventState).isEqualTo(NewEventState.FromOther)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - newEventState resets to None on OnScrollFinished firstIndex 0`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(
+            timelineItems = timelineItems,
+            markAsReadResult = { Result.success(Unit) },
+        )
+        val presenter = createTimelinePresenter(timeline)
+        presenter.test {
+            val initialState = awaitFirstItem()
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Event(UniqueId("seed"), anEventTimelineItem(content = aMessageContent())))
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }
+            timelineItems.getAndUpdate { items ->
+                items + listOf(MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())))
+            }
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.FromOther }
+            initialState.eventSink.invoke(TimelineEvent.OnScrollFinished(0))
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.None }.last().also { state ->
+                assertThat(state.newEventState).isEqualTo(NewEventState.None)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - newEventState transitions to FromMe when latest event is from me`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(timeline)
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Event(UniqueId("seed"), anEventTimelineItem(content = aMessageContent())))
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }
+            // First, an event from another user moves us to FromOther.
+            timelineItems.getAndUpdate { items ->
+                items + listOf(MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())))
+            }
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.FromOther }
+            // Then the local user sends a message: state moves to FromMe.
+            timelineItems.getAndUpdate { items ->
+                items + listOf(
+                    MatrixTimelineItem.Event(UniqueId("2"), anEventTimelineItem(content = aMessageContent(), isOwn = true)),
+                )
+            }
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.FromMe }.last().also { state ->
+                assertThat(state.newEventState).isEqualTo(NewEventState.FromMe)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - newEventState does not reset on OnScrollFinished firstIndex other than 0`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(timeline)
+        presenter.test {
+            val initialState = awaitFirstItem()
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Event(UniqueId("seed"), anEventTimelineItem(content = aMessageContent())))
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }
+            timelineItems.getAndUpdate { items ->
+                items + listOf(MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())))
+            }
+            consumeItemsUntilPredicate { it.newEventState == NewEventState.FromOther }
+            // Scrolling stops above the bottom: state must NOT reset.
+            initialState.eventSink.invoke(TimelineEvent.OnScrollFinished(5))
+            advanceUntilIdle()
+            val drained = consumeItemsUntilTimeout()
+            assertThat(drained.any { it.newEventState == NewEventState.None }).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - newEventState stays None for events with PAGINATION origin`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(timeline)
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Event(UniqueId("seed"), anEventTimelineItem(content = aMessageContent())))
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }
+            // A back-paginated event arrives. It should not flip newEventState.
+            timelineItems.getAndUpdate { items ->
+                items + listOf(
+                    MatrixTimelineItem.Event(
+                        UniqueId("paginated"),
+                        anEventTimelineItem(content = aMessageContent()).copy(origin = TimelineItemEventOrigin.PAGINATION),
+                    )
+                )
+            }
+            consumeItemsUntilPredicate { it.timelineItems.size == 2 }.last().also { state ->
+                assertThat(state.newEventState).isEqualTo(NewEventState.None)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is InWindow at index 0 when the read marker is the only item`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(MatrixTimelineItem.Virtual(UniqueId("read-marker"), VirtualTimelineItem.ReadMarker))
+            )
+            consumeItemsUntilPredicate { it.jumpToUnread is JumpToUnreadState.InWindow }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.InWindow(index = 0))
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is OutOfWindow when fullyReadEventId is set but not in the loaded window`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val fullyReadEventId = EventId("\$older-than-loaded-window")
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                // There is genuinely unread *displayable* content, and the marker event isn't loaded
+                // (isEventLoaded defaults to false), so the FAB targets the out-of-window marker.
+                initialRoomInfo = aRoomInfo(fullyReadEventId = fullyReadEventId, numUnreadMessages = 1),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            // Loaded items don't include the fullyReadEventId and the SDK didn't materialise a ReadMarker.
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(eventId = AN_EVENT_ID, content = aMessageContent())),
+                    MatrixTimelineItem.Event(UniqueId("2"), anEventTimelineItem(eventId = AN_EVENT_ID_2, content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.jumpToUnread is JumpToUnreadState.OutOfWindow }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.OutOfWindow(eventId = fullyReadEventId))
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when the marker event is loaded in the window but not displayed`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        // The marker event is in the loaded window (e.g. a state/filtered event) but never rendered.
+        val fullyReadEventId = EventId("\$loaded-but-not-displayed")
+        val timeline = FakeTimeline(timelineItems = timelineItems).apply {
+            isEventLoadedLambda = { it == fullyReadEventId }
+        }
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = fullyReadEventId, numUnreadMessages = 1),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            // Displayed items don't contain the marker event, but the SDK reports it as loaded.
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(eventId = AN_EVENT_ID, content = aMessageContent())),
+                    MatrixTimelineItem.Event(UniqueId("2"), anEventTimelineItem(eventId = AN_EVENT_ID_2, content = aMessageContent())),
+                )
+            )
+            advanceUntilIdle()
+            // It must never be OutOfWindow — there is nothing displayable to jump to.
+            val drained = consumeItemsUntilTimeout()
+            assertThat(drained.any { it.jumpToUnread is JumpToUnreadState.OutOfWindow }).isFalse()
+            assertThat(drained.last().jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when out of window but there are no unread messages`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val fullyReadEventId = EventId("\$older-than-loaded-window")
+        // isEventLoaded defaults to false (genuinely out of window), but numUnreadMessages is 0.
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = fullyReadEventId, numUnreadMessages = 0),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(eventId = AN_EVENT_ID, content = aMessageContent())),
+                    MatrixTimelineItem.Event(UniqueId("2"), anEventTimelineItem(eventId = AN_EVENT_ID_2, content = aMessageContent())),
+                )
+            )
+            advanceUntilIdle()
+            val drained = consumeItemsUntilTimeout()
+            assertThat(drained.any { it.jumpToUnread != JumpToUnreadState.Hidden }).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when fullyReadEventId IS in the loaded window`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                // The user is caught up: the marker event is loaded, but the SDK didn't insert a
+                // virtual ReadMarker because there are no items newer than it.
+                initialRoomInfo = aRoomInfo(fullyReadEventId = AN_EVENT_ID),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            // A loaded item has eventId == AN_EVENT_ID (default of anEventTimelineItem).
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when fullyReadEventId is set but the timeline is empty`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = AN_EVENT_ID),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            // Without any timeline items, the FAB must stay hidden — the user is mid-load.
+            assertThat(initialState.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            advanceUntilIdle()
+            val drained = consumeItemsUntilTimeout()
+            assertThat(drained.any { it.jumpToUnread != JumpToUnreadState.Hidden }).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread is Hidden when fullyReadEventId is set but the feature flag is off`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = AN_EVENT_ID),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to false)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.timelineItems.size == 1 }.last().also { state ->
+                assertThat(state.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread prefers InWindow when both a virtual marker and fullyReadEventId are present`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(timelineItems = timelineItems)
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = AN_EVENT_ID),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("msg-old"), anEventTimelineItem(content = aMessageContent())),
+                    MatrixTimelineItem.Virtual(UniqueId("read-marker"), VirtualTimelineItem.ReadMarker),
+                    MatrixTimelineItem.Event(UniqueId("msg-newest"), anEventTimelineItem(content = aMessageContent())),
+                )
+            )
+            consumeItemsUntilPredicate { it.jumpToUnread is JumpToUnreadState.InWindow }.last().also { state ->
+                assertThat(state.jumpToUnread).isInstanceOf(JumpToUnreadState.InWindow::class.java)
+            }
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - jumpToUnread hides eagerly after MarkAllAsRead even before a new RoomInfo arrives`() = runTest {
+        val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
+        val timeline = FakeTimeline(
+            timelineItems = timelineItems,
+            getLatestEventIdResult = { Result.success(AN_EVENT_ID_2) },
+        )
+        val fullyReadEventId = EventId("\$older-than-loaded-window")
+        val room = FakeJoinedRoom(
+            liveTimeline = timeline,
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(),
+                initialRoomInfo = aRoomInfo(fullyReadEventId = fullyReadEventId, numUnreadMessages = 1),
+            ),
+        )
+        val presenter = createTimelinePresenter(
+            timeline = timeline,
+            room = room,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.JumpToUnread.key to true)),
+        )
+        presenter.test {
+            awaitFirstItem()
+            timelineItems.emit(
+                listOf(
+                    MatrixTimelineItem.Event(UniqueId("1"), anEventTimelineItem(eventId = AN_EVENT_ID, content = aMessageContent())),
+                )
+            )
+            val outOfWindow = consumeItemsUntilPredicate { it.jumpToUnread is JumpToUnreadState.OutOfWindow }.last()
+            assertThat(outOfWindow.jumpToUnread).isEqualTo(JumpToUnreadState.OutOfWindow(eventId = fullyReadEventId))
+
+            outOfWindow.eventSink(TimelineEvent.MarkAllAsRead)
+            // RoomInfo is intentionally NOT updated — eager hide must fire on the await alone.
+            val afterMark = consumeItemsUntilPredicate { it.jumpToUnread == JumpToUnreadState.Hidden }.last()
+            assertThat(afterMark.jumpToUnread).isEqualTo(JumpToUnreadState.Hidden)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - collapses a run of three or more redacted events into a single group`() = runTest {
+        val timeline = FakeTimeline(
+            timelineItems = flowOf(
+                (0 until 3).map { index ->
+                    MatrixTimelineItem.Event(
+                        uniqueId = UniqueId("redacted_$index"),
+                        event = anEventTimelineItem(eventId = EventId("\$R$index"), content = RedactedContent),
+                    )
+                }
+            ),
+        )
+        val presenter = createTimelinePresenter(timeline = timeline)
+        presenter.test {
+            val state = consumeItemsUntilPredicate { it.timelineItems.size == 1 }.last()
+            val group = state.timelineItems.single()
+            assertThat(group).isInstanceOf(TimelineItem.GroupedEvents::class.java)
+            assertThat((group as TimelineItem.GroupedEvents).events).hasSize(3)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     @Test
     fun `present - reaction ordering`() = runTest {
         val timelineItems = MutableStateFlow(emptyList<MatrixTimelineItem>())
@@ -974,6 +1500,54 @@ class TimelinePresenterTest {
         }
     }
 
+    @Test
+    fun `present - MarkAllAsRead invokes markAsFullyRead with latest event id`() = runTest {
+        val markAsFullyReadRecorder = lambdaRecorder<RoomId, EventId, Unit> { _, _ -> }
+        val presenter = createTimelinePresenter(
+            timeline = FakeTimeline(getLatestEventIdResult = { Result.success(AN_EVENT_ID) }),
+            markAsFullyRead = FakeMarkAsFullyRead(markAsFullyReadRecorder),
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(TimelineEvent.MarkAllAsRead)
+            advanceUntilIdle()
+            markAsFullyReadRecorder.assertions().isCalledOnce().with(value(A_ROOM_ID), value(AN_EVENT_ID))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - MarkAllAsRead does not invoke markAsFullyRead when latest event id lookup fails`() = runTest {
+        val markAsFullyReadRecorder = lambdaRecorder<RoomId, EventId, Unit> { _, _ -> }
+        val presenter = createTimelinePresenter(
+            timeline = FakeTimeline(getLatestEventIdResult = { Result.failure(RuntimeException("boom")) }),
+            markAsFullyRead = FakeMarkAsFullyRead(markAsFullyReadRecorder),
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(TimelineEvent.MarkAllAsRead)
+            advanceUntilIdle()
+            markAsFullyReadRecorder.assertions().isNeverCalled()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - MarkAllAsRead does not invoke markAsFullyRead when there is no latest event`() = runTest {
+        val markAsFullyReadRecorder = lambdaRecorder<RoomId, EventId, Unit> { _, _ -> }
+        val presenter = createTimelinePresenter(
+            timeline = FakeTimeline(getLatestEventIdResult = { Result.success(null) }),
+            markAsFullyRead = FakeMarkAsFullyRead(markAsFullyReadRecorder),
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(TimelineEvent.MarkAllAsRead)
+            advanceUntilIdle()
+            markAsFullyReadRecorder.assertions().isNeverCalled()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     private suspend fun <T> ReceiveTurbine<T>.awaitFirstItem(): T {
         return awaitItem()
     }
@@ -1012,6 +1586,9 @@ class TimelinePresenterTest {
         sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),
         timelineItemIndexer: TimelineItemIndexer = TimelineItemIndexer(),
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
+        liveLocationShareManager: FakeActiveLiveLocationShareManager = FakeActiveLiveLocationShareManager(),
+        markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead { _, _ -> },
+        timelineProtectionPresenter: Presenter<TimelineProtectionState> = { aTimelineProtectionState() },
     ): TimelinePresenter {
         return TimelinePresenter(
             timelineItemsFactoryCreator = aTimelineItemsFactoryCreator(),
@@ -1030,6 +1607,9 @@ class TimelinePresenterTest {
             roomCallStatePresenter = { aStandByCallState() },
             featureFlagService = featureFlagService,
             analyticsService = FakeAnalyticsService(),
+            liveLocationShareManager = liveLocationShareManager,
+            markAsFullyRead = markAsFullyRead,
+            timelineProtectionPresenter = timelineProtectionPresenter,
         )
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
index 3a97fbd9dc..bcddc37a74 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
@@ -6,20 +6,22 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.timeline
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollToIndex
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.messages.impl.timeline.components.MessageShieldData
 import io.element.android.features.messages.impl.timeline.components.aCriticalShield
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemUnknownContent
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingIndicatorModel
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
@@ -34,24 +36,19 @@ import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
 import io.element.android.wysiwyg.link.Link
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TimelineViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class TimelineViewTest : RobolectricTest() {
     @Test
-    fun `reaching the end of the timeline with more events to load emits a LoadMore event`() {
+    fun `reaching the end of the timeline with more events to load emits a LoadMore event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
-        rule.setTimelineView(
+        setTimelineView(
             state = aTimelineState(
                 timelineItems = persistentListOf<TimelineItem>(
                     TimelineItem.Virtual(
@@ -66,60 +63,85 @@ class TimelineViewTest {
     }
 
     @Test
-    fun `reaching the end of the timeline does not send a LoadMore event`() {
-        val eventsRecorder = EventsRecorder<TimelineEvent>(expectEvents = false)
-        rule.setTimelineView(
+    fun `reaching the end of the timeline does not send a LoadMore event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<TimelineEvent>()
+        setTimelineView(
             state = aTimelineState(
+                timelineItems = persistentListOf(aTimelineItemEvent(content = aTimelineItemTextContent())),
                 eventSink = eventsRecorder,
             ),
         )
+        eventsRecorder.assertSingle(TimelineEvent.OnScrollFinished(firstIndex = 0))
     }
 
     @Test
-    fun `scroll to bottom on live timeline does not emit the Event`() {
-        val eventsRecorder = EventsRecorder<TimelineEvent>(expectEvents = false)
-        rule.setTimelineView(
+    fun `scroll to bottom on live timeline does not emit the Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<TimelineEvent>()
+        setTimelineView(
             state = aTimelineState(
+                timelineItems = persistentListOf(aTimelineItemEvent(content = aTimelineItemTextContent())),
                 isLive = true,
                 eventSink = eventsRecorder,
             ),
             forceJumpToBottomVisibility = true,
         )
-        val contentDescription = rule.activity.getString(CommonStrings.a11y_jump_to_bottom)
-        rule.onNodeWithContentDescription(contentDescription).performClick()
+
+        eventsRecorder.assertSingle(TimelineEvent.OnScrollFinished(firstIndex = 0))
+        eventsRecorder.clear()
+
+        val contentDescription = activity!!.getString(CommonStrings.a11y_jump_to_bottom)
+        onNodeWithContentDescription(contentDescription).performClick()
     }
 
     @Test
-    fun `scroll to bottom on detached timeline emits the expected Event`() {
+    fun `scroll to bottom on detached timeline emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
-        rule.setTimelineView(
+        setTimelineView(
             state = aTimelineState(
+                timelineItems = persistentListOf(aTimelineItemEvent(content = aTimelineItemTextContent())),
                 isLive = false,
                 eventSink = eventsRecorder,
             ),
         )
-        val contentDescription = rule.activity.getString(CommonStrings.a11y_jump_to_bottom)
-        rule.onNodeWithContentDescription(contentDescription).performClick()
+
+        eventsRecorder.assertSingle(TimelineEvent.OnScrollFinished(firstIndex = 0))
+        eventsRecorder.clear()
+
+        val contentDescription = activity!!.getString(CommonStrings.a11y_jump_to_bottom)
+        onNodeWithContentDescription(contentDescription).performClick()
         eventsRecorder.assertSingle(TimelineEvent.JumpToLive)
     }
 
     @Test
-    fun `show shield dialog`() {
+    fun `an empty timeline triggers a prefetch`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
-        rule.setTimelineView(
+        setTimelineView(
+            state = aTimelineState(
+                timelineItems = persistentListOf(),
+                eventSink = eventsRecorder,
+            ),
+        )
+
+        eventsRecorder.assertSingle(TimelineEvent.LoadMore(Timeline.PaginationDirection.BACKWARDS))
+    }
+
+    @Test
+    fun `show shield dialog`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<TimelineEvent>()
+        setTimelineView(
             state = aTimelineState(
                 timelineItems = persistentListOf<TimelineItem>(
                     aTimelineItemEvent(
                         // Do not use a Text because EditorStyledText cannot be used in UI test.
-                        content = aTimelineItemImageContent(),
+                        content = aTimelineItemTextContent(),
                         messageShield = MessageShield.UnverifiedIdentity(true),
                     ),
                 ),
                 eventSink = eventsRecorder,
             ),
         )
-        val contentDescription = rule.activity.getString(CommonStrings.a11y_encryption_details)
-        rule.onNodeWithContentDescription(contentDescription).performClick()
+        val contentDescription = activity!!.getString(CommonStrings.a11y_encryption_details)
+        onNodeWithContentDescription(contentDescription).performClick()
         eventsRecorder.assertList(
             listOf(
                 TimelineEvent.OnScrollFinished(0),
@@ -129,25 +151,29 @@ class TimelineViewTest {
     }
 
     @Test
-    fun `hide shield dialog`() {
+    fun `hide shield dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
-        rule.setTimelineView(
+        setTimelineView(
             state = aTimelineState(
+                timelineItems = persistentListOf(aTimelineItemEvent(content = aTimelineItemTextContent())),
                 isLive = false,
                 eventSink = eventsRecorder,
                 messageShield = aCriticalShield(),
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        eventsRecorder.assertSingle(TimelineEvent.OnScrollFinished(firstIndex = 0))
+        eventsRecorder.clear()
+
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(TimelineEvent.HideShieldDialog)
     }
 
     @Ignore(
         "performScrollToIndex in compose tests no longer sets LazyListState.isScrollInProgress to true, so the LoadMore event is not emitted." +
-        "This needs to be reworked to use a different approach to check the LoadMore event was emitted."
+            "This needs to be reworked to use a different approach to check the LoadMore event was emitted."
     )
     @Test
-    fun `scrolling near to the start of the loaded items triggers a pre-fetch`() {
+    fun `scrolling near to the start of the loaded items triggers a pre-fetch`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent>()
         val items = List<TimelineItem>(200) {
             aTimelineItemEvent(
@@ -156,7 +182,7 @@ class TimelineViewTest {
             )
         }.toImmutableList()
 
-        rule.setTimelineView(
+        setTimelineView(
             state = aTimelineState(
                 timelineItems = items,
                 eventSink = eventsRecorder,
@@ -165,9 +191,9 @@ class TimelineViewTest {
             ),
         )
 
-        rule.onNodeWithTag("timeline").performScrollToIndex(180)
+        onNodeWithTag("timeline").performScrollToIndex(180)
 
-        rule.mainClock.advanceTimeBy(1000)
+        mainClock.advanceTimeBy(1000)
 
         eventsRecorder.assertList(
             listOf(
@@ -178,7 +204,7 @@ class TimelineViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTimelineView(
+private fun AndroidComposeUiTest<ComponentActivity>.setTimelineView(
     state: TimelineState,
     timelineProtectionState: TimelineProtectionState = aTimelineProtectionState(),
     onUserDataClick: (MatrixUser) -> Unit = EnsureNeverCalledWithParam(),
@@ -190,8 +216,9 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTimel
     onReactionLongClick: (emoji: String, TimelineItem.Event) -> Unit = EnsureNeverCalledWithTwoParams(),
     onMoreReactionsClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
     onReadReceiptClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
-    onJoinCallClick: (Boolean) -> Unit = EnsureNeverCalledWithParam(),
+    onGalleryItemClick: (TimelineItem.Event, Int) -> Unit = EnsureNeverCalledWithTwoParams(),
     forceJumpToBottomVisibility: Boolean = false,
+    onJoinCallClick: (isAudioCall: Boolean) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setSafeContent(clearAndroidUiDispatcher = true) {
         TimelineView(
@@ -206,8 +233,9 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTimel
             onReactionLongClick = onReactionLongClick,
             onMoreReactionsClick = onMoreReactionsClick,
             onReadReceiptClick = onReadReceiptClick,
-            onJoinCallClick = onJoinCallClick,
+            onGalleryItemClick = onGalleryItemClick,
             forceJumpToBottomVisibility = forceJumpToBottomVisibility,
+            onJoinCallClick = onJoinCallClick,
         )
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenterTest.kt
index e3317b3d42..4d3c4ab41a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionPresenterTest.kt
@@ -11,11 +11,11 @@ package io.element.android.features.messages.impl.timeline.components.customreac
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
 import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
+import io.element.android.libraries.emoji.api.recentemojis.EmptyGetRecentEmojis
+import io.element.android.libraries.emoji.test.fakeEmojiPickerPresenterFactory
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.recentemojis.test.FakeEmojibaseProvider
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -25,8 +25,8 @@ class CustomReactionPresenterTest {
     val warmUpRule = WarmUpRule()
 
     private val presenter = CustomReactionPresenter(
-        emojibaseProvider = FakeEmojibaseProvider(),
-        getRecentEmojis = { Result.success(persistentListOf()) },
+        emojiPickerPresenterFactory = fakeEmojiPickerPresenterFactory(),
+        getRecentEmojis = EmptyGetRecentEmojis,
     )
 
     @Test
@@ -38,8 +38,6 @@ class CustomReactionPresenterTest {
 
             initialState.eventSink(CustomReactionEvent.ShowCustomReactionSheet(event))
 
-            assertThat(awaitItem().target).isEqualTo(CustomReactionState.Target.Loading(event))
-
             val eventId = (awaitItem().target as? CustomReactionState.Target.Success)?.event?.eventId
             assertThat(eventId).isEqualTo(AN_EVENT_ID)
 
@@ -59,8 +57,6 @@ class CustomReactionPresenterTest {
             val key = reactions.reactions.first().key
             initialState.eventSink(CustomReactionEvent.ShowCustomReactionSheet(event))
 
-            assertThat(awaitItem().target).isEqualTo(CustomReactionState.Target.Loading(event))
-
             val stateWithSelectedEmojis = awaitItem()
             val eventId = (stateWithSelectedEmojis.target as? CustomReactionState.Target.Success)?.event?.eventId
             assertThat(eventId).isEqualTo(AN_EVENT_ID)
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenterTest.kt
deleted file mode 100644
index 541b16b546..0000000000
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerPresenterTest.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
-
-import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
-import androidx.compose.runtime.InternalComposeApi
-import androidx.compose.runtime.currentComposer
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.TurbineTestContext
-import app.cash.turbine.test
-import com.google.common.truth.Truth.assertThat
-import io.element.android.emojibasebindings.Emoji
-import io.element.android.emojibasebindings.EmojibaseCategory
-import io.element.android.emojibasebindings.EmojibaseStore
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.tests.testutils.WarmUpRule
-import io.element.android.tests.testutils.testCoroutineDispatchers
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableMap
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class EmojiPickerPresenterTest {
-    @get:Rule
-    val warmUpRule = WarmUpRule()
-
-    @Test
-    fun `updating search query loads new results`() = runTest {
-        testPresenter {
-            skipItems(1)
-
-            val initialState = awaitItem()
-            assertThat(initialState.searchQuery.text.toString()).isEmpty()
-            assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
-
-            initialState.searchQuery.setTextAndPlaceCursorAtEnd("smile")
-            assertThat(awaitItem().searchQuery.text.toString()).isEqualTo("smile")
-
-            val stateWithResults = awaitItem()
-            assertThat(stateWithResults.searchQuery.text.toString()).isEqualTo("smile")
-            assertThat(stateWithResults.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
-        }
-    }
-
-    @Test
-    fun `ToggleSearchActive toggles the search state`() = runTest {
-        testPresenter {
-            skipItems(1)
-
-            val initialState = awaitItem()
-            assertThat(initialState.isSearchActive).isFalse()
-
-            initialState.eventSink(EmojiPickerEvent.ToggleSearchActive(true))
-            assertThat(awaitItem().isSearchActive).isTrue()
-
-            initialState.eventSink(EmojiPickerEvent.ToggleSearchActive(false))
-            assertThat(awaitItem().isSearchActive).isFalse()
-        }
-    }
-
-    @Test
-    fun `recent emojis are automatically added to the categories if present`() = runTest {
-        val providedCategories = persistentListOf(emojiCategory(EmojibaseCategory.Activity))
-        val presenter = createPresenter(
-            categories = providedCategories,
-            recentEmojis = persistentListOf("😊"),
-        )
-        testPresenter(presenter) {
-            skipItems(1)
-
-            val initialState = awaitItem()
-            assertThat(providedCategories.size).isNotEqualTo(initialState.categories.size)
-            assertThat(initialState.categories.size).isEqualTo(2)
-        }
-    }
-
-    private fun TestScope.createPresenter(
-        categories: ImmutableList<Pair<EmojibaseCategory, ImmutableList<Emoji>>> = persistentListOf(emojiCategory()),
-        recentEmojis: ImmutableList<String> = persistentListOf(),
-    ) = EmojiPickerPresenter(
-        emojibaseStore = EmojibaseStore(categories.toMap().toImmutableMap()),
-        recentEmojis = recentEmojis,
-        coroutineDispatchers = testCoroutineDispatchers(),
-    )
-
-    private fun emojiCategory(
-        category: EmojibaseCategory = EmojibaseCategory.Activity,
-        emojis: ImmutableList<Emoji> = persistentListOf(
-            Emoji("1F3C3", "Smile", persistentListOf("smile"), persistentListOf("smile"), "😊", skins = null)
-        )
-    ) = category to emojis
-
-    @OptIn(InternalComposeApi::class)
-    private suspend fun TestScope.testPresenter(
-        presenter: EmojiPickerPresenter = createPresenter(),
-        testBlock: suspend TurbineTestContext<EmojiPickerState>.() -> Unit,
-    ) {
-        moleculeFlow(RecompositionMode.Immediate) {
-            // These are needed to load the history icon in the presenter
-            currentComposer.startProviders(arrayOf(
-                LocalContext provides InstrumentationRegistry.getInstrumentation().context,
-                LocalConfiguration provides InstrumentationRegistry.getInstrumentation().context.resources.configuration,
-            ))
-            val state = presenter.present()
-            currentComposer.endProviders()
-            state
-        }.test {
-            testBlock()
-        }
-    }
-}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt
index b6c81b2825..b4977e7f3a 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt
@@ -6,13 +6,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.messages.impl.timeline.TimelineEvent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemPollContent
 import io.element.android.libraries.testtags.TestTags
@@ -20,14 +22,10 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressTag
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TimelineItemPollViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class TimelineItemPollViewTest : RobolectricTest() {
     @Test
     fun `answering a poll with first answer should emit a PollAnswerSelected event`() {
         testAnswer(answerIndex = 0)
@@ -38,17 +36,17 @@ class TimelineItemPollViewTest {
         testAnswer(answerIndex = 1)
     }
 
-    private fun testAnswer(answerIndex: Int) {
+    private fun testAnswer(answerIndex: Int) = runAndroidComposeUiTest<ComponentActivity> {
         val eventsRecorder = EventsRecorder<TimelineEvent.TimelineItemPollEvent>()
         val content = aTimelineItemPollContent()
-        rule.setContent {
+        setContent {
             TimelineItemPollView(
                 content = content,
                 eventSink = eventsRecorder
             )
         }
         val answer = content.answerItems[answerIndex].answer
-        rule.onNode(
+        onNode(
             matcher = hasText(answer.text),
             useUnmergedTree = true,
         ).performClick()
@@ -56,38 +54,38 @@ class TimelineItemPollViewTest {
     }
 
     @Test
-    fun `editing a poll should emit a PollEditClicked event`() {
+    fun `editing a poll should emit a PollEditClicked event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent.TimelineItemPollEvent>()
         val content = aTimelineItemPollContent(
             isMine = true,
             isEditable = true,
         )
-        rule.setContent {
+        setContent {
             TimelineItemPollView(
                 content = content,
                 eventSink = eventsRecorder
             )
         }
-        rule.clickOn(CommonStrings.action_edit_poll)
+        clickOn(CommonStrings.action_edit_poll)
         eventsRecorder.assertSingle(TimelineEvent.EditPoll(content.eventId!!))
     }
 
     @Test
-    fun `closing a poll should emit a PollEndClicked event`() {
+    fun `closing a poll should emit a PollEndClicked event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TimelineEvent.TimelineItemPollEvent>()
         val content = aTimelineItemPollContent(
             isMine = true,
         )
-        rule.setContent {
+        setContent {
             TimelineItemPollView(
                 content = content,
                 eventSink = eventsRecorder
             )
         }
-        rule.clickOn(CommonStrings.action_end_poll)
+        clickOn(CommonStrings.action_end_poll)
         // A confirmation dialog should be shown
         eventsRecorder.assertEmpty()
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(TimelineEvent.EndPoll(content.eventId!!))
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineTextViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineTextViewTest.kt
index 154225aa7a..d0203d0329 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineTextViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineTextViewTest.kt
@@ -6,17 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.timeline.components.event
 
 import android.text.SpannableString
 import android.text.SpannedString
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextContent
@@ -36,47 +38,41 @@ import io.element.android.libraries.textcomposer.mentions.MentionType
 import io.element.android.libraries.textcomposer.mentions.getMentionSpans
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.wysiwyg.view.spans.CustomMentionSpan
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class TimelineTextViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class TimelineTextViewTest : RobolectricTest() {
     private val mentionSpanTheme = MentionSpanTheme(currentUserId = A_USER_ID)
     private val formatLambda = lambdaRecorder<MentionType, CharSequence> { mentionType -> mentionType.toString() }
     private val mentionSpanFormatter = FakeMentionSpanFormatter(formatLambda)
 
     @Test
-    fun `getTextWithResolvedMentions - does nothing for a non spannable CharSequence`() = runTest {
+    fun `getTextWithResolvedMentions - does nothing for a non spannable CharSequence`() = runAndroidComposeUiTest {
         val charSequence = "Hello <a href=\"https://matrix.to/#/@alice:example.com\">@alice:example.com</a>"
         val mentionSpanUpdater = aMentionSpanUpdater()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
 
         assertThat(result.getMentionSpans()).isEmpty()
         assert(formatLambda).isNeverCalled()
     }
 
     @Test
-    fun `getTextWithResolvedMentions - does nothing if there are no mentions`() = runTest {
+    fun `getTextWithResolvedMentions - does nothing if there are no mentions`() = runAndroidComposeUiTest {
         val charSequence = SpannableString("Hello <a href=\"https://matrix.to/#/@alice:example.com\">@alice:example.com</a>")
         val mentionSpanUpdater = aMentionSpanUpdater()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
 
         assertThat(result.getMentionSpans()).isEmpty()
         assert(formatLambda).isNeverCalled()
     }
 
     @Test
-    fun `getTextWithResolvedMentions - just returns the body if there is no formattedBody`() = runTest {
+    fun `getTextWithResolvedMentions - just returns the body if there is no formattedBody`() = runAndroidComposeUiTest {
         val charSequence = "Hello <a href=\"https://matrix.to/#/@alice:example.com\">@alice:example.com</a>"
         val mentionSpanUpdater = aMentionSpanUpdater()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(body = charSequence, formattedBody = null))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(body = charSequence, formattedBody = null))
 
         assertThat(result.getMentionSpans()).isEmpty()
         assertThat(result.toString()).isEqualTo(charSequence)
@@ -84,7 +80,7 @@ class TimelineTextViewTest {
     }
 
     @Test
-    fun `getTextWithResolvedMentions - with Room mention format correctly`() = runTest {
+    fun `getTextWithResolvedMentions - with Room mention format correctly`() = runAndroidComposeUiTest {
         val mentionType = MentionType.Room(roomIdOrAlias = A_ROOM_ID_2.toRoomIdOrAlias())
         val charSequence = buildSpannedString {
             append("Hello ")
@@ -93,7 +89,7 @@ class TimelineTextViewTest {
             }
         }
         val mentionSpanUpdater = aMentionSpanUpdater()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
 
         val expectedDisplayText = mentionType.toString()
         assertThat(result.getMentionSpans().firstOrNull()?.displayText.toString()).isEqualTo(expectedDisplayText)
@@ -102,7 +98,7 @@ class TimelineTextViewTest {
     }
 
     @Test
-    fun `getTextWithResolvedMentions - replaces MentionSpan's text`() = runTest {
+    fun `getTextWithResolvedMentions - replaces MentionSpan's text`() = runAndroidComposeUiTest {
         val mentionType = MentionType.User(userId = A_USER_ID)
         val charSequence = buildSpannedString {
             append("Hello ")
@@ -111,7 +107,7 @@ class TimelineTextViewTest {
             }
         }
         val mentionSpanUpdater = aMentionSpanUpdater()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
 
         val expectedDisplayText = mentionType.toString()
         assertThat(result.getMentionSpans().firstOrNull()?.displayText.toString()).isEqualTo(expectedDisplayText)
@@ -119,7 +115,7 @@ class TimelineTextViewTest {
     }
 
     @Test
-    fun `getTextWithResolvedMentions - replaces MentionSpan's text inside CustomMentionSpan`() = runTest {
+    fun `getTextWithResolvedMentions - replaces MentionSpan's text inside CustomMentionSpan`() = runAndroidComposeUiTest {
         val mentionType = MentionType.User(userId = A_USER_ID)
         val charSequence = buildSpannedString {
             append("Hello ")
@@ -129,12 +125,12 @@ class TimelineTextViewTest {
         }
         val mentionSpanUpdater = aMentionSpanUpdater()
         val expectedDisplayText = mentionType.toString()
-        val result = rule.getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
+        val result = getText(mentionSpanUpdater, aTextContentWithFormattedBody(charSequence))
         assertThat(result.getMentionSpans().firstOrNull()?.displayText.toString()).isEqualTo(expectedDisplayText)
         assert(formatLambda).isCalledOnce()
     }
 
-    private suspend fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.getText(
+    private suspend fun AndroidComposeUiTest<ComponentActivity>.getText(
         mentionSpanUpdater: MentionSpanUpdater,
         content: TimelineItemTextBasedContent,
     ): CharSequence {
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
index 957b01d1ed..fc01184764 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
@@ -19,9 +19,13 @@ import androidx.core.text.inSpans
 import androidx.core.text.toSpannable
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
+import io.element.android.features.messages.impl.timeline.model.event.AttachmentItem
+import io.element.android.features.messages.impl.timeline.model.event.GalleryItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAttachmentsContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemAudioContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEmoteContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemGalleryContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemNoticeContent
@@ -47,6 +51,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
@@ -67,20 +73,18 @@ import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.test.runTest
 import org.jsoup.nodes.Document
 import org.junit.Assert.fail
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class TimelineItemContentMessageFactoryTest {
+class TimelineItemContentMessageFactoryTest : RobolectricTest() {
     @Test
     fun `test create OtherMessageType`() = runTest {
         val sut = createTimelineItemContentMessageFactory()
@@ -110,11 +114,9 @@ class TimelineItemContentMessageFactoryTest {
             eventId = AN_EVENT_ID,
         )
         val expected = TimelineItemLocationContent(
-            body = "body",
-            location = Location(lat = 1.0, lon = 2.0, accuracy = null),
             description = "description",
             assetType = assetType,
-            mode = TimelineItemLocationContent.Mode.Static,
+            mode = TimelineItemLocationContent.Mode.Static(location = Location(lat = 1.0, lon = 2.0, accuracy = null)),
             senderId = A_USER_ID,
             senderProfile = aProfileDetails(),
         )
@@ -166,16 +168,11 @@ class TimelineItemContentMessageFactoryTest {
             senderProfile = aProfileDetails(),
             eventId = AN_EVENT_ID,
         ) as TimelineItemTextContent
-        val expected = TimelineItemTextContent(
-            body = "https://www.example.org",
-            htmlDocument = null,
-            isEdited = false,
-            formattedBody = buildSpannedString {
-                inSpans(URLSpan("https://www.example.org")) {
-                    append("https://www.example.org")
-                }
+        val expected = TimelineItemTextContent(body = "https://www.example.org", htmlDocument = null, isEdited = false, formattedBody = buildSpannedString {
+            inSpans(URLSpan("https://www.example.org")) {
+                append("https://www.example.org")
             }
-        )
+        })
         assertThat(result.body).isEqualTo(expected.body)
         assertThat(result.htmlDocument).isEqualTo(expected.htmlDocument)
         assertThat(result.plainText).isEqualTo(expected.plainText)
@@ -200,9 +197,7 @@ class TimelineItemContentMessageFactoryTest {
                 append("and manually added link")
             }
         }.toSpannable()
-        val sut = createTimelineItemContentMessageFactory(
-            domConverterTransform = { expected }
-        )
+        val sut = createTimelineItemContentMessageFactory(domConverterTransform = { expected })
         val result = sut.create(
             content = createMessageContent(
                 type = TextMessageType(
@@ -219,9 +214,7 @@ class TimelineItemContentMessageFactoryTest {
 
     @Test
     fun `test create TextMessageType with unknown formatted body does nothing`() = runTest {
-        val sut = createTimelineItemContentMessageFactory(
-            htmlConverterTransform = { it }
-        )
+        val sut = createTimelineItemContentMessageFactory(htmlConverterTransform = { it })
         val result = sut.create(
             content = createMessageContent(
                 type = TextMessageType(
@@ -780,6 +773,428 @@ class TimelineItemContentMessageFactoryTest {
         (result as TimelineItemTextContent).formattedBody.assertSpannedEquals(expectedSpanned)
     }
 
+    @Test
+    fun `test create GalleryMessageType with image items returns TimelineItemGalleryContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Image(
+                            content = ImageMessageType(
+                                filename = "image.jpg",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("image_url"),
+                                info = ImageInfo(
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Jpeg,
+                                    size = 888L,
+                                    thumbnailInfo = ThumbnailInfo(height = 10L, width = 20L, mimetype = MimeTypes.Jpeg, size = 111L),
+                                    thumbnailSource = MediaSource("thumbnail_url"),
+                                    blurhash = A_BLUR_HASH,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemGalleryContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            items = persistentListOf(
+                GalleryItem(
+                    filename = "image.jpg",
+                    mimeType = MimeTypes.Jpeg,
+                    mediaSource = MediaSource("image_url"),
+                    type = GalleryItem.Type.Image,
+                    thumbnailSource = MediaSource("thumbnail_url"),
+                    width = 200,
+                    height = 100,
+                    thumbnailWidth = 20,
+                    thumbnailHeight = 10,
+                    blurhash = A_BLUR_HASH,
+                )
+            )
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with video items returns TimelineItemGalleryContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Video(
+                            content = VideoMessageType(
+                                filename = "video.mp4",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("video_url"),
+                                info = VideoInfo(
+                                    duration = 1.minutes,
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Mp4,
+                                    size = 1234L,
+                                    thumbnailInfo = ThumbnailInfo(height = 10L, width = 20L, mimetype = MimeTypes.Jpeg, size = 111L),
+                                    thumbnailSource = MediaSource("thumbnail_url"),
+                                    blurhash = A_BLUR_HASH,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemGalleryContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            items = persistentListOf(
+                GalleryItem(
+                    filename = "video.mp4",
+                    mimeType = MimeTypes.Mp4,
+                    mediaSource = MediaSource("video_url"),
+                    type = GalleryItem.Type.Video,
+                    thumbnailSource = MediaSource("thumbnail_url"),
+                    width = 200,
+                    height = 100,
+                    thumbnailWidth = 20,
+                    thumbnailHeight = 10,
+                    blurhash = A_BLUR_HASH,
+                    duration = 1.minutes,
+                )
+            )
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with audio items returns TimelineItemAttachmentsContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Audio(
+                            content = AudioMessageType(
+                                filename = "audio.mp3",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("audio_url"),
+                                info = AudioInfo(
+                                    duration = 1.minutes,
+                                    size = 123L,
+                                    mimetype = MimeTypes.Mp3,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemAttachmentsContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            attachments = persistentListOf(
+                AttachmentItem(
+                    filename = "audio.mp3",
+                    mimeType = MimeTypes.Mp3,
+                    mediaSource = MediaSource("audio_url"),
+                    thumbnailSource = null,
+                    fileSize = 123L,
+                    formattedFileSize = "123 Bytes",
+                    fileExtension = "mp3",
+                )
+            )
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with file items returns TimelineItemAttachmentsContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.File(
+                            content = FileMessageType(
+                                filename = "document.pdf",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("file_url"),
+                                info = FileInfo(
+                                    mimetype = MimeTypes.Pdf,
+                                    size = 456L,
+                                    thumbnailInfo = null,
+                                    thumbnailSource = null,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemAttachmentsContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            attachments = persistentListOf(
+                AttachmentItem(
+                    filename = "document.pdf",
+                    mimeType = MimeTypes.Pdf,
+                    mediaSource = MediaSource("file_url"),
+                    thumbnailSource = null,
+                    fileSize = 456L,
+                    formattedFileSize = "456 Bytes",
+                    fileExtension = "pdf",
+                )
+            )
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with image items without thumbnails returns TimelineItemAttachmentsContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Image(
+                            content = ImageMessageType(
+                                filename = "image.jpg",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("image_url"),
+                                info = ImageInfo(
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Jpeg,
+                                    size = 888L,
+                                    thumbnailInfo = null,
+                                    thumbnailSource = null,
+                                    blurhash = null,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemAttachmentsContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            attachments = persistentListOf(
+                AttachmentItem(
+                    filename = "image.jpg",
+                    mimeType = MimeTypes.Jpeg,
+                    mediaSource = MediaSource("image_url"),
+                    thumbnailSource = null,
+                    fileSize = 888L,
+                    formattedFileSize = "888 Bytes",
+                    fileExtension = "jpg",
+                )
+            )
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with only Other items returns TimelineItemAttachmentsContent with empty attachments`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Other(itemType = "unknown_type", body = "Some body")
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        val expected = TimelineItemAttachmentsContent(
+            body = "Gallery body",
+            caption = "Gallery body",
+            formattedCaption = null,
+            isEdited = false,
+            attachments = persistentListOf(),
+        )
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with mixed image and file items returns TimelineItemAttachmentsContent`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Image(
+                            content = ImageMessageType(
+                                filename = "image.jpg",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("image_url"),
+                                info = ImageInfo(
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Jpeg,
+                                    size = 888L,
+                                    thumbnailInfo = ThumbnailInfo(height = 10L, width = 20L, mimetype = MimeTypes.Jpeg, size = 111L),
+                                    thumbnailSource = MediaSource("thumbnail_url"),
+                                    blurhash = null,
+                                )
+                            )
+                        ),
+                        GalleryItemType.File(
+                            content = FileMessageType(
+                                filename = "document.pdf",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("file_url"),
+                                info = FileInfo(
+                                    mimetype = MimeTypes.Pdf,
+                                    size = 456L,
+                                    thumbnailInfo = null,
+                                    thumbnailSource = null,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        assertThat(result).isInstanceOf(TimelineItemAttachmentsContent::class.java)
+        val attachmentsContent = result as TimelineItemAttachmentsContent
+        assertThat(attachmentsContent.attachments).hasSize(2)
+    }
+
+    @Test
+    fun `test create GalleryMessageType with formatted caption returns TimelineItemGalleryContent with formatted caption`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "Gallery body",
+                    formatted = FormattedBody(MessageFormat.HTML, "formatted"),
+                    items = listOf(
+                        GalleryItemType.Image(
+                            content = ImageMessageType(
+                                filename = "image.jpg",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("image_url"),
+                                info = ImageInfo(
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Jpeg,
+                                    size = 888L,
+                                    thumbnailInfo = ThumbnailInfo(height = 10L, width = 20L, mimetype = MimeTypes.Jpeg, size = 111L),
+                                    thumbnailSource = MediaSource("thumbnail_url"),
+                                    blurhash = null,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        assertThat(result).isInstanceOf(TimelineItemGalleryContent::class.java)
+        val galleryContent = result as TimelineItemGalleryContent
+        galleryContent.formattedCaption.assertSpannedEquals(SpannedString("formatted"))
+    }
+
+    @Test
+    fun `test create GalleryMessageType with empty body has no caption`() = runTest {
+        val sut = createTimelineItemContentMessageFactory()
+        val result = sut.create(
+            content = createMessageContent(
+                type = GalleryMessageType(
+                    body = "",
+                    formatted = null,
+                    items = listOf(
+                        GalleryItemType.Image(
+                            content = ImageMessageType(
+                                filename = "image.jpg",
+                                caption = null,
+                                formattedCaption = null,
+                                source = MediaSource("image_url"),
+                                info = ImageInfo(
+                                    height = 100L,
+                                    width = 200L,
+                                    mimetype = MimeTypes.Jpeg,
+                                    size = 888L,
+                                    thumbnailInfo = ThumbnailInfo(height = 10L, width = 20L, mimetype = MimeTypes.Jpeg, size = 111L),
+                                    thumbnailSource = MediaSource("thumbnail_url"),
+                                    blurhash = null,
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            senderId = A_USER_ID,
+            senderProfile = aProfileDetails(),
+            eventId = AN_EVENT_ID,
+        )
+        assertThat(result).isInstanceOf(TimelineItemGalleryContent::class.java)
+        val galleryContent = result as TimelineItemGalleryContent
+        assertThat(galleryContent.caption).isNull()
+        assertThat(galleryContent.formattedCaption).isNull()
+    }
+
     private fun createMessageContent(
         body: String = "Body",
         inReplyTo: InReplyTo? = null,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/GroupabilityTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/GroupabilityTest.kt
new file mode 100644
index 0000000000..fde84ca77a
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/GroupabilityTest.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.groups
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.messages.impl.timeline.aGroupedEvents
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UniqueId
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import org.junit.Test
+
+class GroupabilityTest {
+    private fun redacted(id: String) = aTimelineItemEvent(
+        eventId = EventId(id),
+        content = TimelineItemRedactedContent,
+    )
+
+    private fun groupOf(vararg events: TimelineItem.Event) = TimelineItem.GroupedEvents(
+        id = UniqueId("group"),
+        events = events.toList().toImmutableList(),
+        aggregatedReadReceipts = persistentListOf(),
+    )
+
+    @Test
+    fun `a group made only of redacted events is a redacted messages group`() {
+        val group = groupOf(redacted("\$R1"), redacted("\$R2"), redacted("\$R3"))
+        assertThat(group.isRedactedMessagesGroup()).isTrue()
+    }
+
+    @Test
+    fun `a group of state changes is not a redacted messages group`() {
+        // aGroupedEvents builds a run of state events.
+        assertThat(aGroupedEvents().isRedactedMessagesGroup()).isFalse()
+    }
+
+    @Test
+    fun `a group mixing redacted and non-redacted events is not a redacted messages group`() {
+        val group = groupOf(redacted("\$R1"), aTimelineItemEvent(eventId = EventId("\$E")), redacted("\$R2"))
+        assertThat(group.isRedactedMessagesGroup()).isFalse()
+    }
+
+    @Test
+    fun `an empty group is not a redacted messages group`() {
+        val group = TimelineItem.GroupedEvents(
+            id = UniqueId("group"),
+            events = persistentListOf(),
+            aggregatedReadReceipts = persistentListOf(),
+        )
+        assertThat(group.isRedactedMessagesGroup()).isFalse()
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt
index 726646f5e9..005eb5730e 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/groups/TimelineItemGrouperTest.kt
@@ -15,6 +15,7 @@ import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.ReadReceiptData
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReadReceipts
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRedactedContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateEventContent
 import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
@@ -169,4 +170,31 @@ class TimelineItemGrouperTest {
         // Then
         assertThat(actualGroupId).isEqualTo(expectedGroupId)
     }
+
+    @Test
+    fun `a run of three or more redacted events is collapsed into a single group as a final step`() {
+        val r0 = aGroupableItem.copy(id = UniqueId("r0"), content = TimelineItemRedactedContent)
+        val r1 = aGroupableItem.copy(id = UniqueId("r1"), content = TimelineItemRedactedContent)
+        val r2 = aGroupableItem.copy(id = UniqueId("r2"), content = TimelineItemRedactedContent)
+        val result = sut.group(listOf(r0, r1, r2))
+        assertThat(result).isEqualTo(
+            listOf(
+                TimelineItem.GroupedEvents(
+                    id = computeGroupIdWith(r2),
+                    // Stored oldest-first (the input is newest-first) with the id keyed by the
+                    // oldest member through the shared registry, like the other groups.
+                    events = listOf(r2, r1, r0).toImmutableList(),
+                    aggregatedReadReceipts = emptyList<ReadReceiptData>().toImmutableList(),
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `a run of fewer than three redacted events is left untouched`() {
+        val r0 = aGroupableItem.copy(id = UniqueId("r0"), content = TimelineItemRedactedContent)
+        val r1 = aGroupableItem.copy(id = UniqueId("r1"), content = TimelineItemRedactedContent)
+        val result = sut.group(listOf(r0, r1))
+        assertThat(result).isEqualTo(listOf(r0, r1))
+    }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedViewTest.kt
index af3acee6a2..aef12deeca 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/ProtectedViewTest.kt
@@ -6,56 +6,53 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.messages.impl.timeline.protection
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.lambda.lambdaError
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ProtectedViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ProtectedViewTest : RobolectricTest() {
     @Test
-    fun `when hideContent is false, the content is rendered`() {
-        rule.setProtectedView(
+    fun `when hideContent is false, the content is rendered`() = runAndroidComposeUiTest {
+        setProtectedView(
             hideContent = false,
             content = {
                 Text("Hello")
             }
         )
-        rule.onNodeWithText("Hello").assertExists()
+        onNodeWithText("Hello").assertExists()
     }
 
     @Test
-    fun `when hideContent is true, the content is not rendered, and user can reveal it`() {
+    fun `when hideContent is true, the content is not rendered, and user can reveal it`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setProtectedView(
+            setProtectedView(
                 hideContent = true,
                 onShowClick = it,
                 content = {
                     Text("Hello")
                 }
             )
-            rule.onNodeWithText("Hello").assertDoesNotExist()
-            rule.clickOn(CommonStrings.action_show)
+            onNodeWithText("Hello").assertDoesNotExist()
+            clickOn(CommonStrings.action_show)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setProtectedView(
+private fun AndroidComposeUiTest<ComponentActivity>.setProtectedView(
     hideContent: Boolean = false,
     onShowClick: () -> Unit = { lambdaError() },
     content: @Composable () -> Unit = {},
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
index d6af8ebd68..11142cc9a2 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
@@ -9,19 +9,27 @@
 package io.element.android.features.messages.impl.timeline.protection
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.libraries.matrix.api.media.MediaPreviewConfig
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
+import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.media.FakeMediaPreviewService
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -87,11 +95,48 @@ class TimelineProtectionPresenterTest {
         }
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - validate media scans the media source`() = runTest {
+        val url = "https://example.com/media"
+
+        val mediaPreviewConfig = MediaPreviewConfig(mediaPreviewValue = MediaPreviewValue.Private, hideInviteAvatar = false)
+        val mediaPreviewService = FakeMediaPreviewService(mediaPreviewConfigFlow = MutableStateFlow(mediaPreviewConfig))
+        val room = FakeBaseRoom(initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite), roomCoroutineScope = backgroundScope)
+        val contentScannerService = lambdaRecorder { _: List<MediaSource>, state: ContentValidationState ->
+            state.update(url, ContentValidationValue.Valid)
+        }
+        val presenter = createPresenter(
+            mediaPreviewService = mediaPreviewService,
+            room = room,
+            contentScannerService = contentScannerService,
+        )
+        presenter.test {
+            val validationState = DefaultContentValidationState(initial = mapOf(url to ContentValidationValue.Unknown))
+            assertThat(validationState.getCurrentOverallState().isValid()).isFalse()
+
+            val initialState = awaitItem()
+            initialState.eventSink(
+                TimelineProtectionEvent.ValidateContent(
+                    mediaSources = listOf(MediaSource(url)),
+                    validationState = validationState
+                )
+            )
+
+            runCurrent()
+
+            contentScannerService.assertions().isCalledOnce()
+            assertThat(validationState.getCurrentOverallState().isValid()).isTrue()
+        }
+    }
+
     private fun createPresenter(
         room: BaseRoom = FakeBaseRoom(),
         mediaPreviewService: MediaPreviewService = FakeMediaPreviewService(),
+        contentScannerService: ContentScannerService = ContentScannerService { _: List<MediaSource>, _: ContentValidationState -> },
     ) = TimelineProtectionPresenter(
         mediaPreviewService = mediaPreviewService,
         room = room,
+        contentScannerService = contentScannerService,
     )
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateTest.kt
index 645039b30c..c5709588f0 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionStateTest.kt
@@ -42,4 +42,19 @@ class TimelineProtectionStateTest {
         assertThat(sut.hideMediaContent(AN_EVENT_ID)).isFalse()
         assertThat(sut.hideMediaContent(AN_EVENT_ID_2)).isTrue()
     }
+
+    @Test
+    fun `when isMine is true, hideMediaContent always returns false regardless of state`() {
+        val sutRenderAll = aTimelineProtectionState(
+            protectionState = ProtectionState.RenderAll
+        )
+        assertThat(sutRenderAll.hideMediaContent(null, isMine = true)).isFalse()
+        assertThat(sutRenderAll.hideMediaContent(AN_EVENT_ID, isMine = true)).isFalse()
+
+        val sutRenderOnly = aTimelineProtectionState(
+            protectionState = ProtectionState.RenderOnly(persistentSetOf())
+        )
+        assertThat(sutRenderOnly.hideMediaContent(null, isMine = true)).isFalse()
+        assertThat(sutRenderOnly.hideMediaContent(AN_EVENT_ID, isMine = true)).isFalse()
+    }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandlerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandlerTest.kt
new file mode 100644
index 0000000000..c4861ba57b
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/util/AsyncImageStateHandlerTest.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.timeline.util
+
+import androidx.compose.ui.graphics.painter.Painter
+import coil3.compose.AsyncImagePainter
+import coil3.request.ErrorResult
+import coil3.request.SuccessResult
+import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.api.exception.ContentScannerErrorReason
+import io.element.android.libraries.matrix.api.exception.ContentScannerErrorReason.MCS_MEDIA_NOT_CLEAN
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.mockk.mockk
+import org.junit.Test
+import java.io.FileNotFoundException
+
+class AsyncImageStateHandlerTest {
+    @Test
+    fun `test Empty state sets the content validation state to Unknown`() {
+        val updateContentValidationState = lambdaRecorder<ContentValidationValue, Unit> {}
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Empty,
+            onLoaded = {},
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        updateContentValidationState.assertions().isCalledOnce().with(value(ContentValidationValue.Unknown))
+    }
+
+    @Test
+    fun `test Loading state sets the content validation state to Loading`() {
+        val updateContentValidationState = lambdaRecorder<ContentValidationValue, Unit> {}
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Loading(null),
+            onLoaded = {},
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        updateContentValidationState.assertions().isCalledOnce().with(value(ContentValidationValue.Loading))
+    }
+
+    @Test
+    fun `test Success state sets the content validation state to Valid and triggers onLoaded callback`() {
+        val updateContentValidationState = lambdaRecorder<ContentValidationValue, Unit> {}
+        val onLoaded = lambdaRecorder<Unit> {}
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Success(mockk<Painter>(), SuccessResult(mockk(), mockk())),
+            onLoaded = onLoaded,
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        onLoaded.assertions().isCalledOnce()
+        updateContentValidationState.assertions().isCalledOnce().with(value(ContentValidationValue.Valid))
+    }
+
+    @Test
+    fun `test Failure state sets the content validation state to Invalid if the error matches`() {
+        val updateContentValidationState = lambdaRecorder<ContentValidationValue, Unit> {}
+        val onLoaded = lambdaRecorder<Unit> {}
+        val mediaNotCleanError = ClientException.ContentScanner("dangerous", MCS_MEDIA_NOT_CLEAN)
+        val forbiddenMimeTypeError = ClientException.ContentScanner("dangerous", ContentScannerErrorReason.MCS_MIME_TYPE_FORBIDDEN)
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Error(null, ErrorResult(null, mockk(), mediaNotCleanError)),
+            onLoaded = onLoaded,
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Error(null, ErrorResult(null, mockk(), forbiddenMimeTypeError)),
+            onLoaded = onLoaded,
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        onLoaded.assertions().isNeverCalled()
+        updateContentValidationState.assertions()
+            .isCalledExactly(2)
+            .withSequence(
+                listOf(value(ContentValidationValue.Invalid)),
+                listOf(value(ContentValidationValue.Invalid))
+            )
+    }
+
+    @Test
+    fun `test Failure state sets the content validation state to Uknown if the error does not match a content scanner one`() {
+        val updateContentValidationState = lambdaRecorder<ContentValidationValue, Unit> {}
+        val onLoaded = lambdaRecorder<Unit> {}
+        val error = FileNotFoundException("File not found")
+        handleAsyncImageStateChange(
+            state = AsyncImagePainter.State.Error(null, ErrorResult(null, mockk(), error)),
+            onLoaded = onLoaded,
+            updateContentValidationState = updateContentValidationState,
+        )
+
+        onLoaded.assertions().isNeverCalled()
+        updateContentValidationState.assertions().isCalledOnce().with(value(ContentValidationValue.Unknown))
+    }
+}
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultMessageSummaryFormatterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultMessageSummaryFormatterTest.kt
new file mode 100644
index 0000000000..06e436d64c
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultMessageSummaryFormatterTest.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.utils
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.location.api.Location
+import io.element.android.features.messages.impl.timeline.model.event.RtcNotificationState
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent.Mode
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
+import io.element.android.features.messages.impl.utils.messagesummary.DefaultMessageSummaryFormatter
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.timeline.aProfileDetails
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+
+class DefaultMessageSummaryFormatterTest : RobolectricTest() {
+    private val formatter = DefaultMessageSummaryFormatter(
+        RuntimeEnvironment.getApplication() as Context
+    )
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `format call notification started`() {
+        val expected = formatter.format(
+            TimelineItemRtcNotificationContent(
+                callIntent = CallIntent.VIDEO,
+                state = RtcNotificationState.Started
+            )
+        )
+        assertThat(expected).isEqualTo("Call started")
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `format call notification declined by me`() {
+        val expected = formatter.format(
+            TimelineItemRtcNotificationContent(
+                callIntent = CallIntent.VIDEO,
+                state = RtcNotificationState.Declined(byMe = true)
+            )
+        )
+        assertThat(expected).isEqualTo("You declined a call")
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `format call notification declined`() {
+        val expected = formatter.format(
+            TimelineItemRtcNotificationContent(
+                callIntent = CallIntent.VIDEO,
+                state = RtcNotificationState.Declined(byMe = false)
+            )
+        )
+        assertThat(expected).isEqualTo("Call declined")
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `format live location`() {
+        val expected = formatter.format(
+            aLocationContent(isLive = true)
+        )
+        assertThat(expected).isEqualTo("Shared live location")
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `format static location`() {
+        val expected = formatter.format(
+            aLocationContent(isLive = false)
+        )
+        assertThat(expected).isEqualTo("Shared location")
+    }
+}
+
+private fun aLocationContent(isLive: Boolean) = TimelineItemLocationContent(
+    senderId = A_USER_ID,
+    senderProfile = aProfileDetails(),
+    description = null,
+    assetType = null,
+    mode = if (isLive) {
+        Mode.Live(
+            lastKnownLocation = Location.fromGeoUri("geo:1,5"),
+            isActive = true,
+            endsAt = "",
+            endTimestamp = 0,
+            isOwnUser = true,
+        )
+    } else {
+        Mode.Static(
+            location = Location.fromGeoUri("geo:1,5")!!,
+        )
+    }
+)
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultTextPillificationHelperTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultTextPillificationHelperTest.kt
index 16c8c922ca..6390c2ba48 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultTextPillificationHelperTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/utils/DefaultTextPillificationHelperTest.kt
@@ -9,7 +9,6 @@
 package io.element.android.features.messages.impl.utils
 
 import android.net.Uri
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -27,11 +26,10 @@ import io.element.android.libraries.textcomposer.mentions.MentionSpanProvider
 import io.element.android.libraries.textcomposer.mentions.MentionSpanTheme
 import io.element.android.libraries.textcomposer.mentions.MentionType
 import io.element.android.libraries.textcomposer.mentions.getMentionSpans
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultTextPillificationHelperTest {
+class DefaultTextPillificationHelperTest : RobolectricTest() {
     @Test
     fun `pillify - adds pills for user ids`() {
         val text = "A @user:server.com"
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
index 9c55bf3a85..7d3b6cf647 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/DefaultVoiceMessageComposerPresenterTest.kt
@@ -24,6 +24,7 @@ import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -46,7 +47,9 @@ import io.element.android.libraries.voicerecorder.api.VoiceRecorder
 import io.element.android.libraries.voicerecorder.test.FakeVoiceRecorder
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -59,6 +62,7 @@ import java.io.File
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
+@Suppress("LargeClass")
 class DefaultVoiceMessageComposerPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
@@ -406,6 +410,37 @@ class DefaultVoiceMessageComposerPresenterTest {
         }
     }
 
+    @Test
+    fun `present - send voice message passes reply event ID only when in reply mode`() = runTest {
+        val presenter = createDefaultVoiceMessageComposerPresenter()
+        presenter.test {
+            // First send in Normal mode (default composerMode).
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
+            assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
+            val idleAfterFirstSend = awaitItem()
+            assertThat(idleAfterFirstSend.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
+
+            // Switching to reply mode does not trigger recomposition, so reuse the prior eventSink.
+            messageComposerContext.composerMode = aReplyMode()
+            idleAfterFirstSend.eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Start))
+            awaitItem().eventSink(VoiceMessageComposerEvent.RecorderEvent(VoiceMessageRecorderEvent.Stop))
+            awaitItem().eventSink(VoiceMessageComposerEvent.SendVoiceMessage)
+            assertThat(awaitItem().voiceMessageState).isEqualTo(aPreviewState().toSendingState())
+            val finalState = awaitItem()
+            assertThat(finalState.voiceMessageState).isEqualTo(VoiceMessageState.Idle)
+
+            sendVoiceMessageResult.assertions().isCalledExactly(2)
+                .withSequence(
+                    listOf(any(), any(), any(), value(null)),
+                    listOf(any(), any(), any(), value(AN_EVENT_ID)),
+                )
+
+            testPauseAndDestroy(finalState)
+        }
+    }
+
     @Test
     fun `present - send while playing`() = runTest {
         val presenter = createDefaultVoiceMessageComposerPresenter()
diff --git a/features/messages/test/build.gradle.kts b/features/messages/test/build.gradle.kts
index 29c00ece73..f89dd8de06 100644
--- a/features/messages/test/build.gradle.kts
+++ b/features/messages/test/build.gradle.kts
@@ -16,6 +16,7 @@ android {
 
 dependencies {
     api(projects.features.messages.impl)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.test)
     implementation(projects.libraries.audio.test)
     implementation(projects.libraries.mediaplayer.test)
@@ -26,5 +27,5 @@ dependencies {
     implementation(projects.libraries.voicerecorder.test)
     implementation(projects.services.analytics.test)
     implementation(projects.tests.testutils)
-    implementation(projects.libraries.mediaupload.impl)
+    implementation(projects.libraries.mediaupload.api)
 }
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeMediaOptimizationSelectorPresenterFactory.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeMediaOptimizationSelectorPresenterFactory.kt
index 02a6918ad8..af068a14c2 100644
--- a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeMediaOptimizationSelectorPresenterFactory.kt
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/attachments/video/FakeMediaOptimizationSelectorPresenterFactory.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 class FakeMediaOptimizationSelectorPresenterFactory(
     private val fakePresenter: MediaOptimizationSelectorPresenter = MediaOptimizationSelectorPresenter {
         MediaOptimizationSelectorState(
+            index = 0,
             maxUploadSize = AsyncData.Uninitialized,
             videoSizeEstimations = AsyncData.Uninitialized,
             isImageOptimizationEnabled = null,
@@ -26,7 +27,7 @@ class FakeMediaOptimizationSelectorPresenterFactory(
         )
     }
 ) : MediaOptimizationSelectorPresenter.Factory {
-    override fun create(localMedia: LocalMedia): MediaOptimizationSelectorPresenter {
+    override fun create(index: Int, localMedia: LocalMedia, sendAsFile: Boolean): MediaOptimizationSelectorPresenter {
         return fakePresenter
     }
 }
diff --git a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/voicemessages/composer/FakeDefaultVoiceMessageComposerPresenterFactory.kt b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/voicemessages/composer/FakeDefaultVoiceMessageComposerPresenterFactory.kt
index 17de179b55..466bfba4fd 100644
--- a/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/voicemessages/composer/FakeDefaultVoiceMessageComposerPresenterFactory.kt
+++ b/features/messages/test/src/main/kotlin/io/element/android/features/messages/test/timeline/voicemessages/composer/FakeDefaultVoiceMessageComposerPresenterFactory.kt
@@ -12,13 +12,10 @@ import io.element.android.features.messages.impl.voicemessages.composer.DefaultV
 import io.element.android.features.messages.impl.voicemessages.composer.VoiceMessageComposerPlayer
 import io.element.android.features.messages.test.FakeMessageComposerContext
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaplayer.test.FakeAudioFocus
 import io.element.android.libraries.mediaplayer.test.FakeMediaPlayer
 import io.element.android.libraries.mediaupload.api.MediaSender
-import io.element.android.libraries.mediaupload.impl.DefaultMediaSender
-import io.element.android.libraries.mediaupload.test.FakeMediaOptimizationConfigProvider
-import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
+import io.element.android.libraries.mediaupload.test.FakeMediaSender
 import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
 import io.element.android.libraries.voicerecorder.test.FakeVoiceRecorder
 import io.element.android.services.analytics.test.FakeAnalyticsService
@@ -26,12 +23,7 @@ import kotlinx.coroutines.CoroutineScope
 
 class FakeDefaultVoiceMessageComposerPresenterFactory(
     private val sessionCoroutineScope: CoroutineScope,
-    private val mediaSender: MediaSender = DefaultMediaSender(
-        preProcessor = FakeMediaPreProcessor(),
-        room = FakeJoinedRoom(),
-        timelineMode = Timeline.Mode.Live,
-        mediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
-    ),
+    private val mediaSender: MediaSender = FakeMediaSender(),
 ) : DefaultVoiceMessageComposerPresenter.Factory {
     override fun create(timelineMode: Timeline.Mode): DefaultVoiceMessageComposerPresenter {
         return DefaultVoiceMessageComposerPresenter(
diff --git a/features/migration/impl/build.gradle.kts b/features/migration/impl/build.gradle.kts
index a37c3be882..1ba0953349 100644
--- a/features/migration/impl/build.gradle.kts
+++ b/features/migration/impl/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     implementation(projects.features.migration.api)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.androidutils)
-    implementation(projects.libraries.preferences.impl)
+    implementation(projects.libraries.preferences.api)
     implementation(libs.androidx.datastore.preferences)
     implementation(projects.features.rageshake.api)
     implementation(projects.libraries.designsystem)
diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04Test.kt
index 7b954abf86..591c31c7da 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration04Test.kt
@@ -10,13 +10,11 @@ package io.element.android.features.migration.impl.migrations
 
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class AppMigration04Test {
+class AppMigration04Test : RobolectricTest() {
     @Test
     fun `test migration`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
diff --git a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorContainer.kt b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorContainer.kt
index 7c3ff4a988..7d05fa7298 100644
--- a/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorContainer.kt
+++ b/features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/ui/ConnectivityIndicatorContainer.kt
@@ -19,16 +19,15 @@ import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 
 private val INDICATOR_VERTICAL_PADDING = 6.dp
 
@@ -47,7 +46,7 @@ fun ConnectivityIndicatorContainer(
             // Needed to get valid UI previews
             24.dp
         } else {
-            WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + INDICATOR_VERTICAL_PADDING
+            scaffoldScrollableContentInsets.asPaddingValues().calculateTopPadding() + INDICATOR_VERTICAL_PADDING
         }
         val target = if (isIndicatorVisible.targetState) statusBarTopPadding else 0.dp
         val topWindowInset by animateDpAsState(
diff --git a/features/networkmonitor/impl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt b/features/networkmonitor/impl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt
index 7cffa057bc..6981d2c6af 100644
--- a/features/networkmonitor/impl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt
+++ b/features/networkmonitor/impl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt
@@ -15,13 +15,11 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
-import android.os.Build
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
-import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
@@ -44,7 +42,6 @@ import java.util.concurrent.atomic.AtomicInteger
 class DefaultNetworkMonitor(
     @ApplicationContext context: Context,
     @AppCoroutineScope appCoroutineScope: CoroutineScope,
-    private val buildMeta: BuildMeta,
 ) : NetworkMonitor {
     private val connectivityManager: ConnectivityManager = context.getSystemService(ConnectivityManager::class.java)
 
@@ -76,17 +73,10 @@ class DefaultNetworkMonitor(
             }
 
             override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-                if (!buildMeta.isEnterpriseBuild) {
-                    // The air-gapped environment detection is only relevant for the enterprise build.
-                    return
-                }
-
                 if (network.networkHandle == connectivityManager.activeNetwork?.networkHandle) {
                     // If the network doesn't have the NET_CAPABILITY_VALIDATED capability, it means that the network is not able to reach the internet
                     // (according to Google), which is a common case in air-gapped environments.
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                        isInAirGappedEnvironment.value = !networkCapabilities.capabilities.contains(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                    }
+                    isInAirGappedEnvironment.value = !networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
                 }
             }
 
diff --git a/features/poll/api/src/main/res/values-da/translations.xml b/features/poll/api/src/main/res/values-da/translations.xml
index 58517b3ec4..c62a1ff2d0 100644
--- a/features/poll/api/src/main/res/values-da/translations.xml
+++ b/features/poll/api/src/main/res/values-da/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="a11y_polls_percent_of_total">
-    <item quantity="one">"%1$d% af de samlede stemmer"</item>
+    <item quantity="one">"%1$d%% af de samlede stemmer"</item>
     <item quantity="other">"%1$d procent af det samlede antal stemmer"</item>
   </plurals>
   <string name="a11y_polls_will_remove_selection">"Fjerner tidligere valg"</string>
diff --git a/features/poll/api/src/main/res/values-ja/translations.xml b/features/poll/api/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..b40e58d11f
--- /dev/null
+++ b/features/poll/api/src/main/res/values-ja/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="a11y_polls_percent_of_total">
+    <item quantity="other">"総投票数うち%1$d%%"</item>
+  </plurals>
+  <string name="a11y_polls_will_remove_selection">"前の項目を削除します"</string>
+  <string name="a11y_polls_winning_answer">"投票の勝者はこちらです"</string>
+</resources>
diff --git a/features/poll/api/src/main/res/values-vi/translations.xml b/features/poll/api/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..9c94ec71f6
--- /dev/null
+++ b/features/poll/api/src/main/res/values-vi/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="a11y_polls_percent_of_total">
+    <item quantity="other">"%1$d phần trăm tổng số phiếu bầu"</item>
+  </plurals>
+  <string name="a11y_polls_will_remove_selection">"Xóa lựa chọn trước đó"</string>
+  <string name="a11y_polls_winning_answer">"Đây là câu trả lời chiến thắng"</string>
+</resources>
diff --git a/features/poll/api/src/main/res/values-zh/translations.xml b/features/poll/api/src/main/res/values-zh/translations.xml
index 773d2b03fc..15f71240d4 100644
--- a/features/poll/api/src/main/res/values-zh/translations.xml
+++ b/features/poll/api/src/main/res/values-zh/translations.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="a11y_polls_percent_of_total">
-    <item quantity="other">"%1$d 总投票百分比"</item>
+    <item quantity="other">"占总投票的 %1$d%"</item>
   </plurals>
   <string name="a11y_polls_will_remove_selection">"将移除之前的选择"</string>
-  <string name="a11y_polls_winning_answer">"这是获胜的答案"</string>
+  <string name="a11y_polls_winning_answer">"此为胜出的答案"</string>
 </resources>
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
index 1ba8044566..ea234f1b4d 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
@@ -112,7 +112,7 @@ fun CreatePollView(
             item {
                 Column {
                     ListItem(
-                        headlineContent = {
+                        content = {
                             TextField(
                                 label = stringResource(id = R.string.screen_create_poll_question_desc),
                                 value = state.question,
@@ -132,7 +132,7 @@ fun CreatePollView(
             itemsIndexed(state.answers) { index, answer ->
                 val isLastItem = index == state.answers.size - 1
                 ListItem(
-                    headlineContent = {
+                    content = {
                         TextField(
                             value = answer.text,
                             onValueChange = {
@@ -160,7 +160,7 @@ fun CreatePollView(
             if (state.canAddAnswer) {
                 item {
                     ListItem(
-                        headlineContent = { Text(text = stringResource(id = R.string.screen_create_poll_add_option_btn)) },
+                        content = { Text(text = stringResource(id = R.string.screen_create_poll_add_option_btn)) },
                         leadingContent = ListItemContent.Icon(
                             iconSource = IconSource.Vector(CompoundIcons.Plus()),
                         ),
@@ -179,7 +179,7 @@ fun CreatePollView(
                 Column {
                     HorizontalDivider()
                     ListItem(
-                        headlineContent = { Text(text = stringResource(id = R.string.screen_create_poll_max_selections_headline)) },
+                        content = { Text(text = stringResource(id = R.string.screen_create_poll_max_selections_headline)) },
                         trailingContent = ListItemContent.Custom {
                             MaxSelectionsStepper(
                                 current = state.maxSelections,
@@ -190,7 +190,7 @@ fun CreatePollView(
                         },
                     )
                     ListItem(
-                        headlineContent = { Text(text = stringResource(id = R.string.screen_create_poll_anonymous_headline)) },
+                        content = { Text(text = stringResource(id = R.string.screen_create_poll_anonymous_headline)) },
                         supportingContent = { Text(text = stringResource(id = R.string.screen_create_poll_anonymous_desc)) },
                         trailingContent = ListItemContent.Switch(
                             checked = state.pollKind == PollKind.Undisclosed,
@@ -205,7 +205,7 @@ fun CreatePollView(
                     )
                     if (state.canDelete) {
                         ListItem(
-                            headlineContent = { Text(text = stringResource(id = CommonStrings.action_delete_poll)) },
+                            content = { Text(text = stringResource(id = CommonStrings.action_delete_poll)) },
                             style = ListItemStyle.Destructive,
                             onClick = { state.eventSink(CreatePollEvent.Delete(confirmed = false)) },
                         )
diff --git a/features/poll/impl/src/main/res/values-ca/translations.xml b/features/poll/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..21385e6473
--- /dev/null
+++ b/features/poll/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_poll_add_option_btn">"Afegeix opció"</string>
+  <string name="screen_create_poll_anonymous_desc">"Mostra els resultats només quan hagi finalitzat la votació"</string>
+  <string name="screen_create_poll_anonymous_headline">"Amaga vots"</string>
+  <string name="screen_create_poll_answer_hint">"Opció %1$d"</string>
+  <string name="screen_create_poll_cancel_confirmation_content_android">"Els canvis no s\'han desat. Segur que vols tornar enrere?"</string>
+  <string name="screen_create_poll_question_desc">"Pregunta o tema"</string>
+  <string name="screen_create_poll_question_hint">"De què tracta la votació?"</string>
+  <string name="screen_create_poll_title">"Crea votació"</string>
+  <string name="screen_edit_poll_delete_confirmation">"Segur que vols eliminar la votació?"</string>
+  <string name="screen_edit_poll_delete_confirmation_title">"Elimina votació"</string>
+  <string name="screen_edit_poll_title">"Edita votació"</string>
+  <string name="screen_polls_history_empty_ongoing">"No s\'han trobat votacions en curs."</string>
+  <string name="screen_polls_history_empty_past">"No s\'han trobat votacions passades."</string>
+  <string name="screen_polls_history_filter_ongoing">"En curs"</string>
+  <string name="screen_polls_history_filter_past">"Pasades"</string>
+  <string name="screen_polls_history_title">"Votacions"</string>
+</resources>
diff --git a/features/poll/impl/src/main/res/values-ja/translations.xml b/features/poll/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..a4cd3fbff3
--- /dev/null
+++ b/features/poll/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_poll_add_option_btn">"選択肢を追加"</string>
+  <string name="screen_create_poll_anonymous_desc">"結果を投票終了後に表示します"</string>
+  <string name="screen_create_poll_anonymous_headline">"投票を非表示"</string>
+  <string name="screen_create_poll_answer_hint">"選択肢 %1$d"</string>
+  <string name="screen_create_poll_cancel_confirmation_content_android">"変更は保存されていません。本当に戻りますか？"</string>
+  <string name="screen_create_poll_delete_option_a11y">"選択肢を削除 %1$s"</string>
+  <string name="screen_create_poll_question_desc">"質問またはトピック"</string>
+  <string name="screen_create_poll_question_hint">"何についての投票ですか？"</string>
+  <string name="screen_create_poll_title">"投票を作成"</string>
+  <string name="screen_edit_poll_delete_confirmation">"本当にこの投票を削除しますか？"</string>
+  <string name="screen_edit_poll_delete_confirmation_title">"投票を削除"</string>
+  <string name="screen_edit_poll_title">"投票を編集"</string>
+  <string name="screen_polls_history_empty_ongoing">"進行中の投票が見つかりません。"</string>
+  <string name="screen_polls_history_empty_past">"過去の投票が見つかりません。"</string>
+  <string name="screen_polls_history_filter_ongoing">"進行中"</string>
+  <string name="screen_polls_history_filter_past">"過去"</string>
+  <string name="screen_polls_history_title">"投票"</string>
+</resources>
diff --git a/features/poll/impl/src/main/res/values-vi/translations.xml b/features/poll/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..b56fe7039d
--- /dev/null
+++ b/features/poll/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_poll_add_option_btn">"Thêm lựa chọn"</string>
+  <string name="screen_create_poll_anonymous_desc">"Chỉ hiển thị kết quả sau khi cuộc thăm dò kết thúc"</string>
+  <string name="screen_create_poll_anonymous_headline">"Ẩn phiếu"</string>
+  <string name="screen_create_poll_answer_hint">"Lựa chọn %1$d"</string>
+  <string name="screen_create_poll_cancel_confirmation_content_android">"Các thay đổi của bạn chưa được lưu. Bạn có chắc muốn quay lại không?"</string>
+  <string name="screen_create_poll_delete_option_a11y">"Tùy chọn xóa %1$s"</string>
+  <string name="screen_create_poll_question_desc">"Câu hỏi hoặc chủ đề"</string>
+  <string name="screen_create_poll_question_hint">"Cuộc thăm dò này về vấn đề gì?"</string>
+  <string name="screen_create_poll_title">"Tạo Cuộc thăm dò ý kiến"</string>
+  <string name="screen_edit_poll_delete_confirmation">"Bạn có chắc chắn muốn xóa cuộc thăm dò này không?"</string>
+  <string name="screen_edit_poll_delete_confirmation_title">"Xóa cuộc thăm dò"</string>
+  <string name="screen_edit_poll_title">"Sửa cuộc thăm dò"</string>
+  <string name="screen_polls_history_empty_ongoing">"Không tìm thấy bất kỳ cuộc thăm dò nào đang diễn ra."</string>
+  <string name="screen_polls_history_empty_past">"Không tìm thấy bất kỳ cuộc thăm dò nào trước đây."</string>
+  <string name="screen_polls_history_filter_ongoing">"Đang diễn ra"</string>
+  <string name="screen_polls_history_filter_past">"Quá khứ"</string>
+  <string name="screen_polls_history_title">"Cuộc thăm dò ý kiến"</string>
+</resources>
diff --git a/features/poll/impl/src/main/res/values-zh/translations.xml b/features/poll/impl/src/main/res/values-zh/translations.xml
index f231e99d76..ee40168ea7 100644
--- a/features/poll/impl/src/main/res/values-zh/translations.xml
+++ b/features/poll/impl/src/main/res/values-zh/translations.xml
@@ -5,11 +5,11 @@
   <string name="screen_create_poll_anonymous_headline">"隐藏投票"</string>
   <string name="screen_create_poll_answer_hint">"选项 %1$d"</string>
   <string name="screen_create_poll_cancel_confirmation_content_android">"更改尚未保存，确定要返回吗？"</string>
-  <string name="screen_create_poll_delete_option_a11y">"删除选项%1$s"</string>
+  <string name="screen_create_poll_delete_option_a11y">"删除选项 %1$s"</string>
   <string name="screen_create_poll_question_desc">"问题或话题"</string>
   <string name="screen_create_poll_question_hint">"投票的内容是什么？"</string>
   <string name="screen_create_poll_title">"创建投票"</string>
-  <string name="screen_edit_poll_delete_confirmation">"您确定要删除此投票吗？"</string>
+  <string name="screen_edit_poll_delete_confirmation">"你确定要删除此投票？"</string>
   <string name="screen_edit_poll_delete_confirmation_title">"删除投票"</string>
   <string name="screen_edit_poll_title">"编辑投票"</string>
   <string name="screen_polls_history_empty_ongoing">"无法找到正在进行的投票。"</string>
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt
index 3614b06ad8..1af756f747 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.poll.impl.history
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.poll.api.pollcontent.aPollContentState
 import io.element.android.features.poll.impl.R
 import io.element.android.features.poll.impl.history.model.PollHistoryFilter
@@ -26,34 +28,28 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class PollHistoryViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class PollHistoryViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setPollHistoryViewView(
+            setPollHistoryViewView(
                 aPollHistoryState(
                     eventSink = eventsRecorder
                 ),
                 goBack = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on edit poll invokes the expected callback`() {
+    fun `clicking on edit poll invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>(expectEvents = false)
         val eventId = EventId("\$anEventId")
         val state = aPollHistoryState(
@@ -69,17 +65,17 @@ class PollHistoryViewTest {
             eventSink = eventsRecorder
         )
         ensureCalledOnceWithParam(eventId) {
-            rule.setPollHistoryViewView(
+            setPollHistoryViewView(
                 state = state,
                 onEditPoll = it
             )
-            rule.clickOn(CommonStrings.action_edit_poll)
+            clickOn(CommonStrings.action_edit_poll)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on poll end emits the expected Event`() {
+    fun `clicking on poll end emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>()
         val eventId = EventId("\$anEventId")
         val state = aPollHistoryState(
@@ -95,16 +91,16 @@ class PollHistoryViewTest {
             ),
             eventSink = eventsRecorder
         )
-        rule.setPollHistoryViewView(
+        setPollHistoryViewView(
             state = state,
         )
-        rule.clickOn(CommonStrings.action_end_poll)
+        clickOn(CommonStrings.action_end_poll)
         // Cancel the dialog
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         // Do it again, and confirm the dialog
-        rule.clickOn(CommonStrings.action_end_poll)
+        clickOn(CommonStrings.action_end_poll)
         eventsRecorder.assertEmpty()
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(
             PollHistoryEvents.EndPoll(eventId)
         )
@@ -112,7 +108,7 @@ class PollHistoryViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on poll answer emits the expected Event`() {
+    fun `clicking on poll answer emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>()
         val eventId = EventId("\$anEventId")
         val state = aPollHistoryState(
@@ -129,10 +125,10 @@ class PollHistoryViewTest {
             eventSink = eventsRecorder
         )
         val answer = state.pollHistoryItems.ongoing.first().state.answerItems.first().answer
-        rule.setPollHistoryViewView(
+        setPollHistoryViewView(
             state = state,
         )
-        rule.onNodeWithText(
+        onNodeWithText(
             text = answer.text,
             useUnmergedTree = true,
         ).performClick()
@@ -142,14 +138,14 @@ class PollHistoryViewTest {
     }
 
     @Test
-    fun `clicking on past tab emits the expected Event`() {
+    fun `clicking on past tab emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>()
-        rule.setPollHistoryViewView(
+        setPollHistoryViewView(
             aPollHistoryState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_polls_history_filter_past)
+        clickOn(R.string.screen_polls_history_filter_past)
         eventsRecorder.assertSingle(
             PollHistoryEvents.SelectFilter(filter = PollHistoryFilter.PAST)
         )
@@ -157,22 +153,22 @@ class PollHistoryViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on load more emits the expected Event`() {
+    fun `clicking on load more emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PollHistoryEvents>()
-        rule.setPollHistoryViewView(
+        setPollHistoryViewView(
             aPollHistoryState(
                 hasMoreToLoad = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_load_more)
+        clickOn(CommonStrings.action_load_more)
         eventsRecorder.assertSingle(
             PollHistoryEvents.LoadMore
         )
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPollHistoryViewView(
+private fun AndroidComposeUiTest<ComponentActivity>.setPollHistoryViewView(
     state: PollHistoryState,
     onEditPoll: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     goBack: () -> Unit = EnsureNeverCalled(),
diff --git a/features/poll/test/build.gradle.kts b/features/poll/test/build.gradle.kts
index a3779809d7..d0adc8e94f 100644
--- a/features/poll/test/build.gradle.kts
+++ b/features/poll/test/build.gradle.kts
@@ -15,6 +15,7 @@ android {
 }
 
 dependencies {
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     api(projects.features.poll.api)
     implementation(libs.kotlinx.collections.immutable)
diff --git a/features/preferences/api/build.gradle.kts b/features/preferences/api/build.gradle.kts
index b5a08b9435..c43259918d 100644
--- a/features/preferences/api/build.gradle.kts
+++ b/features/preferences/api/build.gradle.kts
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 plugins {
-    id("io.element.android-library")
+    id("io.element.android-compose-library")
     id("kotlin-parcelize")
 }
 
diff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/ExtraDeveloperOptionsRenderer.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/ExtraDeveloperOptionsRenderer.kt
new file mode 100644
index 0000000000..7d7eec9d8b
--- /dev/null
+++ b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/ExtraDeveloperOptionsRenderer.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.api
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+/**
+ * Component for rendering extra developer options in the preferences screen.
+ */
+interface ExtraDeveloperOptionsRenderer {
+    @Composable
+    fun Render(modifier: Modifier)
+}
diff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
index 5a59d9be8a..e7fbe6069f 100644
--- a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
+++ b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
@@ -28,6 +28,9 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
 
         @Parcelize
         data object NotificationTroubleshoot : InitialTarget
+
+        @Parcelize
+        data object DeveloperSettings : InitialTarget
     }
 
     data class Params(val initialElement: InitialTarget) : NodeInputs
@@ -47,4 +50,14 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
         fun navigateToRoomNotificationSettings(roomId: RoomId)
         fun navigateToEvent(roomId: RoomId, eventId: EventId)
     }
+
+    fun createAppDeveloperSettingsNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: DeveloperSettingsCallback,
+    ): Node
+
+    interface DeveloperSettingsCallback : Plugin {
+        fun onDone()
+    }
 }
diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts
index ad28c90966..e647ebb919 100644
--- a/features/preferences/impl/build.gradle.kts
+++ b/features/preferences/impl/build.gradle.kts
@@ -51,6 +51,7 @@ dependencies {
     implementation(projects.appconfig)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
+    implementation(projects.libraries.cachestore.api)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
@@ -68,6 +69,7 @@ dependencies {
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.push.api)
     implementation(projects.libraries.pushproviders.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.fullscreenintent.api)
     implementation(projects.features.rageshake.api)
@@ -79,6 +81,7 @@ dependencies {
     implementation(projects.features.deactivation.api)
     implementation(projects.features.home.api)
     implementation(projects.features.invite.api)
+    implementation(projects.libraries.emoji.api)
     implementation(projects.services.analytics.api)
     implementation(projects.services.analytics.compose)
     implementation(projects.services.appnavstate.api)
@@ -96,6 +99,7 @@ dependencies {
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.emoji.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.mediapickers.test)
     testImplementation(projects.libraries.mediaupload.test)
@@ -114,6 +118,7 @@ dependencies {
     testImplementation(projects.features.logout.test)
     testImplementation(projects.libraries.indicator.test)
     testImplementation(projects.libraries.pushproviders.test)
+    testImplementation(projects.libraries.cachestore.test)
     testImplementation(projects.libraries.sessionStorage.test)
     testImplementation(projects.services.appnavstate.impl)
     testImplementation(projects.services.analytics.test)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt
index 4348b33756..bacf1bfb48 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt
@@ -13,6 +13,7 @@ import com.bumble.appyx.core.node.Node
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.preferences.api.PreferencesEntryPoint
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsNode
 import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
@@ -28,10 +29,22 @@ class DefaultPreferencesEntryPoint : PreferencesEntryPoint {
             plugins = listOf(params, callback)
         )
     }
+
+    override fun createAppDeveloperSettingsNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: PreferencesEntryPoint.DeveloperSettingsCallback,
+    ): Node {
+        return parentNode.createNode<AppDeveloperSettingsNode>(
+            buildContext = buildContext,
+            plugins = listOf(callback),
+        )
+    }
 }
 
 internal fun PreferencesEntryPoint.InitialTarget.toNavTarget() = when (this) {
     is PreferencesEntryPoint.InitialTarget.Root -> PreferencesFlowNode.NavTarget.Root
     is PreferencesEntryPoint.InitialTarget.NotificationSettings -> PreferencesFlowNode.NavTarget.NotificationSettings
     PreferencesEntryPoint.InitialTarget.NotificationTroubleshoot -> PreferencesFlowNode.NavTarget.TroubleshootNotifications
+    PreferencesEntryPoint.InitialTarget.DeveloperSettings -> PreferencesFlowNode.NavTarget.DeveloperSettings
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index c646923c77..15718ca0f0 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -192,7 +192,11 @@ class PreferencesFlowNode(
                     }
 
                     override fun onDone() {
-                        backstack.pop()
+                        if (backstack.canPop()) {
+                            backstack.pop()
+                        } else {
+                            navigateUp()
+                        }
                     }
                 }
                 createNode<DeveloperSettingsNode>(buildContext, listOf(developerSettingsCallback))
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
index b71db181e8..3a6671f692 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
@@ -34,14 +34,14 @@ fun AboutView(
     ) {
         state.elementLegals.forEach { elementLegal ->
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = elementLegal.titleRes))
                 },
                 onClick = { onElementLegalClick(elementLegal) }
             )
         }
         ListItem(
-            headlineContent = {
+            content = {
                 Text(stringResource(id = CommonStrings.common_open_source_licenses))
             },
             onClick = onOpenSourceLicensesClick,
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsEvents.kt
index b3fb68fe05..ef27c499af 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsEvents.kt
@@ -20,4 +20,5 @@ sealed interface AdvancedSettingsEvents {
     data class SetTheme(val theme: ThemeOption) : AdvancedSettingsEvents
     data class SetTimelineMediaPreviewValue(val value: MediaPreviewValue) : AdvancedSettingsEvents
     data class SetHideInviteAvatars(val value: Boolean) : AdvancedSettingsEvents
+    data class SetLiveLocationMinimumDistanceUpdate(val value: Int) : AdvancedSettingsEvents
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
index e58706e9fe..96b1cddc94 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
@@ -10,12 +10,14 @@ package io.element.android.features.preferences.impl.advanced
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.androidutils.system.openAppSettingsPage
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
@@ -28,10 +30,12 @@ class AdvancedSettingsNode(
     @Composable
     override fun View(modifier: Modifier) {
         val state = presenter.present()
+        val context = LocalContext.current
         AdvancedSettingsView(
             state = state,
             modifier = modifier,
-            onBackClick = ::navigateUp
+            onBackClick = ::navigateUp,
+            onOpenAppSettingsClick = context::openAppSettingsPage
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
index c2871e0be8..45c136ab62 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenter.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
@@ -45,10 +46,17 @@ class AdvancedSettingsPresenter(
         val isSharePresenceEnabled by remember {
             sessionPreferencesStore.isSharePresenceEnabled()
         }.collectAsState(initial = true)
-        val theme = remember {
-            appPreferencesStore.getThemeFlow().mapToTheme()
+        val isBlackThemeAllowed by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.AllowBlackTheme)
+        }.collectAsState(initial = false)
+        val theme = remember(isBlackThemeAllowed) {
+            appPreferencesStore.getThemeFlow().mapToTheme(isBlackThemeAllowed)
         }.collectAsState(initial = Theme.System)
 
+        val liveLocationMinimumDistanceUpdate by produceState<Int?>(null) {
+            appPreferencesStore.getLiveLocationMinimumDistanceInMetersUpdateFlow().collect { value = it }
+        }
+
         val mediaPreviewConfigState = mediaPreviewConfigStateStore.state()
 
         val themeOption by remember {
@@ -56,6 +64,7 @@ class AdvancedSettingsPresenter(
                 when (theme.value) {
                     Theme.System -> ThemeOption.System
                     Theme.Dark -> ThemeOption.Dark
+                    Theme.Black -> ThemeOption.Black
                     Theme.Light -> ThemeOption.Light
                 }
             }
@@ -65,6 +74,14 @@ class AdvancedSettingsPresenter(
             value = featureFlagService.isFeatureEnabled(FeatureFlags.SelectableMediaQuality)
         }
 
+        val availableThemeOptions = remember(isBlackThemeAllowed) {
+            if (isBlackThemeAllowed) {
+                ThemeOption.entries
+            } else {
+                ThemeOption.entries.filterNot { it == ThemeOption.Black }
+            }.toImmutableList()
+        }
+
         val mediaOptimizationState by produceState<MediaOptimizationState?>(null) {
             val hasSplitMediaQualityOptionsFlow = featureFlagService.isFeatureEnabledFlow(FeatureFlags.SelectableMediaQuality)
             combine(
@@ -98,11 +115,15 @@ class AdvancedSettingsPresenter(
                     when (event.theme) {
                         ThemeOption.System -> appPreferencesStore.setTheme(Theme.System.name)
                         ThemeOption.Dark -> appPreferencesStore.setTheme(Theme.Dark.name)
+                        ThemeOption.Black -> appPreferencesStore.setTheme(Theme.Black.name)
                         ThemeOption.Light -> appPreferencesStore.setTheme(Theme.Light.name)
                     }
                 }
                 is AdvancedSettingsEvents.SetHideInviteAvatars -> mediaPreviewConfigStateStore.setHideInviteAvatars(event.value)
                 is AdvancedSettingsEvents.SetTimelineMediaPreviewValue -> mediaPreviewConfigStateStore.setTimelineMediaPreviewValue(event.value)
+                is AdvancedSettingsEvents.SetLiveLocationMinimumDistanceUpdate -> sessionCoroutineScope.launch {
+                    appPreferencesStore.setLiveLocationMinimumDistanceInMetersUpdate(event.value)
+                }
                 is AdvancedSettingsEvents.SetCompressImages -> sessionCoroutineScope.launch {
                     sessionPreferencesStore.setOptimizeImages(event.compress)
                 }
@@ -117,7 +138,9 @@ class AdvancedSettingsPresenter(
             isSharePresenceEnabled = isSharePresenceEnabled,
             mediaOptimizationState = mediaOptimizationState,
             theme = themeOption,
+            availableThemeOptions = availableThemeOptions,
             mediaPreviewConfigState = mediaPreviewConfigState,
+            liveLocationMinimumDistanceUpdate = liveLocationMinimumDistanceUpdate,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsState.kt
index 6eb7414a29..94019c1f01 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsState.kt
@@ -11,16 +11,19 @@ package io.element.android.features.preferences.impl.advanced
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.ui.res.stringResource
+import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.designsystem.components.preferences.DropdownOption
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
-import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
 
 data class AdvancedSettingsState(
     val isDeveloperModeEnabled: Boolean,
     val isSharePresenceEnabled: Boolean,
     val mediaOptimizationState: MediaOptimizationState?,
     val theme: ThemeOption,
+    val availableThemeOptions: ImmutableList<ThemeOption>,
     val mediaPreviewConfigState: MediaPreviewConfigState,
+    val liveLocationMinimumDistanceUpdate: Int?,
     val eventSink: (AdvancedSettingsEvents) -> Unit
 )
 
@@ -41,16 +44,24 @@ enum class ThemeOption : DropdownOption {
     System {
         @Composable
         @ReadOnlyComposable
-        override fun getText(): String = stringResource(CommonStrings.common_system)
-    },
-    Dark {
-        @Composable
-        @ReadOnlyComposable
-        override fun getText(): String = stringResource(CommonStrings.common_dark)
+        override fun getText(): String = stringResource(R.string.theme_system)
     },
+
     Light {
         @Composable
         @ReadOnlyComposable
-        override fun getText(): String = stringResource(CommonStrings.common_light)
+        override fun getText(): String = stringResource(R.string.theme_light)
+    },
+
+    Dark {
+        @Composable
+        @ReadOnlyComposable
+        override fun getText(): String = stringResource(R.string.theme_dark)
+    },
+
+    Black {
+        @Composable
+        @ReadOnlyComposable
+        override fun getText(): String = stringResource(R.string.theme_black)
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsStateProvider.kt
index 6cbe6e5c51..2df59e3ced 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsStateProvider.kt
@@ -12,6 +12,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 open class AdvancedSettingsStateProvider : PreviewParameterProvider<AdvancedSettingsState> {
     override val values: Sequence<AdvancedSettingsState>
@@ -36,8 +38,10 @@ fun aAdvancedSettingsState(
     isSharePresenceEnabled: Boolean = false,
     mediaOptimizationState: MediaOptimizationState = MediaOptimizationState.AllMedia(isEnabled = false),
     theme: ThemeOption = ThemeOption.System,
+    availableThemeOptions: ImmutableList<ThemeOption> = ThemeOption.entries.toImmutableList(),
     hideInviteAvatars: Boolean = false,
     timelineMediaPreviewValue: MediaPreviewValue = MediaPreviewValue.On,
+    liveLocationMinimumDistanceUpdate: Int? = 50,
     setTimelineMediaPreviewAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     setHideInviteAvatarsAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (AdvancedSettingsEvents) -> Unit = {},
@@ -46,11 +50,13 @@ fun aAdvancedSettingsState(
     isSharePresenceEnabled = isSharePresenceEnabled,
     mediaOptimizationState = mediaOptimizationState,
     theme = theme,
+    availableThemeOptions = availableThemeOptions,
     mediaPreviewConfigState = MediaPreviewConfigState(
         hideInviteAvatars = hideInviteAvatars,
         timelineMediaPreviewValue = timelineMediaPreviewValue,
         setTimelineMediaPreviewAction = setTimelineMediaPreviewAction,
         setHideInviteAvatarsAction = setHideInviteAvatarsAction
     ),
+    liveLocationMinimumDistanceUpdate = liveLocationMinimumDistanceUpdate,
     eventSink = eventSink
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
index c2b51973d0..438b20049a 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
@@ -8,15 +8,24 @@
 
 package io.element.android.features.preferences.impl.advanced
 
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.SliderDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.preferences.impl.R
@@ -28,14 +37,17 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen
 import io.element.android.libraries.designsystem.components.preferences.PreferencePage
 import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.ElementPreviewBlack
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.text.stringWithLink
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
 import io.element.android.libraries.designsystem.theme.components.ListSupportingText
 import io.element.android.libraries.designsystem.theme.components.ListSupportingTextDefaults
+import io.element.android.libraries.designsystem.theme.components.Slider
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
@@ -46,12 +58,13 @@ import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.compose.LocalAnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
-import kotlinx.collections.immutable.toImmutableList
+import kotlin.math.roundToInt
 
 @Composable
 fun AdvancedSettingsView(
     state: AdvancedSettingsState,
     onBackClick: () -> Unit,
+    onOpenAppSettingsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val analyticsService = LocalAnalyticsService.current
@@ -74,13 +87,13 @@ fun AdvancedSettingsView(
         PreferenceDropdown(
             title = stringResource(id = CommonStrings.common_appearance),
             selectedOption = state.theme,
-            options = ThemeOption.entries.toImmutableList(),
+            options = state.availableThemeOptions,
             onSelectOption = { themeOption ->
                 state.eventSink(AdvancedSettingsEvents.SetTheme(themeOption))
             }
         )
         ListItem(
-            headlineContent = {
+            content = {
                 Text(text = stringResource(id = CommonStrings.action_view_source))
             },
             supportingContent = {
@@ -92,7 +105,7 @@ fun AdvancedSettingsView(
             onClick = { state.eventSink(AdvancedSettingsEvents.SetDeveloperModeEnabled(!state.isDeveloperModeEnabled)) }
         )
         ListItem(
-            headlineContent = {
+            content = {
                 Text(text = stringResource(id = R.string.screen_advanced_settings_share_presence))
             },
             supportingContent = {
@@ -109,7 +122,7 @@ fun AdvancedSettingsView(
             null -> Unit
             is MediaOptimizationState.AllMedia -> {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(text = stringResource(id = R.string.screen_advanced_settings_media_compression_title))
                     },
                     supportingContent = {
@@ -133,7 +146,7 @@ fun AdvancedSettingsView(
             }
             is MediaOptimizationState.Split -> {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(text = stringResource(id = R.string.screen_advanced_settings_optimise_image_upload_quality_title))
                     },
                     supportingContent = {
@@ -158,7 +171,7 @@ fun AdvancedSettingsView(
                 var displaySelectorDialog by remember { mutableStateOf(false) }
 
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(text = stringResource(id = R.string.screen_advanced_settings_optimise_video_upload_quality_title))
                     },
                     supportingContent = {
@@ -190,6 +203,15 @@ fun AdvancedSettingsView(
         }
 
         ModerationAndSafety(state)
+        if (state.liveLocationMinimumDistanceUpdate != null) {
+            LiveLocationUpdatesSection(
+                value = state.liveLocationMinimumDistanceUpdate,
+                onSaveValue = { value ->
+                    state.eventSink(AdvancedSettingsEvents.SetLiveLocationMinimumDistanceUpdate(value))
+                },
+                onOpenAppPermissionsClick = onOpenAppSettingsClick,
+            )
+        }
     }
 }
 
@@ -225,7 +247,7 @@ private fun VideoQualitySelectorDialog(
                     VideoCompressionPreset.HIGH -> stringResource(CommonStrings.common_video_quality_high_description)
                 }
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = title,
                             style = ElementTheme.typography.fontBodyLgMedium,
@@ -279,7 +301,7 @@ private fun ModerationAndSafety(
             }
         )
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_hide)) },
+            content = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_hide)) },
             leadingContent = ListItemContent.RadioButton(
                 selected = state.mediaPreviewConfigState.timelineMediaPreviewValue == MediaPreviewValue.Off,
                 compact = true
@@ -290,7 +312,7 @@ private fun ModerationAndSafety(
             enabled = !state.mediaPreviewConfigState.setTimelineMediaPreviewAction.isLoading()
         )
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_private_rooms)) },
+            content = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_private_rooms)) },
             leadingContent = ListItemContent.RadioButton(
                 selected = state.mediaPreviewConfigState.timelineMediaPreviewValue == MediaPreviewValue.Private,
                 compact = true
@@ -301,7 +323,7 @@ private fun ModerationAndSafety(
             enabled = !state.mediaPreviewConfigState.setTimelineMediaPreviewAction.isLoading()
         )
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_show)) },
+            content = { Text(text = stringResource(R.string.screen_advanced_settings_show_media_timeline_always_show)) },
             leadingContent = ListItemContent.RadioButton(
                 selected = state.mediaPreviewConfigState.timelineMediaPreviewValue == MediaPreviewValue.On,
                 compact = true
@@ -314,6 +336,78 @@ private fun ModerationAndSafety(
     }
 }
 
+@Composable
+private fun LiveLocationUpdatesSection(
+    value: Int,
+    onSaveValue: (Int) -> Unit,
+    onOpenAppPermissionsClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    PreferenceCategory(
+        modifier = modifier,
+        showTopDivider = true,
+    ) {
+        ListSectionHeader(
+            title = stringResource(R.string.screen_advanced_settings_live_location_section_title),
+            description = {
+                ListSupportingText(
+                    text = stringResource(R.string.screen_advanced_settings_live_location_section_description),
+                    contentPadding = ListSupportingTextDefaults.Padding.None,
+                )
+            }
+        )
+        var sliderValue by remember(value) { mutableIntStateOf(value) }
+        Column(
+            modifier = Modifier.padding(vertical = 12.dp, horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            Text(
+                text = pluralStringResource(
+                    R.plurals.screen_advanced_settings_live_location_update_distance,
+                    sliderValue,
+                    sliderValue,
+                ),
+                style = ElementTheme.typography.fontBodyLgRegular,
+                color = ElementTheme.colors.textPrimary,
+            )
+            val valueRange = 1f..100f
+            val start = valueRange.start.toInt()
+            val end = valueRange.endInclusive.toInt()
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text("${start}m", color = ElementTheme.colors.textSecondary, style = ElementTheme.typography.fontBodyMdRegular)
+                Slider(
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(horizontal = 12.dp),
+                    value = sliderValue.toFloat(),
+                    onValueChange = { sliderValue = it.roundToInt() },
+                    onValueChangeFinish = {
+                        onSaveValue(sliderValue)
+                    },
+                    valueRange = valueRange,
+                    colors = SliderDefaults.colors(
+                        thumbColor = ElementTheme.colors.iconAccentPrimary,
+                        activeTrackColor = ElementTheme.colors.iconAccentPrimary,
+                        inactiveTrackColor = ElementTheme.colors.bgBadgeAccent,
+                        inactiveTickColor = ElementTheme.colors.iconAccentPrimary,
+                    )
+                )
+                Text("${end}m", color = ElementTheme.colors.textSecondary, style = ElementTheme.typography.fontBodyMdRegular)
+            }
+        }
+        val footerText = stringWithLink(
+            textRes = R.string.screen_advanced_settings_live_location_section_footer,
+            url = "",
+            linkTextRes = R.string.screen_advanced_settings_live_location_section_footer_link,
+            onLinkClick = { onOpenAppPermissionsClick() },
+        )
+        ListSupportingText(
+            annotatedString = footerText,
+            contentPadding = ListSupportingTextDefaults.Padding.Default,
+        )
+    }
+}
+
 @PreviewWithLargeHeight
 @Composable
 internal fun AdvancedSettingsViewLightPreview(@PreviewParameter(AdvancedSettingsStateProvider::class) state: AdvancedSettingsState) =
@@ -324,12 +418,18 @@ internal fun AdvancedSettingsViewLightPreview(@PreviewParameter(AdvancedSettings
 internal fun AdvancedSettingsViewDarkPreview(@PreviewParameter(AdvancedSettingsStateProvider::class) state: AdvancedSettingsState) =
     ElementPreviewDark { ContentToPreview(state) }
 
+@PreviewWithLargeHeight
+@Composable
+internal fun AdvancedSettingsViewBlackPreview(@PreviewParameter(AdvancedSettingsStateProvider::class) state: AdvancedSettingsState) =
+    ElementPreviewBlack { ContentToPreview(state) }
+
 @ExcludeFromCoverage
 @Composable
 private fun ContentToPreview(state: AdvancedSettingsState) {
     AdvancedSettingsView(
         state = state,
-        onBackClick = { }
+        onBackClick = { },
+        onOpenAppSettingsClick = {}
     )
 }
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
index 1804d7e070..2d6c2b0904 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
@@ -9,17 +9,12 @@
 package io.element.android.features.preferences.impl.developer
 
 import androidx.compose.ui.graphics.Color
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
-import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
-import io.element.android.libraries.matrix.api.tracing.TraceLogPack
 
 sealed interface DeveloperSettingsEvents {
-    data class UpdateEnabledFeature(val feature: FeatureUiModel, val isEnabled: Boolean) : DeveloperSettingsEvents
-    data class SetCustomElementCallBaseUrl(val baseUrl: String?) : DeveloperSettingsEvents
-    data class SetTracingLogLevel(val logLevel: LogLevelItem) : DeveloperSettingsEvents
-    data class ToggleTracingLogPack(val logPack: TraceLogPack, val enabled: Boolean) : DeveloperSettingsEvents
     data class SetShowColorPicker(val show: Boolean) : DeveloperSettingsEvents
     data class ChangeBrandColor(val color: Color?) : DeveloperSettingsEvents
     data object ClearCache : DeveloperSettingsEvents
     data object VacuumStores : DeveloperSettingsEvents
+    data class MarkAllRoomsAsRead(val needsConfirmation: Boolean) : DeveloperSettingsEvents
+    data object DismissMarkAllRoomsAsReadConfirmation : DeveloperSettingsEvents
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
index 98c7d89633..a8a8c63eed 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
@@ -18,6 +18,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.features.preferences.api.ExtraDeveloperOptionsRenderer
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.designsystem.showkase.getBrowserIntent
 import io.element.android.libraries.di.SessionScope
@@ -28,6 +29,7 @@ class DeveloperSettingsNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: DeveloperSettingsPresenter,
+    private val extraDeveloperOptionsRenderer: ExtraDeveloperOptionsRenderer,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun navigateToPushHistory()
@@ -51,6 +53,7 @@ class DeveloperSettingsNode(
             onOpenShowkase = ::openShowkase,
             onPushHistoryClick = callback::navigateToPushHistory,
             onBackClick = callback::onDone,
+            extraOptions = { extraDeveloperOptionsRenderer.Render(Modifier) },
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt
index a0d96be540..ac1ba06cf6 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt
@@ -11,72 +11,48 @@ package io.element.android.features.preferences.impl.developer
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.graphics.toArgb
 import dev.zacsweers.metro.Inject
 import io.element.android.features.enterprise.api.EnterpriseService
-import io.element.android.features.preferences.impl.developer.tracing.toLogLevel
-import io.element.android.features.preferences.impl.developer.tracing.toLogLevelItem
-import io.element.android.features.preferences.impl.model.EnabledFeature
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsState
 import io.element.android.features.preferences.impl.tasks.ClearCacheUseCase
 import io.element.android.features.preferences.impl.tasks.ComputeCacheSizeUseCase
+import io.element.android.features.preferences.impl.tasks.MarkAllRoomsAsRead
 import io.element.android.features.preferences.impl.tasks.VacuumStoresUseCase
-import io.element.android.features.rageshake.api.preferences.RageshakePreferencesState
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.data.ByteUnit
-import io.element.android.libraries.core.extensions.runCatchingExceptions
-import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.core.meta.BuildType
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
 import io.element.android.libraries.matrix.api.analytics.GetDatabaseSizesUseCase
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.preferences.api.store.AppPreferencesStore
-import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
-import java.net.URL
 
 @Inject
 class DeveloperSettingsPresenter(
+    private val appDeveloperSettingsPresenter: Presenter<AppDeveloperSettingsState>,
     private val sessionId: SessionId,
-    private val featureFlagService: FeatureFlagService,
+    private val deviceId: DeviceId,
     private val computeCacheSizeUseCase: ComputeCacheSizeUseCase,
     private val clearCacheUseCase: ClearCacheUseCase,
-    private val rageshakePresenter: Presenter<RageshakePreferencesState>,
-    private val appPreferencesStore: AppPreferencesStore,
-    private val buildMeta: BuildMeta,
     private val enterpriseService: EnterpriseService,
     private val vacuumStoresUseCase: VacuumStoresUseCase,
     private val databaseSizesUseCase: GetDatabaseSizesUseCase,
     private val fileSizeFormatter: FileSizeFormatter,
+    private val markAllRoomsAsRead: MarkAllRoomsAsRead,
 ) : Presenter<DeveloperSettingsState> {
     @Composable
     override fun present(): DeveloperSettingsState {
-        val rageshakeState = rageshakePresenter.present()
-        val enabledFeatures = remember {
-            mutableStateListOf<EnabledFeature>()
-        }
         val cacheSize = remember {
             mutableStateOf<AsyncData<String>>(AsyncData.Uninitialized)
         }
@@ -86,41 +62,15 @@ class DeveloperSettingsPresenter(
         val clearCacheAction = remember {
             mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
         }
+        val markAllRoomsAsReadAction = remember {
+            mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
+        }
         var showColorPicker by remember {
             mutableStateOf(false)
         }
-        val customElementCallBaseUrl by remember {
-            appPreferencesStore
-                .getCustomElementCallBaseUrlFlow()
-        }.collectAsState(initial = null)
-
-        val tracingLogLevelFlow = remember {
-            appPreferencesStore.getTracingLogLevelFlow().map { AsyncData.Success(it.toLogLevelItem()) }
-        }
-        val tracingLogLevel by tracingLogLevelFlow.collectAsState(initial = AsyncData.Uninitialized)
-        val tracingLogPacks by produceState(persistentListOf()) {
-            appPreferencesStore.getTracingLogPacksFlow()
-                // Sort the entries alphabetically by its title
-                .map { it.sortedBy { pack -> pack.title } }
-                .collectLatest { value = it.toImmutableList() }
-        }
-
         LaunchedEffect(Unit) {
             computeDatabaseSizes(databaseSizes)
-            featureFlagService.getAvailableFeatures()
-                .run {
-                    // Never display room directory search in release builds for Play Store
-                    if (buildMeta.flavorDescription == "GooglePlay" && buildMeta.buildType == BuildType.RELEASE) {
-                        filterNot { it.key == FeatureFlags.RoomDirectorySearch.key }
-                    } else {
-                        this
-                    }
-                }
-                .forEach { feature ->
-                    enabledFeatures.add(EnabledFeature(feature, featureFlagService.isFeatureEnabled(feature)))
-                }
         }
-        val featureUiModels = createUiModels(enabledFeatures)
         val coroutineScope = rememberCoroutineScope()
         // Compute cache size each time the clear cache action value is changed
         LaunchedEffect(clearCacheAction.value.isSuccess()) {
@@ -129,29 +79,7 @@ class DeveloperSettingsPresenter(
 
         fun handleEvent(event: DeveloperSettingsEvents) {
             when (event) {
-                is DeveloperSettingsEvents.UpdateEnabledFeature -> coroutineScope.updateEnabledFeature(
-                    enabledFeatures = enabledFeatures,
-                    featureKey = event.feature.key,
-                    enabled = event.isEnabled,
-                    triggerClearCache = { handleEvent(DeveloperSettingsEvents.ClearCache) }
-                )
-                is DeveloperSettingsEvents.SetCustomElementCallBaseUrl -> coroutineScope.launch {
-                    val urlToSave = event.baseUrl.takeIf { !it.isNullOrEmpty() }
-                    appPreferencesStore.setCustomElementCallBaseUrl(urlToSave)
-                }
                 DeveloperSettingsEvents.ClearCache -> coroutineScope.clearCache(clearCacheAction)
-                is DeveloperSettingsEvents.SetTracingLogLevel -> coroutineScope.launch {
-                    appPreferencesStore.setTracingLogLevel(event.logLevel.toLogLevel())
-                }
-                is DeveloperSettingsEvents.ToggleTracingLogPack -> coroutineScope.launch {
-                    val currentPacks = tracingLogPacks.toMutableSet()
-                    if (currentPacks.contains(event.logPack)) {
-                        currentPacks.remove(event.logPack)
-                    } else {
-                        currentPacks.add(event.logPack)
-                    }
-                    appPreferencesStore.setTracingLogPacks(currentPacks)
-                }
                 is DeveloperSettingsEvents.ChangeBrandColor -> coroutineScope.launch {
                     showColorPicker = false
                     val color = event.color
@@ -167,59 +95,35 @@ class DeveloperSettingsPresenter(
                 DeveloperSettingsEvents.VacuumStores -> coroutineScope.launch {
                     vacuumStoresUseCase()
                 }
+                is DeveloperSettingsEvents.MarkAllRoomsAsRead -> {
+                    if (event.needsConfirmation) {
+                        markAllRoomsAsReadAction.value = AsyncAction.ConfirmingNoParams
+                    } else {
+                        coroutineScope.markAllRoomsAsRead(
+                            markAllRoomsAsReadAction = markAllRoomsAsReadAction,
+                        )
+                    }
+                }
+                DeveloperSettingsEvents.DismissMarkAllRoomsAsReadConfirmation -> {
+                    markAllRoomsAsReadAction.value = AsyncAction.Uninitialized
+                }
             }
         }
 
+        val appDeveloperSettingsState = appDeveloperSettingsPresenter.present()
         return DeveloperSettingsState(
-            features = featureUiModels,
+            appDeveloperSettingsState = appDeveloperSettingsState,
             cacheSize = cacheSize.value,
             databaseSizes = databaseSizes.value,
             clearCacheAction = clearCacheAction.value,
-            rageshakeState = rageshakeState,
-            customElementCallBaseUrlState = CustomElementCallBaseUrlState(
-                baseUrl = customElementCallBaseUrl,
-                validator = ::customElementCallUrlValidator,
-            ),
-            tracingLogLevel = tracingLogLevel,
-            tracingLogPacks = tracingLogPacks,
+            markAllRoomsAsReadAction = markAllRoomsAsReadAction.value,
             isEnterpriseBuild = enterpriseService.isEnterpriseBuild,
             showColorPicker = showColorPicker,
+            deviceId = deviceId,
             eventSink = ::handleEvent,
         )
     }
 
-    @Composable
-    private fun createUiModels(
-        enabledFeatures: SnapshotStateList<EnabledFeature>,
-    ): ImmutableList<FeatureUiModel> {
-        return enabledFeatures.map { enabledFeature ->
-            key(enabledFeature.feature.key) {
-                remember(enabledFeature) {
-                    FeatureUiModel(
-                        key = enabledFeature.feature.key,
-                        title = enabledFeature.feature.title,
-                        description = enabledFeature.feature.description,
-                        icon = null,
-                        isEnabled = enabledFeature.isEnabled
-                    )
-                }
-            }
-        }.toImmutableList()
-    }
-
-    private fun CoroutineScope.updateEnabledFeature(
-        enabledFeatures: SnapshotStateList<EnabledFeature>,
-        featureKey: String,
-        enabled: Boolean,
-        @Suppress("UNUSED_PARAMETER") triggerClearCache: () -> Unit,
-    ) = launch {
-        val featureIndex = enabledFeatures.indexOfFirst { it.feature.key == featureKey }.takeIf { it != -1 } ?: return@launch
-        val feature = enabledFeatures[featureIndex].feature
-        if (featureFlagService.setFeatureEnabled(feature, enabled)) {
-            enabledFeatures[featureIndex] = enabledFeatures[featureIndex].copy(isEnabled = enabled)
-        }
-    }
-
     private fun CoroutineScope.computeCacheSize(cacheSize: MutableState<AsyncData<String>>) = launch {
         suspend {
             computeCacheSizeUseCase()
@@ -248,17 +152,14 @@ class DeveloperSettingsPresenter(
     }
 
     private fun CoroutineScope.clearCache(clearCacheAction: MutableState<AsyncAction<Unit>>) = launch {
+        suspend { clearCacheUseCase() }.runCatchingUpdatingState(state = clearCacheAction)
+    }
+
+    private fun CoroutineScope.markAllRoomsAsRead(
+        markAllRoomsAsReadAction: MutableState<AsyncAction<Unit>>,
+    ) = launch {
         suspend {
-            clearCacheUseCase()
-        }.runCatchingUpdatingState(clearCacheAction)
+            markAllRoomsAsRead().getOrThrow()
+        }.runCatchingUpdatingState(state = markAllRoomsAsReadAction)
     }
 }
-
-private fun customElementCallUrlValidator(url: String?): Boolean {
-    return runCatchingExceptions {
-        if (url.isNullOrEmpty()) return@runCatchingExceptions
-        val parsedUrl = URL(url)
-        if (parsedUrl.protocol !in listOf("http", "https")) error("Incorrect protocol")
-        if (parsedUrl.host.isNullOrBlank()) error("Missing host")
-    }.isSuccess
-}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsState.kt
index 920c8ec95c..700c989bfa 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsState.kt
@@ -8,32 +8,22 @@
 
 package io.element.android.features.preferences.impl.developer
 
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
-import io.element.android.features.rageshake.api.preferences.RageshakePreferencesState
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
-import io.element.android.libraries.matrix.api.tracing.TraceLogPack
-import kotlinx.collections.immutable.ImmutableList
+import io.element.android.libraries.matrix.api.core.DeviceId
 import kotlinx.collections.immutable.ImmutableMap
 
 data class DeveloperSettingsState(
-    val features: ImmutableList<FeatureUiModel>,
+    val appDeveloperSettingsState: AppDeveloperSettingsState,
     val cacheSize: AsyncData<String>,
     val databaseSizes: AsyncData<ImmutableMap<String, String>>,
-    val rageshakeState: RageshakePreferencesState,
     val clearCacheAction: AsyncAction<Unit>,
-    val customElementCallBaseUrlState: CustomElementCallBaseUrlState,
-    val tracingLogLevel: AsyncData<LogLevelItem>,
-    val tracingLogPacks: ImmutableList<TraceLogPack>,
+    val markAllRoomsAsReadAction: AsyncAction<Unit>,
     val isEnterpriseBuild: Boolean,
     val showColorPicker: Boolean,
+    val deviceId: DeviceId,
     val eventSink: (DeveloperSettingsEvents) -> Unit
 ) {
-    val showLoader = clearCacheAction is AsyncAction.Loading
+    val showLoader = clearCacheAction is AsyncAction.Loading || markAllRoomsAsReadAction is AsyncAction.Loading
 }
-
-data class CustomElementCallBaseUrlState(
-    val baseUrl: String?,
-    val validator: (String?) -> Boolean,
-)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsStateProvider.kt
index b925eabe9e..b14446d11c 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsStateProvider.kt
@@ -9,14 +9,12 @@
 package io.element.android.features.preferences.impl.developer
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
-import io.element.android.features.rageshake.api.preferences.aRageshakePreferencesState
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsState
+import io.element.android.features.preferences.impl.developer.appsettings.anAppDeveloperSettingsState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.featureflag.ui.model.aFeatureUiModelList
-import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+import io.element.android.libraries.matrix.api.core.DeviceId
 import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.toImmutableList
 
 open class DeveloperSettingsStateProvider : PreviewParameterProvider<DeveloperSettingsState> {
     override val values: Sequence<DeveloperSettingsState>
@@ -25,11 +23,6 @@ open class DeveloperSettingsStateProvider : PreviewParameterProvider<DeveloperSe
             aDeveloperSettingsState(
                 clearCacheAction = AsyncAction.Loading
             ),
-            aDeveloperSettingsState(
-                customElementCallBaseUrlState = aCustomElementCallBaseUrlState(
-                    baseUrl = "https://call.element.ahoy",
-                )
-            ),
             aDeveloperSettingsState(
                 isEnterpriseBuild = true,
                 // Disable the color picker for now, Paparazzi is failing with:
@@ -43,30 +36,21 @@ open class DeveloperSettingsStateProvider : PreviewParameterProvider<DeveloperSe
 }
 
 fun aDeveloperSettingsState(
+    appDeveloperSettingsState: AppDeveloperSettingsState = anAppDeveloperSettingsState(),
     clearCacheAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
-    customElementCallBaseUrlState: CustomElementCallBaseUrlState = aCustomElementCallBaseUrlState(),
-    traceLogPacks: List<TraceLogPack> = emptyList(),
+    markAllRoomsAsReadAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     isEnterpriseBuild: Boolean = false,
     showColorPicker: Boolean = false,
+    deviceId: DeviceId = DeviceId("ILAKNDNASDLK"),
     eventSink: (DeveloperSettingsEvents) -> Unit = {},
 ) = DeveloperSettingsState(
-    features = aFeatureUiModelList(),
-    rageshakeState = aRageshakePreferencesState(),
+    appDeveloperSettingsState = appDeveloperSettingsState,
     cacheSize = AsyncData.Success("1.2 MB"),
     databaseSizes = AsyncData.Success(persistentMapOf("state_store" to "1.2MB")),
     clearCacheAction = clearCacheAction,
-    customElementCallBaseUrlState = customElementCallBaseUrlState,
-    tracingLogLevel = AsyncData.Success(LogLevelItem.INFO),
-    tracingLogPacks = traceLogPacks.toImmutableList(),
+    markAllRoomsAsReadAction = markAllRoomsAsReadAction,
     isEnterpriseBuild = isEnterpriseBuild,
     showColorPicker = showColorPicker,
+    deviceId = deviceId,
     eventSink = eventSink,
 )
-
-fun aCustomElementCallBaseUrlState(
-    baseUrl: String? = null,
-    validator: (String?) -> Boolean = { true },
-) = CustomElementCallBaseUrlState(
-    baseUrl = baseUrl,
-    validator = validator,
-)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
index 444a391d43..2fd2137451 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
@@ -10,40 +10,33 @@ package io.element.android.features.preferences.impl.developer
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.progressSemantics
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.preferences.impl.R
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
-import io.element.android.features.rageshake.api.preferences.RageshakePreferencesView
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsView
+import io.element.android.libraries.androidutils.system.copyToClipboard
 import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
-import io.element.android.libraries.designsystem.components.preferences.PreferenceDropdown
 import io.element.android.libraries.designsystem.components.preferences.PreferencePage
-import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
-import io.element.android.libraries.designsystem.components.preferences.PreferenceTextField
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.featureflag.ui.FeatureListView
-import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
-import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.mhssn.colorpicker.ColorPickerDialog
 import io.mhssn.colorpicker.ColorPickerType
-import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -53,10 +46,20 @@ fun DeveloperSettingsView(
     onPushHistoryClick: () -> Unit,
     onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
+    extraOptions: @Composable () -> Unit = {},
 ) {
     if (state.showLoader) {
         ProgressDialog()
     }
+    if (state.markAllRoomsAsReadAction.isConfirming()) {
+        ConfirmationDialog(
+            title = "Are you sure you want to mark all the rooms as read?",
+            content = "",
+            submitText = stringResource(CommonStrings.action_yes),
+            onSubmitClick = { state.eventSink(DeveloperSettingsEvents.MarkAllRoomsAsRead(needsConfirmation = false)) },
+            onDismiss = { state.eventSink(DeveloperSettingsEvents.DismissMarkAllRoomsAsReadConfirmation) },
+        )
+    }
     BackHandler(
         enabled = !state.showLoader,
         onBack = onBackClick,
@@ -71,56 +74,18 @@ fun DeveloperSettingsView(
         title = stringResource(id = CommonStrings.common_developer_options)
     ) {
         // Note: this is OK to hardcode strings in this debug screen.
-        PreferenceCategory(
-            title = "Feature flags",
-        ) {
-            FeatureListContent(state)
-        }
-        NotificationCategory(onPushHistoryClick)
-        ElementCallCategory(state = state)
-
-        PreferenceCategory(title = "Rust SDK") {
-            PreferenceDropdown(
-                title = "Tracing log level",
-                supportingText = "Requires app reboot",
-                selectedOption = state.tracingLogLevel.dataOrNull(),
-                options = LogLevelItem.entries.toImmutableList(),
-                onSelectOption = { logLevel ->
-                    state.eventSink(DeveloperSettingsEvents.SetTracingLogLevel(logLevel))
-                }
-            )
-        }
-        PreferenceCategory(title = "Enable trace logs per SDK feature") {
-            Text(
-                text = "Requires app reboot",
-                style = ElementTheme.typography.fontBodyMdRegular,
-                color = ElementTheme.colors.textSecondary,
-                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
-            )
-            for (logPack in TraceLogPack.entries) {
-                PreferenceSwitch(
-                    title = logPack.title,
-                    isChecked = state.tracingLogPacks.contains(logPack),
-                    onCheckedChange = { isChecked -> state.eventSink(DeveloperSettingsEvents.ToggleTracingLogPack(logPack, isChecked)) }
-                )
-            }
-        }
-
-        PreferenceCategory(title = "Showkase") {
-            ListItem(
-                headlineContent = {
-                    Text("Open Showkase browser")
-                },
-                onClick = onOpenShowkase
-            )
-        }
-        RageshakePreferencesView(
-            state = state.rageshakeState,
+        AppDeveloperSettingsView(
+            state = state.appDeveloperSettingsState,
+            onOpenShowkase = onOpenShowkase,
         )
+        SessionCategory(deviceId = state.deviceId)
+        NotificationCategory(onPushHistoryClick)
+        MarkAllRoomsAsReadCategory(state)
+
         if (state.isEnterpriseBuild) {
             PreferenceCategory(title = "Theme") {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text("Change brand color")
                     },
                     onClick = {
@@ -128,7 +93,7 @@ fun DeveloperSettingsView(
                     }
                 )
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text("Reset brand color")
                     },
                     onClick = {
@@ -137,18 +102,13 @@ fun DeveloperSettingsView(
                 )
             }
         }
-        PreferenceCategory(title = "Crash") {
-            ListItem(
-                headlineContent = {
-                    Text("Crash the app 💥")
-                },
-                onClick = { error("This crash is a test.") }
-            )
-        }
+
+        extraOptions()
+
         val cache = state.cacheSize
         PreferenceCategory(title = "Cache") {
             ListItem(
-                headlineContent = { Text("Database sizes") },
+                content = { Text("Database sizes") },
                 supportingContent = {
                     if (state.databaseSizes.isLoading()) {
                         Text("Computing...")
@@ -167,7 +127,7 @@ fun DeveloperSettingsView(
                 }
             )
             ListItem(
-                headlineContent = {
+                content = {
                     Text("Vacuum stores")
                 },
                 onClick = {
@@ -175,7 +135,7 @@ fun DeveloperSettingsView(
                 }
             )
             ListItem(
-                headlineContent = {
+                content = {
                     Text("Clear cache")
                 },
                 trailingContent = if (state.cacheSize.isLoading() || state.clearCacheAction.isLoading()) {
@@ -213,27 +173,45 @@ fun DeveloperSettingsView(
 }
 
 @Composable
-private fun ElementCallCategory(
-    state: DeveloperSettingsState,
-) {
-    PreferenceCategory(title = "Element Call") {
-        val callUrlState = state.customElementCallBaseUrlState
+private fun SessionCategory(deviceId: DeviceId) {
+    PreferenceCategory(title = "Session") {
+        val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
+        val context = LocalContext.current
+        ListItem(
+            content = { Text("DeviceId") },
+            supportingContent = { Text(text = deviceId.value) },
+            onClick = {
+                context.copyToClipboard(
+                    text = deviceId.value,
+                    toastMessage = toastMessage,
+                )
+            }
+        )
+    }
+}
 
-        val supportingText = if (callUrlState.baseUrl.isNullOrEmpty()) {
-            stringResource(R.string.screen_advanced_settings_element_call_base_url_description)
-        } else {
-            callUrlState.baseUrl
-        }
-        PreferenceTextField(
-            headline = stringResource(R.string.screen_advanced_settings_element_call_base_url),
-            value = callUrlState.baseUrl,
-            placeholder = "https://.../room",
-            supportingText = supportingText,
-            validation = callUrlState.validator,
-            onValidationErrorMessage = stringResource(R.string.screen_advanced_settings_element_call_base_url_validation_error),
-            displayValue = { value -> !value.isNullOrEmpty() },
-            keyboardOptions = KeyboardOptions.Default.copy(autoCorrectEnabled = false, keyboardType = KeyboardType.Uri),
-            onChange = { state.eventSink(DeveloperSettingsEvents.SetCustomElementCallBaseUrl(it)) }
+@Composable
+private fun MarkAllRoomsAsReadCategory(state: DeveloperSettingsState) {
+    PreferenceCategory(title = "Room list") {
+        ListItem(
+            content = {
+                Text("Mark all rooms as read")
+            },
+            supportingContent = {
+                Text(
+                    text = """
+                        This will send a private read receipt and a read marker in every room you are part of. 
+                        It's a long running operation that might get rate limited.
+                        It will run in the background but the app must be alive for it to finish.
+                        """.trimIndent(),
+                    style = ElementTheme.typography.fontBodySmRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
+            },
+            enabled = !state.showLoader,
+            onClick = {
+                state.eventSink(DeveloperSettingsEvents.MarkAllRoomsAsRead(needsConfirmation = true))
+            },
         )
     }
 }
@@ -242,7 +220,7 @@ private fun ElementCallCategory(
 private fun NotificationCategory(onPushHistoryClick: () -> Unit) {
     PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_title)) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(stringResource(R.string.troubleshoot_notifications_entry_point_push_history_title))
             },
             onClick = onPushHistoryClick,
@@ -250,20 +228,6 @@ private fun NotificationCategory(onPushHistoryClick: () -> Unit) {
     }
 }
 
-@Composable
-private fun FeatureListContent(
-    state: DeveloperSettingsState,
-) {
-    fun onFeatureEnabled(feature: FeatureUiModel, isEnabled: Boolean) {
-        state.eventSink(DeveloperSettingsEvents.UpdateEnabledFeature(feature, isEnabled))
-    }
-
-    FeatureListView(
-        features = state.features,
-        onCheckedChange = ::onFeatureEnabled,
-    )
-}
-
 @PreviewsDayNight
 @Composable
 internal fun DeveloperSettingsViewPreview(
@@ -273,6 +237,6 @@ internal fun DeveloperSettingsViewPreview(
         state = state,
         onOpenShowkase = {},
         onPushHistoryClick = {},
-        onBackClick = {}
+        onBackClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/NoopExtraDeveloperOptionsRenderer.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/NoopExtraDeveloperOptionsRenderer.kt
new file mode 100644
index 0000000000..da0540a93f
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/NoopExtraDeveloperOptionsRenderer.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.preferences.api.ExtraDeveloperOptionsRenderer
+
+@ContributesBinding(AppScope::class)
+class NoopExtraDeveloperOptionsRenderer : ExtraDeveloperOptionsRenderer {
+    @Composable
+    override fun Render(modifier: Modifier) {
+        // No-op
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsEvent.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsEvent.kt
new file mode 100644
index 0000000000..d9641a2810
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsEvent.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
+import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+
+sealed interface AppDeveloperSettingsEvent {
+    data class UpdateEnabledFeature(val feature: FeatureUiModel, val isEnabled: Boolean) : AppDeveloperSettingsEvent
+    data class SetCustomElementCallBaseUrl(val baseUrl: String?) : AppDeveloperSettingsEvent
+    data class SetTracingLogLevel(val logLevel: LogLevelItem) : AppDeveloperSettingsEvent
+    data class ToggleTracingLogPack(val logPack: TraceLogPack, val enabled: Boolean) : AppDeveloperSettingsEvent
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsNode.kt
new file mode 100644
index 0000000000..89ef240a95
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsNode.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.airbnb.android.showkase.models.Showkase
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.features.preferences.api.ExtraDeveloperOptionsRenderer
+import io.element.android.features.preferences.api.PreferencesEntryPoint
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.designsystem.showkase.getBrowserIntent
+
+@ContributesNode(AppScope::class)
+@AssistedInject
+class AppDeveloperSettingsNode(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: AppDeveloperSettingsPresenter,
+    private val extraDeveloperOptionsRenderer: ExtraDeveloperOptionsRenderer,
+) : Node(buildContext, plugins = plugins) {
+    private val callback: PreferencesEntryPoint.DeveloperSettingsCallback = callback()
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val activity = requireNotNull(LocalActivity.current)
+        fun openShowkase() {
+            val intent = Showkase.getBrowserIntent(activity)
+            activity.startActivity(intent)
+        }
+
+        val state = presenter.present()
+        AppDeveloperSettingsPage(
+            state = state,
+            modifier = modifier,
+            onOpenShowkase = ::openShowkase,
+            onBackClick = callback::onDone,
+            extraOptions = { extraDeveloperOptionsRenderer.Render(Modifier) },
+        )
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPage.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPage.kt
new file mode 100644
index 0000000000..d7d62aa325
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPage.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.components.preferences.PreferencePage
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun AppDeveloperSettingsPage(
+    state: AppDeveloperSettingsState,
+    onOpenShowkase: () -> Unit,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    extraOptions: @Composable () -> Unit = {},
+) {
+    BackHandler(
+        onBack = onBackClick,
+    )
+    PreferencePage(
+        modifier = modifier,
+        onBackClick = {
+            onBackClick()
+        },
+        title = "Application developer options",
+    ) {
+        AppDeveloperSettingsView(
+            state = state,
+            onOpenShowkase = onOpenShowkase,
+            modifier = Modifier.padding(top = 8.dp)
+        )
+        extraOptions()
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun AppDeveloperSettingsPagePreview() = ElementPreview {
+    AppDeveloperSettingsPage(
+        state = anAppDeveloperSettingsState(),
+        onOpenShowkase = {},
+        onBackClick = {},
+    )
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenter.kt
new file mode 100644
index 0000000000..9c1127dd2a
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenter.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import dev.zacsweers.metro.Inject
+import io.element.android.features.preferences.impl.developer.tracing.toLogLevel
+import io.element.android.features.preferences.impl.developer.tracing.toLogLevelItem
+import io.element.android.features.preferences.impl.model.EnabledFeature
+import io.element.android.features.rageshake.api.preferences.RageshakePreferencesState
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import java.net.URL
+
+@Inject
+class AppDeveloperSettingsPresenter(
+    private val featureFlagService: FeatureFlagService,
+    private val rageshakePresenter: Presenter<RageshakePreferencesState>,
+    private val appPreferencesStore: AppPreferencesStore,
+    private val buildMeta: BuildMeta,
+) : Presenter<AppDeveloperSettingsState> {
+    @Composable
+    override fun present(): AppDeveloperSettingsState {
+        val rageshakeState = rageshakePresenter.present()
+        val enabledFeatures = remember {
+            mutableStateListOf<EnabledFeature>()
+        }
+        val customElementCallBaseUrl by remember {
+            appPreferencesStore
+                .getCustomElementCallBaseUrlFlow()
+        }.collectAsState(initial = null)
+
+        val tracingLogLevelFlow = remember {
+            appPreferencesStore.getTracingLogLevelFlow().map { AsyncData.Success(it.toLogLevelItem()) }
+        }
+        val tracingLogLevel by tracingLogLevelFlow.collectAsState(initial = AsyncData.Uninitialized)
+        val tracingLogPacks by produceState(persistentListOf()) {
+            appPreferencesStore.getTracingLogPacksFlow()
+                // Sort the entries alphabetically by its title
+                .map { it.sortedBy { pack -> pack.title } }
+                .collectLatest { value = it.toImmutableList() }
+        }
+
+        LaunchedEffect(Unit) {
+            featureFlagService.getAvailableFeatures()
+                .forEach { feature ->
+                    enabledFeatures.add(EnabledFeature(feature, featureFlagService.isFeatureEnabled(feature)))
+                }
+        }
+        val featureUiModels = createUiModels(enabledFeatures)
+        val coroutineScope = rememberCoroutineScope()
+        // Compute cache size each time the clear cache action value is changed
+
+        fun handleEvent(event: AppDeveloperSettingsEvent) {
+            when (event) {
+                is AppDeveloperSettingsEvent.UpdateEnabledFeature -> coroutineScope.updateEnabledFeature(
+                    enabledFeatures = enabledFeatures,
+                    featureKey = event.feature.key,
+                    enabled = event.isEnabled,
+                )
+                is AppDeveloperSettingsEvent.SetCustomElementCallBaseUrl -> coroutineScope.launch {
+                    val urlToSave = event.baseUrl.takeIf { !it.isNullOrEmpty() }
+                    appPreferencesStore.setCustomElementCallBaseUrl(urlToSave)
+                }
+                is AppDeveloperSettingsEvent.SetTracingLogLevel -> coroutineScope.launch {
+                    appPreferencesStore.setTracingLogLevel(event.logLevel.toLogLevel())
+                }
+                is AppDeveloperSettingsEvent.ToggleTracingLogPack -> coroutineScope.launch {
+                    val currentPacks = tracingLogPacks.toMutableSet()
+                    if (currentPacks.contains(event.logPack)) {
+                        currentPacks.remove(event.logPack)
+                    } else {
+                        currentPacks.add(event.logPack)
+                    }
+                    appPreferencesStore.setTracingLogPacks(currentPacks)
+                }
+            }
+        }
+
+        return AppDeveloperSettingsState(
+            features = featureUiModels,
+            rageshakeState = rageshakeState,
+            customElementCallBaseUrlState = CustomElementCallBaseUrlState(
+                baseUrl = customElementCallBaseUrl,
+                validator = ::customElementCallUrlValidator,
+            ),
+            tracingLogLevel = tracingLogLevel,
+            tracingLogPacks = tracingLogPacks,
+            gitBranch = buildMeta.gitBranchName,
+            gitSha = buildMeta.gitRevision,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    @Composable
+    private fun createUiModels(
+        enabledFeatures: SnapshotStateList<EnabledFeature>,
+    ): ImmutableList<FeatureUiModel> {
+        return enabledFeatures.map { enabledFeature ->
+            key(enabledFeature.feature.key) {
+                remember(enabledFeature) {
+                    FeatureUiModel(
+                        key = enabledFeature.feature.key,
+                        title = enabledFeature.feature.title,
+                        description = enabledFeature.feature.description,
+                        icon = null,
+                        isEnabled = enabledFeature.isEnabled
+                    )
+                }
+            }
+        }.toImmutableList()
+    }
+
+    private fun CoroutineScope.updateEnabledFeature(
+        enabledFeatures: SnapshotStateList<EnabledFeature>,
+        featureKey: String,
+        enabled: Boolean,
+    ) = launch {
+        val featureIndex = enabledFeatures.indexOfFirst { it.feature.key == featureKey }.takeIf { it != -1 } ?: return@launch
+        val feature = enabledFeatures[featureIndex].feature
+        if (featureFlagService.setFeatureEnabled(feature, enabled)) {
+            enabledFeatures[featureIndex] = enabledFeatures[featureIndex].copy(isEnabled = enabled)
+        }
+    }
+}
+
+private fun customElementCallUrlValidator(url: String?): Boolean {
+    return runCatchingExceptions {
+        if (url.isNullOrEmpty()) return@runCatchingExceptions
+        val parsedUrl = URL(url)
+        if (parsedUrl.protocol !in listOf("http", "https")) error("Incorrect protocol")
+        if (parsedUrl.host.isNullOrBlank()) error("Missing host")
+    }.isSuccess
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsState.kt
new file mode 100644
index 0000000000..071670644c
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsState.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.features.rageshake.api.preferences.RageshakePreferencesState
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
+import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+import kotlinx.collections.immutable.ImmutableList
+
+data class AppDeveloperSettingsState(
+    val features: ImmutableList<FeatureUiModel>,
+    val rageshakeState: RageshakePreferencesState,
+    val customElementCallBaseUrlState: CustomElementCallBaseUrlState,
+    val tracingLogLevel: AsyncData<LogLevelItem>,
+    val tracingLogPacks: ImmutableList<TraceLogPack>,
+    val gitBranch: String,
+    val gitSha: String,
+    val eventSink: (AppDeveloperSettingsEvent) -> Unit
+)
+
+data class CustomElementCallBaseUrlState(
+    val baseUrl: String?,
+    val validator: (String?) -> Boolean,
+)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsStateProvider.kt
new file mode 100644
index 0000000000..e4536f4dba
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsStateProvider.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.features.rageshake.api.preferences.aRageshakePreferencesState
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.featureflag.ui.model.aFeatureUiModelList
+import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+import kotlinx.collections.immutable.toImmutableList
+
+open class AppDeveloperSettingsStateProvider : PreviewParameterProvider<AppDeveloperSettingsState> {
+    override val values: Sequence<AppDeveloperSettingsState>
+        get() = sequenceOf(
+            anAppDeveloperSettingsState(),
+            anAppDeveloperSettingsState(
+                customElementCallBaseUrlState = aCustomElementCallBaseUrlState(
+                    baseUrl = "https://call.element.ahoy",
+                )
+            ),
+        )
+}
+
+fun anAppDeveloperSettingsState(
+    customElementCallBaseUrlState: CustomElementCallBaseUrlState = aCustomElementCallBaseUrlState(),
+    traceLogPacks: List<TraceLogPack> = emptyList(),
+    eventSink: (AppDeveloperSettingsEvent) -> Unit = {},
+) = AppDeveloperSettingsState(
+    features = aFeatureUiModelList(),
+    rageshakeState = aRageshakePreferencesState(),
+    customElementCallBaseUrlState = customElementCallBaseUrlState,
+    tracingLogLevel = AsyncData.Success(LogLevelItem.INFO),
+    tracingLogPacks = traceLogPacks.toImmutableList(),
+    gitBranch = "feature/awesome-feature",
+    gitSha = "1234567890",
+    eventSink = eventSink,
+)
+
+fun aCustomElementCallBaseUrlState(
+    baseUrl: String? = null,
+    validator: (String?) -> Boolean = { true },
+) = CustomElementCallBaseUrlState(
+    baseUrl = baseUrl,
+    validator = validator,
+)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsView.kt
new file mode 100644
index 0000000000..a4f41edb4a
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsView.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.preferences.impl.R
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.features.rageshake.api.preferences.RageshakePreferencesView
+import io.element.android.libraries.androidutils.system.copyToClipboard
+import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
+import io.element.android.libraries.designsystem.components.preferences.PreferenceDropdown
+import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
+import io.element.android.libraries.designsystem.components.preferences.PreferenceTextField
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.ListItem
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.featureflag.ui.FeatureListView
+import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
+import io.element.android.libraries.matrix.api.tracing.TraceLogPack
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.toImmutableList
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun AppDeveloperSettingsView(
+    state: AppDeveloperSettingsState,
+    onOpenShowkase: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        // Note: this is OK to hardcode strings in this debug screen.
+        PreferenceCategory(
+            title = "Feature flags",
+            showTopDivider = false,
+        ) {
+            FeatureListContent(state)
+        }
+        ElementCallCategory(state = state)
+        PreferenceCategory(title = "Rust SDK") {
+            PreferenceDropdown(
+                title = "Tracing log level",
+                supportingText = "Requires app reboot",
+                selectedOption = state.tracingLogLevel.dataOrNull(),
+                options = LogLevelItem.entries.toImmutableList(),
+                onSelectOption = { logLevel ->
+                    state.eventSink(AppDeveloperSettingsEvent.SetTracingLogLevel(logLevel))
+                }
+            )
+        }
+        PreferenceCategory(title = "Enable trace logs per SDK feature") {
+            Text(
+                text = "Requires app reboot",
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
+            )
+            for (logPack in TraceLogPack.entries) {
+                PreferenceSwitch(
+                    title = logPack.title,
+                    isChecked = state.tracingLogPacks.contains(logPack),
+                    onCheckedChange = { isChecked -> state.eventSink(AppDeveloperSettingsEvent.ToggleTracingLogPack(logPack, isChecked)) }
+                )
+            }
+        }
+        PreferenceCategory(title = "Showkase") {
+            ListItem(
+                content = {
+                    Text("Open Showkase browser")
+                },
+                onClick = onOpenShowkase
+            )
+        }
+        RageshakePreferencesView(
+            state = state.rageshakeState,
+        )
+        PreferenceCategory(title = "Crash") {
+            ListItem(
+                content = {
+                    Text("Crash the app 💥")
+                },
+                onClick = { error("This crash is a test.") }
+            )
+        }
+        GitCategory(
+            gitBranch = state.gitBranch,
+            gitSha = state.gitSha,
+        )
+    }
+}
+
+@Composable
+private fun GitCategory(
+    gitBranch: String,
+    gitSha: String,
+) {
+    PreferenceCategory(title = "Git") {
+        val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
+        val context = LocalContext.current
+        ListItem(
+            content = { Text("Git branch") },
+            supportingContent = { Text(text = gitBranch) },
+            onClick = {
+                context.copyToClipboard(
+                    text = gitBranch,
+                    toastMessage = toastMessage,
+                )
+            }
+        )
+        ListItem(
+            content = { Text("Git SHA") },
+            supportingContent = { Text(text = gitSha) },
+            onClick = {
+                context.copyToClipboard(
+                    text = gitSha,
+                    toastMessage = toastMessage,
+                )
+            }
+        )
+    }
+}
+
+@Composable
+private fun ElementCallCategory(
+    state: AppDeveloperSettingsState,
+) {
+    PreferenceCategory(title = "Element Call") {
+        val callUrlState = state.customElementCallBaseUrlState
+
+        val supportingText = if (callUrlState.baseUrl.isNullOrEmpty()) {
+            stringResource(R.string.screen_advanced_settings_element_call_base_url_description)
+        } else {
+            callUrlState.baseUrl
+        }
+        PreferenceTextField(
+            headline = stringResource(R.string.screen_advanced_settings_element_call_base_url),
+            value = callUrlState.baseUrl,
+            placeholder = "https://.../room",
+            supportingText = supportingText,
+            validation = callUrlState.validator,
+            onValidationErrorMessage = stringResource(R.string.screen_advanced_settings_element_call_base_url_validation_error),
+            displayValue = { value -> !value.isNullOrEmpty() },
+            keyboardOptions = KeyboardOptions.Default.copy(autoCorrectEnabled = false, keyboardType = KeyboardType.Uri),
+            onChange = { state.eventSink(AppDeveloperSettingsEvent.SetCustomElementCallBaseUrl(it)) }
+        )
+    }
+}
+
+@Composable
+private fun FeatureListContent(
+    state: AppDeveloperSettingsState,
+) {
+    fun onFeatureEnabled(feature: FeatureUiModel, isEnabled: Boolean) {
+        state.eventSink(AppDeveloperSettingsEvent.UpdateEnabledFeature(feature, isEnabled))
+    }
+
+    FeatureListView(
+        features = state.features,
+        onCheckedChange = ::onFeatureEnabled,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun AppDeveloperSettingsViewPreview(
+    @PreviewParameter(AppDeveloperSettingsStateProvider::class) state: AppDeveloperSettingsState
+) = ElementPreview {
+    AppDeveloperSettingsView(
+        state = state,
+        onOpenShowkase = {},
+    )
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/di/DeveloperSettingsModule.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/di/DeveloperSettingsModule.kt
new file mode 100644
index 0000000000..bad0ccae0f
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/di/DeveloperSettingsModule.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.developer.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsPresenter
+import io.element.android.features.preferences.impl.developer.appsettings.AppDeveloperSettingsState
+import io.element.android.libraries.architecture.Presenter
+
+@ContributesTo(AppScope::class)
+@BindingContainer
+interface DeveloperSettingsModule {
+    @Binds
+    fun bindAppDeveloperSettingsPresenter(presenter: AppDeveloperSettingsPresenter): Presenter<AppDeveloperSettingsState>
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsEvents.kt
index 8f1b332c8c..5ca7fc9fdf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsEvents.kt
@@ -8,6 +8,8 @@
 
 package io.element.android.features.preferences.impl.notifications
 
+import io.element.android.libraries.preferences.api.store.NotificationSound
+
 sealed interface NotificationSettingsEvents {
     data object RefreshSystemNotificationsEnabled : NotificationSettingsEvents
     data class SetNotificationsEnabled(val enabled: Boolean) : NotificationSettingsEvents
@@ -20,4 +22,16 @@ sealed interface NotificationSettingsEvents {
     data object ChangePushProvider : NotificationSettingsEvents
     data object CancelChangePushProvider : NotificationSettingsEvents
     data class SetPushProvider(val index: Int) : NotificationSettingsEvents
+    data class SetMessageSound(val sound: NotificationSound) : NotificationSettingsEvents
+    data class SetCallRingtone(val sound: NotificationSound) : NotificationSettingsEvents
+    data object DismissMessageSoundCopyError : NotificationSettingsEvents
+    data object DismissCallRingtoneCopyError : NotificationSettingsEvents
+    data object ShowMessageSoundDialog : NotificationSettingsEvents
+    data object DismissMessageSoundDialog : NotificationSettingsEvents
+    data class SelectMessageSoundPreset(val sound: NotificationSound) : NotificationSettingsEvents
+    data object LaunchMessageSoundPicker : NotificationSettingsEvents
+    data object ShowCallRingtoneDialog : NotificationSettingsEvents
+    data object DismissCallRingtoneDialog : NotificationSettingsEvents
+    data class SelectCallRingtonePreset(val sound: NotificationSound) : NotificationSettingsEvents
+    data object LaunchCallRingtonePicker : NotificationSettingsEvents
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt
index 9d9e80b3f3..03fe2cf31b 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenter.kt
@@ -16,10 +16,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
+import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -30,18 +32,30 @@ import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermiss
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
 import io.element.android.libraries.push.api.PushService
+import io.element.android.libraries.push.api.notifications.NotificationSoundUpdater
+import io.element.android.libraries.push.api.notifications.SoundDisplayNameResolver
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.CopyResult
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.SoundSlot
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.libraries.pushstore.api.UserPushStore
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
+import io.element.android.services.toolbox.api.strings.StringProvider
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
 import kotlin.time.Duration.Companion.seconds
 
 @Inject
@@ -52,9 +66,22 @@ class NotificationSettingsPresenter(
     private val pushService: PushService,
     private val systemNotificationsEnabledProvider: SystemNotificationsEnabledProvider,
     private val fullScreenIntentPermissionsPresenter: Presenter<FullScreenIntentPermissionsState>,
+    private val appPreferencesStore: AppPreferencesStore,
+    private val notificationSoundUpdater: NotificationSoundUpdater,
+    private val notificationSoundCopier: NotificationSoundCopier,
+    private val soundDisplayNameResolver: SoundDisplayNameResolver,
+    private val stringProvider: StringProvider,
     @SessionCoroutineScope
     private val sessionCoroutineScope: CoroutineScope,
 ) : Presenter<NotificationSettingsState> {
+    // Serializes the pick → copy → persist → recreate pipeline per slot. The copier already locks
+    // its `<slot>.tmp` file, but the persist+recreate window outside the copier is unprotected;
+    // without this, two rapid picks (e.g. an automation or accessibility service firing back-to-
+    // back events) could interleave and leave the channel id pointing at the older version while
+    // DataStore reflects the newer one.
+    private val messageSoundLock = Mutex()
+    private val callRingtoneLock = Mutex()
+
     @Composable
     override fun present(): NotificationSettingsState {
         val userPushStore = remember { userPushStoreFactory.getOrCreate(matrixClient.sessionId) }
@@ -109,6 +136,42 @@ class NotificationSettingsPresenter(
 
         var showChangePushProviderDialog by remember { mutableStateOf(false) }
 
+        val messageSound by remember { appPreferencesStore.getMessageSoundFlow() }.collectAsState(initial = NotificationSound.SystemDefault)
+        val callRingtone by remember { appPreferencesStore.getCallRingtoneFlow() }.collectAsState(initial = NotificationSound.SystemDefault)
+        val persistedMessageSoundTitle by remember { appPreferencesStore.getMessageSoundDisplayNameFlow() }.collectAsState(initial = null)
+        val persistedCallRingtoneTitle by remember { appPreferencesStore.getCallRingtoneDisplayNameFlow() }.collectAsState(initial = null)
+        val defaultLabel = stringProvider.getString(R.string.screen_notification_settings_sound_system_default)
+
+        // One-shot classification for the call-ringtone slot only: users who customised the
+        // channel via Android system settings before the in-app picker existed (channel version 0,
+        // persisted SystemDefault) get reflected here. The message-sound equivalent is handled by
+        // the eager migration in DefaultNotificationChannels.createNotificationChannels(). Cleared
+        // on any in-app pick so a stale read can't bleed into the row after the recreate.
+        var legacyCallRingtone by remember { mutableStateOf<NotificationSound?>(null) }
+        LaunchedEffect(Unit) {
+            val config = appPreferencesStore.getNotificationSoundChannelConfig()
+            if (config.callRingtone == NotificationSound.SystemDefault && config.callRingtoneVersion == 0) {
+                legacyCallRingtone = notificationSoundUpdater.readRingingCallChannelSound()
+            }
+        }
+
+        val effectiveMessageSound = messageSound
+        val effectiveCallRingtone = if (callRingtone == NotificationSound.SystemDefault) {
+            legacyCallRingtone ?: callRingtone
+        } else {
+            callRingtone
+        }
+
+        val messageSoundDisplayName = probeSoundDisplayName(effectiveMessageSound, persistedMessageSoundTitle, defaultLabel)
+        val callRingtoneDisplayName = probeSoundDisplayName(effectiveCallRingtone, persistedCallRingtoneTitle, defaultLabel)
+
+        var messageSoundCopyError by remember { mutableStateOf(false) }
+        var callRingtoneCopyError by remember { mutableStateOf(false) }
+        var showMessageSoundDialog by remember { mutableStateOf(false) }
+        var pendingMessageSoundPickerLaunch by remember { mutableIntStateOf(0) }
+        var showCallRingtoneDialog by remember { mutableStateOf(false) }
+        var pendingCallRingtonePickerLaunch by remember { mutableIntStateOf(0) }
+
         fun CoroutineScope.changePushProvider(
             data: Pair<PushProvider, Distributor>?
         ) = launch {
@@ -157,6 +220,62 @@ class NotificationSettingsPresenter(
                 NotificationSettingsEvents.ChangePushProvider -> showChangePushProviderDialog = true
                 NotificationSettingsEvents.CancelChangePushProvider -> showChangePushProviderDialog = false
                 is NotificationSettingsEvents.SetPushProvider -> localCoroutineScope.changePushProvider(distributors.getOrNull(event.index))
+                is NotificationSettingsEvents.SetMessageSound -> applyMessageSound(
+                    sound = event.sound,
+                    sessionCoroutineScope = sessionCoroutineScope,
+                    onCopyError = { messageSoundCopyError = true },
+                    onCopySuccess = { messageSoundCopyError = false },
+                    onChannelFailure = { failure -> changeNotificationSettingAction.value = AsyncAction.Failure(failure) },
+                )
+                is NotificationSettingsEvents.SelectMessageSoundPreset -> {
+                    showMessageSoundDialog = false
+                    applyMessageSound(
+                        sound = event.sound,
+                        sessionCoroutineScope = sessionCoroutineScope,
+                        onCopyError = { messageSoundCopyError = true },
+                        onCopySuccess = { messageSoundCopyError = false },
+                        onChannelFailure = { failure -> changeNotificationSettingAction.value = AsyncAction.Failure(failure) },
+                    )
+                }
+                NotificationSettingsEvents.ShowMessageSoundDialog -> showMessageSoundDialog = true
+                NotificationSettingsEvents.DismissMessageSoundDialog -> showMessageSoundDialog = false
+                NotificationSettingsEvents.LaunchMessageSoundPicker -> {
+                    showMessageSoundDialog = false
+                    pendingMessageSoundPickerLaunch++
+                }
+                is NotificationSettingsEvents.SetCallRingtone -> {
+                    legacyCallRingtone = null
+                    applyCallRingtone(
+                        sound = event.sound,
+                        sessionCoroutineScope = sessionCoroutineScope,
+                        onCopyError = { callRingtoneCopyError = true },
+                        onCopySuccess = { callRingtoneCopyError = false },
+                        onChannelFailure = { failure -> changeNotificationSettingAction.value = AsyncAction.Failure(failure) },
+                    )
+                }
+                is NotificationSettingsEvents.SelectCallRingtonePreset -> {
+                    showCallRingtoneDialog = false
+                    legacyCallRingtone = null
+                    applyCallRingtone(
+                        sound = event.sound,
+                        sessionCoroutineScope = sessionCoroutineScope,
+                        onCopyError = { callRingtoneCopyError = true },
+                        onCopySuccess = { callRingtoneCopyError = false },
+                        onChannelFailure = { failure -> changeNotificationSettingAction.value = AsyncAction.Failure(failure) },
+                    )
+                }
+                NotificationSettingsEvents.ShowCallRingtoneDialog -> showCallRingtoneDialog = true
+                NotificationSettingsEvents.DismissCallRingtoneDialog -> showCallRingtoneDialog = false
+                NotificationSettingsEvents.LaunchCallRingtonePicker -> {
+                    showCallRingtoneDialog = false
+                    pendingCallRingtonePickerLaunch++
+                }
+                NotificationSettingsEvents.DismissMessageSoundCopyError -> {
+                    messageSoundCopyError = false
+                }
+                NotificationSettingsEvents.DismissCallRingtoneCopyError -> {
+                    callRingtoneCopyError = false
+                }
             }
         }
 
@@ -171,10 +290,140 @@ class NotificationSettingsPresenter(
             availablePushDistributors = availableDistributors,
             showChangePushProviderDialog = showChangePushProviderDialog,
             fullScreenIntentPermissionsState = key(refreshFullScreenIntentSettings) { fullScreenIntentPermissionsPresenter.present() },
+            messageSound = NotificationSettingsState.SoundChannelUiState(
+                sound = effectiveMessageSound,
+                displayName = messageSoundDisplayName,
+                copyError = messageSoundCopyError,
+            ),
+            callRingtone = NotificationSettingsState.SoundChannelUiState(
+                sound = effectiveCallRingtone,
+                displayName = callRingtoneDisplayName,
+                copyError = callRingtoneCopyError,
+            ),
+            showMessageSoundDialog = showMessageSoundDialog,
+            showCallRingtoneDialog = showCallRingtoneDialog,
+            pendingMessageSoundPickerLaunch = pendingMessageSoundPickerLaunch,
+            pendingCallRingtonePickerLaunch = pendingCallRingtonePickerLaunch,
             eventSink = ::handleEvent,
         )
     }
 
+    private fun applyMessageSound(
+        sound: NotificationSound,
+        sessionCoroutineScope: CoroutineScope,
+        onCopyError: () -> Unit,
+        onCopySuccess: () -> Unit,
+        onChannelFailure: (Throwable) -> Unit,
+    ) {
+        sessionCoroutineScope.launch {
+            messageSoundLock.withLock {
+                // Re-selecting the current non-Custom sound is a no-op: skip the channel churn
+                // (delete + create round-trips through system_server) and the version bump. Custom
+                // still falls through so the copier refreshes the file from the (possibly updated)
+                // source URI.
+                if (sound !is NotificationSound.Custom && appPreferencesStore.getMessageSoundFlow().first() == sound) {
+                    onCopySuccess()
+                    return@withLock
+                }
+                val resolved = resolvePickedSound(sound, SoundSlot.Message, onCopyError) ?: return@withLock
+                runCatchingExceptions {
+                    onCopySuccess()
+                    val newVersion = appPreferencesStore.setMessageSoundAndIncrementVersion(resolved.first, resolved.second)
+                    notificationSoundUpdater.recreateNoisyChannel(resolved.first, newVersion)
+                    // Non-Custom picks bypass the copier, so they don't sweep the prior Custom file
+                    // inline. Drop it now that the new channel no longer references it.
+                    if (resolved.first !is NotificationSound.Custom) {
+                        notificationSoundCopier.deleteStoredSoundFor(SoundSlot.Message)
+                    }
+                }.onFailure(onChannelFailure)
+            }
+        }
+    }
+
+    private fun applyCallRingtone(
+        sound: NotificationSound,
+        sessionCoroutineScope: CoroutineScope,
+        onCopyError: () -> Unit,
+        onCopySuccess: () -> Unit,
+        onChannelFailure: (Throwable) -> Unit,
+    ) {
+        sessionCoroutineScope.launch {
+            callRingtoneLock.withLock {
+                if (sound !is NotificationSound.Custom && appPreferencesStore.getCallRingtoneFlow().first() == sound) {
+                    onCopySuccess()
+                    return@withLock
+                }
+                val resolved = resolvePickedSound(sound, SoundSlot.Call, onCopyError) ?: return@withLock
+                runCatchingExceptions {
+                    onCopySuccess()
+                    val newVersion = appPreferencesStore.setCallRingtoneAndIncrementVersion(resolved.first, resolved.second)
+                    notificationSoundUpdater.recreateRingingCallChannel(resolved.first, newVersion)
+                    if (resolved.first !is NotificationSound.Custom) {
+                        notificationSoundCopier.deleteStoredSoundFor(SoundSlot.Call)
+                    }
+                }.onFailure(onChannelFailure)
+            }
+        }
+    }
+
+    /**
+     * Custom rows prefer [persistedTitle] (captured at copy time), fall back to a live resolver
+     * probe for legacy data, then to a localised "Custom" — never to [defaultLabel], so an
+     * unresolvable Custom isn't mislabelled as Default.
+     */
+    @Composable
+    private fun probeSoundDisplayName(
+        sound: NotificationSound,
+        persistedTitle: String?,
+        defaultLabel: String,
+    ): String = when (sound) {
+        NotificationSound.SystemDefault -> defaultLabel
+        NotificationSound.ElementDefault -> stringProvider.getString(R.string.screen_notification_settings_sound_element_default)
+        NotificationSound.ElementFade -> stringProvider.getString(R.string.screen_notification_settings_sound_element_fade)
+        NotificationSound.Silent -> stringProvider.getString(R.string.screen_notification_settings_sound_silent)
+        is NotificationSound.Custom -> {
+            val nonBlankPersisted = persistedTitle?.takeUnless { it.isBlank() }
+            if (nonBlankPersisted != null) {
+                nonBlankPersisted
+            } else {
+                val customFallback = stringProvider.getString(R.string.screen_notification_settings_sound_custom_fallback)
+                val resolved by produceState(initialValue = "", sound.uri) {
+                    val title = soundDisplayNameResolver.resolveCustomSoundTitle(sound.uri)
+                    value = title?.takeUnless { it.isBlank() } ?: customFallback
+                }
+                resolved
+            }
+        }
+    }
+
+    /**
+     * For a Custom pick, copies into app-private storage and returns (FileProvider URI, title).
+     * Returns null on copy failure after invoking [onCopyError]. Pass-through for SystemDefault /
+     * Silent.
+     */
+    private suspend fun resolvePickedSound(
+        requested: NotificationSound,
+        slot: SoundSlot,
+        onCopyError: () -> Unit,
+    ): Pair<NotificationSound, String?>? {
+        if (requested !is NotificationSound.Custom) return requested to null
+        return when (val result = notificationSoundCopier.copyToAppFiles(requested.uri, slot)) {
+            is CopyResult.Success -> NotificationSound.Custom(result.fileProviderUriString) to result.displayName
+            is CopyResult.Failure -> {
+                Timber.w(result.cause, "Notification sound copy failed for slot=%s", slot)
+                onCopyError()
+                null
+            }
+            CopyResult.UnplayableSource,
+            CopyResult.UnplayableCopy,
+            CopyResult.FileTooLarge -> {
+                Timber.w("Notification sound rejected: result=%s slot=%s", result::class.simpleName, slot)
+                onCopyError()
+                null
+            }
+        }
+    }
+
     @OptIn(FlowPreview::class)
     private fun CoroutineScope.observeNotificationSettings(
         target: MutableState<NotificationSettingsState.MatrixSettings>,
@@ -223,7 +472,7 @@ class NotificationSettingsPresenter(
                 notificationSettingsService.setDefaultRoomNotificationMode(
                     isEncrypted = encryptedGroupDefaultMode != RoomNotificationMode.ALL_MESSAGES,
                     mode = RoomNotificationMode.ALL_MESSAGES,
-                    isOneToOne = false,
+                    isDM = false,
                 )
             }
 
@@ -234,7 +483,7 @@ class NotificationSettingsPresenter(
                 notificationSettingsService.setDefaultRoomNotificationMode(
                     isEncrypted = encryptedOneToOneDefaultMode != RoomNotificationMode.ALL_MESSAGES,
                     mode = RoomNotificationMode.ALL_MESSAGES,
-                    isOneToOne = true,
+                    isDM = true,
                 )
             }
         }.fold(
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsState.kt
index 0a55909e2c..3c59f6c355 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsState.kt
@@ -12,6 +12,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.preferences.api.store.NotificationSound
 import io.element.android.libraries.pushproviders.api.Distributor
 import kotlinx.collections.immutable.ImmutableList
 
@@ -23,6 +24,24 @@ data class NotificationSettingsState(
     val availablePushDistributors: ImmutableList<Distributor>,
     val showChangePushProviderDialog: Boolean,
     val fullScreenIntentPermissionsState: FullScreenIntentPermissionsState,
+    val messageSound: SoundChannelUiState,
+    val callRingtone: SoundChannelUiState,
+    val showMessageSoundDialog: Boolean,
+    val showCallRingtoneDialog: Boolean,
+    /**
+     * One-shot trigger for launching the system ringtone picker. Each
+     * [NotificationSettingsEvents.LaunchMessageSoundPicker] increments the value;
+     * the view watches this in `LaunchedEffect` and calls the launcher whenever it goes above 0.
+     * **Always start at 0** in initial state, providers, and previews — a non-zero seed will
+     * auto-open the picker on screen entry.
+     */
+    val pendingMessageSoundPickerLaunch: Int,
+    /**
+     * One-shot trigger for launching the system ringtone picker from the call ringtone dialog.
+     * Same contract as [pendingMessageSoundPickerLaunch]: **always start at 0**, or the picker
+     * auto-opens on screen entry.
+     */
+    val pendingCallRingtonePickerLaunch: Int,
     val eventSink: (NotificationSettingsEvents) -> Unit,
 ) {
     sealed interface MatrixSettings {
@@ -45,6 +64,16 @@ data class NotificationSettingsState(
         val appNotificationsEnabled: Boolean,
     )
 
+    /**
+     * UI state for one of the two sound rows (message sound, call ringtone). [copyError] is set
+     * when the last pick failed to copy into app-private storage; the persisted choice stays put.
+     */
+    data class SoundChannelUiState(
+        val sound: NotificationSound,
+        val displayName: String,
+        val copyError: Boolean,
+    )
+
     /**
      * Whether the advanced settings should be shown.
      * This is true if the current push distributor is in a failure state or if there are multiple push distributors available.
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsStateProvider.kt
index fb396443c3..905f869dbe 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsStateProvider.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.fullscreenintent.api.aFullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.preferences.api.store.NotificationSound
 import io.element.android.libraries.pushproviders.api.Distributor
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -45,6 +46,34 @@ open class NotificationSettingsStateProvider : PreviewParameterProvider<Notifica
             aInvalidNotificationSettingsState(fixFailed = true),
             aValidNotificationSettingsState(fullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(permissionGranted = false)),
             aValidNotificationSettingsState(appNotificationEnabled = false),
+            aValidNotificationSettingsState(
+                // Sentinel URIs — previews shouldn't depend on the host's content provider.
+                messageSound = NotificationSound.Custom("preview://message-sound"),
+                messageSoundDisplayName = "Pixel notification",
+                callRingtone = NotificationSound.Custom("preview://call-ringtone"),
+                callRingtoneDisplayName = "Pixel ringtone",
+            ),
+            aValidNotificationSettingsState(
+                messageSound = NotificationSound.Silent,
+                messageSoundDisplayName = "Silent",
+                callRingtone = NotificationSound.Silent,
+                callRingtoneDisplayName = "Silent",
+            ),
+            aValidNotificationSettingsState(
+                messageSoundCopyError = true,
+                callRingtoneCopyError = false,
+            ),
+            aValidNotificationSettingsState(
+                messageSound = NotificationSound.ElementDefault,
+                messageSoundDisplayName = "Element default",
+            ),
+            aValidNotificationSettingsState(showMessageSoundDialog = true),
+            aValidNotificationSettingsState(showCallRingtoneDialog = true),
+            aValidNotificationSettingsState(
+                callRingtone = NotificationSound.Custom("preview://call-ringtone"),
+                callRingtoneDisplayName = "Pixel ringtone",
+                showCallRingtoneDialog = true,
+            ),
         )
 }
 
@@ -62,6 +91,16 @@ fun aValidNotificationSettingsState(
     ),
     showChangePushProviderDialog: Boolean = false,
     fullScreenIntentPermissionsState: FullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(),
+    messageSound: NotificationSound = NotificationSound.SystemDefault,
+    messageSoundDisplayName: String = "Element default",
+    messageSoundCopyError: Boolean = false,
+    callRingtone: NotificationSound = NotificationSound.SystemDefault,
+    callRingtoneDisplayName: String = "System default",
+    callRingtoneCopyError: Boolean = false,
+    showMessageSoundDialog: Boolean = false,
+    showCallRingtoneDialog: Boolean = false,
+    pendingMessageSoundPickerLaunch: Int = 0,
+    pendingCallRingtonePickerLaunch: Int = 0,
     eventSink: (NotificationSettingsEvents) -> Unit = {},
 ) = NotificationSettingsState(
     matrixSettings = NotificationSettingsState.MatrixSettings.Valid(
@@ -80,6 +119,20 @@ fun aValidNotificationSettingsState(
     availablePushDistributors = availablePushDistributors.toImmutableList(),
     showChangePushProviderDialog = showChangePushProviderDialog,
     fullScreenIntentPermissionsState = fullScreenIntentPermissionsState,
+    messageSound = NotificationSettingsState.SoundChannelUiState(
+        sound = messageSound,
+        displayName = messageSoundDisplayName,
+        copyError = messageSoundCopyError,
+    ),
+    callRingtone = NotificationSettingsState.SoundChannelUiState(
+        sound = callRingtone,
+        displayName = callRingtoneDisplayName,
+        copyError = callRingtoneCopyError,
+    ),
+    showMessageSoundDialog = showMessageSoundDialog,
+    showCallRingtoneDialog = showCallRingtoneDialog,
+    pendingMessageSoundPickerLaunch = pendingMessageSoundPickerLaunch,
+    pendingCallRingtonePickerLaunch = pendingCallRingtonePickerLaunch,
     eventSink = eventSink,
 )
 
@@ -99,6 +152,20 @@ fun aInvalidNotificationSettingsState(
     availablePushDistributors = persistentListOf(),
     showChangePushProviderDialog = false,
     fullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(),
+    messageSound = NotificationSettingsState.SoundChannelUiState(
+        sound = NotificationSound.SystemDefault,
+        displayName = "System default",
+        copyError = false,
+    ),
+    callRingtone = NotificationSettingsState.SoundChannelUiState(
+        sound = NotificationSound.SystemDefault,
+        displayName = "System default",
+        copyError = false,
+    ),
+    showMessageSoundDialog = false,
+    showCallRingtoneDialog = false,
+    pendingMessageSoundPickerLaunch = 0,
+    pendingCallRingtonePickerLaunch = 0,
     eventSink = eventSink,
 )
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
index 09f54b7027..9ede5138cf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
@@ -8,16 +8,29 @@
 
 package io.element.android.features.preferences.impl.notifications
 
+import android.app.Activity
+import android.media.RingtoneManager
+import android.net.Uri
+import android.provider.Settings
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.progressSemantics
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.LiveRegionMode
+import androidx.compose.ui.semantics.liveRegion
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.androidutils.system.startNotificationSettingsIntent
@@ -35,13 +48,17 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsEvents
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
+import io.element.android.libraries.preferences.api.store.NotificationSound
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 /**
@@ -113,7 +130,7 @@ private fun NotificationSettingsContentView(
     if (systemSettings.appNotificationsEnabled && !systemSettings.systemNotificationsEnabled) {
         ListItem(
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.NotificationsOffSolid())),
-            headlineContent = {
+            content = {
                 Text(stringResource(id = R.string.screen_notification_settings_system_notifications_turned_off))
             },
             supportingContent = {
@@ -141,7 +158,7 @@ private fun NotificationSettingsContentView(
             PreferenceCategory {
                 ListItem(
                     leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.VoiceCallSolid())),
-                    headlineContent = {
+                    content = {
                         Text(stringResource(id = R.string.full_screen_intent_banner_title))
                     },
                     supportingContent = {
@@ -155,7 +172,7 @@ private fun NotificationSettingsContentView(
         }
         PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_notification_section_title)) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.screen_notification_settings_group_chats))
                 },
                 supportingContent = {
@@ -164,7 +181,7 @@ private fun NotificationSettingsContentView(
                 onClick = onGroupChatsClick
             )
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.screen_notification_settings_direct_chats))
                 },
                 supportingContent = {
@@ -182,6 +199,7 @@ private fun NotificationSettingsContentView(
                 onCheckedChange = onMentionNotificationsChange
             )
         }
+        SoundsPreferenceCategory(state = state)
         PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_additional_settings_section_title)) {
             // TODO We are removing the call notification toggle until support for call notifications has been added
 //                PreferenceSwitch(
@@ -200,7 +218,7 @@ private fun NotificationSettingsContentView(
         }
         PreferenceCategory(title = stringResource(id = R.string.troubleshoot_notifications_entry_point_section)) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.troubleshoot_notifications_entry_point_title))
                 },
                 onClick = onTroubleshootNotificationsClick
@@ -209,7 +227,7 @@ private fun NotificationSettingsContentView(
         if (state.showAdvancedSettings) {
             PreferenceCategory(title = stringResource(id = CommonStrings.common_advanced_settings)) {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(text = stringResource(id = R.string.screen_advanced_settings_push_provider_android))
                     },
                     trailingContent = when (state.currentPushDistributor) {
@@ -261,6 +279,189 @@ private fun NotificationSettingsContentView(
     }
 }
 
+@Composable
+private fun SoundsPreferenceCategory(state: NotificationSettingsState) {
+    PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_sound_section_title)) {
+        val launchMessageSoundPicker = rememberSoundPickerOnClick(
+            type = RingtoneManager.TYPE_NOTIFICATION,
+            current = state.messageSound.sound,
+            defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI,
+            onSoundPick = { sound -> state.eventSink(NotificationSettingsEvents.SetMessageSound(sound)) },
+        )
+        // Skip the initial 0 emission so the picker doesn't auto-open on screen entry; only
+        // increments fired by LaunchMessageSoundPicker should launch it.
+        LaunchedEffect(state.pendingMessageSoundPickerLaunch) {
+            if (state.pendingMessageSoundPickerLaunch > 0) {
+                launchMessageSoundPicker()
+            }
+        }
+        ListItem(
+            content = { Text(stringResource(id = R.string.screen_notification_settings_message_sound_label)) },
+            supportingContent = { Text(state.messageSound.displayName) },
+            onClick = { state.eventSink(NotificationSettingsEvents.ShowMessageSoundDialog) },
+        )
+        if (state.messageSound.copyError) {
+            SoundCopyErrorRow(
+                onDismissClick = { state.eventSink(NotificationSettingsEvents.DismissMessageSoundCopyError) },
+            )
+        }
+        if (state.showMessageSoundDialog) {
+            MessageSoundDialog(state)
+        }
+
+        val launchCallRingtonePicker = rememberSoundPickerOnClick(
+            type = RingtoneManager.TYPE_RINGTONE,
+            current = state.callRingtone.sound,
+            defaultUri = Settings.System.DEFAULT_RINGTONE_URI,
+            onSoundPick = { sound -> state.eventSink(NotificationSettingsEvents.SetCallRingtone(sound)) },
+        )
+        // Skip the initial 0 emission so the picker doesn't auto-open on screen entry; only
+        // increments fired by LaunchCallRingtonePicker should launch it.
+        LaunchedEffect(state.pendingCallRingtonePickerLaunch) {
+            if (state.pendingCallRingtonePickerLaunch > 0) {
+                launchCallRingtonePicker()
+            }
+        }
+        ListItem(
+            content = { Text(stringResource(id = R.string.screen_notification_settings_call_ringtone_label)) },
+            supportingContent = { Text(state.callRingtone.displayName) },
+            onClick = { state.eventSink(NotificationSettingsEvents.ShowCallRingtoneDialog) },
+        )
+        if (state.callRingtone.copyError) {
+            SoundCopyErrorRow(
+                onDismissClick = { state.eventSink(NotificationSettingsEvents.DismissCallRingtoneCopyError) },
+            )
+        }
+        if (state.showCallRingtoneDialog) {
+            CallRingtoneDialog(state)
+        }
+    }
+}
+
+@Composable
+private fun MessageSoundDialog(state: NotificationSettingsState) {
+    val initialSelection = when (state.messageSound.sound) {
+        NotificationSound.ElementDefault -> 0
+        NotificationSound.ElementFade -> 1
+        NotificationSound.SystemDefault -> 2
+        else -> null
+    }
+    // When the user is on Custom or Silent, no preset row is selected — surface the current
+    // sound as a subtitle so screen readers (and sighted users) still have state context.
+    val subtitle = if (initialSelection == null) {
+        stringResource(
+            id = R.string.screen_notification_settings_message_sound_dialog_current_subtitle,
+            state.messageSound.displayName,
+        )
+    } else {
+        null
+    }
+    SingleSelectionDialog(
+        title = stringResource(id = R.string.screen_notification_settings_message_sound_dialog_title),
+        subtitle = subtitle,
+        options = persistentListOf(
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_sound_element_default)),
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_sound_element_fade)),
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_sound_system_default)),
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_message_sound_dialog_choose_other)),
+        ),
+        initialSelection = initialSelection,
+        onSelectOption = { index ->
+            when (index) {
+                0 -> state.eventSink(NotificationSettingsEvents.SelectMessageSoundPreset(NotificationSound.ElementDefault))
+                1 -> state.eventSink(NotificationSettingsEvents.SelectMessageSoundPreset(NotificationSound.ElementFade))
+                2 -> state.eventSink(NotificationSettingsEvents.SelectMessageSoundPreset(NotificationSound.SystemDefault))
+                else -> state.eventSink(NotificationSettingsEvents.LaunchMessageSoundPicker)
+            }
+        },
+        onDismissRequest = { state.eventSink(NotificationSettingsEvents.DismissMessageSoundDialog) },
+    )
+}
+
+@Composable
+private fun CallRingtoneDialog(state: NotificationSettingsState) {
+    val initialSelection = when (state.callRingtone.sound) {
+        NotificationSound.SystemDefault -> 0
+        else -> null
+    }
+    val subtitle = if (initialSelection == null) {
+        stringResource(
+            id = R.string.screen_notification_settings_message_sound_dialog_current_subtitle,
+            state.callRingtone.displayName,
+        )
+    } else {
+        null
+    }
+    SingleSelectionDialog(
+        title = stringResource(id = R.string.screen_notification_settings_call_ringtone_label),
+        subtitle = subtitle,
+        options = persistentListOf(
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_sound_system_default)),
+            ListOption(title = stringResource(id = R.string.screen_notification_settings_message_sound_dialog_choose_other)),
+        ),
+        initialSelection = initialSelection,
+        onSelectOption = { index ->
+            when (index) {
+                0 -> state.eventSink(NotificationSettingsEvents.SelectCallRingtonePreset(NotificationSound.SystemDefault))
+                else -> state.eventSink(NotificationSettingsEvents.LaunchCallRingtonePicker)
+            }
+        },
+        onDismissRequest = { state.eventSink(NotificationSettingsEvents.DismissCallRingtoneDialog) },
+    )
+}
+
+@Composable
+private fun SoundCopyErrorRow(
+    onDismissClick: () -> Unit,
+) {
+    ListItem(
+        modifier = Modifier
+            .background(ElementTheme.colors.bgSubtleSecondary)
+            .semantics { liveRegion = LiveRegionMode.Polite },
+        content = {
+            Text(
+                text = stringResource(R.string.screen_notification_settings_sound_set_sound_error_title),
+                style = ElementTheme.typography.fontBodyMdRegular,
+                color = ElementTheme.colors.textSecondary,
+            )
+        },
+        trailingContent = ListItemContent.Custom { _ ->
+            IconButton(onClick = onDismissClick) {
+                Icon(
+                    imageVector = CompoundIcons.Close(),
+                    contentDescription = stringResource(R.string.screen_notification_settings_sound_set_sound_error_dismiss_a11y),
+                )
+            }
+        },
+    )
+}
+
+@Composable
+private fun rememberSoundPickerOnClick(
+    type: Int,
+    current: NotificationSound,
+    defaultUri: Uri,
+    onSoundPick: (NotificationSound) -> Unit,
+): () -> Unit {
+    // Paparazzi previews don't provide a LocalActivityResultRegistryOwner, which
+    // rememberLauncherForActivityResult requires. Skip the launcher in inspection mode and
+    // return a no-op click handler — previews don't need to launch the picker.
+    if (LocalInspectionMode.current) return {}
+    val launcher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.StartActivityForResult(),
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            val sound = result.data?.toPickedNotificationSound(defaultUri)
+            if (sound != null) {
+                onSoundPick(sound)
+            }
+        }
+    }
+    return {
+        launcher.launch(buildRingtonePickerIntent(type = type, current = current, defaultUri = defaultUri))
+    }
+}
+
 @Composable
 private fun getTitleForRoomNotificationMode(mode: RoomNotificationMode?) =
     when (mode) {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPicker.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPicker.kt
new file mode 100644
index 0000000000..df9d8bb0c4
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPicker.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.notifications
+
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import androidx.core.content.IntentCompat
+import androidx.core.net.toUri
+import io.element.android.libraries.preferences.api.store.NotificationSound
+
+/**
+ * Builds an `ACTION_RINGTONE_PICKER` intent for [type] (notification or ringtone), pre-selecting
+ * the user's [current] choice and showing the system [defaultUri] as the "Default" option.
+ */
+internal fun buildRingtonePickerIntent(
+    type: Int,
+    current: NotificationSound,
+    defaultUri: Uri,
+): Intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER).apply {
+    putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, type)
+    putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
+    putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
+    putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, defaultUri)
+    val existingUri: Uri? = when (current) {
+        // ElementDefault and ElementFade refer to bundled raw resources, which the system picker
+        // can't enumerate. Fall back to the picker's "Default" row so the user has something selected.
+        NotificationSound.SystemDefault,
+        NotificationSound.ElementDefault,
+        NotificationSound.ElementFade -> defaultUri
+        NotificationSound.Silent -> null
+        is NotificationSound.Custom -> current.uri.toUri()
+    }
+    putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, existingUri)
+}
+
+/**
+ * Maps the URI returned by the ringtone picker into a [NotificationSound]:
+ *  - null URI → the user picked "Silent",
+ *  - URI matching [defaultUri] → the user picked "Default",
+ *  - any other URI → the user picked a specific ringtone.
+ */
+internal fun Intent.toPickedNotificationSound(defaultUri: Uri): NotificationSound {
+    val pickedUri: Uri? = IntentCompat.getParcelableExtra(this, RingtoneManager.EXTRA_RINGTONE_PICKED_URI, Uri::class.java)
+    return when {
+        pickedUri == null -> NotificationSound.Silent
+        pickedUri == defaultUri -> NotificationSound.SystemDefault
+        else -> NotificationSound.Custom(pickedUri.toString())
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
index f7fc251eeb..ac4ac3ad34 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
@@ -40,7 +40,7 @@ fun DefaultNotificationSettingOption(
     }
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(title) },
+        content = { Text(title) },
         supportingContent = subtitle?.let { { Text(it) } },
         trailingContent = ListItemContent.RadioButton(selected = isSelected),
         onClick = { onSelectOption(mode) },
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
index 96097983c9..1357caeef3 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
@@ -34,12 +34,12 @@ class EditDefaultNotificationSettingNode(
     }
 
     data class Inputs(
-        val isOneToOne: Boolean
+        val isDm: Boolean
     ) : NodeInputs
 
     private val callback: Callback = callback()
     private val inputs = inputs<Inputs>()
-    private val presenter = presenterFactory.create(inputs.isOneToOne)
+    private val presenter = presenterFactory.create(inputs.isDm)
 
     @Composable
     override fun View(modifier: Modifier) {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
index 178f7033f3..f2cb8b02cc 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
@@ -42,12 +42,12 @@ import kotlin.time.Duration.Companion.seconds
 @AssistedInject
 class EditDefaultNotificationSettingPresenter(
     private val notificationSettingsService: NotificationSettingsService,
-    @Assisted private val isOneToOne: Boolean,
+    @Assisted private val isDm: Boolean,
     private val roomListService: RoomListService,
 ) : Presenter<EditDefaultNotificationSettingState> {
     @AssistedFactory
     interface Factory {
-        fun create(isOneToOne: Boolean): EditDefaultNotificationSettingPresenter
+        fun create(isDm: Boolean): EditDefaultNotificationSettingPresenter
     }
 
     private val collator = Collator.getInstance().apply {
@@ -86,7 +86,7 @@ class EditDefaultNotificationSettingPresenter(
         }
 
         return EditDefaultNotificationSettingState(
-            isOneToOne = isOneToOne,
+            isOneToOne = isDm,
             mode = mode.value,
             roomsWithUserDefinedMode = roomsWithUserDefinedMode.value.toImmutableList(),
             changeNotificationSettingAction = changeNotificationSettingAction.value,
@@ -96,7 +96,7 @@ class EditDefaultNotificationSettingPresenter(
     }
 
     private fun CoroutineScope.fetchSettings(mode: MutableState<RoomNotificationMode?>) = launch {
-        mode.value = notificationSettingsService.getDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = isOneToOne).getOrThrow()
+        mode.value = notificationSettingsService.getDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = isDm).getOrThrow()
     }
 
     @OptIn(FlowPreview::class)
@@ -129,7 +129,7 @@ class EditDefaultNotificationSettingPresenter(
         val roomWithUserDefinedRules: Set<RoomId> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrDefault(emptyList()).toSet()
         roomsWithUserDefinedMode.value = summaries
             .filter { roomSummary ->
-                roomWithUserDefinedRules.contains(roomSummary.roomId) && roomSummary.isOneToOne == isOneToOne
+                roomWithUserDefinedRules.contains(roomSummary.roomId) && roomSummary.isDm == isDm
             }
             .map { roomSummary ->
                 EditNotificationSettingRoomInfo(
@@ -154,9 +154,9 @@ class EditDefaultNotificationSettingPresenter(
     private fun CoroutineScope.setDefaultNotificationMode(mode: RoomNotificationMode, action: MutableState<AsyncAction<Unit>>) = launch {
         action.runUpdatingStateNoSuccess {
             // On modern clients, we don't have different settings for encrypted and non-encrypted rooms (Legacy clients did).
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, mode = mode, isOneToOne = isOneToOne)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, mode = mode, isDM = isDm)
                 .map {
-                    notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, mode = mode, isOneToOne = isOneToOne)
+                    notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, mode = mode, isDM = isDm)
                 }
         }
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
index 3b46ae737e..24da141a48 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
@@ -88,7 +88,7 @@ fun EditDefaultNotificationSettingView(
                         null -> ""
                     }
                     ListItem(
-                        headlineContent = {
+                        content = {
                             val roomName = summary.name
                             Text(
                                 text = roomName ?: stringResource(id = CommonStrings.common_no_room_name),
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvent.kt
similarity index 78%
rename from features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvents.kt
rename to features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvent.kt
index be266869be..5a10a50ba6 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootEvent.kt
@@ -10,7 +10,7 @@ package io.element.android.features.preferences.impl.root
 
 import io.element.android.libraries.matrix.api.core.SessionId
 
-sealed interface PreferencesRootEvents {
-    data object OnVersionInfoClick : PreferencesRootEvents
-    data class SwitchToSession(val sessionId: SessionId) : PreferencesRootEvents
+sealed interface PreferencesRootEvent {
+    data object OnVersionInfoClick : PreferencesRootEvent
+    data class SwitchToSession(val sessionId: SessionId) : PreferencesRootEvent
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
index 6b54a763af..8ee72fba6d 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
@@ -24,6 +24,7 @@ import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 @ContributesNode(SessionScope::class)
@@ -33,6 +34,7 @@ class PreferencesRootNode(
     @Assisted plugins: List<Plugin>,
     private val presenter: PreferencesRootPresenter,
     private val directLogoutView: DirectLogoutView,
+    private val emojiPickerRenderer: EmojiPickerRenderer,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun navigateToAddAccount()
@@ -75,6 +77,7 @@ class PreferencesRootNode(
         val isDark = ElementTheme.isLightTheme.not()
         PreferencesRootView(
             state = state,
+            emojiPickerRenderer = emojiPickerRenderer,
             modifier = modifier,
             onBackClick = this::navigateUp,
             onAddAccountClick = callback::navigateToAddAccount,
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
index 3d6a829167..9ccd8b9116 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
@@ -19,7 +19,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.logout.api.direct.DirectLogoutState
+import io.element.android.features.preferences.impl.userstatus.UserStatusState
 import io.element.android.features.preferences.impl.utils.ShowDeveloperSettingsProvider
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.libraries.architecture.Presenter
@@ -30,7 +32,6 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.sessionstorage.api.SessionStore
@@ -56,6 +57,8 @@ class PreferencesRootPresenter(
     private val rageshakeFeatureAvailability: RageshakeFeatureAvailability,
     private val featureFlagService: FeatureFlagService,
     private val sessionStore: SessionStore,
+    private val sessionEnterpriseService: SessionEnterpriseService,
+    private val userStatusPresenter: Presenter<UserStatusState>,
 ) : Presenter<PreferencesRootState> {
     @Composable
     override fun present(): PreferencesRootState {
@@ -65,13 +68,14 @@ class PreferencesRootPresenter(
             // Force a refresh of the profile
             matrixClient.getUserProfile()
         }
-
         val isMultiAccountEnabled by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.MultiAccount)
         }.collectAsState(initial = false)
         val showLinkNewDevice by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.QrCodeLogin)
         }.collectAsState(initial = false)
+        val isUserStatusEnabled by featureFlagService.isFeatureEnabledFlow(FeatureFlags.UserStatus).collectAsState(initial = false)
+        val userStatusState = if (isUserStatusEnabled) userStatusPresenter.present() else null
 
         val otherSessions by remember {
             sessionStore.sessionsFlow().map { list ->
@@ -99,9 +103,6 @@ class PreferencesRootPresenter(
         val accountManagementUrl: MutableState<String?> = remember {
             mutableStateOf(null)
         }
-        val devicesManagementUrl: MutableState<String?> = remember {
-            mutableStateOf(null)
-        }
         var canDeactivateAccount by remember {
             mutableStateOf(false)
         }
@@ -110,9 +111,9 @@ class PreferencesRootPresenter(
             canDeactivateAccount = matrixClient.canDeactivateAccount()
         }
 
-        val showBlockedUsersItem by produceState(initialValue = false) {
+        val nbOfBlockedUsers by produceState(initialValue = 0) {
             matrixClient.ignoredUsersFlow
-                .onEach { value = it.isNotEmpty() }
+                .onEach { value = it.size }
                 .launchIn(this)
         }
 
@@ -121,17 +122,17 @@ class PreferencesRootPresenter(
         val directLogoutState = directLogoutPresenter.present()
 
         LaunchedEffect(Unit) {
-            initAccountManagementUrl(accountManagementUrl, devicesManagementUrl)
+            initAccountManagementUrl(accountManagementUrl)
         }
 
         val showDeveloperSettings by showDeveloperSettingsProvider.showDeveloperSettings.collectAsState()
 
-        fun handleEvent(event: PreferencesRootEvents) {
+        fun handleEvent(event: PreferencesRootEvent) {
             when (event) {
-                is PreferencesRootEvents.OnVersionInfoClick -> {
+                is PreferencesRootEvent.OnVersionInfoClick -> {
                     showDeveloperSettingsProvider.unlockDeveloperSettings(coroutineScope)
                 }
-                is PreferencesRootEvents.SwitchToSession -> coroutineScope.launch {
+                is PreferencesRootEvent.SwitchToSession -> coroutineScope.launch {
                     sessionStore.setLatestSession(event.sessionId.value)
                 }
             }
@@ -139,20 +140,19 @@ class PreferencesRootPresenter(
 
         return PreferencesRootState(
             myUser = matrixUser.value,
+            userStatusState = userStatusState,
             version = remember { versionFormatter.get() },
-            deviceId = matrixClient.deviceId,
             isMultiAccountEnabled = isMultiAccountEnabled,
             otherSessions = otherSessions,
             showSecureBackup = !canVerifyUserSession,
             showSecureBackupBadge = showSecureBackupIndicator,
             accountManagementUrl = accountManagementUrl.value,
-            devicesManagementUrl = devicesManagementUrl.value,
             showAnalyticsSettings = hasAnalyticsProviders,
             canReportBug = canReportBug,
             showLinkNewDevice = showLinkNewDevice,
             showDeveloperSettings = showDeveloperSettings,
             canDeactivateAccount = canDeactivateAccount,
-            showBlockedUsersItem = showBlockedUsersItem,
+            nbOfBlockedUsers = nbOfBlockedUsers,
             showLabsItem = showLabsItem,
             directLogoutState = directLogoutState,
             snackbarMessage = snackbarMessage,
@@ -162,9 +162,11 @@ class PreferencesRootPresenter(
 
     private fun CoroutineScope.initAccountManagementUrl(
         accountManagementUrl: MutableState<String?>,
-        devicesManagementUrl: MutableState<String?>,
     ) = launch {
-        accountManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.Profile).getOrNull()
-        devicesManagementUrl.value = matrixClient.getAccountManagementUrl(AccountManagementAction.DevicesList).getOrNull()
+        accountManagementUrl.value = matrixClient.getAccountManagementUrl(null)
+            .getOrNull()
+            ?.let {
+                sessionEnterpriseService.tweakMasUrl(it)
+            }
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt
index d637ae6c87..72d7240f2e 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt
@@ -9,29 +9,30 @@
 package io.element.android.features.preferences.impl.root
 
 import io.element.android.features.logout.api.direct.DirectLogoutState
+import io.element.android.features.preferences.impl.userstatus.UserStatusState
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
-import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
 data class PreferencesRootState(
     val myUser: MatrixUser,
+    val userStatusState: UserStatusState?,
     val version: String,
-    val deviceId: DeviceId?,
     val isMultiAccountEnabled: Boolean,
     val otherSessions: ImmutableList<MatrixUser>,
     val showSecureBackup: Boolean,
     val showSecureBackupBadge: Boolean,
     val accountManagementUrl: String?,
-    val devicesManagementUrl: String?,
     val canReportBug: Boolean,
     val showLinkNewDevice: Boolean,
     val showAnalyticsSettings: Boolean,
     val showDeveloperSettings: Boolean,
     val canDeactivateAccount: Boolean,
-    val showBlockedUsersItem: Boolean,
+    val nbOfBlockedUsers: Int,
     val showLabsItem: Boolean,
     val directLogoutState: DirectLogoutState,
     val snackbarMessage: SnackbarMessage?,
-    val eventSink: (PreferencesRootEvents) -> Unit,
-)
+    val eventSink: (PreferencesRootEvent) -> Unit,
+) {
+    val showBlockedUsersItem = nbOfBlockedUsers > 0
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt
index b8d1f1c2b6..86f984f254 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt
@@ -8,36 +8,104 @@
 
 package io.element.android.features.preferences.impl.root
 
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.logout.api.direct.aDirectLogoutState
+import io.element.android.features.preferences.impl.userstatus.UserStatusPickerState
+import io.element.android.features.preferences.impl.userstatus.UserStatusState
+import io.element.android.features.preferences.impl.userstatus.aUserStatusState
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
-import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.toImmutableList
 
+open class PreferencesRootStateProvider : PreviewParameterProvider<PreferencesRootState> {
+    override val values: Sequence<PreferencesRootState>
+        get() = sequenceOf(
+            // Nominal state, that a regular user will see if multi account is enabled
+            aPreferencesRootState(
+                myUser = aMatrixUser(avatarUrl = "anAvatarUrl"),
+                version = "Version 1.1 (1)",
+                isMultiAccountEnabled = true,
+                otherSessions = aMatrixUserList().drop(1).take(1),
+                showSecureBackup = true,
+                accountManagementUrl = "aUrl",
+                canReportBug = true,
+                showLinkNewDevice = true,
+                showAnalyticsSettings = true,
+                canDeactivateAccount = false,
+                nbOfBlockedUsers = 3,
+                showLabsItem = true,
+            ),
+            aPreferencesRootState(
+                myUser = aMatrixUser(displayName = null),
+                isMultiAccountEnabled = true,
+                showSecureBackup = true,
+                canDeactivateAccount = true,
+            ),
+            aPreferencesRootState(
+                isMultiAccountEnabled = true,
+                otherSessions = aMatrixUserList().drop(1).take(3),
+                accountManagementUrl = "aUrl",
+                showSecureBackup = true,
+                showSecureBackupBadge = true,
+            ),
+            aPreferencesRootState(
+                showLabsItem = true,
+                canReportBug = true,
+                nbOfBlockedUsers = 3,
+                snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),
+            ),
+            aPreferencesRootState(
+                showLinkNewDevice = true,
+                showAnalyticsSettings = true,
+                showDeveloperSettings = true,
+                canDeactivateAccount = true,
+            ),
+            aPreferencesRootState(userStatusState = aUserStatusState(pickerState = UserStatusPickerState.ShowingPicker)),
+            // Minimal state
+            aPreferencesRootState(userStatusState = null),
+        )
+}
+
 fun aPreferencesRootState(
     myUser: MatrixUser = aMatrixUser(),
+    version: String = "Version 1.1 (1)",
+    isMultiAccountEnabled: Boolean = false,
     otherSessions: List<MatrixUser> = emptyList(),
-    eventSink: (PreferencesRootEvents) -> Unit = { _ -> },
+    showSecureBackup: Boolean = false,
+    showSecureBackupBadge: Boolean = false,
+    accountManagementUrl: String? = null,
+    canReportBug: Boolean = false,
+    showLinkNewDevice: Boolean = false,
+    showAnalyticsSettings: Boolean = false,
+    showDeveloperSettings: Boolean = false,
+    canDeactivateAccount: Boolean = false,
+    nbOfBlockedUsers: Int = 0,
+    showLabsItem: Boolean = false,
+    directLogoutState: DirectLogoutState = aDirectLogoutState(),
+    userStatusState: UserStatusState? = aUserStatusState(),
+    snackbarMessage: SnackbarMessage? = null,
+    eventSink: (PreferencesRootEvent) -> Unit = {},
 ) = PreferencesRootState(
     myUser = myUser,
-    version = "Version 1.1 (1)",
-    deviceId = DeviceId("ILAKNDNASDLK"),
-    isMultiAccountEnabled = true,
+    version = version,
+    isMultiAccountEnabled = isMultiAccountEnabled,
     otherSessions = otherSessions.toImmutableList(),
-    showSecureBackup = true,
-    showSecureBackupBadge = true,
-    accountManagementUrl = "aUrl",
-    devicesManagementUrl = "anOtherUrl",
-    showAnalyticsSettings = true,
-    showLinkNewDevice = true,
-    canReportBug = true,
-    showDeveloperSettings = true,
-    showBlockedUsersItem = true,
-    showLabsItem = true,
-    canDeactivateAccount = true,
-    snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),
-    directLogoutState = aDirectLogoutState(),
+    showSecureBackup = showSecureBackup,
+    showSecureBackupBadge = showSecureBackupBadge,
+    accountManagementUrl = accountManagementUrl,
+    canReportBug = canReportBug,
+    showLinkNewDevice = showLinkNewDevice,
+    showAnalyticsSettings = showAnalyticsSettings,
+    showDeveloperSettings = showDeveloperSettings,
+    canDeactivateAccount = canDeactivateAccount,
+    nbOfBlockedUsers = nbOfBlockedUsers,
+    showLabsItem = showLabsItem,
+    directLogoutState = directLogoutState,
+    userStatusState = userStatusState,
+    snackbarMessage = snackbarMessage,
     eventSink = eventSink,
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
index 5e3c9d6759..5727712bc3 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@@ -9,11 +9,10 @@
 package io.element.android.features.preferences.impl.root
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -24,32 +23,33 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.preferences.impl.R
 import io.element.android.features.preferences.impl.user.UserPreferences
+import io.element.android.features.preferences.impl.userstatus.UserStatusState
+import io.element.android.features.preferences.impl.userstatus.UserStatusView
 import io.element.android.libraries.architecture.coverage.ExcludeFromCoverage
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.components.preferences.PreferencePage
-import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
-import io.element.android.libraries.matrix.api.core.DeviceId
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
+import io.element.android.libraries.emoji.api.picker.NoOpEmojiPickerRenderer
 import io.element.android.libraries.matrix.api.user.MatrixUser
-import io.element.android.libraries.matrix.ui.components.MatrixUserProvider
 import io.element.android.libraries.matrix.ui.components.MatrixUserRow
-import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun PreferencesRootView(
     state: PreferencesRootState,
+    emojiPickerRenderer: EmojiPickerRenderer,
     onBackClick: () -> Unit,
     onAddAccountClick: () -> Unit,
     onSecureBackupClick: () -> Unit,
@@ -82,7 +82,7 @@ fun PreferencesRootView(
             modifier = Modifier.clickable {
                 onOpenUserProfile(state.myUser)
             },
-            user = state.myUser,
+            matrixUser = state.myUser,
         )
         if (state.isMultiAccountEnabled) {
             MultiAccountSection(
@@ -90,14 +90,13 @@ fun PreferencesRootView(
                 onAddAccountClick = onAddAccountClick,
             )
         }
-        // 'Manage my app' section
-        ManageAppSection(
-            state = state,
-            onOpenNotificationSettings = onOpenNotificationSettings,
-            onOpenLockScreenSettings = onOpenLockScreenSettings,
-            onSecureBackupClick = onSecureBackupClick,
-        )
-
+        if (state.userStatusState != null) {
+            UserStatusSection(
+                userStatusState = state.userStatusState,
+                emojiPickerRenderer = emojiPickerRenderer,
+                showTopDivider = !state.isMultiAccountEnabled,
+            )
+        }
         // 'Account' section
         ManageAccountSection(
             state = state,
@@ -105,6 +104,13 @@ fun PreferencesRootView(
             onLinkNewDeviceClick = onLinkNewDeviceClick,
             onOpenBlockedUsers = onOpenBlockedUsers
         )
+        // 'Manage my app' section
+        ManageAppSection(
+            state = state,
+            onOpenNotificationSettings = onOpenNotificationSettings,
+            onOpenLockScreenSettings = onOpenLockScreenSettings,
+            onSecureBackupClick = onSecureBackupClick,
+        )
 
         // General section
         GeneralSection(
@@ -118,12 +124,11 @@ fun PreferencesRootView(
             onSignOutClick = onSignOutClick,
             onDeactivateClick = onDeactivateClick,
         )
-
+        // Version
         Footer(
             version = state.version,
-            deviceId = state.deviceId,
             onClick = if (!state.showDeveloperSettings) {
-                { state.eventSink(PreferencesRootEvents.OnVersionInfoClick) }
+                { state.eventSink(PreferencesRootEvent.OnVersionInfoClick) }
             } else {
                 null
             }
@@ -131,6 +136,29 @@ fun PreferencesRootView(
     }
 }
 
+@Composable
+private fun ColumnScope.UserStatusSection(
+    userStatusState: UserStatusState,
+    emojiPickerRenderer: EmojiPickerRenderer,
+    showTopDivider: Boolean,
+) {
+    if (showTopDivider) {
+        HorizontalDivider(
+            thickness = 8.dp,
+            color = ElementTheme.colors.bgSubtleSecondary,
+        )
+    }
+    UserStatusView(
+        state = userStatusState,
+        emojiPickerRenderer = emojiPickerRenderer,
+        modifier = Modifier.fillMaxWidth(),
+    )
+    HorizontalDivider(
+        thickness = 1.dp,
+        color = ElementTheme.colors.bgSubtleSecondary,
+    )
+}
+
 @Composable
 private fun ColumnScope.MultiAccountSection(
     state: PreferencesRootState,
@@ -142,17 +170,19 @@ private fun ColumnScope.MultiAccountSection(
     )
     state.otherSessions.forEach { matrixUser ->
         MatrixUserRow(
-            modifier = Modifier.clickable {
-                state.eventSink(PreferencesRootEvents.SwitchToSession(matrixUser.userId))
-            },
+            modifier = Modifier
+                .clickable {
+                    state.eventSink(PreferencesRootEvent.SwitchToSession(matrixUser.userId))
+                }
+                .padding(top = 2.dp, bottom = 2.dp, end = 8.dp),
             matrixUser = matrixUser,
             avatarSize = AvatarSize.AccountItem,
+            verticalSpaceWidth = 16.dp,
         )
-        HorizontalDivider()
     }
     ListItem(
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())),
-        headlineContent = {
+        content = {
             Text(stringResource(CommonStrings.common_add_another_account))
         },
         onClick = onAddAccountClick,
@@ -171,18 +201,18 @@ private fun ColumnScope.ManageAppSection(
     onSecureBackupClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(id = R.string.screen_notification_settings_title)) },
+        content = { Text(stringResource(id = R.string.screen_notification_settings_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),
         onClick = onOpenNotificationSettings,
     )
     ListItem(
-        headlineContent = { Text(stringResource(id = CommonStrings.common_screen_lock)) },
+        content = { Text(stringResource(id = CommonStrings.common_screen_lock)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
         onClick = onOpenLockScreenSettings,
     )
     if (state.showSecureBackup) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_encryption)) },
+            content = { Text(stringResource(id = CommonStrings.common_encryption)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Key())),
             trailingContent = ListItemContent.Badge.takeIf { state.showSecureBackupBadge },
             onClick = onSecureBackupClick,
@@ -198,40 +228,30 @@ private fun ColumnScope.ManageAccountSection(
     onLinkNewDeviceClick: () -> Unit,
     onOpenBlockedUsers: () -> Unit,
 ) {
-    if (state.showLinkNewDevice) {
-        ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_link_new_device)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Devices())),
-            onClick = onLinkNewDeviceClick,
-        )
-    }
     state.accountManagementUrl?.let { url ->
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.action_manage_account)) },
+            content = { Text(stringResource(id = CommonStrings.action_manage_account_and_devices)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserProfile())),
             trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.PopOut())),
             onClick = { onManageAccountClick(url) },
         )
     }
-
-    state.devicesManagementUrl?.let { url ->
+    if (state.showLinkNewDevice) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.action_manage_devices)) },
+            content = { Text(stringResource(id = CommonStrings.common_link_new_device)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Devices())),
-            trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.PopOut())),
-            onClick = { onManageAccountClick(url) },
+            onClick = onLinkNewDeviceClick,
         )
     }
-
     if (state.showBlockedUsersItem) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_blocked_users)) },
+            content = { Text(stringResource(id = CommonStrings.common_blocked_users)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
             onClick = onOpenBlockedUsers,
+            trailingContent = ListItemContent.Text(state.nbOfBlockedUsers.toString()),
         )
     }
-
-    if (state.accountManagementUrl != null || state.devicesManagementUrl != null || state.showBlockedUsersItem) {
+    if (state.accountManagementUrl != null || state.showLinkNewDevice || state.showBlockedUsersItem) {
         HorizontalDivider()
     }
 }
@@ -249,48 +269,47 @@ private fun ColumnScope.GeneralSection(
     onDeactivateClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(id = CommonStrings.common_about)) },
+        content = { Text(stringResource(id = CommonStrings.common_advanced_settings)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Settings())),
+        onClick = onOpenAdvancedSettings,
+    )
+    if (state.showLabsItem) {
+        ListItem(
+            content = { Text(stringResource(id = R.string.screen_labs_title)) },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Labs())),
+            onClick = onOpenLabs,
+        )
+    }
+    ListItem(
+        content = { Text(stringResource(id = CommonStrings.common_about)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Info())),
         onClick = onOpenAbout,
     )
     if (state.canReportBug) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
+            content = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChatProblem())),
             onClick = onOpenRageShake
         )
     }
     if (state.showAnalyticsSettings) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.common_analytics)) },
+            content = { Text(stringResource(id = CommonStrings.common_analytics)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Chart())),
             onClick = onOpenAnalytics,
         )
     }
+    HorizontalDivider()
     ListItem(
-        headlineContent = { Text(stringResource(id = CommonStrings.common_advanced_settings)) },
-        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Settings())),
-        onClick = onOpenAdvancedSettings,
-    )
-
-    if (state.showLabsItem) {
-        ListItem(
-            headlineContent = { Text(stringResource(id = R.string.screen_labs_title)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Labs())),
-            onClick = onOpenLabs,
-        )
-    }
-
-    ListItem(
-        headlineContent = { Text(stringResource(id = CommonStrings.action_signout)) },
-        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.SignOut())),
+        content = { Text(stringResource(id = CommonStrings.action_signout)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Close())),
         style = ListItemStyle.Destructive,
         onClick = onSignOutClick,
     )
     if (state.canDeactivateAccount) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.action_deactivate_account)) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Warning())),
+            content = { Text(stringResource(id = CommonStrings.action_delete_account)) },
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
             style = ListItemStyle.Destructive,
             onClick = onDeactivateClick,
         )
@@ -304,26 +323,15 @@ private fun ColumnScope.GeneralSection(
 @Composable
 private fun ColumnScope.Footer(
     version: String,
-    deviceId: DeviceId?,
     onClick: (() -> Unit)?,
 ) {
-    val text = remember(version, deviceId) {
-        buildString {
-            append(version)
-            if (deviceId != null) {
-                append("\n")
-                append(deviceId)
-            }
-        }
-    }
     Text(
         modifier = Modifier
             .align(Alignment.CenterHorizontally)
-            .padding(top = 16.dp)
             .clickable(enabled = onClick != null, onClick = onClick ?: {})
-            .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 24.dp),
+            .padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 24.dp),
         textAlign = TextAlign.Center,
-        text = text,
+        text = version,
         style = ElementTheme.typography.fontBodySmRegular,
         color = ElementTheme.colors.textSecondary,
     )
@@ -332,7 +340,7 @@ private fun ColumnScope.Footer(
 @Composable
 private fun DeveloperPreferencesView(onOpenDeveloperSettings: () -> Unit) {
     ListItem(
-        headlineContent = { Text(stringResource(id = CommonStrings.common_developer_options)) },
+        content = { Text(stringResource(id = CommonStrings.common_developer_options)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Code())),
         onClick = onOpenDeveloperSettings
     )
@@ -340,19 +348,24 @@ private fun DeveloperPreferencesView(onOpenDeveloperSettings: () -> Unit) {
 
 @PreviewWithLargeHeight
 @Composable
-internal fun PreferencesRootViewLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
-    ElementPreviewLight { ContentToPreview(matrixUser) }
+internal fun PreferencesRootViewLightPreview(@PreviewParameter(PreferencesRootStateProvider::class) state: PreferencesRootState) =
+    ElementPreviewLight(
+        drawableFallbackForImages = CommonDrawables.sample_avatar,
+    ) { ContentToPreview(state) }
 
 @PreviewWithLargeHeight
 @Composable
-internal fun PreferencesRootViewDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
-    ElementPreviewDark { ContentToPreview(matrixUser) }
+internal fun PreferencesRootViewDarkPreview(@PreviewParameter(PreferencesRootStateProvider::class) state: PreferencesRootState) =
+    ElementPreviewDark(
+        drawableFallbackForImages = CommonDrawables.sample_avatar,
+    ) { ContentToPreview(state) }
 
 @ExcludeFromCoverage
 @Composable
-private fun ContentToPreview(matrixUser: MatrixUser) {
+private fun ContentToPreview(state: PreferencesRootState) {
     PreferencesRootView(
-        state = aPreferencesRootState(myUser = matrixUser),
+        state = state,
+        emojiPickerRenderer = NoOpEmojiPickerRenderer,
         onBackClick = {},
         onAddAccountClick = {},
         onOpenAnalytics = {},
@@ -372,16 +385,3 @@ private fun ContentToPreview(matrixUser: MatrixUser) {
         onDeactivateClick = {},
     )
 }
-
-@PreviewsDayNight
-@Composable
-internal fun MultiAccountSectionPreview() = ElementPreview {
-    Column {
-        MultiAccountSection(
-            state = aPreferencesRootState(
-                otherSessions = aMatrixUserList(),
-            ),
-            onAddAccountClick = {},
-        )
-    }
-}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
index 52517b5ca2..6cd41376d1 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/VersionFormatter.kt
@@ -24,16 +24,10 @@ class DefaultVersionFormatter(
     private val buildMeta: BuildMeta,
 ) : VersionFormatter {
     override fun get(): String {
-        val base = stringProvider.getString(
+        return stringProvider.getString(
             CommonStrings.settings_version_number,
             buildMeta.versionName,
             buildMeta.versionCode.toString()
         )
-        return if (buildMeta.gitBranchName == "main") {
-            base
-        } else {
-            // In case of a build not from main, we display the branch name and the revision
-            "$base\n${buildMeta.gitBranchName} (${buildMeta.gitRevision})"
-        }
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
index 6c26866e93..f3faf96ba2 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt
@@ -11,9 +11,9 @@ package io.element.android.features.preferences.impl.tasks
 import android.content.Context
 import coil3.SingletonImageLoader
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Provider
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.preferences.impl.DefaultCacheService
+import io.element.android.libraries.cachestore.api.CacheStore
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.ApplicationContext
@@ -33,12 +33,15 @@ class DefaultClearCacheUseCase(
     private val matrixClient: MatrixClient,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val defaultCacheService: DefaultCacheService,
-    private val okHttpClient: Provider<OkHttpClient>,
+    private val okHttpClient: () -> OkHttpClient,
     private val pushService: PushService,
     private val seenInvitesStore: SeenInvitesStore,
     private val activeRoomsHolder: ActiveRoomsHolder,
+    private val cacheStore: CacheStore,
 ) : ClearCacheUseCase {
     override suspend fun invoke() = withContext(coroutineDispatchers.io) {
+        // Clear cache store
+        cacheStore.deleteAll()
         // Active rooms should be disposed of before clearing the cache
         activeRoomsHolder.clear(matrixClient.sessionId)
         // Clear Matrix cache
@@ -51,7 +54,12 @@ class DefaultClearCacheUseCase(
         // Clear OkHttp cache
         okHttpClient().cache?.delete()
         // Clear app cache
-        context.cacheDir.deleteRecursively()
+        context.cacheDir?.listFiles {
+            // But keep the logs
+            it.name != "logs"
+        }?.onEach {
+            it.deleteRecursively()
+        }
         // Clear some settings
         seenInvitesStore.clear()
         // Ensure any error will be displayed again
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsRead.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsRead.kt
new file mode 100644
index 0000000000..d09ac11dd5
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsRead.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.tasks
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
+import kotlinx.coroutines.withContext
+
+interface MarkAllRoomsAsRead {
+    suspend operator fun invoke(): Result<Unit>
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultMarkAllRoomsAsRead(
+    private val client: MatrixClient,
+    private val notificationCleaner: NotificationCleaner,
+    private val coroutineDispatchers: CoroutineDispatchers,
+) : MarkAllRoomsAsRead {
+    override suspend fun invoke(): Result<Unit> = withContext(coroutineDispatchers.io) {
+        client.markAllRoomsAsRead()
+            .onSuccess {
+                notificationCleaner.clearAllMessagesEvents(client.sessionId)
+            }
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsRead.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsRead.kt
new file mode 100644
index 0000000000..072fa1ea87
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsRead.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.tasks
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
+
+interface MarkRoomAsRead {
+    suspend operator fun invoke(roomId: RoomId): Result<Unit>
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultMarkRoomAsRead(
+    private val client: MatrixClient,
+    private val notificationCleaner: NotificationCleaner,
+    private val sessionPreferencesStore: SessionPreferencesStore,
+    private val coroutineDispatchers: CoroutineDispatchers,
+) : MarkRoomAsRead {
+    override suspend fun invoke(roomId: RoomId): Result<Unit> = withContext(coroutineDispatchers.io) {
+        notificationCleaner.clearMessagesForRoom(client.sessionId, roomId)
+        val room = client.getRoom(roomId) ?: return@withContext Result.failure(IllegalStateException("Room not found"))
+        room.use {
+            it.setUnreadFlag(isUnread = false)
+            val receiptType = if (sessionPreferencesStore.isSendPublicReadReceiptsEnabled().first()) {
+                ReceiptType.READ
+            } else {
+                ReceiptType.READ_PRIVATE
+            }
+            it.markAsRead(receiptType)
+        }
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/UserPreferences.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/UserPreferences.kt
index a9066dcd73..43c7e8dacf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/UserPreferences.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/UserPreferences.kt
@@ -15,21 +15,21 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.MatrixUserHeader
-import io.element.android.libraries.matrix.ui.components.MatrixUserWithNullProvider
+import io.element.android.libraries.matrix.ui.components.MatrixUserProvider
 
 @Composable
 fun UserPreferences(
-    user: MatrixUser?,
+    matrixUser: MatrixUser,
     modifier: Modifier = Modifier,
 ) {
     MatrixUserHeader(
         modifier = modifier,
-        matrixUser = user
+        matrixUser = matrixUser,
     )
 }
 
 @PreviewsDayNight
 @Composable
-internal fun UserPreferencesPreview(@PreviewParameter(MatrixUserWithNullProvider::class) matrixUser: MatrixUser?) = ElementPreview {
+internal fun UserPreferencesPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = ElementPreview {
     UserPreferences(matrixUser)
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
index bddae2fffb..1ab69f6007 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -103,6 +104,14 @@ class EditUserProfilePresenter(
             }
         }
 
+        val homeserverCapabilities = matrixClient.homeserverCapabilities()
+        val canChangeDisplayName = produceState(true) {
+            value = homeserverCapabilities.canChangeDisplayName().getOrDefault(true)
+        }
+        val canChangeAvatar = produceState(true) {
+            value = homeserverCapabilities.canChangeAvatarUrl().getOrDefault(true)
+        }
+
         val saveAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val localCoroutineScope = rememberCoroutineScope()
 
@@ -169,6 +178,8 @@ class EditUserProfilePresenter(
             saveButtonEnabled = canSave && saveAction.value !is AsyncAction.Loading,
             saveAction = saveAction.value,
             cameraPermissionState = cameraPermissionState,
+            canChangeDisplayName = canChangeDisplayName.value,
+            canChangeAvatarUrl = canChangeAvatar.value,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileState.kt
index a638ed8378..a40f1710e2 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileState.kt
@@ -22,5 +22,7 @@ data class EditUserProfileState(
     val saveButtonEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
     val cameraPermissionState: PermissionsState,
+    val canChangeDisplayName: Boolean,
+    val canChangeAvatarUrl: Boolean,
     val eventSink: (EditUserProfileEvent) -> Unit
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
index ca9571aea5..2f238f9935 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileStateProvider.kt
@@ -10,6 +10,7 @@ package io.element.android.features.preferences.impl.user.editprofile
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.USER_NAME_JOHN_DOE
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.permissions.api.PermissionsState
@@ -22,17 +23,20 @@ open class EditUserProfileStateProvider : PreviewParameterProvider<EditUserProfi
             aEditUserProfileState(),
             aEditUserProfileState(userAvatarUrl = "example://uri"),
             aEditUserProfileState(saveAction = AsyncAction.ConfirmingCancellation),
+            aEditUserProfileState(canChangeAvatarUrl = false, canChangeDisplayName = false),
         )
 }
 
 fun aEditUserProfileState(
     userId: UserId = UserId("@john.doe:matrix.org"),
-    displayName: String = "John Doe",
+    displayName: String = USER_NAME_JOHN_DOE,
     userAvatarUrl: String? = null,
     avatarActions: List<AvatarAction> = emptyList(),
     saveButtonEnabled: Boolean = true,
     saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     cameraPermissionState: PermissionsState = aPermissionsState(showDialog = false),
+    canChangeDisplayName: Boolean = true,
+    canChangeAvatarUrl: Boolean = true,
     eventSink: (EditUserProfileEvent) -> Unit = {},
 ) = EditUserProfileState(
     userId = userId,
@@ -42,5 +46,7 @@ fun aEditUserProfileState(
     saveButtonEnabled = saveButtonEnabled,
     saveAction = saveAction,
     cameraPermissionState = cameraPermissionState,
+    canChangeDisplayName = canChangeDisplayName,
+    canChangeAvatarUrl = canChangeAvatarUrl,
     eventSink = eventSink,
 )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
index 774dcedae0..d4571d7be5 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
@@ -120,6 +120,7 @@ fun EditUserProfileView(
                 state = avatarPickerState,
                 onClick = ::onAvatarClick,
                 modifier = Modifier.align(Alignment.CenterHorizontally),
+                enabled = state.canChangeAvatarUrl,
             )
             Spacer(modifier = Modifier.height(16.dp))
             Text(
@@ -134,6 +135,7 @@ fun EditUserProfileView(
                 value = state.displayName,
                 placeholder = stringResource(CommonStrings.common_room_name_placeholder),
                 singleLine = true,
+                enabled = state.canChangeDisplayName,
                 onValueChange = { state.eventSink(EditUserProfileEvent.UpdateDisplayName(it)) },
             )
         }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusBindingContainer.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusBindingContainer.kt
new file mode 100644
index 0000000000..dfa77483f8
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusBindingContainer.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.di.SessionScope
+
+@ContributesTo(SessionScope::class)
+@BindingContainer
+interface UserStatusBindingContainer {
+    @Binds
+    fun bindUserStatusPresenter(presenter: UserStatusPresenter): Presenter<UserStatusState>
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusEvent.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusEvent.kt
new file mode 100644
index 0000000000..58230d722c
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusEvent.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import io.element.android.libraries.matrix.api.user.UserStatus
+
+sealed interface UserStatusEvent {
+    data object OpenPicker : UserStatusEvent
+    data object DismissPicker : UserStatusEvent
+    data class SetStatus(val status: UserStatus) : UserStatusEvent
+    data object OpenCustomInput : UserStatusEvent
+    data object CancelCustomInput : UserStatusEvent
+    data class UpdateCustomEmoji(val emoji: String) : UserStatusEvent
+    data object OpenEmojiPicker : UserStatusEvent
+    data object DismissEmojiPicker : UserStatusEvent
+    data object ClearStatus : UserStatusEvent
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenter.kt
new file mode 100644
index 0000000000..60f02ad05a
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenter.kt
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import androidx.compose.foundation.text.input.clearText
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.emoji.api.picker.EmojiPickerPresenter
+import io.element.android.libraries.emoji.api.recentemojis.EmptyGetRecentEmojis
+import io.element.android.libraries.matrix.api.MatrixClient
+import kotlinx.coroutines.launch
+
+@Inject
+class UserStatusPresenter(
+    private val matrixClient: MatrixClient,
+    emojiPickerPresenterFactory: EmojiPickerPresenter.Factory,
+) : Presenter<UserStatusState> {
+    private val emojiPickerPresenter = emojiPickerPresenterFactory.create(EmptyGetRecentEmojis)
+
+    @Composable
+    override fun present(): UserStatusState {
+        val userProfile by matrixClient.userProfile.collectAsState()
+        var pickerState by remember { mutableStateOf<UserStatusPickerState>(UserStatusPickerState.Hidden) }
+        var isEmojiPickerVisible by remember { mutableStateOf(false) }
+        val customTextFieldState = rememberTextFieldState()
+        val coroutineScope = rememberCoroutineScope()
+
+        fun handleEvent(event: UserStatusEvent) {
+            when (event) {
+                // Mode transitions
+                UserStatusEvent.OpenPicker -> pickerState = UserStatusPickerState.ShowingPicker
+                UserStatusEvent.DismissPicker -> pickerState = UserStatusPickerState.Hidden
+                UserStatusEvent.CancelCustomInput -> pickerState = UserStatusPickerState.Hidden
+                is UserStatusEvent.SetStatus -> {
+                    pickerState = UserStatusPickerState.Hidden
+                    coroutineScope.launch { matrixClient.setUserStatus(event.status) }
+                }
+                UserStatusEvent.ClearStatus -> {
+                    pickerState = UserStatusPickerState.Hidden
+                    coroutineScope.launch { matrixClient.clearUserStatus() }
+                }
+                UserStatusEvent.OpenCustomInput -> {
+                    val raw = userProfile.rawStatus
+                    if (raw != null) {
+                        customTextFieldState.setTextAndPlaceCursorAtEnd(raw.text)
+                    } else {
+                        customTextFieldState.clearText()
+                    }
+                    isEmojiPickerVisible = false
+                    pickerState = UserStatusPickerState.CustomInput(
+                        emoji = raw?.emoji ?: "😀",
+                        textFieldState = customTextFieldState,
+                        emojiPickerSheetState = EmojiPickerSheetState.Hidden,
+                    )
+                }
+                // Custom-input mutations
+                is UserStatusEvent.UpdateCustomEmoji -> {
+                    isEmojiPickerVisible = false
+                    val current = pickerState as? UserStatusPickerState.CustomInput ?: return
+                    pickerState = current.copy(emoji = event.emoji)
+                }
+                // Emoji-picker visibility (only meaningful within CustomInput mode)
+                UserStatusEvent.OpenEmojiPicker -> isEmojiPickerVisible = true
+                UserStatusEvent.DismissEmojiPicker -> isEmojiPickerVisible = false
+            }
+        }
+
+        // In CustomInput mode, override the picker state's `emojiPickerSheetState` with the freshly composed emoji-picker
+        // sub-state so recompositions of the picker propagate up. Other modes pass through unchanged.
+        val effectivePickerState = when (val current = pickerState) {
+            is UserStatusPickerState.CustomInput -> {
+                val emojiPickerState = presentEmojiPickerSheetState(isEmojiPickerVisible)
+                current.copy(emojiPickerSheetState = emojiPickerState)
+            }
+            else -> current
+        }
+
+        return UserStatusState(
+            displayedStatus = userProfile.displayedStatus,
+            rawStatus = userProfile.rawStatus,
+            pickerState = effectivePickerState,
+            eventSink = ::handleEvent,
+        )
+    }
+
+    @Composable
+    private fun presentEmojiPickerSheetState(isVisible: Boolean): EmojiPickerSheetState {
+        if (!isVisible) return EmojiPickerSheetState.Hidden
+        val emojiPickerState = emojiPickerPresenter.present()
+        return if (emojiPickerState.isReady) {
+            EmojiPickerSheetState.Shown(emojiPickerState)
+        } else {
+            EmojiPickerSheetState.Loading
+        }
+    }
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusState.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusState.kt
new file mode 100644
index 0000000000..fa225ae277
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusState.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.runtime.Immutable
+import io.element.android.features.preferences.impl.R
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.UserStatus
+
+data class UserStatusState(
+    val displayedStatus: DisplayedStatus?,
+    val rawStatus: UserStatus?,
+    val pickerState: UserStatusPickerState,
+    val eventSink: (UserStatusEvent) -> Unit,
+)
+
+@Immutable
+sealed interface UserStatusPickerState {
+    data object Hidden : UserStatusPickerState
+    data object ShowingPicker : UserStatusPickerState
+    data class CustomInput(
+        val emoji: String,
+        val textFieldState: TextFieldState,
+        val emojiPickerSheetState: EmojiPickerSheetState,
+    ) : UserStatusPickerState
+}
+
+@Immutable
+sealed interface EmojiPickerSheetState {
+    data object Hidden : EmojiPickerSheetState
+    data object Loading : EmojiPickerSheetState
+    data class Shown(val state: EmojiPickerState) : EmojiPickerSheetState
+}
+
+enum class PredefinedUserStatus(val emoji: String, @StringRes val labelRes: Int) {
+    IN_A_MEETING("💬", R.string.screen_settings_user_status_in_a_meeting),
+    FOCUS_TIME("💡", R.string.screen_settings_user_status_focus_time),
+    ON_THE_ROAD("🚙", R.string.screen_settings_user_status_on_the_road),
+    BE_RIGHT_BACK("☕", R.string.screen_settings_user_status_be_right_back),
+    AWAY("🌴", R.string.screen_settings_user_status_away),
+}
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusStateProvider.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusStateProvider.kt
new file mode 100644
index 0000000000..13a1d31743
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusStateProvider.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.UserStatus
+
+internal class UserStatusStateProvider : PreviewParameterProvider<UserStatusState> {
+    override val values get() = sequenceOf(
+        aUserStatusState(),
+        aUserStatusState(displayedStatus = DisplayedStatus.UserSet(UserStatus("🌴", "Away"))),
+        aUserStatusState(displayedStatus = DisplayedStatus.InCall(callJoinedTs = 0L)),
+        aUserStatusState(pickerState = UserStatusPickerState.ShowingPicker),
+        aUserStatusState(
+            displayedStatus = DisplayedStatus.UserSet(UserStatus("🌴", "Away")),
+            rawStatus = UserStatus("🌴", "Away"),
+            pickerState = UserStatusPickerState.ShowingPicker,
+        ),
+        aUserStatusState(
+            pickerState = UserStatusPickerState.CustomInput(
+                emoji = "😀",
+                textFieldState = TextFieldState(),
+                emojiPickerSheetState = EmojiPickerSheetState.Hidden
+            )
+        ),
+        aUserStatusState(
+            pickerState = UserStatusPickerState.CustomInput(
+                emoji = "🚀",
+                textFieldState = TextFieldState("Working on something"),
+                emojiPickerSheetState = EmojiPickerSheetState.Hidden
+            )
+        ),
+    )
+}
+
+fun aUserStatusState(
+    displayedStatus: DisplayedStatus? = null,
+    rawStatus: UserStatus? = null,
+    pickerState: UserStatusPickerState = UserStatusPickerState.Hidden,
+    eventSink: (UserStatusEvent) -> Unit = {},
+) = UserStatusState(
+    displayedStatus = displayedStatus,
+    rawStatus = rawStatus,
+    pickerState = pickerState,
+    eventSink = eventSink,
+)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusView.kt
new file mode 100644
index 0000000000..19cc43d3d7
--- /dev/null
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusView.kt
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.input.InputTransformation
+import androidx.compose.foundation.text.input.TextFieldLineLimits
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.foundation.text.input.clearText
+import androidx.compose.foundation.text.input.maxLength
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.preferences.impl.R
+import io.element.android.libraries.designsystem.components.list.ListItemContent
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
+import io.element.android.libraries.designsystem.theme.components.IconSource
+import io.element.android.libraries.designsystem.theme.components.ListItem
+import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
+import io.element.android.libraries.designsystem.theme.components.Surface
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TextField
+import io.element.android.libraries.designsystem.theme.components.hide
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
+import io.element.android.libraries.emoji.api.picker.NoOpEmojiPickerRenderer
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.UserStatus
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.persistentSetOf
+
+@Composable
+fun UserStatusView(
+    state: UserStatusState,
+    emojiPickerRenderer: EmojiPickerRenderer,
+    modifier: Modifier = Modifier,
+) {
+    when (val pickerState = state.pickerState) {
+        UserStatusPickerState.Hidden, UserStatusPickerState.ShowingPicker -> {
+            val displayedStatus = state.displayedStatus
+            if (displayedStatus != null) {
+                CurrentStatusRow(
+                    displayedStatus = displayedStatus,
+                    onClick = { state.eventSink(UserStatusEvent.OpenPicker) },
+                    onClear = { state.eventSink(UserStatusEvent.ClearStatus) },
+                    modifier = modifier,
+                )
+            } else {
+                EmptyStatusRow(
+                    onClick = { state.eventSink(UserStatusEvent.OpenPicker) },
+                    modifier = modifier,
+                )
+            }
+            if (pickerState == UserStatusPickerState.ShowingPicker) {
+                UserStatusPickerBottomSheet(
+                    currentRawStatus = state.rawStatus,
+                    onDismiss = { state.eventSink(UserStatusEvent.DismissPicker) },
+                    onSelectPredefinedStatus = { status -> state.eventSink(UserStatusEvent.SetStatus(status)) },
+                    onSelectCustomStatus = { state.eventSink(UserStatusEvent.OpenCustomInput) },
+                )
+            }
+        }
+        is UserStatusPickerState.CustomInput -> {
+            CustomStatusInputRow(
+                emoji = pickerState.emoji,
+                textFieldState = pickerState.textFieldState,
+                rawStatus = state.rawStatus,
+                onConfirm = {
+                    state.eventSink(
+                        UserStatusEvent.SetStatus(UserStatus(pickerState.emoji, pickerState.textFieldState.text.toString()))
+                    )
+                },
+                onCancel = { state.eventSink(UserStatusEvent.CancelCustomInput) },
+                onEmojiClick = { state.eventSink(UserStatusEvent.OpenEmojiPicker) },
+                modifier = modifier,
+            )
+            when (val sheet = pickerState.emojiPickerSheetState) {
+                EmojiPickerSheetState.Hidden, EmojiPickerSheetState.Loading -> Unit
+                is EmojiPickerSheetState.Shown -> EmojiPickerBottomSheet(
+                    pickerState = sheet.state,
+                    emojiPickerRenderer = emojiPickerRenderer,
+                    onSelectEmoji = { emoji -> state.eventSink(UserStatusEvent.UpdateCustomEmoji(emoji.unicode)) },
+                    onDismiss = { state.eventSink(UserStatusEvent.DismissEmojiPicker) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun EmptyStatusRow(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    ListItem(
+        content = {
+            Text(
+                text = stringResource(R.string.screen_settings_user_status_placeholder),
+                modifier = Modifier.padding(vertical = 16.dp),
+            )
+        },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Reaction())),
+        modifier = modifier.clickable(onClick = onClick),
+    )
+}
+
+@Composable
+private fun CurrentStatusRow(
+    displayedStatus: DisplayedStatus,
+    onClick: () -> Unit,
+    onClear: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val (emoji, text) = when (displayedStatus) {
+        is DisplayedStatus.UserSet -> displayedStatus.status.emoji to displayedStatus.status.text
+        is DisplayedStatus.InCall -> "🎧" to stringResource(CommonStrings.common_on_a_call)
+    }
+    ListItem(
+        content = { Text(text = text, modifier = Modifier.padding(vertical = 16.dp)) },
+        leadingContent = ListItemContent.Custom { EmojiText(emoji) },
+        trailingContent = ListItemContent.Custom({
+            IconButton(
+                onClick = onClear,
+                // Remove the extra padding caused by IconButton
+                modifier = Modifier.offset(x = 12.dp)
+            ) {
+                Icon(
+                    imageVector = CompoundIcons.Close(),
+                    contentDescription = stringResource(CommonStrings.action_clear),
+                )
+            }
+        }),
+        onClick = onClick,
+        modifier = modifier,
+    )
+}
+
+@Composable
+private fun EmojiText(emoji: String) {
+    // Ensure the emoji doesn't scale with fontSize to match icons size
+    val fontSize = with(LocalDensity.current) { 16.dp.toSp() }
+    Text(
+        modifier = Modifier.sizeIn(minWidth = 24.dp, minHeight = 24.dp),
+        text = emoji,
+        textAlign = TextAlign.Center,
+        style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = fontSize),
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun UserStatusPickerBottomSheet(
+    currentRawStatus: UserStatus?,
+    onDismiss: () -> Unit,
+    onSelectPredefinedStatus: (UserStatus) -> Unit,
+    onSelectCustomStatus: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded)
+    )
+    val coroutineScope = rememberCoroutineScope()
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        scrollable = true,
+        modifier = modifier,
+    ) {
+        PredefinedUserStatus.entries.forEach { predefined ->
+            val label = stringResource(predefined.labelRes)
+            val predefinedUserStatus = UserStatus(emoji = predefined.emoji, text = label)
+            val isSelected = currentRawStatus == predefinedUserStatus
+            ListItem(
+                content = { Text(text = label) },
+                leadingContent = ListItemContent.Custom { EmojiText(predefined.emoji) },
+                trailingContent = if (isSelected) {
+                    ListItemContent.Icon(IconSource.Vector(CompoundIcons.Check()), tintColor = ElementTheme.colors.iconAccentPrimary)
+                } else {
+                    null
+                },
+                onClick = {
+                    sheetState.hide(coroutineScope) {
+                        onSelectPredefinedStatus(predefinedUserStatus)
+                    }
+                },
+            )
+        }
+        ListItem(
+            content = {
+                Text(text = stringResource(R.string.screen_settings_user_status_custom))
+            },
+            leadingContent = ListItemContent.Custom { EmojiText("✏️") },
+            onClick = {
+                sheetState.hide(coroutineScope) {
+                    onSelectCustomStatus()
+                }
+            },
+        )
+    }
+}
+
+private const val CUSTOM_STATUS_TEXT_MAX_LENGTH = 30
+
+@Composable
+private fun CustomStatusInputRow(
+    emoji: String,
+    textFieldState: TextFieldState,
+    rawStatus: UserStatus?,
+    onConfirm: () -> Unit,
+    onCancel: () -> Unit,
+    onEmojiClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val hasText by remember { derivedStateOf { textFieldState.text.isNotEmpty() } }
+    val hasChanges by remember(emoji, rawStatus) {
+        derivedStateOf {
+            val text = textFieldState.text.toString()
+            text.isNotBlank() && UserStatus(emoji, text) != rawStatus
+        }
+    }
+    val saveLabel = stringResource(CommonStrings.action_save)
+    val cancelLabel = stringResource(CommonStrings.action_cancel)
+    val focusRequester = remember { FocusRequester() }
+    LaunchedEffect(Unit) { focusRequester.requestFocus() }
+    ListItem(
+        content = {
+            TextField(
+                modifier = Modifier.focusRequester(focusRequester),
+                state = textFieldState,
+                placeholder = stringResource(R.string.screen_settings_user_status_custom_hint),
+                inputTransformation = InputTransformation.maxLength(CUSTOM_STATUS_TEXT_MAX_LENGTH),
+                keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                onKeyboardAction = { if (hasChanges) onConfirm() },
+                lineLimits = TextFieldLineLimits.SingleLine,
+                trailingIcon = if (hasText) {
+                    {
+                        Box(modifier = Modifier.clickable { textFieldState.clearText() }) {
+                            Icon(
+                                imageVector = CompoundIcons.Close(),
+                                contentDescription = stringResource(CommonStrings.action_cancel),
+                                modifier = Modifier.size(22.dp),
+                            )
+                        }
+                    }
+                } else {
+                    null
+                }
+            )
+        },
+        trailingContent = ListItemContent.Custom({
+            // Layout measures both buttons to determine the max natural width,
+            // then places only the active one.
+            Layout(
+                content = {
+                    TextButton(onClick = onConfirm, text = saveLabel)
+                    TextButton(onClick = onCancel, text = cancelLabel)
+                }
+            ) { measurables, constraints ->
+                val placeables = measurables.map { it.measure(constraints) }
+                val maxWidth = placeables.maxOf { it.width }
+                val maxHeight = placeables.maxOf { it.height }
+                layout(maxWidth, maxHeight) {
+                    val active = if (hasChanges) placeables[0] else placeables[1]
+                    active.placeRelative(
+                        x = (maxWidth - active.width) / 2,
+                        y = (maxHeight - active.height) / 2,
+                    )
+                }
+            }
+        }),
+        leadingContent = ListItemContent.Custom({
+            Surface(
+                shape = CircleShape,
+                border = BorderStroke(1.dp, ElementTheme.colors.bgSubtleSecondary),
+                modifier = Modifier
+                    .size(50.dp)
+                    .clip(CircleShape)
+                    .clickable(onClick = onEmojiClick),
+            ) {
+                Box(contentAlignment = Alignment.Center) {
+                    EmojiText(emoji)
+                }
+            }
+        }),
+        modifier = modifier,
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun EmojiPickerBottomSheet(
+    pickerState: io.element.android.libraries.emoji.api.picker.EmojiPickerState,
+    emojiPickerRenderer: EmojiPickerRenderer,
+    onSelectEmoji: (io.element.android.emojibasebindings.Emoji) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val sheetState = rememberBottomSheetState(initialValue = SheetValue.Hidden)
+    val coroutineScope = rememberCoroutineScope()
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        scrollable = false,
+    ) {
+        emojiPickerRenderer.Render(
+            state = pickerState,
+            onSelectEmoji = { emoji ->
+                sheetState.hide(coroutineScope) {
+                    onSelectEmoji(emoji)
+                }
+            },
+            selectedEmojis = persistentSetOf(),
+            modifier = Modifier.fillMaxSize(),
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun UserStatusViewPreview(@PreviewParameter(UserStatusStateProvider::class) state: UserStatusState) = ElementPreview {
+    UserStatusView(
+        state = state,
+        emojiPickerRenderer = NoOpEmojiPickerRenderer,
+    )
+}
diff --git a/features/preferences/impl/src/main/res/values-be/translations.xml b/features/preferences/impl/src/main/res/values-be/translations.xml
index b27a22bb8d..7f487afa24 100644
--- a/features/preferences/impl/src/main/res/values-be/translations.xml
+++ b/features/preferences/impl/src/main/res/values-be/translations.xml
@@ -53,6 +53,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"налады сістэмы"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Сістэмныя апавяшчэнні выключаны"</string>
   <string name="screen_notification_settings_title">"Апавяшчэнні"</string>
+  <string name="theme_dark">"Цёмная"</string>
+  <string name="theme_light">"Светлая"</string>
+  <string name="theme_system">"Сістэмная"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Выпраўленне непаладак"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Выпраўленне непаладак з апавяшчэннямі"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-bg/translations.xml b/features/preferences/impl/src/main/res/values-bg/translations.xml
index 692f0ac8f3..d5ad7facb2 100644
--- a/features/preferences/impl/src/main/res/values-bg/translations.xml
+++ b/features/preferences/impl/src/main/res/values-bg/translations.xml
@@ -58,6 +58,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"системни настройки"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Системните известия са изключени"</string>
   <string name="screen_notification_settings_title">"Известия"</string>
+  <string name="theme_dark">"Тъмен"</string>
+  <string name="theme_light">"Светъл"</string>
+  <string name="theme_system">"Система"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Отстраняване на неизправности"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Отстраняване на неизправности с известията"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-ca/translations.xml b/features/preferences/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..b2cb548d45
--- /dev/null
+++ b/features/preferences/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="full_screen_intent_banner_message">"Per assegurar que mai et perdis una trucada important, canvia la configuració per permetre les notificacions en pantalla completa quan el telèfon està bloquejat."</string>
+  <string name="full_screen_intent_banner_title">"Millora l\'experiència de les trucades"</string>
+  <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"Tria com vols rebre les notificacions"</string>
+  <string name="screen_advanced_settings_developer_mode">"Mode desenvolupador"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"Activa-ho per tenir accés a característiques i funcionalitats per a desenvolupadors."</string>
+  <string name="screen_advanced_settings_element_call_base_url">"URL base d\'Element Call personalitzat"</string>
+  <string name="screen_advanced_settings_element_call_base_url_description">"Estableix un URL base personalitzat d\'Element Call."</string>
+  <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL invàlid, assegura\'t d\'incloure el protocol (http/https) i l\'adreça correctament."</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Amaga les previsualitzacions multimèdia a la cronologia"</string>
+  <string name="screen_advanced_settings_media_compression_description">"Puja fotos i vídeos més ràpidament i redueix l\'ús de dades"</string>
+  <string name="screen_advanced_settings_media_compression_title">"Optimitza qualitat de multimèdia"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderació i seguretat"</string>
+  <string name="screen_advanced_settings_push_provider_android">"Proveïdor de notificacions push"</string>
+  <string name="screen_advanced_settings_rich_text_editor_description">"Desactiva l\'editor de text enriquit per escriure Markdown manualment."</string>
+  <string name="screen_advanced_settings_send_read_receipts">"Confirmacions de lectura"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"Si està desactivat, les confirmacions de lectura no s\'enviaran a ningú. Tot i així, rebràs les confirmacions de lectura d\'altres usuaris (que la tinguin activada)."</string>
+  <string name="screen_advanced_settings_share_presence">"Comparteix presència"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Si està desactivat, no s\'enviaran ni rebràs confirmacions de lectura ni notificacions d\'escriptura."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Amaga sempre"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Mostra sempre"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"En sales privades"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Els arxius multimèdia amagats es poden mostrar tocant-los."</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Mostra multimèdia a la cronologia"</string>
+  <string name="screen_advanced_settings_view_source_description">"Activa l\'opció de mostrar el codi font dels missatges a la cronologia"</string>
+  <string name="screen_blocked_users_empty">"No tens usuaris bloquejats"</string>
+  <string name="screen_blocked_users_unblock_alert_action">"Desbloqueja"</string>
+  <string name="screen_blocked_users_unblock_alert_description">"Podràs tornar a veure tots els seus missatges."</string>
+  <string name="screen_blocked_users_unblock_alert_title">"Desbloqueja usuari"</string>
+  <string name="screen_blocked_users_unblocking">"Desbloquejant…"</string>
+  <string name="screen_edit_profile_display_name">"Nom de visualització"</string>
+  <string name="screen_edit_profile_display_name_placeholder">"El teu nom de visualització"</string>
+  <string name="screen_edit_profile_error">"S\'ha produït un error desconegut i no s\'ha pogut canviar la informació."</string>
+  <string name="screen_edit_profile_error_title">"No s\'ha pogut actualitzar el perfil"</string>
+  <string name="screen_edit_profile_title">"Edita perfil"</string>
+  <string name="screen_edit_profile_updating_details">"Actualitzant perfil…"</string>
+  <string name="screen_notification_settings_additional_settings_section_title">"Configuració addicional"</string>
+  <string name="screen_notification_settings_calls_label">"Trucades d\'àudio i vídeo"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Configuració no coincident"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"S\'ha simplificat la configuració de notificacions per facilitar la cerca de les opcions. Algunes configuracions personalitzades anteriors no es mostren aquí, però encara estan actives.
+
+Si continues, és possible que alguna de les teves configuracions canviï."</string>
+  <string name="screen_notification_settings_direct_chats">"Xats directes"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Configuració personalitzada per xat"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"S\'ha produït un error en actualitzar la configuració de notificacions."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Tots els missatges"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Mencions y paraules clau (només)"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"En xats directes, notifica\'m en"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"En xats de grup, notifica\'m en"</string>
+  <string name="screen_notification_settings_enable_notifications">"Activa les notificacions en aquest dispositiu"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"La configuració no s\'ha corregit, torna-ho a intentar."</string>
+  <string name="screen_notification_settings_group_chats">"Xats de grup"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Invitacions"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"El servidor no admet aquesta opció en sales xifrades, és possible que no rebis notificacions en algunes sales."</string>
+  <string name="screen_notification_settings_mentions_section_title">"Mencions"</string>
+  <string name="screen_notification_settings_mode_all">"Tot"</string>
+  <string name="screen_notification_settings_mode_mentions">"Mencions"</string>
+  <string name="screen_notification_settings_notification_section_title">"Notifica\'m a"</string>
+  <string name="screen_notification_settings_room_mention_label">"Notifica\'m a @sala"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Per rebre notificacions, canvia la teva %1$s."</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"configuració del sistema"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"Notificacions del sistema desactivades"</string>
+  <string name="screen_notification_settings_title">"Notificacions"</string>
+  <string name="theme_dark">"Fosc"</string>
+  <string name="theme_light">"Clar"</string>
+  <string name="theme_system">"Sistema"</string>
+  <string name="troubleshoot_notifications_entry_point_section">"Soluciona problemes"</string>
+  <string name="troubleshoot_notifications_entry_point_title">"Resolució de problemes de notificacions"</string>
+</resources>
diff --git a/features/preferences/impl/src/main/res/values-cs/translations.xml b/features/preferences/impl/src/main/res/values-cs/translations.xml
index 0127a98b41..5c690dd824 100644
--- a/features/preferences/impl/src/main/res/values-cs/translations.xml
+++ b/features/preferences/impl/src/main/res/values-cs/translations.xml
@@ -11,6 +11,15 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Skrýt avatary v žádostech o pozvání do místnosti"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Skrýt náhledy médií na časové ose"</string>
   <string name="screen_advanced_settings_labs">"Experimentální funkce"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Vzdálenost, kterou musíte urazit, aby se spustila aktualizace."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Ujistěte se, že je pro tuto aplikaci povolena možnost \"Přesná poloha\". Chcete-li změnit oprávnění, přejděte do %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Nastavení aplikace"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Aktuální informace o poloze"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Každý %1$d metr"</item>
+    <item quantity="few">"Každé %1$d metry"</item>
+    <item quantity="other">"Každých %1$d metrů"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Rychlejší nahrávání fotografií a videí a snížení spotřeby dat"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimalizace kvality médií"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderování a bezpečnost"</string>
@@ -78,6 +87,10 @@ Pokud budete pokračovat, některá nastavení se mohou změnit."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"systémová nastavení"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systémová oznámení byla vypnuta"</string>
   <string name="screen_notification_settings_title">"Oznámení"</string>
+  <string name="theme_black">"Černý"</string>
+  <string name="theme_dark">"Tmavé"</string>
+  <string name="theme_light">"Světlý"</string>
+  <string name="theme_system">"Systém"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Historie push oznámení"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Odstraňování problémů"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Odstraňování problémů s upozorněními"</string>
diff --git a/features/preferences/impl/src/main/res/values-cy/translations.xml b/features/preferences/impl/src/main/res/values-cy/translations.xml
index 9711eda179..e857f6aebe 100644
--- a/features/preferences/impl/src/main/res/values-cy/translations.xml
+++ b/features/preferences/impl/src/main/res/values-cy/translations.xml
@@ -70,6 +70,9 @@ Os ewch ymlaen, efallai y bydd rhai o\'ch gosodiadau\'n newid."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"gosodiadau system"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Hysbysiadau system wedi\'u diffodd"</string>
   <string name="screen_notification_settings_title">"Hysbysiadau"</string>
+  <string name="theme_dark">"Tywyll"</string>
+  <string name="theme_light">"Golau"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Hanes gwthio"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Datrys Problemau"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Hysbysiadau datrys problemau"</string>
diff --git a/features/preferences/impl/src/main/res/values-da/translations.xml b/features/preferences/impl/src/main/res/values-da/translations.xml
index f258fb0952..459ea33632 100644
--- a/features/preferences/impl/src/main/res/values-da/translations.xml
+++ b/features/preferences/impl/src/main/res/values-da/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Skjul avatarer i anmodninger om invitation til rum"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Skjul forhåndsvisning af medier i tidslinjen"</string>
   <string name="screen_advanced_settings_labs">"Laboratorier"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Den afstand, du skal tilbagelægge for at udløse en opdatering."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Sørg for, at \"nøjagtig placering\" er aktiveret for denne app. For at ændre på tilladelsen skal du gå til %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"App-indstillinger"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Live placeringsopdateringer"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Hver %1$d meter"</item>
+    <item quantity="other">"Hver %1$d meter"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Upload fotos og videoer hurtigere, og reducér dataforbrug"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimér mediekvaliteten"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderation og sikkerhed"</string>
@@ -76,6 +84,9 @@ Hvis du fortsætter, kan nogle af dine indstillinger blive ændret."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"systemindstillinger"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systemmeddelelser slået fra"</string>
   <string name="screen_notification_settings_title">"Notifikationer"</string>
+  <string name="theme_dark">"Mørkt tema"</string>
+  <string name="theme_light">"Lyst tema"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Push-historik"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Fejlfind"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Fejlfinding af meddelelser"</string>
diff --git a/features/preferences/impl/src/main/res/values-de/translations.xml b/features/preferences/impl/src/main/res/values-de/translations.xml
index c3722ec88c..e35cf871a1 100644
--- a/features/preferences/impl/src/main/res/values-de/translations.xml
+++ b/features/preferences/impl/src/main/res/values-de/translations.xml
@@ -76,6 +76,9 @@ Wenn du fortfährst, können sich einige deiner Einstellungen ändern."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"Systemeinstellungen"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systembenachrichtigungen deaktiviert"</string>
   <string name="screen_notification_settings_title">"Benachrichtigungen"</string>
+  <string name="theme_dark">"Dunkel"</string>
+  <string name="theme_light">"Hell"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Verlauf pushen"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Fehlerbehebung"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Fehlerbehebung für Benachrichtigungen"</string>
diff --git a/features/preferences/impl/src/main/res/values-el/translations.xml b/features/preferences/impl/src/main/res/values-el/translations.xml
index 64b651114d..6db52343d3 100644
--- a/features/preferences/impl/src/main/res/values-el/translations.xml
+++ b/features/preferences/impl/src/main/res/values-el/translations.xml
@@ -76,6 +76,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"ρυθμίσεις συστήματος"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Ειδοποιήσεις συστήματος ανενεργές"</string>
   <string name="screen_notification_settings_title">"Ειδοποιήσεις"</string>
+  <string name="theme_dark">"Σκοτεινό"</string>
+  <string name="theme_light">"Φωτεινό"</string>
+  <string name="theme_system">"Σύστημα"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Ιστορικό push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Αντιμετώπιση προβλημάτων"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Αντιμετώπιση προβλημάτων ειδοποιήσεων"</string>
diff --git a/features/preferences/impl/src/main/res/values-es/translations.xml b/features/preferences/impl/src/main/res/values-es/translations.xml
index afdc23d90b..dd496a1273 100644
--- a/features/preferences/impl/src/main/res/values-es/translations.xml
+++ b/features/preferences/impl/src/main/res/values-es/translations.xml
@@ -63,6 +63,9 @@ Si continúas, es posible que algunos de tus ajustes cambien."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"ajustes del sistema"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Notificaciones del sistema desactivadas"</string>
   <string name="screen_notification_settings_title">"Notificaciones"</string>
+  <string name="theme_dark">"Oscuro"</string>
+  <string name="theme_light">"Claro"</string>
+  <string name="theme_system">"Sistema"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Historial de notificaciones push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Solucionar problemas"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Solucionar problemas con las notificaciones"</string>
diff --git a/features/preferences/impl/src/main/res/values-et/translations.xml b/features/preferences/impl/src/main/res/values-et/translations.xml
index 4e7ba1c26e..37f3348583 100644
--- a/features/preferences/impl/src/main/res/values-et/translations.xml
+++ b/features/preferences/impl/src/main/res/values-et/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Peida jututubade kutsetest tunnuspildid"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Peida meedia eelvaated ajajoonel"</string>
   <string name="screen_advanced_settings_labs">"Katsed"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Vahemaa, mille pead andmete uuenduse käivitamiseks läbima."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Veendu, et sellel rakendusel on õigus kasutada funktsionaalsust „Täpne asukoht“. Õiguste muutmiseks ava %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Rakenduse seadistused"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Andmete uuendused reaalajas asukoha jagamisel"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Iga %1$d meeter"</item>
+    <item quantity="other">"Iga %1$d meetrit"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Sellega laadid fotosid ja videoid kiiremini üles ning vähendad andmemahtu"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimeeri meedia kvaliteeti"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Modereerimine ja ohutus"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Kas tahad katsetada?"</string>
   <string name="screen_labs_title">"Katsed"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Täiendavad seadistused"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Kõne helin"</string>
   <string name="screen_notification_settings_calls_label">"Hääl- ja videokõned"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Eelistused ei sobi omavahel"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Et eelistusi oleks kergem leida, me oleme lihtsustanud teavituste seadistusi. Kuigi mõned varem valitud eelistused pole siin näha, siis nad kehtivad jätkuvalt.
@@ -68,14 +77,42 @@ Kui sa jätkad muutmist, siis võivad muutuda ka need peidetud eelistused."</str
   <string name="screen_notification_settings_invite_for_me_label">"Kutsed"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Sinu koduserver ei toeta seda funktsionaalsust krüptitud jututubades ja seega ei pruugi kõik teavitused sinuni jõuda."</string>
   <string name="screen_notification_settings_mentions_section_title">"Mainimiste alusel"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Vali muu ​​helin…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Hetkel on kasutusel %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Sõnumi heli"</string>
+  <string name="screen_notification_settings_message_sound_label">"Sõnumi heli"</string>
   <string name="screen_notification_settings_mode_all">"Kõik"</string>
   <string name="screen_notification_settings_mode_mentions">"Mainimiste alusel"</string>
   <string name="screen_notification_settings_notification_section_title">"Teavita mind"</string>
   <string name="screen_notification_settings_room_mention_label">"Teavita mind @jututoa puhul"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Kohandatud"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Sinu valitud helin…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Viga faili kustutamisel"</string>
+  <string name="screen_notification_settings_sound_element_default">"Elementi vaikimisi väärtus"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Elemendi hajumine"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Viga faili importimisel"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Viga helina eelvaate esitamisel"</string>
+  <string name="screen_notification_settings_sound_section_title">"Helin"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Sulge helinavea viga"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Viga helina seadistamisel"</string>
+  <string name="screen_notification_settings_sound_silent">"Vaikne"</string>
+  <string name="screen_notification_settings_sound_system_default">"Süsteemi vaikimisi väärtus"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Teavituste saamiseks palun muuda oma %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"süsteemi seadistusi"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Süsteemi teavitused on välja lülitatud"</string>
   <string name="screen_notification_settings_title">"Teavitused"</string>
+  <string name="screen_settings_user_status_away">"Eemal"</string>
+  <string name="screen_settings_user_status_be_right_back">"Tulen kohe tagasi"</string>
+  <string name="screen_settings_user_status_custom">"Kohandatud…"</string>
+  <string name="screen_settings_user_status_custom_hint">"Kohandatud olek…"</string>
+  <string name="screen_settings_user_status_focus_time">"Keskendumisaeg"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"Koosolekul"</string>
+  <string name="screen_settings_user_status_on_the_road">"Olen liikumises"</string>
+  <string name="screen_settings_user_status_placeholder">"Mis on sinu olek võrgus?"</string>
+  <string name="theme_black">"Süsimust kujundus"</string>
+  <string name="theme_dark">"Tume"</string>
+  <string name="theme_light">"Hele"</string>
+  <string name="theme_system">"Süsteem"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Tõuketeadete ajalugu"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Veaotsing"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Teavituste veaotsing"</string>
diff --git a/features/preferences/impl/src/main/res/values-eu/translations.xml b/features/preferences/impl/src/main/res/values-eu/translations.xml
index 42a90e0328..42416c682b 100644
--- a/features/preferences/impl/src/main/res/values-eu/translations.xml
+++ b/features/preferences/impl/src/main/res/values-eu/translations.xml
@@ -55,4 +55,7 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"sistemaren ezarpenak"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Sistemaren jakinarazpenak desaktibatuta daude"</string>
   <string name="screen_notification_settings_title">"Jakinarazpenak"</string>
+  <string name="theme_dark">"Iluna"</string>
+  <string name="theme_light">"Argia"</string>
+  <string name="theme_system">"Sistema"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-fa/translations.xml b/features/preferences/impl/src/main/res/values-fa/translations.xml
index 05e73febb4..df42ca953c 100644
--- a/features/preferences/impl/src/main/res/values-fa/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fa/translations.xml
@@ -19,12 +19,15 @@
   <string name="screen_advanced_settings_push_provider_android">"فراهم کنندهٔ آگاهی‌های ارسالی"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"از کار انداختن ویرایشگر متن غنی یا نوشتن دستی مارک‌دون."</string>
   <string name="screen_advanced_settings_send_read_receipts">"رسید‌های خواندن"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"اگر خاموش باشد، رسیدهای خوانده شدن شما برای کسی ارسال نمی‌شود. شما همچنان رسیدهای خوانده شدن را از سایر کاربران دریافت خواهید کرد."</string>
   <string name="screen_advanced_settings_share_presence">"هم‌رسانی حضور"</string>
+  <string name="screen_advanced_settings_share_presence_description">"اگر خاموش باشد، نمی‌توانید رسیدهای خوانده شدن یا اعلان‌های تایپ را ارسال یا دریافت کنید."</string>
   <string name="screen_advanced_settings_show_media_timeline_always_hide">"نهفتن همیشگی"</string>
   <string name="screen_advanced_settings_show_media_timeline_always_show">"نمایش همیشگی"</string>
   <string name="screen_advanced_settings_show_media_timeline_private_rooms">"در اتاق‌های خصوصی"</string>
   <string name="screen_advanced_settings_show_media_timeline_subtitle">"رسانه‌های نهفته همواره خواهند توانست با زدن رویشان نمایان شوند"</string>
   <string name="screen_advanced_settings_show_media_timeline_title">"نمایش رسانه در خط زمانی"</string>
+  <string name="screen_advanced_settings_view_source_description">"گزینه مشاهده منبع پیام در جدول زمانی را فعال کنید."</string>
   <string name="screen_blocked_users_empty">"هیچ کاربر مسدودی ندارید"</string>
   <string name="screen_blocked_users_unblock_alert_action">"رفع انسداد"</string>
   <string name="screen_blocked_users_unblock_alert_description">"قادر خواهید بود دوباره همهٔ پیام‌هایش را ببینید."</string>
@@ -64,6 +67,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"تنظیمات سامانه"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"آگاهی‌های سامانه‌ای خاموش شدند"</string>
   <string name="screen_notification_settings_title">"آگاهی‌ها"</string>
+  <string name="theme_dark">"تیره"</string>
+  <string name="theme_light">"روشن"</string>
+  <string name="theme_system">"سامانه"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"تاریخچهٔ آگاهی‌های ارسالی"</string>
   <string name="troubleshoot_notifications_entry_point_section">"رفع‌اشکال"</string>
   <string name="troubleshoot_notifications_entry_point_title">"رفع‌اشکال آگاهی‌ها"</string>
diff --git a/features/preferences/impl/src/main/res/values-fi/translations.xml b/features/preferences/impl/src/main/res/values-fi/translations.xml
index f1462f3bb7..f37673427f 100644
--- a/features/preferences/impl/src/main/res/values-fi/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fi/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Piilota huoneiden avatarit kutsuista"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Piilota median esikatselu aikajanalla"</string>
   <string name="screen_advanced_settings_labs">"Labrat"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Etäisyys, joka sinun on kuljettava päivityksen käynnistämiseksi."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Varmista, että tälle sovellukselle on valittu \"Tarkka sijainti\". Voit muuttaa lupaa kohdassa %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Sovellusasetukset"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Reaaliaikaiset sijaintipäivitykset"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"%1$d metrin välein"</item>
+    <item quantity="other">"%1$d metrin välein"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Lähetä valokuvia ja videoita nopeammin ja vähennä datan käyttöä."</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimoi median laatu"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderointi ja Turvallisuus"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Kokeilunhaluinen olo?"</string>
   <string name="screen_labs_title">"Labrat"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Lisäasetukset"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Puhelun soittoääni"</string>
   <string name="screen_notification_settings_calls_label">"Ääni- ja videopuheluista"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Konfiguraatio ei täsmää"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Olemme yksinkertaistaneet ilmoitusasetuksia, jotta vaihtoehdot olisi helpompi löytää. Joitakin aiemmin valitsemiasi asetuksia ei näytetä tässä, mutta ne ovat edelleen voimassa.
@@ -68,14 +77,34 @@ Jos jatkat, jotkin asetukset saattavat muuttua."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Kutsut"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Kotipalvelimesi ei tue tätä vaihtoehtoa salatuissa huoneissa, joten et ehkä saa ilmoitusta joissakin huoneissa."</string>
   <string name="screen_notification_settings_mentions_section_title">"Maininnat"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Valitse toinen ääni…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Käytössä tällä hetkellä %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Viestin ääni"</string>
+  <string name="screen_notification_settings_message_sound_label">"Viestin ääni"</string>
   <string name="screen_notification_settings_mode_all">"Kaikki"</string>
   <string name="screen_notification_settings_mode_mentions">"Maininnat"</string>
   <string name="screen_notification_settings_notification_section_title">"Ilmoita minulle"</string>
   <string name="screen_notification_settings_room_mention_label">"Ilmoita minulle @room-maininnoista"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Mukautettu"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Mukautettu ääni…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Virhe tiedoston poistamisessa"</string>
+  <string name="screen_notification_settings_sound_element_default">"Elementin oletus"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element Fade"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Virhe tiedoston tuonnissa"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Ongelma ilmoitusäänen esikatselussa"</string>
+  <string name="screen_notification_settings_sound_section_title">"Ääni"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Hylkää hälytysäänen virhe"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Ongelma ilmoitusäänen asettamisessa"</string>
+  <string name="screen_notification_settings_sound_silent">"Hiljainen"</string>
+  <string name="screen_notification_settings_sound_system_default">"Järjestelmän oletus"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Jos haluat saada ilmoituksia, vaihda %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"järjestelmäsi asetuksia"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Järjestelmän ilmoitukset on poissa päältä"</string>
   <string name="screen_notification_settings_title">"Ilmoitukset"</string>
+  <string name="theme_black">"Musta"</string>
+  <string name="theme_dark">"Tumma"</string>
+  <string name="theme_light">"Vaalea"</string>
+  <string name="theme_system">"Järjestelmän oletus"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Push-historia"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Vianmääritys"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Ilmoitusten vianmääritys"</string>
diff --git a/features/preferences/impl/src/main/res/values-fr/translations.xml b/features/preferences/impl/src/main/res/values-fr/translations.xml
index 5ee91388bd..fc57491f4a 100644
--- a/features/preferences/impl/src/main/res/values-fr/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fr/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Masquer les avatars des salons dans les invitations"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Masquer les aperçus des médias dans les discussions"</string>
   <string name="screen_advanced_settings_labs">"Expérimental"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Distance à effectuer pour envoyer une mise à jour."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Assurez-vous que la « Localisation précise » est activée pour cette application. Pour modifier l’autorisation, aller à: %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Paramètres de l’application"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Mises à jour en direct de la localisation"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"%1$d mètre"</item>
+    <item quantity="other">"%1$d mètres"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Téléchargez des photos et des vidéos plus rapidement et réduisez la consommation de données"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimisez la qualité des médias"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Modération et sécurité"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Envie d’expérimenter?"</string>
   <string name="screen_labs_title">"Expérimental"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Réglages supplémentaires"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Sonnerie d’appel"</string>
   <string name="screen_notification_settings_calls_label">"Appels audio et vidéo"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Incompatibilité de configuration"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Nous avons simplifié les paramètres des notifications pour que les options soient plus faciles à trouver. Certains paramètres personnalisés que vous avez choisis par le passé ne sont pas affichés ici, mais ils sont toujours actifs.
@@ -68,14 +77,34 @@ Si vous continuez, il est possible que certains de vos paramètres soient modifi
   <string name="screen_notification_settings_invite_for_me_label">"Invitations"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Votre serveur d’accueil ne supporte pas cette option pour les salons chiffrés, vous pourriez ne pas être notifié(e) dans certains salons."</string>
   <string name="screen_notification_settings_mentions_section_title">"Mentions"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Choisir un autre son…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Vous utilisez actuellement %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Son des messages"</string>
+  <string name="screen_notification_settings_message_sound_label">"Son des messages"</string>
   <string name="screen_notification_settings_mode_all">"Tous"</string>
   <string name="screen_notification_settings_mode_mentions">"Mentions"</string>
   <string name="screen_notification_settings_notification_section_title">"Prévenez-moi pour"</string>
   <string name="screen_notification_settings_room_mention_label">"Prévenez-moi si un message contient \"@room\""</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Personnalisé"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Son personnalisé…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Erreur lors de la suppression du fichier"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element - défaut"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element - doux"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Erreur lors de l’importation du fichier"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Problème lors de l’écoute préalable du son d’alerte"</string>
+  <string name="screen_notification_settings_sound_section_title">"Son"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Ignorer l’erreur des sons d’alerte"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Problème de configuration du son d’alerte"</string>
+  <string name="screen_notification_settings_sound_silent">"Silencieux"</string>
+  <string name="screen_notification_settings_sound_system_default">"Paramètres par défaut du système"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Pour recevoir des notifications, veuillez modifier votre %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"paramètres du système"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Les notifications du système sont désactivées"</string>
   <string name="screen_notification_settings_title">"Notifications"</string>
+  <string name="theme_black">"Noir"</string>
+  <string name="theme_dark">"Sombre"</string>
+  <string name="theme_light">"Clair"</string>
+  <string name="theme_system">"Système"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Historique des Push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Dépannage"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Dépanner les notifications"</string>
diff --git a/features/preferences/impl/src/main/res/values-hr/translations.xml b/features/preferences/impl/src/main/res/values-hr/translations.xml
index 250af33d49..d54e3a66ff 100644
--- a/features/preferences/impl/src/main/res/values-hr/translations.xml
+++ b/features/preferences/impl/src/main/res/values-hr/translations.xml
@@ -11,6 +11,15 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Sakrij avatare u zahtjevima za poziv u sobu"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Sakrij preglede medija na vremenskoj traci"</string>
   <string name="screen_advanced_settings_labs">"Laboratoriji"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Udaljenost koju morate prijeći da biste pokrenuli ažuriranje."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Provjerite je li \"Precizna lokacija\" omogućena za ovu aplikaciju. Za promjenu dopuštenja idite na %1$s ."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Postavke aplikacije"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Ažuriranja lokacije uživo"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Svaki %1$d metar"</item>
+    <item quantity="few">"Svaki %1$d metar"</item>
+    <item quantity="other">"Svaki %1$d metara"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Brže prenesite fotografije i videozapise te smanjite potrošnju podataka"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimiziraj kvalitetu medija"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderiranje i sigurnost"</string>
@@ -50,6 +59,7 @@
   <string name="screen_labs_header_title">"Jeste li spremni za eksperimentiranje?"</string>
   <string name="screen_labs_title">"Laboratoriji"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Dodatne postavke"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Ton zvona"</string>
   <string name="screen_notification_settings_calls_label">"Audiopozivi i videopozivi"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Neusklađenost konfiguracije"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Pojednostavili smo postavke obavijesti kako bismo olakšali pronalaženje mogućnosti. Neke prilagođene postavke koje ste odabrali u prošlosti nisu ovdje prikazane, ali su i dalje aktivne.
@@ -68,14 +78,42 @@ Ako nastavite, neke od vaših postavki mogu se promijeniti."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Pozivnice"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Vaš matični poslužitelj ne podržava ovu mogućnost u šifriranim sobama; možda nećete dobiti obavijesti u nekim sobama."</string>
   <string name="screen_notification_settings_mentions_section_title">"Spominjanja"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Odaberite drugi zvuk…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Trenutačno upotrebljavate %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Zvuk poruke"</string>
+  <string name="screen_notification_settings_message_sound_label">"Zvuk poruke"</string>
   <string name="screen_notification_settings_mode_all">"Sve"</string>
   <string name="screen_notification_settings_mode_mentions">"Spominjanja"</string>
   <string name="screen_notification_settings_notification_section_title">"Obavijesti me za"</string>
   <string name="screen_notification_settings_room_mention_label">"Obavijesti me o sobi @soba"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Prilagođeno"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Personalizirano zvono"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Pogreška pri brisanju datoteke"</string>
+  <string name="screen_notification_settings_sound_element_default">"Zadano za element"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Blijeđenje elementa"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Pogreška pri uvozu datoteke"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Problem s pregledom zvuka upozorenja"</string>
+  <string name="screen_notification_settings_sound_section_title">"Zvuk"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Pogreška zvuka odbacivanja upozorenja"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Problem s postavljanjem zvuka upozorenja"</string>
+  <string name="screen_notification_settings_sound_silent">"Stišano"</string>
+  <string name="screen_notification_settings_sound_system_default">"Zadano sustavom"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Kako biste primali obavijesti, promijenite %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"postavke sustava"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Obavijesti sustava su isključene"</string>
   <string name="screen_notification_settings_title">"Obavijesti"</string>
+  <string name="screen_settings_user_status_away">"Odsutan/na"</string>
+  <string name="screen_settings_user_status_be_right_back">"Odmah se vraćam"</string>
+  <string name="screen_settings_user_status_custom">"Prilagođeno"</string>
+  <string name="screen_settings_user_status_custom_hint">"Prilagođeni status…"</string>
+  <string name="screen_settings_user_status_focus_time">"Vrijeme za fokusiranje"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"Na sastanku"</string>
+  <string name="screen_settings_user_status_on_the_road">"Na putu"</string>
+  <string name="screen_settings_user_status_placeholder">"Kakav je tvoj status?"</string>
+  <string name="theme_black">"Crna"</string>
+  <string name="theme_dark">"Tamno"</string>
+  <string name="theme_light">"Svijetlo"</string>
+  <string name="theme_system">"Sustav"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Povijest push obavijesti"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Rješavanje problema"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Rješavanje problema s obavijestima"</string>
diff --git a/features/preferences/impl/src/main/res/values-hu/translations.xml b/features/preferences/impl/src/main/res/values-hu/translations.xml
index c588e60eaf..f4a9616321 100644
--- a/features/preferences/impl/src/main/res/values-hu/translations.xml
+++ b/features/preferences/impl/src/main/res/values-hu/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Profilképek elrejtése a szobameghívókban"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Médiaelőnézetek elrejtése az idővonalon"</string>
   <string name="screen_advanced_settings_labs">"Kísérletek"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"A megtett távolság miután a helyadat frissül."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Győződjön meg arról, hogy a „Pontos helymeghatározás” engedélyezve van ehhez az alkalmazáshoz. Az engedély módosításához menjen ide:%1$s ."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Alkalmazásbeállítások"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Élő helymeghatározás"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Minden %1$d méter"</item>
+    <item quantity="other">"Minden %1$d méter"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Töltse fel gyorsabban a fényképeket és videókat, valamint csökkentse az adatforgalmat"</string>
   <string name="screen_advanced_settings_media_compression_title">"Média minőségének optimalizálása"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderálás és biztonság"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Kísérletezni szeretne?"</string>
   <string name="screen_labs_title">"Kísérletek"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"További beállítások"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Csengőhang"</string>
   <string name="screen_notification_settings_calls_label">"Hang- és videóhívások"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Konfigurációs eltérés"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Egyszerűsítettük az értesítési beállításokat, hogy könnyebben megtalálhatók legyenek a lehetőségek. A korábban kiválasztott egyéni beállítások némelyike nem jelenik meg itt, de továbbra is aktív.
@@ -68,14 +77,34 @@ Ha folytatja, egyes beállítások megváltozhatnak."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Meghívók"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"A Matrix-kiszolgálója nem támogatja ezt a beállítást a titkosított szobákban, előfordulhat, hogy egyes szobákban nem kap értesítést."</string>
   <string name="screen_notification_settings_mentions_section_title">"Említések"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Válasszon egy másik hangot…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Jelenleg használt: %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Üzenet hang"</string>
+  <string name="screen_notification_settings_message_sound_label">"Üzenet hang"</string>
   <string name="screen_notification_settings_mode_all">"Összes"</string>
   <string name="screen_notification_settings_mode_mentions">"Említések"</string>
   <string name="screen_notification_settings_notification_section_title">"Értesítés ezekről:"</string>
   <string name="screen_notification_settings_room_mention_label">"Értesítés a @room említésekor"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Egyedi"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Egyedi hang…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Hiba a fájl törlésekor"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element alapértelmezett"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element Fade"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Hiba a fájl importálásakor"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Probléma a riasztási hang előnézetekor"</string>
+  <string name="screen_notification_settings_sound_section_title">"Hang"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Figyelmeztető hang hiba kikapcsolása"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Probléma a riasztási hang beállításánál"</string>
+  <string name="screen_notification_settings_sound_silent">"Néma"</string>
+  <string name="screen_notification_settings_sound_system_default">"Rendszer alapértelmezett"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Az értesítések fogadásához kérjük, módosítsa a %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"rendszerbeállításokat"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"A rendszerértesítések ki vannak kapcsolva"</string>
   <string name="screen_notification_settings_title">"Értesítések"</string>
+  <string name="theme_black">"Fekete"</string>
+  <string name="theme_dark">"Sötét"</string>
+  <string name="theme_light">"Világos"</string>
+  <string name="theme_system">"Rendszer"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Leküldéses értesítések előzmények"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Hibaelhárítás"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Értesítések hibaelhárítása"</string>
diff --git a/features/preferences/impl/src/main/res/values-in/translations.xml b/features/preferences/impl/src/main/res/values-in/translations.xml
index 5ce794c8ac..11d0673606 100644
--- a/features/preferences/impl/src/main/res/values-in/translations.xml
+++ b/features/preferences/impl/src/main/res/values-in/translations.xml
@@ -10,6 +10,14 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL tidak valid, pastikan Anda menyertakan protokol (http/https) dan alamat yang benar."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Sembunyikan avatar dalam permintaan undangan ruangan"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Sembunyikan pratinjau media pada lini masa"</string>
+  <string name="screen_advanced_settings_labs">"Uji Coba"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Jarak yang harus Anda tempuh untuk memicu pembaruan."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Pastikan \"Lokasi Tepat\" diaktifkan untuk aplikasi ini. Untuk mengubah izin tersebut, buka %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Pengaturan aplikasi"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Pembaruan lokasi secara langsung"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="other">"Setiap %1$d meter"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Unggah foto dan video lebih cepat dan kurangi penggunaan data"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimalkan kualitas media"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderasi dan Keamanan"</string>
@@ -43,6 +51,11 @@
   <string name="screen_edit_profile_error_title">"Tidak dapat memperbarui profil"</string>
   <string name="screen_edit_profile_title">"Edit profil"</string>
   <string name="screen_edit_profile_updating_details">"Memperbarui profil…"</string>
+  <string name="screen_labs_enable_threads">"Aktifkan balasan utas"</string>
+  <string name="screen_labs_enable_threads_description">"Aplikasi akan dimulai ulang untuk menerapkan perubahan ini."</string>
+  <string name="screen_labs_header_description">"Cobalah ide-ide terbaru kami yang sedang dikembangkan. Fitur-fitur ini belum final; mungkin masih tidak stabil dan dapat berubah."</string>
+  <string name="screen_labs_header_title">"Merasa ingin bereksperimen?"</string>
+  <string name="screen_labs_title">"Uji Coba"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Pengaturan tambahan"</string>
   <string name="screen_notification_settings_calls_label">"Panggilan audio dan video"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Ketidakcocokan pengaturan"</string>
@@ -68,10 +81,17 @@ Jika Anda melanjutkan, beberapa pengaturan Anda dapat berubah."</string>
   <string name="screen_notification_settings_mode_mentions">"Sebutan"</string>
   <string name="screen_notification_settings_notification_section_title">"Beri tahu saya tentang"</string>
   <string name="screen_notification_settings_room_mention_label">"Beri tahu saya pada @room"</string>
+  <string name="screen_notification_settings_sound_element_default">"Pengaturan Default Element"</string>
+  <string name="screen_notification_settings_sound_section_title">"Suara"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Masalah pengaturan suara peringatan"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Untuk menerima pemberitahuan, silakan ubah %1$s Anda."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"pengaturan sistem"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Pemberitahuan sistem dimatikan"</string>
   <string name="screen_notification_settings_title">"Notifikasi"</string>
+  <string name="theme_black">"Hitam"</string>
+  <string name="theme_dark">"Gelap"</string>
+  <string name="theme_light">"Terang"</string>
+  <string name="theme_system">"Sistem"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Riwayat dorongan"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Pemecahan masalah"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Pecahkan masalah notifikasi"</string>
diff --git a/features/preferences/impl/src/main/res/values-it/translations.xml b/features/preferences/impl/src/main/res/values-it/translations.xml
index a10dcc9594..3da5e1e6ce 100644
--- a/features/preferences/impl/src/main/res/values-it/translations.xml
+++ b/features/preferences/impl/src/main/res/values-it/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Nascondi gli avatar nelle richieste di invito alle stanze"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Nascondi le anteprime dei media nelle conversazioni"</string>
   <string name="screen_advanced_settings_labs">"Labs"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"La distanza che devi percorrere per attivare un aggiornamento."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Assicurati che l\'opzione \"Posizione precisa\" sia abilitata per questa app. Per modificare l\'autorizzazione, vai in %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Impostazioni app"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Aggiornamenti posizione in tempo reale"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Ogni %1$d metro"</item>
+    <item quantity="other">"Ogni %1$d metri"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Carica foto e video più velocemente e riduci l\'utilizzo dei dati"</string>
   <string name="screen_advanced_settings_media_compression_title">"Ottimizza la qualità dei contenuti multimediali"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderazione e Sicurezza"</string>
@@ -23,7 +31,7 @@
   <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Qualità del caricamento video"</string>
   <string name="screen_advanced_settings_push_provider_android">"Fornitore di notifiche push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Disattiva l\'editor di testo avanzato per scrivere manualmente in Markdown"</string>
-  <string name="screen_advanced_settings_send_read_receipts">"Conferme di visualizzazione"</string>
+  <string name="screen_advanced_settings_send_read_receipts">"Conferme di lettura"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Se disattivato, le tue conferme di visualizzazione non verranno inviate a nessuno. Riceverai comunque conferme di visualizzazione da altri utenti."</string>
   <string name="screen_advanced_settings_share_presence">"Condividi presenza online"</string>
   <string name="screen_advanced_settings_share_presence_description">"Se disattivato, non potrai né inviare né ricevere conferme di lettura o notifiche di scrittura."</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Hai voglia di sperimentare?"</string>
   <string name="screen_labs_title">"Labs"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Impostazioni aggiuntive"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Suoneria di chiamata"</string>
   <string name="screen_notification_settings_calls_label">"Chiamate audio e video"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Mancata corrispondenza di configurazione"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Abbiamo semplificato le impostazioni di notifica per rendere le opzioni più facili da trovare. Alcune impostazioni personalizzate che hai scelto in passato non sono mostrate qui, ma sono ancora attive.
@@ -68,14 +77,34 @@ Se procedi, alcune delle tue impostazioni potrebbero cambiare."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Inviti"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Il tuo homeserver non supporta questa opzione nelle stanze crifrate, quindi potresti non ricevere notifiche in alcune stanze."</string>
   <string name="screen_notification_settings_mentions_section_title">"Menzioni"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Scegli un altro suono…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Attualmente si utilizza %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Suono messaggi"</string>
+  <string name="screen_notification_settings_message_sound_label">"Suono messaggi"</string>
   <string name="screen_notification_settings_mode_all">"Tutto"</string>
   <string name="screen_notification_settings_mode_mentions">"Menzioni"</string>
   <string name="screen_notification_settings_notification_section_title">"Avvisami per"</string>
   <string name="screen_notification_settings_room_mention_label">"Avvisami con @room"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Personalizzato"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Suono personalizzato…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Errore durante l\'eliminazione del file"</string>
+  <string name="screen_notification_settings_sound_element_default">"Predefinito di Element"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Dissolvenza di Element"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Errore durante l\'importazione del file"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Problema durante l\'anteprima del suono di avviso"</string>
+  <string name="screen_notification_settings_sound_section_title">"Suono"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Ignora l\'errore relativo al suono di avviso"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Problema con l\'impostazione del suono di avviso"</string>
+  <string name="screen_notification_settings_sound_silent">"Silenzioso"</string>
+  <string name="screen_notification_settings_sound_system_default">"Predefinito"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Per ricevere notifiche, modifica le tue %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"impostazioni di sistema"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Notifiche di sistema disattivate"</string>
   <string name="screen_notification_settings_title">"Notifiche"</string>
+  <string name="theme_black">"Nero"</string>
+  <string name="theme_dark">"Scuro"</string>
+  <string name="theme_light">"Chiaro"</string>
+  <string name="theme_system">"Sistema"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Cronologia push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Risoluzione dei problemi"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Risoluzione di problemi delle notifiche"</string>
diff --git a/features/preferences/impl/src/main/res/values-ja/translations.xml b/features/preferences/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..8e97d03c54
--- /dev/null
+++ b/features/preferences/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="full_screen_intent_banner_message">"重要な電話を確実に受け取るため、端末がロックされている状態での全画面通知を、設定から許可してください。"</string>
+  <string name="full_screen_intent_banner_title">"通話品質を高める"</string>
+  <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"通知の受信方法を選択してください"</string>
+  <string name="screen_advanced_settings_developer_mode">"開発者モード"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"開発者向けの機能を表示します。"</string>
+  <string name="screen_advanced_settings_element_call_base_url">"任意の Element Call のベースURL"</string>
+  <string name="screen_advanced_settings_element_call_base_url_description">"任意の Element Call のベースURLを入力してください。"</string>
+  <string name="screen_advanced_settings_element_call_base_url_validation_error">"無効なURLです。プロトコル (http/https) が明記されていることと、アドレスが正しいことを確認してください。"</string>
+  <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"ルームへの招待リクエストにアバターを表示しない"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"タイムラインにメディアのプレビューを表示しない"</string>
+  <string name="screen_advanced_settings_labs">"ラボ"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"更新するのに必要な移動距離です。"</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"「正確な位置情報」がこのアプリで使用可能なことを確認してください。権限を変更するには %1$s を開いてください。"</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"アプリ設定"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"ライブ位置情報の更新"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="other">"%1$dm ごと"</item>
+  </plurals>
+  <string name="screen_advanced_settings_media_compression_description">"写真や動画を高速で送信してデータ使用量を減らします。"</string>
+  <string name="screen_advanced_settings_media_compression_title">"メディアの品質を最適化"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"セキュリティと制限"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"自動的に画像を最適化してアップロード時間とファイルサイズを削減します。"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"画像のアップロード画質を最適化"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s 変更するにはタップしてください。"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"高画質 (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"低画質 (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"標準 (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"動画のアップロード品質"</string>
+  <string name="screen_advanced_settings_push_provider_android">"プッシュ通知プロバイダー"</string>
+  <string name="screen_advanced_settings_rich_text_editor_description">"リッチテキスト編集機能を無効化し、Markdown記法を手入力できるようにします。"</string>
+  <string name="screen_advanced_settings_send_read_receipts">"既読を通知"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"機能がオフの場合、メッセージを確認したことを誰にも通知しません。他のユーザーの既読は確認することができます。"</string>
+  <string name="screen_advanced_settings_share_presence">"在席を共有"</string>
+  <string name="screen_advanced_settings_share_presence_description">"機能がオフの場合、既読の情報と入力中の通知を使用できなくなります。"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"常に非表示"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"常に表示"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"非公開ルームのみ"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"非表示のメディアはタップして表示することができます。"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"タイムラインにメディアを表示"</string>
+  <string name="screen_advanced_settings_view_source_description">"タイムラインでメッセージのソースを表示する機能を追加します。"</string>
+  <string name="screen_blocked_users_empty">"ブロックしたユーザーはいません"</string>
+  <string name="screen_blocked_users_unblock_alert_action">"ブロックを解除"</string>
+  <string name="screen_blocked_users_unblock_alert_description">"すべてのメッセージが再表示されます。"</string>
+  <string name="screen_blocked_users_unblock_alert_title">"ユーザーのブロックを解除"</string>
+  <string name="screen_blocked_users_unblocking">"ブロック解除中…"</string>
+  <string name="screen_edit_profile_display_name">"表示名"</string>
+  <string name="screen_edit_profile_display_name_placeholder">"あなたの表示名"</string>
+  <string name="screen_edit_profile_error">"不明な問題が発生したため、情報の更新に失敗しました。"</string>
+  <string name="screen_edit_profile_error_title">"プロフィールを更新できません"</string>
+  <string name="screen_edit_profile_title">"プロフィールを編集"</string>
+  <string name="screen_edit_profile_updating_details">"プロフィールを更新中…"</string>
+  <string name="screen_labs_enable_threads">"スレッドへの返信を有効化"</string>
+  <string name="screen_labs_enable_threads_description">"変更を適用するためにアプリケーションは再起動します。"</string>
+  <string name="screen_labs_header_description">"開発段階の最新機能を試すことができます。未完成のため、変更や不安定な挙動が生じる可能性があります。"</string>
+  <string name="screen_labs_header_title">"探究的な気分ですか？"</string>
+  <string name="screen_labs_title">"ラボ"</string>
+  <string name="screen_notification_settings_additional_settings_section_title">"追加設定"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"発信音"</string>
+  <string name="screen_notification_settings_calls_label">"音声・ビデオ通話"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"設定の不一致"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"通知設定を簡素化し、見つけやすくしました。以前のカスタム設定の一部はここに表示されませんが、引き続き有効です。
+
+続行すると、一部の設定が変更される可能性があります。"</string>
+  <string name="screen_notification_settings_direct_chats">"ダイレクトチャット"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"チャットごとのカスタム設定"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"通知設定の更新中に問題が発生しました。"</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"すべてのメッセージ"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"メンションとキーワードのみ"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"ダイレクトチャットで以下の通知を受け取る"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"グループチャットで以下の通知を受け取る"</string>
+  <string name="screen_notification_settings_enable_notifications">"この端末で通知を受け取る"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"設定が修正されていません。再試行してください。"</string>
+  <string name="screen_notification_settings_group_chats">"グループチャット"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"招待"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"暗号化されたルームでは、この機能にホームサーバーが対応しないため、一部のルームから通知が届かない可能性があります。"</string>
+  <string name="screen_notification_settings_mentions_section_title">"メンション"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"他の音を選択…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"%1$s を使用中"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"メッセージの音"</string>
+  <string name="screen_notification_settings_message_sound_label">"メッセージの音"</string>
+  <string name="screen_notification_settings_mode_all">"すべて"</string>
+  <string name="screen_notification_settings_mode_mentions">"メンション"</string>
+  <string name="screen_notification_settings_notification_section_title">"以下を通知"</string>
+  <string name="screen_notification_settings_room_mention_label">@ルームで通知を受け取る</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"カスタム"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"カスタム着信音"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"ファイルの削除に失敗"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element の既定"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Elementフェード"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"ファイルの取り込みに失敗"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"通知音のプレビューで問題が発生しました"</string>
+  <string name="screen_notification_settings_sound_section_title">"音"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"通知音のエラーを無視"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"通知音の設定に問題が発生しました"</string>
+  <string name="screen_notification_settings_sound_silent">"サイレント"</string>
+  <string name="screen_notification_settings_sound_system_default">"システムのデフォルト"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"通知を受け取るには、%1$s を変更してください。"</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"システム設定"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"システムで通知がオフです"</string>
+  <string name="screen_notification_settings_title">"通知"</string>
+  <string name="theme_black">"ブラック"</string>
+  <string name="theme_dark">"ダーク"</string>
+  <string name="theme_light">"ライト"</string>
+  <string name="theme_system">"システム"</string>
+  <string name="troubleshoot_notifications_entry_point_push_history_title">"プッシュ履歴"</string>
+  <string name="troubleshoot_notifications_entry_point_section">"トラブルシューティング"</string>
+  <string name="troubleshoot_notifications_entry_point_title">"通知のトラブルシューティング"</string>
+</resources>
diff --git a/features/preferences/impl/src/main/res/values-ka/translations.xml b/features/preferences/impl/src/main/res/values-ka/translations.xml
index 1efe197267..5a20e718a0 100644
--- a/features/preferences/impl/src/main/res/values-ka/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ka/translations.xml
@@ -50,6 +50,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"სისტემის პარამეტრები"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"სისტემის შეტყობინებები გამორთულია"</string>
   <string name="screen_notification_settings_title">"შეტყობინებები"</string>
+  <string name="theme_dark">"მუქი"</string>
+  <string name="theme_light">"ღია"</string>
+  <string name="theme_system">"სისტემა"</string>
   <string name="troubleshoot_notifications_entry_point_section">"პრობლემების გადაჭრა"</string>
   <string name="troubleshoot_notifications_entry_point_title">"პრობლემების გადაჭრის შეტყობინებები"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-ko/translations.xml b/features/preferences/impl/src/main/res/values-ko/translations.xml
index 5e17d57a87..dcff2d7b6c 100644
--- a/features/preferences/impl/src/main/res/values-ko/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ko/translations.xml
@@ -11,6 +11,13 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"방 초대 요청에서 아바타 숨기기"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"타임라인에서 미디어 미리 보기 숨기기"</string>
   <string name="screen_advanced_settings_labs">"실험실"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"위치 업데이트 전환 기준 거리"</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"이 앱에 \"정확한 위치\" 권한이 허용되어 있는지 확인해 주세요. 권한을 변경하려면 %1$s(으)로 이동하세요."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"앱 설정"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"실시간 위치 업데이트"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="other">"%1$d미터마다"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"사진과 동영상을 더 빠르게 업로드하고 데이터 사용량을 줄이세요"</string>
   <string name="screen_advanced_settings_media_compression_title">"미디어 품질 최적화"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"중재와 안전"</string>
@@ -51,6 +58,7 @@
   <string name="screen_labs_header_title">"새로운 것을 시도해보고 싶으신가요?"</string>
   <string name="screen_labs_title">"실험실"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"추가 설정"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"통화 벨소리"</string>
   <string name="screen_notification_settings_calls_label">"음성 및 동영상 통화"</string>
   <string name="screen_notification_settings_configuration_mismatch">"구성 불일치"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"알림 설정을 간소화하여 옵션을 더 쉽게 찾을 수 있도록 했습니다. 과거에 선택한 일부 맞춤 설정은 여기에서 표시되지 않지만, 여전히 활성화되어 있습니다.
@@ -69,14 +77,34 @@
   <string name="screen_notification_settings_invite_for_me_label">"초대"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"귀하의 홈서버는 암호화된 방에서 이 옵션을 지원하지 않으므로, 일부 방에서는 알림이 표시되지 않을 수 있습니다."</string>
   <string name="screen_notification_settings_mentions_section_title">"언급"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"다른 소리를 선택하세요…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"현재 사용 중: %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"메시지 소리"</string>
+  <string name="screen_notification_settings_message_sound_label">"메시지 소리"</string>
   <string name="screen_notification_settings_mode_all">"모두"</string>
   <string name="screen_notification_settings_mode_mentions">"언급"</string>
   <string name="screen_notification_settings_notification_section_title">"나에게 알려주세요"</string>
   <string name="screen_notification_settings_room_mention_label">@room 에서 알림 받기</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"사용자 지정"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"소리 사용자 지정"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"파일 삭제 오류"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element 기본 설정"</string>
+  <string name="screen_notification_settings_sound_element_fade">"엘리먼트 페이드"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"파일 가져오기 오류"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"알림음 미리듣기 문제 발생"</string>
+  <string name="screen_notification_settings_sound_section_title">"소리"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"알림음 오류 해제"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"알림 소리 설정 문제"</string>
+  <string name="screen_notification_settings_sound_silent">"무음"</string>
+  <string name="screen_notification_settings_sound_system_default">"시스템 기본값"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"알림을 받으려면 %1$s 을 변경해 주세요."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"시스템 설정"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"시스템 알림이 꺼져 있습니다."</string>
   <string name="screen_notification_settings_title">"알림"</string>
+  <string name="theme_black">"검은색"</string>
+  <string name="theme_dark">"다크"</string>
+  <string name="theme_light">"라이트"</string>
+  <string name="theme_system">"시스템"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"푸시 기록"</string>
   <string name="troubleshoot_notifications_entry_point_section">"문제 해결"</string>
   <string name="troubleshoot_notifications_entry_point_title">"문제 해결 알림"</string>
diff --git a/features/preferences/impl/src/main/res/values-nb/translations.xml b/features/preferences/impl/src/main/res/values-nb/translations.xml
index 90ec12a1a1..e02cc6b049 100644
--- a/features/preferences/impl/src/main/res/values-nb/translations.xml
+++ b/features/preferences/impl/src/main/res/values-nb/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Skjul avatarer i invitasjonsforespørsler til rom"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Skjul forhåndsvisninger av medier på tidslinjen"</string>
   <string name="screen_advanced_settings_labs">"Prøvefunksjoner"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Avstanden du må bevege deg for å utløse en oppdatering."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Sørg for at «Nøyaktig lokasjon» er aktivert for denne appen. For å endre tillatelsen, gå til %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Appinnstillinger"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Oppdateringer av lokasjon i sanntid"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Hver %1$d. meter"</item>
+    <item quantity="other">"Hver %1$d. meter"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Last opp bilder og videoer raskere og reduser databruken"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimaliser mediekvaliteten"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderasjon og sikkerhet"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Lyst til å prøve noe nytt?"</string>
   <string name="screen_labs_title">"Prøvefunksjoner"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Ytterligere innstillinger"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Ringetone"</string>
   <string name="screen_notification_settings_calls_label">"Lyd- og videosamtaler"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Uoverensstemmelse i konfigurasjonen"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Vi har forenklet varslingsinnstillingene for å gjøre det lettere å finne alternativene. Noen av de egendefinerte innstillingene du har valgt tidligere, vises ikke her, men de er fortsatt aktive.
@@ -68,14 +77,41 @@ Hvis du fortsetter, kan noen av innstillingene dine endres."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Invitasjoner"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Hjemmeserveren din støtter ikke dette alternativet i krypterte rom, og det kan hende at du ikke blir varslet i enkelte rom."</string>
   <string name="screen_notification_settings_mentions_section_title">"Omtaler"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Velg en annen lyd…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Du bruker for øyeblikket %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Meldingslyd"</string>
+  <string name="screen_notification_settings_message_sound_label">"Meldingslyd"</string>
   <string name="screen_notification_settings_mode_all">"Alle"</string>
   <string name="screen_notification_settings_mode_mentions">"Omtaler"</string>
   <string name="screen_notification_settings_notification_section_title">"Varsle meg om"</string>
   <string name="screen_notification_settings_room_mention_label">"Gi meg varsel på @room"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Egendefinert"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Tilpasset lyd…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Feil ved sletting av fil"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element-standard"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Feil ved import av fil"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Problem med å forhåndsavspille varsellyd"</string>
+  <string name="screen_notification_settings_sound_section_title">"Lyd"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Avvis feilmelding om varsellyd"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Problem med å angi varsellyd"</string>
+  <string name="screen_notification_settings_sound_silent">"Stille"</string>
+  <string name="screen_notification_settings_sound_system_default">"Systemstandard"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"For å motta varsler, vennligst endre %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"systeminnstillinger"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systemvarsler er slått av"</string>
   <string name="screen_notification_settings_title">"Varslinger"</string>
+  <string name="screen_settings_user_status_away">"Borte"</string>
+  <string name="screen_settings_user_status_be_right_back">"Er straks tilbake"</string>
+  <string name="screen_settings_user_status_custom">"Egendefinert…"</string>
+  <string name="screen_settings_user_status_custom_hint">"Egendefinert status…"</string>
+  <string name="screen_settings_user_status_focus_time">"Fokustid"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"I et møte"</string>
+  <string name="screen_settings_user_status_on_the_road">"På farten"</string>
+  <string name="screen_settings_user_status_placeholder">"Hva er statusen din?"</string>
+  <string name="theme_black">"Svart"</string>
+  <string name="theme_dark">"Mørk"</string>
+  <string name="theme_light">"Lys"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Push-historikk"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Feilsøk"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Feilsøk varsler"</string>
diff --git a/features/preferences/impl/src/main/res/values-nl/translations.xml b/features/preferences/impl/src/main/res/values-nl/translations.xml
index 28614965c5..c5c439a0c3 100644
--- a/features/preferences/impl/src/main/res/values-nl/translations.xml
+++ b/features/preferences/impl/src/main/res/values-nl/translations.xml
@@ -54,6 +54,9 @@ Als je doorgaat, kunnen sommige van je instellingen veranderen."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"systeeminstellingen"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systeemmeldingen uitgeschakeld"</string>
   <string name="screen_notification_settings_title">"Meldingen"</string>
+  <string name="theme_dark">"Donker"</string>
+  <string name="theme_light">"Licht"</string>
+  <string name="theme_system">"Systeem"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Problemen oplossen"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Problemen met meldingen oplossen"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-pl/translations.xml b/features/preferences/impl/src/main/res/values-pl/translations.xml
index 9e2c56e580..fb1750e056 100644
--- a/features/preferences/impl/src/main/res/values-pl/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pl/translations.xml
@@ -11,6 +11,15 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Ukryj awatary w prośbach o dołączenie do pokoju"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Ukryj podglądy multimediów na osi czasu"</string>
   <string name="screen_advanced_settings_labs">"Laboratoria"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Odległość, jaką należy pokonać, aby uruchomić aktualizację."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Upewnij się, że \"Dokładna lokalizacja\" jest włączona dla tej aplikacji. Aby zmienić to uprawnienie, przejdź do %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Ustawienia aplikacji"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Aktualizacje lokalizacji na żywo"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Co %1$d metr"</item>
+    <item quantity="few">"Co %1$d metry"</item>
+    <item quantity="many">"Co %1$d metrów"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Przesyłaj zdjęcia i filmy szybciej, zmniejszając zużycie danych"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optymalizuj jakość multimediów"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderacja i bezpieczeństwo"</string>
@@ -50,13 +59,14 @@
   <string name="screen_labs_header_title">"Chcesz poeksperymentować?"</string>
   <string name="screen_labs_title">"Laboratoria"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Dodatkowe ustawienia"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Dzwonek połączenia"</string>
   <string name="screen_notification_settings_calls_label">"Połączenia audio i wideo"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Niezgodność konfiguracji"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Uprościliśmy Ustawienia powiadomień, aby ułatwić nawigowanie między opcjami. Niektóre ustawienia, które wybrałeś mogły zniknąć, lecz są wciąż aktywne.
 
 Niektóre ustawienia mogą ulec zmianie, jeśli kontynuujesz."</string>
   <string name="screen_notification_settings_direct_chats">"Czaty prywatne"</string>
-  <string name="screen_notification_settings_edit_custom_settings_section_title">"Ustawienia własne wybranego czatu"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Własne ustawienia dla wybranego czatu"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Wystąpił błąd podczas aktualizacji ustawienia powiadomień."</string>
   <string name="screen_notification_settings_edit_mode_all_messages">"Wszystkie wiadomości"</string>
   <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Tylko wzmianki i słowa kluczowe"</string>
@@ -68,14 +78,42 @@ Niektóre ustawienia mogą ulec zmianie, jeśli kontynuujesz."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Zaproszenia"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Twój serwer domowy nie wspiera tej opcji w pokojach szyfrowanych, możesz nie otrzymać powiadomień z niektórych pokoi."</string>
   <string name="screen_notification_settings_mentions_section_title">"Wzmianki"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Wybierz inny dźwięk…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Aktualnie używany %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Dźwięk wiadomości"</string>
+  <string name="screen_notification_settings_message_sound_label">"Dźwięk wiadomości"</string>
   <string name="screen_notification_settings_mode_all">"Wszystkie"</string>
   <string name="screen_notification_settings_mode_mentions">"Wzmianki"</string>
   <string name="screen_notification_settings_notification_section_title">"Powiadamiaj mnie przez"</string>
   <string name="screen_notification_settings_room_mention_label">"Powiadom mnie na @pokój"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Własny"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Własny dźwięk…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Błąd usuwania pliku"</string>
+  <string name="screen_notification_settings_sound_element_default">"Domyślny Element"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element Fade"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Błąd importowania pliku"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Wystąpił błąd podczas podglądania dźwięku powiadomień"</string>
+  <string name="screen_notification_settings_sound_section_title">"Dźwięk"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Pomiń dźwięk błędu"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Nie udało się ustawić dźwięku powiadomień"</string>
+  <string name="screen_notification_settings_sound_silent">"Cichy"</string>
+  <string name="screen_notification_settings_sound_system_default">"Ustawienie domyślne"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Aby otrzymywać powiadomienia, zmień swoje%1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"ustawienia systemowe"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Powiadomienia systemowe wyłączone"</string>
   <string name="screen_notification_settings_title">"Powiadomienia"</string>
+  <string name="screen_settings_user_status_away">"Z dala od urządzenia"</string>
+  <string name="screen_settings_user_status_be_right_back">"Zaraz wracam"</string>
+  <string name="screen_settings_user_status_custom">"Własny"</string>
+  <string name="screen_settings_user_status_custom_hint">"Własny status…"</string>
+  <string name="screen_settings_user_status_focus_time">"Skupia się"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"Na spotkaniu"</string>
+  <string name="screen_settings_user_status_on_the_road">"W trasie"</string>
+  <string name="screen_settings_user_status_placeholder">"Jaki jest Twój status?"</string>
+  <string name="theme_black">"Czarny"</string>
+  <string name="theme_dark">"Ciemny"</string>
+  <string name="theme_light">"Jasny"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Historia powiadomień Push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Rozwiązywanie problemów"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Rozwiązywanie problemów powiadomień"</string>
diff --git a/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml b/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
index f6e1bc90ba..be354681f5 100644
--- a/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pt-rBR/translations.xml
@@ -76,6 +76,9 @@ Se você continuar, algumas de suas configurações poderão mudar."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"configurações do seu sistema"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Notificações do sistema desativadas"</string>
   <string name="screen_notification_settings_title">"Notificações"</string>
+  <string name="theme_dark">"Escuro"</string>
+  <string name="theme_light">"Claro"</string>
+  <string name="theme_system">"Sistema"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Histórico de push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Solução de problemas"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Solucionar problemas de notificações"</string>
diff --git a/features/preferences/impl/src/main/res/values-pt/translations.xml b/features/preferences/impl/src/main/res/values-pt/translations.xml
index ffd38b961f..0e27d58de5 100644
--- a/features/preferences/impl/src/main/res/values-pt/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pt/translations.xml
@@ -76,6 +76,9 @@ Se prosseguires, algumas delas podem ser alteradas."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"configurações do sistema"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Notificações do sistema desativadas"</string>
   <string name="screen_notification_settings_title">"Notificações"</string>
+  <string name="theme_dark">"Escuro"</string>
+  <string name="theme_light">"Claro"</string>
+  <string name="theme_system">"Sistema"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Histórico de push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Resolução de problemas"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Corrigir notificações"</string>
diff --git a/features/preferences/impl/src/main/res/values-ro/translations.xml b/features/preferences/impl/src/main/res/values-ro/translations.xml
index 6f8e41c5b9..69eddf05f5 100644
--- a/features/preferences/impl/src/main/res/values-ro/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ro/translations.xml
@@ -11,6 +11,15 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Ascundeți avatarele din invitațiile pentru camere"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Ascundeți previzualizările media în lista de mesaje"</string>
   <string name="screen_advanced_settings_labs">"Laboratoare"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Distanța pe care trebuie să o parcurgeți pentru a declanșa o actualizare."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Asigurați-vă că este activată opțiunea „Locație precisă” pentru această aplicație. Pentru a schimba permisiunea, accesați %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Setările aplicației"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Actualizări in timp real ale locației"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"La fiecare %1$d metru"</item>
+    <item quantity="few">"La fiecare %1$d metri"</item>
+    <item quantity="other">"La fiecare %1$d metri"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Încărcați fotografii și videoclipuri mai rapid și reduceți consumul de date"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimizați calitatea media"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderare și siguranță"</string>
@@ -78,6 +87,10 @@ Dacă continuați, unele dintre setările dumneavoastră pot fi modificate."</st
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"Setări de sistem"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Notificările de sistem sunt dezactivate"</string>
   <string name="screen_notification_settings_title">"Notificări"</string>
+  <string name="theme_black">"Negru"</string>
+  <string name="theme_dark">"Întunecat"</string>
+  <string name="theme_light">"Deschis"</string>
+  <string name="theme_system">"Sistem"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Istoricul notificărilor"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Depanare"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Depanați notificările"</string>
diff --git a/features/preferences/impl/src/main/res/values-ru/translations.xml b/features/preferences/impl/src/main/res/values-ru/translations.xml
index bf9d268b45..e81bd50021 100644
--- a/features/preferences/impl/src/main/res/values-ru/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ru/translations.xml
@@ -11,11 +11,20 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Скрывать аватары в приглашениях"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Скрывать предпросмотр медиа в истории сообщений"</string>
   <string name="screen_advanced_settings_labs">"Лаборатория"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Расстояние, которое нужно пройти, чтобы инициировать обновление."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Убедитесь, что для этого приложения включена функция «Точное местоположение». Чтобы изменить разрешение, перейдите на страницу %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Настройки приложения"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Обновления местоположения в режиме реального времени"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Каждый %1$d метр"</item>
+    <item quantity="few">"Каждые %1$d метра"</item>
+    <item quantity="many">"Каждые %1$d метров"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Загружайте фотографии и видео быстрее и сокращайте потребление трафика"</string>
   <string name="screen_advanced_settings_media_compression_title">"Оптимизировать качество мультимедиа"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Модерация и безопасность"</string>
-  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Автоматически оптимизируйте изображения для более быстрой загрузки и уменьшения размера файлов."</string>
-  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Оптимизируйте качество загрузки изображения"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Автоматически оптимизировать изображения для более быстрой загрузки и уменьшения размера файлов."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Оптимизировать качество загрузки изображений"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Нажмите здесь, чтобы изменить."</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Высокое (1080p)"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Низкое (480p)"</string>
@@ -25,15 +34,15 @@
   <string name="screen_advanced_settings_rich_text_editor_description">"Отключить редактор форматированного текста и включить Markdown."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Уведомления о прочтении"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Если этот параметр выключен, другие пользователи не будут видеть, прочитали ли вы сообщения. Вы по-прежнему будете видеть статус прочтения других пользователей."</string>
-  <string name="screen_advanced_settings_share_presence">"Поделиться присутствием"</string>
-  <string name="screen_advanced_settings_share_presence_description">"Если выключено, вы не будете видеть, кто печатает и читает сообщения, а также другие пользователи не будут знать, когда вы печатаете или читаете сообщения."</string>
+  <string name="screen_advanced_settings_share_presence">"Делиться присутствием"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Если выключено, Вы не будете видеть, кто печатает и читает сообщения, а также другие пользователи не будут знать, когда Вы печатаете или читаете сообщения."</string>
   <string name="screen_advanced_settings_show_media_timeline_always_hide">"Всегда скрывать"</string>
   <string name="screen_advanced_settings_show_media_timeline_always_show">"Всегда показывать"</string>
   <string name="screen_advanced_settings_show_media_timeline_private_rooms">"В приватных комнатах"</string>
   <string name="screen_advanced_settings_show_media_timeline_subtitle">"Скрытые медиа всегда можно просмотреть, нажав на них."</string>
   <string name="screen_advanced_settings_show_media_timeline_title">"Показать медиа в истории сообщений"</string>
   <string name="screen_advanced_settings_view_source_description">"Включить опцию просмотра источника сообщения в истории сообщений."</string>
-  <string name="screen_blocked_users_empty">"У вас нет заблокированных пользователей"</string>
+  <string name="screen_blocked_users_empty">"У Вас нет заблокированных пользователей"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Разблокировать"</string>
   <string name="screen_blocked_users_unblock_alert_description">"Вы снова сможете увидеть все сообщения."</string>
   <string name="screen_blocked_users_unblock_alert_title">"Разблокировать пользователя"</string>
@@ -44,17 +53,18 @@
   <string name="screen_edit_profile_error_title">"Невозможно обновить профиль"</string>
   <string name="screen_edit_profile_title">"Редактировать профиль"</string>
   <string name="screen_edit_profile_updating_details">"Обновление профиля…"</string>
-  <string name="screen_labs_enable_threads">"Включить ответы в ветке"</string>
+  <string name="screen_labs_enable_threads">"Включить ответы в обсуждениях"</string>
   <string name="screen_labs_enable_threads_description">"Приложение перезапустится, чтобы применить это изменение."</string>
   <string name="screen_labs_header_description">"Попробуйте функции в разработке. Эти функции ещё не завершены, они нестабильны и могут измениться."</string>
   <string name="screen_labs_header_title">"Хотите попробовать?"</string>
   <string name="screen_labs_title">"Лаборатория"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Дополнительные параметры"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Мелодия звонка"</string>
   <string name="screen_notification_settings_calls_label">"Аудио и видео звонки"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Несоответствие конфигурации"</string>
-  <string name="screen_notification_settings_configuration_mismatch_description">"Мы упростили настройки уведомлений, чтобы упростить поиск опций. Некоторые пользовательские настройки, выбранные вами ранее, не отображаются в данном меню, но они все еще активны. 
+  <string name="screen_notification_settings_configuration_mismatch_description">"Мы упростили настройки уведомлений, чтобы упростить поиск опций. Некоторые пользовательские настройки, выбранные вами ранее, не отображаются в данном меню, но они всё ещё активны. 
 
-Если вы продолжите, некоторые настройки могут быть изменены."</string>
+Если Вы продолжите, некоторые настройки могут быть изменены."</string>
   <string name="screen_notification_settings_direct_chats">"В личных чатах"</string>
   <string name="screen_notification_settings_edit_custom_settings_section_title">"Отдельные настройки для каждого чата"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Произошла ошибка при обновлении настройки уведомления."</string>
@@ -63,20 +73,40 @@
   <string name="screen_notification_settings_edit_screen_direct_section_header">"Уведомлять меня в личных чатах"</string>
   <string name="screen_notification_settings_edit_screen_group_section_header">"Уведомлять меня в групповых чатах"</string>
   <string name="screen_notification_settings_enable_notifications">"Включить уведомления на данном устройстве"</string>
-  <string name="screen_notification_settings_failed_fixing_configuration">"Конфигурация не была исправлена, попробуйте еще раз."</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Конфигурация не была исправлена, попробуйте ещё раз."</string>
   <string name="screen_notification_settings_group_chats">"В групповых чатах"</string>
   <string name="screen_notification_settings_invite_for_me_label">"Приглашения"</string>
-  <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш сервер не поддерживает эту опцию для зашифрованных комнат, вы можете не получать некоторые уведомления."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш сервер не поддерживает эту опцию для зашифрованных комнат, Вы можете не получать некоторые уведомления."</string>
   <string name="screen_notification_settings_mentions_section_title">"Упоминания"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Выбрать другой звук…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Сейчас используется %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Звук сообщения"</string>
+  <string name="screen_notification_settings_message_sound_label">"Звук сообщения"</string>
   <string name="screen_notification_settings_mode_all">"Все"</string>
   <string name="screen_notification_settings_mode_mentions">"Упоминания"</string>
   <string name="screen_notification_settings_notification_section_title">"Уведомлять меня"</string>
   <string name="screen_notification_settings_room_mention_label">"Уведомлять меня при упоминании @room"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Пользовательский"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Пользовательский звук…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Ошибка при удалении файла"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element по умолчанию"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element Fade"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Ошибка импорта файла"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Ошибка предварительного прослушиванием звука"</string>
+  <string name="screen_notification_settings_sound_section_title">"Звук"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Отклонить ошибку о звуке"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Проблема с настройкой звукового оповещения"</string>
+  <string name="screen_notification_settings_sound_silent">"Без звука"</string>
+  <string name="screen_notification_settings_sound_system_default">"Как в системе"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Чтобы получать уведомления, измените %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"системные настройки"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Системные уведомления выключены"</string>
   <string name="screen_notification_settings_title">"Уведомления"</string>
+  <string name="theme_black">"Черный"</string>
+  <string name="theme_dark">"Темная"</string>
+  <string name="theme_light">"Светлое"</string>
+  <string name="theme_system">"Системное"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"История уведомлений"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Устранение неполадок"</string>
-  <string name="troubleshoot_notifications_entry_point_title">"Уведомления об устранении неполадок"</string>
+  <string name="troubleshoot_notifications_entry_point_title">"Устранение неполадок с уведомлениями"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-sk/translations.xml b/features/preferences/impl/src/main/res/values-sk/translations.xml
index 9968c6d4cb..530fccd90b 100644
--- a/features/preferences/impl/src/main/res/values-sk/translations.xml
+++ b/features/preferences/impl/src/main/res/values-sk/translations.xml
@@ -78,6 +78,9 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</stri
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"nastavenia systému"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systémové oznámenia sú vypnuté"</string>
   <string name="screen_notification_settings_title">"Oznámenia"</string>
+  <string name="theme_dark">"Tmavý"</string>
+  <string name="theme_light">"Svetlý"</string>
+  <string name="theme_system">"Systém"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"História push oznámení"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Riešenie problémov"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Oznámenia riešení problémov"</string>
diff --git a/features/preferences/impl/src/main/res/values-sv/translations.xml b/features/preferences/impl/src/main/res/values-sv/translations.xml
index e25e36a44f..109000440f 100644
--- a/features/preferences/impl/src/main/res/values-sv/translations.xml
+++ b/features/preferences/impl/src/main/res/values-sv/translations.xml
@@ -70,6 +70,9 @@ Om du fortsätter kan vissa av dina inställningar ändras."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"systeminställningar"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Systemaviseringar avstängda"</string>
   <string name="screen_notification_settings_title">"Aviseringar"</string>
+  <string name="theme_dark">"Mörkt"</string>
+  <string name="theme_light">"Ljust"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Push-historik"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Felsök"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Felsök aviseringar"</string>
diff --git a/features/preferences/impl/src/main/res/values-tr/translations.xml b/features/preferences/impl/src/main/res/values-tr/translations.xml
index 0df8500fda..78e9018554 100644
--- a/features/preferences/impl/src/main/res/values-tr/translations.xml
+++ b/features/preferences/impl/src/main/res/values-tr/translations.xml
@@ -74,6 +74,9 @@ Devam ederseniz, bazı ayarlarınız değişebilir."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"si̇stem ayarları"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Sistem bildirimleri kapalı"</string>
   <string name="screen_notification_settings_title">"Bildirimler"</string>
+  <string name="theme_dark">"Koyu"</string>
+  <string name="theme_light">"Aydınlık"</string>
+  <string name="theme_system">"Sistem"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Sorun gider"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Sorun Giderme Bildirimleri"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-uk/translations.xml b/features/preferences/impl/src/main/res/values-uk/translations.xml
index d145724af8..db42d153aa 100644
--- a/features/preferences/impl/src/main/res/values-uk/translations.xml
+++ b/features/preferences/impl/src/main/res/values-uk/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="full_screen_intent_banner_message">"Щоб ніколи не пропустити важливий виклик, змініть налаштування, щоб увімкнути повноекранні сповіщення, коли телефон заблоковано."</string>
-  <string name="full_screen_intent_banner_title">"Покращуйте досвід дзвінків"</string>
+  <string name="full_screen_intent_banner_title">"Покращуйте якість викликів"</string>
   <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"Виберіть спосіб отримання сповіщень"</string>
   <string name="screen_advanced_settings_developer_mode">"Режим розробника"</string>
   <string name="screen_advanced_settings_developer_mode_description">"Увімкніть доступ до функцій і можливостей для розробників."</string>
@@ -10,9 +10,18 @@
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Неправильна URL-адреса. Переконайтеся, що ви вказали протокол (http/https) та правильну адресу."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Сховати аватари у запитах на запрошення до кімнат"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Сховати попередній перегляд медіа у стрічці"</string>
-  <string name="screen_advanced_settings_labs">"Лабораторії"</string>
-  <string name="screen_advanced_settings_media_compression_description">"Швидше завантажуйте фотографії та відео та зменшуйте використання даних"</string>
-  <string name="screen_advanced_settings_media_compression_title">"Оптимізуйте медіаякість"</string>
+  <string name="screen_advanced_settings_labs">"Лабораторія"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Відстань, яку потрібно пройти, щоб ініціювати оновлення."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Переконайтеся, що для цього застосунку ввімкнено функцію «Точна геолокація». Щоб змінити дозвіл, перейдіть на сторінку %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Налаштування застосунку"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Оновлення місцезнаходження в реальному часі"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Кожен %1$d метр"</item>
+    <item quantity="few">"Кожні %1$d метри"</item>
+    <item quantity="many">"Кожні %1$d метрів"</item>
+  </plurals>
+  <string name="screen_advanced_settings_media_compression_description">"Швидше завантаження світлин і відео та зменшення обсягу трафіку"</string>
+  <string name="screen_advanced_settings_media_compression_title">"Оптимізація якості медіа"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Модерування й безпека"</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Автоматична оптимізація зображень для швидшого вивантаження та зменшення розміру файлів."</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Оптимізація якості вивантажуваних зображень"</string>
@@ -25,14 +34,14 @@
   <string name="screen_advanced_settings_rich_text_editor_description">"Вимкніть редактор розширеного тексту, щоб вводити Markdown вручну."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Читати журнали"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Якщо вимкнено, ваші сповіщення про прочитання нікому не надсилатимуться. Ви все одно отримуватимете сповіщення про прочитання від інших користувачів."</string>
-  <string name="screen_advanced_settings_share_presence">"Поділіться присутністю"</string>
-  <string name="screen_advanced_settings_share_presence_description">"Якщо цей параметр вимкнено, ви не зможете надсилати й отримувати звіти про прочитання чи сповіщення про введення тексту."</string>
+  <string name="screen_advanced_settings_share_presence">"Ділитися присутністю"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Якщо вимкнути цю функцію, ви не зможете надсилати чи отримувати підтвердження прочитання або сповіщення про набір тексту."</string>
   <string name="screen_advanced_settings_show_media_timeline_always_hide">"Завжди ховати"</string>
   <string name="screen_advanced_settings_show_media_timeline_always_show">"Завжди показувати"</string>
   <string name="screen_advanced_settings_show_media_timeline_private_rooms">"У приватних кімнатах"</string>
   <string name="screen_advanced_settings_show_media_timeline_subtitle">"Сховані медіа завжди можна переглянути, натиснувши на нього"</string>
   <string name="screen_advanced_settings_show_media_timeline_title">"Показувати медіа у стрічці"</string>
-  <string name="screen_advanced_settings_view_source_description">"Увімкнути опцію для перегляду коду повідомлення в стрічці"</string>
+  <string name="screen_advanced_settings_view_source_description">"Увімкнення цього параметра уможливить перегляд джерела повідомлень зі стрічки."</string>
   <string name="screen_blocked_users_empty">"У вас немає заблокованих користувачів."</string>
   <string name="screen_blocked_users_unblock_alert_action">"Розблокувати"</string>
   <string name="screen_blocked_users_unblock_alert_description">"Ви знову зможете бачити всі повідомлення від них."</string>
@@ -46,11 +55,12 @@
   <string name="screen_edit_profile_updating_details">"Оновлення профілю…"</string>
   <string name="screen_labs_enable_threads">"Увімкнути відповіді в гілках"</string>
   <string name="screen_labs_enable_threads_description">"Застосунок перезапуститься, щоб застосувати цю зміну."</string>
-  <string name="screen_labs_header_description">"Випробуйте наші останні ідеї, що перебувають на стадії розробки. Ці функції ще не остаточні; вони можуть бути нестабільними та змінюватися."</string>
+  <string name="screen_labs_header_description">"Випробуйте найновіші ідеї наших розробників. Ці функції ще не завершені, вони можуть бути нестабільними та змінюватись."</string>
   <string name="screen_labs_header_title">"Хочете поекспериментувати?"</string>
-  <string name="screen_labs_title">"Лабораторії"</string>
+  <string name="screen_labs_title">"Лабораторія"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Додаткові налаштування"</string>
-  <string name="screen_notification_settings_calls_label">"Аудіо та відеодзвінки"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Мелодія виклику"</string>
+  <string name="screen_notification_settings_calls_label">"Аудіо та відеовиклики"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Невідповідність конфігурації"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Ми спростили налаштування сповіщень, щоб полегшити пошук параметрів. Деякі користувацькі налаштування, які ви вибрали раніше, тут не відображаються, але вони все ще активні.
 
@@ -68,14 +78,42 @@
   <string name="screen_notification_settings_invite_for_me_label">"Запрошення"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш домашній сервер не підтримує цю опцію в зашифрованих кімнатах, ви можете не отримати сповіщення в деяких кімнатах."</string>
   <string name="screen_notification_settings_mentions_section_title">"Згадки"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Обрати інший звук…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Наразі використовується %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Звук повідомлення"</string>
+  <string name="screen_notification_settings_message_sound_label">"Звук повідомлення"</string>
   <string name="screen_notification_settings_mode_all">"Усі"</string>
   <string name="screen_notification_settings_mode_mentions">"Згадки"</string>
   <string name="screen_notification_settings_notification_section_title">"Сповіщати мене про"</string>
   <string name="screen_notification_settings_room_mention_label">"Сповіщати про @room"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Власний"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Користувацький звук…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Помилка видалення файлу"</string>
+  <string name="screen_notification_settings_sound_element_default">"Типово Element"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Згасання Element"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Помилка імпорту файлу"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Проблема з попереднім прослуховуванням звуку сповіщення"</string>
+  <string name="screen_notification_settings_sound_section_title">"Звук"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Відхилити помилку звукового сповіщення"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Проблема налаштовування звуку сповіщення"</string>
+  <string name="screen_notification_settings_sound_silent">"Без звуку"</string>
+  <string name="screen_notification_settings_sound_system_default">"Як у системі"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Щоб отримувати сповіщення змініть свої %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"системні налаштування"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Системні сповіщення вимкнені"</string>
   <string name="screen_notification_settings_title">"Сповіщення"</string>
+  <string name="screen_settings_user_status_away">"Не на місці"</string>
+  <string name="screen_settings_user_status_be_right_back">"Зараз повернуся"</string>
+  <string name="screen_settings_user_status_custom">"Власний…"</string>
+  <string name="screen_settings_user_status_custom_hint">"Власний статус…"</string>
+  <string name="screen_settings_user_status_focus_time">"Зосереджений(а)"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"На зустрічі"</string>
+  <string name="screen_settings_user_status_on_the_road">"У дорозі"</string>
+  <string name="screen_settings_user_status_placeholder">"Який у вас статус?"</string>
+  <string name="theme_black">"Темна"</string>
+  <string name="theme_dark">"Темна"</string>
+  <string name="theme_light">"Світла"</string>
+  <string name="theme_system">"Системна"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Історія push-сповіщень"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Усунення несправностей"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Усунення неполадок сповіщень"</string>
diff --git a/features/preferences/impl/src/main/res/values-ur/translations.xml b/features/preferences/impl/src/main/res/values-ur/translations.xml
index 470763e877..35b8f4aa4e 100644
--- a/features/preferences/impl/src/main/res/values-ur/translations.xml
+++ b/features/preferences/impl/src/main/res/values-ur/translations.xml
@@ -53,6 +53,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"نظام کی ترتیبات"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"نظام کی اطلاعات بند کر دی گئیں"</string>
   <string name="screen_notification_settings_title">"اطلاعات"</string>
+  <string name="theme_dark">"اندھیرا"</string>
+  <string name="theme_light">"روشنی"</string>
+  <string name="theme_system">"نظام"</string>
   <string name="troubleshoot_notifications_entry_point_section">"ازالہ کریں"</string>
   <string name="troubleshoot_notifications_entry_point_title">"اطلاعات کا ازالہ کریں"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-uz/translations.xml b/features/preferences/impl/src/main/res/values-uz/translations.xml
index 9c81fc3daa..fe241214ba 100644
--- a/features/preferences/impl/src/main/res/values-uz/translations.xml
+++ b/features/preferences/impl/src/main/res/values-uz/translations.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Xonaga taklif so‘rovlarida avatarlarni berkitish"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Vaqt jadvalida mediaga razm solishlarni berkitish"</string>
   <string name="screen_advanced_settings_labs">"Laboratoriyalar"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"Yangilanishni ishga tushirish uchun harakat qilishingiz kerak boʻlgan masofa"</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Ushbu ilova uchun “Aniq joylashuv” yoqilganligiga ishonch hosil qiling. Ruxsatni oʻzgartirish uchun %1$s ga oʻting."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"Ilova sozlamalari"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Jonli joylashuv yangilanishlari"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Har %1$d metr"</item>
+    <item quantity="other">"Har %1$d metr"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Rasm va videolarni tezroq yuklang va trafik sarfini kamaytiring"</string>
   <string name="screen_advanced_settings_media_compression_title">"Media sifatini yaxshilash"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderatsiya va xavfsizlik"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Tajribani his qilyapsizmi?"</string>
   <string name="screen_labs_title">"Laboratoriyalar"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Qo\'shimcha sozlamalar"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Qoʻngʻroq ohangi"</string>
   <string name="screen_notification_settings_calls_label">"Audio va video qo\'ng\'iroqlar"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Konfiguratsiya mos kelmasligi"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"Variantlarni topishni osonlashtirish uchun bildirishnomalar sozlamalarini soddalashtirdik. Ilgari siz tanlagan baʼzi shaxsiy sozlamalar bu yerda koʻrsatilmaydi, lekin ular hali ham faol. 
@@ -68,14 +77,34 @@ Davom ettirsangiz, baʼzi sozlamalaringiz oʻzgarishi mumkin."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Taklifnomalar"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Uy serveringiz shifrlangan xonalarda ushbu imkoniyatni qoʻllab-quvvatlamaydi, shuning uchun baʼzi xonalardagi xabarlarni olmasligingiz mumkin."</string>
   <string name="screen_notification_settings_mentions_section_title">"Eslatmalar"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Boshqa tovushni tanlang…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Hozir foydalanilmoqda: %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Xabar ovozi"</string>
+  <string name="screen_notification_settings_message_sound_label">"Xabar ovozi"</string>
   <string name="screen_notification_settings_mode_all">"Hammasi"</string>
   <string name="screen_notification_settings_mode_mentions">"Eslatmalar"</string>
   <string name="screen_notification_settings_notification_section_title">"Menga xabar bering"</string>
   <string name="screen_notification_settings_room_mention_label">"Menga @room orqali xabar bering"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Maxsus"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Maxsus ovoz…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Faylni oʻchirishda xatolik yuz berdi"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element standarti"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Elementlarning yoʻqolishi"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Faylni import qilishda xatolik yuz berdi"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Ogohlantirish ovozini oldindan koʻrishda muammo"</string>
+  <string name="screen_notification_settings_sound_section_title">"Ovoz"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Ogohlantirish ovozi xatosini yopish"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Ogohlantirish ovozini sozlashda muammo"</string>
+  <string name="screen_notification_settings_sound_silent">"Ovozsiz"</string>
+  <string name="screen_notification_settings_sound_system_default">"Tizim standarti"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"Bildirishnomalarni olish uchun, iltimos, o\'zingizni %1$singizni o\'zgartiring."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"tizim sozlamalari"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Tizim bildirishnomalari o\'chirilgan"</string>
   <string name="screen_notification_settings_title">"Bildirishnomalar"</string>
+  <string name="theme_black">"Qora"</string>
+  <string name="theme_dark">"Tungi"</string>
+  <string name="theme_light">"Nur"</string>
+  <string name="theme_system">"Tizim"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Bildirishnoma tarixi"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Muammolarni bartaraf etish"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Bildirishnomalar bilan bog‘liq muammolarni bartaraf etish"</string>
diff --git a/features/preferences/impl/src/main/res/values-vi/translations.xml b/features/preferences/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..9889b1697a
--- /dev/null
+++ b/features/preferences/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="full_screen_intent_banner_message">"Để đảm bảo bạn không bỏ lỡ bất kỳ cuộc gọi quan trọng nào, vui lòng thay đổi cài đặt để cho phép thông báo toàn màn hình khi điện thoại của bạn bị khóa."</string>
+  <string name="full_screen_intent_banner_title">"Nâng cao trải nghiệm cuộc gọi của bạn"</string>
+  <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"Chọn cách nhận thông báo"</string>
+  <string name="screen_advanced_settings_developer_mode">"Chế độ nhà phát triển"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"Cho phép truy cập vào các tính năng và chức năng dành cho nhà phát triển."</string>
+  <string name="screen_advanced_settings_element_call_base_url">"Địa chỉ tùy chỉnh máy chủ cuộc gọi Element"</string>
+  <string name="screen_advanced_settings_element_call_base_url_description">"Đặt địa chỉ máy chủ cuộc gọi tùy chỉnh cho Element."</string>
+  <string name="screen_advanced_settings_element_call_base_url_validation_error">"Địa chỉ URL không hợp lệ. Hãy kiểm tra lại giao thức (http/https) và địa chỉ chính xác."</string>
+  <string name="screen_advanced_settings_labs">"Labs"</string>
+  <string name="screen_advanced_settings_media_compression_description">"Tải ảnh và video nhanh hơn và giảm mức sử dụng dữ liệu."</string>
+  <string name="screen_advanced_settings_media_compression_title">"Tối ưu hóa chất lượng media"</string>
+  <string name="screen_advanced_settings_push_provider_android">"Nhà cung cấp dịch vụ thông báo"</string>
+  <string name="screen_advanced_settings_rich_text_editor_description">"Tắt trình soạn thảo văn bản nâng cao để nhập Markdown thủ công."</string>
+  <string name="screen_advanced_settings_send_read_receipts">"Thông báo đã đọc"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"Nếu tắt, thông báo đã đọc của bạn sẽ không được gửi cho ai. Bạn vẫn sẽ nhận được thông báo đã đọc từ người khác."</string>
+  <string name="screen_advanced_settings_share_presence">"Chia sẻ trạng thái"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Nếu tắt, bạn sẽ không thể gửi hoặc nhận thông báo đã đọc và thông báo \"đang nhập…\"."</string>
+  <string name="screen_advanced_settings_view_source_description">"Bật tùy chọn xem nguồn tin nhắn trong dòng thời gian."</string>
+  <string name="screen_blocked_users_empty">"Bạn chưa chặn ai cả"</string>
+  <string name="screen_blocked_users_unblock_alert_action">"Bỏ chặn"</string>
+  <string name="screen_blocked_users_unblock_alert_description">"Bạn sẽ có thể xem lại tất cả tin nhắn từ họ."</string>
+  <string name="screen_blocked_users_unblock_alert_title">"Bỏ chặn người dùng"</string>
+  <string name="screen_blocked_users_unblocking">"Đang mở khóa…"</string>
+  <string name="screen_edit_profile_display_name">"Tên hiển thị"</string>
+  <string name="screen_edit_profile_display_name_placeholder">"Tên hiển thị của bạn"</string>
+  <string name="screen_edit_profile_error">"Có lỗi không xác định, thông tin không được cập nhật."</string>
+  <string name="screen_edit_profile_error_title">"Không thể cập nhật hồ sơ"</string>
+  <string name="screen_edit_profile_title">"Chỉnh sửa hồ sơ"</string>
+  <string name="screen_edit_profile_updating_details">"Đang cập nhật hồ sơ…"</string>
+  <string name="screen_labs_enable_threads">"Cho phép trả lời theo chủ đề"</string>
+  <string name="screen_labs_enable_threads_description">"Ứng dụng sẽ khởi động lại để áp dụng thay đổi này."</string>
+  <string name="screen_labs_header_description">"Hãy thử các ý tưởng mới nhất đang được phát triển. Các tính năng này chưa hoàn thiện; có thể không ổn định và có thể thay đổi."</string>
+  <string name="screen_labs_header_title">"Bạn muốn thử tính năng thử nghiệm?"</string>
+  <string name="screen_labs_title">"Labs"</string>
+  <string name="screen_notification_settings_additional_settings_section_title">"Cài đặt bổ sung"</string>
+  <string name="screen_notification_settings_calls_label">"Cuộc gọi âm thanh và video"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Cấu hình không khớp"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Chúng tôi đã đơn giản hóa Cài đặt Thông báo để các tùy chọn dễ tìm hơn. Một số cài đặt tùy chỉnh bạn đã chọn trước đây không hiển thị ở đây, nhưng vẫn đang hoạt động. 
+
+Nếu bạn tiếp tục, một số cài đặt của bạn có thể thay đổi."</string>
+  <string name="screen_notification_settings_direct_chats">"Trò chuyện trực tiếp"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Cài đặt tùy chỉnh cho từng cuộc trò chuyện"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Đã xảy ra lỗi khi cập nhật cài đặt thông báo."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Tất cả tin nhắn."</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Chỉ đề cập và từ khóa"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"Trong chat riêng, nhắc tôi khi"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"Trong chat nhóm, nhắc tôi khi"</string>
+  <string name="screen_notification_settings_enable_notifications">"Bật thông báo trên thiết bị này"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Cấu hình chưa đúng, hãy thử lại."</string>
+  <string name="screen_notification_settings_group_chats">"Trò chuyện nhóm"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Lời mời"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Máy chủ không hỗ trợ tùy chọn này trong phòng mã hóa, một số phòng có thể không thông báo."</string>
+  <string name="screen_notification_settings_mentions_section_title">"Nhắc đến"</string>
+  <string name="screen_notification_settings_mode_all">"Tất cả"</string>
+  <string name="screen_notification_settings_mode_mentions">"Nhắc đến"</string>
+  <string name="screen_notification_settings_notification_section_title">"Thông báo cho tôi khi"</string>
+  <string name="screen_notification_settings_room_mention_label">"Thông báo cho tôi khi @room"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Để nhận thông báo, vui lòng thay đổi %1$s của bạn."</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"cài đặt hệ thống"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"Thông báo hệ thống đã tắt"</string>
+  <string name="screen_notification_settings_title">"Thông báo"</string>
+  <string name="theme_dark">"Tối"</string>
+  <string name="theme_light">"Sáng"</string>
+  <string name="theme_system">"Hệ thống"</string>
+  <string name="troubleshoot_notifications_entry_point_section">"Khắc phục sự cố"</string>
+  <string name="troubleshoot_notifications_entry_point_title">"Khắc phục sự cố thông báo"</string>
+</resources>
diff --git a/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml b/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
index 634911100a..03892ce980 100644
--- a/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
@@ -76,6 +76,9 @@
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"系統設定"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"已關閉系統通知"</string>
   <string name="screen_notification_settings_title">"通知"</string>
+  <string name="theme_dark">"深色"</string>
+  <string name="theme_light">"淺色"</string>
+  <string name="theme_system">"系統"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"推播通知歷史紀錄"</string>
   <string name="troubleshoot_notifications_entry_point_section">"疑難排解"</string>
   <string name="troubleshoot_notifications_entry_point_title">"疑難排解通知"</string>
diff --git a/features/preferences/impl/src/main/res/values-zh/translations.xml b/features/preferences/impl/src/main/res/values-zh/translations.xml
index 0c576b58b6..5a6e75fdd6 100644
--- a/features/preferences/impl/src/main/res/values-zh/translations.xml
+++ b/features/preferences/impl/src/main/res/values-zh/translations.xml
@@ -1,25 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="full_screen_intent_banner_message">"为确保您不会错过重要来电，请更改设置以允许锁屏时的全屏通知。"</string>
+  <string name="full_screen_intent_banner_message">"为确保你不会错过重要来电，请更改设置以允许锁屏时的全屏通知。"</string>
   <string name="full_screen_intent_banner_title">"提升通话体验"</string>
   <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"选择如何接收通知"</string>
   <string name="screen_advanced_settings_developer_mode">"开发者模式"</string>
-  <string name="screen_advanced_settings_developer_mode_description">"允许开发人员访问特性和功能。"</string>
-  <string name="screen_advanced_settings_element_call_base_url">"自定义 Element Call URL"</string>
-  <string name="screen_advanced_settings_element_call_base_url_description">"为 Element 通话设置根 URL。"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"启用以访问适用于开发者的功能与特性。"</string>
+  <string name="screen_advanced_settings_element_call_base_url">"自定义 Element Call 基础 URL"</string>
+  <string name="screen_advanced_settings_element_call_base_url_description">"为 Element Call 设置基础 URL。"</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL 无效，请确保包含协议（http/https）和正确的地址。"</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"在房间邀请请求中隐藏头像"</string>
-  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"在时间轴中隐藏媒体预览"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"在时间线上隐藏媒体预览"</string>
   <string name="screen_advanced_settings_labs">"实验室"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"触发一次更新所需的移动距离。"</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"确保已为 app 启用“精确位置”。如需更改该权限请转到 %1$s。"</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"App 设置"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"实时位置更新"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="other">"每 %1$d 米"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"针对上传进行优化"</string>
-  <string name="screen_advanced_settings_media_compression_title">"媒体"</string>
-  <string name="screen_advanced_settings_moderation_and_safety_section_title">"内容审核与安全"</string>
+  <string name="screen_advanced_settings_media_compression_title">"优化媒体质量"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"尺度与安全"</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_description">"自动优化图像以实现更快的上传速度和更小的文件大小。"</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_title">"优化图片上传质量"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s。点击此处更改。"</string>
-  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"高 (1080p)"</string>
-  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"低画质 (480p)"</string>
-  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"标准 (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"高（1080p）"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"低（480p）"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"标准（720p）"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_title">"视频上传质量"</string>
   <string name="screen_advanced_settings_push_provider_android">"通知推送提供者"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"禁用富文本编辑器，手动输入 Markdown。"</string>
@@ -30,53 +37,82 @@
   <string name="screen_advanced_settings_show_media_timeline_always_hide">"始终隐藏"</string>
   <string name="screen_advanced_settings_show_media_timeline_always_show">"始终显示"</string>
   <string name="screen_advanced_settings_show_media_timeline_private_rooms">"在私人房间"</string>
-  <string name="screen_advanced_settings_show_media_timeline_subtitle">"随时可以通过点击隐藏的媒体来显示它"</string>
-  <string name="screen_advanced_settings_show_media_timeline_title">"在时间轴中显示媒体"</string>
-  <string name="screen_advanced_settings_view_source_description">"启用在时间轴中查看消息源码的选项。"</string>
-  <string name="screen_blocked_users_empty">"您没有屏蔽用户"</string>
-  <string name="screen_blocked_users_unblock_alert_action">"解封"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"点击隐藏的媒体即可将其恢复显示"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"在时间线上显示媒体"</string>
+  <string name="screen_advanced_settings_view_source_description">"启用在时间线上查看消息源码的选项。"</string>
+  <string name="screen_blocked_users_empty">"暂无已屏蔽的用户"</string>
+  <string name="screen_blocked_users_unblock_alert_action">"解除屏蔽"</string>
   <string name="screen_blocked_users_unblock_alert_description">"可以重新接收他们的消息。"</string>
-  <string name="screen_blocked_users_unblock_alert_title">"解封用户"</string>
-  <string name="screen_blocked_users_unblocking">"正在解除屏蔽……"</string>
+  <string name="screen_blocked_users_unblock_alert_title">"解除屏蔽用户"</string>
+  <string name="screen_blocked_users_unblocking">"正在解除屏蔽…"</string>
   <string name="screen_edit_profile_display_name">"显示名称"</string>
   <string name="screen_edit_profile_display_name_placeholder">"你的显示名称"</string>
   <string name="screen_edit_profile_error">"遇到未知错误，无法更改信息。"</string>
   <string name="screen_edit_profile_error_title">"无法更新个人资料"</string>
   <string name="screen_edit_profile_title">"编辑个人资料"</string>
-  <string name="screen_edit_profile_updating_details">"更新个人资料……"</string>
-  <string name="screen_labs_enable_threads">"启用主题回复"</string>
-  <string name="screen_labs_enable_threads_description">"应用将重启以应用此更改。"</string>
+  <string name="screen_edit_profile_updating_details">"正在更新个人资料…"</string>
+  <string name="screen_labs_enable_threads">"启用消息列中的回复"</string>
+  <string name="screen_labs_enable_threads_description">"App 将重启以应用此更改。"</string>
   <string name="screen_labs_header_description">"尝试我们最新的开发理念。这些功能尚未最终确定，可能不稳定，也可能会发生变化。"</string>
   <string name="screen_labs_header_title">"想尝试新功能？"</string>
   <string name="screen_labs_title">"实验室"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"更多设置"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"来电铃声"</string>
   <string name="screen_notification_settings_calls_label">"音视频通话"</string>
   <string name="screen_notification_settings_configuration_mismatch">"配置不匹配"</string>
-  <string name="screen_notification_settings_configuration_mismatch_description">"我们简化了通知设置，使选项更易于查找。您过去选择的某些自定义设置未在此处显示，但它们仍然有效。
+  <string name="screen_notification_settings_configuration_mismatch_description">"我们简化了通知设置，使选项更易于查找。你曾经选择的某些自定义设置未在此处显示，但它们仍然有效。
 
-如果继续，您的某些设置可能会更改。"</string>
+如果继续，你的某些设置可能会被更改。"</string>
   <string name="screen_notification_settings_direct_chats">"私聊"</string>
-  <string name="screen_notification_settings_edit_custom_settings_section_title">"各聊天室的独立设置"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"各房间单独的设置"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"更新通知设置时出错。"</string>
-  <string name="screen_notification_settings_edit_mode_all_messages">"全部消息"</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"所有消息"</string>
   <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"仅限提及和关键词"</string>
-  <string name="screen_notification_settings_edit_screen_direct_section_header">"在私聊中，请通知我："</string>
-  <string name="screen_notification_settings_edit_screen_group_section_header">"在群聊中，请通知我："</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"在私聊中通知我以下类型"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"在群聊中通知我以下类型"</string>
   <string name="screen_notification_settings_enable_notifications">"在此设备上启用通知"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"配置尚未更正，请重试。"</string>
   <string name="screen_notification_settings_group_chats">"群聊"</string>
   <string name="screen_notification_settings_invite_for_me_label">"邀请"</string>
-  <string name="screen_notification_settings_mentions_only_disclaimer">"服务器在加密聊天室中不支持此选项，因此在某些聊天室可能无法收到通知。"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"主服务器不支持在加密房间中的此选项，因此在某些房间你可能无法收到通知。"</string>
   <string name="screen_notification_settings_mentions_section_title">"提及"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"选择其它提示音…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"当前正在使用 %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"消息提示音"</string>
+  <string name="screen_notification_settings_message_sound_label">"消息提示音"</string>
   <string name="screen_notification_settings_mode_all">"全部"</string>
   <string name="screen_notification_settings_mode_mentions">"提及"</string>
-  <string name="screen_notification_settings_notification_section_title">"请通知我："</string>
-  <string name="screen_notification_settings_room_mention_label">@room 时通知我</string>
-  <string name="screen_notification_settings_system_notifications_action_required">"要接收通知，请更改您的 %1$s。"</string>
+  <string name="screen_notification_settings_notification_section_title">"通知我以下类型"</string>
+  <string name="screen_notification_settings_room_mention_label">"提及所有成员（@room）时通知我"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"自定义"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"自定义提示音…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"删除文件时出错"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element 默认"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element 淡入"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"导入文件时出错"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"预览提示音时出现问题"</string>
+  <string name="screen_notification_settings_sound_section_title">"提示音"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"忽略提示音错误"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"设置提示音时出现问题"</string>
+  <string name="screen_notification_settings_sound_silent">"静默"</string>
+  <string name="screen_notification_settings_sound_system_default">"系统默认"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"要接收通知，请更改 %1$s。"</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"系统设置"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"系统通知已关闭"</string>
   <string name="screen_notification_settings_title">"通知"</string>
-  <string name="troubleshoot_notifications_entry_point_push_history_title">"推送历史记录"</string>
+  <string name="screen_settings_user_status_away">"离开"</string>
+  <string name="screen_settings_user_status_be_right_back">"马上回来"</string>
+  <string name="screen_settings_user_status_custom">"自定义…"</string>
+  <string name="screen_settings_user_status_custom_hint">"自定义状态…"</string>
+  <string name="screen_settings_user_status_focus_time">"专注时间"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"正在开会"</string>
+  <string name="screen_settings_user_status_on_the_road">"在路上"</string>
+  <string name="screen_settings_user_status_placeholder">"你的当前状态？"</string>
+  <string name="theme_black">"纯黑"</string>
+  <string name="theme_dark">"深色"</string>
+  <string name="theme_light">"浅色"</string>
+  <string name="theme_system">"系统"</string>
+  <string name="troubleshoot_notifications_entry_point_push_history_title">"推送历史"</string>
   <string name="troubleshoot_notifications_entry_point_section">"排查问题"</string>
   <string name="troubleshoot_notifications_entry_point_title">"排查通知问题"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values/localazy.xml b/features/preferences/impl/src/main/res/values/localazy.xml
index 31ee676226..b4b97375b5 100644
--- a/features/preferences/impl/src/main/res/values/localazy.xml
+++ b/features/preferences/impl/src/main/res/values/localazy.xml
@@ -11,6 +11,14 @@
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Hide avatars in room invite requests"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Hide media previews in timeline"</string>
   <string name="screen_advanced_settings_labs">"Labs"</string>
+  <string name="screen_advanced_settings_live_location_section_description">"The distance you have to move to trigger an update."</string>
+  <string name="screen_advanced_settings_live_location_section_footer">"Make sure \"Precise Location” is enabled for this app. To change the permission go to %1$s."</string>
+  <string name="screen_advanced_settings_live_location_section_footer_link">"App Settings"</string>
+  <string name="screen_advanced_settings_live_location_section_title">"Live location updates"</string>
+  <plurals name="screen_advanced_settings_live_location_update_distance">
+    <item quantity="one">"Every %1$d meter"</item>
+    <item quantity="other">"Every %1$d meters"</item>
+  </plurals>
   <string name="screen_advanced_settings_media_compression_description">"Upload photos and videos faster and reduce data usage"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimise media quality"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderation and Safety"</string>
@@ -50,6 +58,7 @@
   <string name="screen_labs_header_title">"Feeling experimental?"</string>
   <string name="screen_labs_title">"Labs"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Additional settings"</string>
+  <string name="screen_notification_settings_call_ringtone_label">"Call ringtone"</string>
   <string name="screen_notification_settings_calls_label">"Audio and video calls"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Configuration mismatch"</string>
   <string name="screen_notification_settings_configuration_mismatch_description">"We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
@@ -59,7 +68,7 @@ If you proceed, some of your settings may change."</string>
   <string name="screen_notification_settings_edit_custom_settings_section_title">"Custom setting per chat"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"An error occurred while updating the notification setting."</string>
   <string name="screen_notification_settings_edit_mode_all_messages">"All messages"</string>
-  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Mentions and Keywords only"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Mentions and replies only"</string>
   <string name="screen_notification_settings_edit_screen_direct_section_header">"On direct chats, notify me for"</string>
   <string name="screen_notification_settings_edit_screen_group_section_header">"On group chats, notify me for"</string>
   <string name="screen_notification_settings_enable_notifications">"Enable notifications on this device"</string>
@@ -68,14 +77,42 @@ If you proceed, some of your settings may change."</string>
   <string name="screen_notification_settings_invite_for_me_label">"Invitations"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Your homeserver does not support this option in encrypted rooms, you may not get notified in some rooms."</string>
   <string name="screen_notification_settings_mentions_section_title">"Mentions"</string>
+  <string name="screen_notification_settings_message_sound_dialog_choose_other">"Choose another sound…"</string>
+  <string name="screen_notification_settings_message_sound_dialog_current_subtitle">"Currently using %1$s"</string>
+  <string name="screen_notification_settings_message_sound_dialog_title">"Message sound"</string>
+  <string name="screen_notification_settings_message_sound_label">"Message sound"</string>
   <string name="screen_notification_settings_mode_all">"All"</string>
   <string name="screen_notification_settings_mode_mentions">"Mentions"</string>
   <string name="screen_notification_settings_notification_section_title">"Notify me for"</string>
   <string name="screen_notification_settings_room_mention_label">"Notify me on @room"</string>
+  <string name="screen_notification_settings_sound_custom_fallback">"Custom"</string>
+  <string name="screen_notification_settings_sound_custom_sound_button_title">"Custom sound…"</string>
+  <string name="screen_notification_settings_sound_delete_sound_error_title">"Error deleting file"</string>
+  <string name="screen_notification_settings_sound_element_default">"Element Default"</string>
+  <string name="screen_notification_settings_sound_element_fade">"Element Fade"</string>
+  <string name="screen_notification_settings_sound_import_sound_error_title">"Error importing file"</string>
+  <string name="screen_notification_settings_sound_preview_sound_error_title">"Problem previewing alert sound"</string>
+  <string name="screen_notification_settings_sound_section_title">"Sound"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_dismiss_a11y">"Dismiss alert sound error"</string>
+  <string name="screen_notification_settings_sound_set_sound_error_title">"Problem setting alert sound"</string>
+  <string name="screen_notification_settings_sound_silent">"Silent"</string>
+  <string name="screen_notification_settings_sound_system_default">"System Default"</string>
   <string name="screen_notification_settings_system_notifications_action_required">"To receive notifications, please change your %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"system settings"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"System notifications turned off"</string>
   <string name="screen_notification_settings_title">"Notifications"</string>
+  <string name="screen_settings_user_status_away">"Away"</string>
+  <string name="screen_settings_user_status_be_right_back">"Be right back"</string>
+  <string name="screen_settings_user_status_custom">"Custom…"</string>
+  <string name="screen_settings_user_status_custom_hint">"Custom status…"</string>
+  <string name="screen_settings_user_status_focus_time">"Focus time"</string>
+  <string name="screen_settings_user_status_in_a_meeting">"In a meeting"</string>
+  <string name="screen_settings_user_status_on_the_road">"On the road"</string>
+  <string name="screen_settings_user_status_placeholder">"What\'s your status?"</string>
+  <string name="theme_black">"Black"</string>
+  <string name="theme_dark">"Dark"</string>
+  <string name="theme_light">"Light"</string>
+  <string name="theme_system">"System"</string>
   <string name="troubleshoot_notifications_entry_point_push_history_title">"Push history"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Troubleshoot"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Troubleshoot notifications"</string>
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutViewTest.kt
index 258e9855de..6d18bfeebf 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/about/AboutViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.about
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
@@ -19,51 +21,46 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class AboutViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class AboutViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes back callback`() {
+    fun `clicking on back invokes back callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setAboutView(
+            setAboutView(
                 anAboutState(),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on an item invokes the expected callback`() {
+    fun `clicking on an item invokes the expected callback`() = runAndroidComposeUiTest {
         val state = anAboutState()
         ensureCalledOnceWithParam(state.elementLegals.first()) { callback ->
-            rule.setAboutView(
+            setAboutView(
                 state,
                 onElementLegalClick = callback,
             )
-            rule.clickOn(state.elementLegals.first().titleRes)
+            clickOn(state.elementLegals.first().titleRes)
         }
     }
 
     @Test
-    fun `clicking on the open source licenses invokes the expected callback`() {
+    fun `clicking on the open source licenses invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setAboutView(
+            setAboutView(
                 anAboutState(),
                 onOpenSourceLicensesClick = callback,
             )
-            rule.clickOn(CommonStrings.common_open_source_licenses)
+            clickOn(CommonStrings.common_open_source_licenses)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAboutView(
+private fun AndroidComposeUiTest<ComponentActivity>.setAboutView(
     state: AboutState,
     onElementLegalClick: (ElementLegal) -> Unit = EnsureNeverCalledWithParam(),
     onOpenSourceLicensesClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenterTest.kt
index 942d549dab..25d7c01778 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsPresenterTest.kt
@@ -12,14 +12,17 @@ import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.compound.theme.Theme
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.tests.testutils.WarmUpRule
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -40,6 +43,9 @@ class AdvancedSettingsPresenterTest {
                 assertThat(isSharePresenceEnabled).isTrue()
                 assertThat(mediaOptimizationState).isNull()
                 assertThat(theme).isEqualTo(ThemeOption.System)
+                assertThat(availableThemeOptions).isEqualTo(
+                    listOf(ThemeOption.System, ThemeOption.Light, ThemeOption.Dark).toImmutableList()
+                )
                 assertThat(mediaPreviewConfigState.hideInviteAvatars).isFalse()
                 assertThat(mediaPreviewConfigState.timelineMediaPreviewValue).isEqualTo(MediaPreviewValue.On)
                 assertThat(mediaPreviewConfigState.setHideInviteAvatarsAction).isEqualTo(AsyncAction.Uninitialized)
@@ -204,6 +210,82 @@ class AdvancedSettingsPresenterTest {
         }
     }
 
+    @Test
+    fun `present - exposes live location minimum distance from app preferences`() = runTest {
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            liveLocationMinimumDistanceUpdate = 50,
+        )
+        val presenter = createAdvancedSettingsPresenter(appPreferencesStore = appPreferencesStore)
+
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+
+            with(awaitItem()) {
+                assertThat(liveLocationMinimumDistanceUpdate).isEqualTo(50)
+            }
+        }
+    }
+
+    @Test
+    fun `present - saving live location minimum distance updates app preferences`() = runTest {
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            liveLocationMinimumDistanceUpdate = 10,
+        )
+        val presenter = createAdvancedSettingsPresenter(appPreferencesStore = appPreferencesStore)
+
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+
+            with(awaitItem()) {
+                assertThat(liveLocationMinimumDistanceUpdate).isEqualTo(10)
+                eventSink(AdvancedSettingsEvents.SetLiveLocationMinimumDistanceUpdate(42))
+            }
+            with(awaitItem()) {
+                assertThat(liveLocationMinimumDistanceUpdate).isEqualTo(42)
+            }
+        }
+    }
+
+    @Test
+    fun `present - black theme option shown when feature flag enabled`() = runTest {
+        val presenter = createAdvancedSettingsPresenter(
+            featureFlagService = FakeFeatureFlagService().apply {
+                setFeatureEnabled(FeatureFlags.AllowBlackTheme, true)
+            }
+        )
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+
+            with(awaitItem()) {
+                assertThat(availableThemeOptions).contains(ThemeOption.Black)
+                assertThat(availableThemeOptions).isEqualTo(ThemeOption.entries.toImmutableList())
+            }
+        }
+    }
+
+    @Test
+    fun `present - stored black theme falls back to dark when feature flag disabled`() = runTest {
+        val appPreferencesStore = InMemoryAppPreferencesStore().apply {
+            setTheme(Theme.Black.name)
+        }
+        val presenter = createAdvancedSettingsPresenter(appPreferencesStore = appPreferencesStore)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+
+            with(awaitItem()) {
+                assertThat(theme).isEqualTo(ThemeOption.Dark)
+            }
+        }
+    }
+
     @Test
     fun `present - hide invite avatars`() = runTest {
         val mediaPreviewStore = FakeMediaPreviewConfigStateStore()
@@ -297,7 +379,7 @@ class AdvancedSettingsPresenterTest {
     }
 
     private fun CoroutineScope.createAdvancedSettingsPresenter(
-        appPreferencesStore: InMemoryAppPreferencesStore = InMemoryAppPreferencesStore(),
+        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
         sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(),
         mediaPreviewConfigStateStore: MediaPreviewConfigStateStore = FakeMediaPreviewConfigStateStore(),
         featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
index 36fd30983e..fa4ecfd829 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
@@ -6,13 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.advanced
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.features.preferences.impl.R
@@ -24,82 +27,103 @@ import io.element.android.services.analytics.compose.LocalAnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.assertNoNodeWithText
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.collections.immutable.toImmutableList
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class AdvancedSettingsViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class AdvancedSettingsViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setAdvancedSettingsView(
+            setAdvancedSettingsView(
                 state = aAdvancedSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on other theme emits the expected event`() {
+    fun `clicking on other theme emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.common_appearance)
-        rule.clickOn(CommonStrings.common_dark)
+        clickOn(CommonStrings.common_appearance)
+        clickOn(R.string.theme_dark)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetTheme(ThemeOption.Dark))
     }
 
     @Test
-    fun `clicking on View source emits the expected event`() {
+    fun `black theme is shown when available`() = runAndroidComposeUiTest {
+        setAdvancedSettingsView(
+            state = aAdvancedSettingsState(
+                availableThemeOptions = ThemeOption.entries.toImmutableList(),
+            ),
+        )
+        clickOn(CommonStrings.common_appearance)
+        run {
+            val text = activity!!.getString(R.string.theme_black)
+            onNodeWithText(text).assertExists()
+        }
+    }
+
+    @Test
+    fun `black theme is hidden when unavailable`() = runAndroidComposeUiTest {
+        setAdvancedSettingsView(
+            state = aAdvancedSettingsState(
+                availableThemeOptions = ThemeOption.entries.filterNot { it == ThemeOption.Black }.toImmutableList(),
+            ),
+        )
+        clickOn(CommonStrings.common_appearance)
+        assertNoNodeWithText(R.string.theme_black)
+    }
+
+    @Test
+    fun `clicking on View source emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_view_source)
+        clickOn(CommonStrings.action_view_source)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetDeveloperModeEnabled(true))
     }
 
     @Test
-    fun `clicking on Share presence emits the expected event`() {
+    fun `clicking on Share presence emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_share_presence)
+        clickOn(R.string.screen_advanced_settings_share_presence)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetSharePresenceEnabled(true))
     }
 
     @Test
-    fun `clicking on media to enable compression emits the expected event`() {
+    fun `clicking on media to enable compression emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
         val analyticsService = FakeAnalyticsService()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
             ),
             analyticsService = analyticsService
         )
-        rule.clickOn(R.string.screen_advanced_settings_media_compression_description)
+        clickOn(R.string.screen_advanced_settings_media_compression_description)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetCompressMedia(true))
         assertThat(analyticsService.capturedEvents).isEqualTo(
             listOf(
@@ -111,17 +135,17 @@ class AdvancedSettingsViewTest {
     }
 
     @Test
-    fun `clicking on media to disable compression emits the expected event`() {
+    fun `clicking on media to disable compression emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
         val analyticsService = FakeAnalyticsService()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 mediaOptimizationState = MediaOptimizationState.AllMedia(isEnabled = true),
                 eventSink = eventsRecorder,
             ),
             analyticsService = analyticsService
         )
-        rule.clickOn(R.string.screen_advanced_settings_media_compression_description)
+        clickOn(R.string.screen_advanced_settings_media_compression_description)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetCompressMedia(false))
         assertThat(analyticsService.capturedEvents).isEqualTo(
             listOf(
@@ -134,65 +158,65 @@ class AdvancedSettingsViewTest {
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `clicking on hide invite avatars emits the expected event`() {
+    fun `clicking on hide invite avatars emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 hideInviteAvatars = false
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_hide_invite_avatars_toggle_title)
+        clickOn(R.string.screen_advanced_settings_hide_invite_avatars_toggle_title)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetHideInviteAvatars(true))
     }
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `clicking on timeline media preview always hide emits the expected event`() {
+    fun `clicking on timeline media preview always hide emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 timelineMediaPreviewValue = MediaPreviewValue.On
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_show_media_timeline_always_hide)
+        clickOn(R.string.screen_advanced_settings_show_media_timeline_always_hide)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Off))
     }
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `clicking on timeline media preview private rooms emits the expected event`() {
+    fun `clicking on timeline media preview private rooms emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 timelineMediaPreviewValue = MediaPreviewValue.On
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_show_media_timeline_private_rooms)
+        clickOn(R.string.screen_advanced_settings_show_media_timeline_private_rooms)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.Private))
     }
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `clicking on timeline media preview always show emits the expected event`() {
+    fun `clicking on timeline media preview always show emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>()
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 timelineMediaPreviewValue = MediaPreviewValue.Off
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_show_media_timeline_always_show)
+        clickOn(R.string.screen_advanced_settings_show_media_timeline_always_show)
         eventsRecorder.assertSingle(AdvancedSettingsEvents.SetTimelineMediaPreviewValue(MediaPreviewValue.On))
     }
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `hide invite avatars toggle is disabled when action is loading`() {
+    fun `hide invite avatars toggle is disabled when action is loading`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>(expectEvents = false)
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 hideInviteAvatars = false,
@@ -200,14 +224,14 @@ class AdvancedSettingsViewTest {
             ),
         )
         // The toggle should be disabled, so clicking should not emit any events
-        rule.clickOn(R.string.screen_advanced_settings_hide_invite_avatars_toggle_title)
+        clickOn(R.string.screen_advanced_settings_hide_invite_avatars_toggle_title)
     }
 
     @Test
     @Config(qualifiers = "h1080dp")
-    fun `timeline media preview options are disabled when action is loading`() {
+    fun `timeline media preview options are disabled when action is loading`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AdvancedSettingsEvents>(expectEvents = false)
-        rule.setAdvancedSettingsView(
+        setAdvancedSettingsView(
             state = aAdvancedSettingsState(
                 eventSink = eventsRecorder,
                 timelineMediaPreviewValue = MediaPreviewValue.On,
@@ -215,15 +239,16 @@ class AdvancedSettingsViewTest {
             ),
         )
         // The options should be disabled, so clicking should not emit any events
-        rule.clickOn(R.string.screen_advanced_settings_show_media_timeline_always_hide)
-        rule.clickOn(R.string.screen_advanced_settings_show_media_timeline_private_rooms)
+        clickOn(R.string.screen_advanced_settings_show_media_timeline_always_hide)
+        clickOn(R.string.screen_advanced_settings_show_media_timeline_private_rooms)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAdvancedSettingsView(
+private fun AndroidComposeUiTest<ComponentActivity>.setAdvancedSettingsView(
     state: AdvancedSettingsState,
     analyticsService: AnalyticsService = FakeAnalyticsService(),
     onBackClick: () -> Unit = EnsureNeverCalled(),
+    onOpenAppSettings: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         CompositionLocalProvider(
@@ -232,6 +257,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAdvan
             AdvancedSettingsView(
                 state = state,
                 onBackClick = onBackClick,
+                onOpenAppSettingsClick = onOpenAppSettings
             )
         }
     }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
index b3549762ab..467ace4675 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.blockedusers
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
@@ -23,72 +25,66 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class BlockedUserViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class BlockedUserViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes back callback`() {
+    fun `clicking on back invokes back callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setBlockedUsersView(
+            setBlockedUsersView(
                 aBlockedUsersState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on a user emits the expected Event`() {
+    fun `clicking on a user emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>()
         val userList = aMatrixUserList()
-        rule.setBlockedUsersView(
+        setBlockedUsersView(
             aBlockedUsersState(
                 blockedUsers = userList,
                 eventSink = eventsRecorder
             ),
         )
-        rule.onNodeWithText(userList.first().displayName.orEmpty()).performClick()
+        onNodeWithText(userList.first().displayName.orEmpty()).performClick()
         eventsRecorder.assertSingle(BlockedUsersEvents.Unblock(userList.first().userId))
     }
 
     @Test
-    fun `clicking on cancel sends a BlockedUsersEvents`() {
+    fun `clicking on cancel sends a BlockedUsersEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>()
-        rule.setBlockedUsersView(
+        setBlockedUsersView(
             aBlockedUsersState(
                 unblockUserAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(BlockedUsersEvents.Cancel)
     }
 
     @Test
-    fun `clicking on confirm sends a BlockedUsersEvents`() {
+    fun `clicking on confirm sends a BlockedUsersEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>()
-        rule.setBlockedUsersView(
+        setBlockedUsersView(
             aBlockedUsersState(
                 unblockUserAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_blocked_users_unblock_alert_action)
+        clickOn(R.string.screen_blocked_users_unblock_alert_action)
         eventsRecorder.assertSingle(BlockedUsersEvents.ConfirmUnblock)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setBlockedUsersView(
+private fun AndroidComposeUiTest<ComponentActivity>.setBlockedUsersView(
     state: BlockedUsersState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt
index 1fcf9bff70..bb688f498d 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt
@@ -14,27 +14,21 @@ import androidx.compose.ui.graphics.Color
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.features.preferences.impl.developer.appsettings.anAppDeveloperSettingsState
 import io.element.android.features.preferences.impl.tasks.FakeClearCacheUseCase
 import io.element.android.features.preferences.impl.tasks.FakeComputeCacheSizeUseCase
+import io.element.android.features.preferences.impl.tasks.FakeMarkAllRoomsAsRead
 import io.element.android.features.preferences.impl.tasks.VacuumStoresUseCase
-import io.element.android.features.rageshake.api.preferences.aRageshakePreferencesState
 import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.data.megaBytes
-import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.core.meta.BuildType
-import io.element.android.libraries.featureflag.api.Feature
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeature
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.analytics.GetDatabaseSizesUseCase
 import io.element.android.libraries.matrix.api.analytics.SdkStoreSizes
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.test.A_DEVICE_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
-import io.element.android.libraries.matrix.test.core.aBuildMeta
-import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -51,17 +45,7 @@ class DeveloperSettingsPresenterTest {
 
     @Test
     fun `present - ensures initial states are correct`() = runTest {
-        val getAvailableFeaturesResult = lambdaRecorder<Boolean, Boolean, List<Feature>> { _, _ ->
-            listOf(
-                FakeFeature(
-                    key = "feature_1",
-                    title = "Feature 1",
-                    isInLabs = false,
-                )
-            )
-        }
         val presenter = createDeveloperSettingsPresenter(
-            featureFlagService = FakeFeatureFlagService(getAvailableFeaturesResult = getAvailableFeaturesResult),
             databaseSizesUseCase = GetDatabaseSizesUseCase {
                 Result.success(
                     SdkStoreSizes(stateStore = 10.megaBytes, eventCacheStore = 10.megaBytes, mediaStore = 10.megaBytes, cryptoStore = 10.megaBytes)
@@ -70,22 +54,15 @@ class DeveloperSettingsPresenterTest {
         )
         presenter.test {
             awaitItem().also { state ->
-                assertThat(state.features).isEmpty()
+                assertThat(state.appDeveloperSettingsState.features).isNotEmpty()
                 assertThat(state.clearCacheAction).isEqualTo(AsyncAction.Uninitialized)
                 assertThat(state.cacheSize).isEqualTo(AsyncData.Uninitialized)
-                assertThat(state.customElementCallBaseUrlState).isNotNull()
-                assertThat(state.customElementCallBaseUrlState.baseUrl).isNull()
-                assertThat(state.rageshakeState.isEnabled).isFalse()
-                assertThat(state.rageshakeState.isSupported).isTrue()
-                assertThat(state.rageshakeState.sensitivity).isEqualTo(0.3f)
-                assertThat(state.tracingLogLevel).isEqualTo(AsyncData.Uninitialized)
                 assertThat(state.isEnterpriseBuild).isFalse()
                 assertThat(state.showColorPicker).isFalse()
+                assertThat(state.deviceId).isEqualTo(A_DEVICE_ID)
             }
             awaitItem().also { state ->
-                assertThat(state.features).isNotEmpty()
-                assertThat(state.features).hasSize(1)
-                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.INFO)
+                assertThat(state.cacheSize.isLoading()).isTrue()
             }
             awaitItem().also { state ->
                 assertThat(state.cacheSize).isInstanceOf(AsyncData.Success::class.java)
@@ -98,37 +75,6 @@ class DeveloperSettingsPresenterTest {
                     )
                 )
             }
-            getAvailableFeaturesResult.assertions().isCalledOnce()
-                .with(value(false), value(false))
-        }
-    }
-
-    @Test
-    fun `present - ensures Room directory search is not present on release Google Play builds`() = runTest {
-        val buildMeta = aBuildMeta(buildType = BuildType.RELEASE, flavorDescription = "GooglePlay")
-        val presenter = createDeveloperSettingsPresenter(buildMeta = buildMeta)
-        presenter.test {
-            skipItems(2)
-            awaitItem().also { state ->
-                assertThat(state.features).doesNotContain(FeatureFlags.RoomDirectorySearch)
-            }
-        }
-    }
-
-    @Test
-    fun `present - ensures state is updated when enabled feature event is triggered`() = runTest {
-        val presenter = createDeveloperSettingsPresenter()
-        presenter.test {
-            skipItems(2)
-            awaitItem().also { state ->
-                val feature = state.features.first { !it.isEnabled }
-                state.eventSink(DeveloperSettingsEvents.UpdateEnabledFeature(feature, !feature.isEnabled))
-            }
-            awaitItem().also { state ->
-                val feature = state.features.first()
-                assertThat(feature.isEnabled).isTrue()
-                assertThat(feature.key).isEqualTo(feature.key)
-            }
         }
     }
 
@@ -158,52 +104,6 @@ class DeveloperSettingsPresenterTest {
         }
     }
 
-    @Test
-    fun `present - custom element call base url`() = runTest {
-        val preferencesStore = InMemoryAppPreferencesStore()
-        val presenter = createDeveloperSettingsPresenter(preferencesStore = preferencesStore)
-        presenter.test {
-            skipItems(2)
-            awaitItem().also { state ->
-                assertThat(state.customElementCallBaseUrlState.baseUrl).isNull()
-                state.eventSink(DeveloperSettingsEvents.SetCustomElementCallBaseUrl("https://call.element.ahoy"))
-            }
-            awaitItem().also { state ->
-                assertThat(state.customElementCallBaseUrlState.baseUrl).isEqualTo("https://call.element.ahoy")
-            }
-        }
-    }
-
-    @Test
-    fun `present - custom element call base url validator needs at least an HTTP scheme and host`() = runTest {
-        val presenter = createDeveloperSettingsPresenter()
-        presenter.test {
-            skipItems(2)
-            val urlValidator = awaitItem().customElementCallBaseUrlState.validator
-            assertThat(urlValidator("")).isTrue() // We allow empty string to clear the value and use the default one
-            assertThat(urlValidator("test")).isFalse()
-            assertThat(urlValidator("http://")).isFalse()
-            assertThat(urlValidator("geo://test")).isFalse()
-            assertThat(urlValidator("https://call.element.io")).isTrue()
-        }
-    }
-
-    @Test
-    fun `present - changing tracing log level`() = runTest {
-        val preferences = InMemoryAppPreferencesStore()
-        val presenter = createDeveloperSettingsPresenter(preferencesStore = preferences)
-        presenter.test {
-            skipItems(2)
-            awaitItem().also { state ->
-                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.INFO)
-                state.eventSink(DeveloperSettingsEvents.SetTracingLogLevel(LogLevelItem.TRACE))
-            }
-            awaitItem().also { state ->
-                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.TRACE)
-            }
-        }
-    }
-
     @Test
     fun `present - enterprise build can change the brand color`() = runTest {
         val overrideBrandColorResult = lambdaRecorder<SessionId?, String?, Unit> { _, _ -> }
@@ -231,6 +131,28 @@ class DeveloperSettingsPresenterTest {
         }
     }
 
+    @Test
+    fun `present - confirm mark all rooms as read`() = runTest {
+        val markAllRoomsAsRead = FakeMarkAllRoomsAsRead()
+        val presenter = createDeveloperSettingsPresenter(markAllRoomsAsRead = markAllRoomsAsRead)
+        presenter.test {
+            skipItems(2)
+            val initialState = awaitItem()
+            initialState.eventSink(DeveloperSettingsEvents.MarkAllRoomsAsRead(needsConfirmation = true))
+            val stateWithConfirmation = awaitItem()
+            assertThat(stateWithConfirmation.markAllRoomsAsReadAction.isConfirming()).isTrue()
+            stateWithConfirmation.eventSink(DeveloperSettingsEvents.MarkAllRoomsAsRead(needsConfirmation = false))
+            awaitItem().also { state ->
+                assertThat(state.markAllRoomsAsReadAction.isConfirming()).isFalse()
+                assertThat(state.markAllRoomsAsReadAction).isInstanceOf(AsyncAction.Loading::class.java)
+            }
+            awaitItem().also { state ->
+                assertThat(state.markAllRoomsAsReadAction).isInstanceOf(AsyncAction.Success::class.java)
+                assertThat(markAllRoomsAsRead.invokeCallCount).isEqualTo(1)
+            }
+        }
+    }
+
     @Test
     fun `present - VacuumStores action invokes the VacuumStoresUseCase`() = runTest {
         var vacuumCalled = false
@@ -250,37 +172,25 @@ class DeveloperSettingsPresenterTest {
 
     private fun createDeveloperSettingsPresenter(
         sessionId: SessionId = A_SESSION_ID,
-        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(
-            getAvailableFeaturesResult = { _, _ ->
-                listOf(
-                    FakeFeature(
-                        key = "feature_1",
-                        title = "Feature 1",
-                        isInLabs = false,
-                    )
-                )
-            }
-        ),
+        deviceId: DeviceId = A_DEVICE_ID,
         cacheSizeUseCase: FakeComputeCacheSizeUseCase = FakeComputeCacheSizeUseCase(),
         clearCacheUseCase: FakeClearCacheUseCase = FakeClearCacheUseCase(),
-        preferencesStore: InMemoryAppPreferencesStore = InMemoryAppPreferencesStore(),
-        buildMeta: BuildMeta = aBuildMeta(),
         enterpriseService: EnterpriseService = FakeEnterpriseService(),
         vacuumStoresUseCase: VacuumStoresUseCase = VacuumStoresUseCase {},
         databaseSizesUseCase: GetDatabaseSizesUseCase = GetDatabaseSizesUseCase { Result.success(SdkStoreSizes(null, null, null, null)) },
+        markAllRoomsAsRead: FakeMarkAllRoomsAsRead = FakeMarkAllRoomsAsRead(),
     ): DeveloperSettingsPresenter {
         return DeveloperSettingsPresenter(
+            appDeveloperSettingsPresenter = { anAppDeveloperSettingsState() },
             sessionId = sessionId,
-            featureFlagService = featureFlagService,
+            deviceId = deviceId,
             computeCacheSizeUseCase = cacheSizeUseCase,
             clearCacheUseCase = clearCacheUseCase,
-            rageshakePresenter = { aRageshakePreferencesState() },
-            appPreferencesStore = preferencesStore,
-            buildMeta = buildMeta,
             enterpriseService = enterpriseService,
             vacuumStoresUseCase = vacuumStoresUseCase,
             databaseSizesUseCase = databaseSizesUseCase,
             fileSizeFormatter = FakeFileSizeFormatter(),
+            markAllRoomsAsRead = markAllRoomsAsRead,
         )
     }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
index 3854e3f4a1..a16ad77d48 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
@@ -6,128 +6,87 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.developer
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.filterToOne
-import androidx.compose.ui.test.hasAnyAncestor
-import androidx.compose.ui.test.isDialog
-import androidx.compose.ui.test.isEditable
-import androidx.compose.ui.test.isFocusable
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.preferences.impl.R
-import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
-import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class DeveloperSettingsViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class DeveloperSettingsViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setDeveloperSettingsView(
+            setDeveloperSettingsView(
                 state = aDeveloperSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
-    @Config(qualifiers = "h1500dp")
+    @Config(qualifiers = "h2400dp")
     @Test
-    fun `clicking on push history notification invokes the expected callback`() {
+    fun `clicking on push history notification invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setDeveloperSettingsView(
+            setDeveloperSettingsView(
                 state = aDeveloperSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onPushHistoryClick = it
             )
-            rule.clickOn(R.string.troubleshoot_notifications_entry_point_push_history_title)
+            clickOn(R.string.troubleshoot_notifications_entry_point_push_history_title)
         }
     }
 
-    @Config(qualifiers = "h1500dp")
-    @Test
-    fun `clicking on element call url open the dialogs and submit emits the expected event`() {
-        val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>()
-        rule.setDeveloperSettingsView(
-            state = aDeveloperSettingsState(
-                eventSink = eventsRecorder
-            ),
-        )
-        rule.clickOn(R.string.screen_advanced_settings_element_call_base_url)
-        val textInputNode = rule.onAllNodes(isEditable().and(isFocusable())).filterToOne(hasAnyAncestor(isDialog()))
-        textInputNode.performTextInput("https://call.element.dev")
-        rule.clickOn(CommonStrings.action_ok)
-        eventsRecorder.assertSingle(DeveloperSettingsEvents.SetCustomElementCallBaseUrl("https://call.element.dev"))
-    }
-
     @Config(qualifiers = "h2000dp")
     @Test
-    fun `clicking on open showkase invokes the expected callback`() {
+    fun `clicking on open showkase invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setDeveloperSettingsView(
+            setDeveloperSettingsView(
                 state = aDeveloperSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onOpenShowkase = it
             )
-            rule.onNodeWithText("Open Showkase browser").performClick()
+            onNodeWithText("Open Showkase browser").performClick()
         }
     }
 
-    @Config(qualifiers = "h1024dp")
+    @Config(qualifiers = "h2400dp")
     @Test
-    fun `clicking on log level emits the expected event`() {
+    fun `clicking on clear cache emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>()
-        rule.setDeveloperSettingsView(
+        setDeveloperSettingsView(
             state = aDeveloperSettingsState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.onNodeWithText("Tracing log level").performClick()
-        rule.onNodeWithText("Debug").performClick()
-        eventsRecorder.assertSingle(DeveloperSettingsEvents.SetTracingLogLevel(LogLevelItem.DEBUG))
-    }
-
-    @Config(qualifiers = "h2200dp")
-    @Test
-    fun `clicking on clear cache emits the expected event`() {
-        val eventsRecorder = EventsRecorder<DeveloperSettingsEvents>()
-        rule.setDeveloperSettingsView(
-            state = aDeveloperSettingsState(
-                eventSink = eventsRecorder
-            ),
-        )
-        rule.onNodeWithText("Clear cache").performClick()
+        onNodeWithText("Clear cache").performScrollTo().performClick()
         eventsRecorder.assertSingle(DeveloperSettingsEvents.ClearCache)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setDeveloperSettingsView(
+private fun AndroidComposeUiTest<ComponentActivity>.setDeveloperSettingsView(
     state: DeveloperSettingsState,
     onOpenShowkase: () -> Unit = EnsureNeverCalled(),
     onPushHistoryClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPageTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPageTest.kt
new file mode 100644
index 0000000000..3500b96731
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPageTest.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.filterToOne
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.isDialog
+import androidx.compose.ui.test.isEditable
+import androidx.compose.ui.test.isFocusable
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.preferences.impl.R
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+import org.robolectric.annotation.Config
+
+class AppDeveloperSettingsPageTest : RobolectricTest() {
+    @Test
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AppDeveloperSettingsEvent>(expectEvents = false)
+        ensureCalledOnce {
+            setAppDeveloperSettingsView(
+                state = anAppDeveloperSettingsState(
+                    eventSink = eventsRecorder
+                ),
+                onBackClick = it
+            )
+            pressBack()
+        }
+    }
+
+    @Config(qualifiers = "h1500dp")
+    @Test
+    fun `clicking on element call url open the dialogs and submit emits the expected event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AppDeveloperSettingsEvent>()
+        setAppDeveloperSettingsView(
+            state = anAppDeveloperSettingsState(
+                eventSink = eventsRecorder
+            ),
+        )
+        clickOn(R.string.screen_advanced_settings_element_call_base_url)
+        val textInputNode = onAllNodes(isEditable().and(isFocusable())).filterToOne(hasAnyAncestor(isDialog()))
+        textInputNode.performTextInput("https://call.element.dev")
+        clickOn(CommonStrings.action_ok)
+        eventsRecorder.assertSingle(AppDeveloperSettingsEvent.SetCustomElementCallBaseUrl("https://call.element.dev"))
+    }
+
+    @Config(qualifiers = "h2000dp")
+    @Test
+    fun `clicking on open showkase invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AppDeveloperSettingsEvent>(expectEvents = false)
+        ensureCalledOnce {
+            setAppDeveloperSettingsView(
+                state = anAppDeveloperSettingsState(
+                    eventSink = eventsRecorder
+                ),
+                onOpenShowkase = it
+            )
+            onNodeWithText("Open Showkase browser").performClick()
+        }
+    }
+
+    @Config(qualifiers = "h1024dp")
+    @Test
+    fun `clicking on log level emits the expected event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<AppDeveloperSettingsEvent>()
+        setAppDeveloperSettingsView(
+            state = anAppDeveloperSettingsState(
+                eventSink = eventsRecorder
+            ),
+        )
+        onNodeWithText("Tracing log level").performClick()
+        onNodeWithText("Debug").performClick()
+        eventsRecorder.assertSingle(AppDeveloperSettingsEvent.SetTracingLogLevel(LogLevelItem.DEBUG))
+    }
+}
+
+private fun AndroidComposeUiTest<ComponentActivity>.setAppDeveloperSettingsView(
+    state: AppDeveloperSettingsState,
+    onOpenShowkase: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        AppDeveloperSettingsPage(
+            state = state,
+            onOpenShowkase = onOpenShowkase,
+            onBackClick = onBackClick,
+        )
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenterTest.kt
new file mode 100644
index 0000000000..f4dad80e8b
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/appsettings/AppDeveloperSettingsPresenterTest.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.preferences.impl.developer.appsettings
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.preferences.impl.developer.tracing.LogLevelItem
+import io.element.android.features.rageshake.api.preferences.aRageshakePreferencesState
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.featureflag.api.Feature
+import io.element.android.libraries.featureflag.test.FakeFeature
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.test.core.aBuildMeta
+import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class AppDeveloperSettingsPresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - ensures initial states are correct`() = runTest {
+        val getAvailableFeaturesResult = lambdaRecorder<Boolean, Boolean, List<Feature>> { _, _ ->
+            listOf(
+                FakeFeature(
+                    key = "feature_1",
+                    title = "Feature 1",
+                    isInLabs = false,
+                )
+            )
+        }
+        val presenter = createAppDeveloperSettingsPresenter(
+            featureFlagService = FakeFeatureFlagService(getAvailableFeaturesResult = getAvailableFeaturesResult),
+        )
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.features).isEmpty()
+                assertThat(state.customElementCallBaseUrlState).isNotNull()
+                assertThat(state.customElementCallBaseUrlState.baseUrl).isNull()
+                assertThat(state.rageshakeState.isEnabled).isFalse()
+                assertThat(state.rageshakeState.isSupported).isTrue()
+                assertThat(state.rageshakeState.sensitivity).isEqualTo(0.3f)
+                assertThat(state.tracingLogLevel).isEqualTo(AsyncData.Uninitialized)
+                assertThat(state.gitBranch).isEqualTo("feature/awesome-feature")
+                assertThat(state.gitSha).isEqualTo("1234567890")
+            }
+            awaitItem().also { state ->
+                assertThat(state.features).isNotEmpty()
+                assertThat(state.features).hasSize(1)
+                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.INFO)
+            }
+            getAvailableFeaturesResult.assertions().isCalledOnce()
+                .with(value(false), value(false))
+        }
+    }
+
+    @Test
+    fun `present - ensures state is updated when enabled feature event is triggered`() = runTest {
+        val presenter = createAppDeveloperSettingsPresenter()
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                val feature = state.features.first { !it.isEnabled }
+                state.eventSink(AppDeveloperSettingsEvent.UpdateEnabledFeature(feature, !feature.isEnabled))
+            }
+            awaitItem().also { state ->
+                val feature = state.features.first()
+                assertThat(feature.isEnabled).isTrue()
+                assertThat(feature.key).isEqualTo(feature.key)
+            }
+        }
+    }
+
+    @Test
+    fun `present - custom element call base url`() = runTest {
+        val preferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createAppDeveloperSettingsPresenter(preferencesStore = preferencesStore)
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.customElementCallBaseUrlState.baseUrl).isNull()
+                state.eventSink(AppDeveloperSettingsEvent.SetCustomElementCallBaseUrl("https://call.element.ahoy"))
+            }
+            awaitItem().also { state ->
+                assertThat(state.customElementCallBaseUrlState.baseUrl).isEqualTo("https://call.element.ahoy")
+            }
+        }
+    }
+
+    @Test
+    fun `present - custom element call base url validator needs at least an HTTP scheme and host`() = runTest {
+        val presenter = createAppDeveloperSettingsPresenter()
+        presenter.test {
+            skipItems(1)
+            val urlValidator = awaitItem().customElementCallBaseUrlState.validator
+            assertThat(urlValidator("")).isTrue() // We allow empty string to clear the value and use the default one
+            assertThat(urlValidator("test")).isFalse()
+            assertThat(urlValidator("http://")).isFalse()
+            assertThat(urlValidator("geo://test")).isFalse()
+            assertThat(urlValidator("https://call.element.io")).isTrue()
+        }
+    }
+
+    @Test
+    fun `present - changing tracing log level`() = runTest {
+        val preferences = InMemoryAppPreferencesStore()
+        val presenter = createAppDeveloperSettingsPresenter(preferencesStore = preferences)
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.INFO)
+                state.eventSink(AppDeveloperSettingsEvent.SetTracingLogLevel(LogLevelItem.TRACE))
+            }
+            awaitItem().also { state ->
+                assertThat(state.tracingLogLevel.dataOrNull()).isEqualTo(LogLevelItem.TRACE)
+            }
+        }
+    }
+
+    private fun createAppDeveloperSettingsPresenter(
+        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(
+            getAvailableFeaturesResult = { _, _ ->
+                listOf(
+                    FakeFeature(
+                        key = "feature_1",
+                        title = "Feature 1",
+                        isInLabs = false,
+                    )
+                )
+            }
+        ),
+        preferencesStore: InMemoryAppPreferencesStore = InMemoryAppPreferencesStore(),
+    ): AppDeveloperSettingsPresenter {
+        return AppDeveloperSettingsPresenter(
+            featureFlagService = featureFlagService,
+            rageshakePresenter = { aRageshakePreferencesState() },
+            appPreferencesStore = preferencesStore,
+            buildMeta = aBuildMeta(
+                gitRevision = "1234567890",
+                gitBranchName = "feature/awesome-feature"
+            )
+        )
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt
index e03b65f0a9..509d00db25 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt
@@ -198,7 +198,7 @@ class EditDefaultNotificationSettingsPresenterTest {
     ): EditDefaultNotificationSettingPresenter {
         return EditDefaultNotificationSettingPresenter(
             notificationSettingsService = notificationSettingsService,
-            isOneToOne = false,
+            isDm = false,
             roomListService = roomListService,
         )
     }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTest.kt
index 9b36c477a4..29e4b1c40a 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsPresenterTest.kt
@@ -17,21 +17,35 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.libraries.push.api.PushService
+import io.element.android.libraries.push.api.notifications.NotificationSoundUpdater
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier
 import io.element.android.libraries.push.test.FakePushService
+import io.element.android.libraries.push.test.notifications.FakeNotificationSoundUpdater
+import io.element.android.libraries.push.test.notifications.FakeSoundDisplayNameResolver
+import io.element.android.libraries.push.test.notifications.sound.FakeNotificationSoundCopier
 import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.api.PushProvider
 import io.element.android.libraries.pushproviders.test.FakePushProvider
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStoreFactory
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import kotlin.time.Duration.Companion.milliseconds
 
+@Suppress("LargeClass")
 class NotificationSettingsPresenterTest {
     @Test
     fun `present - ensures initial state is correct`() = runTest {
@@ -61,8 +75,8 @@ class NotificationSettingsPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val presenter = createNotificationSettingsPresenter(notificationSettingsService)
         presenter.test {
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
-            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, isOneToOne = false, mode = RoomNotificationMode.ALL_MESSAGES)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = true, isDM = false, mode = RoomNotificationMode.ALL_MESSAGES)
+            notificationSettingsService.setDefaultRoomNotificationMode(isEncrypted = false, isDM = false, mode = RoomNotificationMode.ALL_MESSAGES)
             val updatedState = consumeItemsUntilPredicate {
                 (it.matrixSettings as? NotificationSettingsState.MatrixSettings.Valid)
                     ?.defaultGroupNotificationMode == RoomNotificationMode.ALL_MESSAGES
@@ -79,12 +93,12 @@ class NotificationSettingsPresenterTest {
         presenter.test {
             notificationSettingsService.setDefaultRoomNotificationMode(
                 isEncrypted = true,
-                isOneToOne = false,
+                isDM = false,
                 mode = RoomNotificationMode.ALL_MESSAGES
             )
             notificationSettingsService.setDefaultRoomNotificationMode(
                 isEncrypted = false,
-                isOneToOne = false,
+                isDM = false,
                 mode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY
             )
             val updatedState = consumeItemsUntilPredicate {
@@ -353,10 +367,756 @@ class NotificationSettingsPresenterTest {
         )
     }
 
+    @Test
+    fun `present - SetMessageSound atomically persists, increments version, and recreates channel`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val customSound = NotificationSound.Custom("content://media/internal/audio/media/42")
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initialState.messageSound.sound).isEqualTo(NotificationSound.SystemDefault)
+
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(customSound))
+
+            val updatedState = consumeItemsUntilPredicate { it.messageSound.sound == customSound }.last()
+            assertThat(updatedState.messageSound.sound).isEqualTo(customSound)
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSoundVersion).isEqualTo(1)
+            recreateRecorder.assertions().isCalledOnce().with(value(customSound), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SetCallRingtone with Silent atomically persists and recreates channel`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateRingingCallChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initialState.callRingtone.sound).isEqualTo(NotificationSound.SystemDefault)
+
+            initialState.eventSink(NotificationSettingsEvents.SetCallRingtone(NotificationSound.Silent))
+
+            val updatedState = consumeItemsUntilPredicate { it.callRingtone.sound == NotificationSound.Silent }.last()
+            assertThat(updatedState.callRingtone.sound).isEqualTo(NotificationSound.Silent)
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().callRingtoneVersion).isEqualTo(1)
+            recreateRecorder.assertions().isCalledOnce().with(value(NotificationSound.Silent), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - successive message sound changes increment version each time`() = runTest {
+        val versions = mutableListOf<Int>()
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, version -> versions += version },
+            ),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://a")))
+            consumeItemsUntilPredicate { it.messageSound.sound == NotificationSound.Custom("content://a") }
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://b")))
+            consumeItemsUntilPredicate { it.messageSound.sound == NotificationSound.Custom("content://b") }
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.SystemDefault))
+            consumeItemsUntilPredicate { it.messageSound.sound == NotificationSound.SystemDefault }
+
+            assertThat(versions).containsExactly(1, 2, 3).inOrder()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SetMessageSound with SystemDefault clears existing custom URI`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore(messageSound = NotificationSound.Custom("content://existing"))
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+        )
+        presenter.test {
+            consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.sound == NotificationSound.Custom("content://existing")
+            }.last().eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.SystemDefault))
+            consumeItemsUntilPredicate { it.messageSound.sound == NotificationSound.SystemDefault }
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSound).isEqualTo(NotificationSound.SystemDefault)
+            recreateRecorder.assertions().isCalledOnce().with(value(NotificationSound.SystemDefault), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SetMessageSound surfaces DataStore failure via changeNotificationSettingAction`() = runTest {
+        val backing = InMemoryAppPreferencesStore()
+        val store = object : AppPreferencesStore by backing {
+            override suspend fun setMessageSoundAndIncrementVersion(sound: NotificationSound, title: String?): Int {
+                error("Simulated DataStore failure")
+            }
+        }
+        val presenter = createNotificationSettingsPresenter(appPreferencesStore = store)
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://x")))
+
+            val errorState = consumeItemsUntilPredicate {
+                it.changeNotificationSettingAction.isFailure()
+            }.last()
+            assertThat(errorState.changeNotificationSettingAction.isFailure()).isTrue()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SystemDefault and Silent display names do not invoke the resolver`() = runTest {
+        val resolverCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(
+                messageSound = NotificationSound.SystemDefault,
+                callRingtone = NotificationSound.Silent,
+            ),
+            soundDisplayNameResolver = FakeSoundDisplayNameResolver(
+                resolveLambda = { uri ->
+                    resolverCalls += uri
+                    "Should not appear"
+                },
+            ),
+        )
+        presenter.test {
+            // The synchronous branches (SystemDefault / Silent) feed the label directly without
+            // routing through produceState — so the resolver is never invoked, and the label
+            // never flashes from the default to itself.
+            consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(resolverCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - ElementDefault and ElementFade display names do not invoke the resolver`() = runTest {
+        val resolverCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(
+                messageSound = NotificationSound.ElementFade,
+                callRingtone = NotificationSound.ElementDefault,
+            ),
+            soundDisplayNameResolver = FakeSoundDisplayNameResolver(
+                resolveLambda = { uri ->
+                    resolverCalls += uri
+                    "Should not appear"
+                },
+            ),
+        )
+        presenter.test {
+            consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(resolverCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - resolves Custom display name via SoundDisplayNameResolver`() = runTest {
+        val resolverCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(messageSound = NotificationSound.Custom("content://media/42")),
+            soundDisplayNameResolver = FakeSoundDisplayNameResolver(
+                resolveLambda = { uri ->
+                    resolverCalls += uri
+                    "Pixel notification"
+                },
+            ),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.displayName == "Pixel notification"
+            }.last()
+            assertThat(state.messageSound.displayName).isEqualTo("Pixel notification")
+            assertThat(resolverCalls).contains("content://media/42")
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - Custom display name falls back to localized Custom string when no persisted title and resolver returns null`() = runTest {
+        val resolverCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            // No persisted display name (legacy data path). Resolver returns null. Final fallback
+            // is the localised string resource (FakeStringProvider returns "A string" for any
+            // resource id) — never the default label, so the row is not mislabelled as "System default".
+            appPreferencesStore = InMemoryAppPreferencesStore(messageSound = NotificationSound.Custom("content://gone")),
+            soundDisplayNameResolver = FakeSoundDisplayNameResolver(
+                resolveLambda = { uri ->
+                    resolverCalls += uri
+                    null
+                },
+            ),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.sound is NotificationSound.Custom &&
+                    it.messageSound.displayName == "A string"
+            }.last()
+            assertThat(state.messageSound.displayName).isEqualTo("A string")
+            assertThat(resolverCalls).contains("content://gone")
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - persisted in-app pick takes precedence over channel read`() = runTest {
+        // When DataStore holds a real in-app pick, the channel read must not run. Persisted
+        // value is what the user explicitly chose; channel state is only a fallback.
+        var channelReadCalls = 0
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(
+                messageSound = NotificationSound.Custom("content://persisted"),
+                messageSoundDisplayName = "Persisted Tone",
+            ),
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                readNoisyChannelSoundLambda = {
+                    channelReadCalls++
+                    NotificationSound.Custom("content://channel/should-not-appear")
+                },
+            ),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.displayName == "Persisted Tone"
+            }.last()
+            assertThat(state.messageSound.sound).isEqualTo(NotificationSound.Custom("content://persisted"))
+            assertThat(channelReadCalls).isEqualTo(0)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - persisted display name takes precedence over live resolver probe`() = runTest {
+        val resolverCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(
+                messageSound = NotificationSound.Custom("content://media/42"),
+                messageSoundDisplayName = "Captured at copy time",
+            ),
+            soundDisplayNameResolver = FakeSoundDisplayNameResolver(
+                resolveLambda = { uri ->
+                    resolverCalls += uri
+                    "Live probe (should not appear)"
+                },
+            ),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.displayName == "Captured at copy time"
+            }.last()
+            assertThat(state.messageSound.displayName).isEqualTo("Captured at copy time")
+            // Live resolver must not be invoked when a persisted title is available.
+            assertThat(resolverCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - SetMessageSound with Custom copies via copier and persists the FileProvider URI`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+            notificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { _, _ ->
+                NotificationSoundCopier.CopyResult.Success(
+                    fileProviderUriString = "content://my.app.fileprovider/notification_sounds/message_sound.ogg",
+                    displayName = "Cool Tone",
+                )
+            }),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://media/source")))
+            advanceUntilIdle()
+
+            val expectedSound = NotificationSound.Custom("content://my.app.fileprovider/notification_sounds/message_sound.ogg")
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSound).isEqualTo(expectedSound)
+            assertThat(appPreferencesStore.getMessageSoundDisplayNameFlow().first()).isEqualTo("Cool Tone")
+            recreateRecorder.assertions().isCalledOnce().with(value(expectedSound), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SetMessageSound copy failure surfaces inline error and leaves prior choice intact`() = runTest {
+        val priorChoice = NotificationSound.Custom("content://prior")
+        val appPreferencesStore = InMemoryAppPreferencesStore(messageSound = priorChoice)
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { _, _ ->
+                NotificationSoundCopier.CopyResult.UnplayableSource
+            }),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://broken")))
+
+            val errorState = consumeItemsUntilPredicate { it.messageSound.copyError }.last()
+            assertThat(errorState.messageSound.copyError).isTrue()
+            // Persisted state is unchanged.
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSound).isEqualTo(priorChoice)
+
+            // Dismissing the inline error clears the flag without altering persistence.
+            errorState.eventSink(NotificationSettingsEvents.DismissMessageSoundCopyError)
+            val cleared = consumeItemsUntilPredicate { !it.messageSound.copyError }.last()
+            assertThat(cleared.messageSound.copyError).isFalse()
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSound).isEqualTo(priorChoice)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SetCallRingtone copy failure surfaces inline error and leaves prior choice intact`() = runTest {
+        val priorChoice = NotificationSound.Custom("content://prior")
+        val appPreferencesStore = InMemoryAppPreferencesStore(callRingtone = priorChoice)
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { _, _ ->
+                NotificationSoundCopier.CopyResult.UnplayableSource
+            }),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetCallRingtone(NotificationSound.Custom("content://broken")))
+
+            val errorState = consumeItemsUntilPredicate { it.callRingtone.copyError }.last()
+            assertThat(errorState.callRingtone.copyError).isTrue()
+            // Persisted state is unchanged.
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().callRingtone).isEqualTo(priorChoice)
+
+            // Dismissing the inline error clears the flag without altering persistence.
+            errorState.eventSink(NotificationSettingsEvents.DismissCallRingtoneCopyError)
+            val cleared = consumeItemsUntilPredicate { !it.callRingtone.copyError }.last()
+            assertThat(cleared.callRingtone.copyError).isFalse()
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().callRingtone).isEqualTo(priorChoice)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - SystemDefault and Silent picks bypass the copier`() = runTest {
+        val copierCalls = mutableListOf<String>()
+        val presenter = createNotificationSettingsPresenter(
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, _ -> },
+                recreateRingingCallChannelLambda = { _, _ -> },
+            ),
+            notificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { source, _ ->
+                copierCalls += source
+                NotificationSoundCopier.CopyResult.Success(source, "x")
+            }),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.SystemDefault))
+            initialState.eventSink(NotificationSettingsEvents.SetCallRingtone(NotificationSound.Silent))
+            advanceUntilIdle()
+            assertThat(copierCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - non-Custom picks delete the stored slot file`() = runTest {
+        val deleteCalls = mutableListOf<NotificationSoundCopier.SoundSlot>()
+        // Start from persisted Custom for both slots so the non-Custom picks below are real
+        // transitions (no-op short-circuit only fires when the new sound equals the persisted one).
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(
+                messageSound = NotificationSound.Custom("content://prior-message"),
+                callRingtone = NotificationSound.Custom("content://prior-call"),
+            ),
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, _ -> },
+                recreateRingingCallChannelLambda = { _, _ -> },
+            ),
+            notificationSoundCopier = FakeNotificationSoundCopier(
+                copyLambda = { _, _ -> NotificationSoundCopier.CopyResult.Failure(IllegalStateException("not expected")) },
+                deleteStoredSoundForLambda = { slot -> deleteCalls += slot },
+            ),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.SystemDefault))
+            initialState.eventSink(NotificationSettingsEvents.SetCallRingtone(NotificationSound.Silent))
+            advanceUntilIdle()
+            assertThat(deleteCalls).containsExactly(
+                NotificationSoundCopier.SoundSlot.Message,
+                NotificationSoundCopier.SoundSlot.Call,
+            )
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - re-selecting the persisted non-Custom sound is a no-op`() = runTest {
+        val recreateCalls = mutableListOf<Int>()
+        val deleteCalls = mutableListOf<NotificationSoundCopier.SoundSlot>()
+        val copierCalls = mutableListOf<String>()
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            messageSound = NotificationSound.ElementDefault,
+            messageSoundChannelVersion = 5,
+            callRingtone = NotificationSound.Silent,
+            callRingtoneChannelVersion = 3,
+        )
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundCopier = FakeNotificationSoundCopier(
+                copyLambda = { source, _ ->
+                    copierCalls += source
+                    NotificationSoundCopier.CopyResult.Success(source, "title")
+                },
+                deleteStoredSoundForLambda = { slot -> deleteCalls += slot },
+            ),
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, version -> recreateCalls += version },
+                recreateRingingCallChannelLambda = { _, version -> recreateCalls += version },
+            ),
+        )
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+
+            // Re-pick the persisted sound for both slots — neither should churn the channel,
+            // bump the version, or hit the copier / delete sweep.
+            initial.eventSink(NotificationSettingsEvents.SelectMessageSoundPreset(NotificationSound.ElementDefault))
+            initial.eventSink(NotificationSettingsEvents.SetCallRingtone(NotificationSound.Silent))
+            advanceUntilIdle()
+
+            val config = appPreferencesStore.getNotificationSoundChannelConfig()
+            assertThat(config.messageSoundVersion).isEqualTo(5)
+            assertThat(config.callRingtoneVersion).isEqualTo(3)
+            assertThat(recreateCalls).isEmpty()
+            assertThat(copierCalls).isEmpty()
+            assertThat(deleteCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - rapid back-to-back picks settle in deterministic order`() = runTest {
+        // Defends the persist+recreate window against rapid event firing (e.g. an accessibility
+        // service driving the dialog). The per-slot mutex in the presenter forces copy → persist
+        // → recreate to complete for the first pick before the second begins, so the recreated
+        // version sequence matches the persisted version sequence.
+        val recreatedVersions = mutableListOf<Int>()
+        val copyOrder = mutableListOf<String>()
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { source, _ ->
+                copyOrder += source
+                NotificationSoundCopier.CopyResult.Success(source, "title")
+            }),
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, version -> recreatedVersions += version },
+            ),
+        )
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initial.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://A")))
+            initial.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://B")))
+            advanceUntilIdle()
+
+            assertThat(copyOrder).containsExactly("content://A", "content://B").inOrder()
+            assertThat(recreatedVersions).containsExactly(1, 2).inOrder()
+            val config = appPreferencesStore.getNotificationSoundChannelConfig()
+            assertThat(config.messageSoundVersion).isEqualTo(2)
+            assertThat(config.messageSound).isEqualTo(NotificationSound.Custom("content://B"))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - Custom pick does not invoke deleteStoredSoundFor (copier sweeps inline)`() = runTest {
+        val deleteCalls = mutableListOf<NotificationSoundCopier.SoundSlot>()
+        val presenter = createNotificationSettingsPresenter(
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { _, _ -> },
+            ),
+            notificationSoundCopier = FakeNotificationSoundCopier(
+                copyLambda = { _, _ ->
+                    NotificationSoundCopier.CopyResult.Success(
+                        fileProviderUriString = "content://my.app.fileprovider/notification_sounds/message_sound.mp3",
+                        displayName = "New Tone",
+                    )
+                },
+                deleteStoredSoundForLambda = { slot -> deleteCalls += slot },
+            ),
+        )
+        presenter.test {
+            val initialState = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initialState.eventSink(NotificationSettingsEvents.SetMessageSound(NotificationSound.Custom("content://media/source")))
+            advanceUntilIdle()
+            assertThat(deleteCalls).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - ShowMessageSoundDialog and DismissMessageSoundDialog toggle dialog visibility`() = runTest {
+        val presenter = createNotificationSettingsPresenter()
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initial.showMessageSoundDialog).isFalse()
+
+            initial.eventSink(NotificationSettingsEvents.ShowMessageSoundDialog)
+            val shown = consumeItemsUntilPredicate { it.showMessageSoundDialog }.last()
+            assertThat(shown.showMessageSoundDialog).isTrue()
+
+            shown.eventSink(NotificationSettingsEvents.DismissMessageSoundDialog)
+            val hidden = consumeItemsUntilPredicate { !it.showMessageSoundDialog }.last()
+            assertThat(hidden.showMessageSoundDialog).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - SelectMessageSoundPreset persists ElementDefault, recreates the channel and closes the dialog`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore()
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateNoisyChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+        )
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            initial.eventSink(NotificationSettingsEvents.ShowMessageSoundDialog)
+            val shown = consumeItemsUntilPredicate { it.showMessageSoundDialog }.last()
+
+            shown.eventSink(NotificationSettingsEvents.SelectMessageSoundPreset(NotificationSound.ElementDefault))
+            advanceUntilIdle()
+            consumeItemsUntilPredicate {
+                !it.showMessageSoundDialog && it.messageSound.sound == NotificationSound.ElementDefault
+            }
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().messageSound)
+                .isEqualTo(NotificationSound.ElementDefault)
+            recreateRecorder.assertions().isCalledOnce().with(value(NotificationSound.ElementDefault), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - LaunchMessageSoundPicker increments the picker token and closes the dialog`() = runTest {
+        val presenter = createNotificationSettingsPresenter()
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initial.pendingMessageSoundPickerLaunch).isEqualTo(0)
+            initial.eventSink(NotificationSettingsEvents.ShowMessageSoundDialog)
+            val shown = consumeItemsUntilPredicate { it.showMessageSoundDialog }.last()
+
+            shown.eventSink(NotificationSettingsEvents.LaunchMessageSoundPicker)
+            val launched = consumeItemsUntilPredicate { it.pendingMessageSoundPickerLaunch == 1 }.last()
+            assertThat(launched.showMessageSoundDialog).isFalse()
+            assertThat(launched.pendingMessageSoundPickerLaunch).isEqualTo(1)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - ShowCallRingtoneDialog and DismissCallRingtoneDialog toggle dialog visibility`() = runTest {
+        val presenter = createNotificationSettingsPresenter()
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initial.showCallRingtoneDialog).isFalse()
+
+            initial.eventSink(NotificationSettingsEvents.ShowCallRingtoneDialog)
+            val shown = consumeItemsUntilPredicate { it.showCallRingtoneDialog }.last()
+            assertThat(shown.showCallRingtoneDialog).isTrue()
+
+            shown.eventSink(NotificationSettingsEvents.DismissCallRingtoneDialog)
+            val hidden = consumeItemsUntilPredicate { !it.showCallRingtoneDialog }.last()
+            assertThat(hidden.showCallRingtoneDialog).isFalse()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - SelectCallRingtonePreset persists SystemDefault, recreates the channel and closes the dialog`() = runTest {
+        val recreateRecorder = lambdaRecorder<NotificationSound, Int, Unit> { _, _ -> }
+        val appPreferencesStore = InMemoryAppPreferencesStore(callRingtone = NotificationSound.Silent)
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateRingingCallChannelLambda = { sound, version -> recreateRecorder(sound, version) },
+            ),
+        )
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.callRingtone.sound == NotificationSound.Silent
+            }.last()
+            initial.eventSink(NotificationSettingsEvents.ShowCallRingtoneDialog)
+            val shown = consumeItemsUntilPredicate { it.showCallRingtoneDialog }.last()
+
+            shown.eventSink(NotificationSettingsEvents.SelectCallRingtonePreset(NotificationSound.SystemDefault))
+            advanceUntilIdle()
+            consumeItemsUntilPredicate {
+                !it.showCallRingtoneDialog && it.callRingtone.sound == NotificationSound.SystemDefault
+            }
+            assertThat(appPreferencesStore.getNotificationSoundChannelConfig().callRingtone)
+                .isEqualTo(NotificationSound.SystemDefault)
+            recreateRecorder.assertions().isCalledOnce().with(value(NotificationSound.SystemDefault), value(1))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - LaunchCallRingtonePicker increments the picker token and closes the dialog`() = runTest {
+        val presenter = createNotificationSettingsPresenter()
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid
+            }.last()
+            assertThat(initial.pendingCallRingtonePickerLaunch).isEqualTo(0)
+            initial.eventSink(NotificationSettingsEvents.ShowCallRingtoneDialog)
+            val shown = consumeItemsUntilPredicate { it.showCallRingtoneDialog }.last()
+
+            shown.eventSink(NotificationSettingsEvents.LaunchCallRingtonePicker)
+            val launched = consumeItemsUntilPredicate { it.pendingCallRingtonePickerLaunch == 1 }.last()
+            assertThat(launched.showCallRingtoneDialog).isFalse()
+            assertThat(launched.pendingCallRingtonePickerLaunch).isEqualTo(1)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `present - SelectCallRingtonePreset clears legacy ringtone classification`() = runTest {
+        // Legacy state: persisted SystemDefault + channel version 0 means the presenter probes the
+        // channel and surfaces whatever Android system has. We seed that probe with Silent so the
+        // initial row reads Silent even though DataStore holds SystemDefault. A preset pick must
+        // null the legacy classifier; otherwise re-reading state would still resolve to Silent
+        // after the SystemDefault selection persists.
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            callRingtone = NotificationSound.SystemDefault,
+            callRingtoneChannelVersion = 0,
+        )
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = FakeNotificationSoundUpdater(
+                recreateRingingCallChannelLambda = { _, _ -> },
+                readRingingCallChannelSoundLambda = { NotificationSound.Silent },
+            ),
+        )
+        presenter.test {
+            val initial = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.callRingtone.sound == NotificationSound.Silent
+            }.last()
+            initial.eventSink(NotificationSettingsEvents.SelectCallRingtonePreset(NotificationSound.SystemDefault))
+            advanceUntilIdle()
+            val after = consumeItemsUntilPredicate {
+                it.callRingtone.sound == NotificationSound.SystemDefault
+            }.last()
+            assertThat(after.callRingtone.sound).isEqualTo(NotificationSound.SystemDefault)
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - persisted ElementDefault renders Element default label`() = runTest {
+        val presenter = createNotificationSettingsPresenter(
+            appPreferencesStore = InMemoryAppPreferencesStore(messageSound = NotificationSound.ElementDefault),
+        )
+        presenter.test {
+            val state = consumeItemsUntilPredicate {
+                it.matrixSettings is NotificationSettingsState.MatrixSettings.Valid &&
+                    it.messageSound.sound == NotificationSound.ElementDefault
+            }.last()
+            // FakeStringProvider returns "A string" for any resource, so this just verifies the
+            // ElementDefault branch is taken (vs falling through to the Custom resolver path).
+            assertThat(state.messageSound.displayName).isEqualTo("A string")
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
     private fun TestScope.createNotificationSettingsPresenter(
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
         pushService: PushService = FakePushService(),
         fullScreenIntentPermissionsStateLambda: () -> FullScreenIntentPermissionsState = { aFullScreenIntentPermissionsState() },
+        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
+        notificationSoundUpdater: NotificationSoundUpdater = FakeNotificationSoundUpdater(),
+        // Default copier passes the picked URI string straight through as the FileProvider URI
+        // and uses the URI string as the display name. Tests that exercise copy failures override.
+        notificationSoundCopier: NotificationSoundCopier = FakeNotificationSoundCopier(copyLambda = { source, _ ->
+            NotificationSoundCopier.CopyResult.Success(source, source)
+        }),
+        soundDisplayNameResolver: FakeSoundDisplayNameResolver = FakeSoundDisplayNameResolver(),
     ): NotificationSettingsPresenter {
         val matrixClient = FakeMatrixClient(notificationSettingsService = notificationSettingsService)
         return NotificationSettingsPresenter(
@@ -366,6 +1126,11 @@ class NotificationSettingsPresenterTest {
             pushService = pushService,
             systemNotificationsEnabledProvider = FakeSystemNotificationsEnabledProvider(),
             fullScreenIntentPermissionsPresenter = { fullScreenIntentPermissionsStateLambda() },
+            appPreferencesStore = appPreferencesStore,
+            notificationSoundUpdater = notificationSoundUpdater,
+            notificationSoundCopier = notificationSoundCopier,
+            soundDisplayNameResolver = soundDisplayNameResolver,
+            stringProvider = FakeStringProvider(),
             sessionCoroutineScope = backgroundScope,
         )
     }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
index ea140abbd7..57edf01a1d 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
@@ -6,14 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.notifications
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.preferences.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
@@ -25,76 +28,70 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class NotificationSettingsViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class NotificationSettingsViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
         ensureCalledOnce {
-            rule.setNotificationSettingsView(
+            setNotificationSettingsView(
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
         eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)
     }
 
-    @Config(qualifiers = "h1024dp")
+    @Config(qualifiers = "h1280dp")
     @Test
-    fun `clicking on troubleshoot notification invokes the expected callback`() {
+    fun `clicking on troubleshoot notification invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
         ensureCalledOnce {
-            rule.setNotificationSettingsView(
+            setNotificationSettingsView(
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onTroubleshootNotificationsClick = it
             )
-            rule.clickOn(R.string.troubleshoot_notifications_entry_point_title)
+            clickOn(R.string.troubleshoot_notifications_entry_point_title)
         }
         eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on group chats invokes the expected callback`() {
+    fun `clicking on group chats invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
         ensureCalledOnceWithParam(false) {
-            rule.setNotificationSettingsView(
+            setNotificationSettingsView(
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onOpenEditDefault = it
             )
-            rule.clickOn(R.string.screen_notification_settings_group_chats)
+            clickOn(R.string.screen_notification_settings_group_chats)
         }
         eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on direct chats invokes the expected callback`() {
+    fun `clicking on direct chats invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
         ensureCalledOnceWithParam(true) {
-            rule.setNotificationSettingsView(
+            setNotificationSettingsView(
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
                 onOpenEditDefault = it
             )
-            rule.clickOn(R.string.screen_notification_settings_direct_chats)
+            clickOn(R.string.screen_notification_settings_direct_chats)
         }
         eventsRecorder.assertSingle(NotificationSettingsEvents.RefreshSystemNotificationsEnabled)
     }
@@ -111,15 +108,15 @@ class NotificationSettingsViewTest {
         testNotificationToggle(false)
     }
 
-    private fun testNotificationToggle(initialState: Boolean) {
+    private fun testNotificationToggle(initialState: Boolean) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 appNotificationEnabled = initialState,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_notification_settings_enable_notifications)
+        clickOn(R.string.screen_notification_settings_enable_notifications)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -140,15 +137,15 @@ class NotificationSettingsViewTest {
         testAtRoomToggle(false)
     }
 
-    private fun testAtRoomToggle(initialState: Boolean) {
+    private fun testAtRoomToggle(initialState: Boolean) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 atRoomNotificationsEnabled = initialState,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_notification_settings_room_mention_label)
+        clickOn(R.string.screen_notification_settings_room_mention_label)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -169,15 +166,15 @@ class NotificationSettingsViewTest {
         testInvitationToggle(false)
     }
 
-    private fun testInvitationToggle(initialState: Boolean) {
+    private fun testInvitationToggle(initialState: Boolean) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 inviteForMeNotificationsEnabled = initialState,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_notification_settings_invite_for_me_label)
+        clickOn(R.string.screen_notification_settings_invite_for_me_label)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -188,15 +185,15 @@ class NotificationSettingsViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `with an error configuration, clicking on continue emits the expected events`() {
+    fun `with an error configuration, clicking on continue emits the expected events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 changeNotificationSettingAction = AsyncAction.Failure(AN_EXCEPTION),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -207,15 +204,15 @@ class NotificationSettingsViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `with invalid configuration, clicking on continue emits the expected events`() {
+    fun `with invalid configuration, clicking on continue emits the expected events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aInvalidNotificationSettingsState(
                 fixFailed = false,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -226,15 +223,15 @@ class NotificationSettingsViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `with invalid configuration and error, clicking on OK emits the expected events`() {
+    fun `with invalid configuration and error, clicking on OK emits the expected events`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aInvalidNotificationSettingsState(
                 fixFailed = true,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -243,16 +240,16 @@ class NotificationSettingsViewTest {
         )
     }
 
-    @Config(qualifiers = "h1024dp")
+    @Config(qualifiers = "h1280dp")
     @Test
-    fun `clicking on Push notification provider emits the expected event`() {
+    fun `clicking on Push notification provider emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_advanced_settings_push_provider_android)
+        clickOn(R.string.screen_advanced_settings_push_provider_android)
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -262,16 +259,16 @@ class NotificationSettingsViewTest {
     }
 
     @Test
-    fun `clicking on a push provider emits the expected event`() {
+    fun `clicking on a push provider emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
-        rule.setNotificationSettingsView(
+        setNotificationSettingsView(
             state = aValidNotificationSettingsState(
                 eventSink = eventsRecorder,
                 showChangePushProviderDialog = true,
                 availablePushDistributors = listOf(aDistributor("P1"), aDistributor("P2"))
             ),
         )
-        rule.onNodeWithText("P2").performClick()
+        onNodeWithText("P2").performClick()
         eventsRecorder.assertList(
             listOf(
                 NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
@@ -279,9 +276,46 @@ class NotificationSettingsViewTest {
             )
         )
     }
+
+    @Config(qualifiers = "h1280dp")
+    @Test
+    fun `sounds preference category renders rows with current display names`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
+        setNotificationSettingsView(
+            state = aValidNotificationSettingsState(
+                eventSink = eventsRecorder,
+                messageSoundDisplayName = "Pixel notification",
+                callRingtoneDisplayName = "Pixel ringtone",
+            ),
+        )
+        onNodeWithText("Sound").assertIsDisplayed()
+        onNodeWithText("Message sound").assertIsDisplayed()
+        onNodeWithText("Call ringtone").assertIsDisplayed()
+        onNodeWithText("Pixel notification").assertIsDisplayed()
+        onNodeWithText("Pixel ringtone").assertIsDisplayed()
+    }
+
+    @Config(qualifiers = "h1280dp")
+    @Test
+    fun `clicking the message sound row opens the preset dialog`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<NotificationSettingsEvents>()
+        setNotificationSettingsView(
+            state = aValidNotificationSettingsState(eventSink = eventsRecorder),
+        )
+        // The click now opens the in-app preset dialog instead of launching the system picker
+        // directly; the picker only fires from the dialog's "Choose another sound..." option
+        // (covered by Presenter tests + NotificationSoundPickerTest).
+        onNodeWithText("Message sound").performClick()
+        eventsRecorder.assertList(
+            listOf(
+                NotificationSettingsEvents.RefreshSystemNotificationsEnabled,
+                NotificationSettingsEvents.ShowMessageSoundDialog,
+            )
+        )
+    }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setNotificationSettingsView(
+private fun AndroidComposeUiTest<ComponentActivity>.setNotificationSettingsView(
     state: NotificationSettingsState,
     onOpenEditDefault: (isOneToOne: Boolean) -> Unit = EnsureNeverCalledWithParam(),
     onTroubleshootNotificationsClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPickerTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPickerTest.kt
new file mode 100644
index 0000000000..48f5a21eca
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundPickerTest.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.notifications
+
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import android.provider.Settings
+import androidx.core.net.toUri
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+
+class NotificationSoundPickerTest : RobolectricTest() {
+    @Test
+    fun `buildRingtonePickerIntent encodes SystemDefault as the system default URI`() {
+        val intent = buildRingtonePickerIntent(
+            type = RingtoneManager.TYPE_NOTIFICATION,
+            current = NotificationSound.SystemDefault,
+            defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI,
+        )
+        assertThat(intent.action).isEqualTo(RingtoneManager.ACTION_RINGTONE_PICKER)
+        assertThat(intent.getIntExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, -1)).isEqualTo(RingtoneManager.TYPE_NOTIFICATION)
+        assertThat(intent.getBooleanExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false)).isTrue()
+        assertThat(intent.getBooleanExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, false)).isTrue()
+        @Suppress("DEPRECATION")
+        val existing: Uri? = intent.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI)
+        assertThat(existing).isEqualTo(Settings.System.DEFAULT_NOTIFICATION_URI)
+    }
+
+    @Test
+    fun `buildRingtonePickerIntent encodes Silent as a null existing URI`() {
+        val intent = buildRingtonePickerIntent(
+            type = RingtoneManager.TYPE_RINGTONE,
+            current = NotificationSound.Silent,
+            defaultUri = Settings.System.DEFAULT_RINGTONE_URI,
+        )
+        @Suppress("DEPRECATION")
+        val existing: Uri? = intent.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI)
+        assertThat(existing).isNull()
+    }
+
+    @Test
+    fun `buildRingtonePickerIntent encodes Custom as the parsed URI`() {
+        val intent = buildRingtonePickerIntent(
+            type = RingtoneManager.TYPE_NOTIFICATION,
+            current = NotificationSound.Custom("content://media/internal/audio/media/42"),
+            defaultUri = Settings.System.DEFAULT_NOTIFICATION_URI,
+        )
+        @Suppress("DEPRECATION")
+        val existing: Uri? = intent.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI)
+        assertThat(existing).isEqualTo("content://media/internal/audio/media/42".toUri())
+    }
+
+    @Test
+    fun `toPickedNotificationSound maps null URI to Silent`() {
+        val result = Intent().apply {
+            putExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, null as Uri?)
+        }
+        assertThat(result.toPickedNotificationSound(Settings.System.DEFAULT_NOTIFICATION_URI))
+            .isEqualTo(NotificationSound.Silent)
+    }
+
+    @Test
+    fun `toPickedNotificationSound maps default URI to SystemDefault`() {
+        val result = Intent().apply {
+            putExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, Settings.System.DEFAULT_NOTIFICATION_URI)
+        }
+        assertThat(result.toPickedNotificationSound(Settings.System.DEFAULT_NOTIFICATION_URI))
+            .isEqualTo(NotificationSound.SystemDefault)
+    }
+
+    @Test
+    fun `toPickedNotificationSound maps any other URI to Custom`() {
+        val customUri = "content://media/internal/audio/media/42".toUri()
+        val result = Intent().apply {
+            putExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI, customUri)
+        }
+        assertThat(result.toPickedNotificationSound(Settings.System.DEFAULT_NOTIFICATION_URI))
+            .isEqualTo(NotificationSound.Custom(customUri.toString()))
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundStorageTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundStorageTest.kt
new file mode 100644
index 0000000000..7f8dba8226
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSoundStorageTest.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.notifications
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.preferences.api.store.NotificationSound.Companion.toStored
+import org.junit.Test
+
+class NotificationSoundStorageTest {
+    @Test
+    fun `fromStored - null maps to SystemDefault`() {
+        assertThat(NotificationSound.fromStored(null)).isEqualTo(NotificationSound.SystemDefault)
+    }
+
+    @Test
+    fun `fromStored - silent sentinel maps to Silent`() {
+        assertThat(NotificationSound.fromStored("silent")).isEqualTo(NotificationSound.Silent)
+    }
+
+    @Test
+    fun `fromStored - element_default sentinel maps to ElementDefault`() {
+        assertThat(NotificationSound.fromStored("element_default")).isEqualTo(NotificationSound.ElementDefault)
+    }
+
+    @Test
+    fun `fromStored - element_fade sentinel maps to ElementFade`() {
+        assertThat(NotificationSound.fromStored("element_fade")).isEqualTo(NotificationSound.ElementFade)
+    }
+
+    @Test
+    fun `fromStored - any other string is treated as a Custom URI`() {
+        assertThat(NotificationSound.fromStored("content://media/42"))
+            .isEqualTo(NotificationSound.Custom("content://media/42"))
+    }
+
+    @Test
+    fun `toStored - SystemDefault encodes as null`() {
+        assertThat(NotificationSound.SystemDefault.toStored()).isNull()
+    }
+
+    @Test
+    fun `toStored - ElementDefault encodes as element_default`() {
+        assertThat(NotificationSound.ElementDefault.toStored()).isEqualTo("element_default")
+    }
+
+    @Test
+    fun `toStored - ElementFade encodes as element_fade`() {
+        assertThat(NotificationSound.ElementFade.toStored()).isEqualTo("element_fade")
+    }
+
+    @Test
+    fun `toStored - Silent encodes as silent`() {
+        assertThat(NotificationSound.Silent.toStored()).isEqualTo("silent")
+    }
+
+    @Test
+    fun `toStored - Custom encodes as the URI string`() {
+        assertThat(NotificationSound.Custom("content://x").toStored()).isEqualTo("content://x")
+    }
+
+    @Test
+    fun `round-trip preserves every variant`() {
+        val variants = listOf(
+            NotificationSound.SystemDefault,
+            NotificationSound.ElementDefault,
+            NotificationSound.ElementFade,
+            NotificationSound.Silent,
+            NotificationSound.Custom("content://media/42"),
+        )
+        for (sound in variants) {
+            assertThat(NotificationSound.fromStored(sound.toStored())).isEqualTo(sound)
+        }
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
index f0dc58ef22..0bda80fe0c 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
@@ -12,7 +12,10 @@ package io.element.android.features.preferences.impl.root
 
 import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.api.SessionEnterpriseService
+import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.features.logout.api.direct.aDirectLogoutState
+import io.element.android.features.preferences.impl.userstatus.aUserStatusState
 import io.element.android.features.preferences.impl.utils.ShowDeveloperSettingsProvider
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.libraries.core.meta.BuildType
@@ -23,11 +26,13 @@ import io.element.android.libraries.featureflag.test.FakeFeature
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.indicator.test.FakeIndicatorService
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
@@ -40,7 +45,9 @@ import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -61,6 +68,9 @@ class PreferencesRootPresenterTest {
         )
         createPresenter(
             matrixClient = matrixClient,
+            sessionEnterpriseService = FakeSessionEnterpriseService(
+                tweakMasUrlResult = { "tweaked $it" },
+            ),
         ).test {
             val initialState = awaitItem()
             assertThat(initialState.myUser).isEqualTo(
@@ -73,6 +83,7 @@ class PreferencesRootPresenterTest {
             assertThat(initialState.version).isEqualTo("A Version")
             assertThat(initialState.isMultiAccountEnabled).isFalse()
             assertThat(initialState.otherSessions).isEmpty()
+            assertThat(initialState.version).isEqualTo("A Version")
             val loadedState = awaitItem()
             assertThat(loadedState.myUser).isEqualTo(
                 MatrixUser(
@@ -81,27 +92,21 @@ class PreferencesRootPresenterTest {
                     avatarUrl = AN_AVATAR_URL
                 )
             )
-            assertThat(initialState.version).isEqualTo("A Version")
             assertThat(loadedState.showSecureBackup).isFalse()
             assertThat(loadedState.showSecureBackupBadge).isFalse()
             assertThat(loadedState.accountManagementUrl).isNull()
-            assertThat(loadedState.devicesManagementUrl).isNull()
             assertThat(loadedState.showAnalyticsSettings).isFalse()
             assertThat(loadedState.showLinkNewDevice).isFalse()
             assertThat(loadedState.showDeveloperSettings).isTrue()
             assertThat(loadedState.canDeactivateAccount).isTrue()
             assertThat(loadedState.canReportBug).isTrue()
+            assertThat(loadedState.nbOfBlockedUsers).isEqualTo(0)
             assertThat(loadedState.directLogoutState).isEqualTo(aDirectLogoutState())
             assertThat(loadedState.snackbarMessage).isNull()
-            skipItems(1)
             val finalState = awaitItem()
-            accountManagementUrlResult.assertions().isCalledExactly(2)
-                .withSequence(
-                    listOf(value(AccountManagementAction.Profile)),
-                    listOf(value(AccountManagementAction.DevicesList)),
-                )
-            assertThat(finalState.accountManagementUrl).isEqualTo("Profile url")
-            assertThat(finalState.devicesManagementUrl).isEqualTo("DevicesList url")
+            accountManagementUrlResult.assertions().isCalledOnce()
+                .with(value(null))
+            assertThat(finalState.accountManagementUrl).isEqualTo("tweaked null url")
         }
     }
 
@@ -121,6 +126,22 @@ class PreferencesRootPresenterTest {
         }
     }
 
+    @Test
+    fun `present - number of blocked users`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            canDeactivateAccountResult = { true },
+            accountManagementUrlResult = { Result.success("") },
+            ignoredUsersFlow = MutableStateFlow(persistentListOf(A_USER_ID, A_USER_ID_2)),
+        )
+        createPresenter(
+            matrixClient = matrixClient,
+        ).test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.nbOfBlockedUsers).isEqualTo(2)
+        }
+    }
+
     @Test
     fun `present - secure backup badge`() = runTest {
         val matrixClient = FakeMatrixClient(
@@ -181,12 +202,36 @@ class PreferencesRootPresenterTest {
             val loadedState = awaitFirstItem()
             repeat(times = ShowDeveloperSettingsProvider.DEVELOPER_SETTINGS_COUNTER) {
                 assertThat(loadedState.showDeveloperSettings).isFalse()
-                loadedState.eventSink(PreferencesRootEvents.OnVersionInfoClick)
+                loadedState.eventSink(PreferencesRootEvent.OnVersionInfoClick)
             }
             assertThat(awaitItem().showDeveloperSettings).isTrue()
         }
     }
 
+    @Test
+    fun `present - switch session invoke method on the session store`() = runTest {
+        val setLatestSessionResult = lambdaRecorder<String, Unit> { }
+        val sessionStore = InMemorySessionStore(
+            initialList = listOf(
+                aSessionData(sessionId = A_SESSION_ID.value),
+                aSessionData(sessionId = A_SESSION_ID_2.value),
+            ),
+            setLatestSessionResult = setLatestSessionResult,
+        )
+        createPresenter(
+            matrixClient = FakeMatrixClient(
+                canDeactivateAccountResult = { true },
+                accountManagementUrlResult = { Result.success(null) },
+            ),
+            sessionStore = sessionStore,
+        ).test {
+            val loadedState = awaitFirstItem()
+            loadedState.eventSink(PreferencesRootEvent.SwitchToSession(A_SESSION_ID_2))
+            setLatestSessionResult.assertions().isCalledOnce()
+                .with(value(A_SESSION_ID_2.value))
+        }
+    }
+
     @Test
     fun `present - labs can be shown if any feature flag is in labs and not finished`() = runTest {
         createPresenter(
@@ -288,6 +333,7 @@ class PreferencesRootPresenterTest {
         indicatorService: IndicatorService = FakeIndicatorService(),
         featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
         sessionStore: SessionStore = InMemorySessionStore(),
+        sessionEnterpriseService: SessionEnterpriseService = FakeSessionEnterpriseService(),
     ) = PreferencesRootPresenter(
         matrixClient = matrixClient,
         sessionVerificationService = sessionVerificationService,
@@ -300,5 +346,7 @@ class PreferencesRootPresenterTest {
         rageshakeFeatureAvailability = rageshakeFeatureAvailability,
         featureFlagService = featureFlagService,
         sessionStore = sessionStore,
+        sessionEnterpriseService = sessionEnterpriseService,
+        userStatusPresenter = { aUserStatusState() },
     )
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
new file mode 100644
index 0000000000..c6578cb494
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.features.preferences.impl.root
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.hasClickAction
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.preferences.impl.R
+import io.element.android.libraries.emoji.api.picker.NoOpEmojiPickerRenderer
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.test.A_USER_ID_2
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.ensureCalledOnce
+import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+
+class PreferencesRootViewTest : RobolectricTest() {
+    @Test
+    fun `clicking on back invokes back callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder
+                ),
+                onBackClick = callback,
+            )
+            pressBack()
+        }
+    }
+
+    @Test
+    fun `click on User profile invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        val user = aMatrixUser()
+        ensureCalledOnceWithParam(user) { callback ->
+            setView(
+                aPreferencesRootState(
+                    myUser = user,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenUserProfile = callback,
+            )
+            onNodeWithText("Alice").performClick()
+        }
+    }
+
+    @Test
+    fun `clicking on other session sends a SwitchToSession`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>()
+        setView(
+            aPreferencesRootState(
+                isMultiAccountEnabled = true,
+                otherSessions = listOf(
+                    aMatrixUser(
+                        id = A_USER_ID_2.value,
+                        displayName = "Bob",
+                    )
+                ),
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText("Bob").performClick()
+        eventsRecorder.assertSingle(PreferencesRootEvent.SwitchToSession(A_USER_ID_2))
+    }
+
+    @Test
+    fun `click on Add account invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    isMultiAccountEnabled = true,
+                    eventSink = eventsRecorder,
+                ),
+                onAddAccountClick = callback,
+            )
+            clickOn(CommonStrings.common_add_another_account)
+        }
+    }
+
+    @Test
+    fun `when multi account is not enabled, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                isMultiAccountEnabled = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_add_another_account)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Encryption invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    showSecureBackup = true,
+                    eventSink = eventsRecorder,
+                ),
+                onSecureBackupClick = callback,
+            )
+            clickOn(CommonStrings.common_encryption)
+        }
+    }
+
+    @Test
+    fun `when showSecureBackup is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                showSecureBackup = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_encryption)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Manage account invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnceWithParam("aUrl") { callback ->
+            setView(
+                aPreferencesRootState(
+                    accountManagementUrl = "aUrl",
+                    eventSink = eventsRecorder,
+                ),
+                onManageAccountClick = callback,
+            )
+            clickOn(CommonStrings.action_manage_account_and_devices)
+        }
+    }
+
+    @Test
+    fun `when accountManagementUrl is null, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                accountManagementUrl = null,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.action_manage_account_and_devices)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Link new devices invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    showLinkNewDevice = true,
+                    eventSink = eventsRecorder,
+                ),
+                onLinkNewDeviceClick = callback,
+            )
+            clickOn(CommonStrings.common_link_new_device)
+        }
+    }
+
+    @Test
+    fun `when showLinkNewDevice is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                showLinkNewDevice = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_link_new_device)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Analytics invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    showAnalyticsSettings = true,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenAnalytics = callback,
+            )
+            val text = activity!!.getString(CommonStrings.common_analytics)
+            onNode(hasText(text) and hasClickAction()).performScrollTo().performClick()
+        }
+    }
+
+    @Test
+    fun `when showAnalyticsSettings is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                showAnalyticsSettings = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_analytics)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Report a problem invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    canReportBug = true,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenRageShake = callback,
+            )
+            val text = activity!!.getString(CommonStrings.common_report_a_problem)
+            onNode(hasText(text) and hasClickAction()).performScrollTo().performClick()
+        }
+    }
+
+    @Test
+    fun `when canReportBug is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                canReportBug = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_report_a_problem)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Screen lock invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder,
+                ),
+                onOpenLockScreenSettings = callback,
+            )
+            clickOn(CommonStrings.common_screen_lock)
+        }
+    }
+
+    @Test
+    fun `click on About invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder,
+                ),
+                onOpenAbout = callback,
+            )
+            clickOn(CommonStrings.common_about)
+        }
+    }
+
+    @Test
+    fun `click on Developer settings invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    showDeveloperSettings = true,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenDeveloperSettings = callback,
+            )
+            val text = activity!!.getString(CommonStrings.common_developer_options)
+            onNode(hasText(text) and hasClickAction()).performScrollTo().performClick()
+        }
+    }
+
+    @Test
+    fun `when showDeveloperSettings is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                showDeveloperSettings = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_developer_options)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Advanced settings invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder,
+                ),
+                onOpenAdvancedSettings = callback,
+            )
+            clickOn(CommonStrings.common_advanced_settings)
+        }
+    }
+
+    @Test
+    fun `click on Labs invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    showLabsItem = true,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenLabs = callback,
+            )
+            clickOn(R.string.screen_labs_title)
+        }
+    }
+
+    @Test
+    fun `when showLabsItem is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                showLabsItem = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(R.string.screen_labs_title)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Notification invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder,
+                ),
+                onOpenNotificationSettings = callback,
+            )
+            clickOn(R.string.screen_notification_settings_title)
+        }
+    }
+
+    @Test
+    fun `click on Blocked users invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    nbOfBlockedUsers = 1,
+                    eventSink = eventsRecorder,
+                ),
+                onOpenBlockedUsers = callback,
+            )
+            clickOn(CommonStrings.common_blocked_users)
+        }
+    }
+
+    @Test
+    fun `when nbOfBlockedUsers is 0, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                nbOfBlockedUsers = 0,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.common_blocked_users)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `click on Remove this device invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    eventSink = eventsRecorder,
+                ),
+                onSignOutClick = callback,
+            )
+            val text = activity!!.getString(CommonStrings.action_signout)
+            onNode(hasText(text) and hasClickAction()).performScrollTo().performClick()
+        }
+    }
+
+    @Test
+    fun `click on Deactivate invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        ensureCalledOnce { callback ->
+            setView(
+                aPreferencesRootState(
+                    canDeactivateAccount = true,
+                    eventSink = eventsRecorder,
+                ),
+                onDeactivateClick = callback,
+            )
+            val text = activity!!.getString(CommonStrings.action_delete_account)
+            onNode(hasText(text) and hasClickAction()).performScrollTo().performClick()
+        }
+    }
+
+    @Test
+    fun `when canDeactivateAccount is false, item is not shown`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>(expectEvents = false)
+        setView(
+            aPreferencesRootState(
+                canDeactivateAccount = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.action_delete_account)).assertDoesNotExist()
+    }
+
+    @Test
+    fun `clicking on version sends a PreferencesRootEvents`() = runAndroidComposeUiTest {
+        val version = "VERSION"
+        val eventsRecorder = EventsRecorder<PreferencesRootEvent>()
+        setView(
+            aPreferencesRootState(
+                version = version,
+                eventSink = eventsRecorder,
+            ),
+        )
+        onNodeWithText(version).performScrollTo().performClick()
+        eventsRecorder.assertSingle(PreferencesRootEvent.OnVersionInfoClick)
+    }
+}
+
+private fun AndroidComposeUiTest<ComponentActivity>.setView(
+    state: PreferencesRootState,
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+    onAddAccountClick: () -> Unit = EnsureNeverCalled(),
+    onSecureBackupClick: () -> Unit = EnsureNeverCalled(),
+    onManageAccountClick: (url: String) -> Unit = EnsureNeverCalledWithParam(),
+    onLinkNewDeviceClick: () -> Unit = EnsureNeverCalled(),
+    onOpenAnalytics: () -> Unit = EnsureNeverCalled(),
+    onOpenRageShake: () -> Unit = EnsureNeverCalled(),
+    onOpenLockScreenSettings: () -> Unit = EnsureNeverCalled(),
+    onOpenAbout: () -> Unit = EnsureNeverCalled(),
+    onOpenDeveloperSettings: () -> Unit = EnsureNeverCalled(),
+    onOpenAdvancedSettings: () -> Unit = EnsureNeverCalled(),
+    onOpenLabs: () -> Unit = EnsureNeverCalled(),
+    onOpenNotificationSettings: () -> Unit = EnsureNeverCalled(),
+    onOpenUserProfile: (MatrixUser) -> Unit = EnsureNeverCalledWithParam(),
+    onOpenBlockedUsers: () -> Unit = EnsureNeverCalled(),
+    onSignOutClick: () -> Unit = EnsureNeverCalled(),
+    onDeactivateClick: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        PreferencesRootView(
+            state = state,
+            emojiPickerRenderer = NoOpEmojiPickerRenderer,
+            onBackClick = onBackClick,
+            onAddAccountClick = onAddAccountClick,
+            onSecureBackupClick = onSecureBackupClick,
+            onManageAccountClick = onManageAccountClick,
+            onLinkNewDeviceClick = onLinkNewDeviceClick,
+            onOpenAnalytics = onOpenAnalytics,
+            onOpenRageShake = onOpenRageShake,
+            onOpenLockScreenSettings = onOpenLockScreenSettings,
+            onOpenAbout = onOpenAbout,
+            onOpenDeveloperSettings = onOpenDeveloperSettings,
+            onOpenAdvancedSettings = onOpenAdvancedSettings,
+            onOpenLabs = onOpenLabs,
+            onOpenNotificationSettings = onOpenNotificationSettings,
+            onOpenUserProfile = onOpenUserProfile,
+            onOpenBlockedUsers = onOpenBlockedUsers,
+            onSignOutClick = onSignOutClick,
+            onDeactivateClick = onDeactivateClick,
+        )
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt
index c00dc7689b..0a05c0e3a3 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/VersionFormatterTest.kt
@@ -16,7 +16,7 @@ import org.junit.Test
 
 class VersionFormatterTest {
     @Test
-    fun `version formatter should return simplified version for main branch`() = runTest {
+    fun `version formatter should return formatted version`() = runTest {
         val sut = DefaultVersionFormatter(
             stringProvider = FakeStringProvider(defaultResult = VERSION),
             buildMeta = aBuildMeta(
@@ -28,21 +28,7 @@ class VersionFormatterTest {
         assertThat(sut.get()).isEqualTo("${VERSION}versionName, 123")
     }
 
-    @Test
-    fun `version formatter should return simplified version for other branch`() = runTest {
-        val sut = DefaultVersionFormatter(
-            stringProvider = FakeStringProvider(defaultResult = VERSION),
-            buildMeta = aBuildMeta(
-                versionName = "versionName",
-                versionCode = 123,
-                gitBranchName = "branch",
-                gitRevision = "1234567890",
-            )
-        )
-        assertThat(sut.get()).isEqualTo("${VERSION}versionName, 123\nbranch (1234567890)")
-    }
-
     companion object {
-        const val VERSION = "version"
+        const val VERSION = "version: "
     }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt
index 6845ecb3a4..ed1eb4255b 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt
@@ -19,19 +19,19 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.push.test.FakePushService
+import io.element.android.libraries.sessionstorage.test.InMemoryCacheStore
+import io.element.android.libraries.sessionstorage.test.aCacheData
 import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import okhttp3.OkHttpClient
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultClearCacheUseCaseTest {
+class DefaultClearCacheUseCaseTest : RobolectricTest() {
     @Test
     fun `execute clear cache should do all the expected tasks`() = runTest {
         val activeRoomsHolder = DefaultActiveRoomsHolder().apply { addRoom(FakeJoinedRoom()) }
@@ -49,6 +49,9 @@ class DefaultClearCacheUseCaseTest {
         )
         val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID))
         assertThat(seenInvitesStore.seenRoomIds().first()).isNotEmpty()
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf("key1" to aCacheData())
+        )
         val sut = DefaultClearCacheUseCase(
             context = InstrumentationRegistry.getInstrumentation().context,
             matrixClient = matrixClient,
@@ -58,9 +61,11 @@ class DefaultClearCacheUseCaseTest {
             pushService = pushService,
             seenInvitesStore = seenInvitesStore,
             activeRoomsHolder = activeRoomsHolder,
+            cacheStore = cacheStore,
         )
         defaultCacheService.clearedCacheEventFlow.test {
             sut.invoke()
+            assertThat(cacheStore.dataMap).isEmpty()
             clearCacheLambda.assertions().isCalledOnce()
             setIgnoreRegistrationErrorLambda.assertions().isCalledOnce()
                 .with(value(matrixClient.sessionId), value(false))
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkAllRoomsAsRead.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkAllRoomsAsRead.kt
new file mode 100644
index 0000000000..cbb5992b77
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkAllRoomsAsRead.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.tasks
+
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeMarkAllRoomsAsRead(
+    private val invokeLambda: suspend () -> Result<Unit> = { Result.success(Unit) },
+) : MarkAllRoomsAsRead {
+    var invokeCallCount = 0
+        private set
+
+    override suspend fun invoke(): Result<Unit> = simulateLongTask {
+        invokeCallCount++
+        invokeLambda()
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkRoomAsRead.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkRoomAsRead.kt
new file mode 100644
index 0000000000..3c1a3687bc
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/FakeMarkRoomAsRead.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.tasks
+
+import io.element.android.libraries.matrix.api.core.RoomId
+
+class FakeMarkRoomAsRead(
+    private val invokeLambda: suspend (RoomId) -> Result<Unit> = { Result.success(Unit) },
+) : MarkRoomAsRead {
+    val invokedRoomIds = mutableListOf<RoomId>()
+
+    override suspend fun invoke(roomId: RoomId): Result<Unit> {
+        invokedRoomIds.add(roomId)
+        return invokeLambda(roomId)
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsReadTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsReadTest.kt
new file mode 100644
index 0000000000..4079d19564
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkAllRoomsAsReadTest.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.tasks
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class MarkAllRoomsAsReadTest {
+    @Test
+    fun `invoke - delegates to client and clears all notifications`() = runTest {
+        val markAllRoomsAsReadLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val clearAllMessagesEventsLambda = lambdaRecorder<SessionId, Unit> { }
+        val markAllRoomsAsRead = DefaultMarkAllRoomsAsRead(
+            client = FakeMatrixClient(
+                markAllRoomsAsReadResult = markAllRoomsAsReadLambda,
+            ),
+            notificationCleaner = FakeNotificationCleaner(
+                clearAllMessagesEventsLambda = clearAllMessagesEventsLambda,
+            ),
+            coroutineDispatchers = testCoroutineDispatchers(),
+        )
+
+        val result = markAllRoomsAsRead()
+
+        assertThat(result.isSuccess).isTrue()
+        markAllRoomsAsReadLambda.assertions().isCalledOnce()
+        clearAllMessagesEventsLambda.assertions().isCalledOnce().with(value(A_SESSION_ID))
+    }
+
+    @Test
+    fun `invoke - does not clear notifications when client fails`() = runTest {
+        val clearAllMessagesEventsLambda = lambdaRecorder<SessionId, Unit> { }
+        val markAllRoomsAsRead = DefaultMarkAllRoomsAsRead(
+            client = FakeMatrixClient(
+                markAllRoomsAsReadResult = { Result.failure(IllegalStateException("Failed")) },
+            ),
+            notificationCleaner = FakeNotificationCleaner(
+                clearAllMessagesEventsLambda = clearAllMessagesEventsLambda,
+            ),
+            coroutineDispatchers = testCoroutineDispatchers(),
+        )
+
+        val result = markAllRoomsAsRead()
+
+        assertThat(result.isFailure).isTrue()
+        clearAllMessagesEventsLambda.assertions().isNeverCalled()
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsReadTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsReadTest.kt
new file mode 100644
index 0000000000..301b18b285
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/MarkRoomAsReadTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.features.preferences.impl.tasks
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
+import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class MarkRoomAsReadTest {
+    @Test
+    fun `invoke - clears notifications, clears unread flag and sends public read receipt`() = runTest {
+        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
+        val room = FakeBaseRoom(markAsReadResult = markAsReadResult)
+        val matrixClient = FakeMatrixClient().apply {
+            givenGetRoomResult(A_ROOM_ID, room)
+        }
+        val clearMessagesForRoomLambda = lambdaRecorder { _: SessionId, _: RoomId -> }
+        val notificationCleaner = FakeNotificationCleaner(clearMessagesForRoomLambda = clearMessagesForRoomLambda)
+        val sessionPreferencesStore = InMemorySessionPreferencesStore()
+        val markRoomAsRead = DefaultMarkRoomAsRead(
+            client = matrixClient,
+            notificationCleaner = notificationCleaner,
+            sessionPreferencesStore = sessionPreferencesStore,
+            coroutineDispatchers = testCoroutineDispatchers(),
+        )
+
+        val result = markRoomAsRead(A_ROOM_ID)
+        runCurrent()
+
+        assertThat(result.isSuccess).isTrue()
+        clearMessagesForRoomLambda.assertions().isCalledOnce()
+            .with(value(A_SESSION_ID), value(A_ROOM_ID))
+        assertThat(room.setUnreadFlagCalls).isEqualTo(listOf(false))
+        markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.READ))
+    }
+
+    @Test
+    fun `invoke - sends private read receipt when public receipts are disabled`() = runTest {
+        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { Result.success(Unit) }
+        val room = FakeBaseRoom(markAsReadResult = markAsReadResult)
+        val matrixClient = FakeMatrixClient().apply {
+            givenGetRoomResult(A_ROOM_ID, room)
+        }
+        val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = false)
+        val markRoomAsRead = DefaultMarkRoomAsRead(
+            client = matrixClient,
+            notificationCleaner = FakeNotificationCleaner(clearMessagesForRoomLambda = { _, _ -> }),
+            sessionPreferencesStore = sessionPreferencesStore,
+            coroutineDispatchers = testCoroutineDispatchers(),
+        )
+
+        val result = markRoomAsRead(A_ROOM_ID)
+        runCurrent()
+
+        assertThat(result.isSuccess).isTrue()
+        markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.READ_PRIVATE))
+    }
+}
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
index 728e05ee7e..a9bce23e45 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileViewTest.kt
@@ -6,15 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.preferences.impl.user.editprofile
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -23,96 +25,92 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class EditUserProfileViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class EditUserProfileViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back emits the expected event`() {
+    fun `clicking on back emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
-        rule.setEditUserProfileView(
+        setEditUserProfileView(
             aEditUserProfileState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressBack()
+        pressBack()
         eventsRecorder.assertSingle(EditUserProfileEvent.Exit)
     }
 
     @Test
-    fun `clicking on save from the exit confirmation dialog emits the expected event`() {
+    fun `clicking on save from the exit confirmation dialog emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
-        rule.setEditUserProfileView(
+        setEditUserProfileView(
             aEditUserProfileState(
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        clickOn(CommonStrings.action_save, inDialog = true)
         eventsRecorder.assertSingle(EditUserProfileEvent.Save)
     }
 
     @Test
-    fun `clicking on discard exit emits the expected event`() {
+    fun `clicking on discard exit emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
-        rule.setEditUserProfileView(
+        setEditUserProfileView(
             aEditUserProfileState(
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_discard)
+        clickOn(CommonStrings.action_discard)
         eventsRecorder.assertSingle(EditUserProfileEvent.Exit)
     }
 
     @Test
-    fun `clicking on save emits the expected event`() {
+    fun `clicking on save emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
-        rule.setEditUserProfileView(
+        setEditUserProfileView(
             aEditUserProfileState(
                 saveButtonEnabled = true,
                 saveAction = AsyncAction.Uninitialized,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertSingle(EditUserProfileEvent.Save)
     }
 
     @Test
-    fun `clicking on avatar opens the bottom sheet dialog`() {
+    fun `clicking on avatar opens the bottom sheet dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>()
         val actions = listOf(
             AvatarAction.TakePhoto,
             AvatarAction.ChoosePhoto,
             AvatarAction.Remove,
         )
-        rule.setEditUserProfileView(
+        setEditUserProfileView(
             aEditUserProfileState(
                 saveAction = AsyncAction.Uninitialized,
                 avatarActions = actions,
                 eventSink = eventsRecorder,
             ),
         )
-        val contentDescription = rule.activity.getString(CommonStrings.a11y_avatar)
-        rule.onNodeWithContentDescription(contentDescription).performClick()
+        val resources = activity!!.resources
+        val contentDescription = resources.getString(CommonStrings.a11y_avatar)
+        onNodeWithContentDescription(contentDescription).performClick()
         // Assert that the actions are displayed
         actions.forEach { action ->
-            val text = rule.activity.getString(action.titleResId)
-            rule.onNodeWithText(text).assertExists()
+            val text = resources.getString(action.titleResId)
+            onNodeWithText(text).assertExists()
         }
     }
 
     @Test
-    fun `success invokes the expected callback`() {
+    fun `success invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<EditUserProfileEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setEditUserProfileView(
+            setEditUserProfileView(
                 aEditUserProfileState(
                     saveAction = AsyncAction.Success(Unit),
                     eventSink = eventsRecorder,
@@ -123,7 +121,7 @@ class EditUserProfileViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setEditUserProfileView(
+private fun AndroidComposeUiTest<ComponentActivity>.setEditUserProfileView(
     state: EditUserProfileState,
     onEditProfileSuccess: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenterTest.kt
new file mode 100644
index 0000000000..a09afdeb6f
--- /dev/null
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/userstatus/UserStatusPresenterTest.kt
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.impl.userstatus
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.emoji.test.fakeEmojiPickerPresenterFactory
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.UserStatus
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class UserStatusPresenterTest {
+    private fun createPresenter(client: FakeMatrixClient = FakeMatrixClient()) =
+        UserStatusPresenter(
+            matrixClient = client,
+            emojiPickerPresenterFactory = fakeEmojiPickerPresenterFactory(),
+        )
+
+    @Test
+    fun `initial state - no status set`() = runTest {
+        createPresenter().test {
+            val state = awaitItem()
+            assertThat(state.displayedStatus).isNull()
+            assertThat(state.pickerState).isEqualTo(UserStatusPickerState.Hidden)
+        }
+    }
+
+    @Test
+    fun `Open event transitions to ShowingPicker`() = runTest {
+        createPresenter().test {
+            val state = awaitItem()
+            state.eventSink(UserStatusEvent.OpenPicker)
+            assertThat(awaitItem().pickerState).isEqualTo(UserStatusPickerState.ShowingPicker)
+        }
+    }
+
+    @Test
+    fun `Dismiss event from ShowingPicker goes back to Hidden`() = runTest {
+        createPresenter().test {
+            val state = awaitItem()
+            state.eventSink(UserStatusEvent.OpenPicker)
+            awaitItem() // ShowingPicker
+            state.eventSink(UserStatusEvent.DismissPicker)
+            assertThat(awaitItem().pickerState).isEqualTo(UserStatusPickerState.Hidden)
+        }
+    }
+
+    @Test
+    fun `Set event calls setUserStatus and transitions to Hidden with updated status`() = runTest {
+        val client = FakeMatrixClient()
+        createPresenter(client).test {
+            val status = UserStatus(emoji = "💬", text = "In a meeting")
+            awaitItem().eventSink(UserStatusEvent.SetStatus(status))
+            val newState = awaitItem()
+            assertThat(newState.pickerState).isEqualTo(UserStatusPickerState.Hidden)
+            assertThat(newState.displayedStatus).isEqualTo(DisplayedStatus.UserSet(status))
+            assertThat(client.setUserStatusCalled).isTrue()
+        }
+    }
+
+    @Test
+    fun `OpenCustomInput with no existing status uses defaults`() = runTest {
+        createPresenter().test {
+            awaitItem().eventSink(UserStatusEvent.OpenCustomInput)
+            val state = awaitItem()
+            val pickerState = state.pickerState as UserStatusPickerState.CustomInput
+            assertThat(pickerState.emoji).isEqualTo("😀")
+            assertThat(pickerState.textFieldState.text.toString()).isEqualTo("")
+        }
+    }
+
+    @Test
+    fun `OpenCustomInput with existing rawStatus pre-fills values`() = runTest {
+        val client = FakeMatrixClient()
+        createPresenter(client).test {
+            val status = UserStatus(emoji = "🌴", text = "Away")
+            awaitItem().eventSink(UserStatusEvent.SetStatus(status))
+            // Single emission: pickerState=Hidden and displayedStatus both set in one recomposition
+            awaitItem().eventSink(UserStatusEvent.OpenCustomInput)
+            val state = awaitItem()
+            val pickerState = state.pickerState as UserStatusPickerState.CustomInput
+            assertThat(pickerState.emoji).isEqualTo("🌴")
+            assertThat(pickerState.textFieldState.text.toString()).isEqualTo("Away")
+        }
+    }
+
+    @Test
+    fun `UpdateCustomEmoji updates emoji in CustomInput state`() = runTest {
+        createPresenter().test {
+            awaitItem().eventSink(UserStatusEvent.OpenCustomInput)
+            awaitItem().eventSink(UserStatusEvent.UpdateCustomEmoji("🚀"))
+            val state = awaitItem()
+            assertThat((state.pickerState as UserStatusPickerState.CustomInput).emoji).isEqualTo("🚀")
+        }
+    }
+
+    @Test
+    fun `CancelCustomInput goes back to Hidden`() = runTest {
+        createPresenter().test {
+            awaitItem().eventSink(UserStatusEvent.OpenCustomInput)
+            awaitItem().eventSink(UserStatusEvent.CancelCustomInput) // CustomInput state, fire Cancel
+            assertThat(awaitItem().pickerState).isEqualTo(UserStatusPickerState.Hidden)
+        }
+    }
+
+    @Test
+    fun `Clear event calls clearUserStatus and clears displayed status`() = runTest {
+        val client = FakeMatrixClient()
+        createPresenter(client).test {
+            val status = UserStatus(emoji = "☕", text = "Be right back")
+            awaitItem().eventSink(UserStatusEvent.SetStatus(status))
+            // Single emission: pickerState=Hidden and displayedStatus both set in one recomposition
+            awaitItem().eventSink(UserStatusEvent.ClearStatus)
+            val clearedState = awaitItem()
+            assertThat(clearedState.pickerState).isEqualTo(UserStatusPickerState.Hidden)
+            assertThat(clearedState.displayedStatus).isNull()
+            assertThat(client.clearUserStatusCalled).isTrue()
+        }
+    }
+}
diff --git a/features/preferences/test/build.gradle.kts b/features/preferences/test/build.gradle.kts
new file mode 100644
index 0000000000..a066fe4707
--- /dev/null
+++ b/features/preferences/test/build.gradle.kts
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.preferences.test"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.features.preferences.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/features/preferences/test/src/main/kotlin/io/element/android/features/preferences/test/FakePreferencesEntryPoint.kt b/features/preferences/test/src/main/kotlin/io/element/android/features/preferences/test/FakePreferencesEntryPoint.kt
new file mode 100644
index 0000000000..c57ed434fa
--- /dev/null
+++ b/features/preferences/test/src/main/kotlin/io/element/android/features/preferences/test/FakePreferencesEntryPoint.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.preferences.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.preferences.api.PreferencesEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakePreferencesEntryPoint : PreferencesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: PreferencesEntryPoint.Params,
+        callback: PreferencesEntryPoint.Callback,
+    ): Node {
+        lambdaError()
+    }
+
+    override fun createAppDeveloperSettingsNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: PreferencesEntryPoint.DeveloperSettingsCallback,
+    ): Node {
+        lambdaError()
+    }
+}
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
index 5db1d4f076..ea78ed5a2c 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
@@ -43,7 +43,7 @@ private fun CrashDetectionContent(
     onDismiss: () -> Unit = { },
 ) {
     ConfirmationDialog(
-        title = stringResource(id = CommonStrings.action_report_bug),
+        title = stringResource(id = CommonStrings.common_report_a_problem),
         content = stringResource(id = R.string.crash_detection_dialog_content, appName),
         submitText = stringResource(id = CommonStrings.action_yes),
         cancelText = stringResource(id = CommonStrings.action_no),
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
index 745a362637..c60bd4e1bf 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
@@ -77,7 +77,7 @@ private fun RageshakeDialogContent(
     onYesClick: () -> Unit = { },
 ) {
     ConfirmationDialog(
-        title = stringResource(id = CommonStrings.action_report_bug),
+        title = stringResource(id = CommonStrings.common_report_a_problem),
         content = stringResource(id = R.string.rageshake_detection_dialog_content),
         thirdButtonText = stringResource(id = CommonStrings.action_disable),
         submitText = stringResource(id = CommonStrings.action_yes),
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesView.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesView.kt
index 7ea35308e9..a227d0ffcf 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesView.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/preferences/RageshakePreferencesView.kt
@@ -56,7 +56,7 @@ fun RageshakePreferencesView(
                     )
                 } else {
                     ListItem(
-                        headlineContent = {
+                        content = {
                             Text("Rageshaking is not supported by your device")
                         },
                     )
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporter.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporter.kt
index 79b05ea32e..631a51a686 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporter.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/reporter/BugReporter.kt
@@ -20,6 +20,7 @@ interface BugReporter {
      * @param problemDescription the bug description
      * @param canContact true if the user opt in to be contacted directly
      * @param sendPushRules true to include the push rules
+     * @param ghIssueNumber it not null, the GitHub issue number to link the bug report to.
      * @param listener the listener
      */
     suspend fun sendBugReport(
@@ -29,6 +30,7 @@ interface BugReporter {
         problemDescription: String,
         canContact: Boolean = false,
         sendPushRules: Boolean = false,
+        ghIssueNumber: Int? = null,
         listener: BugReporterListener
     )
 
diff --git a/features/rageshake/api/src/main/res/values-be/translations.xml b/features/rageshake/api/src/main/res/values-be/translations.xml
index 3d9eec29d2..f08697c71d 100644
--- a/features/rageshake/api/src/main/res/values-be/translations.xml
+++ b/features/rageshake/api/src/main/res/values-be/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="crash_detection_dialog_content">"Пры апошнім выкарыстанні %1$s адбыўся збой. Хочаце падзяліцца справаздачай аб збоі?"</string>
+  <string name="crash_detection_dialog_content">"Пры апошнім выкарыстанні %1$s адбыўся збой. Хочаце абагуліць справаздачу аб збоі?"</string>
   <string name="rageshake_detection_dialog_content">"Падобна, што вы трасеце тэлефон. Хочаце адкрыць экран паведамлення пра памылку?"</string>
   <string name="settings_rageshake">"Rageshake"</string>
   <string name="settings_rageshake_detection_threshold">"Парог выяўлення"</string>
diff --git a/features/rageshake/api/src/main/res/values-ca/translations.xml b/features/rageshake/api/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..b5907369e6
--- /dev/null
+++ b/features/rageshake/api/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crash_detection_dialog_content">"%1$s ha fallat l\'últim cop que es va utilitzar. Vols enviar un informe d\'errors?"</string>
+  <string name="rageshake_detection_dialog_content">"Sembla que sacseges el telèfon amb frustració. Vols obrir la pantalla d\'informe d\'errors?"</string>
+  <string name="settings_rageshake">"La sacsejada de frustració és quan mous i sacseges el mòbil per informar d\'un error. L\'aplicació ja no és compatible amb aquesta funcionalitat però el nom encara s\'utilitza per raons històriques."</string>
+  <string name="settings_rageshake_detection_threshold">"Llindar de detecció"</string>
+</resources>
diff --git a/features/rageshake/api/src/main/res/values-ja/translations.xml b/features/rageshake/api/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..7afb523cd1
--- /dev/null
+++ b/features/rageshake/api/src/main/res/values-ja/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crash_detection_dialog_content">"%1$s は前回の利用時にクラッシュしました。クラッシュレポートを開発者に共有しますか？"</string>
+  <string name="rageshake_detection_dialog_content">"怒り狂って端末を振っていますね。バグの報告をしますか？"</string>
+  <string name="settings_rageshake">"怒り狂う"</string>
+  <string name="settings_rageshake_detection_threshold">"検出感度"</string>
+</resources>
diff --git a/features/rageshake/api/src/main/res/values-lt/translations.xml b/features/rageshake/api/src/main/res/values-lt/translations.xml
index 49762d57ca..88c49aca3c 100644
--- a/features/rageshake/api/src/main/res/values-lt/translations.xml
+++ b/features/rageshake/api/src/main/res/values-lt/translations.xml
@@ -2,6 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crash_detection_dialog_content">"%1$s nulūžo paskutinį kartą, kai buvo naudojama. Ar norėtumėte su mumis pasidalyti strigčių ataskaita?"</string>
   <string name="rageshake_detection_dialog_content">"Atrodo, kad nusivylęs purtote telefoną. Ar norėtumėte atidaryti pranešimo apie klaidas ekraną?"</string>
-  <string name="settings_rageshake">"Rageshake"</string>
+  <string name="settings_rageshake">"Gerai pakratyti"</string>
   <string name="settings_rageshake_detection_threshold">"Aptikimo riba"</string>
 </resources>
diff --git a/features/rageshake/api/src/main/res/values-ru/translations.xml b/features/rageshake/api/src/main/res/values-ru/translations.xml
index 8a3df584d7..c0448b7498 100644
--- a/features/rageshake/api/src/main/res/values-ru/translations.xml
+++ b/features/rageshake/api/src/main/res/values-ru/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crash_detection_dialog_content">"При последнем использовании %1$s произошел сбой. Хотите отправить отчет?"</string>
-  <string name="rageshake_detection_dialog_content">"Похоже, что вы трясете телефон. Хотите открыть экран сообщения об ошибке?"</string>
+  <string name="rageshake_detection_dialog_content">"Похоже, что Вы трясете телефон в раздражении. Хотите открыть экран сообщения об ошибке?"</string>
   <string name="settings_rageshake">"Встряхните"</string>
   <string name="settings_rageshake_detection_threshold">"Порог обнаружения"</string>
 </resources>
diff --git a/features/rageshake/api/src/main/res/values-uz/translations.xml b/features/rageshake/api/src/main/res/values-uz/translations.xml
index 96032fd65f..cfce2a82ef 100644
--- a/features/rageshake/api/src/main/res/values-uz/translations.xml
+++ b/features/rageshake/api/src/main/res/values-uz/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="crash_detection_dialog_content">"%1$soxirgi marta ishlatilganda qulab tushdi. Biz bilan nosozlik hisobotini baham ko\'rmoqchimisiz?"</string>
+  <string name="crash_detection_dialog_content">"%1$s oxirgi marta ishlatilganda xatolik berdi. Biz bilan nosozlik hisobotini ulashmoqchimisiz?"</string>
   <string name="rageshake_detection_dialog_content">"Siz hafsalasi pir bo\'lib telefonni silkitayotganga o\'xshaysiz. Xatolar haqida hisobot ekranini ochmoqchimisiz?"</string>
   <string name="settings_rageshake">"G\'azablanish"</string>
   <string name="settings_rageshake_detection_threshold">"Aniqlash chegarasi"</string>
diff --git a/features/rageshake/api/src/main/res/values-vi/translations.xml b/features/rageshake/api/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..086619eed0
--- /dev/null
+++ b/features/rageshake/api/src/main/res/values-vi/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crash_detection_dialog_content">"%1$s đã bị lỗi ở lần sử dụng gần nhất. Bạn có muốn chia sẻ báo cáo lỗi với chúng tôi không?"</string>
+  <string name="rageshake_detection_dialog_content">"Có vẻ như bạn đang lắc điện thoại vì bực bội. Bạn có muốn mở màn hình báo cáo lỗi không?"</string>
+  <string name="settings_rageshake">"Lắc điện thoại"</string>
+  <string name="settings_rageshake_detection_threshold">"Ngưỡng phát hiện"</string>
+</resources>
diff --git a/features/rageshake/api/src/main/res/values-zh/translations.xml b/features/rageshake/api/src/main/res/values-zh/translations.xml
index 34a643ceab..8c78bbbc9c 100644
--- a/features/rageshake/api/src/main/res/values-zh/translations.xml
+++ b/features/rageshake/api/src/main/res/values-zh/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="crash_detection_dialog_content">"%1$s 上次使用时崩溃了。想和我们分享崩溃报告吗？"</string>
-  <string name="rageshake_detection_dialog_content">"你似乎愤怒地摇晃了手机。想要打开 Bug 报告页面吗？"</string>
+  <string name="crash_detection_dialog_content">"%1$s 上次使用时曾崩溃过。是否与我们分享崩溃报告？"</string>
+  <string name="rageshake_detection_dialog_content">"你似乎愤怒地摇晃了手机。是否打开 Bug 报告页面？"</string>
   <string name="settings_rageshake">"摇一摇"</string>
   <string name="settings_rageshake_detection_threshold">"检测阈值"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportEvents.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportEvents.kt
index 90751873dd..94897d1bad 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportEvents.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportEvents.kt
@@ -18,4 +18,5 @@ sealed interface BugReportEvents {
     data class SetCanContact(val canContact: Boolean) : BugReportEvents
     data class SetSendScreenshot(val sendScreenshot: Boolean) : BugReportEvents
     data class SetSendPushRules(val sendPushRules: Boolean) : BugReportEvents
+    data class SetGhIssueNumber(val ghIssueNumber: Int?) : BugReportEvents
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenter.kt
index 4985f9b30e..85731ae959 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenter.kt
@@ -113,6 +113,9 @@ class BugReportPresenter(
                     sendingProgress.floatValue = 0f
                     sendingAction.value = AsyncAction.Uninitialized
                 }
+                is BugReportEvents.SetGhIssueNumber -> updateFormState(formState) {
+                    copy(ghIssueNumber = event.ghIssueNumber)
+                }
             }
         }
 
@@ -142,7 +145,8 @@ class BugReportPresenter(
             problemDescription = formState.description,
             canContact = formState.canContact,
             sendPushRules = formState.sendPushRules,
-            listener = listener
+            ghIssueNumber = formState.ghIssueNumber,
+            listener = listener,
         )
     }
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportState.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportState.kt
index 65cc055ec9..8e07b3c4e8 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportState.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportState.kt
@@ -32,6 +32,7 @@ data class BugReportFormState(
     val canContact: Boolean,
     val sendScreenshot: Boolean,
     val sendPushRules: Boolean,
+    val ghIssueNumber: Int?,
 ) : Parcelable {
     companion object {
         val Default = BugReportFormState(
@@ -40,6 +41,7 @@ data class BugReportFormState(
             canContact = false,
             sendScreenshot = false,
             sendPushRules = false,
+            ghIssueNumber = null,
         )
     }
 }
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
index c2c34835c9..fede373627 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
@@ -34,6 +34,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.features.rageshake.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
@@ -100,7 +101,7 @@ fun BugReportView(
             Spacer(modifier = Modifier.height(16.dp))
             PreferenceDivider()
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.screen_bug_report_view_logs))
                 },
                 enabled = isFormEnabled,
@@ -155,6 +156,48 @@ fun BugReportView(
                 title = stringResource(R.string.screen_bug_report_send_notification_settings_title),
                 subtitle = stringResource(R.string.screen_bug_report_send_notification_settings_description),
             )
+            PreferenceRow {
+                var ghIssueNumberState by textFieldState(
+                    stateValue = state.formState.ghIssueNumber?.toString() ?: ""
+                )
+                TextField(
+                    value = ghIssueNumberState,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .onTabOrEnterKeyFocusNext(LocalFocusManager.current),
+                    enabled = isFormEnabled,
+                    label = stringResource(id = R.string.screen_bug_report_github_issue_label),
+                    placeholder = "1234",
+                    supportingText = stringResource(id = R.string.screen_bug_report_github_issue_description),
+                    leadingIcon = {
+                        Text(
+                            text = "#",
+                            style = ElementTheme.typography.fontBodyLgMedium,
+                            color = ElementTheme.colors.textSecondary,
+                        )
+                    },
+                    onValueChange = {
+                        if (it.isEmpty()) {
+                            ghIssueNumberState = ""
+                            eventSink(BugReportEvents.SetGhIssueNumber(null))
+                        } else {
+                            val number = it.toIntOrNull()?.takeIf { ghInt -> ghInt in 1..99_999 }
+                            number?.let { ghIssueNumber ->
+                                ghIssueNumberState = ghIssueNumber.toString()
+                                eventSink(BugReportEvents.SetGhIssueNumber(ghIssueNumber))
+                            }
+                        }
+                    },
+                    keyboardOptions = KeyboardOptions(
+                        keyboardType = KeyboardType.Number,
+                        imeAction = ImeAction.Next,
+                    ),
+                    keyboardActions = KeyboardActions(onNext = {
+                        keyboardController?.hide()
+                    }),
+                    singleLine = true,
+                )
+            }
             // Submit
             PreferenceRow {
                 Button(
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
index b4e7faa01e..96bd7adfce 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
@@ -14,7 +14,6 @@ import androidx.core.net.toFile
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Provider
 import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.RageshakeConfig
 import io.element.android.features.rageshake.api.logs.createWriteToFilesConfiguration
@@ -77,7 +76,7 @@ class DefaultBugReporter(
     private val screenshotHolder: ScreenshotHolder,
     private val crashDataStore: CrashDataStore,
     private val coroutineDispatchers: CoroutineDispatchers,
-    private val okHttpClient: Provider<OkHttpClient>,
+    private val okHttpClient: () -> OkHttpClient,
     private val userAgentProvider: UserAgentProvider,
     private val sessionStore: SessionStore,
     private val buildMeta: BuildMeta,
@@ -124,6 +123,7 @@ class DefaultBugReporter(
         problemDescription: String,
         canContact: Boolean,
         sendPushRules: Boolean,
+        ghIssueNumber: Int?,
         listener: BugReporterListener,
     ) {
         val url = bugReporterUrlProvider.provide().first()
@@ -145,6 +145,9 @@ class DefaultBugReporter(
                 val crashCallStack = crashDataStore.crashInfo().first()
                 val bugDescription = buildString {
                     append(problemDescription)
+                    ghIssueNumber?.let {
+                        append("\n\nhttps://github.com/element-hq/element-x-android/issues/$it")
+                    }
                     if (crashCallStack.isNotEmpty() && withCrashLogs) {
                         append("\n\n\n\n--------------------------------- crash call stack ---------------------------------\n")
                         append(crashCallStack)
@@ -182,6 +185,7 @@ class DefaultBugReporter(
                     .addFormDataPart("device", Build.MODEL.trim())
                     .addFormDataPart("locale", Locale.getDefault().toString())
                     .addFormDataPart("sdk_sha", sdkMetadata.sdkGitSha)
+                    .addFormDataPart("sha", buildMeta.gitRevision)
                     .addFormDataPart("local_time", LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
                     .addFormDataPart("utc_time", LocalDateTime.ofInstant(Instant.now(), ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME))
                     .addFormDataPart("app_id", buildMeta.applicationId)
diff --git a/features/rageshake/impl/src/main/res/values-be/translations.xml b/features/rageshake/impl/src/main/res/values-be/translations.xml
index f927ba3c5e..50f8bb6052 100644
--- a/features/rageshake/impl/src/main/res/values-be/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-be/translations.xml
@@ -12,6 +12,6 @@
   <string name="screen_bug_report_include_logs">"Дазволіць журналы"</string>
   <string name="screen_bug_report_include_screenshot">"Адправіць здымак экрана"</string>
   <string name="screen_bug_report_logs_description">"Каб пераканацца, што ўсё працуе правільна, у паведамленне будуць уключаны часопісы. Каб адправіць паведамленне без часопісаў, адключыце гэтую наладу."</string>
-  <string name="screen_bug_report_rash_logs_alert_title">"Пры апошнім выкарыстанні %1$s адбыўся збой. Хочаце падзяліцца справаздачай аб збоі?"</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"Пры апошнім выкарыстанні %1$s адбыўся збой. Хочаце абагуліць справаздачу аб збоі?"</string>
   <string name="screen_bug_report_view_logs">"Прагляд журналаў"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-ca/translations.xml b/features/rageshake/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..6586cd9dc2
--- /dev/null
+++ b/features/rageshake/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bug_report_attach_screenshot">"Adjunta captura de pantalla"</string>
+  <string name="screen_bug_report_contact_me">"Pots contactar amb mi si tens comentaris addicionals."</string>
+  <string name="screen_bug_report_contact_me_title">"Contacta\'m"</string>
+  <string name="screen_bug_report_edit_screenshot">"Edita captura de pantalla"</string>
+  <string name="screen_bug_report_editor_description">"Descriu el problema. Què has fet? Què esperaves que passés? Què va has passat realment? Si us plau, explica-ho el més detalladament possible."</string>
+  <string name="screen_bug_report_editor_placeholder">"Descriu el problema…"</string>
+  <string name="screen_bug_report_editor_supporting">"Si és possible, escriu la descripció en anglès."</string>
+  <string name="screen_bug_report_error_description_too_short">"Descripció massa curta. Si us plau, proporciona més detalls sobre què ha passat. Gràcies!"</string>
+  <string name="screen_bug_report_include_crash_logs">"Envia registre de fallada"</string>
+  <string name="screen_bug_report_include_logs">"Permet registres"</string>
+  <string name="screen_bug_report_include_screenshot">"Envia captura de pantalla"</string>
+  <string name="screen_bug_report_logs_description">"Els registres s\'inclouran amb el missatge per intentar resoldre el problema correctament. Per enviar el missatge sense registres, desactiva aquesta opció."</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s ha fallat l\'últim cop que es va utilitzar. Vols enviar un informe d\'errors?"</string>
+  <string name="screen_bug_report_view_logs">"Veure registres"</string>
+</resources>
diff --git a/features/rageshake/impl/src/main/res/values-et/translations.xml b/features/rageshake/impl/src/main/res/values-et/translations.xml
index 2f55a9b6b5..1f61849fa5 100644
--- a/features/rageshake/impl/src/main/res/values-et/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-et/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Palun kirjelda probleemi…"</string>
   <string name="screen_bug_report_editor_supporting">"Kui vähegi võimalik, siis kirjuta inglise keeles."</string>
   <string name="screen_bug_report_error_description_too_short">"Kirjeldus on liiga lühike. Palun jaga täpsemat teavet selle kohta, mis juhtus. Tänud juba ette!"</string>
+  <string name="screen_bug_report_github_issue_description">"Võid sisestada seotud GitHubi veateate numbri, kui see on olemas."</string>
+  <string name="screen_bug_report_github_issue_label">"Veateade GitHubis"</string>
   <string name="screen_bug_report_include_crash_logs">"Saada krahhilogid"</string>
   <string name="screen_bug_report_include_logs">"Luba logide saatmine"</string>
   <string name="screen_bug_report_include_logs_error">"Sinu logid on väga mahukad ja neid ei saa siia lisada. Palun saada logid meile mõnel muul viisil."</string>
diff --git a/features/rageshake/impl/src/main/res/values-fa/translations.xml b/features/rageshake/impl/src/main/res/values-fa/translations.xml
index ba5ab756db..2e27f97ba6 100644
--- a/features/rageshake/impl/src/main/res/values-fa/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-fa/translations.xml
@@ -7,6 +7,7 @@
   <string name="screen_bug_report_editor_description">"لطفاً مشکل را شرح دهید. چه‌کار کردید؟ انتظار داشتید چه بشود؟ ولی چه شد؟ لطفاً‌تا جای ممکن وارد جزییات شوید."</string>
   <string name="screen_bug_report_editor_placeholder">"شرح مشکل…"</string>
   <string name="screen_bug_report_editor_supporting">"ترجیحاً توضیحات را به زبان انگلیسی بنویسید."</string>
+  <string name="screen_bug_report_error_description_too_short">"توضیحات خیلی کوتاه است، لطفاً جزئیات بیشتری در مورد آنچه اتفاق افتاده ارائه دهید. متشکرم!"</string>
   <string name="screen_bug_report_include_crash_logs">"ارسال رخدادنگارهای خطا"</string>
   <string name="screen_bug_report_include_logs">"اجازه به گزارش‌ها"</string>
   <string name="screen_bug_report_include_screenshot">"ارسال تصویر صفحه"</string>
diff --git a/features/rageshake/impl/src/main/res/values-fi/translations.xml b/features/rageshake/impl/src/main/res/values-fi/translations.xml
index 1970d538fd..5590602367 100644
--- a/features/rageshake/impl/src/main/res/values-fi/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-fi/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Kuvaile ongelmaasi…"</string>
   <string name="screen_bug_report_editor_supporting">"Jos mahdollista, kirjoita englanniksi."</string>
   <string name="screen_bug_report_error_description_too_short">"Kuvaus on liian lyhyt. Kerro tarkemmin mitä tapahtui, kiitos!"</string>
+  <string name="screen_bug_report_github_issue_description">"Voit kirjoittaa mahdollisen GitHub-issuen numeron."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub-issue"</string>
   <string name="screen_bug_report_include_crash_logs">"Lähetä kaatumislokit"</string>
   <string name="screen_bug_report_include_logs">"Lähetä lokitiedostot"</string>
   <string name="screen_bug_report_include_logs_error">"Lokitiedostosi ovat liian suuria, joten niitä ei voida sisällyttää tähän raporttiin. Lähetä ne meille toisella tavalla."</string>
diff --git a/features/rageshake/impl/src/main/res/values-fr/translations.xml b/features/rageshake/impl/src/main/res/values-fr/translations.xml
index 6685903146..7f0e3c0e54 100644
--- a/features/rageshake/impl/src/main/res/values-fr/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-fr/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Décrire le problème…"</string>
   <string name="screen_bug_report_editor_supporting">"Si possible, veuillez rédiger la description en anglais."</string>
   <string name="screen_bug_report_error_description_too_short">"La description est trop courte, veuillez fournir plus de détails sur ce qui s’est passé. Merci !"</string>
+  <string name="screen_bug_report_github_issue_description">"Vous pouvez saisir le numéro d’un ticket GitHub associé, le cas échéant."</string>
+  <string name="screen_bug_report_github_issue_label">"Ticket GitHub"</string>
   <string name="screen_bug_report_include_crash_logs">"Envoyer des journaux d’incident"</string>
   <string name="screen_bug_report_include_logs">"Autoriser à inclure les journaux techniques"</string>
   <string name="screen_bug_report_include_logs_error">"Vos fichiers de log sont trop volumineux et ne peuvent donc pas être inclus dans ce rapport, veuillez nous les envoyer par un autre moyen."</string>
diff --git a/features/rageshake/impl/src/main/res/values-hr/translations.xml b/features/rageshake/impl/src/main/res/values-hr/translations.xml
index e49427b2a9..edff9f2254 100644
--- a/features/rageshake/impl/src/main/res/values-hr/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-hr/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Opišite problem…"</string>
   <string name="screen_bug_report_editor_supporting">"Ako je moguće, molimo vas da opis bude na engleskom jeziku."</string>
   <string name="screen_bug_report_error_description_too_short">"Opis je prekratak; navedite više pojedinosti o tome što se dogodilo. Hvala!"</string>
+  <string name="screen_bug_report_github_issue_description">"Možete unijeti broj povezanog GitHub problema, ako postoji."</string>
+  <string name="screen_bug_report_github_issue_label">"Problem s GitHubom"</string>
   <string name="screen_bug_report_include_crash_logs">"Pošalji zapisnike o padu aplikacije"</string>
   <string name="screen_bug_report_include_logs">"Dopusti zapisnike"</string>
   <string name="screen_bug_report_include_logs_error">"Vaši su zapisnici preopširni pa ih nije moguće uključiti u ovo izvješće. Molimo vas da nam ih pošaljete na drugi način."</string>
diff --git a/features/rageshake/impl/src/main/res/values-hu/translations.xml b/features/rageshake/impl/src/main/res/values-hu/translations.xml
index 851d3f0067..db665a1253 100644
--- a/features/rageshake/impl/src/main/res/values-hu/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-hu/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Írja le a problémát…"</string>
   <string name="screen_bug_report_editor_supporting">"Ha lehetséges, a leírást angolul írja meg."</string>
   <string name="screen_bug_report_error_description_too_short">"A leírás túl rövid, adjon meg további részleteket a történtekről. Köszönjük!"</string>
+  <string name="screen_bug_report_github_issue_description">"Megadhatja egy kapcsolódó GitHub-probléma számát, ha van ilyen."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub-jegy"</string>
   <string name="screen_bug_report_include_crash_logs">"Összeomlásnaplók küldése"</string>
   <string name="screen_bug_report_include_logs">"Naplók engedélyezése"</string>
   <string name="screen_bug_report_include_logs_error">"A naplófájlok túl nagyok, ezért nem szerepelhetnek ebben a jelentésben. Más módon küldje el őket."</string>
diff --git a/features/rageshake/impl/src/main/res/values-in/translations.xml b/features/rageshake/impl/src/main/res/values-in/translations.xml
index 0140bfee7a..d58a5ef9ca 100644
--- a/features/rageshake/impl/src/main/res/values-in/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-in/translations.xml
@@ -14,5 +14,7 @@
   <string name="screen_bug_report_include_screenshot">"Kirim tangkapan layar"</string>
   <string name="screen_bug_report_logs_description">"Log akan disertakan dengan pesan Anda untuk memastikan bahwa semuanya berfungsi dengan baik. Untuk mengirimkan pesan Anda tanpa log, matikan pengaturan ini."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s mengalami kemogokan saat terakhir kali digunakan. Apakah Anda ingin berbagi laporan kerusakan dengan kami?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Jika Anda mengalami masalah dengan notifikasi, mengunggah aturan push notifikasi dapat membantu kami menemukan penyebab utamanya. Perlu diingat bahwa aturan ini dapat berisi informasi pribadi, seperti nama tampilan Anda atau kata kunci yang ingin Anda terima notifikasinya."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Pengaturan notifikasi pengiriman"</string>
   <string name="screen_bug_report_view_logs">"Tampilkan catatan"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-it/translations.xml b/features/rageshake/impl/src/main/res/values-it/translations.xml
index 31fb95f9f6..bac6dd5f0f 100644
--- a/features/rageshake/impl/src/main/res/values-it/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-it/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Descrivi il problema…"</string>
   <string name="screen_bug_report_editor_supporting">"Se possibile, scrivere la descrizione in inglese."</string>
   <string name="screen_bug_report_error_description_too_short">"La descrizione è troppo breve, ti preghiamo di fornire maggiori dettagli sull\'accaduto. Grazie!"</string>
+  <string name="screen_bug_report_github_issue_description">"Puoi inserire il numero di una segnalazione GitHub associata, se presente."</string>
+  <string name="screen_bug_report_github_issue_label">"Segnalazione GitHub"</string>
   <string name="screen_bug_report_include_crash_logs">"Invia i log degli arresti anomali"</string>
   <string name="screen_bug_report_include_logs">"Consenti i log"</string>
   <string name="screen_bug_report_include_logs_error">"I tuoi log sono troppo grandi, quindi non possono essere inclusi in questo rapporto, inviaceli in un altro modo."</string>
diff --git a/features/rageshake/impl/src/main/res/values-ja/translations.xml b/features/rageshake/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..53d25b364f
--- /dev/null
+++ b/features/rageshake/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bug_report_attach_screenshot">"スクリーンショットを添付"</string>
+  <string name="screen_bug_report_contact_me">"追加の質問がある場合は、ご連絡ください。"</string>
+  <string name="screen_bug_report_contact_me_title">"返信を受け取る"</string>
+  <string name="screen_bug_report_edit_screenshot">"スクリーンショットを編集"</string>
+  <string name="screen_bug_report_editor_description">"問題を教えてください。行った操作、想定した挙動、実際の挙動などについて、可能な限り詳細に記述してください。"</string>
+  <string name="screen_bug_report_editor_placeholder">"問題の説明…"</string>
+  <string name="screen_bug_report_editor_supporting">"可能であれば英語で記入してください。"</string>
+  <string name="screen_bug_report_error_description_too_short">"説明が過度に短いです。問題についてより詳細にご記入ください。"</string>
+  <string name="screen_bug_report_github_issue_description">"関連したGitHubのissueがある場合はIDを記入してください。"</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub issue"</string>
+  <string name="screen_bug_report_include_crash_logs">"クラッシュログを送信"</string>
+  <string name="screen_bug_report_include_logs">"ログの記録を許可"</string>
+  <string name="screen_bug_report_include_logs_error">"ログのサイズが大きく、報告に添付することができません。ログは別の方法で送信してください。"</string>
+  <string name="screen_bug_report_include_screenshot">"スクリーンを送信"</string>
+  <string name="screen_bug_report_logs_description">"メッセージには、正常に動作していることを確認するため、ログが含まれています。ログを含めたくない場合は、オフにしてください。"</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s は前回の利用時にクラッシュしました。クラッシュレポートを開発者に共有しますか？"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"通知について問題がある場合は、プッシュ通知の設定を添付することで、原因究明の手がかりになります。この設定には、ユーザーネームや通知のキーワードなどの個人情報が含まれる場合があります。ご注意ください。"</string>
+  <string name="screen_bug_report_send_notification_settings_title">"通知設定を送信"</string>
+  <string name="screen_bug_report_view_logs">"ログを表示"</string>
+</resources>
diff --git a/features/rageshake/impl/src/main/res/values-ko/translations.xml b/features/rageshake/impl/src/main/res/values-ko/translations.xml
index ef4978924c..1b15ce3f5a 100644
--- a/features/rageshake/impl/src/main/res/values-ko/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-ko/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"문제를 설명해 주세요…"</string>
   <string name="screen_bug_report_editor_supporting">"가능하다면 영어로 설명을 작성해 주십시오."</string>
   <string name="screen_bug_report_error_description_too_short">"설명 내용이 너무 짧습니다. 발생한 상황에 대해 더 자세한 내용을 제공해 주시기 바랍니다. 감사합니다!"</string>
+  <string name="screen_bug_report_github_issue_description">"연관된 GitHub 이슈 번호가 있다면 입력할 수 있습니다."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub 이슈"</string>
   <string name="screen_bug_report_include_crash_logs">"충돌 로그 보내기"</string>
   <string name="screen_bug_report_include_logs">"로그 허용"</string>
   <string name="screen_bug_report_include_logs_error">"귀하의 로그가 너무 커서 이 보고서에 포함할 수 없습니다. 다른 방법으로 보내주시기 바랍니다."</string>
diff --git a/features/rageshake/impl/src/main/res/values-lt/translations.xml b/features/rageshake/impl/src/main/res/values-lt/translations.xml
index c45c982ba5..cc79a5055e 100644
--- a/features/rageshake/impl/src/main/res/values-lt/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-lt/translations.xml
@@ -10,6 +10,6 @@
   <string name="screen_bug_report_include_crash_logs">"Siųsti gedimų žurnalus"</string>
   <string name="screen_bug_report_include_logs">"Leisti žurnalus"</string>
   <string name="screen_bug_report_include_screenshot">"Siųsti ekrano nuotrauką"</string>
-  <string name="screen_bug_report_logs_description">"Prie žinutės bus pridėti žurnalai, kad įsitikintumėme, jog viskas veikia tinkamai. Jei norite išsiųsti savo žinutę be žurnalų, išjunkite šį nustatymą."</string>
+  <string name="screen_bug_report_logs_description">"Žurnalai bus įtraukti į jūsų žinutę, kad būtų užtikrinta, jog viskas veikia tinkamai. Kad išsiųstumėte žinutę be žurnalų, išjunkite šį nustatymą."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s nulūžo paskutinį kartą, kai buvo naudojama. Ar norėtumėte su mumis pasidalyti strigčių ataskaita?"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-nb/translations.xml b/features/rageshake/impl/src/main/res/values-nb/translations.xml
index 996793c262..d9f01b70ac 100644
--- a/features/rageshake/impl/src/main/res/values-nb/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-nb/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Beskriv problemet…"</string>
   <string name="screen_bug_report_editor_supporting">"Hvis mulig, vennligst skriv beskrivelsen på engelsk."</string>
   <string name="screen_bug_report_error_description_too_short">"Beskrivelsen er for kort, vennligst gi flere detaljer om hva som skjedde. Takk skal du ha!"</string>
+  <string name="screen_bug_report_github_issue_description">"Du kan oppgi nummeret på en tilknyttet GitHub-sak, hvis det finnes."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub-sak"</string>
   <string name="screen_bug_report_include_crash_logs">"Send krasjlogger"</string>
   <string name="screen_bug_report_include_logs">"Tillat logger"</string>
   <string name="screen_bug_report_include_logs_error">"Loggene dine er for store og kan derfor ikke inkluderes i denne rapporten. Vennligst send dem til oss på en annen måte."</string>
diff --git a/features/rageshake/impl/src/main/res/values-pl/translations.xml b/features/rageshake/impl/src/main/res/values-pl/translations.xml
index c433071584..2b0feb0851 100644
--- a/features/rageshake/impl/src/main/res/values-pl/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-pl/translations.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Opisz problem…"</string>
   <string name="screen_bug_report_editor_supporting">"Jeśli to możliwe, napisz zgłoszenje w języku angielskim."</string>
   <string name="screen_bug_report_error_description_too_short">"Opis jest zbyt krótki, podaj więcej szczegółów na temat tego co się stało. Dzięki!"</string>
+  <string name="screen_bug_report_github_issue_description">"Możesz wpisać numer powiązanego zgłoszenia w serwisie GitHub, jeśli takie istnieje."</string>
+  <string name="screen_bug_report_github_issue_label">"Zgłoszenie Github"</string>
   <string name="screen_bug_report_include_crash_logs">"Wyślij logi awarii"</string>
   <string name="screen_bug_report_include_logs">"Zezwól na logi"</string>
   <string name="screen_bug_report_include_logs_error">"Twoje dzienniki są zbyt duże, więc nie można ich uwzględnić w tym raporcie. Prześlij je do nas w inny sposób."</string>
diff --git a/features/rageshake/impl/src/main/res/values-ru/translations.xml b/features/rageshake/impl/src/main/res/values-ru/translations.xml
index d4224a6dcb..4934266798 100644
--- a/features/rageshake/impl/src/main/res/values-ru/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-ru/translations.xml
@@ -8,13 +8,15 @@
   <string name="screen_bug_report_editor_placeholder">"Опишите проблему…"</string>
   <string name="screen_bug_report_editor_supporting">"Если возможно, пожалуйста, напишите описание на английском языке."</string>
   <string name="screen_bug_report_error_description_too_short">"Описание слишком короткое, пожалуйста, расскажите подробнее о том, что произошло. Спасибо!"</string>
+  <string name="screen_bug_report_github_issue_description">"При наличии, Вы можете ввести номер связанной проблемы из GitHub."</string>
+  <string name="screen_bug_report_github_issue_label">"Проблема на GitHub"</string>
   <string name="screen_bug_report_include_crash_logs">"Отправка журналов сбоев"</string>
   <string name="screen_bug_report_include_logs">"Разрешить ведение журналов"</string>
   <string name="screen_bug_report_include_logs_error">"Ваши журналы слишком большие для включения в этот отчет. Пожалуйста, отправьте их нам другим способом."</string>
   <string name="screen_bug_report_include_screenshot">"Отправить скриншот"</string>
   <string name="screen_bug_report_logs_description">"Чтобы убедиться, что всё работает правильно, к сообщению будут прикреплены журналы. Чтобы отправить сообщение без журналов, отключите эту настройку."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"При последнем использовании %1$s произошел сбой. Хотите отправить отчет?"</string>
-  <string name="screen_bug_report_send_notification_settings_description">"Если у вас возникли проблемы с уведомлениями, загрузка настроек уведомлений может помочь нам определить основную причину."</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Если у Вас возникли проблемы с уведомлениями, загрузка настроек уведомлений может помочь нам определить причину проблемы. Обратите внимание, что эти правила могут содержать конфиденциальную информацию, такую ​​как Ваше отображаемое имя или ключевые слова, по которым должны срабатывать уведомления."</string>
   <string name="screen_bug_report_send_notification_settings_title">"Настройки отправки уведомлений"</string>
   <string name="screen_bug_report_view_logs">"Просмотр журналов"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-uk/translations.xml b/features/rageshake/impl/src/main/res/values-uk/translations.xml
index 3999133537..d42f6e5501 100644
--- a/features/rageshake/impl/src/main/res/values-uk/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-uk/translations.xml
@@ -8,11 +8,15 @@
   <string name="screen_bug_report_editor_placeholder">"Опишіть проблему…"</string>
   <string name="screen_bug_report_editor_supporting">"Якщо можливо, будь ласка, напишіть опис англійською мовою."</string>
   <string name="screen_bug_report_error_description_too_short">"Опис закороткий, будь ласка, надайте докладнішу інформацію про те, що сталося. Дякуємо!"</string>
+  <string name="screen_bug_report_github_issue_description">"Ви можете ввести номер вже існуючої проблеми на GitHub, якщо така є."</string>
+  <string name="screen_bug_report_github_issue_label">"Тікет на GitHub"</string>
   <string name="screen_bug_report_include_crash_logs">"Надіслати журнали збоїв"</string>
   <string name="screen_bug_report_include_logs">"Дозволити журнали"</string>
   <string name="screen_bug_report_include_logs_error">"Ваші журнали надмірно великі, тому їх не можна включити в цей звіт, будь ласка, надішліть їх нам іншим способом."</string>
   <string name="screen_bug_report_include_screenshot">"Надіслати знімок екрана"</string>
   <string name="screen_bug_report_logs_description">"Журнали будуть додані до вашого повідомлення, щоб переконатися, що все працює належним чином. Щоб надіслати повідомлення без журналів, вимкніть це налаштування."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"Стався збій %1$s під час останнього користування. Хочете поділитися з нами звітом про збій?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Якщо у вас виникають проблеми зі сповіщеннями, надсилання нам правил push-сповіщень допоможе нам визначити першопричину. Зверніть увагу, що ці правила можуть містити приватну інформацію, таку як ваше ім’я користувача або ключові слова, за якими ви отримували сповіщення."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Налаштування сповіщень"</string>
   <string name="screen_bug_report_view_logs">"Переглянути журнали"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-uz/translations.xml b/features/rageshake/impl/src/main/res/values-uz/translations.xml
index 30e9e1787b..8a955ec449 100644
--- a/features/rageshake/impl/src/main/res/values-uz/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-uz/translations.xml
@@ -8,12 +8,14 @@
   <string name="screen_bug_report_editor_placeholder">"Muammoni tasvirlab bering…"</string>
   <string name="screen_bug_report_editor_supporting">"Iloji bo\'lsa, tavsifni ingliz tilida yozing."</string>
   <string name="screen_bug_report_error_description_too_short">"Tavsif juda qisqa, nima boʻlganligi haqida batafsilroq maʼlumot bering. Rahmat!"</string>
+  <string name="screen_bug_report_github_issue_description">"Agar mavjud boʻlsa, bogʻliq GitHub muammosining raqamini kiritishingiz mumkin."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub muammosi"</string>
   <string name="screen_bug_report_include_crash_logs">"Buzilish jurnallarini yuboring"</string>
   <string name="screen_bug_report_include_logs">"Jurnallarga ruxsat bering"</string>
   <string name="screen_bug_report_include_logs_error">"Sizning jurnallaringiz juda katta, shuning uchun bu hisobotga kiritilmaydi, iltimos ularni bizga boshqa usulda yuboring."</string>
   <string name="screen_bug_report_include_screenshot">"Ekran tasvirini yuboring"</string>
   <string name="screen_bug_report_logs_description">"Har bir narsa to\'ri ishlayotganiga ishonch hosil qilish uchun xabaringizga jurnallar kiritiladi. Xabarni jurnallarsiz yuborish uchun ushbu sozlamani oʻchiring."</string>
-  <string name="screen_bug_report_rash_logs_alert_title">"%1$soxirgi marta ishlatilganda qulab tushdi. Biz bilan nosozlik hisobotini baham ko\'rmoqchimisiz?"</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s oxirgi marta ishlatilganda xatolik berdi. Biz bilan nosozlik hisobotini ulashmoqchimisiz?"</string>
   <string name="screen_bug_report_send_notification_settings_description">"Agar bildirishnomalar bilan bog‘liq muammolarga duch kelayotgan bo‘lsangiz, bildirishnomalarni yetkazish qoidalarini yuklash bizga asosiy sababni aniqlashda yordam beradi. Shuni yodda tutingki, bu qoidalarda shaxsiy ma’lumotlar, masalan, ko‘rsatiladigan ismingiz yoki bildirishnoma olishingiz kerak bo‘lgan kalit so‘zlar kabi ma’lumotlar bo‘lishi mumkin."</string>
   <string name="screen_bug_report_send_notification_settings_title">"Bildirishnoma sozlamalarini yuborish"</string>
   <string name="screen_bug_report_view_logs">"Jurnallarni ko'rish"</string>
diff --git a/features/rageshake/impl/src/main/res/values-vi/translations.xml b/features/rageshake/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..6f53dc65e6
--- /dev/null
+++ b/features/rageshake/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bug_report_attach_screenshot">"Đính kèm ảnh chụp màn hình"</string>
+  <string name="screen_bug_report_contact_me">"Bạn có thể liên hệ với tôi nếu có bất kỳ câu hỏi nào khác."</string>
+  <string name="screen_bug_report_contact_me_title">"Liên hệ với tôi"</string>
+  <string name="screen_bug_report_edit_screenshot">"Chỉnh sửa ảnh chụp màn hình"</string>
+  <string name="screen_bug_report_editor_description">"Hãy mô tả vấn đề. Bạn đã làm gì? Bạn mong đợi/dự đoán điều gì sẽ xảy ra? Điều gì thực sự đã xảy ra? Hãy trình bày càng chi tiết càng tốt."</string>
+  <string name="screen_bug_report_editor_placeholder">"Hãy mô tả vấn đề…"</string>
+  <string name="screen_bug_report_editor_supporting">"Nếu có thể, vui lòng viết mô tả bằng tiếng Anh."</string>
+  <string name="screen_bug_report_error_description_too_short">"Phần mô tả quá ngắn, vui lòng cung cấp thêm chi tiết về những gì đã xảy ra. Cảm ơn!"</string>
+  <string name="screen_bug_report_include_crash_logs">"Gửi nhật ký sự cố"</string>
+  <string name="screen_bug_report_include_logs">"Cho phép ghi nhật ký"</string>
+  <string name="screen_bug_report_include_logs_error">"Tệp nhật ký của bạn quá lớn nên không thể đưa vào báo cáo này, vui lòng gửi chúng cho chúng tôi bằng cách khác."</string>
+  <string name="screen_bug_report_include_screenshot">"Gửi ảnh chụp màn hình"</string>
+  <string name="screen_bug_report_logs_description">"Nhật ký lỗi sẽ được đính kèm với tin nhắn của bạn để đảm bảo mọi thứ hoạt động bình thường. Để gửi tin nhắn mà không có nhật ký lỗi, hãy tắt cài đặt này."</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s đã bị lỗi ở lần sử dụng gần nhất. Bạn có muốn chia sẻ báo cáo lỗi với chúng tôi không?"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"Nếu bạn gặp sự cố với thông báo, việc tải lên các quy tắc thông báo có thể giúp chúng tôi xác định nguyên nhân chính. Xin lưu ý rằng các quy tắc này có thể chứa thông tin riêng tư, chẳng hạn như tên hiển thị hoặc từ khóa mà bạn muốn nhận thông báo."</string>
+  <string name="screen_bug_report_send_notification_settings_title">"Cài đặt thông báo"</string>
+  <string name="screen_bug_report_view_logs">"Xem nhật ký"</string>
+</resources>
diff --git a/features/rageshake/impl/src/main/res/values-zh/translations.xml b/features/rageshake/impl/src/main/res/values-zh/translations.xml
index 527a35cdcc..ea795037d1 100644
--- a/features/rageshake/impl/src/main/res/values-zh/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-zh/translations.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_bug_report_attach_screenshot">"附上截图"</string>
-  <string name="screen_bug_report_contact_me">"如果您有任何后续问题，可以与我联系。"</string>
+  <string name="screen_bug_report_contact_me">"如果有任何后续问题可以联系我。"</string>
   <string name="screen_bug_report_contact_me_title">"联系我"</string>
   <string name="screen_bug_report_edit_screenshot">"编辑截图"</string>
-  <string name="screen_bug_report_editor_description">"请尽可能详细地描述问题。您做了什么？您预期会发生什么？实际发生了什么？"</string>
+  <string name="screen_bug_report_editor_description">"请尽可能详细地描述问题。你做了什么？预期会发生什么？实际上发生了什么？"</string>
   <string name="screen_bug_report_editor_placeholder">"描述问题…"</string>
   <string name="screen_bug_report_editor_supporting">"请尽可能用英文描述。"</string>
   <string name="screen_bug_report_error_description_too_short">"描述太短，请提供详细情况。谢谢！"</string>
+  <string name="screen_bug_report_github_issue_description">"你可以输入与之相关的 GitHub issue 编号（如果有）。"</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub issue"</string>
   <string name="screen_bug_report_include_crash_logs">"发送崩溃日志"</string>
   <string name="screen_bug_report_include_logs">"允许日志"</string>
-  <string name="screen_bug_report_include_logs_error">"日志文件过大，无法包含在本报告中，请通过其他方式发送给我们。"</string>
+  <string name="screen_bug_report_include_logs_error">"日志文件过大，无法包含在本次报告中，请通过其它方式发送给我们。"</string>
   <string name="screen_bug_report_include_screenshot">"发送屏幕截图"</string>
-  <string name="screen_bug_report_logs_description">"为确认一切正常运行，您的消息中将包含日志。如要发送不带日志的消息，请关闭此设置。"</string>
-  <string name="screen_bug_report_rash_logs_alert_title">"%1$s 上次使用时崩溃了。想和我们分享崩溃报告吗？"</string>
-  <string name="screen_bug_report_send_notification_settings_description">"如果您遇到通知问题，上传通知设置可以帮助我们查明根本原因。"</string>
+  <string name="screen_bug_report_logs_description">"为确认一切正常运行，日志中将包含你的消息。如要发送不含消息的日志，请关闭此设置。"</string>
+  <string name="screen_bug_report_rash_logs_alert_title">"%1$s 上次使用时曾崩溃过。是否与我们分享崩溃报告？"</string>
+  <string name="screen_bug_report_send_notification_settings_description">"如果你遭遇通知相关问题，上传通知设置可以帮助我们调查根本原因。请注意：这些规则可能包含私人信息，例如你的显示名称或用于接收通知的关键词。"</string>
   <string name="screen_bug_report_send_notification_settings_title">"发送通知设置"</string>
   <string name="screen_bug_report_view_logs">"查看日志"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values/localazy.xml b/features/rageshake/impl/src/main/res/values/localazy.xml
index 85af2af4a7..d1dc52f3e4 100644
--- a/features/rageshake/impl/src/main/res/values/localazy.xml
+++ b/features/rageshake/impl/src/main/res/values/localazy.xml
@@ -8,6 +8,8 @@
   <string name="screen_bug_report_editor_placeholder">"Describe the problem…"</string>
   <string name="screen_bug_report_editor_supporting">"If possible, please write the description in English."</string>
   <string name="screen_bug_report_error_description_too_short">"The description is too short, please provide more details about what happened. Thanks!"</string>
+  <string name="screen_bug_report_github_issue_description">"You can enter the number of an associated GitHub issue, if any."</string>
+  <string name="screen_bug_report_github_issue_label">"GitHub issue"</string>
   <string name="screen_bug_report_include_crash_logs">"Send crash logs"</string>
   <string name="screen_bug_report_include_logs">"Allow logs"</string>
   <string name="screen_bug_report_include_logs_error">"Your logs are excessively large so cannot be included in this report, please send them to us another way."</string>
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
index 148c375e25..afbcc939a6 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
@@ -107,6 +107,18 @@ class BugReportPresenterTest {
         }
     }
 
+    @Test
+    fun `present - set GitHub issue number`() = runTest {
+        val presenter = createPresenter()
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(BugReportEvents.SetGhIssueNumber(1))
+            assertThat(awaitItem().formState).isEqualTo(BugReportFormState.Default.copy(ghIssueNumber = 1))
+            initialState.eventSink.invoke(BugReportEvents.SetGhIssueNumber(null))
+            assertThat(awaitItem().formState).isEqualTo(BugReportFormState.Default.copy(ghIssueNumber = null))
+        }
+    }
+
     @Test
     fun `present - reset all`() = runTest {
         val presenter = createPresenter(
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
index 36cc185e86..659145caa9 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
@@ -28,6 +28,7 @@ class FakeBugReporter(val mode: Mode = Mode.Success) : BugReporter {
         problemDescription: String,
         canContact: Boolean,
         sendPushRules: Boolean,
+        ghIssueNumber: Int?,
         listener: BugReporterListener,
     ) {
         delay(100)
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandlerTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandlerTest.kt
index 665e1ce4bd..70abe99469 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandlerTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/crash/VectorUncaughtExceptionHandlerTest.kt
@@ -11,14 +11,12 @@ package io.element.android.features.rageshake.impl.crash
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class VectorUncaughtExceptionHandlerTest {
+class VectorUncaughtExceptionHandlerTest : RobolectricTest() {
     @Test
     fun `activate should change the default handler`() {
         val sut = VectorUncaughtExceptionHandler(PreferencesCrashDataStore(FakePreferenceDataStoreFactory()))
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
index 6dd6f81e5f..ad29e5ed3f 100755
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
@@ -32,6 +32,7 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
@@ -46,12 +47,9 @@ import okhttp3.mockwebserver.RecordedRequest
 import okio.buffer
 import okio.source
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultBugReporterTest {
+class DefaultBugReporterTest : RobolectricTest() {
     @Test
     fun `test sendBugReport success`() = runTest {
         val server = MockWebServer()
@@ -536,6 +534,6 @@ class DefaultBugReporterTest {
     }
 
     companion object {
-        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 17
+        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 18
     }
 }
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt
index 4ab1a51336..a754825dcc 100644
--- a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt
@@ -108,7 +108,7 @@ fun ReportRoomView(
 
             ListItem(
                 modifier = Modifier.padding(end = 8.dp),
-                headlineContent = {
+                content = {
                     Text(text = stringResource(CommonStrings.action_leave_room))
                 },
                 onClick = {
diff --git a/features/reportroom/impl/src/main/res/values-ca/translations.xml b/features/reportroom/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..05ca5c0fc0
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_reason_footer">"Denuncia aquesta sala al teu administrador. Si els missatges estan xifrats, l\'administrador no els podrà llegir."</string>
+  <string name="screen_report_room_reason_placeholder">"Descriu el motiu de la denúncia…"</string>
+  <string name="screen_report_room_title">"Denuncia sala"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-ja/translations.xml b/features/reportroom/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..9718ca432f
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"報告は正常に送信されましたが、ルームの退出中に問題が発生しました。もう一度試してください。"</string>
+  <string name="screen_report_room_leave_failed_alert_title">"ルームの退出に失敗"</string>
+  <string name="screen_report_room_reason_footer">"管理者にこのルームを報告します。メッセージが暗号化されている場合、管理者は内容を確認することができません。"</string>
+  <string name="screen_report_room_reason_placeholder">"報告の理由を説明してください…"</string>
+  <string name="screen_report_room_title">"ルームを通報"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-ru/translations.xml b/features/reportroom/impl/src/main/res/values-ru/translations.xml
index 24a46b5f3d..22ff15c1cd 100644
--- a/features/reportroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-ru/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_report_room_leave_failed_alert_message">"Ваша жалоба была успешно отправлена, но мы столкнулись с проблемой при попытке покинуть комнату. Пожалуйста, попробуйте еще раз."</string>
+  <string name="screen_report_room_leave_failed_alert_message">"Ваша жалоба была успешно отправлена, но мы столкнулись с проблемой при попытке покинуть комнату. Пожалуйста, попробуйте ещё раз."</string>
   <string name="screen_report_room_leave_failed_alert_title">"Невозможно покинуть комнату"</string>
   <string name="screen_report_room_reason_footer">"Пожалуйтесь на комнату администратору. Если сообщения зашифрованы, ваш администратор не сможет их прочитать."</string>
   <string name="screen_report_room_reason_placeholder">"Опишите причину жалобы…"</string>
diff --git a/features/reportroom/impl/src/main/res/values-vi/translations.xml b/features/reportroom/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..3037521f98
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_reason_footer">"Hãy báo cáo phòng chat này cho quản trị viên của bạn. Nếu tin nhắn được mã hóa, quản trị viên sẽ không thể đọc được chúng."</string>
+  <string name="screen_report_room_title">"Báo cáo phòng"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-zh/translations.xml b/features/reportroom/impl/src/main/res/values-zh/translations.xml
index 40a0b5f1b0..4366e33455 100644
--- a/features/reportroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/reportroom/impl/src/main/res/values-zh/translations.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_report_room_leave_failed_alert_message">"您的报告已成功提交，但在尝试离开房间时遇到了问题。请重试。"</string>
+  <string name="screen_report_room_leave_failed_alert_message">"你的举报已成功提交，但在尝试退出房间时遇到问题。请重试。"</string>
   <string name="screen_report_room_leave_failed_alert_title">"无法离开房间"</string>
-  <string name="screen_report_room_reason_footer">"向管理员举报此房间。如果信息已加密，管理员将无法读取。"</string>
-  <string name="screen_report_room_reason_placeholder">"描述举报的原因…"</string>
+  <string name="screen_report_room_reason_footer">"向管理员举报此房间。如果消息已加密，管理员将无法读取。"</string>
+  <string name="screen_report_room_reason_placeholder">"描述举报的理由…"</string>
   <string name="screen_report_room_title">"举报房间"</string>
 </resources>
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt
index 59d9507571..0e43cf6594 100644
--- a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt
@@ -6,90 +6,87 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.reportroom.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ReportRoomViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ReportRoomViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invoke the expected callback`() {
+    fun `clicking on back invoke the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReportRoomEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setReportRoomView(
+            setReportRoomView(
                 aReportRoomState(
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on report when enabled emits the expected event`() {
+    fun `clicking on report when enabled emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReportRoomEvents>()
-        rule.setReportRoomView(
+        setReportRoomView(
             aReportRoomState(
                 reason = "Spam",
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_report)
+        clickOn(CommonStrings.action_report)
         eventsRecorder.assertSingle(ReportRoomEvents.Report)
     }
 
     @Test
-    fun `clicking on decline when disabled does not emit event`() {
+    fun `clicking on decline when disabled does not emit event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReportRoomEvents>(expectEvents = false)
-        rule.setReportRoomView(
+        setReportRoomView(
             aReportRoomState(eventSink = eventsRecorder),
         )
-        rule.clickOn(CommonStrings.action_report)
+        clickOn(CommonStrings.action_report)
     }
 
     @Test
-    fun `clicking on leave room option emits the expected event`() {
+    fun `clicking on leave room option emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReportRoomEvents>()
-        rule.setReportRoomView(
+        setReportRoomView(
             aReportRoomState(eventSink = eventsRecorder),
         )
-        rule.clickOn(CommonStrings.action_leave_room)
+        clickOn(CommonStrings.action_leave_room)
         eventsRecorder.assertSingle(ReportRoomEvents.ToggleLeaveRoom)
     }
 
     @Test
-    fun `typing text in the reason field emits the expected Event`() {
+    fun `typing text in the reason field emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ReportRoomEvents>()
-        rule.setReportRoomView(
+        setReportRoomView(
             aReportRoomState(
                 eventSink = eventsRecorder,
                 reason = ""
             ),
         )
-        rule.onNodeWithText("").performTextInput("Spam!")
+        onNodeWithText("").performTextInput("Spam!")
         eventsRecorder.assertSingle(ReportRoomEvents.UpdateReason("Spam!"))
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setReportRoomView(
+private fun AndroidComposeUiTest<ComponentActivity>.setReportRoomView(
     state: ReportRoomState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
index 552f1d0ec6..3023124e9e 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenter.kt
@@ -47,6 +47,7 @@ class ChangeRoomPermissionsPresenter(
             RoomPermissionsSection.MessagesAndContent -> persistentListOf(
                 RoomPermissionType.SEND_EVENTS,
                 RoomPermissionType.REDACT_EVENTS,
+                RoomPermissionType.SHARE_LIVE_LOCATION,
             )
             RoomPermissionsSection.ManageMembers -> persistentListOf(
                 RoomPermissionType.INVITE,
@@ -114,6 +115,7 @@ class ChangeRoomPermissionsPresenter(
                         RoomPermissionType.ROOM_AVATAR -> currentPermissions?.copy(roomAvatar = powerLevel)
                         RoomPermissionType.ROOM_TOPIC -> currentPermissions?.copy(roomTopic = powerLevel)
                         RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions?.copy(spaceChild = powerLevel)
+                        RoomPermissionType.SHARE_LIVE_LOCATION -> currentPermissions?.copy(beaconInfo = powerLevel, beacon = powerLevel)
                     }
                 }
                 is ChangeRoomPermissionsEvent.Save -> coroutineScope.save()
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
index 535f2b4a71..b6b2ca0bda 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsState.kt
@@ -65,6 +65,7 @@ data class ChangeRoomPermissionsState(
             RoomPermissionType.ROOM_AVATAR -> currentPermissions.roomAvatar
             RoomPermissionType.ROOM_TOPIC -> currentPermissions.roomTopic
             RoomPermissionType.SPACE_MANAGE_ROOMS -> currentPermissions.spaceChild
+            RoomPermissionType.SHARE_LIVE_LOCATION -> maxOf(currentPermissions.beacon, currentPermissions.beaconInfo)
         }
     }
 }
@@ -104,4 +105,5 @@ enum class RoomPermissionType {
     ROOM_AVATAR,
     ROOM_TOPIC,
     SPACE_MANAGE_ROOMS,
+    SHARE_LIVE_LOCATION,
 }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
index 2760272d8a..700a82795e 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsStateProvider.kt
@@ -63,5 +63,8 @@ private fun previewPermissions(): RoomPowerLevelsValues {
         // SpaceManagement section
         spaceChild = RoomMember.Role.Moderator.powerLevel,
         stateDefault = RoomMember.Role.Moderator.powerLevel,
+        // Live location beacon section
+        beacon = RoomMember.Role.Admin.powerLevel,
+        beaconInfo = RoomMember.Role.Moderator.powerLevel,
     )
 }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
index 529df0d50d..bb702ed90a 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsView.kt
@@ -127,6 +127,7 @@ private fun titleForType(type: RoomPermissionType): String = when (type) {
     RoomPermissionType.ROOM_AVATAR -> stringResource(R.string.screen_room_change_permissions_room_avatar)
     RoomPermissionType.ROOM_TOPIC -> stringResource(R.string.screen_room_change_permissions_room_topic)
     RoomPermissionType.SPACE_MANAGE_ROOMS -> stringResource(R.string.screen_room_change_permissions_manage_space_rooms)
+    RoomPermissionType.SHARE_LIVE_LOCATION -> stringResource(R.string.screen_room_change_permissions_live_location)
 }
 
 @PreviewsDayNight
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
index b033a5870d..848ab64f87 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesPresenter.kt
@@ -77,7 +77,7 @@ class ChangeRolesPresenter(
         val queryState = rememberTextFieldState()
         var searchActive by rememberSaveable { mutableStateOf(false) }
         var searchResults by remember {
-            mutableStateOf<SearchBarResultState<MembersByRole>>(SearchBarResultState.Initial())
+            mutableStateOf<SearchBarResultState<MembersByRole>>(SearchBarResultState.Initial)
         }
         val selectedUsers = remember {
             mutableStateOf<ImmutableList<MatrixUser>>(persistentListOf())
@@ -118,7 +118,7 @@ class ChangeRolesPresenter(
                 .groupedByRole()
 
             searchResults = if (results.isEmpty()) {
-                SearchBarResultState.NoResultsFound()
+                SearchBarResultState.NoResultsFound
             } else {
                 SearchBarResultState.Results(results)
             }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
index ebaf619d4e..e6b71ef752 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesStateProvider.kt
@@ -11,6 +11,10 @@ package io.element.android.features.rolesandpermissions.impl.roles
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -64,7 +68,7 @@ internal fun aChangeRolesState(
     role: RoomMember.Role = RoomMember.Role.Admin,
     searchQuery: String = "",
     isSearchActive: Boolean = false,
-    searchResults: SearchBarResultState<MembersByRole> = SearchBarResultState.NoResultsFound(),
+    searchResults: SearchBarResultState<MembersByRole> = SearchBarResultState.NoResultsFound,
     selectedUsers: ImmutableList<MatrixUser> = persistentListOf(),
     hasPendingChanges: Boolean = false,
     savingState: AsyncAction<Boolean> = AsyncAction.Uninitialized,
@@ -103,9 +107,9 @@ internal fun aChangeRolesStateWithSelectedUsers() = aChangeRolesState(
 internal fun aChangeRolesStateWithOwners(
     role: RoomMember.Role = RoomMember.Role.Admin,
     selectedUsers: List<MatrixUser> = listOf(
-        aMatrixUser(id = "@alice:server.org", displayName = "Alice"),
-        aMatrixUser(id = "@bob:server.org", displayName = "Bob"),
-        aMatrixUser(id = "@carol:server.org", displayName = "Carol"),
+        aMatrixUser(displayName = USER_NAME_ALICE),
+        aMatrixUser(displayName = USER_NAME_BOB),
+        aMatrixUser(displayName = USER_NAME_CAROL),
     ),
 ) = aChangeRolesState(
     role = role,
@@ -114,22 +118,22 @@ internal fun aChangeRolesStateWithOwners(
             members = persistentListOf(
                 aRoomMember(
                     userId = UserId("@alice:server.org"),
-                    displayName = "Alice",
+                    displayName = USER_NAME_ALICE,
                     role = RoomMember.Role.Owner(isCreator = true),
                 ),
                 aRoomMember(
                     userId = UserId("@bob:server.org"),
-                    displayName = "Bob",
+                    displayName = USER_NAME_BOB,
                     role = RoomMember.Role.Owner(isCreator = false),
                 ),
                 aRoomMember(
                     userId = UserId("@carol:server.org"),
-                    displayName = "Carol",
+                    displayName = USER_NAME_CAROL,
                     role = RoomMember.Role.Admin,
                 ),
                 aRoomMember(
                     userId = UserId("@david:server.org"),
-                    displayName = "David",
+                    displayName = USER_NAME_DAVID,
                     role = RoomMember.Role.User,
                 ),
             ),
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
index da69ee52a9..050027bb1c 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsNode.kt
@@ -26,12 +26,8 @@ class RolesAndPermissionsNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: RolesAndPermissionsPresenter,
-) : Node(buildContext, plugins = plugins), RolesAndPermissionsNavigator {
+) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin, RolesAndPermissionsNavigator {
-        override fun openAdminList()
-        override fun openModeratorList()
-        override fun openEditPermissions()
-
         override fun onBackClick() {}
     }
 
@@ -56,8 +52,8 @@ class RolesAndPermissionsNode(
 }
 
 interface RolesAndPermissionsNavigator {
-    fun onBackClick() {}
-    fun openAdminList() {}
-    fun openModeratorList() {}
-    fun openEditPermissions() {}
+    fun onBackClick()
+    fun openAdminList()
+    fun openModeratorList()
+    fun openEditPermissions()
 }
diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
index 269fdee664..3cf29c18cf 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsView.kt
@@ -12,7 +12,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
@@ -61,7 +62,7 @@ fun RolesAndPermissionsView(
             stringResource(R.string.screen_room_roles_and_permissions_admins)
         }
         ListItem(
-            headlineContent = { Text(adminsTitle) },
+            content = { Text(adminsTitle) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
             trailingContent = state.adminCount?.let { adminCount ->
                 ListItemContent.Text("$adminCount")
@@ -69,7 +70,7 @@ fun RolesAndPermissionsView(
             onClick = { rolesAndPermissionsNavigator.openAdminList() },
         )
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_moderators)) },
+            content = { Text(stringResource(R.string.screen_room_roles_and_permissions_moderators)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChatProblem())),
             trailingContent = state.moderatorCount?.let { moderationCount ->
                 ListItemContent.Text("$moderationCount")
@@ -78,20 +79,20 @@ fun RolesAndPermissionsView(
         )
         if (state.canSelfDemote) {
             ListItem(
-                headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_my_role)) },
+                content = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_my_role)) },
                 onClick = { state.eventSink(RolesAndPermissionsEvents.ChangeOwnRole) },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Edit()))
             )
         }
         HorizontalDivider()
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_permissions_header)) },
+            content = { Text(stringResource(R.string.screen_room_roles_and_permissions_permissions_header)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Settings())),
             onClick = { rolesAndPermissionsNavigator.openEditPermissions() },
         )
         HorizontalDivider()
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_reset)) },
+            content = { Text(stringResource(R.string.screen_room_roles_and_permissions_reset)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
             onClick = { state.eventSink(RolesAndPermissionsEvents.ResetPermissions) },
             style = ListItemStyle.Destructive,
@@ -141,7 +142,10 @@ private fun ChangeOwnRoleBottomSheet(
     eventSink: (RolesAndPermissionsEvents) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+    )
     fun dismiss() {
         sheetState.hide(coroutineScope) {
             eventSink(RolesAndPermissionsEvents.CancelPendingAction)
@@ -153,6 +157,7 @@ private fun ChangeOwnRoleBottomSheet(
             .navigationBarsPadding(),
         sheetState = sheetState,
         onDismissRequest = ::dismiss,
+        scrollable = true,
     ) {
         Text(
             modifier = Modifier.padding(14.dp),
@@ -168,7 +173,7 @@ private fun ChangeOwnRoleBottomSheet(
         )
         for (demoteAction in availableDemoteActions) {
             ListItem(
-                headlineContent = { Text(stringResource(demoteAction.titleRes)) },
+                content = { Text(stringResource(demoteAction.titleRes)) },
                 onClick = {
                     sheetState.hide(coroutineScope) {
                         eventSink(RolesAndPermissionsEvents.DemoteSelfTo(demoteAction.role))
@@ -178,9 +183,8 @@ private fun ChangeOwnRoleBottomSheet(
             )
         }
         ListItem(
-            headlineContent = { Text(stringResource(CommonStrings.action_cancel)) },
+            content = { Text(stringResource(CommonStrings.action_cancel)) },
             onClick = ::dismiss,
-            style = ListItemStyle.Primary,
         )
     }
 }
@@ -191,7 +195,12 @@ internal fun RolesAndPermissionsViewPreview(@PreviewParameter(RolesAndPermission
     ElementPreview {
         RolesAndPermissionsView(
             state = state,
-            rolesAndPermissionsNavigator = object : RolesAndPermissionsNavigator {},
+            rolesAndPermissionsNavigator = object : RolesAndPermissionsNavigator {
+                override fun onBackClick() {}
+                override fun openAdminList() {}
+                override fun openModeratorList() {}
+                override fun openEditPermissions() {}
+            },
         )
     }
 }
diff --git a/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
index 44841d1207..4e4ff9bb58 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-be/translations.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Толькі адміністратары"</string>
+  <string name="screen_room_change_permissions_administrators">"Адміністратар"</string>
   <string name="screen_room_change_permissions_ban_people">"Заблакіраваць людзей"</string>
   <string name="screen_room_change_permissions_delete_messages">"Выдаліць паведамленні"</string>
-  <string name="screen_room_change_permissions_invite_people">"Запрашайце людзей і прымайце запыты на далучэнне"</string>
+  <string name="screen_room_change_permissions_everyone">"Удзельнік"</string>
+  <string name="screen_room_change_permissions_invite_people">"Запрасіць людзей"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Паведамленні і змест"</string>
-  <string name="screen_room_change_permissions_moderators">"Адміністратары і мадэратары"</string>
+  <string name="screen_room_change_permissions_moderators">"Мадэратар"</string>
   <string name="screen_room_change_permissions_remove_people">"Выдаляйце людзей і адхіляйце запыты на далучэнне"</string>
   <string name="screen_room_change_permissions_room_avatar">"Змяніць аватар пакоя"</string>
   <string name="screen_room_change_permissions_room_details">"Рэдагаваць пакой"</string>
@@ -39,8 +40,8 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Яны змогуць зноў далучыцца да гэтага пакоя, калі іх запросяць."</string>
   <string name="screen_room_member_list_mode_banned">"Заблакіраваныя"</string>
   <string name="screen_room_member_list_mode_members">"Удзельнікі"</string>
-  <string name="screen_room_member_list_role_administrator">"Толькі адміністратары"</string>
-  <string name="screen_room_member_list_role_moderator">"Адміністратары і мадэратары"</string>
+  <string name="screen_room_member_list_role_administrator">"Адміністратар"</string>
+  <string name="screen_room_member_list_role_moderator">"Мадэратар"</string>
   <string name="screen_room_member_list_room_members_header_title">"Удзельнікі пакоя"</string>
   <string name="screen_room_member_list_unbanning_user">"Разблакіроўка %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"Адміністратары"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ca/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..eccea6f2df
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_change_permissions_administrators">"Només administradors"</string>
+  <string name="screen_room_change_permissions_ban_people">"Bandejar usuaris"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Eliminar missatges"</string>
+  <string name="screen_room_change_permissions_everyone">"Membre"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar persones i acceptar sol·licituds d\'unió"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gestiona membres"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Missatges i contingut"</string>
+  <string name="screen_room_change_permissions_moderators">"Administradors i moderadors"</string>
+  <string name="screen_room_change_permissions_remove_people">"Eliminar persones i rebutjar sol·licituds d\'unió"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Canvia la foto de la sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Edita detalls"</string>
+  <string name="screen_room_change_permissions_room_name">"Canvia el nom de la sala"</string>
+  <string name="screen_room_change_permissions_room_topic">"Canvia el tema de la sala"</string>
+  <string name="screen_room_change_permissions_send_messages">"Enviar missatges"</string>
+  <string name="screen_room_change_role_administrators_title">"Edita administradors"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"No podràs desfer aquesta acció. Estàs concedint a l\'usuari el mateix nivell de poder que tu."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Afegir com a administrador?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Descendeix"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"No podràs desfer aquest canvi ja que t\'estàs descendint de rang, si ets l\'últim usuari de la sala amb privilegis, no podràs recuperar-los."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Vols descendir de categoria?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (pendent)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(pendent)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Els administradors tenen automàticament privilegis de moderador"</string>
+  <string name="screen_room_change_role_moderators_title">"Edita moderadors"</string>
+  <string name="screen_room_change_role_section_administrators">"Administradors"</string>
+  <string name="screen_room_change_role_section_moderators">"Moderadors"</string>
+  <string name="screen_room_change_role_section_users">"Membres"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Hi ha canvis sense desar."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Desar canvis?"</string>
+  <string name="screen_room_member_list_banned_empty">"No hi ha usuaris bandejats en aquesta sala."</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d persona"</item>
+    <item quantity="other">"%1$d persones"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bandeja de la sala"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Només elimina\'l"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Desbandeja"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Podran tornar a unir-se a aquesta sala si se\'ls convida."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Readmet usuari"</string>
+  <string name="screen_room_member_list_mode_banned">"Bandejats"</string>
+  <string name="screen_room_member_list_mode_members">"Membres"</string>
+  <string name="screen_room_member_list_role_administrator">"Només administradors"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradors i moderadors"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Membres de la sala"</string>
+  <string name="screen_room_member_list_unbanning_user">"Readmetent %1$s"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Administradors"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Canvia el meu rol"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Descendeix a membre"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Descendeix a moderador"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Moderació de membres"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Missatges i contingut"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Moderadors"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Restableix permisos"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Si restableixes els permisos, perdràs la configuració actual."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Restablir permisos?"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"Rols"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"Detalls de sala"</string>
+  <string name="screen_room_roles_and_permissions_title">"Rols i permisos"</string>
+</resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
index 87936de3a7..662096dd20 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-cs/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Odstranit zprávy"</string>
   <string name="screen_room_change_permissions_everyone">"Člen"</string>
   <string name="screen_room_change_permissions_invite_people">"Pozvat přátele"</string>
+  <string name="screen_room_change_permissions_live_location">"Sdílet aktuální polohu"</string>
   <string name="screen_room_change_permissions_manage_space">"Správa prostoru"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Spravovat místnosti"</string>
   <string name="screen_room_change_permissions_member_moderation">"Spravovat členy"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
index 1c1f490580..02ec4ad07d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-et/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Eemalda sõnumid"</string>
   <string name="screen_room_change_permissions_everyone">"Liikmed"</string>
   <string name="screen_room_change_permissions_invite_people">"Osalejate kutsumine"</string>
+  <string name="screen_room_change_permissions_live_location">"Jaga asukohta reaalajas"</string>
   <string name="screen_room_change_permissions_manage_space">"Halda kogukonda"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Halda jututuba"</string>
   <string name="screen_room_change_permissions_member_moderation">"Liikmete haldus"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
index c526d059bc..e381cec856 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fa/translations.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"فقط مدیران"</string>
+  <string name="screen_room_change_permissions_administrators">"ادمین"</string>
   <string name="screen_room_change_permissions_ban_people">"تحریم افراد"</string>
-  <string name="screen_room_change_permissions_delete_messages">"برداشتن پیام‌ها"</string>
-  <string name="screen_room_change_permissions_everyone">"هرکسی"</string>
-  <string name="screen_room_change_permissions_invite_people">"دعوت افراد و پذیرش درخواست‌های پیوستن"</string>
-  <string name="screen_room_change_permissions_member_moderation">"نظارت اعضا"</string>
+  <string name="screen_room_change_permissions_delete_messages">"حذف پیام‌ها"</string>
+  <string name="screen_room_change_permissions_everyone">"عضو"</string>
+  <string name="screen_room_change_permissions_invite_people">"دعوت کاربران"</string>
+  <string name="screen_room_change_permissions_member_moderation">"مدیریت اعضا"</string>
   <string name="screen_room_change_permissions_messages_and_content">"پیام‌ها و محتوا"</string>
-  <string name="screen_room_change_permissions_moderators">"مدیرن و ناظران"</string>
-  <string name="screen_room_change_permissions_remove_people">"برداشتن افراد و رد درخواست‌های پیوستن"</string>
+  <string name="screen_room_change_permissions_moderators">"ناظم"</string>
+  <string name="screen_room_change_permissions_remove_people">"حذف افراد"</string>
   <string name="screen_room_change_permissions_room_avatar">"تغییر چهرک اتاق"</string>
-  <string name="screen_room_change_permissions_room_details">"ویرایش اتاق"</string>
+  <string name="screen_room_change_permissions_room_details">"ویرایش جزییات"</string>
   <string name="screen_room_change_permissions_room_name">"تغییر نام اتاق"</string>
   <string name="screen_room_change_permissions_room_topic">"دگرگونی موضوع اتاق"</string>
   <string name="screen_room_change_permissions_send_messages">"فرستادن پیام‌ها"</string>
@@ -32,7 +32,7 @@
   <string name="screen_room_change_role_section_users">"اعضا"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"تغییراتی ذخیره نشده دارید."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"ذخیرهٔ تغییرات؟"</string>
-  <string name="screen_room_member_list_banned_empty">"هیچ کاربر محرومی در این اتاق نیست."</string>
+  <string name="screen_room_member_list_banned_empty">"هیچ کاربری محروم نشده."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d نفر"</item>
     <item quantity="other">"%1$d نفر"</item>
@@ -44,8 +44,8 @@
   <string name="screen_room_member_list_manage_member_unban_title">"تحریم نکردن از اتاق"</string>
   <string name="screen_room_member_list_mode_banned">"محروم"</string>
   <string name="screen_room_member_list_mode_members">"اعضا"</string>
-  <string name="screen_room_member_list_role_administrator">"فقط مدیران"</string>
-  <string name="screen_room_member_list_role_moderator">"مدیرن و ناظران"</string>
+  <string name="screen_room_member_list_role_administrator">"ادمین"</string>
+  <string name="screen_room_member_list_role_moderator">"ناظم"</string>
   <string name="screen_room_member_list_role_owner">"مالک"</string>
   <string name="screen_room_member_list_room_members_header_title">"اعضای اتاق"</string>
   <string name="screen_room_member_list_unbanning_user">"رفع تحریم %1$s"</string>
@@ -59,8 +59,9 @@
   <string name="screen_room_roles_and_permissions_moderators">"ناظم‌ها"</string>
   <string name="screen_room_roles_and_permissions_owners">"مالکان"</string>
   <string name="screen_room_roles_and_permissions_reset">"بازنشانی اجازه‌ها"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"پس از بازنشانی اجازه‌ها تنظیمات فعلی را از دست خواهید داد."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"بازنشانی اجازه‌ها؟"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"نقش‌ها"</string>
   <string name="screen_room_roles_and_permissions_room_details">"جزییات اتاق"</string>
-  <string name="screen_room_roles_and_permissions_title">"نقش‌ها و اجازه‌ها"</string>
+  <string name="screen_room_roles_and_permissions_title">"نقش‌ها و مجوزها"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
index 7c5d635b14..fdc1c17f22 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fi/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Viestien poistaminen"</string>
   <string name="screen_room_change_permissions_everyone">"Jäsen"</string>
   <string name="screen_room_change_permissions_invite_people">"Kutsujen antaminen"</string>
+  <string name="screen_room_change_permissions_live_location">"Jaa reaaliaikainen sijainti"</string>
   <string name="screen_room_change_permissions_manage_space">"Tilan hallitseminen"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Huoneiden hallitseminen"</string>
   <string name="screen_room_change_permissions_member_moderation">"Jäsenien hallitseminen"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
index 7e5736bbed..677a4ba33b 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-fr/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Supprimer des messages"</string>
   <string name="screen_room_change_permissions_everyone">"Membre"</string>
   <string name="screen_room_change_permissions_invite_people">"Inviter des personnes"</string>
+  <string name="screen_room_change_permissions_live_location">"Partager la position en continu"</string>
   <string name="screen_room_change_permissions_manage_space">"Gérer l’espace"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Gérer les salons"</string>
   <string name="screen_room_change_permissions_member_moderation">"Gérer les membres"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml
index 7f24535124..fda73c88aa 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-hr/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Uklanjanje poruka"</string>
   <string name="screen_room_change_permissions_everyone">"Član"</string>
   <string name="screen_room_change_permissions_invite_people">"Pozivanje osoba"</string>
+  <string name="screen_room_change_permissions_live_location">"Dijeljenje lokacije uživo"</string>
   <string name="screen_room_change_permissions_manage_space">"Upravljaj prostorom"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Upravljaj sobama"</string>
   <string name="screen_room_change_permissions_member_moderation">"Upravljanje članovima"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
index e44a1dba21..9c88a2f20e 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-hu/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Üzenetek eltávolítása"</string>
   <string name="screen_room_change_permissions_everyone">"Tag"</string>
   <string name="screen_room_change_permissions_invite_people">"Emberek meghívása"</string>
+  <string name="screen_room_change_permissions_live_location">"Valós idejű hely megosztása"</string>
   <string name="screen_room_change_permissions_manage_space">"Tér kezelése"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Szobák kezelése"</string>
   <string name="screen_room_change_permissions_member_moderation">"Tagok kezelése"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
index 05844637ea..98f38095de 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-in/translations.xml
@@ -2,9 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_room_change_permissions_administrators">"Hanya admin"</string>
   <string name="screen_room_change_permissions_ban_people">"Cekal orang-orang"</string>
+  <string name="screen_room_change_permissions_change_settings">"Ubah pengaturan"</string>
   <string name="screen_room_change_permissions_delete_messages">"Hilangkan pesan"</string>
   <string name="screen_room_change_permissions_everyone">"Semua Anggota"</string>
   <string name="screen_room_change_permissions_invite_people">"Boleh mungundang"</string>
+  <string name="screen_room_change_permissions_live_location">"Bagikan lokasi secara langsung"</string>
+  <string name="screen_room_change_permissions_manage_space">"Kelola ruang"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Kelola ruangan"</string>
   <string name="screen_room_change_permissions_member_moderation">"Kelola anggota"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Pesan dan konten"</string>
   <string name="screen_room_change_permissions_moderators">"Admin dan moderator"</string>
@@ -14,6 +18,7 @@
   <string name="screen_room_change_permissions_room_name">"Ubah nama ruangan"</string>
   <string name="screen_room_change_permissions_room_topic">"Ubah topik ruangan"</string>
   <string name="screen_room_change_permissions_send_messages">"Kirim pesan"</string>
+  <string name="screen_room_change_permissions_title">"Permission"</string>
   <string name="screen_room_change_role_administrators_title">"Edit Admin"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Anda tidak akan dapat mengurungkan tindakan ini. Anda mempromosikan pengguna untuk memiliki tingkat daya yang sama seperti Anda."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Tambahkan Admin?"</string>
@@ -34,6 +39,11 @@
   <string name="screen_room_change_role_unsaved_changes_description">"Anda memiliki perubahan yang belum disimpan."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Simpan perubahan?"</string>
   <string name="screen_room_member_list_banned_empty">"Tidak ada pengguna yang dicekal dalam ruangan ini."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d Dilarang"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Periksa ejaannya atau coba pencarian baru"</string>
+  <string name="screen_room_member_list_empty_search_title">"Tidak ada hasil untuk%1$s"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d orang"</item>
   </plurals>
@@ -44,6 +54,10 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Batalkan cekalan dari ruangan"</string>
   <string name="screen_room_member_list_mode_banned">"Tercekal"</string>
   <string name="screen_room_member_list_mode_members">"Anggota"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d Diundang"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Tertunda"</string>
   <string name="screen_room_member_list_role_administrator">"Hanya admin"</string>
   <string name="screen_room_member_list_role_moderator">"Admin dan moderator"</string>
   <string name="screen_room_member_list_role_owner">"Pemilik"</string>
@@ -58,10 +72,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Pesan dan konten"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderator"</string>
   <string name="screen_room_roles_and_permissions_owners">"Pemilik"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Permission"</string>
   <string name="screen_room_roles_and_permissions_reset">"Atur ulang perizinan"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Setelah Anda mengatur ulang perizinan, Anda akan kehilangan pengaturan Anda saat ini."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Atur ulang perizinan?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Peran"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detail ruangan"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Detail ruang"</string>
   <string name="screen_room_roles_and_permissions_title">"Peran dan perizinan"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
index b1dea12151..ac1366d988 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-it/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
   <string name="screen_room_change_permissions_everyone">"Membro"</string>
   <string name="screen_room_change_permissions_invite_people">"Invita persone"</string>
+  <string name="screen_room_change_permissions_live_location">"Condividi posizione in tempo reale"</string>
   <string name="screen_room_change_permissions_manage_space">"Gestire lo spazio"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Gestisci le stanze"</string>
   <string name="screen_room_change_permissions_member_moderation">"Gestisci membri"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ja/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..28e1a9db89
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_change_permissions_administrators">"管理者"</string>
+  <string name="screen_room_change_permissions_ban_people">"ユーザーの追放"</string>
+  <string name="screen_room_change_permissions_change_settings">"設定の変更"</string>
+  <string name="screen_room_change_permissions_delete_messages">"メッセージの削除"</string>
+  <string name="screen_room_change_permissions_everyone">"メンバー"</string>
+  <string name="screen_room_change_permissions_invite_people">"ユーザーの招待"</string>
+  <string name="screen_room_change_permissions_live_location">"ライブ位置情報を共有"</string>
+  <string name="screen_room_change_permissions_manage_space">"スペースの管理"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"ルームを管理"</string>
+  <string name="screen_room_change_permissions_member_moderation">"メンバーの管理"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"メッセージと内容"</string>
+  <string name="screen_room_change_permissions_moderators">"モデレーター"</string>
+  <string name="screen_room_change_permissions_remove_people">"ユーザーの削除"</string>
+  <string name="screen_room_change_permissions_room_avatar">"アバターの変更"</string>
+  <string name="screen_room_change_permissions_room_details">"詳細を編集"</string>
+  <string name="screen_room_change_permissions_room_name">"名前の変更"</string>
+  <string name="screen_room_change_permissions_room_topic">"トピックの変更"</string>
+  <string name="screen_room_change_permissions_send_messages">"メッセージの送信"</string>
+  <string name="screen_room_change_permissions_title">"権限"</string>
+  <string name="screen_room_change_role_administrators_title">"管理者を編集"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"この操作は取り消せません。このユーザーをあなたと同じ権限まで昇格します。"</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"管理者を追加しますか？"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"この操作は取り消せません。選択したユーザーに所有権を譲与します。あなたがルームを退出すると恒久的に変更が適用されます。"</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"所有権を譲与しますか？"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"降格"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"自身を降格しようとしているため、後から取り消すことはできません。このルームに他に特権を持つユーザーが存在しない場合、それを回復することはできなくなります。"</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"自身を降格しますか？"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (承認待ち)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"承認待ち"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"管理者はモデレータの特権を有します。"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"所有者は管理者の特権を有します。"</string>
+  <string name="screen_room_change_role_moderators_title">"モデレーターを編集"</string>
+  <string name="screen_room_change_role_owners_title">"所有者を選択"</string>
+  <string name="screen_room_change_role_section_administrators">"管理者"</string>
+  <string name="screen_room_change_role_section_moderators">"モデレーター"</string>
+  <string name="screen_room_change_role_section_users">"メンバー"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"未保存の変更内容があります。"</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"変更を保存しますか？"</string>
+  <string name="screen_room_member_list_banned_empty">"追放されたユーザーはいません。"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d 人の追放"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"スペルを確認するか、新たに検索し直してください"</string>
+  <string name="screen_room_member_list_empty_search_title">"\"%1$s\" の検索結果はありません"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="other">"%1$d 人"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"ユーザーを追放"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"メンバーのみを削除"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"追放を解除"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"招待を受け取ると再度参加できます。"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"ユーザーの追放を解除"</string>
+  <string name="screen_room_member_list_mode_banned">"追放済み"</string>
+  <string name="screen_room_member_list_mode_members">"メンバー"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d 件の招待"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"待機中"</string>
+  <string name="screen_room_member_list_role_administrator">"管理者"</string>
+  <string name="screen_room_member_list_role_moderator">"モデレーター"</string>
+  <string name="screen_room_member_list_role_owner">"所有者"</string>
+  <string name="screen_room_member_list_room_members_header_title">"ルームのメンバー"</string>
+  <string name="screen_room_member_list_unbanning_user">"%1$s の追放を解除中"</string>
+  <string name="screen_room_roles_and_permissions_admins">"管理者"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理者と所有者"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"自身の役割を変更"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"権限を譲与"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"モデレーターに譲与"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"メンバーの編集"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"メッセージと内容"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"モデレーター"</string>
+  <string name="screen_room_roles_and_permissions_owners">"所有者"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"権限"</string>
+  <string name="screen_room_roles_and_permissions_reset">"権限をリセット"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"権限をリセットすると現在の設定はすべて失われます。"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"権限をリセットしますか？"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"役割"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"ルームの詳細"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"スペースの詳細"</string>
+  <string name="screen_room_roles_and_permissions_title">"役割と権限"</string>
+</resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
index 4ad64f1723..c9de19a43a 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ko/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"메시지 삭제"</string>
   <string name="screen_room_change_permissions_everyone">"멤버"</string>
   <string name="screen_room_change_permissions_invite_people">"사람 초대하기"</string>
+  <string name="screen_room_change_permissions_live_location">"실시간 위치 공유"</string>
   <string name="screen_room_change_permissions_manage_space">"스페이스 관리"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"방 관리"</string>
   <string name="screen_room_change_permissions_member_moderation">"멤버 관리"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
index 3536e03ad5..728cac0450 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-nb/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Fjern meldinger"</string>
   <string name="screen_room_change_permissions_everyone">"Medlem"</string>
   <string name="screen_room_change_permissions_invite_people">"Inviter folk"</string>
+  <string name="screen_room_change_permissions_live_location">"Del lokasjon i sanntid"</string>
   <string name="screen_room_change_permissions_manage_space">"Administrer området"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Administrer rom"</string>
   <string name="screen_room_change_permissions_member_moderation">"Administrer medlemmer"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
index 44659c47cd..9b570f5261 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-pl/translations.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_change_permissions_administrators">"Tylko administratorzy"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Banowanie osób"</string>
+  <string name="screen_room_change_permissions_change_settings">"Zmień ustawienia"</string>
   <string name="screen_room_change_permissions_delete_messages">"Usuń wiadomości"</string>
-  <string name="screen_room_change_permissions_invite_people">"Zapraszanie osób i akceptowanie próśb o dołączenie"</string>
+  <string name="screen_room_change_permissions_everyone">"Członek"</string>
+  <string name="screen_room_change_permissions_invite_people">"Zaproś osoby"</string>
+  <string name="screen_room_change_permissions_live_location">"Udostępnij lokalizację na żywo"</string>
+  <string name="screen_room_change_permissions_manage_space">"Zarządzaj przestrzeniami"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Zarządzaj pokojami"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Zarządzaj członkami"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Wiadomości i zawartość"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratorzy i moderatorzy"</string>
-  <string name="screen_room_change_permissions_remove_people">"Usuwanie osób i odrzucanie próśb o dołączenie"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Usuń osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Zmień awatar pokoju"</string>
-  <string name="screen_room_change_permissions_room_details">"Edytuj pokój"</string>
+  <string name="screen_room_change_permissions_room_details">"Edytuj szczegóły"</string>
   <string name="screen_room_change_permissions_room_name">"Zmień nazwę pokoju"</string>
   <string name="screen_room_change_permissions_room_topic">"Zmień temat pokoju"</string>
   <string name="screen_room_change_permissions_send_messages">"Wysyłanie wiadomości"</string>
+  <string name="screen_room_change_permissions_title">"Uprawnienia"</string>
   <string name="screen_room_change_role_administrators_title">"Edytuj administratorów"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Tej akcji nie będzie można cofnąć. Promujesz użytkownika, który będzie posiadał takie same uprawnienia jak Ty."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Dodać administratora?"</string>
@@ -21,7 +28,7 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Nie będzie można cofnąć tej zmiany, jeśli się zdegradujesz. Jeśli jesteś ostatnim uprzywilejowanym użytkownikiem w pokoju, nie będziesz w stanie odzyskać uprawnień."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Zdegradować siebie?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Oczekujące)"</string>
-  <string name="screen_room_change_role_invited_member_name_android">"(Oczekujący)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Oczekujące)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorzy automatycznie mają uprawnienia moderatora"</string>
   <string name="screen_room_change_role_moderators_owner_section_footer">"Właściciele automatycznie mają uprawnienia administratora."</string>
   <string name="screen_room_change_role_moderators_title">"Edytuj moderatorów"</string>
@@ -31,7 +38,14 @@
   <string name="screen_room_change_role_section_users">"Członków"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Masz niezapisane zmiany."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Zapisać zmiany?"</string>
-  <string name="screen_room_member_list_banned_empty">"W tym pokoju nie ma zbanowanych użytkowników."</string>
+  <string name="screen_room_member_list_banned_empty">"Nie ma zbanowanych użytkowników."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zbanowany"</item>
+    <item quantity="few">"%1$d zbanowanych"</item>
+    <item quantity="many">"%1$d zbanowanych"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Sprawdź pisownię lub wyszukaj ponownie"</string>
+  <string name="screen_room_member_list_empty_search_title">"Brak wyników dla “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osoba"</item>
     <item quantity="few">"%1$d osoby"</item>
@@ -44,8 +58,14 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj z pokoju"</string>
   <string name="screen_room_member_list_mode_banned">"Zbanowanych"</string>
   <string name="screen_room_member_list_mode_members">"Członków"</string>
-  <string name="screen_room_member_list_role_administrator">"Tylko administratorzy"</string>
-  <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d zaproszony"</item>
+    <item quantity="few">"%1$d zaproszonych"</item>
+    <item quantity="many">"%1$d zaproszonych"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Oczekuje"</string>
+  <string name="screen_room_member_list_role_administrator">"Administrator"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Właściciel"</string>
   <string name="screen_room_member_list_room_members_header_title">"Członkowie pokoju"</string>
   <string name="screen_room_member_list_unbanning_user">"Odbanowanie %1$s"</string>
@@ -58,10 +78,12 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Wiadomości i zawartość"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorzy"</string>
   <string name="screen_room_roles_and_permissions_owners">"Właściciele"</string>
-  <string name="screen_room_roles_and_permissions_reset">"Resetuj uprawnienia"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Uprawnienia"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Zresetuj uprawnienia"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po zresetowaniu uprawnień utracisz bieżące ustawienia."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Zresetować uprawnienia?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Role"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Szczegóły pokoju"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"Szczegóły przestrzeni"</string>
   <string name="screen_room_roles_and_permissions_title">"Role i uprawnienia"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
index ac9ec710a2..962f8b2d4d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ro/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Ștergeți mesajele"</string>
   <string name="screen_room_change_permissions_everyone">"Membru"</string>
   <string name="screen_room_change_permissions_invite_people">"Invitați persoane"</string>
+  <string name="screen_room_change_permissions_live_location">"Partajați locația în timp real"</string>
   <string name="screen_room_change_permissions_manage_space">"Gestionați spațiul"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Gestionați camerele"</string>
   <string name="screen_room_change_permissions_member_moderation">"Gestionați membrii"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
index 2b7fca0254..8ec7d7579c 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-ru/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Удалять сообщения"</string>
   <string name="screen_room_change_permissions_everyone">"Участники"</string>
   <string name="screen_room_change_permissions_invite_people">"Приглашать людей"</string>
+  <string name="screen_room_change_permissions_live_location">"Поделиться текущим местоположением"</string>
   <string name="screen_room_change_permissions_manage_space">"Управление пространством"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Управление комнатами"</string>
   <string name="screen_room_change_permissions_member_moderation">"Управлять участниками"</string>
@@ -19,7 +20,7 @@
   <string name="screen_room_change_permissions_send_messages">"Отправлять сообщения"</string>
   <string name="screen_room_change_permissions_title">"Разрешения"</string>
   <string name="screen_room_change_role_administrators_title">"Редактировать администраторов"</string>
-  <string name="screen_room_change_role_confirm_add_admin_description">"Вы не сможете отменить это действие. Вы даете пользователю такой же уровень прав, как и у вас"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Вы не сможете отменить это действие. Вы даете пользователю такой же уровень прав, как и у Вас"</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Добавить администратора?"</string>
   <string name="screen_room_change_role_confirm_change_owners_description">"Отменить данное действие будет невозможно. Права передадутся выбранным пользователям. После вашего выхода действие станет необратимым."</string>
   <string name="screen_room_change_role_confirm_change_owners_title">"Передать владение?"</string>
@@ -35,7 +36,7 @@
   <string name="screen_room_change_role_section_administrators">"Администраторы"</string>
   <string name="screen_room_change_role_section_moderators">"Модераторы"</string>
   <string name="screen_room_change_role_section_users">"Участники"</string>
-  <string name="screen_room_change_role_unsaved_changes_description">"У вас есть несохраненные изменения."</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"У Вас есть несохраненные изменения."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Сохранить изменения?"</string>
   <string name="screen_room_member_list_banned_empty">"В этой комнате нет заблокированных пользователей."</string>
   <plurals name="screen_room_member_list_banned_header_title">
diff --git a/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
index 7ce3e78387..5690886c60 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uk/translations.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Вилучати повідомлення"</string>
   <string name="screen_room_change_permissions_everyone">"Учасник"</string>
   <string name="screen_room_change_permissions_invite_people">"Запрошувати людей"</string>
+  <string name="screen_room_change_permissions_live_location">"Ділитися місцезнаходженням у реальному часі"</string>
   <string name="screen_room_change_permissions_manage_space">"Керувати простором"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Керувати кімнатами"</string>
   <string name="screen_room_change_permissions_member_moderation">"Керувати учасниками"</string>
@@ -38,6 +39,11 @@
   <string name="screen_room_change_role_unsaved_changes_description">"У вас є не збережені зміни."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Зберегти зміни?"</string>
   <string name="screen_room_member_list_banned_empty">"Немає заблокованих користувачів."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Заблокований"</item>
+    <item quantity="few">"%1$d Заблоковано"</item>
+    <item quantity="many">"%1$d Заблоковано"</item>
+  </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"Перевірте правопис або спробуйте новий пошук"</string>
   <string name="screen_room_member_list_empty_search_title">"Немає результатів за запитом «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
diff --git a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
index 566ce7f53c..33ff506375 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-uz/translations.xml
@@ -5,7 +5,8 @@
   <string name="screen_room_change_permissions_change_settings">"Sozlamalarni o‘zgartirish"</string>
   <string name="screen_room_change_permissions_delete_messages">"Xabarlarni olib tashlash"</string>
   <string name="screen_room_change_permissions_everyone">"A\'zo"</string>
-  <string name="screen_room_change_permissions_invite_people">"Odamlarni taklif qiling va qo‘shilish so‘rovlarini qabul qiling"</string>
+  <string name="screen_room_change_permissions_invite_people">"Odamlarni taklif qiling"</string>
+  <string name="screen_room_change_permissions_live_location">"Jonli joylashuvni ulashish"</string>
   <string name="screen_room_change_permissions_manage_space">"Maydonni boshqarish"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Xonalarni boshqarish"</string>
   <string name="screen_room_change_permissions_member_moderation">"A’zolarni boshqarish"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-vi/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..314b3ff6c4
--- /dev/null
+++ b/features/rolesandpermissions/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_change_permissions_administrators">"Quản trị viên"</string>
+  <string name="screen_room_change_permissions_ban_people">"Cấm người dùng"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Xóa tin nhắn"</string>
+  <string name="screen_room_change_permissions_everyone">"Thành viên"</string>
+  <string name="screen_room_change_permissions_invite_people">"Mời mọi người"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"Quản lý phòng trò chuyện"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Quản lý thành viên"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Tin nhắn và nội dung."</string>
+  <string name="screen_room_change_permissions_moderators">"Người điều hành"</string>
+  <string name="screen_room_change_permissions_remove_people">"Gỡ người dùng"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Đổi ảnh đại diện"</string>
+  <string name="screen_room_change_permissions_room_details">"Chỉnh sửa thông tin"</string>
+  <string name="screen_room_change_permissions_room_name">"Đổi tên"</string>
+  <string name="screen_room_change_permissions_room_topic">"Đổi chủ đề"</string>
+  <string name="screen_room_change_permissions_send_messages">"Gửi tin nhắn."</string>
+  <string name="screen_room_change_role_administrators_title">"Chỉnh sửa Quản trị viên"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Bạn sẽ không thể hoàn tác hành động này. Bạn đang thăng quyền cho người dùng lên cùng cấp quyền với bạn."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Thêm quản trị viên?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Giáng cấp"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"Bạn sẽ không thể hoàn tác thay đổi này vì bạn đang tự giáng cấp bản thân, nếu bạn là người dùng cuối cùng có đặc quyền trong phòng, nó sẽ không thể lấy lại đặc quyền."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Giáng cấp bản thân?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (Đang chờ xử lý)"</string>
+  <string name="screen_room_change_role_moderators_title">"Chỉnh sửa Người điều hành"</string>
+  <string name="screen_room_change_role_section_administrators">"Quản trị viên"</string>
+  <string name="screen_room_change_role_section_moderators">"Người điều hành"</string>
+  <string name="screen_room_change_role_section_users">"Thành viên"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Bạn có thay đổi chưa được lưu."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Lưu thay đổi?"</string>
+  <string name="screen_room_member_list_banned_empty">"Hiện không có người dùng nào bị cấm."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d bị cấm"</item>
+  </plurals>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="other">"%1$d người"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Cấm người dùng"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Chỉ xóa thành viên"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Bỏ cấm"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Họ có thể tham gia lại phòng này nếu được mời."</string>
+  <string name="screen_room_member_list_mode_banned">"Bị cấm"</string>
+  <string name="screen_room_member_list_mode_members">"Thành viên"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d được mời"</item>
+  </plurals>
+  <string name="screen_room_member_list_role_administrator">"Quản trị viên"</string>
+  <string name="screen_room_member_list_role_moderator">"Người điều hành"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Thành viên phòng"</string>
+  <string name="screen_room_member_list_unbanning_user">"Đang gỡ cấm %1$s"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Quản trị viên"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Thay đổi vai trò của tôi"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Hạ cấp xuống thành thành viên"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Hạ cấp xuống làm người điều hành"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Quản lý thành viên"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Tin nhắn và nội dung."</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Người điều hành"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Đặt lại quyền truy cập"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Sau khi bạn đặt lại quyền truy cập, bạn sẽ mất các cài đặt hiện tại."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Đặt lại quyền truy cập?"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"Vai trò"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"Chi tiết phòng"</string>
+  <string name="screen_room_roles_and_permissions_title">"Vai trò và quyền hạn"</string>
+</resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
index 7bc662e2fc..e9933c4819 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh-rTW/translations.xml
@@ -38,6 +38,9 @@
   <string name="screen_room_change_role_unsaved_changes_description">"您有尚未儲存的變更"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"是否儲存變更？"</string>
   <string name="screen_room_member_list_banned_empty">"沒有被封鎖的使用者。"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d 個已封鎖"</item>
+  </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"檢查拼字或嘗試新搜尋"</string>
   <string name="screen_room_member_list_empty_search_title">"找不到「%1$s」"</string>
   <plurals name="screen_room_member_list_header_title">
@@ -50,6 +53,9 @@
   <string name="screen_room_member_list_manage_member_unban_title">"從聊天室解除封鎖"</string>
   <string name="screen_room_member_list_mode_banned">"黑名單"</string>
   <string name="screen_room_member_list_mode_members">"成員"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d 個已邀請"</item>
+  </plurals>
   <string name="screen_room_member_list_pending_status">"擱置中"</string>
   <string name="screen_room_member_list_role_administrator">"管理員"</string>
   <string name="screen_room_member_list_role_moderator">"版主"</string>
diff --git a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
index 768bed1a86..53edd50a6d 100644
--- a/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values-zh/translations.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_room_change_permissions_administrators">"管理员"</string>
-  <string name="screen_room_change_permissions_ban_people">"封禁成员"</string>
+  <string name="screen_room_change_permissions_ban_people">"封禁人员"</string>
   <string name="screen_room_change_permissions_change_settings">"更改设置"</string>
   <string name="screen_room_change_permissions_delete_messages">"移除消息"</string>
   <string name="screen_room_change_permissions_everyone">"成员"</string>
   <string name="screen_room_change_permissions_invite_people">"邀请人员"</string>
+  <string name="screen_room_change_permissions_live_location">"共享实时位置"</string>
   <string name="screen_room_change_permissions_manage_space">"管理空间"</string>
-  <string name="screen_room_change_permissions_manage_space_rooms">"管理聊天室"</string>
+  <string name="screen_room_change_permissions_manage_space_rooms">"管理房间"</string>
   <string name="screen_room_change_permissions_member_moderation">"管理成员"</string>
   <string name="screen_room_change_permissions_messages_and_content">"消息和内容"</string>
   <string name="screen_room_change_permissions_moderators">"协管员"</string>
   <string name="screen_room_change_permissions_remove_people">"移除人员"</string>
-  <string name="screen_room_change_permissions_room_avatar">"更改聊天室头像"</string>
+  <string name="screen_room_change_permissions_room_avatar">"更改房间头像"</string>
   <string name="screen_room_change_permissions_room_details">"编辑详情"</string>
-  <string name="screen_room_change_permissions_room_name">"更改聊天室名称"</string>
-  <string name="screen_room_change_permissions_room_topic">"更改聊天室主题"</string>
+  <string name="screen_room_change_permissions_room_name">"更改房间名称"</string>
+  <string name="screen_room_change_permissions_room_topic">"更改房间主题"</string>
   <string name="screen_room_change_permissions_send_messages">"发送消息"</string>
   <string name="screen_room_change_permissions_title">"权限"</string>
   <string name="screen_room_change_role_administrators_title">"编辑管理员"</string>
-  <string name="screen_room_change_role_confirm_add_admin_description">"您将无法撤消此操作。您正在提升用户的权限，使其拥有与您平权。"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"此操作无法撤消。你正在提升用户的权限到与你相同的权力值。"</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"添加管理员？"</string>
-  <string name="screen_room_change_role_confirm_change_owners_description">"此操作无法撤销。您正在将所有权转移给所选用户。一旦离开此界面，该操作将永久生效。"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"此操作无法撤消。你正在将所有权转移给所选用户。一旦离开此处，该操作将永久生效。"</string>
   <string name="screen_room_change_role_confirm_change_owners_title">"转让所有权"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"降级"</string>
-  <string name="screen_room_change_role_confirm_demote_self_description">"您正在降级，此更改将无法撤消。如果您是聊天室中的最后一个特权用户，则无法重新获得权限。"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"你正在降级自身，此更改无法撤消。如果你是房间中的最后一个拥有特权的用户，则无法重新获得权限。"</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"降级自己？"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s（待处理）"</string>
   <string name="screen_room_change_role_invited_member_name_android">"（待处理）"</string>
@@ -35,22 +36,22 @@
   <string name="screen_room_change_role_section_administrators">"管理员"</string>
   <string name="screen_room_change_role_section_moderators">"协管员"</string>
   <string name="screen_room_change_role_section_users">"成员"</string>
-  <string name="screen_room_change_role_unsaved_changes_description">"您有未保存的更改。"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"你有未保存的更改。"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"保存更改？"</string>
-  <string name="screen_room_member_list_banned_empty">"没有被封禁的用户。"</string>
+  <string name="screen_room_member_list_banned_empty">"暂无被封禁的用户。"</string>
   <plurals name="screen_room_member_list_banned_header_title">
-    <item quantity="other">"%1$d 被禁用"</item>
+    <item quantity="other">"%1$d 人被封禁"</item>
   </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"检查拼写或尝试新搜索"</string>
   <string name="screen_room_member_list_empty_search_title">"未找到 “%1$s” 相关结果"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d 个人"</item>
   </plurals>
-  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"移除并封禁成员"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"封禁用户"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"仅移除成员"</string>
-  <string name="screen_room_member_list_manage_member_unban_action">"取消封禁"</string>
-  <string name="screen_room_member_list_manage_member_unban_message">"如果受到邀请，他们可以重新加入聊天室。"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"从房间取消解封"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"解封"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"如果他们受到邀请，则可以重新加入房间。"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"解封用户"</string>
   <string name="screen_room_member_list_mode_banned">"已封禁用户"</string>
   <string name="screen_room_member_list_mode_members">"成员"</string>
   <plurals name="screen_room_member_list_pending_header_title">
@@ -60,10 +61,10 @@
   <string name="screen_room_member_list_role_administrator">"管理员"</string>
   <string name="screen_room_member_list_role_moderator">"协管员"</string>
   <string name="screen_room_member_list_role_owner">"所有者"</string>
-  <string name="screen_room_member_list_room_members_header_title">"聊天室成员"</string>
-  <string name="screen_room_member_list_unbanning_user">"解除封禁 %1$s"</string>
+  <string name="screen_room_member_list_room_members_header_title">"房间成员"</string>
+  <string name="screen_room_member_list_unbanning_user">"正在解除封禁 %1$s"</string>
   <string name="screen_room_roles_and_permissions_admins">"管理员"</string>
-  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理员和所有者"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理员与所有者"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"更改我的角色"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"降级为成员"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"降级为协管员"</string>
@@ -73,10 +74,10 @@
   <string name="screen_room_roles_and_permissions_owners">"所有者"</string>
   <string name="screen_room_roles_and_permissions_permissions_header">"权限"</string>
   <string name="screen_room_roles_and_permissions_reset">"重置权限"</string>
-  <string name="screen_room_roles_and_permissions_reset_confirm_description">"重置权限后，您将丢失当前设置。"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"重置权限后你将丢失当前设置。"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"重置权限？"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"角色"</string>
-  <string name="screen_room_roles_and_permissions_room_details">"聊天室详情"</string>
-  <string name="screen_room_roles_and_permissions_space_details">"空间详情"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"房间详细信息"</string>
+  <string name="screen_room_roles_and_permissions_space_details">"空间详细信息"</string>
   <string name="screen_room_roles_and_permissions_title">"角色与权限"</string>
 </resources>
diff --git a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
index e5ab3f1cd7..dc89095786 100644
--- a/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
+++ b/features/rolesandpermissions/impl/src/main/res/values/localazy.xml
@@ -6,6 +6,7 @@
   <string name="screen_room_change_permissions_delete_messages">"Remove messages"</string>
   <string name="screen_room_change_permissions_everyone">"Member"</string>
   <string name="screen_room_change_permissions_invite_people">"Invite people"</string>
+  <string name="screen_room_change_permissions_live_location">"Share live location"</string>
   <string name="screen_room_change_permissions_manage_space">"Manage space"</string>
   <string name="screen_room_change_permissions_manage_space_rooms">"Manage rooms"</string>
   <string name="screen_room_change_permissions_member_moderation">"Manage members"</string>
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
index ba7d47adb2..c143b7c969 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsPresenterTest.kt
@@ -66,6 +66,7 @@ class ChangeRoomPermissionsPresenterTest {
             assertThat(itemsBySection[RoomPermissionsSection.MessagesAndContent]).containsExactly(
                 RoomPermissionType.SEND_EVENTS,
                 RoomPermissionType.REDACT_EVENTS,
+                RoomPermissionType.SHARE_LIVE_LOCATION,
             )
             assertThat(itemsBySection[RoomPermissionsSection.ManageMembers]).containsExactly(
                 RoomPermissionType.INVITE,
@@ -148,7 +149,9 @@ class ChangeRoomPermissionsPresenterTest {
                         roomName = Moderator.powerLevel,
                         roomAvatar = Moderator.powerLevel,
                         roomTopic = Moderator.powerLevel,
-                        spaceChild = initialPermissions.spaceChild
+                        spaceChild = initialPermissions.spaceChild,
+                        beacon = initialPermissions.beacon,
+                        beaconInfo = initialPermissions.beaconInfo,
                     )
                 )
             }
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
index f28c9c150f..57307706e0 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/permissions/ChangeRoomPermissionsViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.rolesandpermissions.impl.permissions
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -21,86 +23,81 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ChangeRoomPermissionsViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ChangeRoomPermissionsViewTest : RobolectricTest() {
     @Test
-    fun `click on back icon invokes Exit`() {
+    fun `click on back icon invokes Exit`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 eventSink = recorder
             )
         )
-        rule.pressBack()
+        pressBack()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
     }
 
     @Test
-    fun `click on back key invokes Exit`() {
+    fun `click on back key invokes Exit`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 eventSink = recorder
             )
         )
-        rule.pressBackKey()
+        pressBackKey()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
     }
 
     @Test
-    fun `when confirming exit with pending changes, using the back key actually exits`() {
+    fun `when confirming exit with pending changes, using the back key actually exits`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 hasChanges = true,
                 eventSink = recorder,
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
     }
 
     @Test
-    fun `when confirming exit with pending changes, clicking on 'discard' button in the dialog actually exits`() {
+    fun `when confirming exit with pending changes, clicking on 'discard' button in the dialog actually exits`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 hasChanges = true,
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_discard)
+        clickOn(CommonStrings.action_discard)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Exit)
     }
 
     @Test
-    fun `when confirming exit with pending changes, clicking on 'save' button in the dialog saves the changes`() {
+    fun `when confirming exit with pending changes, clicking on 'save' button in the dialog saves the changes`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 hasChanges = true,
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        clickOn(CommonStrings.action_save, inDialog = true)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Save)
     }
 
     @Test
-    fun `click on a role item triggers ChangeRole event`() {
+    fun `click on a role item triggers ChangeRole event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 itemsBySection = persistentMapOf(
                     // Makes sure there is only one item to click on
@@ -109,70 +106,70 @@ class ChangeRoomPermissionsViewTest {
                 eventSink = recorder,
             )
         )
-        rule.clickOn(R.string.screen_room_change_permissions_room_name)
-        rule.clickOn(R.string.screen_room_change_permissions_everyone)
+        clickOn(R.string.screen_room_change_permissions_room_name)
+        clickOn(R.string.screen_room_change_permissions_everyone)
         recorder.assertSingle(
             ChangeRoomPermissionsEvent.ChangeMinimumRoleForAction(RoomPermissionType.ROOM_NAME, SelectableRole.Everyone),
         )
     }
 
     @Test
-    fun `click on the Save menu item triggers Save event`() {
+    fun `click on the Save menu item triggers Save event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 hasChanges = true,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         recorder.assertSingle(ChangeRoomPermissionsEvent.Save)
     }
 
     @Test
-    fun `a successful save exits the screen`() {
+    fun `a successful save exits the screen`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(true) { callback ->
-            rule.setChangeRoomPermissionsRule(
+            setChangeRoomPermissionsRule(
                 state = aChangeRoomPermissionsState(
                     hasChanges = true,
                     saveAction = AsyncAction.Success(true),
                 ),
                 onComplete = callback,
             )
-            rule.clickOn(CommonStrings.action_save)
+            clickOn(CommonStrings.action_save)
         }
     }
 
     @Test
-    fun `a cancellation exits the screen`() {
+    fun `a cancellation exits the screen`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(false) { callback ->
-            rule.setChangeRoomPermissionsRule(
+            setChangeRoomPermissionsRule(
                 state = aChangeRoomPermissionsState(
                     hasChanges = true,
                     saveAction = AsyncAction.Success(false),
                 ),
                 onComplete = callback,
             )
-            rule.clickOn(CommonStrings.action_save)
+            clickOn(CommonStrings.action_save)
         }
     }
 
     @Test
-    fun `click on the Ok option in save error dialog triggers ResetPendingAction event`() {
+    fun `click on the Ok option in save error dialog triggers ResetPendingAction event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ChangeRoomPermissionsEvent>()
-        rule.setChangeRoomPermissionsRule(
+        setChangeRoomPermissionsRule(
             state = aChangeRoomPermissionsState(
                 hasChanges = true,
                 saveAction = AsyncAction.Failure(IllegalStateException("Failed to set room power levels")),
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         recorder.assertSingle(ChangeRoomPermissionsEvent.ResetPendingActions)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChangeRoomPermissionsRule(
+private fun AndroidComposeUiTest<ComponentActivity>.setChangeRoomPermissionsRule(
     state: ChangeRoomPermissionsState = aChangeRoomPermissionsState(),
     onComplete: (Boolean) -> Unit = EnsureNeverCalledWithParam(),
 ) {
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
index 09bef49cbd..dfc2b88e25 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt
@@ -6,16 +6,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.rolesandpermissions.impl.roles
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.extensions.runCatchingExceptions
@@ -29,21 +31,16 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.toImmutableList
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class ChangeRolesViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class ChangeRolesViewTest : RobolectricTest() {
     @Test
-    fun `passing a 'User' role throws an exception`() {
+    fun `passing a 'User' role throws an exception`() = runAndroidComposeUiTest {
         val exception = runCatchingExceptions {
-            rule.setChangeRolesContent(
+            setChangeRolesContent(
                 state = aChangeRolesState(
                     role = RoomMember.Role.User,
                     eventSink = EnsureNeverCalledWithParam(),
@@ -54,106 +51,106 @@ class ChangeRolesViewTest {
     }
 
     @Test
-    fun `back key - with search active toggles the search`() {
+    fun `back key - with search active toggles the search`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
 
         // Advance time to let the event be processed, as the search toggle might have some delay (e.g. for the animation)
-        rule.mainClock.advanceTimeBy(1)
+        mainClock.advanceTimeBy(1)
 
         eventsRecorder.assertSingle(ChangeRolesEvent.ToggleSearchActive)
     }
 
     @Test
-    fun `back key - with search inactive exits the screen`() {
+    fun `back key - with search inactive exits the screen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = false,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(ChangeRolesEvent.Exit)
     }
 
     @Test
-    fun `back button - exits the screen`() {
+    fun `back button - exits the screen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = false,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressBack()
+        pressBack()
         eventsRecorder.assertSingle(ChangeRolesEvent.Exit)
     }
 
     @Test
-    fun `save button - with changes, it saves them`() {
+    fun `save button - with changes, it saves them`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 hasPendingChanges = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save button - with no changes, does nothing`() {
+    fun `save button - with no changes, does nothing`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 hasPendingChanges = false,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertEmpty()
     }
 
     @Test
-    fun `exit confirmation dialog - discard exits the screen`() {
+    fun `exit confirmation dialog - discard exits the screen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
                 savingState = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_discard)
+        clickOn(CommonStrings.action_discard)
         eventsRecorder.assertSingle(ChangeRolesEvent.Exit)
     }
 
     @Test
-    fun `exit confirmation dialog - save emits the save event`() {
+    fun `exit confirmation dialog - save emits the save event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
                 savingState = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save admins confirmation dialog - submit saves the changes`() {
+    fun `save admins confirmation dialog - submit saves the changes`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
@@ -161,14 +158,14 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save owners confirmation dialog - continue saves the changes`() {
+    fun `save owners confirmation dialog - continue saves the changes`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Owner(isCreator = false),
                 isSearchActive = true,
@@ -176,14 +173,14 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ChangeRolesEvent.Save)
     }
 
     @Test
-    fun `save admins confirmation dialog - cancel removes the dialog`() {
+    fun `save admins confirmation dialog - cancel removes the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Admin,
                 isSearchActive = true,
@@ -191,14 +188,14 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
-    fun `save owners confirmation dialog - cancel removes the dialog`() {
+    fun `save owners confirmation dialog - cancel removes the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 role = RoomMember.Role.Owner(isCreator = false),
                 isSearchActive = true,
@@ -206,39 +203,39 @@ class ChangeRolesViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
-    fun `error dialog - dismissing removes the dialog`() {
+    fun `error dialog - dismissing removes the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
                 savingState = AsyncAction.Failure(IllegalStateException("boom")),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(ChangeRolesEvent.CloseDialog)
     }
 
     @Test
-    fun `testing removing user from selected list emits the expected event`() {
+    fun `testing removing user from selected list emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         val selectedUsers = aMatrixUserList().take(2)
         val userToDeselect = selectedUsers[1]
         assertThat(userToDeselect.displayName).isEqualTo("Bob")
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = aChangeRolesStateWithSelectedUsers().copy(
                 selectedUsers = selectedUsers.toImmutableList(),
                 eventSink = eventsRecorder,
             ),
         )
         // Unselect the user from the row list
-        val contentDescription = rule.activity.getString(CommonStrings.action_remove)
-        rule.onNodeWithContentDescription(
+        val contentDescription = activity!!.getString(CommonStrings.action_remove)
+        onNodeWithContentDescription(
             label = contentDescription,
             useUnmergedTree = true,
         ).performClick()
@@ -247,7 +244,7 @@ class ChangeRolesViewTest {
 
     @Test
     @Config(qualifiers = "h1000dp")
-    fun `testing adding user to the selected list emits the expected event`() {
+    fun `testing adding user to the selected list emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         val selectedUsers = aMatrixUserList().take(2)
         val state = aChangeRolesStateWithSelectedUsers().copy(
@@ -256,16 +253,16 @@ class ChangeRolesViewTest {
         )
         val userToSelect = (state.searchResults as SearchBarResultState.Results).results.members.first().toMatrixUser()
         assertThat(userToSelect.displayName).isEqualTo("Carol")
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = state,
         )
         // Select the user from the user list
-        rule.onNodeWithText("Carol").performClick()
+        onNodeWithText("Carol").performClick()
         eventsRecorder.assertSingle(ChangeRolesEvent.UserSelectionToggled(userToSelect))
     }
 
     @Test
-    fun `testing removing user to the selected list emits the expected event`() {
+    fun `testing removing user to the selected list emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ChangeRolesEvent>()
         val selectedUsers = aMatrixUserList().take(2)
         val state = aChangeRolesStateWithSelectedUsers().copy(
@@ -274,18 +271,18 @@ class ChangeRolesViewTest {
         )
         val userToSelect = (state.searchResults as SearchBarResultState.Results).results.moderators.first().toMatrixUser()
         assertThat(userToSelect.displayName).isEqualTo("Bob")
-        rule.setChangeRolesContent(
+        setChangeRolesContent(
             state = state,
         )
         // Unselect the user from the user list
-        rule.onAllNodesWithText(
+        onAllNodesWithText(
             text = "Bob",
             useUnmergedTree = true,
         )[1].performClick()
         eventsRecorder.assertSingle(ChangeRolesEvent.UserSelectionToggled(userToSelect))
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChangeRolesContent(
+    private fun AndroidComposeUiTest<ComponentActivity>.setChangeRolesContent(
         state: ChangeRolesState,
     ) {
         setContent {
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
index 7d190b85f4..8add944927 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/DefaultChangeRoomMemberRolesEntyPointTest.kt
@@ -8,18 +8,16 @@
 
 package io.element.android.features.rolesandpermissions.impl.roles
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.rolesandpermissions.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.tests.testutils.node.TestParentNode
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultChangeRoomMemberRolesEntyPointTest {
+class DefaultChangeRoomMemberRolesEntyPointTest : RobolectricTest() {
     @Test
     fun `test node builder`() = runTest {
         val entryPoint = DefaultChangeRoomMemberRolesEntyPoint()
diff --git a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
index e08ae205b7..8a3b6fd766 100644
--- a/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
+++ b/features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/root/RolesAndPermissionsViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.rolesandpermissions.impl.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.rolesandpermissions.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -22,160 +24,154 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledTimes
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class RolesAndPermissionsViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class RolesAndPermissionsViewTest : RobolectricTest() {
     @Test
-    fun `click on back invokes expected callback`() {
+    fun `click on back invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRolesAndPermissionsView(
+            setRolesAndPermissionsView(
                 goBack = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `tapping on Admins opens admin list`() {
+    fun `tapping on Admins opens admin list`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRolesAndPermissionsView(
+            setRolesAndPermissionsView(
                 aRolesAndPermissionsState(
                     roomSupportsOwners = false,
                     eventSink = EventsRecorder(expectEvents = false)
                 ),
                 openAdminList = callback,
             )
-            rule.clickOn(R.string.screen_room_roles_and_permissions_admins)
+            clickOn(R.string.screen_room_roles_and_permissions_admins)
         }
     }
 
     @Test
-    fun `tapping on Admins and Owners opens admin list`() {
+    fun `tapping on Admins and Owners opens admin list`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRolesAndPermissionsView(
+            setRolesAndPermissionsView(
                 aRolesAndPermissionsState(
                     roomSupportsOwners = true,
                     eventSink = EventsRecorder(expectEvents = false)
                 ),
                 openAdminList = callback,
             )
-            rule.clickOn(R.string.screen_room_roles_and_permissions_admins_and_owners)
+            clickOn(R.string.screen_room_roles_and_permissions_admins_and_owners)
         }
     }
 
     @Test
-    fun `tapping on Moderators opens moderators list`() {
+    fun `tapping on Moderators opens moderators list`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRolesAndPermissionsView(
+            setRolesAndPermissionsView(
                 openModeratorList = callback,
             )
-            rule.clickOn(R.string.screen_room_roles_and_permissions_moderators)
+            clickOn(R.string.screen_room_roles_and_permissions_moderators)
         }
     }
 
     @Test
     @Config(qualifiers = "h640dp")
-    fun `tapping permission item open the change permissions screen`() {
+    fun `tapping permission item open the change permissions screen`() = runAndroidComposeUiTest {
         ensureCalledTimes(1) { callback ->
-            rule.setRolesAndPermissionsView(
+            setRolesAndPermissionsView(
                 openEditPermissions = callback,
             )
-            rule.clickOn(R.string.screen_room_roles_and_permissions_permissions_header)
+            clickOn(R.string.screen_room_roles_and_permissions_permissions_header)
         }
     }
 
     @Test
     @Config(qualifiers = "h640dp")
-    fun `tapping on reset permissions triggers ResetPermissions event`() {
+    fun `tapping on reset permissions triggers ResetPermissions event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(R.string.screen_room_roles_and_permissions_reset)
+        clickOn(R.string.screen_room_roles_and_permissions_reset)
         recorder.assertSingle(RolesAndPermissionsEvents.ResetPermissions)
     }
 
     @Test
-    fun `tapping on Reset in the reset permissions confirmation dialog triggers ResetPermissions event`() {
+    fun `tapping on Reset in the reset permissions confirmation dialog triggers ResetPermissions event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 resetPermissionsAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_reset)
+        clickOn(CommonStrings.action_reset)
         recorder.assertSingle(RolesAndPermissionsEvents.ResetPermissions)
     }
 
     @Test
-    fun `tapping on Cancel in the reset permissions confirmation dialog triggers CancelPendingAction event`() {
+    fun `tapping on Cancel in the reset permissions confirmation dialog triggers CancelPendingAction event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 resetPermissionsAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         recorder.assertSingle(RolesAndPermissionsEvents.CancelPendingAction)
     }
 
     @Test
-    fun `tapping on 'Demote to moderator' in the demote self bottom sheet triggers the right event`() {
+    fun `tapping on 'Demote to moderator' in the demote self bottom sheet triggers the right event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(R.string.screen_room_roles_and_permissions_change_role_demote_to_moderator)
-        rule.mainClock.advanceTimeBy(1_000L)
+        clickOn(R.string.screen_room_roles_and_permissions_change_role_demote_to_moderator)
+        mainClock.advanceTimeBy(1_000L)
         recorder.assertSingle(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.Moderator))
     }
 
     @Test
-    fun `tapping on 'Demote to member' in the demote self bottom sheet triggers the right event`() = runTest {
+    fun `tapping on 'Demote to member' in the demote self bottom sheet triggers the right event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(R.string.screen_room_roles_and_permissions_change_role_demote_to_member)
-        rule.mainClock.advanceTimeBy(1_000L)
+        clickOn(R.string.screen_room_roles_and_permissions_change_role_demote_to_member)
+        mainClock.advanceTimeBy(1_000L)
         recorder.assertSingle(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.User))
     }
 
     @Test
-    fun `tapping on 'Cancel' in the demote self bottom sheet triggers the right event`() {
+    fun `tapping on 'Cancel' in the demote self bottom sheet triggers the right event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
-        rule.setRolesAndPermissionsView(
+        setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
                 changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
-        rule.mainClock.advanceTimeBy(1_000L)
+        clickOn(CommonStrings.action_cancel)
+        mainClock.advanceTimeBy(1_000L)
         recorder.assertSingle(RolesAndPermissionsEvents.CancelPendingAction)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRolesAndPermissionsView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRolesAndPermissionsView(
     state: RolesAndPermissionsState = aRolesAndPermissionsState(
         roomSupportsOwners = false,
         eventSink = EventsRecorder(expectEvents = false),
diff --git a/features/roomaliasresolver/impl/src/main/res/values-ca/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..ea90cabc34
--- /dev/null
+++ b/features/roomaliasresolver/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_loading_alert_title">"No s\'ha pogut mostrar la vista prèvia de la sala"</string>
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"No s\'ha pogut obtenir l\'àlies de sala."</string>
+</resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-fa/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..4fba81c4f8
--- /dev/null
+++ b/features/roomaliasresolver/impl/src/main/res/values-fa/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"شکست در دریافت نام مستعار اتاق."</string>
+</resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-ja/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..4e3f765f88
--- /dev/null
+++ b/features/roomaliasresolver/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_loading_alert_title">"ルームのプレビューを表示できません"</string>
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"ルームエイリアスを解決できません。"</string>
+</resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-vi/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..b08c97b72a
--- /dev/null
+++ b/features/roomaliasresolver/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_loading_alert_title">"Không thể hiển thị bản xem trước của phòng này"</string>
+</resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-zh/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-zh/translations.xml
index 52934b6a08..6b44301045 100644
--- a/features/roomaliasresolver/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomaliasresolver/impl/src/main/res/values-zh/translations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_join_room_loading_alert_title">"无法显示此房间预览"</string>
-  <string name="screen_room_alias_resolver_resolve_alias_failure">"无法解析聊天室别名。"</string>
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"无法解析房间别名。"</string>
 </resources>
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
index 4b37f993f9..ae33517732 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.roomaliasresolver.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -22,48 +24,43 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomAliasHelperViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomAliasHelperViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setRoomAliasResolverView(
+            setRoomAliasResolverView(
                 aRoomAliasResolverState(
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on Retry emits the expected Event`() {
+    fun `clicking on Retry emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>()
-        rule.setRoomAliasResolverView(
+        setRoomAliasResolverView(
             aRoomAliasResolverState(
                 resolveState = AsyncData.Failure(Exception("Error")),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_retry)
+        clickOn(CommonStrings.action_retry)
         eventsRecorder.assertSingle(RoomAliasResolverEvents.Retry)
     }
 
     @Test
-    fun `success state invokes the expected Callback`() {
+    fun `success state invokes the expected Callback`() = runAndroidComposeUiTest {
         val result = aResolvedRoomAlias()
         val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
         ensureCalledOnceWithParam(result) {
-            rule.setRoomAliasResolverView(
+            setRoomAliasResolverView(
                 aRoomAliasResolverState(
                     resolveState = AsyncData.Success(result),
                     eventSink = eventsRecorder,
@@ -74,7 +71,7 @@ class RoomAliasHelperViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomAliasResolverView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomAliasResolverView(
     state: RoomAliasResolverState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onAliasResolved: (ResolvedRoomAlias) -> Unit = EnsureNeverCalledWithParam(),
diff --git a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
index 54ffdf6c25..15e320c8f8 100644
--- a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
+++ b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
@@ -20,8 +20,9 @@ import io.element.android.features.call.api.CurrentCallService
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.canCall
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 
@@ -57,8 +58,7 @@ class RoomCallStatePresenter(
                         canJoinCall = canJoinCall,
                         isUserInTheCall = isUserInTheCall,
                         isUserLocallyInTheCall = isUserLocallyInTheCall,
-                        // TODO resolve intent while the call is ongoing
-                        isAudioCall = false
+                        isAudioCall = roomInfo.activeCallIntentConsensus.isAudio(),
                     )
                     else -> RoomCallState.StandBy(
                         canStartCall = canJoinCall,
@@ -70,3 +70,12 @@ class RoomCallStatePresenter(
         return callState
     }
 }
+
+fun CallIntentConsensus.isAudio(): Boolean {
+    val intent = when (this) {
+        is CallIntentConsensus.Full -> callIntent
+        is CallIntentConsensus.Partial -> callIntent
+        is CallIntentConsensus.None -> return false
+    }
+    return intent == CallIntent.AUDIO
+}
diff --git a/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt b/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
index 0a561ad59a..0612adbea1 100644
--- a/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
+++ b/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
@@ -14,6 +14,8 @@ import io.element.android.features.call.api.CurrentCallService
 import io.element.android.features.call.test.FakeCurrentCallService
 import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.features.roomcall.api.RoomCallState
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.api.room.CallIntentConsensus
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
@@ -87,10 +89,10 @@ class RoomCallStatePresenterTest {
     }
 
     @Test
-    fun `present - initial state - when is direct room`() = runTest {
+    fun `present - initial state - when is DM room`() = runTest {
         val room = FakeJoinedRoom(
             baseRoom = FakeBaseRoom(
-                initialRoomInfo = aRoomInfo(isDirect = true),
+                initialRoomInfo = aRoomInfo(isDm = true),
                 roomPermissions = roomPermissions(true),
             )
         )
@@ -188,6 +190,100 @@ class RoomCallStatePresenterTest {
         }
     }
 
+    @Test
+    fun `present - active call with audio Intent`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(true),
+            ).apply {
+                givenRoomInfo(
+                    aRoomInfo(
+                        hasRoomCall = true,
+                        activeCallIntentConsensus = CallIntentConsensus.Full(CallIntent.AUDIO),
+                        activeRoomCallParticipants = emptyList(),
+                    )
+                )
+            }
+        )
+        val presenter = createRoomCallStatePresenter(
+            joinedRoom = room,
+            currentCallService = FakeCurrentCallService(MutableStateFlow(CurrentCall.RoomCall(room.roomId))),
+        )
+        presenter.test {
+            skipItems(1)
+            assertThat(awaitItem()).isEqualTo(
+                RoomCallState.OnGoing(
+                    canJoinCall = true,
+                    isAudioCall = true,
+                    isUserInTheCall = false,
+                    isUserLocallyInTheCall = true,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - active call with partial audio Intent`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(true),
+            ).apply {
+                givenRoomInfo(
+                    aRoomInfo(
+                        hasRoomCall = true,
+                        activeCallIntentConsensus = CallIntentConsensus.Partial(CallIntent.AUDIO, 1, 4),
+                    )
+                )
+            }
+        )
+        val presenter = createRoomCallStatePresenter(
+            joinedRoom = room,
+            currentCallService = FakeCurrentCallService(MutableStateFlow(CurrentCall.RoomCall(room.roomId))),
+        )
+        presenter.test {
+            skipItems(1)
+            assertThat(awaitItem()).isEqualTo(
+                RoomCallState.OnGoing(
+                    canJoinCall = true,
+                    isAudioCall = true,
+                    isUserInTheCall = false,
+                    isUserLocallyInTheCall = true,
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - active call with no intent defaults to Audio`() = runTest {
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                roomPermissions = roomPermissions(true),
+            ).apply {
+                givenRoomInfo(
+                    aRoomInfo(
+                        hasRoomCall = true,
+                        activeCallIntentConsensus = CallIntentConsensus.None,
+                    )
+                )
+            }
+        )
+        val presenter = createRoomCallStatePresenter(
+            joinedRoom = room,
+            currentCallService = FakeCurrentCallService(MutableStateFlow(CurrentCall.RoomCall(room.roomId))),
+        )
+        presenter.test {
+            skipItems(1)
+            assertThat(awaitItem()).isEqualTo(
+                RoomCallState.OnGoing(
+                    canJoinCall = true,
+                    isAudioCall = false,
+                    isUserInTheCall = false,
+                    isUserLocallyInTheCall = true,
+                )
+            )
+        }
+    }
+
     @Test
     fun `present - user leaves the call`() = runTest {
         val room = FakeJoinedRoom(
diff --git a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
index 928c08324d..3474711b55 100644
--- a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
+++ b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
@@ -38,8 +38,10 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
     interface Callback : Plugin {
+        fun onDone()
         fun navigateToGlobalNotificationSettings()
-        fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
+        fun navigateToDeveloperSettings()
+        fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean = false)
         fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean)
     }
diff --git a/features/roomdetails/impl/build.gradle.kts b/features/roomdetails/impl/build.gradle.kts
index 2765a95a1e..77e2d0c229 100644
--- a/features/roomdetails/impl/build.gradle.kts
+++ b/features/roomdetails/impl/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.permissions.api)
     implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.push.api)
     implementation(projects.libraries.testtags)
     api(projects.features.roomdetails.api)
     api(projects.libraries.usersearch.api)
@@ -69,6 +70,7 @@ dependencies {
     testImplementation(projects.libraries.mediaviewer.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.features.call.test)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsEvent.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsEvent.kt
index de801e8aae..a82766175d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsEvent.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsEvent.kt
@@ -14,4 +14,6 @@ sealed interface RoomDetailsEvent {
     data object UnmuteNotification : RoomDetailsEvent
     data class CopyToClipboard(val text: String) : RoomDetailsEvent
     data class SetFavorite(val isFavorite: Boolean) : RoomDetailsEvent
+    data object MarkAsRead : RoomDetailsEvent
+    data object MarkAsUnread : RoomDetailsEvent
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
index e1024c611f..7574863962 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
@@ -25,7 +25,7 @@ import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.annotations.ContributesNode
 import io.element.android.appconfig.LearnMoreConfig
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
@@ -176,6 +176,10 @@ class RoomDetailsFlowNode(
         return when (navTarget) {
             NavTarget.RoomDetails -> {
                 val roomDetailsCallback = object : RoomDetailsNode.Callback {
+                    override fun navigateBack() {
+                        callback.onDone()
+                    }
+
                     override fun navigateToRoomMemberList() {
                         backstack.push(NavTarget.RoomMemberList)
                     }
@@ -225,13 +229,13 @@ class RoomDetailsFlowNode(
                     }
 
                     override fun navigateToRoomCall(callIntent: CallIntent) {
-                        val inputs = CallType.RoomCall(
+                        val callData = CallData(
                             sessionId = room.sessionId,
                             roomId = room.roomId,
                             isAudioCall = callIntent == CallIntent.AUDIO
                         )
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
-                        elementCallEntryPoint.startCall(inputs)
+                        elementCallEntryPoint.startCall(callData)
                     }
 
                     override fun navigateToReportRoom() {
@@ -254,6 +258,10 @@ class RoomDetailsFlowNode(
                     override fun navigateToInviteMembers() {
                         backstack.push(NavTarget.InviteMembers)
                     }
+
+                    override fun navigateToAvatarPreview(username: String, avatarUrl: String) {
+                        overlay.show(NavTarget.AvatarPreview(username, avatarUrl))
+                    }
                 }
                 createNode<RoomMemberListNode>(buildContext, listOf(roomMemberListCallback))
             }
@@ -263,7 +271,20 @@ class RoomDetailsFlowNode(
             }
 
             NavTarget.InviteMembers -> {
-                createNode<RoomInviteMembersNode>(buildContext)
+                val callback = object : RoomInviteMembersNode.Callback {
+                    override fun openCreatedRoom(roomId: RoomId) {
+                        navigateUp()
+                        room.roomCoroutineScope.launch {
+                            callback.navigateToRoom(
+                                roomId = roomId,
+                                serverNames = emptyList(),
+                                // Remove the invite screen from the backstack to avoid navigating back to it after the new room has been created
+                                clearBackStack = true,
+                            )
+                        }
+                    }
+                }
+                createNode<RoomInviteMembersNode>(buildContext, plugins = listOf(callback))
             }
 
             is NavTarget.RoomNotificationSettings -> {
@@ -288,7 +309,7 @@ class RoomDetailsFlowNode(
 
                     override fun startCall(dmRoomId: RoomId, callIntent: CallIntent) {
                         elementCallEntryPoint.startCall(
-                            CallType.RoomCall(
+                            CallData(
                                 roomId = dmRoomId,
                                 sessionId = room.sessionId,
                                 isAudioCall = callIntent == CallIntent.AUDIO
@@ -388,6 +409,10 @@ class RoomDetailsFlowNode(
                     override fun navigateToRoom(roomId: RoomId) {
                         callback.navigateToRoom(roomId, emptyList())
                     }
+
+                    override fun navigateToDeveloperSettings() {
+                        callback.navigateToDeveloperSettings()
+                    }
                 }
                 return messagesEntryPoint.createNode(
                     parentNode = this,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNavigator.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNavigator.kt
new file mode 100644
index 0000000000..9e2b77a260
--- /dev/null
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNavigator.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.roomdetails.impl
+
+interface RoomDetailsNavigator {
+    fun onDone()
+}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
index e9aad5b1d2..7f22c7e111 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
@@ -42,12 +42,13 @@ import io.element.android.libraries.androidutils.R as AndroidUtilsR
 class RoomDetailsNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val presenter: RoomDetailsPresenter,
+    presenterFactory: RoomDetailsPresenter.Factory,
     private val room: BaseRoom,
     private val analyticsService: AnalyticsService,
     private val leaveRoomRenderer: LeaveRoomRenderer,
-) : Node(buildContext, plugins = plugins) {
+) : Node(buildContext, plugins = plugins), RoomDetailsNavigator {
     interface Callback : Plugin {
+        fun navigateBack()
         fun navigateToRoomMemberList()
         fun navigateToInviteMembers()
         fun navigateToRoomDetailsEdit()
@@ -65,6 +66,7 @@ class RoomDetailsNode(
         fun navigateToSelectNewOwnersWhenLeaving()
     }
 
+    private val presenter = presenterFactory.create(this)
     private val callback: Callback = callback()
 
     init {
@@ -144,4 +146,8 @@ class RoomDetailsNode(
             }
         )
     }
+
+    override fun onDone() {
+        callback.navigateBack()
+    }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index 853d76859b..9a602d06c0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -17,7 +17,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.features.knockrequests.api.KnockRequestPermissions
 import io.element.android.features.knockrequests.api.knockRequestPermissions
@@ -35,36 +37,36 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.canEditRolesAndPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.permissionsAsState
 import io.element.android.libraries.matrix.api.room.roomNotificationSettings
-import io.element.android.libraries.matrix.ui.room.getCurrentRoomMember
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.ui.room.getDirectRoomMember
 import io.element.android.libraries.matrix.ui.room.roomMemberIdentityStateChange
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
-@Inject
+@AssistedInject
 class RoomDetailsPresenter(
+    @Assisted private val navigator: RoomDetailsNavigator,
     private val client: MatrixClient,
     private val room: JoinedRoom,
-    private val featureFlagService: FeatureFlagService,
     private val notificationSettingsService: NotificationSettingsService,
     private val roomMembersDetailsPresenterFactory: RoomMemberDetailsPresenter.Factory,
     private val leaveRoomPresenter: Presenter<LeaveRoomState>,
@@ -73,7 +75,16 @@ class RoomDetailsPresenter(
     private val analyticsService: AnalyticsService,
     private val clipboardHelper: ClipboardHelper,
     private val appPreferencesStore: AppPreferencesStore,
+    private val sessionPreferencesStore: SessionPreferencesStore,
+    private val notificationCleaner: NotificationCleaner,
 ) : Presenter<RoomDetailsState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(
+            navigator: RoomDetailsNavigator,
+        ): RoomDetailsPresenter
+    }
+
     @Composable
     override fun present(): RoomDetailsState {
         val scope = rememberCoroutineScope()
@@ -85,6 +96,14 @@ class RoomDetailsPresenter(
         val roomTopic by remember { derivedStateOf { roomInfo.topic } }
         val isFavorite by remember { derivedStateOf { roomInfo.isFavorite } }
         val joinRule by remember { derivedStateOf { roomInfo.joinRule } }
+        val hasNewContent by remember {
+            derivedStateOf {
+                roomInfo.numUnreadMessages > 0 ||
+                    roomInfo.numUnreadMentions > 0 ||
+                    roomInfo.numUnreadNotifications > 0 ||
+                    roomInfo.isMarkedUnread
+            }
+        }
 
         val pinnedMessagesCount by remember { derivedStateOf { roomInfo.pinnedEventIds.size } }
 
@@ -99,9 +118,8 @@ class RoomDetailsPresenter(
         val canonicalAlias by remember { derivedStateOf { roomInfo.canonicalAlias } }
         val isEncrypted by remember { derivedStateOf { roomInfo.isEncrypted == true } }
         val dmMember by room.getDirectRoomMember(membersState)
-        val currentMember by room.getCurrentRoomMember(membersState)
-        val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMember)
-        val roomType = getRoomType(dmMember, currentMember)
+        val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMember?.userId)
+        val roomType = getRoomType(dmMember)
         val roomCallState = roomCallStatePresenter.present()
         val joinedMemberCount by remember { derivedStateOf { roomInfo.joinedMembersCount } }
 
@@ -114,14 +132,11 @@ class RoomDetailsPresenter(
             }
         }
 
-        val isKnockRequestsEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
-        }.collectAsState(false)
         val knockRequestsCount by produceState<Int?>(null) {
             room.knockRequestsFlow.collect { value = it.size }
         }
         val canShowKnockRequests by remember {
-            derivedStateOf { isKnockRequestsEnabled && permissions.knockRequestsPermissions.hasAny && joinRule == JoinRule.Knock }
+            derivedStateOf { permissions.knockRequestsPermissions.hasAny && joinRule == JoinRule.Knock }
         }
         val canShowSecurityAndPrivacy by remember {
             derivedStateOf { !isDm && permissions.securityAndPrivacyPermissions.hasAny(isSpace = false, joinRule = joinRule) }
@@ -147,7 +162,7 @@ class RoomDetailsPresenter(
                 }
                 RoomDetailsEvent.UnmuteNotification -> {
                     scope.launch(dispatchers.io) {
-                        notificationSettingsService.unmuteRoom(room.roomId, isEncrypted, room.isOneToOne)
+                        notificationSettingsService.unmuteRoom(room.roomId, isEncrypted, room.isDm())
                     }
                 }
                 is RoomDetailsEvent.SetFavorite -> scope.setFavorite(event.isFavorite)
@@ -155,10 +170,12 @@ class RoomDetailsPresenter(
                     clipboardHelper.copyPlainText(event.text)
                     snackbarDispatcher.post(SnackbarMessage(CommonStrings.common_copied_to_clipboard))
                 }
+                is RoomDetailsEvent.MarkAsRead -> scope.markAsRead()
+                is RoomDetailsEvent.MarkAsUnread -> scope.markAsUnread()
             }
         }
 
-        val roomMemberDetailsState = roomMemberDetailsPresenter?.present()
+        val dmOtherMemberDetailsState = roomMemberDetailsPresenter?.present()
 
         val hasMemberVerificationViolations by produceState(false) {
             room.roomMemberIdentityStateChange(waitForEncryption = true)
@@ -168,8 +185,6 @@ class RoomDetailsPresenter(
 
         val canReportRoom by produceState(false) { value = client.canReportRoom() }
 
-        val enableKeyShareOnInvite by featureFlagService.isFeatureEnabledFlow(FeatureFlags.EnableKeyShareOnInvite).collectAsState(initial = false)
-
         return RoomDetailsState(
             roomId = room.roomId,
             roomName = roomName,
@@ -182,46 +197,40 @@ class RoomDetailsPresenter(
             canEdit = roomType == RoomDetailsType.Room && permissions.editDetailsPermissions.hasAny,
             roomCallState = roomCallState,
             roomType = roomType,
-            roomMemberDetailsState = roomMemberDetailsState,
+            dmOtherMemberDetailsState = dmOtherMemberDetailsState,
             leaveRoomState = leaveRoomState,
             roomNotificationSettings = roomNotificationSettingsState.roomNotificationSettings(),
             isFavorite = isFavorite,
             displayRolesAndPermissionsSettings = !isDm && permissions.canEditRolesAndPermissions,
             isPublic = joinRule == JoinRule.Public,
-            heroes = roomInfo.heroes.toImmutableList(),
+            heroes = roomInfo.heroes,
             pinnedMessagesCount = pinnedMessagesCount,
             snackbarMessage = snackbarMessage,
             canShowKnockRequests = canShowKnockRequests,
             knockRequestsCount = knockRequestsCount,
             canShowSecurityAndPrivacy = canShowSecurityAndPrivacy,
             hasMemberVerificationViolations = hasMemberVerificationViolations,
-            canReportRoom = canReportRoom,
+            canReportRoom = !isDm && canReportRoom,
             isTombstoned = roomInfo.successorRoom != null,
             showDebugInfo = isDeveloperModeEnabled,
             roomVersion = roomInfo.roomVersion,
-            enableKeyShareOnInvite = enableKeyShareOnInvite,
             roomHistoryVisibility = roomInfo.historyVisibility,
+            hasNewContent = hasNewContent,
             eventSink = ::handleEvent,
         )
     }
 
     @Composable
-    private fun roomMemberDetailsPresenter(dmMemberState: RoomMember?) = remember(dmMemberState) {
-        dmMemberState?.let { roomMember ->
-            roomMembersDetailsPresenterFactory.create(roomMember.userId)
+    private fun roomMemberDetailsPresenter(userId: UserId?) = remember(userId) {
+        userId?.let { userId ->
+            roomMembersDetailsPresenterFactory.create(userId)
         }
     }
 
     @Composable
-    private fun getRoomType(
-        dmMember: RoomMember?,
-        currentMember: RoomMember?,
-    ): RoomDetailsType = remember(dmMember, currentMember) {
-        if (dmMember != null && currentMember != null) {
-            RoomDetailsType.Dm(
-                me = currentMember,
-                otherMember = dmMember,
-            )
+    private fun getRoomType(dmMember: RoomMember?): RoomDetailsType = remember(dmMember) {
+        if (dmMember != null) {
+            RoomDetailsType.Dm(otherMember = dmMember)
         } else {
             RoomDetailsType.Room
         }
@@ -260,4 +269,26 @@ class RoomDetailsPresenter(
                 analyticsService.captureInteraction(Interaction.Name.MobileRoomFavouriteToggle)
             }
     }
+
+    private fun CoroutineScope.markAsRead() = launch {
+        notificationCleaner.clearMessagesForRoom(client.sessionId, room.roomId)
+        room.setUnreadFlag(isUnread = false)
+        val receiptType = if (sessionPreferencesStore.isSendPublicReadReceiptsEnabled().first()) {
+            ReceiptType.READ
+        } else {
+            ReceiptType.READ_PRIVATE
+        }
+        room.markAsRead(receiptType)
+            .onSuccess {
+                analyticsService.captureInteraction(name = Interaction.Name.MobileRoomListRoomContextMenuUnreadToggle)
+            }
+    }
+
+    private fun CoroutineScope.markAsUnread() = launch {
+        room.setUnreadFlag(isUnread = true)
+            .onSuccess {
+                analyticsService.captureInteraction(name = Interaction.Name.MobileRoomListRoomContextMenuUnreadToggle)
+                navigator.onDone()
+            }
+    }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
index 20ec12fdb9..4464058701 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -31,7 +31,7 @@ data class RoomDetailsState(
     val memberCount: Long,
     val isEncrypted: Boolean,
     val roomType: RoomDetailsType,
-    val roomMemberDetailsState: UserProfileState?,
+    val dmOtherMemberDetailsState: UserProfileState?,
     val canEdit: Boolean,
     val canInvite: Boolean,
     val roomCallState: RoomCallState,
@@ -51,8 +51,8 @@ data class RoomDetailsState(
     val isTombstoned: Boolean,
     val showDebugInfo: Boolean,
     val roomVersion: String?,
-    val enableKeyShareOnInvite: Boolean,
     val roomHistoryVisibility: RoomHistoryVisibility,
+    val hasNewContent: Boolean,
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
@@ -64,7 +64,7 @@ data class RoomDetailsState(
         if (isPublic) {
             add(RoomBadge.PUBLIC)
         }
-        if (enableKeyShareOnInvite && isEncrypted) {
+        if (isEncrypted) {
             when (roomHistoryVisibility) {
                 RoomHistoryVisibility.Invited, RoomHistoryVisibility.Joined -> add(RoomBadge.SHARED_HISTORY_HIDDEN)
                 RoomHistoryVisibility.Shared -> add(RoomBadge.SHARED_HISTORY_SHARED)
@@ -78,10 +78,7 @@ data class RoomDetailsState(
 @Immutable
 sealed interface RoomDetailsType {
     data object Room : RoomDetailsType
-    data class Dm(
-        val me: RoomMember,
-        val otherMember: RoomMember,
-    ) : RoomDetailsType
+    data class Dm(val otherMember: RoomMember) : RoomDetailsType
 }
 
 @Immutable
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
index e40e6b03ef..6aa4f11a8e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@@ -13,7 +13,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.features.roomcall.api.aStandByCallState
-import io.element.android.features.roomdetails.impl.members.aRoomMember
 import io.element.android.features.userprofile.api.UserProfileState
 import io.element.android.features.userprofile.api.UserProfileVerificationState
 import io.element.android.features.userprofile.shared.aUserProfileState
@@ -27,6 +26,7 @@ import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import kotlinx.collections.immutable.toImmutableList
@@ -35,7 +35,7 @@ open class RoomDetailsStateProvider : PreviewParameterProvider<RoomDetailsState>
     override val values: Sequence<RoomDetailsState>
         get() = sequenceOf(
             aRoomDetailsState(displayAdminSettings = true),
-            aRoomDetailsState(roomTopic = RoomTopicState.Hidden, showDebugInfo = true),
+            aRoomDetailsState(roomTopic = RoomTopicState.Hidden, showDebugInfo = true, hasNewContent = true),
             aRoomDetailsState(roomTopic = RoomTopicState.CanAddTopic),
             aRoomDetailsState(isEncrypted = false),
             aRoomDetailsState(roomAlias = null),
@@ -75,6 +75,8 @@ fun aDmRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
+    displayedStatus: DisplayedStatus? = null,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -84,7 +86,9 @@ fun aDmRoomMember(
     powerLevel = powerLevel,
     isIgnored = isIgnored,
     role = role,
-    membershipChangeReason = membershipChangeReason
+    membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
+    displayedStatus = displayedStatus,
 )
 
 fun aRoomDetailsState(
@@ -105,7 +109,7 @@ fun aRoomDetailsState(
     canEdit: Boolean = false,
     roomCallState: RoomCallState = aStandByCallState(),
     roomType: RoomDetailsType = RoomDetailsType.Room,
-    roomMemberDetailsState: UserProfileState? = null,
+    dmOtherMemberDetailsState: UserProfileState? = null,
     leaveRoomState: LeaveRoomState = aLeaveRoomState(),
     roomNotificationSettings: RoomNotificationSettings = aRoomNotificationSettings(),
     isFavorite: Boolean = false,
@@ -121,8 +125,8 @@ fun aRoomDetailsState(
     canReportRoom: Boolean = true,
     isTombstoned: Boolean = false,
     showDebugInfo: Boolean = false,
-    enableKeyShareOnInvite: Boolean = false,
     roomHistoryVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Shared,
+    hasNewContent: Boolean = false,
     eventSink: (RoomDetailsEvent) -> Unit = {},
 ) = RoomDetailsState(
     roomId = roomId,
@@ -136,7 +140,7 @@ fun aRoomDetailsState(
     canEdit = canEdit,
     roomCallState = roomCallState,
     roomType = roomType,
-    roomMemberDetailsState = roomMemberDetailsState,
+    dmOtherMemberDetailsState = dmOtherMemberDetailsState,
     leaveRoomState = leaveRoomState,
     roomNotificationSettings = roomNotificationSettings,
     isFavorite = isFavorite,
@@ -153,8 +157,8 @@ fun aRoomDetailsState(
     isTombstoned = isTombstoned,
     showDebugInfo = showDebugInfo,
     roomVersion = "12",
-    enableKeyShareOnInvite = enableKeyShareOnInvite,
     roomHistoryVisibility = roomHistoryVisibility,
+    hasNewContent = hasNewContent,
     eventSink = eventSink,
 )
 
@@ -177,15 +181,14 @@ fun aDmRoomDetailsState(
     roomName: String = "Daniel",
     isEncrypted: Boolean = true,
     dmRoomMemberVerificationState: UserProfileVerificationState = UserProfileVerificationState.UNKNOWN,
+    displayedStatus: DisplayedStatus? = null,
 ) = aRoomDetailsState(
     roomName = roomName,
     isPublic = false,
     isEncrypted = isEncrypted,
-    roomType = RoomDetailsType.Dm(
-        me = aRoomMember(),
-        otherMember = aDmRoomMember(isIgnored = isDmMemberIgnored),
-    ),
-    roomMemberDetailsState = aUserProfileState(
+    canInvite = true,
+    roomType = RoomDetailsType.Dm(otherMember = aDmRoomMember(isIgnored = isDmMemberIgnored, displayedStatus = displayedStatus)),
+    dmOtherMemberDetailsState = aUserProfileState(
         isBlocked = AsyncData.Success(isDmMemberIgnored),
         verificationState = dmRoomMemberVerificationState,
     )
@@ -195,6 +198,5 @@ fun aSharedHistoryRoomDetailsState(
     roomHistoryVisibility: RoomHistoryVisibility
 ) = aRoomDetailsState(
     isEncrypted = true,
-    enableKeyShareOnInvite = true,
     roomHistoryVisibility = roomHistoryVisibility,
 )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index c48716db11..96dc3e25ba 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.features.roomdetails.impl
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -21,6 +22,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
@@ -31,15 +33,18 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 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.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomcall.api.hasPermissionToJoin
+import io.element.android.features.userprofile.api.UserProfileState
 import io.element.android.features.userprofile.api.UserProfileVerificationState
 import io.element.android.features.userprofile.shared.blockuser.BlockUserDialogs
 import io.element.android.features.userprofile.shared.blockuser.BlockUserSection
@@ -52,7 +57,6 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
-import io.element.android.libraries.designsystem.components.avatar.DmAvatars
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.button.MainActionButton
 import io.element.android.libraries.designsystem.components.list.ListItemContent
@@ -62,7 +66,7 @@ import io.element.android.libraries.designsystem.modifiers.niceClickable
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight
+import io.element.android.libraries.designsystem.preview.PreviewWithExtraLargeHeight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.DropdownMenu
 import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
@@ -74,6 +78,8 @@ import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.core.RoomAlias
@@ -85,14 +91,19 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.getBestName
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.matrix.ui.model.toText
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.compose.LocalAnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
+/**
+ * Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=21-120385
+ */
 @Composable
 fun RoomDetailsView(
     state: RoomDetailsState,
@@ -126,12 +137,14 @@ fun RoomDetailsView(
             )
         },
         snackbarHost = { SnackbarHost(snackbarHostState) },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Column(
             modifier = Modifier
                 .padding(padding)
                 .verticalScroll(rememberScrollState())
                 .consumeWindowInsets(padding)
+                .padding(lazyColumnContentPadding)
         ) {
             leaveRoomView()
 
@@ -154,9 +167,9 @@ fun RoomDetailsView(
                 }
                 is RoomDetailsType.Dm -> {
                     DmHeaderSection(
-                        me = state.roomType.me,
                         otherMember = state.roomType.otherMember,
                         roomName = state.roomName,
+                        isTombstoned = state.isTombstoned,
                         openAvatarPreview = { name, avatarUrl ->
                             openAvatarPreview(name, avatarUrl)
                         },
@@ -187,58 +200,50 @@ fun RoomDetailsView(
             }
 
             PreferenceCategory {
-                if (state.roomNotificationSettings != null) {
-                    NotificationItem(
-                        isDefaultMode = state.roomNotificationSettings.isDefault,
-                        openRoomNotificationSettings = openRoomNotificationSettings
+                if (state.hasNewContent) {
+                    ListItem(
+                        content = {
+                            Text(
+                                text = stringResource(id = R.string.screen_roomlist_mark_as_read),
+                                style = MaterialTheme.typography.bodyLarge,
+                            )
+                        },
+                        onClick = {
+                            state.eventSink(RoomDetailsEvent.MarkAsRead)
+                        },
+                        leadingContent = ListItemContent.Icon(
+                            iconSource = IconSource.Vector(CompoundIcons.MarkAsRead())
+                        ),
+                        trailingContent = ListItemContent.Custom {
+                            Box(
+                                modifier = Modifier
+                                    .size(8.dp)
+                                    .clip(CircleShape)
+                                    .background(ElementTheme.colors.iconAccentPrimary)
+                            )
+                        },
                     )
-                }
-
-                FavoriteItem(
-                    isFavorite = state.isFavorite,
-                    onFavoriteChanges = {
-                        state.eventSink(RoomDetailsEvent.SetFavorite(it))
-                    }
-                )
-
-                if (state.canShowSecurityAndPrivacy) {
-                    SecurityAndPrivacyItem(
-                        onClick = onSecurityAndPrivacyClick
-                    )
-                }
-
-                state.roomMemberDetailsState?.let { dmMemberDetails ->
-                    ProfileItem(
-                        verificationState = dmMemberDetails.verificationState,
-                        onClick = { onProfileClick(dmMemberDetails.userId) }
+                } else {
+                    ListItem(
+                        content = {
+                            Text(
+                                text = stringResource(id = R.string.screen_roomlist_mark_as_unread),
+                            )
+                        },
+                        onClick = {
+                            state.eventSink(RoomDetailsEvent.MarkAsUnread)
+                        },
+                        leadingContent = ListItemContent.Icon(
+                            iconSource = IconSource.Vector(CompoundIcons.MarkAsUnread())
+                        ),
                     )
                 }
             }
-
-            if (state.roomType is RoomDetailsType.Room) {
-                PreferenceCategory {
-                    MembersItem(
-                        memberCount = state.memberCount,
-                        hasVerificationViolations = state.hasMemberVerificationViolations,
-                        openRoomMemberList = openRoomMemberList,
-                    )
-                    if (state.canShowKnockRequests) {
-                        KnockRequestsItem(
-                            knockRequestsCount = state.knockRequestsCount,
-                            onKnockRequestsClick = onKnockRequestsClick
-                        )
-                    }
-                    if (state.displayRolesAndPermissionsSettings) {
-                        ListItem(
-                            headlineContent = { Text(stringResource(R.string.screen_room_details_roles_and_permissions)) },
-                            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
-                            onClick = openAdminSettings,
-                        )
-                    }
-                }
-            }
-
+            // Room content
             PreferenceCategory {
+                MediaGalleryItem(
+                    onClick = openMediaGallery
+                )
                 PinnedMessagesItem(
                     pinnedMessagesCount = state.pinnedMessagesCount,
                     onPinnedMessagesClick = onPinnedMessagesClick
@@ -246,23 +251,87 @@ fun RoomDetailsView(
                 PollsItem(
                     openPollHistory = openPollHistory
                 )
-                MediaGalleryItem(
-                    onClick = openMediaGallery
+            }
+            when (state.roomType) {
+                is RoomDetailsType.Room -> {
+                    PreferenceCategory {
+                        MembersItem(
+                            memberCount = state.memberCount,
+                            hasVerificationViolations = state.hasMemberVerificationViolations,
+                            openRoomMemberList = openRoomMemberList,
+                        )
+                        if (state.canShowKnockRequests) {
+                            KnockRequestsItem(
+                                knockRequestsCount = state.knockRequestsCount,
+                                onKnockRequestsClick = onKnockRequestsClick
+                            )
+                        }
+                        if (state.displayRolesAndPermissionsSettings) {
+                            ListItem(
+                                content = { Text(stringResource(R.string.screen_room_details_roles_and_permissions)) },
+                                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
+                                onClick = openAdminSettings,
+                            )
+                        }
+                    }
+                }
+                is RoomDetailsType.Dm -> {
+                    if (state.canInvite) {
+                        // Note: for rooms the invite action is a Main action
+                        PreferenceCategory {
+                            InviteItem(onClick = invitePeople)
+                        }
+                    }
+                    state.dmOtherMemberDetailsState?.let { dmMemberDetails ->
+                        PreferenceCategory {
+                            ProfileItem(
+                                verificationState = dmMemberDetails.verificationState,
+                                onClick = { onProfileClick(dmMemberDetails.userId) }
+                            )
+                        }
+                    }
+                }
+            }
+            PreferenceCategory {
+                if (state.roomNotificationSettings != null) {
+                    NotificationItem(
+                        isDefaultMode = state.roomNotificationSettings.isDefault,
+                        openRoomNotificationSettings = openRoomNotificationSettings
+                    )
+                }
+                FavoriteItem(
+                    isFavorite = state.isFavorite,
+                    onFavoriteChanges = {
+                        state.eventSink(RoomDetailsEvent.SetFavorite(it))
+                    }
                 )
+                if (state.canShowSecurityAndPrivacy && state.roomType is RoomDetailsType.Room) {
+                    SecurityAndPrivacyItem(
+                        onClick = onSecurityAndPrivacyClick
+                    )
+                }
             }
-
-            if (state.roomType is RoomDetailsType.Dm && state.roomMemberDetailsState != null) {
-                val roomMemberState = state.roomMemberDetailsState
-                BlockUserSection(roomMemberState)
-                BlockUserDialogs(roomMemberState)
+            if (state.isEncrypted) {
+                PreferenceCategory(
+                    title = stringResource(R.string.screen_room_details_security_title)
+                ) {
+                    ListItem(
+                        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
+                        content = {
+                            Text(stringResource(id = R.string.screen_room_details_encryption_enabled_title))
+                        },
+                        supportingContent = {
+                            Text(stringResource(id = R.string.screen_room_details_encryption_enabled_subtitle))
+                        },
+                    )
+                }
             }
-
             OtherActionsSection(
+                dmOtherMemberDetailsState = state.dmOtherMemberDetailsState,
                 canReportRoom = state.canReportRoom,
                 onReportRoomClick = onReportRoomClick,
                 onLeaveRoomClick = { state.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true)) }
             )
-
             if (state.showDebugInfo) {
                 DebugInfoSection(
                     roomId = state.roomId,
@@ -276,7 +345,7 @@ fun RoomDetailsView(
 @Composable
 private fun KnockRequestsItem(knockRequestsCount: Int?, onKnockRequestsClick: () -> Unit) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_room_details_requests_to_join_title)) },
+        content = { Text(stringResource(R.string.screen_room_details_requests_to_join_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.AskToJoin())),
         trailingContent = if (knockRequestsCount == null || knockRequestsCount == 0) {
             null
@@ -372,14 +441,14 @@ private fun MainActionsSection(
                 onClick = { onCall(CallIntent.VIDEO) },
             )
         }
+        if (state.canInvite && state.roomType !is RoomDetailsType.Dm) {
+            MainActionButton(
+                title = stringResource(CommonStrings.action_invite),
+                imageVector = CompoundIcons.UserAdd(),
+                onClick = onInvitePeople,
+            )
+        }
         if (state.roomType is RoomDetailsType.Room) {
-            if (state.canInvite) {
-                MainActionButton(
-                    title = stringResource(CommonStrings.action_invite),
-                    imageVector = CompoundIcons.UserAdd(),
-                    onClick = onInvitePeople,
-                )
-            }
             // Share CTA should be hidden for DMs
             MainActionButton(
                 title = stringResource(CommonStrings.action_share),
@@ -417,6 +486,7 @@ private fun RoomHeaderSection(
             ),
             contentDescription = stringResource(CommonStrings.a11y_room_avatar),
             modifier = Modifier
+                .clip(CircleShape)
                 .clickable(
                     enabled = avatarUrl != null,
                     onClickLabel = stringResource(CommonStrings.action_view),
@@ -425,19 +495,31 @@ private fun RoomHeaderSection(
                 }
                 .testTag(TestTags.roomDetailAvatar)
         )
-        TitleAndSubtitle(
-            title = roomName,
-            subtitle = roomAlias?.value,
-            onSubtitleClick = onSubtitleClick,
+        Spacer(modifier = Modifier.height(24.dp))
+        Text(
+            text = roomName,
+            style = ElementTheme.typography.fontHeadingLgBold,
+            textAlign = TextAlign.Center,
         )
+        if (roomAlias != null) {
+            Spacer(modifier = Modifier.height(12.dp))
+            Text(
+                modifier = Modifier.niceClickable { onSubtitleClick(roomAlias.value) },
+                text = roomAlias.value,
+                style = ElementTheme.typography.fontBodyLgRegular,
+                color = ElementTheme.colors.textSecondary,
+                textAlign = TextAlign.Center,
+            )
+        }
+        Spacer(modifier = Modifier.height(12.dp))
     }
 }
 
 @Composable
 private fun DmHeaderSection(
-    me: RoomMember,
     otherMember: RoomMember,
     roomName: String,
+    isTombstoned: Boolean,
     openAvatarPreview: (name: String, url: String) -> Unit,
     onSubtitleClick: (String) -> Unit,
     modifier: Modifier = Modifier
@@ -448,43 +530,53 @@ private fun DmHeaderSection(
             .padding(horizontal = 16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        DmAvatars(
-            userAvatarData = me.getAvatarData(size = AvatarSize.DmCluster),
-            otherUserAvatarData = otherMember.getAvatarData(size = AvatarSize.DmCluster),
-            openAvatarPreview = { url -> openAvatarPreview(me.getBestName(), url) },
-            openOtherAvatarPreview = { url -> openAvatarPreview(roomName, url) },
+        Avatar(
+            avatarData = AvatarData(otherMember.userId.value, roomName, otherMember.avatarUrl, AvatarSize.RoomDetailsHeader),
+            avatarType = AvatarType.Room(
+                heroes = persistentListOf(
+                    otherMember.getAvatarData(size = AvatarSize.RoomDetailsHeader)
+                ),
+                isTombstoned = isTombstoned,
+            ),
+            contentDescription = stringResource(CommonStrings.a11y_room_avatar),
+            modifier = Modifier
+                .clip(CircleShape)
+                .clickable(
+                    enabled = otherMember.avatarUrl != null,
+                    onClickLabel = stringResource(CommonStrings.action_view),
+                ) {
+                    openAvatarPreview(otherMember.getBestName(), otherMember.avatarUrl!!)
+                }
+                .testTag(TestTags.roomDetailAvatar)
         )
-        TitleAndSubtitle(
-            title = roomName,
-            subtitle = otherMember.userId.value,
-            onSubtitleClick = onSubtitleClick,
-        )
-    }
-}
-
-@Composable
-private fun TitleAndSubtitle(
-    title: String,
-    subtitle: String?,
-    onSubtitleClick: (String) -> Unit,
-) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
         Spacer(modifier = Modifier.height(24.dp))
         Text(
-            text = title,
+            text = roomName,
             style = ElementTheme.typography.fontHeadingLgBold,
             textAlign = TextAlign.Center,
         )
-        if (subtitle != null) {
-            Spacer(modifier = Modifier.height(6.dp))
+        val userStatus = otherMember.displayedStatus?.toText()
+        if (userStatus != null) {
+            Spacer(modifier = Modifier.height(12.dp))
             Text(
-                modifier = Modifier.niceClickable { onSubtitleClick(subtitle) },
-                text = subtitle,
-                style = ElementTheme.typography.fontBodyLgRegular,
+                text = userStatus,
+                style = ElementTheme.typography.fontBodyLgMedium,
+                maxLines = 1,
                 color = ElementTheme.colors.textSecondary,
+                overflow = TextOverflow.Ellipsis,
                 textAlign = TextAlign.Center,
+                modifier = Modifier.fillMaxWidth()
             )
         }
+        Spacer(modifier = Modifier.height(12.dp))
+        Text(
+            modifier = Modifier.niceClickable { onSubtitleClick(otherMember.userId.value) },
+            text = otherMember.userId.value,
+            style = ElementTheme.typography.fontBodyLgRegular,
+            color = ElementTheme.colors.textSecondary,
+            textAlign = TextAlign.Center,
+        )
+        Spacer(modifier = Modifier.height(12.dp))
     }
 }
 
@@ -564,7 +656,7 @@ private fun TopicSection(
         if (roomTopic is RoomTopicState.CanAddTopic) {
             ListItem(
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())),
-                headlineContent = {
+                content = {
                     Text(stringResource(id = R.string.screen_room_details_add_topic_title))
                 },
                 onClick = {
@@ -595,7 +687,7 @@ private fun NotificationItem(
         stringResource(R.string.screen_room_details_notification_mode_custom)
     }
     ListItem(
-        headlineContent = { Text(text = stringResource(R.string.screen_room_details_notification_title)) },
+        content = { Text(text = stringResource(R.string.screen_room_details_notification_title)) },
         supportingContent = { Text(text = subtitle) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),
         onClick = openRoomNotificationSettings,
@@ -608,7 +700,7 @@ private fun SecurityAndPrivacyItem(
     modifier: Modifier = Modifier,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_room_details_security_and_privacy_title)) },
+        content = { Text(stringResource(R.string.screen_room_details_security_and_privacy_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
         onClick = onClick,
         modifier = modifier,
@@ -640,7 +732,7 @@ private fun ProfileItem(
 ) {
     ListItem(
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserProfile())),
-        headlineContent = { Text(stringResource(id = R.string.screen_room_details_profile_row_title)) },
+        content = { Text(stringResource(id = R.string.screen_room_details_profile_row_title)) },
         trailingContent = when (verificationState) {
             UserProfileVerificationState.VERIFIED -> ListItemContent.Icon(
                 iconSource = IconSource.Vector(CompoundIcons.Verified()),
@@ -663,7 +755,7 @@ private fun MembersItem(
     openRoomMemberList: () -> Unit,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(CommonStrings.common_people)) },
+        content = { Text(stringResource(CommonStrings.common_people)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.User())),
         trailingContent = if (hasVerificationViolations) {
             ListItemContent.Icon(
@@ -677,6 +769,17 @@ private fun MembersItem(
     )
 }
 
+@Composable
+private fun InviteItem(
+    onClick: () -> Unit,
+) {
+    ListItem(
+        content = { Text(stringResource(R.string.screen_room_details_invite_title)) },
+        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserAdd())),
+        onClick = onClick,
+    )
+}
+
 @Composable
 private fun PinnedMessagesItem(
     pinnedMessagesCount: Int?,
@@ -684,7 +787,7 @@ private fun PinnedMessagesItem(
 ) {
     val analyticsService = LocalAnalyticsService.current
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_room_details_pinned_events_row_title)) },
+        content = { Text(stringResource(R.string.screen_room_details_pinned_events_row_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Pin())),
         trailingContent =
             if (pinnedMessagesCount == null) {
@@ -706,7 +809,7 @@ private fun PollsItem(
     openPollHistory: () -> Unit,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_polls_history_title)) },
+        content = { Text(stringResource(R.string.screen_polls_history_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Polls())),
         onClick = openPollHistory,
     )
@@ -717,7 +820,7 @@ private fun MediaGalleryItem(
     onClick: () -> Unit,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_room_details_media_gallery_title)) },
+        content = { Text(stringResource(R.string.screen_room_details_media_gallery_title)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Image())),
         onClick = onClick,
     )
@@ -728,11 +831,16 @@ private fun OtherActionsSection(
     canReportRoom: Boolean,
     onReportRoomClick: () -> Unit,
     onLeaveRoomClick: () -> Unit,
+    dmOtherMemberDetailsState: UserProfileState?,
 ) {
-    PreferenceCategory(showTopDivider = true) {
+    PreferenceCategory {
+        if (dmOtherMemberDetailsState != null) {
+            BlockUserSection(dmOtherMemberDetailsState)
+            BlockUserDialogs(dmOtherMemberDetailsState)
+        }
         if (canReportRoom) {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(stringResource(CommonStrings.action_report_room))
                 },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChatProblem())),
@@ -741,7 +849,7 @@ private fun OtherActionsSection(
             )
         }
         ListItem(
-            headlineContent = {
+            content = {
                 Text(stringResource(CommonStrings.action_leave_room))
             },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Leave())),
@@ -757,10 +865,10 @@ private fun DebugInfoSection(
     roomVersion: String?,
 ) {
     val context = LocalContext.current
-    PreferenceCategory(showTopDivider = true) {
+    PreferenceCategory {
         val toastMessage = stringResource(CommonStrings.common_copied_to_clipboard)
         ListItem(
-            headlineContent = {
+            content = {
                 Text("Internal room ID")
             },
             supportingContent = {
@@ -780,7 +888,7 @@ private fun DebugInfoSection(
             },
         )
         ListItem(
-            headlineContent = {
+            content = {
                 Text("Room version")
             },
             supportingContent = {
@@ -795,17 +903,17 @@ private fun DebugInfoSection(
     }
 }
 
-@PreviewWithLargeHeight
+@PreviewWithExtraLargeHeight
 @Composable
 internal fun RoomDetailsPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) =
     ElementPreviewLight { ContentToPreview(state) }
 
-@PreviewWithLargeHeight
+@PreviewWithExtraLargeHeight
 @Composable
 internal fun RoomDetailsDarkPreview(@PreviewParameter(RoomDetailsStateProvider::class) state: RoomDetailsState) =
     ElementPreviewDark { ContentToPreview(state) }
 
-@PreviewWithLargeHeight
+@PreviewWithExtraLargeHeight
 @Composable
 internal fun RoomDetailsA11yPreview() = ElementPreview {
     ContentToPreview(
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
index ea0ed1bb72..3919817313 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
@@ -11,6 +11,7 @@ package io.element.android.features.roomdetails.impl.invite
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@@ -19,10 +20,16 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
+import io.element.android.features.invitepeople.api.InvitePeopleEvents
 import io.element.android.features.invitepeople.api.InvitePeoplePresenter
 import io.element.android.features.invitepeople.api.InvitePeopleRenderer
+import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesNode(RoomScope::class)
@@ -35,6 +42,10 @@ class RoomInviteMembersNode(
     room: JoinedRoom,
     invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,
 ) : Node(buildContext, plugins = plugins) {
+    interface Callback : Plugin {
+        fun openCreatedRoom(roomId: RoomId)
+    }
+
     init {
         lifecycle.subscribe(
             onResume = {
@@ -48,6 +59,8 @@ class RoomInviteMembersNode(
         roomId = room.roomId,
     )
 
+    private val callback = plugins.callback<Callback>()
+
     @Composable
     override fun View(modifier: Modifier) {
         val state = invitePeoplePresenter.present()
@@ -59,6 +72,19 @@ class RoomInviteMembersNode(
             }
         }
 
+        AsyncActionView(
+            async = state.createRoomFromDmAction,
+            onSuccess = { roomId ->
+                callback.openCreatedRoom(roomId)
+            },
+            progressDialog = {
+                ProgressDialog(text = stringResource(CommonStrings.common_creating_room))
+            },
+            onErrorDismiss = {
+                state.eventSink(InvitePeopleEvents.ClearError)
+            }
+        )
+
         RoomInviteMembersView(
             state = state,
             modifier = modifier,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
index 750b111fc3..37f107e784 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.ui.model.getBestName
 import io.element.android.services.analytics.api.AnalyticsService
 
 @ContributesNode(RoomScope::class)
@@ -41,6 +42,7 @@ class RoomMemberListNode(
     interface Callback : Plugin {
         fun navigateToRoomMemberDetails(roomMemberId: UserId)
         fun navigateToInviteMembers()
+        fun navigateToAvatarPreview(username: String, avatarUrl: String)
     }
 
     private val callback: Callback = callback()
@@ -82,13 +84,18 @@ class RoomMemberListNode(
                     else -> state.moderationState.eventSink(RoomMemberModerationEvents.ProcessAction(action, target))
                 }
             },
+            onAvatarClick = { user ->
+                user.avatarUrl?.let { url ->
+                    callback.navigateToAvatarPreview(user.getBestName(), url)
+                }
+            },
             modifier = Modifier,
         )
     }
 }
 
 interface RoomMemberListNavigator {
-    fun exitRoomMemberList() {}
-    fun openRoomMemberDetails(roomMemberId: UserId) {}
-    fun openInviteMembers() {}
+    fun exitRoomMemberList()
+    fun openRoomMemberDetails(roomMemberId: UserId)
+    fun openInviteMembers()
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
index bc077feb6a..472a185076 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt
@@ -15,10 +15,20 @@ import io.element.android.features.roommembermoderation.api.RoomMemberModeration
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationState
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.map
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
+import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
+import io.element.android.libraries.designsystem.preview.USER_NAME_MALLORY
+import io.element.android.libraries.designsystem.preview.USER_NAME_SUSIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_VICTOR
+import io.element.android.libraries.designsystem.preview.USER_NAME_WALTER
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.collections.immutable.persistentListOf
 
 internal class RoomMemberListStateProvider : PreviewParameterProvider<RoomMemberListState> {
@@ -119,6 +129,8 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
+    displayedStatus: DisplayedStatus? = null,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -129,6 +141,8 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
+    displayedStatus = displayedStatus,
 )
 
 fun aRoomMemberList() = persistentListOf(
@@ -143,21 +157,21 @@ fun aRoomMemberList() = persistentListOf(
     aBannedMallory(),
 )
 
-fun anEve(): RoomMember = aRoomMember(UserId("@eve:server.org"), "Eve")
+fun anEve(): RoomMember = aRoomMember(UserId("@eve:server.org"), USER_NAME_EVE)
 
-fun aDavid(): RoomMember = aRoomMember(UserId("@david:server.org"), "David")
+fun aDavid(): RoomMember = aRoomMember(UserId("@david:server.org"), USER_NAME_DAVID)
 
-fun aCarol(): RoomMember = aRoomMember(UserId("@carol:server.org"), "Carol")
+fun aCarol(): RoomMember = aRoomMember(UserId("@carol:server.org"), USER_NAME_CAROL)
 
-fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.Admin)
-fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.Moderator)
+fun anAlice() = aRoomMember(UserId("@alice:server.org"), USER_NAME_ALICE, role = RoomMember.Role.Admin)
+fun aBob() = aRoomMember(UserId("@bob:server.org"), USER_NAME_BOB, role = RoomMember.Role.Moderator)
 
-fun anInvitedVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
+fun anInvitedVictor() = aRoomMember(UserId("@victor:server.org"), USER_NAME_VICTOR, membership = RoomMembershipState.INVITE)
 
-fun anInvitedWalter() = aRoomMember(UserId("@walter:server.org"), "Walter", membership = RoomMembershipState.INVITE)
+fun anInvitedWalter() = aRoomMember(UserId("@walter:server.org"), USER_NAME_WALTER, membership = RoomMembershipState.INVITE)
 
-fun aBannedSusie(): RoomMember = aRoomMember(UserId("@susie:server.org"), "Susie", membership = RoomMembershipState.BAN)
+fun aBannedSusie(): RoomMember = aRoomMember(UserId("@susie:server.org"), USER_NAME_SUSIE, membership = RoomMembershipState.BAN)
 
-fun aBannedMallory(): RoomMember = aRoomMember(UserId("@mallory:server.org"), "Mallory", membership = RoomMembershipState.BAN)
+fun aBannedMallory(): RoomMember = aRoomMember(UserId("@mallory:server.org"), USER_NAME_MALLORY, membership = RoomMembershipState.BAN)
 
 private fun RoomMember.withIdentity(identityState: IdentityState? = null) = RoomMemberWithIdentityState(this, identityState)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index 146d2f7952..659d8ed0e0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -14,9 +14,14 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
@@ -50,6 +55,9 @@ import io.element.android.libraries.designsystem.theme.components.SegmentedButto
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.getBestName
@@ -77,7 +85,8 @@ fun RoomMemberListView(
                 onBackClick = navigator::exitRoomMemberList,
                 onInviteClick = navigator::openInviteMembers,
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Column(
             modifier = Modifier
@@ -90,7 +99,8 @@ fun RoomMemberListView(
                 state = state.searchQuery,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
+                    .padding(horizontal = 16.dp)
+                    .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()),
                 placeholder = stringResource(CommonStrings.common_search_for_someone),
             )
             RoomMemberList(
@@ -114,7 +124,11 @@ private fun RoomMemberList(
     onSelectedSectionChange: (SelectedSection) -> Unit,
     onSelectUser: (RoomMember) -> Unit,
 ) {
-    LazyColumn(modifier = Modifier.fillMaxWidth(), state = rememberLazyListState()) {
+    LazyColumn(
+        modifier = Modifier.fillMaxWidth(),
+        state = rememberLazyListState(),
+        contentPadding = lazyColumnContentPadding,
+    ) {
         stickyHeader {
             Column {
                 AnimatedVisibility(visible = showBannedSection) {
@@ -355,6 +369,10 @@ private fun RoomMemberListTopBar(
 internal fun RoomMemberListViewPreview(@PreviewParameter(RoomMemberListStateProvider::class) state: RoomMemberListState) = ElementPreview {
     RoomMemberListView(
         state = state,
-        navigator = object : RoomMemberListNavigator {},
+        navigator = object : RoomMemberListNavigator {
+            override fun exitRoomMemberList() {}
+            override fun openRoomMemberDetails(roomMemberId: UserId) {}
+            override fun openInviteMembers() {}
+        },
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
index f47ea0e8b3..9b18c88c93 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
@@ -128,6 +128,7 @@ class RoomMemberDetailsPresenter(
         return userProfileState.copy(
             userName = roomUserName ?: userProfileState.userName,
             avatarUrl = roomUserAvatar ?: userProfileState.avatarUrl,
+            displayedStatus = roomMember?.displayedStatus ?: userProfileState.displayedStatus,
             verificationState = verificationState,
             snackbarMessage = snackbarMessage,
             eventSink = ::handleEvent,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
index 8ff1be538f..cee23e6ba1 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
@@ -40,7 +40,7 @@ fun RoomNotificationSettingsOption(
     ListItem(
         modifier = modifier,
         enabled = enabled,
-        headlineContent = { Text(title) },
+        content = { Text(title) },
         supportingContent = subtitle?.let { { Text(it) } },
         trailingContent = ListItemContent.RadioButton(selected = isSelected),
         onClick = { onSelectOption(roomNotificationSettingsItem) },
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
index c7930b5895..08dbf2019d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
@@ -160,7 +160,7 @@ class RoomNotificationSettingsPresenter(
         suspend {
             val isEncrypted = room.info().isEncrypted ?: room.getUpdatedIsEncrypted().getOrThrow()
             pendingModeState.value = null
-            notificationSettingsService.getRoomNotificationSettings(room.roomId, isEncrypted, room.isOneToOne).getOrThrow()
+            notificationSettingsService.getRoomNotificationSettings(room.roomId, isEncrypted, room.isDm()).getOrThrow()
         }.runCatchingUpdatingState(roomNotificationSettings)
     }
 
@@ -170,7 +170,7 @@ class RoomNotificationSettingsPresenter(
         val isEncrypted = room.info().isEncrypted ?: room.getUpdatedIsEncrypted().getOrThrow()
         defaultRoomNotificationMode.value = notificationSettingsService.getDefaultRoomNotificationMode(
             isEncrypted,
-            room.isOneToOne
+            room.isDm()
         ).getOrThrow()
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
index 3e4e9e773e..1721c9925c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
@@ -66,7 +66,7 @@ fun UserDefinedRoomNotificationSettingsView(
             }
 
             ListItem(
-                headlineContent = { Text(stringResource(R.string.screen_room_notification_settings_edit_remove_setting)) },
+                content = { Text(stringResource(R.string.screen_room_notification_settings_edit_remove_setting)) },
                 style = ListItemStyle.Destructive,
                 onClick = {
                     state.eventSink(RoomNotificationSettingsEvent.DeleteCustomNotification)
diff --git a/features/roomdetails/impl/src/main/res/values-be/translations.xml b/features/roomdetails/impl/src/main/res/values-be/translations.xml
index 9b89f2cef0..2b0b59e359 100644
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_title">"Рэдагаваць адрас"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Пры абнаўленні налад апавяшчэнняў адбылася памылка."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш хатні сервер не падтрымлівае гэтую опцыю ў зашыфраваных пакоях, вы можаце не атрымаць апавяшчэнне ў некаторых пакоях."</string>
   <string name="screen_polls_history_title">"Апытанні"</string>
-  <string name="screen_room_change_permissions_administrators">"Толькі адміністратары"</string>
+  <string name="screen_room_change_permissions_administrators">"Адміністратар"</string>
   <string name="screen_room_change_permissions_ban_people">"Заблакіраваць людзей"</string>
   <string name="screen_room_change_permissions_delete_messages">"Выдаліць паведамленні"</string>
-  <string name="screen_room_change_permissions_invite_people">"Запрашайце людзей і прымайце запыты на далучэнне"</string>
+  <string name="screen_room_change_permissions_everyone">"Удзельнік"</string>
+  <string name="screen_room_change_permissions_invite_people">"Запрасіць людзей"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Паведамленні і змест"</string>
-  <string name="screen_room_change_permissions_moderators">"Адміністратары і мадэратары"</string>
+  <string name="screen_room_change_permissions_moderators">"Мадэратар"</string>
   <string name="screen_room_change_permissions_remove_people">"Выдаляйце людзей і адхіляйце запыты на далучэнне"</string>
   <string name="screen_room_change_permissions_room_avatar">"Змяніць аватар пакоя"</string>
   <string name="screen_room_change_permissions_room_details">"Рэдагаваць пакой"</string>
@@ -43,6 +45,7 @@
   <string name="screen_room_details_error_muting">"Не атрымалася адключыць гук у гэтым пакоі, паўтарыце спробу."</string>
   <string name="screen_room_details_error_unmuting">"Не ўдалося ўключыць гук у гэтым пакоі. Паўтарыце спробу."</string>
   <string name="screen_room_details_invite_people_title">"Запрасіць карыстальнікаў"</string>
+  <string name="screen_room_details_invite_title">"Запрасіць"</string>
   <string name="screen_room_details_leave_conversation_title">"Пакінуць размову"</string>
   <string name="screen_room_details_leave_room_title">"Пакінуць пакой"</string>
   <string name="screen_room_details_notification_mode_custom">"Уласныя"</string>
@@ -51,8 +54,9 @@
   <string name="screen_room_details_pinned_events_row_title">"Замацаваныя паведамленні"</string>
   <string name="screen_room_details_profile_row_title">"Профіль"</string>
   <string name="screen_room_details_roles_and_permissions">"Ролі і дазволы"</string>
+  <string name="screen_room_details_room_name_label">"Імя"</string>
   <string name="screen_room_details_security_title">"Бяспека"</string>
-  <string name="screen_room_details_share_room_title">"Падзяліцца пакоем"</string>
+  <string name="screen_room_details_share_room_title">"Абагуліць пакой"</string>
   <string name="screen_room_details_title">"Інфармацыя аб пакоі"</string>
   <string name="screen_room_details_topic_title">"Тэма"</string>
   <string name="screen_room_details_updating_room">"Ідзе абнаўленне пакоя…"</string>
@@ -68,8 +72,8 @@
   <string name="screen_room_member_list_manage_member_unban_message">"Яны змогуць зноў далучыцца да гэтага пакоя, калі іх запросяць."</string>
   <string name="screen_room_member_list_mode_banned">"Заблакіраваныя"</string>
   <string name="screen_room_member_list_mode_members">"Удзельнікі"</string>
-  <string name="screen_room_member_list_role_administrator">"Толькі адміністратары"</string>
-  <string name="screen_room_member_list_role_moderator">"Адміністратары і мадэратары"</string>
+  <string name="screen_room_member_list_role_administrator">"Адміністратар"</string>
+  <string name="screen_room_member_list_role_moderator">"Мадэратар"</string>
   <string name="screen_room_member_list_room_members_header_title">"Удзельнікі пакоя"</string>
   <string name="screen_room_member_list_unbanning_user">"Разблакіроўка %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Дазволіць уласную наладу"</string>
@@ -99,4 +103,7 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Ролі"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Дэталі пакоя"</string>
   <string name="screen_room_roles_and_permissions_title">"Ролі і дазволы"</string>
+  <string name="screen_roomlist_mark_as_read">"Пазначыць як прачытанае"</string>
+  <string name="screen_roomlist_mark_as_unread">"Пазначыць як непрачытанае"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Адрас"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-bg/translations.xml b/features/roomdetails/impl/src/main/res/values-bg/translations.xml
index 55bce6cd12..7369d78f1d 100644
--- a/features/roomdetails/impl/src/main/res/values-bg/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-bg/translations.xml
@@ -33,6 +33,7 @@
   <string name="screen_room_details_error_muting">"Неуспешно заглушаване на тази стая, моля, опитайте отново."</string>
   <string name="screen_room_details_error_unmuting">"Неуспешно раззаглушаване на тази стая, моля, опитайте отново."</string>
   <string name="screen_room_details_invite_people_title">"Поканване на хора"</string>
+  <string name="screen_room_details_invite_title">"Поканване"</string>
   <string name="screen_room_details_leave_conversation_title">"Напускане на разговора"</string>
   <string name="screen_room_details_leave_room_title">"Напускане на стаята"</string>
   <string name="screen_room_details_media_gallery_title">"Медия и файлове"</string>
@@ -78,6 +79,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Роли"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Подробности за стаята"</string>
   <string name="screen_room_roles_and_permissions_title">"Роли и разрешения"</string>
+  <string name="screen_roomlist_mark_as_read">"Отбелязване като прочетено"</string>
+  <string name="screen_roomlist_mark_as_unread">"Отбелязване като непрочетено"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Добавяне на адрес"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Да, включване на шифроването"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Да се включи ли шифроването?"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ca/translations.xml b/features/roomdetails/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..8b9f8d937e
--- /dev/null
+++ b/features/roomdetails/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"És necessària una adreça perquè sigui visible al directori públic."</string>
+  <string name="screen_edit_room_address_title">"Edita adreça"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"S\'ha produït un error en actualitzar la configuració de notificacions."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"El servidor no admet aquesta opció en sales xifrades, és possible que no rebis notificacions en algunes sales."</string>
+  <string name="screen_polls_history_title">"Votacions"</string>
+  <string name="screen_room_change_permissions_administrators">"Només administradors"</string>
+  <string name="screen_room_change_permissions_ban_people">"Bandejar usuaris"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Eliminar missatges"</string>
+  <string name="screen_room_change_permissions_everyone">"Membre"</string>
+  <string name="screen_room_change_permissions_invite_people">"Convidar persones i acceptar sol·licituds d\'unió"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Gestiona membres"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Missatges i contingut"</string>
+  <string name="screen_room_change_permissions_moderators">"Administradors i moderadors"</string>
+  <string name="screen_room_change_permissions_remove_people">"Eliminar persones i rebutjar sol·licituds d\'unió"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Canvia la foto de la sala"</string>
+  <string name="screen_room_change_permissions_room_details">"Edita detalls"</string>
+  <string name="screen_room_change_permissions_room_name">"Canvia el nom de la sala"</string>
+  <string name="screen_room_change_permissions_room_topic">"Canvia el tema de la sala"</string>
+  <string name="screen_room_change_permissions_send_messages">"Enviar missatges"</string>
+  <string name="screen_room_change_role_administrators_title">"Edita administradors"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"No podràs desfer aquesta acció. Estàs concedint a l\'usuari el mateix nivell de poder que tu."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Afegir com a administrador?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Descendeix"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"No podràs desfer aquest canvi ja que t\'estàs descendint de rang, si ets l\'últim usuari de la sala amb privilegis, no podràs recuperar-los."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Vols descendir de categoria?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (pendent)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(pendent)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Els administradors tenen automàticament privilegis de moderador"</string>
+  <string name="screen_room_change_role_moderators_title">"Edita moderadors"</string>
+  <string name="screen_room_change_role_section_administrators">"Administradors"</string>
+  <string name="screen_room_change_role_section_moderators">"Moderadors"</string>
+  <string name="screen_room_change_role_section_users">"Membres"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Hi ha canvis sense desar."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Desar canvis?"</string>
+  <string name="screen_room_details_add_topic_title">"Afegeix tema"</string>
+  <string name="screen_room_details_badge_encrypted">"Xifrada"</string>
+  <string name="screen_room_details_badge_not_encrypted">"No xifrada"</string>
+  <string name="screen_room_details_badge_public">"Sala pública"</string>
+  <string name="screen_room_details_edit_room_title">"Edita detalls"</string>
+  <string name="screen_room_details_edition_error">"Un error desconegut ha impedit l\'intercanvi d\'informació."</string>
+  <string name="screen_room_details_edition_error_title">"No s\'ha pogut actualitzar la sala"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Els missatges estan protegits amb cadenats. Només tu i els destinataris teniu les úniques claus per a desbloquejar-los."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Xifrat de missatges activat"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"S\'ha produït un error en carregar la configuració de notificacions."</string>
+  <string name="screen_room_details_error_muting">"No s\'ha pogut silenciar la sala. Torna-ho a intentar."</string>
+  <string name="screen_room_details_error_unmuting">"No s\'ha pogut deixar de silenciar la sala. Torna-ho a provar."</string>
+  <string name="screen_room_details_invite_people_title">"Convida persones"</string>
+  <string name="screen_room_details_invite_title">"Convida"</string>
+  <string name="screen_room_details_leave_conversation_title">"Surt del xat"</string>
+  <string name="screen_room_details_leave_room_title">"Surt de la sala"</string>
+  <string name="screen_room_details_media_gallery_title">"Multimèdia i documents"</string>
+  <string name="screen_room_details_notification_mode_custom">"Personalitzat"</string>
+  <string name="screen_room_details_notification_mode_default">"Predeterminat"</string>
+  <string name="screen_room_details_notification_title">"Notificacions"</string>
+  <string name="screen_room_details_pinned_events_row_title">"Missatges fixats"</string>
+  <string name="screen_room_details_profile_row_title">"Perfil"</string>
+  <string name="screen_room_details_requests_to_join_title">"Sol·licituds d\'unió"</string>
+  <string name="screen_room_details_roles_and_permissions">"Rols i permisos"</string>
+  <string name="screen_room_details_security_and_privacy_title">"Seguretat i privadesa"</string>
+  <string name="screen_room_details_security_title">"Seguretat"</string>
+  <string name="screen_room_details_share_room_title">"Comparteix sala"</string>
+  <string name="screen_room_details_title">"Informació de sala"</string>
+  <string name="screen_room_details_topic_title">"Tema"</string>
+  <string name="screen_room_details_updating_room">"Actualitzant sala…"</string>
+  <string name="screen_room_member_list_banned_empty">"No hi ha usuaris bandejats en aquesta sala."</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d persona"</item>
+    <item quantity="other">"%1$d persones"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Bandeja de la sala"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Només elimina\'l"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Desbandeja"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Podran tornar a unir-se a aquesta sala si se\'ls convida."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Readmet usuari"</string>
+  <string name="screen_room_member_list_mode_banned">"Bandejats"</string>
+  <string name="screen_room_member_list_mode_members">"Membres"</string>
+  <string name="screen_room_member_list_role_administrator">"Només administradors"</string>
+  <string name="screen_room_member_list_role_moderator">"Administradors i moderadors"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Membres de la sala"</string>
+  <string name="screen_room_member_list_unbanning_user">"Readmetent %1$s"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Permet la configuració personalitzada"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Si ho actives, se substituirà la configuració predeterminada"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Notifica\'m en aquest xat"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Ho pots canviar al la %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"configuració global"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Configuració predeterminada"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Elimina la configuració personalitzada"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"S\'ha produït un error en carregar la configuració de notificacions."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"No s\'ha pogut restaurar el mode predeterminat. Torna-ho a provar."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"No s\'ha pogut configurar el mode. Torna-ho a provar."</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"El servidor no admet aquesta opció en sales xifrades, no rebras notificacions en aquesta sala."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Tots els missatges"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mencions y paraules clau (només)"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"En aquesta sala, notifica\'m en"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Administradors"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Canvia el meu rol"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Descendeix a membre"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Descendeix a moderador"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Moderació de membres"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Missatges i contingut"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Moderadors"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Restableix permisos"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Si restableixes els permisos, perdràs la configuració actual."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Restablir permisos?"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"Rols"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"Detalls de sala"</string>
+  <string name="screen_room_roles_and_permissions_title">"Rols i permisos"</string>
+  <string name="screen_roomlist_mark_as_read">"Marca com a llegit"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marca com a no llegit"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Afegeix adreça"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Tothom ha de sol·licitar l\'accés."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Sol·licita unir-t\'hi"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sí, activa el xifrat"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Un cop activat, el xifrat d\'una sala no es pot desactivar. L\'històric de missatges només serà visible per als membres de la sala des que van ser convidats o des que s\'hi van unir.
+Ningú a part dels membres de la sala podrà llegir els missatges. Això pot impedir que els bots i els ponts (\'bridges\') funcionin correctament.
+No es recomana activar el xifrat a les sales que tothom pot trobar i unir-se."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Vols activar el xifrat?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Un cop activat, el xifrat no es pot desactivar."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Xifrat"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activa el xifrat d\'extrem a extrem"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tothom pot unir-s\'hi."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tothom"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Només s\'hi poden unir les persones convidades."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Només amb invitació"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accés"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Actualment els espais no són compatibles"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"És necessària una adreça perquè sigui visible al directori públic."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adreça"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permet trobar aquesta sala cercant %1$s al directori públic de sales"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible al directori públic"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tothom (historial públic)"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Qui pot llegir l\'historial?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membres, des de quan es van convidar"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membres (historial complet)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adreces de sala són maneres de trobar i accedir a les sales. Això també garanteix que puguis compartir fàcilment la teva sala amb altres persones.
+Pots optar per publicar la teva sala al directori públic de sales del teu servidor local."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilitat"</string>
+  <string name="screen_security_and_privacy_title">"Seguretat i privadesa"</string>
+</resources>
diff --git a/features/roomdetails/impl/src/main/res/values-cs/translations.xml b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
index eaf787e4e3..190e1ae5de 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Nezavírejte aplikaci, dokud neskončíte."</string>
   <string name="screen_room_details_invite_people_preparing">"Příprava pozvánek…"</string>
   <string name="screen_room_details_invite_people_title">"Pozvat přátele"</string>
+  <string name="screen_room_details_invite_title">"Pozvat"</string>
   <string name="screen_room_details_leave_conversation_title">"Opustit konverzaci"</string>
   <string name="screen_room_details_leave_room_title">"Opustit místnost"</string>
   <string name="screen_room_details_media_gallery_title">"Média a soubory"</string>
@@ -134,6 +135,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Role"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Podrobnosti místnosti"</string>
   <string name="screen_room_roles_and_permissions_title">"Role a oprávnění"</string>
+  <string name="screen_roomlist_mark_as_read">"Označit jako přečtené"</string>
+  <string name="screen_roomlist_mark_as_unread">"Označit jako nepřečtené"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Přidat adresu"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Připojit se může kdokoli v autorizovaných prostorách, ale všichni ostatní musí o přístup požádat."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Všichni musí požádat o přístup."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-cy/translations.xml b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
index be8ab00639..f5d4eecac5 100644
--- a/features/roomdetails/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
@@ -53,6 +53,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Peidiwch â chau\'r ap nes ei fod wedi gorffen."</string>
   <string name="screen_room_details_invite_people_preparing">"Wrthi\'n paratoi gwahoddiadau…"</string>
   <string name="screen_room_details_invite_people_title">"Gwahodd pobl"</string>
+  <string name="screen_room_details_invite_title">"Gwahodd"</string>
   <string name="screen_room_details_leave_conversation_title">"Gadael y sgwrs"</string>
   <string name="screen_room_details_leave_room_title">"Gadael yr ystafell"</string>
   <string name="screen_room_details_media_gallery_title">"Cyfryngau a ffeiliau"</string>
@@ -119,6 +120,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rolau"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Manylion yr ystafell"</string>
   <string name="screen_room_roles_and_permissions_title">"Rolau a chaniatâd"</string>
+  <string name="screen_roomlist_mark_as_read">"Marcio fel wedi\'i ddarllen"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marcio fel heb ei ddarllen"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Ychwanegu cyfeiriad ystafell"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Gall unrhyw un ofyn am gael ymuno â\'r ystafell ond bydd rhaid i weinyddwr neu gymedrolwr dderbyn y cais."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Gofyn i gael ymuno"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-da/translations.xml b/features/roomdetails/impl/src/main/res/values-da/translations.xml
index e381a30957..191df9f059 100644
--- a/features/roomdetails/impl/src/main/res/values-da/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-da/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Luk ikke appen, før den er færdig."</string>
   <string name="screen_room_details_invite_people_preparing">"Forbereder invitationer…"</string>
   <string name="screen_room_details_invite_people_title">"Invitér andre"</string>
+  <string name="screen_room_details_invite_title">"Invitér"</string>
   <string name="screen_room_details_leave_conversation_title">"Forlad samtalen"</string>
   <string name="screen_room_details_leave_room_title">"Forlad rum"</string>
   <string name="screen_room_details_media_gallery_title">"Medier og filer"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roller"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detaljer om rummet"</string>
   <string name="screen_room_roles_and_permissions_title">"Roller og tilladelser"</string>
+  <string name="screen_roomlist_mark_as_read">"Marker som læst"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marker som ulæst"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Tilføj adresse"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Alle i autoriserede klynger kan deltage, men alle andre skal anmode om adgang."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle skal anmode om adgang."</string>
@@ -153,7 +156,7 @@ Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage
   <string name="screen_security_and_privacy_room_access_section_header">"Adgang"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Alle i autoriserede klynger kan deltage."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Alle i %1$s kan deltage."</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af rummet"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af klyngen"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Klynger understøttes ikke i øjeblikket"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en adresse for at gøre det synligt i det offentlige register."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-de/translations.xml b/features/roomdetails/impl/src/main/res/values-de/translations.xml
index 33f686332f..08201fdc34 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Neue Mitglieder sehen den Nachrichtenverlauf nicht"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Neue Mitglieder sehen den Nachrichtenverlauf"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Jeder sieht den Nachrichtenverlauf"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im öffentlichen Verzeichnis sichtbar zu machen."</string>
   <string name="screen_edit_room_address_title">"Chat-Adresse bearbeiten"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Beim Aktualisieren der Benachrichtigungseinstellungen ist ein Fehler aufgetreten."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Schließ die App erst, wenn du fertig bist."</string>
   <string name="screen_room_details_invite_people_preparing">"Einladungen werden vorbereitet…"</string>
   <string name="screen_room_details_invite_people_title">"Nutzer einladen"</string>
+  <string name="screen_room_details_invite_title">"Einladen"</string>
   <string name="screen_room_details_leave_conversation_title">"Unterhaltung verlassen"</string>
   <string name="screen_room_details_leave_room_title">"Verlassen"</string>
   <string name="screen_room_details_media_gallery_title">"Medien und Dateien"</string>
@@ -128,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rollen"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Chat-Details anpassen"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollen und Berechtigungen"</string>
+  <string name="screen_roomlist_mark_as_read">"Als gelesen markieren"</string>
+  <string name="screen_roomlist_mark_as_unread">"Als ungelesen markieren"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Chat-Adresse hinzufügen"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Jedes Mitglied eines autorisierten Space kann beitreten, aber alle anderen müssen einen Beitritt anfragen."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Zugang nur auf Anfrage."</string>
@@ -150,6 +156,7 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_access_section_header">"Zugang"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Jeder in autorisierten Spaces kann beitreten."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Jeder in %1$s kann beitreten."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space Mitglieder"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im öffentlichen Verzeichnis sichtbar zu machen."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-el/translations.xml b/features/roomdetails/impl/src/main/res/values-el/translations.xml
index c1b108a524..5f1a3ce4ab 100644
--- a/features/roomdetails/impl/src/main/res/values-el/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-el/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Μην κλείσετε την εφαρμογή μέχρι να τελειώσει."</string>
   <string name="screen_room_details_invite_people_preparing">"Προετοιμασία προσκλήσεων…"</string>
   <string name="screen_room_details_invite_people_title">"Πρόσκληση ατόμων"</string>
+  <string name="screen_room_details_invite_title">"Πρόσκληση"</string>
   <string name="screen_room_details_leave_conversation_title">"Αποχώρηση από τη συζήτηση"</string>
   <string name="screen_room_details_leave_room_title">"Αποχώρηση από την αίθουσα"</string>
   <string name="screen_room_details_media_gallery_title">"Πολυμέσα και αρχεία"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Ρόλοι"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Λεπτομέρειες αίθουσας"</string>
   <string name="screen_room_roles_and_permissions_title">"Ρόλοι και δικαιώματα"</string>
+  <string name="screen_roomlist_mark_as_read">"Επισήμανση ως αναγνωσμένου"</string>
+  <string name="screen_roomlist_mark_as_unread">"Επισήμανση ως μη αναγνωσμένου"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Προσθήκη διεύθυνσης"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Οποιοσδήποτε σε εξουσιοδοτημένους χώρους μπορεί να συμμετάσχει, αλλά όλοι οι άλλοι πρέπει να ζητήσουν πρόσβαση."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Όλοι πρέπει να αιτούνται πρόσβαση."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-es/translations.xml b/features/roomdetails/impl/src/main/res/values-es/translations.xml
index 716e3ed32a..9537596d4e 100644
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@@ -47,6 +47,7 @@
   <string name="screen_room_details_error_muting">"No se ha podido silenciar esta sala, inténtalo de nuevo."</string>
   <string name="screen_room_details_error_unmuting">"Error al dejar de silenciar esta sala, por favor inténtalo de nuevo."</string>
   <string name="screen_room_details_invite_people_title">"Invitar personas"</string>
+  <string name="screen_room_details_invite_title">"Invitar"</string>
   <string name="screen_room_details_leave_conversation_title">"Salir de la conversación"</string>
   <string name="screen_room_details_leave_room_title">"Salir de la sala"</string>
   <string name="screen_room_details_media_gallery_title">"Medios y archivos"</string>
@@ -106,6 +107,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roles"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detalles de la sala"</string>
   <string name="screen_room_roles_and_permissions_title">"Roles y permisos"</string>
+  <string name="screen_roomlist_mark_as_read">"Marcar como leído"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marcar como no leído"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Agregar dirección"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Todos deben solicitar acceso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitar unirse"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-et/translations.xml b/features/roomdetails/impl/src/main/res/values-et/translations.xml
index d5d3af8563..e6962456ac 100644
--- a/features/roomdetails/impl/src/main/res/values-et/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-et/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Ära sulge rakendust enne, kui tegevus on lõppenud."</string>
   <string name="screen_room_details_invite_people_preparing">"Valmistan kutseid ette…"</string>
   <string name="screen_room_details_invite_people_title">"Kutsu osalejaid"</string>
+  <string name="screen_room_details_invite_title">"Kutsu"</string>
   <string name="screen_room_details_leave_conversation_title">"Lahku vestlusest"</string>
   <string name="screen_room_details_leave_room_title">"Lahku jututoast"</string>
   <string name="screen_room_details_media_gallery_title">"Meedia ja failid"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rollid"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Jututoa üksikasjad"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollid ja õigused"</string>
+  <string name="screen_roomlist_mark_as_read">"Märgi loetuks"</string>
+  <string name="screen_roomlist_mark_as_unread">"Märgi mitteloetuks"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Lisa aadress"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Liituda saavad kõik volitatud kogukondade liikmed, kuid kõik teised peavad küsima võimalust ligipääsuks."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Kõik võivad paluda jututoaga liitumist."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-eu/translations.xml b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
index 7fb07cf2a4..64f32e44d9 100644
--- a/features/roomdetails/impl/src/main/res/values-eu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-eu/translations.xml
@@ -44,6 +44,7 @@
   <string name="screen_room_details_error_muting">"Ezin izan da gela mututu; saiatu berriro."</string>
   <string name="screen_room_details_error_unmuting">"Ezin izan da gela mututzeari utzi; saiatu berriro."</string>
   <string name="screen_room_details_invite_people_title">"Gonbidatu jendea"</string>
+  <string name="screen_room_details_invite_title">"Gonbidatu"</string>
   <string name="screen_room_details_leave_conversation_title">"Utzi elkarrizketa"</string>
   <string name="screen_room_details_leave_room_title">"Atera gelatik"</string>
   <string name="screen_room_details_media_gallery_title">"Multimedia eta fitxategiak"</string>
@@ -99,6 +100,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rolak"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Gelaren xehetasunak"</string>
   <string name="screen_room_roles_and_permissions_title">"Rolak eta baimenak"</string>
+  <string name="screen_roomlist_mark_as_read">"Markatu irakurritzat"</string>
+  <string name="screen_roomlist_mark_as_unread">"Markatu irakurri gabetzat"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Gehitu gelaren helbidea"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Bai, gaitu zifratzea"</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Zifratzea"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fa/translations.xml b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
index bfe743fd1b..7cdfe409dd 100644
--- a/features/roomdetails/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
@@ -4,17 +4,17 @@
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"هنگام به‌روز کردن تنظیمات آگاهی خطایی رخ داد."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"کارساز خانگیتان از این گزینه در اتاق‌های رمز شده پشتیبانی نمی‌کند. ممکن است در برخی اتاق‌ها آگاه نشوید."</string>
   <string name="screen_polls_history_title">"نظرسنجی‌ها"</string>
-  <string name="screen_room_change_permissions_administrators">"فقط مدیران"</string>
+  <string name="screen_room_change_permissions_administrators">"ادمین"</string>
   <string name="screen_room_change_permissions_ban_people">"تحریم افراد"</string>
-  <string name="screen_room_change_permissions_delete_messages">"برداشتن پیام‌ها"</string>
-  <string name="screen_room_change_permissions_everyone">"هرکسی"</string>
-  <string name="screen_room_change_permissions_invite_people">"دعوت افراد و پذیرش درخواست‌های پیوستن"</string>
-  <string name="screen_room_change_permissions_member_moderation">"نظارت اعضا"</string>
+  <string name="screen_room_change_permissions_delete_messages">"حذف پیام‌ها"</string>
+  <string name="screen_room_change_permissions_everyone">"عضو"</string>
+  <string name="screen_room_change_permissions_invite_people">"دعوت کاربران"</string>
+  <string name="screen_room_change_permissions_member_moderation">"مدیریت اعضا"</string>
   <string name="screen_room_change_permissions_messages_and_content">"پیام‌ها و محتوا"</string>
-  <string name="screen_room_change_permissions_moderators">"مدیرن و ناظران"</string>
-  <string name="screen_room_change_permissions_remove_people">"برداشتن افراد و رد درخواست‌های پیوستن"</string>
+  <string name="screen_room_change_permissions_moderators">"ناظم"</string>
+  <string name="screen_room_change_permissions_remove_people">"حذف افراد"</string>
   <string name="screen_room_change_permissions_room_avatar">"تغییر چهرک اتاق"</string>
-  <string name="screen_room_change_permissions_room_details">"ویرایش اتاق"</string>
+  <string name="screen_room_change_permissions_room_details">"ویرایش جزییات"</string>
   <string name="screen_room_change_permissions_room_name">"تغییر نام اتاق"</string>
   <string name="screen_room_change_permissions_room_topic">"دگرگونی موضوع اتاق"</string>
   <string name="screen_room_change_permissions_send_messages">"فرستادن پیام‌ها"</string>
@@ -40,7 +40,7 @@
   <string name="screen_room_details_badge_encrypted">"رمز شده"</string>
   <string name="screen_room_details_badge_not_encrypted">"رمزنگاری نشده"</string>
   <string name="screen_room_details_badge_public">"اتاق عمومی"</string>
-  <string name="screen_room_details_edit_room_title">"ویرایش اتاق"</string>
+  <string name="screen_room_details_edit_room_title">"ویرایش جزییات"</string>
   <string name="screen_room_details_edition_error">"خطایی ناشناخته رخ داد و اطّلاعات قابل تغییر نبودند."</string>
   <string name="screen_room_details_edition_error_title">"ناتوان در به‌روز رسانی اتاق"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"پیام‌ها با قفل محافظت می‌شوند. فقط شما و گیرندگان، کلیدهای منحصر به فرد برای باز کردن قفل آنها را دارید."</string>
@@ -51,6 +51,7 @@
   <string name="screen_room_details_invite_people_dont_close">"کاره را تا زمان پایانش نبندید."</string>
   <string name="screen_room_details_invite_people_preparing">"آماده سازی دعوت‌ها…"</string>
   <string name="screen_room_details_invite_people_title">"دعوت افراد"</string>
+  <string name="screen_room_details_invite_title">"دعوت"</string>
   <string name="screen_room_details_leave_conversation_title">"ترک گفت‌وگو"</string>
   <string name="screen_room_details_leave_room_title">"ترک اتاق"</string>
   <string name="screen_room_details_media_gallery_title">"رسانه‌ها و پرونده‌ها"</string>
@@ -60,14 +61,14 @@
   <string name="screen_room_details_pinned_events_row_title">"پیام‌های سنجاق شده"</string>
   <string name="screen_room_details_profile_row_title">"نمایه"</string>
   <string name="screen_room_details_requests_to_join_title">"درخواست‌های پیوستن"</string>
-  <string name="screen_room_details_roles_and_permissions">"نقش‌ها و اجازه‌ها"</string>
+  <string name="screen_room_details_roles_and_permissions">"نقش‌ها و مجوزها"</string>
   <string name="screen_room_details_security_and_privacy_title">"امنیت و محرمانگی"</string>
   <string name="screen_room_details_security_title">"امنیت"</string>
   <string name="screen_room_details_share_room_title">"هم‌رسانی اتاق"</string>
   <string name="screen_room_details_title">"اطّلاعات اتاق"</string>
   <string name="screen_room_details_topic_title">"موضوع"</string>
   <string name="screen_room_details_updating_room">"به‌روز کردن اتاق…"</string>
-  <string name="screen_room_member_list_banned_empty">"هیچ کاربر محرومی در این اتاق نیست."</string>
+  <string name="screen_room_member_list_banned_empty">"هیچ کاربری محروم نشده."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d نفر"</item>
     <item quantity="other">"%1$d نفر"</item>
@@ -79,8 +80,8 @@
   <string name="screen_room_member_list_manage_member_unban_title">"تحریم نکردن از اتاق"</string>
   <string name="screen_room_member_list_mode_banned">"محروم"</string>
   <string name="screen_room_member_list_mode_members">"اعضا"</string>
-  <string name="screen_room_member_list_role_administrator">"فقط مدیران"</string>
-  <string name="screen_room_member_list_role_moderator">"مدیرن و ناظران"</string>
+  <string name="screen_room_member_list_role_administrator">"ادمین"</string>
+  <string name="screen_room_member_list_role_moderator">"ناظم"</string>
   <string name="screen_room_member_list_role_owner">"مالک"</string>
   <string name="screen_room_member_list_room_members_header_title">"اعضای اتاق"</string>
   <string name="screen_room_member_list_unbanning_user">"رفع تحریم %1$s"</string>
@@ -108,10 +109,13 @@
   <string name="screen_room_roles_and_permissions_moderators">"ناظم‌ها"</string>
   <string name="screen_room_roles_and_permissions_owners">"مالکان"</string>
   <string name="screen_room_roles_and_permissions_reset">"بازنشانی اجازه‌ها"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"پس از بازنشانی اجازه‌ها تنظیمات فعلی را از دست خواهید داد."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"بازنشانی اجازه‌ها؟"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"نقش‌ها"</string>
   <string name="screen_room_roles_and_permissions_room_details">"جزییات اتاق"</string>
-  <string name="screen_room_roles_and_permissions_title">"نقش‌ها و اجازه‌ها"</string>
+  <string name="screen_room_roles_and_permissions_title">"نقش‌ها و مجوزها"</string>
+  <string name="screen_roomlist_mark_as_read">"علامت‌گذاری به عنوان خوانده شده"</string>
+  <string name="screen_roomlist_mark_as_unread">"نشان به ناخوانده"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"افزودن نشانی اتاق"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"درخواست دعوت"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"بله. به کار انداختن رمزنگاری"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fi/translations.xml b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
index 110790fac1..4eafca087e 100644
--- a/features/roomdetails/impl/src/main/res/values-fi/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fi/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Älä sulje sovellusta ennen kuin se on valmis."</string>
   <string name="screen_room_details_invite_people_preparing">"Valmistellaan kutsuja…"</string>
   <string name="screen_room_details_invite_people_title">"Kutsu henkilöitä"</string>
+  <string name="screen_room_details_invite_title">"Kutsu"</string>
   <string name="screen_room_details_leave_conversation_title">"Poistu keskustelusta"</string>
   <string name="screen_room_details_leave_room_title">"Poistu huoneesta"</string>
   <string name="screen_room_details_media_gallery_title">"Media ja tiedostot"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roolit"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Huoneen tiedot"</string>
   <string name="screen_room_roles_and_permissions_title">"Roolit ja oikeudet"</string>
+  <string name="screen_roomlist_mark_as_read">"Merkitse luetuksi"</string>
+  <string name="screen_roomlist_mark_as_unread">"Merkitse lukemattomaksi"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Lisää osoite"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Kuka tahansa valtuutetuissa tiloissa voi liittyä, mutta kaikkien muiden on pyydettävä pääsyä."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Kaikkien on pyydettävä pääsyä."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fr/translations.xml b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
index 0fad68c934..0d6844cb7e 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Ne fermez pas l’application avant que l’opération soit terminée."</string>
   <string name="screen_room_details_invite_people_preparing">"Préparation des invitations…"</string>
   <string name="screen_room_details_invite_people_title">"Inviter des amis"</string>
+  <string name="screen_room_details_invite_title">"Inviter"</string>
   <string name="screen_room_details_leave_conversation_title">"Quitter la discussion"</string>
   <string name="screen_room_details_leave_room_title">"Quitter le salon"</string>
   <string name="screen_room_details_media_gallery_title">"Médias et fichiers"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rôles"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Détails du salon"</string>
   <string name="screen_room_roles_and_permissions_title">"Rôles &amp; autorisations"</string>
+  <string name="screen_roomlist_mark_as_read">"Marquer comme lu"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marquer comme non lu"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Ajouter une adresse"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Toute personne se trouvant dans un espace autorisé peut participer, mais toutes les autres doivent demander l’accès."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Tout le monde doit demander un accès."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-hr/translations.xml b/features/roomdetails/impl/src/main/res/values-hr/translations.xml
index 09ec7432df..5619164dd2 100644
--- a/features/roomdetails/impl/src/main/res/values-hr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hr/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"član"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Novi članovi vide povijest"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Svatko može vidjeti povijest"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Trebat će vam adresa kako bi bila vidljiva u javnom direktoriju."</string>
   <string name="screen_edit_room_address_title">"Uredi adresu"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Došlo je do pogreške prilikom ažuriranja postavke obavijesti."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Ne zatvarajte aplikaciju dok se ne završi."</string>
   <string name="screen_room_details_invite_people_preparing">"Priprema pozivnica…"</string>
   <string name="screen_room_details_invite_people_title">"Pozovi osobe"</string>
+  <string name="screen_room_details_invite_title">"Pozovi"</string>
   <string name="screen_room_details_leave_conversation_title">"Napusti razgovor"</string>
   <string name="screen_room_details_leave_room_title">"Napusti sobu"</string>
   <string name="screen_room_details_media_gallery_title">"Mediji i datoteke"</string>
@@ -131,9 +135,12 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Uloge"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Pojedinosti o sobi"</string>
   <string name="screen_room_roles_and_permissions_title">"Uloge i dopuštenja"</string>
+  <string name="screen_roomlist_mark_as_read">"Označi kao pročitano"</string>
+  <string name="screen_roomlist_mark_as_unread">"Označi kao nepročitano"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adresu"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Svatko tko se nalazi u ovlaštenim prostorima može se pridružiti, ali svi ostali moraju zatražiti pristup."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Svi moraju zatražiti pristup."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Zatraži pridruživanje"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Svatko u %1$s može se pridružiti, ali svi ostali moraju zatražiti pristup."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, omogući šifriranje"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Nakon što se šifriranje za sobu omogući, više se neće moći onemogućiti. Povijest poruka bit će vidljiva samo članovima sobe otkad su pozvani ili otkad su joj se pridružili.
@@ -144,13 +151,15 @@ Ne preporučujemo omogućavanje šifriranja za sobe koje svatko može pronaći i
   <string name="screen_security_and_privacy_encryption_section_header">"Šifriranje"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Omogući sveobuhvatno šifriranje"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Svatko se može pridružiti."</string>
-  <string name="screen_security_and_privacy_room_access_footer">"Odaberite iz kojih se prostora članovi mogu pridružiti ovoj sobi bez pozivnice.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bilo tko"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Odaberite iz kojih se prostora članovi mogu pridružiti ovoj sobi bez pozivnice. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Upravljaj prostorima"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Samo pozvane osobe mogu se pridružiti."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Samo s pozivnicom"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Pristup"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Svatko tko se nalazi u ovlaštenim prostorima može se pridružiti."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Svatko u %1$s može se pridružiti."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Članovi prostora"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostori trenutačno nisu podržani"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Trebat će vam adresa kako bi bila vidljiva u javnom direktoriju."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-hu/translations.xml b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
index 1dc523f319..fed765fb45 100644
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Ne zárja be az alkalmazást, amíg nem végzett."</string>
   <string name="screen_room_details_invite_people_preparing">"Meghívók előkészítése…"</string>
   <string name="screen_room_details_invite_people_title">"Ismerősök meghívása"</string>
+  <string name="screen_room_details_invite_title">"Meghívás"</string>
   <string name="screen_room_details_leave_conversation_title">"Beszélgetés elhagyása"</string>
   <string name="screen_room_details_leave_room_title">"Szoba elhagyása"</string>
   <string name="screen_room_details_media_gallery_title">"Média és fájlok"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Szerepkörök"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Szoba részletei"</string>
   <string name="screen_room_roles_and_permissions_title">"Szerepkörök és jogosultságok"</string>
+  <string name="screen_roomlist_mark_as_read">"Megjelölés olvasottként"</string>
+  <string name="screen_roomlist_mark_as_unread">"Megjelölés olvasatlanként"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Cím hozzáadása"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Bárki csatlakozhat, az engedélyezett terekből, és mindenki másnak hozzáférést kell kérnie."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Mindenkinek hozzáférést kell kérnie."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-in/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
index 41bf3d2826..bcdacb99ea 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Anggota baru tidak dapat melihat riwayat"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Anggota baru dapat melihat riwayat"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Siapa pun dapat melihat riwayat"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
   <string name="screen_edit_room_address_title">"Edit alamat"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Terjadi kesalahan saat memperbarui pengaturan pemberitahuan."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Jangan tutup aplikasi tunggu hingga selesai."</string>
   <string name="screen_room_details_invite_people_preparing">"Mempersiapkan undangan…"</string>
   <string name="screen_room_details_invite_people_title">"Undang orang-orang"</string>
+  <string name="screen_room_details_invite_title">"Undang"</string>
   <string name="screen_room_details_leave_conversation_title">"Tinggalkan percakapan"</string>
   <string name="screen_room_details_leave_room_title">"Tinggalkan ruangan"</string>
   <string name="screen_room_details_media_gallery_title">"Media dan berkas"</string>
@@ -63,6 +67,7 @@
   <string name="screen_room_details_profile_row_title">"Profil"</string>
   <string name="screen_room_details_requests_to_join_title">"Permintaan untuk bergabung"</string>
   <string name="screen_room_details_roles_and_permissions">"Peran dan perizinan"</string>
+  <string name="screen_room_details_room_name_label">"Nama"</string>
   <string name="screen_room_details_security_and_privacy_title">"Keamanan &amp; privasi"</string>
   <string name="screen_room_details_security_title">"Keamanan"</string>
   <string name="screen_room_details_share_room_title">"Bagikan ruangan"</string>
@@ -70,6 +75,11 @@
   <string name="screen_room_details_topic_title">"Topik"</string>
   <string name="screen_room_details_updating_room">"Memperbarui ruangan…"</string>
   <string name="screen_room_member_list_banned_empty">"Tidak ada pengguna yang dicekal dalam ruangan ini."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d Dilarang"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Periksa ejaannya atau coba pencarian baru"</string>
+  <string name="screen_room_member_list_empty_search_title">"Tidak ada hasil untuk%1$s"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d orang"</item>
   </plurals>
@@ -80,6 +90,10 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Batalkan cekalan dari ruangan"</string>
   <string name="screen_room_member_list_mode_banned">"Tercekal"</string>
   <string name="screen_room_member_list_mode_members">"Anggota"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d Diundang"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Tertunda"</string>
   <string name="screen_room_member_list_role_administrator">"Hanya admin"</string>
   <string name="screen_room_member_list_role_moderator">"Admin dan moderator"</string>
   <string name="screen_room_member_list_role_owner">"Pemilik"</string>
@@ -108,15 +122,20 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Pesan dan konten"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderator"</string>
   <string name="screen_room_roles_and_permissions_owners">"Pemilik"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Permission"</string>
   <string name="screen_room_roles_and_permissions_reset">"Atur ulang perizinan"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Setelah Anda mengatur ulang perizinan, Anda akan kehilangan pengaturan Anda saat ini."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Atur ulang perizinan?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Peran"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detail ruangan"</string>
   <string name="screen_room_roles_and_permissions_title">"Peran dan perizinan"</string>
+  <string name="screen_roomlist_mark_as_read">"Tandai sebagai dibaca"</string>
+  <string name="screen_roomlist_mark_as_unread">"Tandai sebagai belum dibaca"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Siapa pun yang berada di ruang yang diizinkan dapat bergabung, tetapi semua orang lain harus meminta akses."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Meminta hak akses pada administrator atau moderator."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Ijin bergabung"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Siapa pun di %1$s dapat bergabung, tetapi semua orang lain harus meminta akses."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ya, aktifkan enkripsi"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Setelah diaktifkan, encryption untuk sebuah ruangan tidak dapat dinonaktifkan, Riwayat pesan hanya akan terlihat oleh anggota ruangan sejak mereka diundang atau sejak mereka bergabung dengan ruangan tersebut.
 Tidak ada orang lain selain anggota ruangan yang dapat membaca pesan. Hal ini dapat mencegah bot dan jembatan bekerja dengan benar.
@@ -127,20 +146,28 @@ Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat dite
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktifkan enkripsi ujung ke ujung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Siapa pun dapat menemukan dan bergabung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Semua orang"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Pilih ruang mana yang anggotanya dapat bergabung ke ruangan ini tanpa undangan. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Kelola ruang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Siapa pun yang berada di area yang diizinkan dapat bergabung."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Siapa pun di %1$s dapat bergabung."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Alamat"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Izinkan agar dapat ditemukan melalui pencarian di direktori publik."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Tersedia di direktori publik"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa saja (riwayat publik)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Perubahan tidak akan memengaruhi pesan lama, hanya pesan baru. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Siapa yang bisa membaca riwayat"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Hanya sejak anggota diundang"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Anggota dapat melihat rekaman percakapan sejak memilih opsi ini"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat adalah cara untuk menemukan dan mengakses ruangan dan ruang. Ini juga memastikan Anda dapat dengan mudah membagikannya dengan orang lain."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilitas"</string>
   <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-it/translations.xml b/features/roomdetails/impl/src/main/res/values-it/translations.xml
index 053e269bc4..b8a18d4421 100644
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"I nuovi membri non vedono la cronologia"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"I nuovi membri vedono la cronologia"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Chiunque può vedere la cronologia"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
   <string name="screen_edit_room_address_title">"Modifica indirizzo"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Si è verificato un errore durante l\'aggiornamento delle impostazioni di notifica."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Non chiudere l\'app fino al completamento."</string>
   <string name="screen_room_details_invite_people_preparing">"Preparazione degli inviti…"</string>
   <string name="screen_room_details_invite_people_title">"Invita persone"</string>
+  <string name="screen_room_details_invite_title">"Invita"</string>
   <string name="screen_room_details_leave_conversation_title">"Abbandona la conversazione"</string>
   <string name="screen_room_details_leave_room_title">"Esci dalla stanza"</string>
   <string name="screen_room_details_media_gallery_title">"File e contenuti multimediali"</string>
@@ -63,6 +67,7 @@
   <string name="screen_room_details_profile_row_title">"Profilo"</string>
   <string name="screen_room_details_requests_to_join_title">"Richieste di accesso"</string>
   <string name="screen_room_details_roles_and_permissions">"Ruoli e autorizzazioni"</string>
+  <string name="screen_room_details_room_name_label">"Nome"</string>
   <string name="screen_room_details_security_and_privacy_title">"Sicurezza e privacy"</string>
   <string name="screen_room_details_security_title">"Sicurezza"</string>
   <string name="screen_room_details_share_room_title">"Condividi stanza"</string>
@@ -127,9 +132,13 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Ruoli"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Dettagli della stanza"</string>
   <string name="screen_room_roles_and_permissions_title">"Ruoli e autorizzazioni"</string>
+  <string name="screen_roomlist_mark_as_read">"Segna come letto"</string>
+  <string name="screen_roomlist_mark_as_unread">"Segna come non letto"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Chiunque si trovi in spazi autorizzati può partecipare, ma tutti gli altri devono richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque deve richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Chiunque all\'interno di %1$s può partecipare, mentre tutti gli altri devono richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sì, attiva la crittografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una volta attivata, la crittografia di una stanza non può essere disattivata, la cronologia dei messaggi sarà visibile solo ai membri della stanza da quando sono stati invitati o da quando sono entrati nella stanza.
 Nessuno, oltre ai membri della stanza, sarà in grado di leggere i messaggi. Ciò potrebbe impedire ai bot e ai bridge di funzionare correttamente.
@@ -140,19 +149,25 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_encryption_toggle_title">"Attiva la crittografia end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può partecipare."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Scegli quali membri dello spazio possono accedere a questa stanza senza invito.%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gestisci gli spazi"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Solo le persone invitate possono entrare."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo su invito"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Accesso"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Chiunque si trovi in ​​spazi autorizzati può partecipare."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Chiunque in %1$s può partecipare."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gli spazi non sono attualmente supportati"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Consenti la ricerca di questa stanza effettuando una ricerca nell\'elenco delle stanze pubbliche di %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Consenti di essere trovato effettuando una ricerca nell\'elenco pubblico."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco pubblico"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque (la cronologia è pubblica)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Le modifiche non interesseranno i messaggi passati, ma solo quelli nuovi. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Chi può leggere la cronologia messaggi"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo membri da quando sono stati invitati"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo membri da dopo aver selezionato questa opzione"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members invited"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members (cronologia completa)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
 Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ja/translations.xml b/features/roomdetails/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..bf0ef7424c
--- /dev/null
+++ b/features/roomdetails/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"新しいメンバーは過去の内容を確認できない"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"新規メンバーも過去の内容を確認できます"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"すべてのユーザーが過去の内容を確認できます"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"公開ディレクトリで自分を見つけられるようにするには、アドレスが必要です。"</string>
+  <string name="screen_edit_room_address_title">"アドレスの編集"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"通知設定の更新中に問題が発生しました。"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"暗号化されたルームでは、この機能にホームサーバーが対応しないため、一部のルームから通知が届かない可能性があります。"</string>
+  <string name="screen_polls_history_title">"投票"</string>
+  <string name="screen_room_change_permissions_administrators">"管理者"</string>
+  <string name="screen_room_change_permissions_ban_people">"ユーザーの追放"</string>
+  <string name="screen_room_change_permissions_delete_messages">"メッセージの削除"</string>
+  <string name="screen_room_change_permissions_everyone">"メンバー"</string>
+  <string name="screen_room_change_permissions_invite_people">"ユーザーの招待"</string>
+  <string name="screen_room_change_permissions_member_moderation">"メンバーの管理"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"メッセージと内容"</string>
+  <string name="screen_room_change_permissions_moderators">"モデレーター"</string>
+  <string name="screen_room_change_permissions_remove_people">"ユーザーの削除"</string>
+  <string name="screen_room_change_permissions_room_avatar">"アバターの変更"</string>
+  <string name="screen_room_change_permissions_room_details">"詳細を編集"</string>
+  <string name="screen_room_change_permissions_room_name">"名前の変更"</string>
+  <string name="screen_room_change_permissions_room_topic">"トピックの変更"</string>
+  <string name="screen_room_change_permissions_send_messages">"メッセージの送信"</string>
+  <string name="screen_room_change_role_administrators_title">"管理者を編集"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"この操作は取り消せません。このユーザーをあなたと同じ権限まで昇格します。"</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"管理者を追加しますか？"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"この操作は取り消せません。選択したユーザーに所有権を譲与します。あなたがルームを退出すると恒久的に変更が適用されます。"</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"所有権を譲与しますか？"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"降格"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"自身を降格しようとしているため、後から取り消すことはできません。このルームに他に特権を持つユーザーが存在しない場合、それを回復することはできなくなります。"</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"自身を降格しますか？"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (承認待ち)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"承認待ち"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"管理者はモデレータの特権を有します。"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"所有者は管理者の特権を有します。"</string>
+  <string name="screen_room_change_role_moderators_title">"モデレーターを編集"</string>
+  <string name="screen_room_change_role_owners_title">"所有者を選択"</string>
+  <string name="screen_room_change_role_section_administrators">"管理者"</string>
+  <string name="screen_room_change_role_section_moderators">"モデレーター"</string>
+  <string name="screen_room_change_role_section_users">"メンバー"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"未保存の変更内容があります。"</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"変更を保存しますか？"</string>
+  <string name="screen_room_details_add_topic_title">"トピックを追加"</string>
+  <string name="screen_room_details_badge_encrypted">"暗号化済み"</string>
+  <string name="screen_room_details_badge_not_encrypted">"暗号化されていません"</string>
+  <string name="screen_room_details_badge_public">"公開ルーム"</string>
+  <string name="screen_room_details_edit_room_title">"詳細を編集"</string>
+  <string name="screen_room_details_edition_error">"不明な問題が発生したため、情報の更新に失敗しました。"</string>
+  <string name="screen_room_details_edition_error_title">"ルームを更新することができません"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"メッセージは、あなたと受信者のみが持つ鍵で暗号化されています。"</string>
+  <string name="screen_room_details_encryption_enabled_title">"メッセージの暗号化が有効です"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"通知設定の読み込み中に問題が発生しました。"</string>
+  <string name="screen_room_details_error_muting">"ルームをミュートできませんでした。再試行してください。"</string>
+  <string name="screen_room_details_error_unmuting">"ルームをミュート解除できませんでした。再試行してください。"</string>
+  <string name="screen_room_details_invite_people_dont_close">"終了するまでアプリを閉じないでください。"</string>
+  <string name="screen_room_details_invite_people_preparing">"招待を準備中…"</string>
+  <string name="screen_room_details_invite_people_title">"ユーザーを招待"</string>
+  <string name="screen_room_details_invite_title">"招待"</string>
+  <string name="screen_room_details_leave_conversation_title">"会話を退出"</string>
+  <string name="screen_room_details_leave_room_title">"ルームを退出"</string>
+  <string name="screen_room_details_media_gallery_title">"ファイルとメディア"</string>
+  <string name="screen_room_details_notification_mode_custom">"カスタム"</string>
+  <string name="screen_room_details_notification_mode_default">"デフォルト"</string>
+  <string name="screen_room_details_notification_title">"通知"</string>
+  <string name="screen_room_details_pinned_events_row_title">"ピン留めされたメッセージ"</string>
+  <string name="screen_room_details_profile_row_title">"プロフィール"</string>
+  <string name="screen_room_details_requests_to_join_title">"参加のリクエスト"</string>
+  <string name="screen_room_details_roles_and_permissions">"役割と権限"</string>
+  <string name="screen_room_details_room_name_label">"名前"</string>
+  <string name="screen_room_details_security_and_privacy_title">"セキュリティとプライバシー"</string>
+  <string name="screen_room_details_security_title">"セキュリティ"</string>
+  <string name="screen_room_details_share_room_title">"ルームを共有"</string>
+  <string name="screen_room_details_title">"ルームの情報"</string>
+  <string name="screen_room_details_topic_title">"トピック"</string>
+  <string name="screen_room_details_updating_room">"詳細を更新中…"</string>
+  <string name="screen_room_member_list_banned_empty">"追放されたユーザーはいません。"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d 人の追放"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"スペルを確認するか、新たに検索し直してください"</string>
+  <string name="screen_room_member_list_empty_search_title">"\"%1$s\" の検索結果はありません"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="other">"%1$d 人"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"ユーザーを追放"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"メンバーのみを削除"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"追放を解除"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"招待を受け取ると再度参加できます。"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"ユーザーの追放を解除"</string>
+  <string name="screen_room_member_list_mode_banned">"追放済み"</string>
+  <string name="screen_room_member_list_mode_members">"メンバー"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d 件の招待"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"待機中"</string>
+  <string name="screen_room_member_list_role_administrator">"管理者"</string>
+  <string name="screen_room_member_list_role_moderator">"モデレーター"</string>
+  <string name="screen_room_member_list_role_owner">"所有者"</string>
+  <string name="screen_room_member_list_room_members_header_title">"ルームのメンバー"</string>
+  <string name="screen_room_member_list_unbanning_user">"%1$s の追放を解除中"</string>
+  <string name="screen_room_notification_settings_allow_custom">"カスタム設定を許可"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"オンにするとデフォルト設定が上書きされます"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"このチャットで以下の通知を受け取る"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"%1$s から変更できます。"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"全体設定"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"デフォルト設定"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"カスタム設定を削除する"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"通知設定の読み込み中に問題が発生しました。"</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"デフォルトの復元に失敗しました。再試行してください。"</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"設定に失敗しました。再試行してください。"</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"暗号化されたルームでは、この機能にホームサーバーが対応しないため、このルームからの通知を受信できません。"</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"すべてのメッセージ"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"メンションとキーワードのみ"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"このルームでは以下の通知を受け取る"</string>
+  <string name="screen_room_roles_and_permissions_admins">"管理者"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理者と所有者"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"自身の役割を変更"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"権限を譲与"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"モデレーターに譲与"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"メンバーの編集"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"メッセージと内容"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"モデレーター"</string>
+  <string name="screen_room_roles_and_permissions_owners">"所有者"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"権限"</string>
+  <string name="screen_room_roles_and_permissions_reset">"権限をリセット"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"権限をリセットすると現在の設定はすべて失われます。"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"権限をリセットしますか？"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"役割"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"ルームの詳細"</string>
+  <string name="screen_room_roles_and_permissions_title">"役割と権限"</string>
+  <string name="screen_roomlist_mark_as_read">"既読にする"</string>
+  <string name="screen_roomlist_mark_as_unread">"未読にする"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"アドレスを追加"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"認証済みのスペースに所属するユーザーのみが参加できます。それ以外のユーザーは参加へのリクエストが必要です。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"参加のリクエストが必須です。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"参加をリクエスト"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s に所属するユーザーのみが参加できます。それ以外のユーザーは参加のリクエストが必要です。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"暗号化を有効にする"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"暗号化が有効のルームを再び無効化することはできません。過去のメッセージの参照は、ユーザーが招待された、あるいは参加した以降に投稿された内容に限定されます。
+ルームのメンバー以外がメッセージを確認することはできないため、bot やブリッジのサービスが正常に動作しない可能性があります。
+公開スペースを暗号化することは一般に推奨されません。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"暗号化を有効にしますか？"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"一度有効にすると元に戻すことはできません。"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"暗号化"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"エンドツーエンド暗号化を有効にする"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"誰でも参加できます"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"全員"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"招待無しで参加できるユーザーが所属するルームを選択してください。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"スペースを管理"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"招待されたユーザーのみ参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"招待制"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"アクセス"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"認証済みのスペースに所属するすべてのユーザーが参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s に所属するすべてのユーザーが参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"スペースのメンバー"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"スペースは現在対応していません。"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"公開ディレクトリで自分を見つけられるようにするには、アドレスが必要です。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"アドレス"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"%1$s の公開ルームの検索結果に、このルームを表示します"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"公開ディレクトリの検索結果に表示"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"公開ディレクトリに表示"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"全員(履歴を公開)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"過去のメッセージに変更は適用されません。新規のメッセージにのみ適用されます。%1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"履歴を表示するユーザー"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"招待済みのユーザー"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"ユーザー (すべての履歴)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"ルームアドレスはルームの検索やアクセスに役立ち、他のユーザーにルームを簡単に共有できます。
+ホームサーバーの公開ディレクトリにルームを表示するかを設定できます。"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"ルームの公開"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"ルームアドレスはルームの検索やアクセスに役立ち、他のユーザーにルームを簡単に共有できます。"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"視認性"</string>
+  <string name="screen_security_and_privacy_title">"セキュリティとプライバシー"</string>
+</resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ka/translations.xml b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
index 3ffc962603..8fd0b2c8a6 100644
--- a/features/roomdetails/impl/src/main/res/values-ka/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
@@ -39,6 +39,7 @@
   <string name="screen_room_details_error_muting">"ამ ოთახის დადუმება ვერ მოხერხდა. გთხოვთ, სცადოთ ხელახლა."</string>
   <string name="screen_room_details_error_unmuting">"ამ ოთახის დადუმების მოხსნა ვერ მოხერხდა. გთხოვთ, სცადოთ ხელახლა."</string>
   <string name="screen_room_details_invite_people_title">"ხალხის მოწვევა"</string>
+  <string name="screen_room_details_invite_title">"მოწვევა"</string>
   <string name="screen_room_details_leave_conversation_title">"საუბრის დატოვება"</string>
   <string name="screen_room_details_leave_room_title">"ოთახის დატოვება"</string>
   <string name="screen_room_details_notification_mode_custom">"მორგებული"</string>
@@ -93,4 +94,6 @@
   <string name="screen_room_roles_and_permissions_roles_header">"როლები"</string>
   <string name="screen_room_roles_and_permissions_room_details">"ოთახის დეტალები"</string>
   <string name="screen_room_roles_and_permissions_title">"როლები და ნებართვები"</string>
+  <string name="screen_roomlist_mark_as_read">"წაკითხულად მონიშვნა"</string>
+  <string name="screen_roomlist_mark_as_unread">"წაუკითხავად მონიშვნა"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ko/translations.xml b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
index 2c6462c4a7..4a32cab45d 100644
--- a/features/roomdetails/impl/src/main/res/values-ko/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ko/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"작업이 완료될 때까지 앱을 닫지 마세요."</string>
   <string name="screen_room_details_invite_people_preparing">"초대 준비중…"</string>
   <string name="screen_room_details_invite_people_title">"사람 초대하기"</string>
+  <string name="screen_room_details_invite_title">"초대"</string>
   <string name="screen_room_details_leave_conversation_title">"대화에서 나가기"</string>
   <string name="screen_room_details_leave_room_title">"방 떠나기"</string>
   <string name="screen_room_details_media_gallery_title">"미디어 및 파일"</string>
@@ -128,6 +129,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"역할"</string>
   <string name="screen_room_roles_and_permissions_room_details">"방 세부 정보"</string>
   <string name="screen_room_roles_and_permissions_title">"역할 및 권한"</string>
+  <string name="screen_roomlist_mark_as_read">"읽음으로 표시"</string>
+  <string name="screen_roomlist_mark_as_unread">"읽지 않음으로 표시"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"주소 추가"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"승인된 스페이스의 멤버는 누구나 참여할 수 있지만, 그 외의 인원은 액세스 요청을 해야 합니다."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"모든 사용자가 액세스 권한을 요청해야 합니다."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-lt/translations.xml b/features/roomdetails/impl/src/main/res/values-lt/translations.xml
index 84f74042da..9bdaeb86e5 100644
--- a/features/roomdetails/impl/src/main/res/values-lt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-lt/translations.xml
@@ -8,6 +8,7 @@
   <string name="screen_room_details_encryption_enabled_subtitle">"Žinutės yra užrakintos. Tik Jūs ir gavėjai turite unikalius raktus joms atrakinti."</string>
   <string name="screen_room_details_encryption_enabled_title">"Įjungtas žinučių šifravimas"</string>
   <string name="screen_room_details_invite_people_title">"Pakviesti žmonių"</string>
+  <string name="screen_room_details_invite_title">"Kviesti"</string>
   <string name="screen_room_details_leave_conversation_title">"Palikti pokalbį"</string>
   <string name="screen_room_details_leave_room_title">"Išeiti iš kambario"</string>
   <string name="screen_room_details_notification_mode_custom">"Pasirinktinis"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-nb/translations.xml b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
index e522f5cd79..0cb3dfc268 100644
--- a/features/roomdetails/impl/src/main/res/values-nb/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Ikke lukk appen før den er ferdig."</string>
   <string name="screen_room_details_invite_people_preparing">"Forbereder invitasjoner…"</string>
   <string name="screen_room_details_invite_people_title">"Inviter folk"</string>
+  <string name="screen_room_details_invite_title">"Inviter"</string>
   <string name="screen_room_details_leave_conversation_title">"Forlat samtalen"</string>
   <string name="screen_room_details_leave_room_title">"Forlat rommet"</string>
   <string name="screen_room_details_media_gallery_title">"Medier og filer"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roller"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Romdetaljer"</string>
   <string name="screen_room_roles_and_permissions_title">"Roller og tillatelser"</string>
+  <string name="screen_roomlist_mark_as_read">"Marker som lest"</string>
+  <string name="screen_roomlist_mark_as_unread">"Merk som ulest"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Legg til adresse"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Alle i autoriserte områder kan bli med, men alle andre må be om tilgang."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Alle må be om tilgang."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-nl/translations.xml b/features/roomdetails/impl/src/main/res/values-nl/translations.xml
index 9234921c35..2ee5caca97 100644
--- a/features/roomdetails/impl/src/main/res/values-nl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nl/translations.xml
@@ -43,6 +43,7 @@
   <string name="screen_room_details_error_muting">"Het dempen van deze kamer is mislukt. Probeer het opnieuw."</string>
   <string name="screen_room_details_error_unmuting">"Het dempen opheffen voor deze kamer is mislukt. Probeer het opnieuw."</string>
   <string name="screen_room_details_invite_people_title">"Mensen uitnodigen"</string>
+  <string name="screen_room_details_invite_title">"Uitnodigen"</string>
   <string name="screen_room_details_leave_conversation_title">"Gesprek verlaten"</string>
   <string name="screen_room_details_leave_room_title">"Kamer verlaten"</string>
   <string name="screen_room_details_media_gallery_title">"Media en bestanden"</string>
@@ -99,4 +100,6 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rollen"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Kamergegevens"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollen en rechten"</string>
+  <string name="screen_roomlist_mark_as_read">"Markeren als gelezen"</string>
+  <string name="screen_roomlist_mark_as_unread">"Markeren als ongelezen"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-pl/translations.xml b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
index e22636290b..b79d3014e5 100644
--- a/features/roomdetails/impl/src/main/res/values-pl/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pl/translations.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
-  <string name="screen_edit_room_address_title">"Adres pokoju"</string>
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Nowi członkowie nie widzą historii"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Nowi członkowie widzą historię"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Każdy może przeglądać historię"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi publicznych, potrzebny jest adres pokoju."</string>
+  <string name="screen_edit_room_address_title">"Edytuj adres"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Wystąpił błąd podczas aktualizacji ustawienia powiadomień."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Twój serwer domowy nie wspiera tej opcji w pokojach szyfrowanych, możesz nie otrzymać powiadomień z niektórych pokoi."</string>
   <string name="screen_polls_history_title">"Ankiety"</string>
-  <string name="screen_room_change_permissions_administrators">"Tylko administratorzy"</string>
+  <string name="screen_room_change_permissions_administrators">"Administrator"</string>
   <string name="screen_room_change_permissions_ban_people">"Banowanie osób"</string>
   <string name="screen_room_change_permissions_delete_messages">"Usuń wiadomości"</string>
-  <string name="screen_room_change_permissions_invite_people">"Zapraszanie osób i akceptowanie próśb o dołączenie"</string>
+  <string name="screen_room_change_permissions_everyone">"Członek"</string>
+  <string name="screen_room_change_permissions_invite_people">"Zaproś osoby"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Zarządzaj członkami"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Wiadomości i zawartość"</string>
-  <string name="screen_room_change_permissions_moderators">"Administratorzy i moderatorzy"</string>
-  <string name="screen_room_change_permissions_remove_people">"Usuwanie osób i odrzucanie próśb o dołączenie"</string>
+  <string name="screen_room_change_permissions_moderators">"Moderator"</string>
+  <string name="screen_room_change_permissions_remove_people">"Usuń osoby"</string>
   <string name="screen_room_change_permissions_room_avatar">"Zmień awatar pokoju"</string>
-  <string name="screen_room_change_permissions_room_details">"Edytuj pokój"</string>
+  <string name="screen_room_change_permissions_room_details">"Edytuj szczegóły"</string>
   <string name="screen_room_change_permissions_room_name">"Zmień nazwę pokoju"</string>
   <string name="screen_room_change_permissions_room_topic">"Zmień temat pokoju"</string>
   <string name="screen_room_change_permissions_send_messages">"Wysyłanie wiadomości"</string>
@@ -26,7 +31,7 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Nie będzie można cofnąć tej zmiany, jeśli się zdegradujesz. Jeśli jesteś ostatnim uprzywilejowanym użytkownikiem w pokoju, nie będziesz w stanie odzyskać uprawnień."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Zdegradować siebie?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Oczekujące)"</string>
-  <string name="screen_room_change_role_invited_member_name_android">"(Oczekujący)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Oczekujące)"</string>
   <string name="screen_room_change_role_moderators_admin_section_footer">"Administratorzy automatycznie mają uprawnienia moderatora"</string>
   <string name="screen_room_change_role_moderators_owner_section_footer">"Właściciele automatycznie mają uprawnienia administratora."</string>
   <string name="screen_room_change_role_moderators_title">"Edytuj moderatorów"</string>
@@ -40,10 +45,10 @@
   <string name="screen_room_details_badge_encrypted">"Szyfrowany"</string>
   <string name="screen_room_details_badge_not_encrypted">"Nieszyfrowany"</string>
   <string name="screen_room_details_badge_public">"Pokój publiczny"</string>
-  <string name="screen_room_details_edit_room_title">"Edytuj pokój"</string>
+  <string name="screen_room_details_edit_room_title">"Edytuj szczegóły"</string>
   <string name="screen_room_details_edition_error">"Wystąpił nieznany błąd i nie można było zmienić informacji."</string>
   <string name="screen_room_details_edition_error_title">"Nie można zaktualizować pokoju"</string>
-  <string name="screen_room_details_encryption_enabled_subtitle">"Wiadomości są zabezpieczone kłódkami. Tylko Ty i odbiorcy macie unikalne klucze do ich odblokowania."</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Wiadomości są zabezpieczone kłódkami. Tylko Ty i Twoi odbiorcy posiadacie klucze do ich otwarcia."</string>
   <string name="screen_room_details_encryption_enabled_title">"Szyfrowanie wiadomości włączone"</string>
   <string name="screen_room_details_error_loading_notification_settings">"Wystąpił błąd podczas ładowania ustawień powiadomień."</string>
   <string name="screen_room_details_error_muting">"Wyciszenie tego pokoju nie powiodło się, spróbuj ponownie."</string>
@@ -51,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Nie zamykaj aplikacji przed zakończeniem."</string>
   <string name="screen_room_details_invite_people_preparing">"Przygotowywanie zaproszeń…"</string>
   <string name="screen_room_details_invite_people_title">"Zaproś znajomych"</string>
+  <string name="screen_room_details_invite_title">"Zaproś"</string>
   <string name="screen_room_details_leave_conversation_title">"Opuść rozmowę"</string>
   <string name="screen_room_details_leave_room_title">"Opuść pokój"</string>
   <string name="screen_room_details_media_gallery_title">"Media i pliki"</string>
@@ -61,13 +67,21 @@
   <string name="screen_room_details_profile_row_title">"Profil"</string>
   <string name="screen_room_details_requests_to_join_title">"Prośby o dołączenie"</string>
   <string name="screen_room_details_roles_and_permissions">"Role i uprawnienia"</string>
+  <string name="screen_room_details_room_name_label">"Nazwa"</string>
   <string name="screen_room_details_security_and_privacy_title">"Bezpieczeństwo i prywatność"</string>
   <string name="screen_room_details_security_title">"Bezpieczeństwo"</string>
   <string name="screen_room_details_share_room_title">"Udostępnij pokój"</string>
   <string name="screen_room_details_title">"Informacje pokoju"</string>
   <string name="screen_room_details_topic_title">"Temat"</string>
   <string name="screen_room_details_updating_room">"Aktualizuję pokój…"</string>
-  <string name="screen_room_member_list_banned_empty">"W tym pokoju nie ma zbanowanych użytkowników."</string>
+  <string name="screen_room_member_list_banned_empty">"Nie ma zbanowanych użytkowników."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d zbanowany"</item>
+    <item quantity="few">"%1$d zbanowanych"</item>
+    <item quantity="many">"%1$d zbanowanych"</item>
+  </plurals>
+  <string name="screen_room_member_list_empty_search_subtitle">"Sprawdź pisownię lub wyszukaj ponownie"</string>
+  <string name="screen_room_member_list_empty_search_title">"Brak wyników dla “%1$s”"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d osoba"</item>
     <item quantity="few">"%1$d osoby"</item>
@@ -80,16 +94,22 @@
   <string name="screen_room_member_list_manage_member_unban_title">"Odbanuj z pokoju"</string>
   <string name="screen_room_member_list_mode_banned">"Zbanowanych"</string>
   <string name="screen_room_member_list_mode_members">"Członków"</string>
-  <string name="screen_room_member_list_role_administrator">"Tylko administratorzy"</string>
-  <string name="screen_room_member_list_role_moderator">"Administratorzy i moderatorzy"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="one">"%1$d zaproszony"</item>
+    <item quantity="few">"%1$d zaproszonych"</item>
+    <item quantity="many">"%1$d zaproszonych"</item>
+  </plurals>
+  <string name="screen_room_member_list_pending_status">"Oczekuje"</string>
+  <string name="screen_room_member_list_role_administrator">"Administrator"</string>
+  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
   <string name="screen_room_member_list_role_owner">"Właściciel"</string>
   <string name="screen_room_member_list_room_members_header_title">"Członkowie pokoju"</string>
   <string name="screen_room_member_list_unbanning_user">"Odbanowanie %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"Zezwalaj na ustawienia niestandardowe"</string>
   <string name="screen_room_notification_settings_allow_custom_footnote">"Włączenie tej opcji nadpisze ustawienie domyślne"</string>
   <string name="screen_room_notification_settings_custom_settings_title">"Powiadamiaj mnie o tym czacie przez"</string>
-  <string name="screen_room_notification_settings_default_setting_footnote">"Możesz to zmienić w swoim %1$s."</string>
-  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"ustawienia globalne"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Możesz to zmienić w %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"ustawieniach globalnych"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Ustawienie domyślne"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"Usuń ustawienia własne"</string>
   <string name="screen_room_notification_settings_error_loading_settings">"Wystąpił błąd podczas ładowania ustawień powiadomień."</string>
@@ -108,15 +128,20 @@
   <string name="screen_room_roles_and_permissions_messages_and_content">"Wiadomości i zawartość"</string>
   <string name="screen_room_roles_and_permissions_moderators">"Moderatorzy"</string>
   <string name="screen_room_roles_and_permissions_owners">"Właściciele"</string>
-  <string name="screen_room_roles_and_permissions_reset">"Resetuj uprawnienia"</string>
+  <string name="screen_room_roles_and_permissions_permissions_header">"Uprawnienia"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Zresetuj uprawnienia"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_description">"Po zresetowaniu uprawnień utracisz bieżące ustawienia."</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"Zresetować uprawnienia?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Role"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Szczegóły pokoju"</string>
   <string name="screen_room_roles_and_permissions_title">"Role i uprawnienia"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres pokoju"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić żądanie."</string>
+  <string name="screen_roomlist_mark_as_read">"Oznacz jako przeczytane"</string>
+  <string name="screen_roomlist_mark_as_unread">"Oznacz jako nieprzeczytane"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Każdy w autoryzowanych przestrzeniach może dołączyć, ale wszyscy inni muszą poprosić o dostęp."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy musi poprosić o dostęp."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Każdy w %1$s może dołączyć, ale wszyscy pozostali muszą poprosić o dostęp."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Tak, włącz szyfrowanie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po włączeniu szyfrowanie pokoju nie może zostać wyłączone, a historia wiadomości będzie widoczna tylko dla członków od momentu, w którym dołączyli lub zostali zaproszeni.
 Nikt poza członkami pokoju nie będzie mógł czytać wiadomości. Może to wpłynąć na prawidłowe działanie botów lub mostków.
@@ -125,23 +150,31 @@ Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do
   <string name="screen_security_and_privacy_encryption_section_footer">"Po włączeniu szyfrowania nie można wyłączyć."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Szyfrowanie"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Włącz szyfrowanie end-to-end"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może znaleźć i dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może dołączyć."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Każdy"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko osoby z zaproszeniem mogą dołączyć"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko zaproszenie"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Dostęp do pokoju"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Wybierz, którzy członkowie przestrzeni mogą dołączyć do tego pokoju bez zaproszenia. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Zarządzaj przestrzeniami"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko zaproszone osoby mogą dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko na zaproszenie"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Dostęp"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Każdy w autoryzowanych przestrzeniach może dołączyć."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Każdy w %1$s może dołączyć."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Przestrzenie nie są obecnie wspierane"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adres pokoju"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi publicznych, potrzebny jest adres pokoju."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adres"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Zezwól na znalezienie tego pokoju wyszukując %1$s w katalogu pokoi publicznych"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Zezwól, by inni mogli Cię znaleźć, przeszukując katalog publiczny."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Widoczny w katalogu pokoi publicznych"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokolwiek"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Każdy (historia jest publiczna)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Zmiany nie zmienią przeszłych wiadomości, tylko nowe. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kto może czytać historię"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Od momentu kiedy członkowie zostali zaproszeni"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie od momentu włączenia tej opcji"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Członkowie od kiedy zostali zaproszeni"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie (cała historia)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
 Również możesz się zdecydować na upublicznienie Twojego serwera w katalogu pokoi publicznych."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikowanie pokoju"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pokoju"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy pokoi pomagają w znalezieniu i dołączeniu do pokoi i przestrzeni. Umożliwiają również łatwe udostępnianie ich innym."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność"</string>
   <string name="screen_security_and_privacy_title">"Bezpieczeństwo i prywatność"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
index ddbbe0f601..f2ddfb86cb 100644
--- a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
@@ -53,6 +53,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Não feche o aplicativo até terminar."</string>
   <string name="screen_room_details_invite_people_preparing">"Preparando convites…"</string>
   <string name="screen_room_details_invite_people_title">"Convidar pessoas"</string>
+  <string name="screen_room_details_invite_title">"Convidar"</string>
   <string name="screen_room_details_leave_conversation_title">"Sair da conversa"</string>
   <string name="screen_room_details_leave_room_title">"Sair da sala"</string>
   <string name="screen_room_details_media_gallery_title">"Mídia e arquivos"</string>
@@ -128,6 +129,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Cargos"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detalhes da sala"</string>
   <string name="screen_room_roles_and_permissions_title">"Cargos e permissões"</string>
+  <string name="screen_roomlist_mark_as_read">"Marcar como lida"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marcar como não lida"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Qualquer um nos espaços autorizados podem entrar, mas todos os outros devem pedir acesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Qualquer um pode pedir acesso, mas um administrador terá que aceitar o pedido."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pt/translations.xml b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
index 592cba34f6..04ded84480 100644
--- a/features/roomdetails/impl/src/main/res/values-pt/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt/translations.xml
@@ -53,6 +53,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Não feches a aplicação até concluir."</string>
   <string name="screen_room_details_invite_people_preparing">"A preparar convites…"</string>
   <string name="screen_room_details_invite_people_title">"Convidar pessoas"</string>
+  <string name="screen_room_details_invite_title">"Convidar"</string>
   <string name="screen_room_details_leave_conversation_title">"Sair da conversa"</string>
   <string name="screen_room_details_leave_room_title">"Sair da sala"</string>
   <string name="screen_room_details_media_gallery_title">"Multimédia e ficheiros"</string>
@@ -127,6 +128,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Cargos"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detalhes da sala"</string>
   <string name="screen_room_roles_and_permissions_title">"Cargos e permissões"</string>
+  <string name="screen_roomlist_mark_as_read">"Marcar como lida"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marcar como não lida"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Adicionar endereço"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Todos precisam de pedir acesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Pedir para entrar"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ro/translations.xml b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
index 2eac873575..f3feda811a 100644
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Membrii noi nu pot vedea istoricul"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Membrii noi pot vedea istoricul"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Oricine poate vedea istoricul"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Veți avea nevoie de o adresă pentru a o face vizibilă în directorul public."</string>
   <string name="screen_edit_room_address_title">"Editați adresa"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"A apărut o eroare în timpul actualizării setărilor pentru notificari."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Nu închideți aplicația până nu se termină."</string>
   <string name="screen_room_details_invite_people_preparing">"Se pregătesc invitațiile…"</string>
   <string name="screen_room_details_invite_people_title">"Invitați prieteni"</string>
+  <string name="screen_room_details_invite_title">"Invitați"</string>
   <string name="screen_room_details_leave_conversation_title">"Părăsiți conversația"</string>
   <string name="screen_room_details_leave_room_title">"Părăsiți camera"</string>
   <string name="screen_room_details_media_gallery_title">"Media și fișiere"</string>
@@ -131,9 +135,12 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roluri"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detaliile camerei"</string>
   <string name="screen_room_roles_and_permissions_title">"Roluri și permisiuni"</string>
+  <string name="screen_roomlist_mark_as_read">"Marcați ca citită"</string>
+  <string name="screen_roomlist_mark_as_unread">"Marcați ca necitită"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Adăugați o adresă"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Oricine se află în spațiile autorizate se poate alătura, dar toți ceilalți trebuie să solicite accesul."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Toată lumea trebuie să solicite acces."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitați să vă alăturați"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Oricine în %1$s se poate alătura, dar toți ceilalți trebuie să solicite acces."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, activați criptarea"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Odată activată, criptarea pentru o cameră nu poate fi dezactivată. Mesajele anterioare vor fi vizibile numai pentru membrii camerei de la momentul la care au fost invitați sau de la momentul la care s-au alăturat camerei. 
@@ -144,22 +151,26 @@ Nu recomandăm activarea criptării pentru camerele pe care oricine le poate gă
   <string name="screen_security_and_privacy_encryption_section_header">"Criptare"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Activați criptarea end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Oricine se poate alătura."</string>
-  <string name="screen_security_and_privacy_room_access_footer">"Alegeți membrii căror spații se pot alătura acestei camere fără invitație. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Oricine"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Alegeți membrii căror spații se pot alătura acestei cameră fără invitație. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gestionați spațiile"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Doar persoanele invitate se pot alătura."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Doar pe bază de invitație"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acces"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Oricine se află într-un spațiu autorizat poate participa."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Oricine din %1$s se poate alătura."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membrii spațiului"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spațiile nu sunt momentan suportate."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă pentru a o face vizibilă în directorul public."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresă"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permiteți găsirea acestei camere prin căutarea în directorul de camere publice al %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permiteți găsirea prin căutarea în directorul public."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vizibilă în directorul de camere publice"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Oricine (istoricul este public)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Modificările nu vor afecta mesajele anterioare, ci doar pe cele noi. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Cine poate citi mesajele anterioare"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Doar pentru membri, de la momentul în care au fost invitați"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Doar pentru membri, după selectarea acestei opțiuni"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membri de la momentul invitației"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membri (istoric complet)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camere. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dumneavoastră cu alte persoane.
 Puteți alege să publicați camera în directorul public al camerelor serverului dumneavoastră."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicare cameră"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ru/translations.xml b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
index 7ad44fff9d..ebe1448aa9 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -6,7 +6,7 @@
   <string name="screen_edit_room_address_room_address_section_footer">"Необходимо задать адрес комнаты, чтобы опубликовать ее в каталоге комнат."</string>
   <string name="screen_edit_room_address_title">"Редактировать адрес комнаты"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Произошла ошибка при обновлении настройки уведомления."</string>
-  <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш сервер не поддерживает эту опцию для зашифрованных комнат, вы можете не получать некоторые уведомления."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Ваш сервер не поддерживает эту опцию для зашифрованных комнат, Вы можете не получать некоторые уведомления."</string>
   <string name="screen_polls_history_title">"Опросы"</string>
   <string name="screen_room_change_permissions_administrators">"Администраторы"</string>
   <string name="screen_room_change_permissions_ban_people">"Блокировать пользователей"</string>
@@ -23,7 +23,7 @@
   <string name="screen_room_change_permissions_room_topic">"Менять тему комнаты"</string>
   <string name="screen_room_change_permissions_send_messages">"Отправлять сообщения"</string>
   <string name="screen_room_change_role_administrators_title">"Редактировать администраторов"</string>
-  <string name="screen_room_change_role_confirm_add_admin_description">"Вы не сможете отменить это действие. Вы даете пользователю такой же уровень прав, как и у вас"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Вы не сможете отменить это действие. Вы даете пользователю такой же уровень прав, как и у Вас"</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Добавить администратора?"</string>
   <string name="screen_room_change_role_confirm_change_owners_description">"Отменить данное действие будет невозможно. Права передадутся выбранным пользователям. После вашего выхода действие станет необратимым."</string>
   <string name="screen_room_change_role_confirm_change_owners_title">"Передать владение?"</string>
@@ -39,7 +39,7 @@
   <string name="screen_room_change_role_section_administrators">"Администраторы"</string>
   <string name="screen_room_change_role_section_moderators">"Модераторы"</string>
   <string name="screen_room_change_role_section_users">"Участники"</string>
-  <string name="screen_room_change_role_unsaved_changes_description">"У вас есть несохраненные изменения."</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"У Вас есть несохраненные изменения."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Сохранить изменения?"</string>
   <string name="screen_room_details_add_topic_title">"Добавить тему"</string>
   <string name="screen_room_details_badge_encrypted">"Зашифровано"</string>
@@ -51,18 +51,19 @@
   <string name="screen_room_details_encryption_enabled_subtitle">"Сообщения зашифрованы. Только вы и ваши собеседники имеют доступ к сообщениям."</string>
   <string name="screen_room_details_encryption_enabled_title">"Шифрование сообщений включено"</string>
   <string name="screen_room_details_error_loading_notification_settings">"Произошла ошибка при загрузке настроек уведомлений."</string>
-  <string name="screen_room_details_error_muting">"Не удалось отключить звук в этой комнате, попробуйте еще раз."</string>
-  <string name="screen_room_details_error_unmuting">"Не удалось включить звук в эту комнату, попробуйте еще раз."</string>
+  <string name="screen_room_details_error_muting">"Не удалось отключить звук в этой комнате, попробуйте ещё раз."</string>
+  <string name="screen_room_details_error_unmuting">"Не удалось включить звук в этой комнате, попробуйте ещё раз."</string>
   <string name="screen_room_details_invite_people_dont_close">"Не закрывайте приложение, пока не закончите."</string>
   <string name="screen_room_details_invite_people_preparing">"Подготовка приглашений…"</string>
   <string name="screen_room_details_invite_people_title">"Пригласить в комнату"</string>
+  <string name="screen_room_details_invite_title">"Пригласить"</string>
   <string name="screen_room_details_leave_conversation_title">"Покинуть беседу"</string>
   <string name="screen_room_details_leave_room_title">"Покинуть комнату"</string>
   <string name="screen_room_details_media_gallery_title">"Медиа и файлы"</string>
   <string name="screen_room_details_notification_mode_custom">"Пользовательские"</string>
   <string name="screen_room_details_notification_mode_default">"По умолчанию"</string>
   <string name="screen_room_details_notification_title">"Уведомления"</string>
-  <string name="screen_room_details_pinned_events_row_title">"Закрепленные сообщения"</string>
+  <string name="screen_room_details_pinned_events_row_title">"Закреплённые сообщения"</string>
   <string name="screen_room_details_profile_row_title">"Профиль"</string>
   <string name="screen_room_details_requests_to_join_title">"Запросы на вступление"</string>
   <string name="screen_room_details_roles_and_permissions">"Роли и разрешения"</string>
@@ -112,8 +113,8 @@
   <string name="screen_room_notification_settings_default_setting_title">"Настройка по умолчанию"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"Удалить пользовательскую настройку"</string>
   <string name="screen_room_notification_settings_error_loading_settings">"Произошла ошибка при загрузке настроек уведомлений."</string>
-  <string name="screen_room_notification_settings_error_restoring_default">"Не удалось восстановить режим по умолчанию, попробуйте еще раз."</string>
-  <string name="screen_room_notification_settings_error_setting_mode">"Не удалось настроить режим, попробуйте еще раз."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Не удалось восстановить режим по умолчанию, попробуйте ещё раз."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Не удалось настроить режим, попробуйте ещё раз."</string>
   <string name="screen_room_notification_settings_mentions_only_disclaimer">"Ваш домашний сервер не поддерживает эту опцию в зашифрованных комнатах, вы не будете получать уведомления в этой комнате."</string>
   <string name="screen_room_notification_settings_mode_all_messages">"О всех сообщениях"</string>
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
@@ -134,6 +135,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Роли"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Информация о комнате"</string>
   <string name="screen_room_roles_and_permissions_title">"Роли и разрешения"</string>
+  <string name="screen_roomlist_mark_as_read">"Пометить как прочитанное"</string>
+  <string name="screen_roomlist_mark_as_unread">"Отметить как непрочитанное"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Добавить адрес"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Кто угодно из авторизованных пространств может присоединиться, а всем остальным необходимо запросить доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Каждый должен запросить доступ."</string>
@@ -150,7 +153,7 @@
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Любой желающий может присоединиться"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Кто угодно"</string>
   <string name="screen_security_and_privacy_room_access_footer">"Выберите, участники каких пространств могут присоединиться к этой комнате без приглашения.%1$s"</string>
-  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Управление пространством"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Управление пространствами"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Присоединиться могут только приглашенные люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Только по приглашению"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index 225dcedac3..122c27e058 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -53,6 +53,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Nezatvárajte aplikáciu, kým sa neukončí pozývanie."</string>
   <string name="screen_room_details_invite_people_preparing">"Príprava pozvánok…"</string>
   <string name="screen_room_details_invite_people_title">"Pozvať ľudí"</string>
+  <string name="screen_room_details_invite_title">"Pozvať"</string>
   <string name="screen_room_details_leave_conversation_title">"Opustiť konverzáciu"</string>
   <string name="screen_room_details_leave_room_title">"Opustiť miestnosť"</string>
   <string name="screen_room_details_media_gallery_title">"Médiá a súbory"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roly"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Podrobnosti o miestnosti"</string>
   <string name="screen_room_roles_and_permissions_title">"Roly a povolenia"</string>
+  <string name="screen_roomlist_mark_as_read">"Označiť ako prečítané"</string>
+  <string name="screen_roomlist_mark_as_unread">"Označiť ako neprečítané"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Pridať adresu"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Pripojiť sa môže ktokoľvek z autorizovaných priestorov, ale všetci ostatní musia o prístup požiadať."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Všetci musia požiadať o prístup."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-sv/translations.xml b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
index 795dc97106..aa9f244498 100644
--- a/features/roomdetails/impl/src/main/res/values-sv/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
@@ -53,6 +53,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Stäng inte appen förrän det är klart."</string>
   <string name="screen_room_details_invite_people_preparing">"Förbereder inbjudningar …"</string>
   <string name="screen_room_details_invite_people_title">"Bjud in personer"</string>
+  <string name="screen_room_details_invite_title">"Bjud in"</string>
   <string name="screen_room_details_leave_conversation_title">"Lämna konversation"</string>
   <string name="screen_room_details_leave_room_title">"Lämna rum"</string>
   <string name="screen_room_details_media_gallery_title">"Media och filer"</string>
@@ -115,6 +116,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roller"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Rumsdetaljer"</string>
   <string name="screen_room_roles_and_permissions_title">"Roller och behörigheter"</string>
+  <string name="screen_roomlist_mark_as_read">"Markera som läst"</string>
+  <string name="screen_roomlist_mark_as_unread">"Markera som oläst"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Lägg till adress"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Alla måste begära åtkomst."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Be om att gå med"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-tr/translations.xml b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
index 16137ce753..a9bfc6fbe2 100644
--- a/features/roomdetails/impl/src/main/res/values-tr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-tr/translations.xml
@@ -46,6 +46,7 @@
   <string name="screen_room_details_error_muting">"Bu odayı sessize alma başarısız oldu, lütfen tekrar deneyin."</string>
   <string name="screen_room_details_error_unmuting">"Bu odanın sesi açılamadı, lütfen tekrar deneyin."</string>
   <string name="screen_room_details_invite_people_title">"Kişileri davet et"</string>
+  <string name="screen_room_details_invite_title">"Davet et"</string>
   <string name="screen_room_details_leave_conversation_title">"Sohbeti bırak"</string>
   <string name="screen_room_details_leave_room_title">"Odadan ayrıl"</string>
   <string name="screen_room_details_media_gallery_title">"Medya ve dosyalar"</string>
@@ -112,6 +113,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roller"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Oda bilgileri"</string>
   <string name="screen_room_roles_and_permissions_title">"Roller ve izinler"</string>
+  <string name="screen_roomlist_mark_as_read">"Okundu olarak işaretle"</string>
+  <string name="screen_roomlist_mark_as_unread">"Okunmamış olarak işaretle"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Oda adresi ekle"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Yetkilendirilmiş alanlardaki herkes katılabilir, diğer herkes erişim talep etmelidir."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Herkes odaya katılma isteğinde bulunabilir ancak bir yönetici veya moderatörün isteği kabul etmesi gerekir."</string>
diff --git a/features/roomdetails/impl/src/main/res/values-uk/translations.xml b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
index 46adfa54d5..8f566bb235 100644
--- a/features/roomdetails/impl/src/main/res/values-uk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uk/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Нові учасники не бачать історії"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Нові учасники бачать історію"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Будь-хто може переглянути історію"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
   <string name="screen_edit_room_address_title">"Змінити адресу"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Під час оновлення налаштувань сповіщень сталася помилка."</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Не закривайте застосунок доки не завершите."</string>
   <string name="screen_room_details_invite_people_preparing">"Приготування запрошень…"</string>
   <string name="screen_room_details_invite_people_title">"Запросити людей"</string>
+  <string name="screen_room_details_invite_title">"Запросити"</string>
   <string name="screen_room_details_leave_conversation_title">"Залишити розмову"</string>
   <string name="screen_room_details_leave_room_title">"Вийти з кімнати"</string>
   <string name="screen_room_details_media_gallery_title">"Медіа та файли"</string>
@@ -71,6 +75,11 @@
   <string name="screen_room_details_topic_title">"Тема"</string>
   <string name="screen_room_details_updating_room">"Оновлення кімнати…"</string>
   <string name="screen_room_member_list_banned_empty">"Немає заблокованих користувачів."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="one">"%1$d Заблокований"</item>
+    <item quantity="few">"%1$d Заблоковано"</item>
+    <item quantity="many">"%1$d Заблоковано"</item>
+  </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"Перевірте правопис або спробуйте новий пошук"</string>
   <string name="screen_room_member_list_empty_search_title">"Немає результатів за запитом «%1$s»"</string>
   <plurals name="screen_room_member_list_header_title">
@@ -126,9 +135,13 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Ролі"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Деталі кімнати"</string>
   <string name="screen_room_roles_and_permissions_title">"Ролі та дозволи"</string>
+  <string name="screen_roomlist_mark_as_read">"Позначити прочитаним"</string>
+  <string name="screen_roomlist_mark_as_unread">"Позначити непрочитаним"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Додати адресу"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Будь-хто в авторизованих просторах може приєднатися, але всі інші повинні подати запит на доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Усі повинні запитувати доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Запит на приєднання"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Будь-хто з %1$s може приєднатися, але всі інші повинні подати запит на доступ."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Так, увімкнути шифрування"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Після ввімкнення шифрування кімнати, його неможливо вимкнути, історію повідомлень бачитимуть лише учасники кімнати, яких було запрошено або які приєдналися до кімнати.
 Ніхто, крім учасників кімнати, не зможе прочитати повідомлення. Це може перешкоджати коректній роботі ботів і мостів.
@@ -144,11 +157,14 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Приєднатися можуть лише запрошені люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Лише запрошені"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Долучитися може будь-хто, хто має доступ до авторизованих просторів."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Долучитися може будь-хто з %1$s."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Адреса"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Дозвольте, щоб цю кімнату можна було знайти за допомогою пошуку в каталозі загальнодоступних кімнат %1$s "</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Дозвольте знаходити вас за допомогою пошуку в публічному каталозі."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в загальному каталозі"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Будь-хто (загальнодоступна історія)"</string>
   <string name="screen_security_and_privacy_room_history_section_footer">"Зміни не вплинуть на попередні повідомлення, лише на нові. %1$s"</string>
@@ -158,6 +174,7 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреси кімнат — це спосіб знайти кімнату та отримати до неї доступ. Це також гарантує, що ви можете легко поділитися своєю кімнатою з іншими.
 Ви можете опублікувати свою кімнату в каталозі загальнодоступних кімнат вашого домашнього сервера."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публікація в кімнаті"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреси — це спосіб знаходити кімнати та простори та отримувати до них доступ. Це також гарантує, що ви зможете легко ділитися ними з іншими."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Видимість"</string>
   <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ur/translations.xml b/features/roomdetails/impl/src/main/res/values-ur/translations.xml
index 3715bb91ff..5c32811f36 100644
--- a/features/roomdetails/impl/src/main/res/values-ur/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ur/translations.xml
@@ -43,6 +43,7 @@
   <string name="screen_room_details_error_muting">"اس کمرے کو خاموش کرنے میں ناکام، برائے مہربانی دوبارہ کوشش کریں۔"</string>
   <string name="screen_room_details_error_unmuting">"اس کمرے کو غیر خاموش کرنے میں ناکام، برائے مہربانی دوبارہ کوشش کریں۔"</string>
   <string name="screen_room_details_invite_people_title">"لوگوں کو مدعو کریں"</string>
+  <string name="screen_room_details_invite_title">"مدعو کریں"</string>
   <string name="screen_room_details_leave_conversation_title">"گفتگو چھوڑیں"</string>
   <string name="screen_room_details_leave_room_title">"کمرہ چھوڑ دیں"</string>
   <string name="screen_room_details_notification_mode_custom">"حسب ضرورت"</string>
@@ -98,4 +99,6 @@
   <string name="screen_room_roles_and_permissions_roles_header">"کردارہا"</string>
   <string name="screen_room_roles_and_permissions_room_details">"کمرے کی تفصیلات"</string>
   <string name="screen_room_roles_and_permissions_title">"کردارہا اور اجازتیں"</string>
+  <string name="screen_roomlist_mark_as_read">"بطور مقروءہ نشانزد کریں"</string>
+  <string name="screen_roomlist_mark_as_unread">"بطور غیر مقروءہ نشانزد کریں"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-uz/translations.xml b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
index cac162cf2b..d7778f2df4 100644
--- a/features/roomdetails/impl/src/main/res/values-uz/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-uz/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Yangi a’zolar tarixni ko‘rmaydi"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Yangi a’zolar tarixni ko‘radi"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Tarixni hamma ko‘rishi mumkin"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
   <string name="screen_edit_room_address_title">"Xona manzili"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Bildirishnoma sozlamalarini yangilashda xatolik yuz berdi."</string>
@@ -9,7 +12,7 @@
   <string name="screen_room_change_permissions_ban_people">"Odamlarni taqiqlash"</string>
   <string name="screen_room_change_permissions_delete_messages">"Xabarlarni olib tashlash"</string>
   <string name="screen_room_change_permissions_everyone">"A\'zo"</string>
-  <string name="screen_room_change_permissions_invite_people">"Odamlarni taklif qiling va qo‘shilish so‘rovlarini qabul qiling"</string>
+  <string name="screen_room_change_permissions_invite_people">"Odamlarni taklif qiling"</string>
   <string name="screen_room_change_permissions_member_moderation">"A’zolarni boshqarish"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Xabarlar va kontent"</string>
   <string name="screen_room_change_permissions_moderators">"Moderator"</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Tugallanmaguncha ilovani yopmang."</string>
   <string name="screen_room_details_invite_people_preparing">"Taklifnomalar tayyorlanmoqda…"</string>
   <string name="screen_room_details_invite_people_title">"Odamlarni taklif qiling"</string>
+  <string name="screen_room_details_invite_title">"Taklif qilish"</string>
   <string name="screen_room_details_leave_conversation_title">"Suhbatni tark etish"</string>
   <string name="screen_room_details_leave_room_title">"Xonani tark etish"</string>
   <string name="screen_room_details_media_gallery_title">"Media va fayllar"</string>
@@ -128,9 +132,12 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Rollar"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Xona tafsilotlari"</string>
   <string name="screen_room_roles_and_permissions_title">"Rollar va ruxsatlar"</string>
+  <string name="screen_roomlist_mark_as_read">"Oʻqilgan deb belgilash"</string>
+  <string name="screen_roomlist_mark_as_unread">"Oʻqilmagan deb belgilash"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Vakolatli guruhlardagi har kim qo‘shilishi mumkin, lekin qolganlar ruxsat so‘rashi kerak. Tarjima eslatmasi yo‘q"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Qo‘shilish uchun so‘rash"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s ichidagi istalgan kishi qo‘shilishi mumkin, lekin qolganlar ruxsat so‘rashi kerak."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ha, shifrlashni yoqish"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Yoqilgandan so‘ng, xona uchun shifrlashni o‘chirib bo‘lmaydi. Xabarlar tarixi faqat xona a’zolari taklif qilinganidan yoki xonaga qo‘shilganidan keyingi davrdan boshlab ko‘rinadi. Xona a’zolaridan tashqari hech kim xabarlarni o‘qiy olmaydi. Bu botlar va ko‘priklarning to‘g‘ri ishlashiga to‘sqinlik qilishi mumkin.
@@ -140,6 +147,7 @@ Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shi
   <string name="screen_security_and_privacy_encryption_section_header">"Shifrlash"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"End-to-end shifrlashni yoqish"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Istalgan kishi topishi va qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Har kim"</string>
   <string name="screen_security_and_privacy_room_access_footer">"Qaysi maydonlar a’zolari bu xonaga taklifnomalarsiz kirishi mumkinligini tanlang. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Maydonlarni boshqarish"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
@@ -147,15 +155,18 @@ Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shi
   <string name="screen_security_and_privacy_room_access_section_header">"Xonaga kirish huquqi"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Ruxsat berilgan maydonlardagi istalgan kishi qo‘shilishi mumkin."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s ichidagi istalgan kishi qo‘shilishi mumkin."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Maydon a’zolari"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Hozirda maydonlar qo‘llab-quvvatlanmaydi"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Manzil"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu xonani %1$s umumiy xonalar ro‘yxatidan qidirib topish imkoniyatini berish"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umumiy katalogni qidirish orqali topishga ruxsat bering."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Umumiy xona ro‘yxatida ko‘rinadi"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Har kim (tarix hammaga ochiq)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"O‘zgarishlar avvalgi xabarlarga ta’sir qilmaydi, faqat yangilariga ta’sir qiladi.%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Tarixni kim o‘qiy oladi"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan buyon faqat a’zolar"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar faqat bu parametr tanlanganidan keyin"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan beri a’zo"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar (to‘liq tarix)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Xona manzillari xonalarni topish va ularga kirish usullaridir. Bu shuningdek xonangizni boshqalar bilan oson ulashish imkonini beradi.
 Xonangizni o‘z homeserveringizning ommaviy xonalar ro‘yxatida e’lon qilishni tanlashingiz mumkin."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"xona nashriyoti"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-vi/translations.xml b/features/roomdetails/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..ecc7e4e227
--- /dev/null
+++ b/features/roomdetails/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"Thành viên mới không thể xem lịch sử"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"Thành viên mới có thể xem lịch sử"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"Ai cũng có thể xem lịch sử"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Bạn cần một địa chỉ để hiển thị trong danh bạ công khai."</string>
+  <string name="screen_edit_room_address_title">"Chỉnh sửa địa chỉ"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Đã xảy ra lỗi khi cập nhật cài đặt thông báo."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Máy chủ không hỗ trợ tùy chọn này trong phòng mã hóa, một số phòng có thể không thông báo."</string>
+  <string name="screen_polls_history_title">"Cuộc thăm dò ý kiến"</string>
+  <string name="screen_room_change_permissions_administrators">"Quản trị viên"</string>
+  <string name="screen_room_change_permissions_ban_people">"Cấm người dùng"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Xóa tin nhắn"</string>
+  <string name="screen_room_change_permissions_everyone">"Thành viên"</string>
+  <string name="screen_room_change_permissions_invite_people">"Mời mọi người"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Quản lý thành viên"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Tin nhắn và nội dung."</string>
+  <string name="screen_room_change_permissions_moderators">"Người điều hành"</string>
+  <string name="screen_room_change_permissions_remove_people">"Gỡ người dùng"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Đổi ảnh đại diện"</string>
+  <string name="screen_room_change_permissions_room_details">"Chỉnh sửa thông tin"</string>
+  <string name="screen_room_change_permissions_room_name">"Đổi tên"</string>
+  <string name="screen_room_change_permissions_room_topic">"Đổi chủ đề"</string>
+  <string name="screen_room_change_permissions_send_messages">"Gửi tin nhắn."</string>
+  <string name="screen_room_change_role_administrators_title">"Chỉnh sửa Quản trị viên"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Bạn sẽ không thể hoàn tác hành động này. Bạn đang thăng quyền cho người dùng lên cùng cấp quyền với bạn."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Thêm quản trị viên?"</string>
+  <string name="screen_room_change_role_confirm_demote_self_action">"Giáng cấp"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"Bạn sẽ không thể hoàn tác thay đổi này vì bạn đang tự giáng cấp bản thân, nếu bạn là người dùng cuối cùng có đặc quyền trong phòng, nó sẽ không thể lấy lại đặc quyền."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Giáng cấp bản thân?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (Đang chờ xử lý)"</string>
+  <string name="screen_room_change_role_moderators_title">"Chỉnh sửa Người điều hành"</string>
+  <string name="screen_room_change_role_section_administrators">"Quản trị viên"</string>
+  <string name="screen_room_change_role_section_moderators">"Người điều hành"</string>
+  <string name="screen_room_change_role_section_users">"Thành viên"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Bạn có thay đổi chưa được lưu."</string>
+  <string name="screen_room_change_role_unsaved_changes_title">"Lưu thay đổi?"</string>
+  <string name="screen_room_details_add_topic_title">"Thêm chủ đề"</string>
+  <string name="screen_room_details_badge_public">"Phòng công cộng"</string>
+  <string name="screen_room_details_edit_room_title">"Chỉnh sửa thông tin"</string>
+  <string name="screen_room_details_edition_error">"Có lỗi không xác định, thông tin không được cập nhật."</string>
+  <string name="screen_room_details_edition_error_title">"Không thể cập nhật phòng"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Tin nhắn được bảo mật bằng khóa. Chỉ bạn và người nhận mới có chìa khóa riêng để mở khóa."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Mã hóa tin nhắn đã được bật"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Đã xảy ra lỗi khi tải cài đặt thông báo."</string>
+  <string name="screen_room_details_error_muting">"Không thể tắt tiếng phòng này, vui lòng thử lại."</string>
+  <string name="screen_room_details_error_unmuting">"Không thể bật tiếng cho phòng này. Vui lòng thử lại."</string>
+  <string name="screen_room_details_invite_people_title">"Mời ai đó"</string>
+  <string name="screen_room_details_invite_title">"Mời"</string>
+  <string name="screen_room_details_leave_conversation_title">"Rời khỏi cuộc trò chuyện"</string>
+  <string name="screen_room_details_leave_room_title">"Rời phòng"</string>
+  <string name="screen_room_details_notification_mode_custom">"Tùy chỉnh"</string>
+  <string name="screen_room_details_notification_mode_default">"Mặc định"</string>
+  <string name="screen_room_details_notification_title">"Thông báo"</string>
+  <string name="screen_room_details_pinned_events_row_title">"Tin nhắn được ghim"</string>
+  <string name="screen_room_details_roles_and_permissions">"Vai trò và quyền hạn"</string>
+  <string name="screen_room_details_room_name_label">"Tên"</string>
+  <string name="screen_room_details_security_title">"Bảo mật"</string>
+  <string name="screen_room_details_share_room_title">"Chia sẻ phòng"</string>
+  <string name="screen_room_details_topic_title">"Chủ đề"</string>
+  <string name="screen_room_details_updating_room">"Đang cập nhật thông tin…"</string>
+  <string name="screen_room_member_list_banned_empty">"Hiện không có người dùng nào bị cấm."</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d bị cấm"</item>
+  </plurals>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="other">"%1$d người"</item>
+  </plurals>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Cấm người dùng"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Chỉ xóa thành viên"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"Bỏ cấm"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Họ có thể tham gia lại phòng này nếu được mời."</string>
+  <string name="screen_room_member_list_mode_banned">"Bị cấm"</string>
+  <string name="screen_room_member_list_mode_members">"Thành viên"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d được mời"</item>
+  </plurals>
+  <string name="screen_room_member_list_role_administrator">"Quản trị viên"</string>
+  <string name="screen_room_member_list_role_moderator">"Người điều hành"</string>
+  <string name="screen_room_member_list_room_members_header_title">"Thành viên phòng"</string>
+  <string name="screen_room_member_list_unbanning_user">"Đang gỡ cấm %1$s"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Cho phép tùy chỉnh cài đặt"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Kích hoạt sẽ thay thế cài đặt mặc định"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Thông báo cho tôi trong cuộc trò chuyện này khi"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Bạn có thể thay đổi trong %1$s của mình."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"cài đặt chung"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Cài đặt mặc định"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Xóa cài đặt tùy chỉnh"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Đã xảy ra lỗi khi tải cài đặt thông báo."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Không thể khôi phục chế độ mặc định, vui lòng thử lại."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Không thể thiết lập chế độ, hãy thử lại nhé."</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"Máy chủ không hỗ trợ tùy chọn này trong phòng mã hóa, bạn sẽ không nhận thông báo ở đây."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Tất cả tin nhắn."</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Chỉ đề cập và từ khóa"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"Trong phòng này, thông báo cho tôi khi"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Quản trị viên"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Thay đổi vai trò của tôi"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Hạ cấp xuống thành thành viên"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Hạ cấp xuống làm người điều hành"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Quản lý thành viên"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Tin nhắn và nội dung."</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Người điều hành"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Đặt lại quyền truy cập"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Sau khi bạn đặt lại quyền truy cập, bạn sẽ mất các cài đặt hiện tại."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Đặt lại quyền truy cập?"</string>
+  <string name="screen_room_roles_and_permissions_roles_header">"Vai trò"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"Chi tiết phòng"</string>
+  <string name="screen_room_roles_and_permissions_title">"Vai trò và quyền hạn"</string>
+  <string name="screen_roomlist_mark_as_read">"Đánh dấu đã đọc"</string>
+  <string name="screen_roomlist_mark_as_unread">"Đánh dấu chưa đọc"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Sau khi được kích hoạt, mã hóa cho một phòng chat không thể tắt được. Lịch sử tin nhắn chỉ hiển thị cho các thành viên phòng chat kể từ khi họ được mời hoặc kể từ khi họ tham gia phòng chat.
+Không ai ngoài các thành viên phòng chat có thể đọc tin nhắn. Điều này có thể ngăn chặn bot và các thiết bị kết nối hoạt động đúng cách.
+Chúng tôi không khuyến khích bật mã hóa cho các phòng chat mà bất kỳ ai cũng có thể tìm thấy và tham gia."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Mã hóa"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Thành viên không gian"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bạn cần một địa chỉ để hiển thị trong danh bạ công khai."</string>
+</resources>
diff --git a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
index 2b784b91ea..0e516d0c29 100644
--- a/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"新成員無法檢視歷史"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"新成員可以檢視歷史"</string>
+  <string name="crypto_history_sharing_room_info_world_readable_badge_content">"任何人都可以檢視歷史"</string>
   <string name="screen_edit_room_address_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
   <string name="screen_edit_room_address_title">"編輯地址"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"更新通知設定時發生錯誤。"</string>
@@ -53,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"完成前請勿關閉應用程式。"</string>
   <string name="screen_room_details_invite_people_preparing">"正在準備邀請……"</string>
   <string name="screen_room_details_invite_people_title">"邀請夥伴"</string>
+  <string name="screen_room_details_invite_title">"邀請"</string>
   <string name="screen_room_details_leave_conversation_title">"離開對話"</string>
   <string name="screen_room_details_leave_room_title">"離開聊天室"</string>
   <string name="screen_room_details_media_gallery_title">"媒體與檔案"</string>
@@ -63,6 +67,7 @@
   <string name="screen_room_details_profile_row_title">"個人檔案"</string>
   <string name="screen_room_details_requests_to_join_title">"請求加入"</string>
   <string name="screen_room_details_roles_and_permissions">"角色與權限"</string>
+  <string name="screen_room_details_room_name_label">"名稱"</string>
   <string name="screen_room_details_security_and_privacy_title">"安全與隱私"</string>
   <string name="screen_room_details_security_title">"安全性"</string>
   <string name="screen_room_details_share_room_title">"分享聊天室"</string>
@@ -70,6 +75,9 @@
   <string name="screen_room_details_topic_title">"主題"</string>
   <string name="screen_room_details_updating_room">"正在更新聊天室…"</string>
   <string name="screen_room_member_list_banned_empty">"沒有被封鎖的使用者。"</string>
+  <plurals name="screen_room_member_list_banned_header_title">
+    <item quantity="other">"%1$d 個已封鎖"</item>
+  </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"檢查拼字或嘗試新搜尋"</string>
   <string name="screen_room_member_list_empty_search_title">"找不到「%1$s」"</string>
   <plurals name="screen_room_member_list_header_title">
@@ -82,6 +90,9 @@
   <string name="screen_room_member_list_manage_member_unban_title">"從聊天室解除封鎖"</string>
   <string name="screen_room_member_list_mode_banned">"黑名單"</string>
   <string name="screen_room_member_list_mode_members">"成員"</string>
+  <plurals name="screen_room_member_list_pending_header_title">
+    <item quantity="other">"%1$d 個已邀請"</item>
+  </plurals>
   <string name="screen_room_member_list_pending_status">"擱置中"</string>
   <string name="screen_room_member_list_role_administrator">"管理員"</string>
   <string name="screen_room_member_list_role_moderator">"版主"</string>
@@ -118,9 +129,13 @@
   <string name="screen_room_roles_and_permissions_roles_header">"身份"</string>
   <string name="screen_room_roles_and_permissions_room_details">"聊天室資訊"</string>
   <string name="screen_room_roles_and_permissions_title">"角色與權限"</string>
+  <string name="screen_roomlist_mark_as_read">"標為已讀"</string>
+  <string name="screen_roomlist_mark_as_unread">"標為未讀"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"新增地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"任何在授權空間的人都可以加入，但其他人都必須提出申請。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"所有人都必須申請存取權。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"任何在 %1$s 中的人都可以加入，但其他人都必須提出申請。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
 除了聊天室成員以外，任何人都不能讀取訊息。這可能會讓機器人與橋接無法正常運作。
@@ -131,22 +146,29 @@
   <string name="screen_security_and_privacy_encryption_toggle_title">"啟用端到端加密"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"選擇哪些空間的成員不需要邀請就可以加入此聊天室。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"管理空間"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"僅受邀者才能加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"任何位於已授權空間的人都可以加入。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"任何在 %1$s 中的人都可以加入。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支援空間"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"允許其他人透過公開目錄找到。"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開目錄中可見"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人（歷史紀錄公開）"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"變更不會影響先前的訊息，只會影響新訊息。%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"誰可以讀取歷史紀錄"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"選取此選項後僅限成員"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"成員，邀請後"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"成員（完整歷史）"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
 您可以選擇在家伺服器公開聊天室目錄中發佈您的聊天室。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"聊天室發佈"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是尋找與存取聊天室與空間的一種方式。這也讓您可以輕鬆地與其他人分享這些資訊。"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"能見度"</string>
   <string name="screen_security_and_privacy_title">"安全與隱私"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-zh/translations.xml b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
index 4101f67260..8a5c5734ed 100644
--- a/features/roomdetails/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-zh/translations.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="crypto_history_sharing_room_info_hidden_badge_content">"新成员无法查看历史记录"</string>
-  <string name="crypto_history_sharing_room_info_shared_badge_content">"新成员可见历史记录"</string>
+  <string name="crypto_history_sharing_room_info_hidden_badge_content">"新成员不能看到历史"</string>
+  <string name="crypto_history_sharing_room_info_shared_badge_content">"新成员可以看到历史"</string>
   <string name="crypto_history_sharing_room_info_world_readable_badge_content">"任何人都能查看历史记录"</string>
-  <string name="screen_edit_room_address_room_address_section_footer">"您需要一个地址才能在公共目录中显示。"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"你需要一个地址才能使其在公共目录中可见。"</string>
   <string name="screen_edit_room_address_title">"编辑地址"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"更新通知设置时出错。"</string>
-  <string name="screen_notification_settings_mentions_only_disclaimer">"服务器在加密聊天室中不支持此选项，因此在某些聊天室可能无法收到通知。"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"主服务器不支持在加密房间中的此选项，因此在某些房间你可能无法收到通知。"</string>
   <string name="screen_polls_history_title">"投票"</string>
   <string name="screen_room_change_permissions_administrators">"管理员"</string>
-  <string name="screen_room_change_permissions_ban_people">"封禁成员"</string>
+  <string name="screen_room_change_permissions_ban_people">"封禁人员"</string>
   <string name="screen_room_change_permissions_delete_messages">"移除消息"</string>
   <string name="screen_room_change_permissions_everyone">"成员"</string>
   <string name="screen_room_change_permissions_invite_people">"邀请人员"</string>
@@ -17,18 +17,18 @@
   <string name="screen_room_change_permissions_messages_and_content">"消息和内容"</string>
   <string name="screen_room_change_permissions_moderators">"协管员"</string>
   <string name="screen_room_change_permissions_remove_people">"移除人员"</string>
-  <string name="screen_room_change_permissions_room_avatar">"更改聊天室头像"</string>
+  <string name="screen_room_change_permissions_room_avatar">"更改房间头像"</string>
   <string name="screen_room_change_permissions_room_details">"编辑详情"</string>
-  <string name="screen_room_change_permissions_room_name">"更改聊天室名称"</string>
-  <string name="screen_room_change_permissions_room_topic">"更改聊天室主题"</string>
+  <string name="screen_room_change_permissions_room_name">"更改房间名称"</string>
+  <string name="screen_room_change_permissions_room_topic">"更改房间主题"</string>
   <string name="screen_room_change_permissions_send_messages">"发送消息"</string>
   <string name="screen_room_change_role_administrators_title">"编辑管理员"</string>
-  <string name="screen_room_change_role_confirm_add_admin_description">"您将无法撤消此操作。您正在提升用户的权限，使其拥有与您平权。"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"此操作无法撤消。你正在提升用户的权限到与你相同的权力值。"</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"添加管理员？"</string>
-  <string name="screen_room_change_role_confirm_change_owners_description">"此操作无法撤销。您正在将所有权转移给所选用户。一旦离开此界面，该操作将永久生效。"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"此操作无法撤消。你正在将所有权转移给所选用户。一旦离开此处，该操作将永久生效。"</string>
   <string name="screen_room_change_role_confirm_change_owners_title">"转让所有权"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"降级"</string>
-  <string name="screen_room_change_role_confirm_demote_self_description">"您正在降级，此更改将无法撤消。如果您是聊天室中的最后一个特权用户，则无法重新获得权限。"</string>
+  <string name="screen_room_change_role_confirm_demote_self_description">"你正在降级自身，此更改无法撤消。如果你是房间中的最后一个拥有特权的用户，则无法重新获得权限。"</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"降级自己？"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s（待处理）"</string>
   <string name="screen_room_change_role_invited_member_name_android">"（待处理）"</string>
@@ -39,54 +39,55 @@
   <string name="screen_room_change_role_section_administrators">"管理员"</string>
   <string name="screen_room_change_role_section_moderators">"协管员"</string>
   <string name="screen_room_change_role_section_users">"成员"</string>
-  <string name="screen_room_change_role_unsaved_changes_description">"您有未保存的更改。"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"你有未保存的更改。"</string>
   <string name="screen_room_change_role_unsaved_changes_title">"保存更改？"</string>
   <string name="screen_room_details_add_topic_title">"添加主题"</string>
-  <string name="screen_room_details_badge_encrypted">"加密的"</string>
-  <string name="screen_room_details_badge_not_encrypted">"未加密的"</string>
-  <string name="screen_room_details_badge_public">"公共聊天室"</string>
+  <string name="screen_room_details_badge_encrypted">"已加密"</string>
+  <string name="screen_room_details_badge_not_encrypted">"未加密"</string>
+  <string name="screen_room_details_badge_public">"公共房间"</string>
   <string name="screen_room_details_edit_room_title">"编辑详情"</string>
   <string name="screen_room_details_edition_error">"出现未知错误，无法更改信息。"</string>
-  <string name="screen_room_details_edition_error_title">"无法更新聊天室"</string>
+  <string name="screen_room_details_edition_error_title">"无法更新房间"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"消息已加密，只有你和消息接收者拥有唯一解密密钥。"</string>
   <string name="screen_room_details_encryption_enabled_title">"消息加密已启用"</string>
   <string name="screen_room_details_error_loading_notification_settings">"加载通知设置时出错。"</string>
-  <string name="screen_room_details_error_muting">"无法将此聊天室静音，请重试。"</string>
-  <string name="screen_room_details_error_unmuting">"无法取消此聊天室的静音，请重试。"</string>
-  <string name="screen_room_details_invite_people_dont_close">"完成之前请勿关闭应用程序。"</string>
-  <string name="screen_room_details_invite_people_preparing">"准备邀请…"</string>
-  <string name="screen_room_details_invite_people_title">"邀请朋友"</string>
+  <string name="screen_room_details_error_muting">"无法静音此房间，请重试。"</string>
+  <string name="screen_room_details_error_unmuting">"无法取消静音此房间，请重试。"</string>
+  <string name="screen_room_details_invite_people_dont_close">"完成之前请勿关闭 app。"</string>
+  <string name="screen_room_details_invite_people_preparing">"正在准备邀请…"</string>
+  <string name="screen_room_details_invite_people_title">"邀请人员"</string>
+  <string name="screen_room_details_invite_title">"邀请"</string>
   <string name="screen_room_details_leave_conversation_title">"离开聊天"</string>
-  <string name="screen_room_details_leave_room_title">"离开聊天室"</string>
-  <string name="screen_room_details_media_gallery_title">"媒体和文件"</string>
+  <string name="screen_room_details_leave_room_title">"离开房间"</string>
+  <string name="screen_room_details_media_gallery_title">"媒体与文件"</string>
   <string name="screen_room_details_notification_mode_custom">"自定义"</string>
   <string name="screen_room_details_notification_mode_default">"默认"</string>
   <string name="screen_room_details_notification_title">"通知"</string>
-  <string name="screen_room_details_pinned_events_row_title">"置顶消息"</string>
+  <string name="screen_room_details_pinned_events_row_title">"已置顶的消息"</string>
   <string name="screen_room_details_profile_row_title">"个人资料"</string>
   <string name="screen_room_details_requests_to_join_title">"申请加入"</string>
   <string name="screen_room_details_roles_and_permissions">"角色与权限"</string>
   <string name="screen_room_details_room_name_label">"名称"</string>
   <string name="screen_room_details_security_and_privacy_title">"安全与隐私"</string>
   <string name="screen_room_details_security_title">"安全"</string>
-  <string name="screen_room_details_share_room_title">"分享聊天室"</string>
-  <string name="screen_room_details_title">"聊天室信息"</string>
+  <string name="screen_room_details_share_room_title">"分享房间"</string>
+  <string name="screen_room_details_title">"房间信息"</string>
   <string name="screen_room_details_topic_title">"主题"</string>
-  <string name="screen_room_details_updating_room">"正在更新聊天室……"</string>
-  <string name="screen_room_member_list_banned_empty">"没有被封禁的用户。"</string>
+  <string name="screen_room_details_updating_room">"正在更新房间…"</string>
+  <string name="screen_room_member_list_banned_empty">"暂无被封禁的用户。"</string>
   <plurals name="screen_room_member_list_banned_header_title">
-    <item quantity="other">"%1$d 被禁用"</item>
+    <item quantity="other">"%1$d 人被封禁"</item>
   </plurals>
   <string name="screen_room_member_list_empty_search_subtitle">"检查拼写或尝试新搜索"</string>
   <string name="screen_room_member_list_empty_search_title">"未找到 “%1$s” 相关结果"</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="other">"%1$d 个人"</item>
   </plurals>
-  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"移除并封禁成员"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"封禁用户"</string>
   <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"仅移除成员"</string>
-  <string name="screen_room_member_list_manage_member_unban_action">"取消封禁"</string>
-  <string name="screen_room_member_list_manage_member_unban_message">"如果受到邀请，他们可以重新加入聊天室。"</string>
-  <string name="screen_room_member_list_manage_member_unban_title">"从房间取消解封"</string>
+  <string name="screen_room_member_list_manage_member_unban_action">"解封"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"如果他们受到邀请，则可以重新加入房间。"</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"解封用户"</string>
   <string name="screen_room_member_list_mode_banned">"已封禁用户"</string>
   <string name="screen_room_member_list_mode_members">"成员"</string>
   <plurals name="screen_room_member_list_pending_header_title">
@@ -96,24 +97,24 @@
   <string name="screen_room_member_list_role_administrator">"管理员"</string>
   <string name="screen_room_member_list_role_moderator">"协管员"</string>
   <string name="screen_room_member_list_role_owner">"所有者"</string>
-  <string name="screen_room_member_list_room_members_header_title">"聊天室成员"</string>
-  <string name="screen_room_member_list_unbanning_user">"解除封禁 %1$s"</string>
+  <string name="screen_room_member_list_room_members_header_title">"房间成员"</string>
+  <string name="screen_room_member_list_unbanning_user">"正在解除封禁 %1$s"</string>
   <string name="screen_room_notification_settings_allow_custom">"允许自定义设置"</string>
-  <string name="screen_room_notification_settings_allow_custom_footnote">"开启此功能将覆盖您的默认设置"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"启用此功能将覆盖默认设置"</string>
   <string name="screen_room_notification_settings_custom_settings_title">"在此聊天中通知我以下内容"</string>
-  <string name="screen_room_notification_settings_default_setting_footnote">"你可以在你的 %1$s 中更改这一项。"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"你可以在 %1$s 中更改此项。"</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"全局设置"</string>
   <string name="screen_room_notification_settings_default_setting_title">"默认设置"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"撤销独立设置"</string>
   <string name="screen_room_notification_settings_error_loading_settings">"加载通知设置时出错。"</string>
   <string name="screen_room_notification_settings_error_restoring_default">"恢复默认模式失败，请重试。"</string>
   <string name="screen_room_notification_settings_error_setting_mode">"设置模式失败，请重试。"</string>
-  <string name="screen_room_notification_settings_mentions_only_disclaimer">"服务器在加密聊天室中不支持此选项，无法在此聊天室收到通知。"</string>
-  <string name="screen_room_notification_settings_mode_all_messages">"全部消息"</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"主服务器不支持在加密房间中的此选项，因此在此房间你可能无法收到通知。"</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"所有消息"</string>
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"仅限提及和关键词"</string>
-  <string name="screen_room_notification_settings_room_custom_settings_title">"在这个聊天室，通知我："</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"在此房间通知我以下类型"</string>
   <string name="screen_room_roles_and_permissions_admins">"管理员"</string>
-  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理员和所有者"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理员与所有者"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"更改我的角色"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"降级为成员"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"降级为协管员"</string>
@@ -123,19 +124,21 @@
   <string name="screen_room_roles_and_permissions_owners">"所有者"</string>
   <string name="screen_room_roles_and_permissions_permissions_header">"权限"</string>
   <string name="screen_room_roles_and_permissions_reset">"重置权限"</string>
-  <string name="screen_room_roles_and_permissions_reset_confirm_description">"重置权限后，您将丢失当前设置。"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"重置权限后你将丢失当前设置。"</string>
   <string name="screen_room_roles_and_permissions_reset_confirm_title">"重置权限？"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"角色"</string>
-  <string name="screen_room_roles_and_permissions_room_details">"聊天室详情"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"房间详细信息"</string>
   <string name="screen_room_roles_and_permissions_title">"角色与权限"</string>
+  <string name="screen_roomlist_mark_as_read">"设为已读"</string>
+  <string name="screen_roomlist_mark_as_unread">"设为未读"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"添加地址"</string>
-  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"授权空间内任何成员均可加入，其他人员需申请访问权限。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"已授权空间内的任何成员都可以加入，其他人必须申请访问。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"所有用户均需申请访问权限。"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"请求加入"</string>
-  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s 成员可自由加入，其他人员需申请访问权限。"</string>
-  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，启用加密"</string>
-  <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史记录只能在房间成员被邀请或加入房间后才可见。
-除房间成员外，任何人都无法阅读信息。这可能会妨碍机器人和网桥正常工作。
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"申请加入"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s 成员可以加入，但其他人员必须申请访问。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是，启用加密"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史只能在房间成员被邀请或加入房间后才可见。
+除房间成员外，任何人都无法阅读消息。这可能会阻止机器人和桥接器正常工作。
 我们不建议对任何人都能找到并加入的房间启用加密。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"启用加密？"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"加密一旦启用，就无法禁用。"</string>
@@ -143,16 +146,16 @@
   <string name="screen_security_and_privacy_encryption_toggle_title">"启用端到端加密"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
-  <string name="screen_security_and_privacy_room_access_footer">"选择哪些空间的成员无需邀请即可加入本聊天室。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"选择哪些无需邀请即可加入此房间的空间成员。%1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"管理空间"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"仅限受邀者加入。"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"仅限受邀人员加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"仅限受邀者"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"访问权限"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"任何位于已授权空间的成员均可加入。"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s 中的任何人都可加入。"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支持空间"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"您需要一个地址才能在公共目录中显示。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"“空间”功能当前不受支持"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"你需要一个地址才能使其在公共目录中可见。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允许通过搜索 %1$s 的公共房间目录来发现此房间"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"通过公共目录搜索功能实现可被发现性。"</string>
@@ -160,12 +163,12 @@
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人（历史记录公开）"</string>
   <string name="screen_security_and_privacy_room_history_section_footer">"更改不会影响之前的消息，只会影响新消息。%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"谁可以读取历史记录"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"自受邀以来的成员"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"自成员被邀请时起"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"成员（完整历史记录）"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
 你可以选择在你服务器的公共房间目录中发布你的房间。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"房间发布"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是查找和访问聊天室及空间的途径，同时确保您能轻松与他人共享。"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是查找和访问房间及空间的途径，同时确保你能轻松与他人共享。"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"可见性"</string>
   <string name="screen_security_and_privacy_title">"安全与隐私"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index 6275b2837e..31851c2603 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -56,6 +56,7 @@
   <string name="screen_room_details_invite_people_dont_close">"Don\'t close the app until finished."</string>
   <string name="screen_room_details_invite_people_preparing">"Preparing invitations…"</string>
   <string name="screen_room_details_invite_people_title">"Invite people"</string>
+  <string name="screen_room_details_invite_title">"Invite"</string>
   <string name="screen_room_details_leave_conversation_title">"Leave conversation"</string>
   <string name="screen_room_details_leave_room_title">"Leave room"</string>
   <string name="screen_room_details_media_gallery_title">"Media and files"</string>
@@ -113,7 +114,7 @@
   <string name="screen_room_notification_settings_error_setting_mode">"Failed setting the mode, please try again."</string>
   <string name="screen_room_notification_settings_mentions_only_disclaimer">"Your homeserver does not support this option in encrypted rooms, you won\'t get notified in this room."</string>
   <string name="screen_room_notification_settings_mode_all_messages">"All messages"</string>
-  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions and Keywords only"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions and replies only"</string>
   <string name="screen_room_notification_settings_room_custom_settings_title">"In this room, notify me for"</string>
   <string name="screen_room_roles_and_permissions_admins">"Admins"</string>
   <string name="screen_room_roles_and_permissions_admins_and_owners">"Admins and owners"</string>
@@ -131,6 +132,8 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Roles"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Room details"</string>
   <string name="screen_room_roles_and_permissions_title">"Roles &amp; permissions"</string>
+  <string name="screen_roomlist_mark_as_read">"Mark as read"</string>
+  <string name="screen_roomlist_mark_as_unread">"Mark as unread"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Add address"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Anyone in authorised spaces can join, but everyone else must request access."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Everyone must request access."</string>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
index 5042f942b6..9a97380d21 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
@@ -68,8 +68,10 @@ class DefaultRoomDetailsEntryPointTest {
             )
         }
         val callback = object : RoomDetailsEntryPoint.Callback {
+            override fun onDone() = lambdaError()
             override fun navigateToGlobalNotificationSettings() = lambdaError()
-            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
+            override fun navigateToDeveloperSettings() = lambdaError()
+            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>, clearBackStack: Boolean) = lambdaError()
             override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
             override fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/FakeRoomDetailsNavigator.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/FakeRoomDetailsNavigator.kt
new file mode 100644
index 0000000000..b416902dab
--- /dev/null
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/FakeRoomDetailsNavigator.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.roomdetails.impl
+
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeRoomDetailsNavigator(
+    private val onDoneResult: () -> Unit = { lambdaError() }
+) : RoomDetailsNavigator {
+    override fun onDone() = onDoneResult()
+}
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
index 2d85744345..edb9115a7e 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
@@ -15,6 +15,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -28,7 +29,7 @@ import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.tests.testutils.lambda.lambdaError
 
-fun aRoom(
+fun aFakeBaseRoom(
     sessionId: SessionId = A_SESSION_ID,
     roomId: RoomId = A_ROOM_ID,
     displayName: String = A_ROOM_NAME,
@@ -49,6 +50,7 @@ fun aRoom(
     getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
     userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
     setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
+    markAsReadResult: (ReceiptType) -> Result<Unit> = { lambdaError() },
 ) = FakeBaseRoom(
     sessionId = sessionId,
     roomId = roomId,
@@ -57,6 +59,7 @@ fun aRoom(
     getUpdatedMemberResult = getUpdatedMemberResult,
     userRoleResult = userRoleResult,
     setIsFavoriteResult = setIsFavoriteResult,
+    markAsReadResult = markAsReadResult,
     roomPermissions = roomPermissions,
     initialRoomInfo = aRoomInfo(
         name = displayName,
@@ -106,6 +109,7 @@ fun aJoinedRoom(
     publishRoomAliasInRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
     removeRoomAliasFromRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
     setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
+    markAsReadResult: (ReceiptType) -> Result<Unit> = { lambdaError() },
 ) = FakeJoinedRoom(
     roomNotificationSettingsService = notificationSettingsService,
     setNameResult = setNameResult,
@@ -118,7 +122,7 @@ fun aJoinedRoom(
     updateCanonicalAliasResult = updateCanonicalAliasResult,
     publishRoomAliasInRoomDirectoryResult = publishRoomAliasInRoomDirectoryResult,
     removeRoomAliasFromRoomDirectoryResult = removeRoomAliasFromRoomDirectoryResult,
-    baseRoom = aRoom(
+    baseRoom = aFakeBaseRoom(
         sessionId = sessionId,
         roomId = roomId,
         roomPermissions = roomPermissions,
@@ -139,5 +143,6 @@ fun aJoinedRoom(
         joinedMemberCount = joinedMemberCount,
         activeMemberCount = activeMemberCount,
         invitedMemberCount = invitedMemberCount,
+        markAsReadResult = markAsReadResult,
     )
 )
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
index d355010307..51a6f97ab0 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
@@ -21,9 +21,8 @@ import io.element.android.libraries.androidutils.clipboard.ClipboardHelper
 import io.element.android.libraries.androidutils.clipboard.FakeClipboardHelper
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembersState
@@ -31,6 +30,7 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
@@ -44,7 +44,11 @@ import io.element.android.libraries.matrix.test.notificationsettings.FakeNotific
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
+import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
+import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.EventsRecorder
@@ -80,14 +84,12 @@ class RoomDetailsPresenterTest {
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),
-        featureFlagService: FeatureFlagService = FakeFeatureFlagService(
-            mapOf(
-                FeatureFlags.Knock.key to false,
-            )
-        ),
         encryptionService: FakeEncryptionService = FakeEncryptionService(),
         clipboardHelper: ClipboardHelper = FakeClipboardHelper(),
-        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore()
+        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
+        navigator: RoomDetailsNavigator = FakeRoomDetailsNavigator(),
+        notificationCleaner: NotificationCleaner = FakeNotificationCleaner(),
+        sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
     ): RoomDetailsPresenter {
         val matrixClient = FakeMatrixClient(notificationSettingsService = notificationSettingsService)
         val roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory {
@@ -104,9 +106,9 @@ class RoomDetailsPresenterTest {
             }
         }
         return RoomDetailsPresenter(
+            navigator = navigator,
             client = matrixClient,
             room = room,
-            featureFlagService = featureFlagService,
             notificationSettingsService = matrixClient.notificationSettingsService,
             roomMembersDetailsPresenterFactory = roomMemberDetailsPresenterFactory,
             leaveRoomPresenter = { leaveRoomState },
@@ -115,6 +117,8 @@ class RoomDetailsPresenterTest {
             analyticsService = analyticsService,
             clipboardHelper = clipboardHelper,
             appPreferencesStore = appPreferencesStore,
+            notificationCleaner = notificationCleaner,
+            sessionPreferencesStore = sessionPreferencesStore,
         )
     }
 
@@ -199,19 +203,14 @@ class RoomDetailsPresenterTest {
             givenRoomInfo(
                 aRoomInfo(
                     isEncrypted = true,
-                    isDirect = true,
+                    isDm = true,
                 )
             )
         }
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
             val initialState = awaitItem()
-            assertThat(initialState.roomType).isEqualTo(
-                RoomDetailsType.Dm(
-                    me = myRoomMember,
-                    otherMember = otherRoomMember,
-                )
-            )
+            assertThat(initialState.roomType).isEqualTo(RoomDetailsType.Dm(otherMember = otherRoomMember))
             cancelAndIgnoreRemainingEvents()
         }
     }
@@ -289,7 +288,7 @@ class RoomDetailsPresenterTest {
             givenRoomInfo(
                 aRoomInfo(
                     isEncrypted = true,
-                    isDirect = true,
+                    isDm = true,
                 )
             )
         }
@@ -312,7 +311,6 @@ class RoomDetailsPresenterTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
         val room = aJoinedRoom(
-            isDirect = true,
             topic = null,
             roomPermissions = roomPermissions(),
             userDisplayNameResult = { Result.success(A_USER_NAME) },
@@ -330,7 +328,7 @@ class RoomDetailsPresenterTest {
 
             givenRoomInfo(
                 aRoomInfo(
-                    isDirect = true,
+                    isDm = true,
                     activeMembersCount = 2,
                     topic = null,
                 )
@@ -570,17 +568,11 @@ class RoomDetailsPresenterTest {
             roomPermissions = roomPermissions(),
             joinRule = JoinRule.Knock,
         )
-        val featureFlagService = FakeFeatureFlagService(
-            mapOf(FeatureFlags.Knock.key to false)
-        )
         val presenter = createRoomDetailsPresenter(
             room = room,
-            featureFlagService = featureFlagService,
         )
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
             skipItems(1)
-            assertThat(awaitItem().canShowKnockRequests).isFalse()
-            featureFlagService.setFeatureEnabled(FeatureFlags.Knock, true)
             assertThat(awaitItem().canShowKnockRequests).isTrue()
             room.givenRoomInfo(aRoomInfo(joinRule = JoinRule.Invite))
             assertThat(awaitItem().canShowKnockRequests).isFalse()
@@ -593,8 +585,7 @@ class RoomDetailsPresenterTest {
         val room = aJoinedRoom(
             roomPermissions = roomPermissions(),
         )
-        val featureFlagService = FakeFeatureFlagService()
-        val presenter = createRoomDetailsPresenter(room = room, featureFlagService = featureFlagService)
+        val presenter = createRoomDetailsPresenter(room = room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
             skipItems(1)
             with(awaitItem()) {
@@ -620,6 +611,87 @@ class RoomDetailsPresenterTest {
         }
     }
 
+    @Test
+    fun `present - mark as read`() = runTest {
+        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { _ -> Result.success(Unit) }
+        val room = aJoinedRoom(
+            markAsReadResult = markAsReadResult,
+        )
+        val clearMessagesForRoomResult = lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> Result.success(Unit) }
+        val notificationCleaner = FakeNotificationCleaner(
+            clearMessagesForRoomLambda = clearMessagesForRoomResult,
+        )
+        val presenter = createRoomDetailsPresenter(
+            room = room,
+            notificationCleaner = notificationCleaner,
+        )
+        presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
+            skipItems(1)
+            with(awaitItem()) {
+                eventSink(RoomDetailsEvent.MarkAsRead)
+            }
+            assertThat(room.baseRoom.setUnreadFlagCalls).containsExactly(false)
+            markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.READ))
+            clearMessagesForRoomResult.assertions().isCalledOnce().with(
+                value(room.sessionId),
+                value(room.roomId),
+            )
+        }
+    }
+
+    @Test
+    fun `present - mark as read - private`() = runTest {
+        val markAsReadResult = lambdaRecorder<ReceiptType, Result<Unit>> { _ -> Result.success(Unit) }
+        val room = aJoinedRoom(
+            markAsReadResult = markAsReadResult,
+        )
+        val sessionPreferencesStore = InMemorySessionPreferencesStore(
+            isSendPublicReadReceiptsEnabled = false,
+        )
+        val clearMessagesForRoomResult = lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> Result.success(Unit) }
+        val notificationCleaner = FakeNotificationCleaner(
+            clearMessagesForRoomLambda = clearMessagesForRoomResult,
+        )
+        val presenter = createRoomDetailsPresenter(
+            room = room,
+            notificationCleaner = notificationCleaner,
+            sessionPreferencesStore = sessionPreferencesStore,
+        )
+        presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
+            skipItems(1)
+            with(awaitItem()) {
+                eventSink(RoomDetailsEvent.MarkAsRead)
+            }
+            assertThat(room.baseRoom.setUnreadFlagCalls).containsExactly(false)
+            markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.READ_PRIVATE))
+            clearMessagesForRoomResult.assertions().isCalledOnce().with(
+                value(room.sessionId),
+                value(room.roomId),
+            )
+        }
+    }
+
+    @Test
+    fun `present - mark as unread`() = runTest {
+        val room = aJoinedRoom()
+        val onDoneResult = lambdaRecorder<Unit> { }
+        val navigator = FakeRoomDetailsNavigator(
+            onDoneResult = onDoneResult
+        )
+        val presenter = createRoomDetailsPresenter(
+            room = room,
+            navigator = navigator,
+        )
+        presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
+            skipItems(1)
+            with(awaitItem()) {
+                eventSink(RoomDetailsEvent.MarkAsUnread)
+            }
+            onDoneResult.assertions().isCalledOnce()
+            assertThat(room.baseRoom.setUnreadFlagCalls).containsExactly(true)
+        }
+    }
+
     private fun roomPermissions(
         canInvite: Boolean = true,
         canKick: Boolean = true,
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
index 7bfd52d82d..54ad539bfb 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateTest.kt
@@ -37,24 +37,24 @@ class RoomDetailsStateTest {
     }
 
     @Test
-    fun `room public encrypted should have encrypted and public badges`() {
+    fun `room public encrypted should have encrypted, public, and history sharing shared badges`() {
         val sut = aRoomDetailsState(
             isPublic = true,
             isEncrypted = true,
         )
         assertThat(sut.roomBadges).isEqualTo(
-            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC)
+            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC, RoomBadge.SHARED_HISTORY_SHARED)
         )
     }
 
     @Test
-    fun `room not public encrypted should have encrypted badges`() {
+    fun `room not public encrypted should have encrypted and history sharing shared badges`() {
         val sut = aRoomDetailsState(
             isPublic = false,
             isEncrypted = true,
         )
         assertThat(sut.roomBadges).isEqualTo(
-            persistentListOf(RoomBadge.ENCRYPTED)
+            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.SHARED_HISTORY_SHARED)
         )
     }
 
@@ -62,7 +62,6 @@ class RoomDetailsStateTest {
     fun `room public not encrypted should not have history sharing badges`() {
         val sut = aRoomDetailsState(
             isEncrypted = false,
-            enableKeyShareOnInvite = true,
             roomHistoryVisibility = RoomHistoryVisibility.Shared
         )
         assertThat(sut.roomBadges).isEqualTo(
@@ -74,7 +73,6 @@ class RoomDetailsStateTest {
     fun `room public encrypted should have history sharing hidden badge`() {
         val sut = aRoomDetailsState(
             isEncrypted = true,
-            enableKeyShareOnInvite = true,
             roomHistoryVisibility = RoomHistoryVisibility.Joined
         )
         assertThat(sut.roomBadges).isEqualTo(
@@ -83,22 +81,9 @@ class RoomDetailsStateTest {
     }
 
     @Test
-    fun `room public encrypted should have history sharing shared badge`() {
+    fun `room public encrypted with world_readable visibility should have history sharing world_readable badge`() {
         val sut = aRoomDetailsState(
             isEncrypted = true,
-            enableKeyShareOnInvite = true,
-            roomHistoryVisibility = RoomHistoryVisibility.Shared
-        )
-        assertThat(sut.roomBadges).isEqualTo(
-            persistentListOf(RoomBadge.ENCRYPTED, RoomBadge.PUBLIC, RoomBadge.SHARED_HISTORY_SHARED)
-        )
-    }
-
-    @Test
-    fun `room public encrypted should have history sharing world_readable badge`() {
-        val sut = aRoomDetailsState(
-            isEncrypted = true,
-            enableKeyShareOnInvite = true,
             roomHistoryVisibility = RoomHistoryVisibility.WorldReadable
         )
         assertThat(sut.roomBadges).isEqualTo(
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
index 588a10a218..767ddd5dd9 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
@@ -6,15 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.roomdetails.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.onLast
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.roomdetails.impl.members.aRoomMember
 import io.element.android.features.userprofile.shared.aUserProfileState
 import io.element.android.libraries.matrix.api.core.UserId
@@ -32,323 +36,332 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class RoomDetailsViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class RoomDetailsViewTest : RobolectricTest() {
     @Test
-    fun `click on back invokes expected callback`() {
+    fun `click on back invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 goBack = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `click on share invokes expected callback`() {
+    fun `click on share invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 onShareRoom = callback,
             )
-            rule.clickOn(CommonStrings.action_share)
+            clickOn(CommonStrings.action_share)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on room members invokes expected callback`() {
+    fun `click on room members invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 openRoomMemberList = callback,
             )
-            rule.clickOn(CommonStrings.common_people)
+            clickOn(CommonStrings.common_people)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on polls invokes expected callback`() {
+    fun `click on polls invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 openPollHistory = callback,
             )
-            rule.clickOn(R.string.screen_polls_history_title)
+            clickOn(R.string.screen_polls_history_title)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on media gallery invokes expected callback`() {
+    fun `click on media gallery invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 openMediaGallery = callback,
             )
-            rule.clickOn(R.string.screen_room_details_media_gallery_title)
+            clickOn(R.string.screen_room_details_media_gallery_title)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on notification invokes expected callback`() {
+    fun `click on notification invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 openRoomNotificationSettings = callback,
             )
-            rule.clickOn(R.string.screen_room_details_notification_title)
+            clickOn(R.string.screen_room_details_notification_title)
         }
     }
 
     @Test
-    fun `click on invite invokes expected callback`() {
+    fun `click on invite invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canInvite = true,
                 ),
                 invitePeople = callback,
             )
-            rule.clickOn(CommonStrings.action_invite)
+            clickOn(CommonStrings.action_invite)
         }
     }
 
     @Test
-    fun `click on call invokes expected callback`() {
+    fun `click on call invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(CallIntent.AUDIO) { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canInvite = true,
-                    roomType = RoomDetailsType.Dm(
-                        aRoomMember(UserId("@me:local.org")),
-                        aRoomMember(UserId("@other:local.org"))
-                    ),
+                    roomType = RoomDetailsType.Dm(aRoomMember(UserId("@other:local.org"))),
                 ),
                 onJoinCallClick = callback,
             )
-            rule.clickOn(CommonStrings.action_call)
+            clickOn(CommonStrings.action_call)
         }
     }
 
     @Test
-    fun `click on video call invokes expected callback`() {
+    fun `click on video call invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(CallIntent.VIDEO) { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canInvite = true,
                 ),
                 onJoinCallClick = callback,
             )
-            rule.clickOn(CommonStrings.common_video)
+            clickOn(CommonStrings.common_video)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on pinned messages invokes expected callback`() {
+    fun `click on pinned messages invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canInvite = true,
                 ),
                 onPinnedMessagesClick = callback,
             )
-            rule.clickOn(R.string.screen_room_details_pinned_events_row_title)
+            clickOn(R.string.screen_room_details_pinned_events_row_title)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on security and privacy invokes expected callback`() {
+    fun `click on security and privacy invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canShowSecurityAndPrivacy = true,
                 ),
                 onSecurityAndPrivacyClick = callback,
             )
-            rule.clickOn(R.string.screen_room_details_security_and_privacy_title)
+            clickOn(R.string.screen_room_details_security_and_privacy_title)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on add topic emit expected event`() {
+    fun `click on add topic emit expected event`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam<RoomDetailsAction>(RoomDetailsAction.AddTopic) { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     roomTopic = RoomTopicState.CanAddTopic,
                 ),
                 onActionClick = callback,
             )
-            rule.clickOn(R.string.screen_room_details_add_topic_title)
+            clickOn(R.string.screen_room_details_add_topic_title)
         }
     }
 
     @Test
-    fun `click on menu edit emit expected event`() {
+    fun `click on menu edit emit expected event`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam<RoomDetailsAction>(RoomDetailsAction.Edit) { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canEdit = true,
                 ),
                 onActionClick = callback,
             )
-            val menuContentDescription = rule.activity.getString(CommonStrings.a11y_user_menu)
-            rule.onNodeWithContentDescription(menuContentDescription).performClick()
-            rule.clickOn(CommonStrings.action_edit)
+            val menuContentDescription = activity!!.getString(CommonStrings.a11y_user_menu)
+            onNodeWithContentDescription(menuContentDescription).performClick()
+            clickOn(CommonStrings.action_edit)
         }
     }
 
     @Test
-    fun `click on avatar test`() {
+    fun `click on avatar test`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>(expectEvents = false)
         val state = aRoomDetailsState(
             eventSink = eventsRecorder,
             roomAvatarUrl = "an_avatar_url",
         )
         val callback = EnsureCalledOnceWithTwoParams(state.roomName, "an_avatar_url")
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = state,
             openAvatarPreview = callback,
         )
-        rule.onNodeWithTag(TestTags.roomDetailAvatar.value).performClick()
+        onNodeWithTag(TestTags.roomDetailAvatar.value).performClick()
         callback.assertSuccess()
     }
 
     @Test
-    fun `click on avatar test on DM`() {
+    fun `click on avatar test on DM`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>(expectEvents = false)
         val state = aRoomDetailsState(
-            roomType = RoomDetailsType.Dm(
-                aRoomMember(),
-                aDmRoomMember(avatarUrl = "an_avatar_url"),
-            ),
+            roomType = RoomDetailsType.Dm(aDmRoomMember(avatarUrl = "an_avatar_url"),),
             roomName = "Daniel",
             eventSink = eventsRecorder,
         )
         val callback = EnsureCalledOnceWithTwoParams("Daniel", "an_avatar_url")
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = state,
             openAvatarPreview = callback,
         )
-        rule.onNodeWithTag(TestTags.memberDetailAvatar.value).performClick()
+        onNodeWithTag(TestTags.roomDetailAvatar.value).performClick()
         callback.assertSuccess()
     }
 
     @Test
-    fun `click on mute emit expected event`() {
+    fun `click on mute emit expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>()
         val state = aRoomDetailsState(
             eventSink = eventsRecorder,
             roomNotificationSettings = aRoomNotificationSettings(mode = RoomNotificationMode.ALL_MESSAGES),
         )
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = state,
         )
-        rule.clickOn(CommonStrings.common_mute)
+        clickOn(CommonStrings.common_mute)
         eventsRecorder.assertSingle(RoomDetailsEvent.MuteNotification)
     }
 
     @Test
-    fun `click on unmute emit expected event`() {
+    fun `click on unmute emit expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>()
         val state = aRoomDetailsState(
             eventSink = eventsRecorder,
             roomNotificationSettings = aRoomNotificationSettings(mode = RoomNotificationMode.MUTE),
         )
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = state,
         )
-        rule.clickOn(CommonStrings.common_unmute)
+        clickOn(CommonStrings.common_unmute)
         eventsRecorder.assertSingle(RoomDetailsEvent.UnmuteNotification)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on favorite emit expected Event`() {
+    fun `click on favorite emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>()
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = aRoomDetailsState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.common_favourite)
+        clickOn(CommonStrings.common_favourite)
         eventsRecorder.assertSingle(RoomDetailsEvent.SetFavorite(true))
     }
 
     @Config(qualifiers = "h1500dp")
     @Test
-    fun `click on leave emit expected Event`() {
+    fun `click on leave emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEvent>()
-        rule.setRoomDetailView(
+        setRoomDetailView(
             state = aRoomDetailsState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_room_details_leave_room_title)
+        clickOn(R.string.screen_room_details_leave_room_title)
         eventsRecorder.assertSingle(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
     }
 
     @Config(qualifiers = "h1500dp")
     @Test
-    fun `click on report room  invokes expected callback`() {
+    fun `click on report room  invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                 ),
                 onReportRoomClick = callback,
             )
-            rule.clickOn(CommonStrings.action_report_room)
+            clickOn(CommonStrings.action_report_room)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on knock requests invokes expected callback`() {
+    fun `click on knock requests invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
                     canShowKnockRequests = true,
                 ),
                 onKnockRequestsClick = callback,
             )
-            rule.clickOn(R.string.screen_room_details_requests_to_join_title)
+            clickOn(R.string.screen_room_details_requests_to_join_title)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `click on profile invokes the expected callback`() {
+    fun `click on profile invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(A_USER_ID) { callback ->
-            rule.setRoomDetailView(
+            setRoomDetailView(
                 state = aRoomDetailsState(
                     eventSink = EventsRecorder(expectEvents = false),
-                    roomMemberDetailsState = aUserProfileState(userId = A_USER_ID),
+                    roomType = RoomDetailsType.Dm(aDmRoomMember(userId = A_USER_ID)),
+                    dmOtherMemberDetailsState = aUserProfileState(userId = A_USER_ID),
                 ),
                 onProfileClick = callback,
             )
-            rule.clickOn(R.string.screen_room_details_profile_row_title)
+            clickOn(R.string.screen_room_details_profile_row_title)
+        }
+    }
+
+    @Config(qualifiers = "h1024dp")
+    @Test
+    fun `click on invite invokes the expected callback`() = runAndroidComposeUiTest {
+        ensureCalledOnce { callback ->
+            setRoomDetailView(
+                state = aRoomDetailsState(
+                    eventSink = EventsRecorder(expectEvents = false),
+                    roomType = RoomDetailsType.Dm(
+                        aDmRoomMember(userId = UserId("@other:local.org")),
+                    ),
+                    dmOtherMemberDetailsState = aUserProfileState(userId = A_USER_ID),
+                    canInvite = true,
+                ),
+                invitePeople = callback,
+            )
+            onAllNodesWithText(activity!!.getString(R.string.screen_room_details_invite_title)).onLast().performClick()
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDetailView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomDetailView(
     state: RoomDetailsState = aRoomDetailsState(
         eventSink = EventsRecorder(expectEvents = false),
     ),
diff --git a/features/roomdetailsedit/impl/src/main/res/values-ca/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..8be6967ace
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_details_edit_room_title">"Edita detalls"</string>
+  <string name="screen_room_details_edition_error">"Un error desconegut ha impedit l\'intercanvi d\'informació."</string>
+  <string name="screen_room_details_edition_error_title">"No s\'ha pogut actualitzar la sala"</string>
+  <string name="screen_room_details_updating_room">"Actualitzant sala…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-fa/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-fa/translations.xml
index bbbd63d171..a339ecd57f 100644
--- a/features/roomdetailsedit/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetailsedit/impl/src/main/res/values-fa/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_details_edit_room_title">"ویرایش اتاق"</string>
+  <string name="screen_room_details_edit_room_title">"ویرایش جزییات"</string>
   <string name="screen_room_details_edition_error">"خطایی ناشناخته رخ داد و اطّلاعات قابل تغییر نبودند."</string>
   <string name="screen_room_details_edition_error_title">"ناتوان در به‌روز رسانی اتاق"</string>
   <string name="screen_room_details_updating_room">"به‌روز کردن اتاق…"</string>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-ja/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..5dbdbe22e1
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_details_edit_room_title">"詳細を編集"</string>
+  <string name="screen_room_details_edition_error">"不明な問題が発生したため、情報の更新に失敗しました。"</string>
+  <string name="screen_room_details_edition_error_title">"ルームを更新することができません"</string>
+  <string name="screen_room_details_updating_room">"詳細を更新中…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-pl/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-pl/translations.xml
index c676ff46ed..25be496204 100644
--- a/features/roomdetailsedit/impl/src/main/res/values-pl/translations.xml
+++ b/features/roomdetailsedit/impl/src/main/res/values-pl/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_room_details_edit_room_title">"Edytuj pokój"</string>
+  <string name="screen_room_details_edit_room_title">"Edytuj szczegóły"</string>
   <string name="screen_room_details_edition_error">"Wystąpił nieznany błąd i nie można było zmienić informacji."</string>
   <string name="screen_room_details_edition_error_title">"Nie można zaktualizować pokoju"</string>
   <string name="screen_room_details_updating_room">"Aktualizuję pokój…"</string>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-vi/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..9a5d8948e4
--- /dev/null
+++ b/features/roomdetailsedit/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_details_edit_room_title">"Chỉnh sửa thông tin"</string>
+  <string name="screen_room_details_edition_error">"Có lỗi không xác định, thông tin không được cập nhật."</string>
+  <string name="screen_room_details_edition_error_title">"Không thể cập nhật phòng"</string>
+  <string name="screen_room_details_updating_room">"Đang cập nhật thông tin…"</string>
+</resources>
diff --git a/features/roomdetailsedit/impl/src/main/res/values-zh/translations.xml b/features/roomdetailsedit/impl/src/main/res/values-zh/translations.xml
index cf7abd7cc8..ae6d0167c3 100644
--- a/features/roomdetailsedit/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdetailsedit/impl/src/main/res/values-zh/translations.xml
@@ -2,6 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_room_details_edit_room_title">"编辑详情"</string>
   <string name="screen_room_details_edition_error">"出现未知错误，无法更改信息。"</string>
-  <string name="screen_room_details_edition_error_title">"无法更新聊天室"</string>
-  <string name="screen_room_details_updating_room">"正在更新聊天室……"</string>
+  <string name="screen_room_details_edition_error_title">"无法更新房间"</string>
+  <string name="screen_room_details_updating_room">"正在更新房间…"</string>
 </resources>
diff --git a/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
index 71fb143074..dab0381232 100644
--- a/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
+++ b/features/roomdetailsedit/impl/src/test/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditViewTest.kt
@@ -5,19 +5,21 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.roomdetailsedit.impl
 
 import androidx.activity.ComponentActivity
 import androidx.annotation.StringRes
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.isEditable
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.testtags.TestTags
@@ -27,59 +29,54 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomDetailsEditViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomDetailsEditViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back emits the expected Event`() {
+    fun `clicking on back emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBack()
+        pressBack()
         eventsRecorder.assertSingle(RoomDetailsEditEvent.OnBackPress)
     }
 
     @Test
-    fun `clicking on discard when confirming exit emits the expected Event`() {
+    fun `clicking on discard when confirming exit emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_discard)
+        clickOn(CommonStrings.action_discard)
         eventsRecorder.assertSingle(RoomDetailsEditEvent.OnBackPress)
     }
 
     @Test
-    fun `clicking on save when confirming exit emits the expected Event`() {
+    fun `clicking on save when confirming exit emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 saveAction = AsyncAction.ConfirmingCancellation,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        clickOn(CommonStrings.action_save, inDialog = true)
         eventsRecorder.assertSingle(RoomDetailsEditEvent.Save)
     }
 
     @Test
-    fun `when edition is successful, the expected callback is invoked`() {
+    fun `when edition is successful, the expected callback is invoked`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setRoomDetailsEditView(
+            setRoomDetailsEditView(
                 aRoomDetailsEditState(
                     eventSink = eventsRecorder,
                     saveAction = AsyncAction.Success(Unit)
@@ -90,55 +87,55 @@ class RoomDetailsEditViewTest {
     }
 
     @Test
-    fun `when name is changed, the expected Event is emitted`() {
+    fun `when name is changed, the expected Event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 roomRawName = "Marketing",
             ),
         )
-        rule.onNodeWithText("Marketing").performTextInput("A")
+        onNodeWithText("Marketing").performTextInput("A")
         eventsRecorder.assertSingle(RoomDetailsEditEvent.UpdateRoomName("AMarketing"))
     }
 
     @Test
-    fun `when user cannot change name, nothing happen`() {
+    fun `when user cannot change name, nothing happen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 roomRawName = "Marketing",
                 canChangeName = false,
             ),
         )
-        rule.onNodeWithText("Marketing").assert(!isEditable())
+        onNodeWithText("Marketing").assert(!isEditable())
     }
 
     @Test
-    fun `when topic is changed, the expected Event is emitted`() {
+    fun `when topic is changed, the expected Event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 roomTopic = "My Topic",
             ),
         )
-        rule.onNodeWithText("My Topic").performTextInput("A")
+        onNodeWithText("My Topic").performTextInput("A")
         eventsRecorder.assertSingle(RoomDetailsEditEvent.UpdateRoomTopic("AMy Topic"))
     }
 
     @Test
-    fun `when user cannot change topic, nothing happen`() {
+    fun `when user cannot change topic, nothing happen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 roomTopic = "My Topic",
                 canChangeTopic = false,
             ),
         )
-        rule.onNodeWithText("My Topic").assert(!isEditable())
+        onNodeWithText("My Topic").assert(!isEditable())
     }
 
     @Ignore("This test is failing because the bottom sheet does not open")
@@ -171,73 +168,73 @@ class RoomDetailsEditViewTest {
     private fun testAvatarChange(
         @StringRes stringActionRes: Int,
         expectedEvent: RoomDetailsEditEvent.HandleAvatarAction,
-    ) {
+    ) = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
             ),
         )
         // Open the bottom sheet
-        rule.onNode(hasTestTag(TestTags.editAvatar.value)).performClick()
-        rule.onNodeWithText(rule.activity.getString(stringActionRes)).assertExists()
-        rule.clickOn(stringActionRes)
+        onNode(hasTestTag(TestTags.editAvatar.value)).performClick()
+        onNodeWithText(activity!!.getString(stringActionRes)).assertExists()
+        clickOn(stringActionRes)
         eventsRecorder.assertSingle(expectedEvent)
     }
 
     @Test
-    fun `when user cannot change avatar, nothing happen`() {
+    fun `when user cannot change avatar, nothing happen`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 canChangeAvatar = false,
             ),
         )
-        rule.onNode(hasTestTag(TestTags.editAvatar.value)).performClick()
-        rule.onNodeWithText(rule.activity.getString(CommonStrings.action_take_photo)).assertDoesNotExist()
+        onNode(hasTestTag(TestTags.editAvatar.value)).performClick()
+        onNodeWithText(activity!!.getString(CommonStrings.action_take_photo)).assertDoesNotExist()
     }
 
     @Test
-    fun `when save is clicked, the expected Event is emitted`() {
+    fun `when save is clicked, the expected Event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 saveButtonEnabled = true,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertSingle(RoomDetailsEditEvent.Save)
     }
 
     @Test
-    fun `when save is clicked, but nothing need to be saved, nothing happens`() {
+    fun `when save is clicked, but nothing need to be saved, nothing happens`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>(expectEvents = false)
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 saveButtonEnabled = false,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
     }
 
     @Test
-    fun `when error is shown, closing the dialog emit the expected Event`() {
+    fun `when error is shown, closing the dialog emit the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDetailsEditEvent>()
-        rule.setRoomDetailsEditView(
+        setRoomDetailsEditView(
             aRoomDetailsEditState(
                 eventSink = eventsRecorder,
                 saveAction = AsyncAction.Failure(RuntimeException("Whelp")),
             ),
         )
-        rule.clickOn(CommonStrings.action_ok)
+        clickOn(CommonStrings.action_ok)
         eventsRecorder.assertSingle(RoomDetailsEditEvent.CloseDialog)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDetailsEditView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomDetailsEditView(
     state: RoomDetailsEditState,
     onDone: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
index f2e4ae44fa..dd9098b7ad 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
@@ -52,6 +52,8 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
@@ -76,7 +78,8 @@ fun RoomDirectoryView(
                     .padding(padding)
                     .consumeWindowInsets(padding)
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     )
 }
 
@@ -127,7 +130,10 @@ private fun RoomDirectoryRoomList(
     onReachedLoadMore: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    LazyColumn(modifier = modifier) {
+    LazyColumn(
+        modifier = modifier,
+        contentPadding = lazyColumnContentPadding,
+    ) {
         items(roomDescriptions) { roomDescription ->
             RoomDirectoryRoomRow(
                 roomDescription = roomDescription,
diff --git a/features/roomdirectory/impl/src/main/res/values-ca/translations.xml b/features/roomdirectory/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..fc664290c1
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_directory_search_loading_error">"No s\'ha pogut carregar"</string>
+  <string name="screen_room_directory_search_title">"Directori de sales"</string>
+</resources>
diff --git a/features/roomdirectory/impl/src/main/res/values-ja/translations.xml b/features/roomdirectory/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..f533dc8eab
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_directory_search_loading_error">"読み込みに失敗しました"</string>
+  <string name="screen_room_directory_search_title">"ルーム階層"</string>
+</resources>
diff --git a/features/roomdirectory/impl/src/main/res/values-vi/translations.xml b/features/roomdirectory/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..efbe223f79
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_directory_search_loading_error">"Không tải được"</string>
+  <string name="screen_room_directory_search_title">"Danh sách phòng"</string>
+</resources>
diff --git a/features/roomdirectory/impl/src/main/res/values-zh/translations.xml b/features/roomdirectory/impl/src/main/res/values-zh/translations.xml
index 742a762858..705b8e353f 100644
--- a/features/roomdirectory/impl/src/main/res/values-zh/translations.xml
+++ b/features/roomdirectory/impl/src/main/res/values-zh/translations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_room_directory_search_loading_error">"加载失败"</string>
-  <string name="screen_room_directory_search_title">"聊天室目录"</string>
+  <string name="screen_room_directory_search_title">"房间目录"</string>
 </resources>
diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
index a50ad6a22c..b3b935596f 100644
--- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
+++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
@@ -6,47 +6,44 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.roomdirectory.impl.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomDirectoryViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomDirectoryViewTest : RobolectricTest() {
     @Test
-    fun `typing text in search field emits the expected Event`() {
+    fun `typing text in search field emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()
-        rule.setRoomDirectoryView(
+        setRoomDirectoryView(
             state = aRoomDirectoryState(
                 eventSink = eventsRecorder,
             )
         )
-        rule.onNodeWithTag(TestTags.searchTextField.value).performTextInput(
+        onNodeWithTag(TestTags.searchTextField.value).performTextInput(
             text = "Test"
         )
         eventsRecorder.assertSingle(RoomDirectoryEvents.Search("Test"))
     }
 
     @Test
-    fun `clicking on room item then onResultClick lambda is called once`() {
+    fun `clicking on room item then onResultClick lambda is called once`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()
         val state = aRoomDirectoryState(
             roomDescriptions = aRoomDescriptionList(),
@@ -54,27 +51,27 @@ class RoomDirectoryViewTest {
         )
         val clickedRoom = state.roomDescriptions.first()
         ensureCalledOnceWithParam(clickedRoom) { callback ->
-            rule.setRoomDirectoryView(
+            setRoomDirectoryView(
                 state = state,
                 onResultClick = callback,
             )
-            rule.onNodeWithText(clickedRoom.computedName).performClick()
+            onNodeWithText(clickedRoom.computedName).performClick()
         }
     }
 
     @Test
-    fun `composing load more indicator emits expected Event`() {
+    fun `composing load more indicator emits expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()
         val state = aRoomDirectoryState(
             displayLoadMoreIndicator = true,
             eventSink = eventsRecorder,
         )
-        rule.setRoomDirectoryView(state = state)
+        setRoomDirectoryView(state = state)
         eventsRecorder.assertSingle(RoomDirectoryEvents.LoadMore)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDirectoryView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomDirectoryView(
     state: RoomDirectoryState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onResultClick: (RoomDescription) -> Unit = EnsureNeverCalledWithParam(),
diff --git a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationRenderer.kt b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationRenderer.kt
index 8fb1ae0c03..efc87d8a40 100644
--- a/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationRenderer.kt
+++ b/features/roommembermoderation/api/src/main/kotlin/io/element/android/features/roommembermoderation/api/RoomMemberModerationRenderer.kt
@@ -17,6 +17,7 @@ interface RoomMemberModerationRenderer {
     fun Render(
         state: RoomMemberModerationState,
         onSelectAction: (ModerationAction, MatrixUser) -> Unit,
+        onAvatarClick: ((MatrixUser) -> Unit)?,
         modifier: Modifier,
     )
 }
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt
index 05bf00c7eb..0eeded6434 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/DefaultRoomMemberModerationRenderer.kt
@@ -25,10 +25,11 @@ class DefaultRoomMemberModerationRenderer : RoomMemberModerationRenderer {
     override fun Render(
         state: RoomMemberModerationState,
         onSelectAction: (ModerationAction, MatrixUser) -> Unit,
+        onAvatarClick: ((MatrixUser) -> Unit)?,
         modifier: Modifier
     ) {
         if (state is InternalRoomMemberModerationState) {
-            RoomMemberModerationView(state, onSelectAction, modifier)
+            RoomMemberModerationView(modifier = modifier, state = state, onSelectAction = onSelectAction, onAvatarClick = onAvatarClick)
         } else {
             SideEffect {
                 Timber.d("RoomMemberModerationRenderer: Render called with unsupported state: $state")
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
index 120a299a7d..2c32f2c47a 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/InternalRoomMemberModerationStateProvider.kt
@@ -14,7 +14,9 @@ import io.element.android.features.roommembermoderation.api.ModerationActionStat
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationPermissions
 import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.toImmutableList
 
@@ -78,9 +80,10 @@ class InternalRoomMemberModerationStateProvider : PreviewParameterProvider<Inter
 }
 
 fun anAlice() = MatrixUser(
-    UserId(value = "@alice:server.org"),
-    displayName = "Alice",
+    userId = UserId(value = "@alice:server.org"),
+    displayName = USER_NAME_ALICE,
     avatarUrl = null,
+    displayedStatus = DisplayedStatus.InCall(0L),
 )
 
 fun aRoomMembersModerationState(
diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
index ac6c5bc4cb..a5e0ac274f 100644
--- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
+++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
@@ -8,17 +8,21 @@
 
 package io.element.android.features.roommembermoderation.impl
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
@@ -52,6 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
+import io.element.android.libraries.matrix.ui.model.toText
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.launch
@@ -61,6 +66,7 @@ import timber.log.Timber
 fun RoomMemberModerationView(
     state: InternalRoomMemberModerationState,
     onSelectAction: (ModerationAction, MatrixUser) -> Unit,
+    onAvatarClick: ((MatrixUser) -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
@@ -70,6 +76,7 @@ fun RoomMemberModerationView(
                 user = selectedUser,
                 actions = state.actions,
                 onSelectAction = onSelectAction,
+                onAvatarClick = onAvatarClick,
                 onDismiss = { state.eventSink(InternalRoomMemberModerationEvents.Reset) },
             )
         }
@@ -211,12 +218,16 @@ private fun RoomMemberActionsBottomSheet(
     user: MatrixUser,
     actions: ImmutableList<ModerationActionState>,
     onSelectAction: (ModerationAction, MatrixUser) -> Unit,
+    onAvatarClick: ((MatrixUser) -> Unit)? = null,
     onDismiss: () -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val bottomSheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+    )
     ModalBottomSheet(
-        modifier = Modifier.systemBarsPadding(),
+        modifier = Modifier.statusBarsPadding(),
         sheetState = bottomSheetState,
         onDismissRequest = {
             coroutineScope.launch {
@@ -224,9 +235,12 @@ private fun RoomMemberActionsBottomSheet(
                 onDismiss()
             }
         },
+        scrollable = false,
     ) {
         Column(
-            modifier = Modifier.padding(vertical = 16.dp)
+            modifier = Modifier
+                .padding(vertical = 16.dp)
+                .verticalScroll(rememberScrollState())
         ) {
             Avatar(
                 avatarData = user.getAvatarData(size = AvatarSize.RoomListManageUser),
@@ -234,6 +248,13 @@ private fun RoomMemberActionsBottomSheet(
                 modifier = Modifier
                     .padding(bottom = 24.dp)
                     .align(Alignment.CenterHorizontally)
+                    .clickable(enabled = user.avatarUrl != null && onAvatarClick != null) {
+                        coroutineScope.launch {
+                            bottomSheetState.hide()
+                            onAvatarClick?.invoke(user)
+                            onDismiss()
+                        }
+                    }
             )
             val bestName = user.getBestName()
             Text(
@@ -243,9 +264,23 @@ private fun RoomMemberActionsBottomSheet(
                 overflow = TextOverflow.Ellipsis,
                 textAlign = TextAlign.Center,
                 modifier = Modifier
-                    .padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
+                    .padding(start = 16.dp, end = 16.dp, bottom = 12.dp)
                     .fillMaxWidth()
             )
+            val userStatus = user.displayedStatus?.toText()
+            if (userStatus != null) {
+                Text(
+                    text = userStatus,
+                    style = ElementTheme.typography.fontBodyLgMedium,
+                    maxLines = 1,
+                    color = ElementTheme.colors.textSecondary,
+                    overflow = TextOverflow.Ellipsis,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier
+                        .padding(start = 16.dp, end = 16.dp, bottom = 12.dp)
+                        .fillMaxWidth()
+                )
+            }
             // Show user ID only if it's different from the display name
             if (bestName != user.userId.value) {
                 Text(
@@ -266,13 +301,12 @@ private fun RoomMemberActionsBottomSheet(
                 when (val action = actionState.action) {
                     is ModerationAction.DisplayProfile -> {
                         ListItem(
-                            style = ListItemStyle.Primary,
-                            headlineContent = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_member_user_info)) },
+                            content = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_member_user_info)) },
                             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserProfile())),
                             onClick = {
                                 coroutineScope.launch {
-                                    onSelectAction(action, user)
                                     bottomSheetState.hide()
+                                    onSelectAction(action, user)
                                 }
                             },
                             enabled = actionState.isEnabled
@@ -280,7 +314,7 @@ private fun RoomMemberActionsBottomSheet(
                     }
                     is ModerationAction.KickUser -> {
                         ListItem(
-                            headlineContent = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_remove)) },
+                            content = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_remove)) },
                             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Close())),
                             style = ListItemStyle.Destructive,
                             onClick = {
@@ -294,7 +328,7 @@ private fun RoomMemberActionsBottomSheet(
                     }
                     is ModerationAction.BanUser -> {
                         ListItem(
-                            headlineContent = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_ban)) },
+                            content = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_ban)) },
                             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
                             style = ListItemStyle.Destructive,
                             onClick = {
@@ -308,7 +342,7 @@ private fun RoomMemberActionsBottomSheet(
                     }
                     is ModerationAction.UnbanUser -> {
                         ListItem(
-                            headlineContent = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_unban)) },
+                            content = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_unban)) },
                             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Restart())),
                             style = ListItemStyle.Destructive,
                             onClick = {
@@ -329,16 +363,18 @@ private fun RoomMemberActionsBottomSheet(
 @PreviewsDayNight
 @Composable
 internal fun RoomMemberModerationViewPreview(@PreviewParameter(InternalRoomMemberModerationStateProvider::class) state: InternalRoomMemberModerationState) {
+    val isDoingAction = listOf(state.kickUserAsyncAction, state.banUserAsyncAction, state.unbanUserAsyncAction).any { it is AsyncAction.Loading }
+    val modifier = if (isDoingAction) {
+        Modifier.fillMaxWidth().heightIn(min = 64.dp)
+    } else {
+        Modifier.fillMaxSize()
+    }
     ElementPreview {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .heightIn(min = 64.dp)
-        ) {
+        Box(modifier) {
             RoomMemberModerationView(
                 state = state,
-                onSelectAction = { _, _ ->
-                },
+                onSelectAction = { _, _ -> },
+                onAvatarClick = {},
             )
         }
     }
diff --git a/features/roommembermoderation/impl/src/main/res/values-be/translations.xml b/features/roommembermoderation/impl/src/main/res/values-be/translations.xml
index b4b1f35f18..d6d5fc1b8e 100644
--- a/features/roommembermoderation/impl/src/main/res/values-be/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-be/translations.xml
@@ -7,7 +7,7 @@
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Блакіроўка %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Яны змогуць зноў далучыцца да гэтага пакоя, калі іх запросяць."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Прагляд профілю"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Выдаліць удзельніка з пакоя"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Выдаліць удзельніка"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Выдаліць удзельніка і забараніць далучацца ў будучыні?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Выдаленне %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Разблакіраваць"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-ca/translations.xml b/features/roommembermoderation/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..9495112c4e
--- /dev/null
+++ b/features/roommembermoderation/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_manage_room_member_ban">"Bandeja de la sala"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Bandeja"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"No podrà tornar a unir-se a aquesta sala encara que se\'l convidi."</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Segur que vols bandejar aquest membre?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_banning_user">"Bandejant %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Elimina"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Podran tornar a unir-se a aquesta sala si se\'ls convida."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Segur que vols eliminar aquest membre?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Veure perfil"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Elimina de la sala"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Vols eliminar l\'usuari i prohibir-li l\'accés en el futur?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"Eliminant %1$s…"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"Readmet usuari"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Desbandeja"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"Podrà tornar a unir-se a través d\'una invitació"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Segur que vols readmetre aquest membre?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Readmetent %1$s"</string>
+</resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml b/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml
index f17660f418..6ddb482189 100644
--- a/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-fa/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"در صورت دعوت می‌تواند دوباره به اتاق بپیوندد."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"مطمئنید می‌خواهید این عضو را بردارید؟"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"دیدن نمایه"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"برداشتن از اتاق"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"حذف کاربر"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"برداشتن عضو و تحریم پیوستن در آینده؟"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"برداشتن %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"تحریم نکردن از اتاق"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-in/translations.xml b/features/roommembermoderation/impl/src/main/res/values-in/translations.xml
index bddbdb0a67..43be3b018c 100644
--- a/features/roommembermoderation/impl/src/main/res/values-in/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-in/translations.xml
@@ -4,10 +4,12 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Cekal"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Mereka tidak akan dapat bergabung ke ruangan ini lagi jika diundang."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Apakah Anda yakin ingin mencekal anggota ini?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Mereka tidak akan dapat bergabung kembali ke space ini meskipun diundang, tetapi mereka tetap akan mempertahankan keanggotaan mereka di room atau subruang mana pun."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Mencekal %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Hapus"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Pengguna dapat bergabung ke ruangan ini lagi jika diundang."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Apakah Anda yakin ingin menghapus anggota ini?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Mereka akan dapat bergabung kembali ke Space ini jika diundang, dan mereka tetap akan mempertahankan keanggotaan mereka di room atau subruang mana pun."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Tampilkan profil"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Keluarkan dari ruangan"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Keluarkan pengguna dan cekal pengguna bergabung lagi di masa mendatang?"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-ja/translations.xml b/features/roommembermoderation/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..5ca793fd5a
--- /dev/null
+++ b/features/roommembermoderation/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_manage_room_member_ban">"ユーザーを追放"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"追放"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"招待されても再度参加することはできません。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"このメンバーを本当に追放しますか？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"招待されても再度参加することはできませんが、すべてのルームとスペースにおける権限を維持します。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_banning_user">"%1$s を追放中"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"削除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"招待を受け取ると再度参加できます。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"このメンバーを本当に削除しますか？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"すべてのルームとスペースにおける権限を維持し、招待によって再度参加することができます。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_member_user_info">"プロフィールを表示"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"ユーザーを削除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"メンバーを削除し、今後の参加を禁止しますか？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"%1$s を削除中…"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"ユーザーの追放を解除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"追放を解除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"招待によって再度参加することができます。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"このメンバーの追放を本当に解除しますか？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"%1$s の追放を解除中"</string>
+</resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-pl/translations.xml b/features/roommembermoderation/impl/src/main/res/values-pl/translations.xml
index 20246af787..40ea1f099a 100644
--- a/features/roommembermoderation/impl/src/main/res/values-pl/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-pl/translations.xml
@@ -4,12 +4,14 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Zbanuj"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nie będą mogli ponownie dołączyć do tego pokoju, jeśli zostaną zaproszeni."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Czy na pewno chcesz zbanować tego członka?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Nie będą mogli ponownie dołączyć do tej przestrzeni, nawet jeśli zostaną zaproszeni, zachowają jednak członkostwo w pokojach lub podprzestrzeniach."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Banowanie %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Usuń"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Będą mogli ponownie dołączyć do tego pokoju, jeśli zostaną zaproszeni."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Czy na pewno chcesz usunąć tego członka?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Będą mogli ponownie dołączyć do tej przestrzeni, jeśli zostaną zaproszeni, zachowując jednocześnie członkostwo w pokojach lub podprzestrzeniach."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Wyświetl profil"</string>
-  <string name="screen_bottom_sheet_manage_room_member_remove">"Usuń z pokoju"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Usuń użytkownika"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Usunąć członka i zablokować możliwość dołączenia w przyszłości?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Usuwanie %1$s…"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban">"Odbanuj z pokoju"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-uk/translations.xml b/features/roommembermoderation/impl/src/main/res/values-uk/translations.xml
index cd6dd40e55..0ddc115f7d 100644
--- a/features/roommembermoderation/impl/src/main/res/values-uk/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-uk/translations.xml
@@ -4,10 +4,12 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Заблокувати"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Він не зможе приєднатися до цієї кімнати знову, якщо його запросять."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Ви точно хочете заблокувати цього користувача?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"Вони не зможуть знову приєднатися до цього простору, навіть якщо їх запросять, але збережуть своє членство в будь-яких кімнатах або підпросторах."</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Блокування %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Вилучити"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Вони зможуть знову приєднатися до цієї кімнати, якщо їх запросять."</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Ви дійсно хочете вилучити цього учасника?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"Вони зможуть знову приєднатися до цього простору, якщо їх запросять, і збережуть своє членство в будь-яких кімнатах або підпросторах."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Переглянути профіль"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Вилучити користувача"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Вилучити учасника та заборонити приєднання в майбутньому?"</string>
diff --git a/features/roommembermoderation/impl/src/main/res/values-vi/translations.xml b/features/roommembermoderation/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..07d712cd4c
--- /dev/null
+++ b/features/roommembermoderation/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_manage_room_member_ban">"Cấm người dùng"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Cấm"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Họ sẽ không thể tham gia lại ngay cả khi được mời."</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Xác nhận cấm thành viên này?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_banning_user">"Đang cấm %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Họ có thể tham gia lại phòng này nếu được mời."</string>
+  <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Xem hồ sơ"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove">"Xóa người dùng"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Xóa thành viên và cấm tham gia trong tương lai?"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"Đang xóa %1$s…"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Bỏ cấm"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Đang gỡ cấm %1$s"</string>
+</resources>
diff --git a/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
index aa8b2e3df8..bfd456f130 100644
--- a/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
+++ b/features/roommembermoderation/impl/src/main/res/values-zh/translations.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_bottom_sheet_manage_room_member_ban">"移除并封禁成员"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban">"封禁用户"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"封禁"</string>
-  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"即使受到邀请，他们也无法再次加入聊天室。"</string>
-  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"您确定要封禁该成员吗？"</string>
-  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"即使再次受邀，他们也无法加入这个空间，但他们仍将保留其在任何房间或子空间的成员资格。"</string>
-  <string name="screen_bottom_sheet_manage_room_member_banning_user">"封禁 %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"他们即使受到邀请也无法再次加入房间。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"你确定要封禁该成员？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_from_space_confirmation_description">"即使再次被邀请，他们也无法加入此空间，但其在任何房间或子空间的成员资格仍然保留。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_banning_user">"正在封禁 %1$s"</string>
   <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"移除"</string>
-  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"如果受到邀请，他们可以重新加入聊天室。"</string>
-  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"您确定要移除此成员吗？"</string>
-  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"如果受到邀请，他们将能够再次加入这个空间，并且他们仍将保留其在任何房间或子空间的成员资格。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"如果他们受到邀请，则可以重新加入房间。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"你确定要移除此成员？"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_from_space_confirmation_description">"如果被邀请，他们将能够再次加入此空间，并且其在任何房间或子空间的成员资格仍然保留。"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"查看个人资料"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"移除用户"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"删除成员并禁止重新加入？"</string>
-  <string name="screen_bottom_sheet_manage_room_member_removing_user">"正在移除 %1$s……"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unban">"从房间取消解封"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"取消封禁"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"如果再次收到邀请，他们可以重新加入该聊天室"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"正在移除 %1$s…"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban">"解封用户"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"解封"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"如果他们受到邀请，则可以重新加入"</string>
   <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"确定要解除该成员的封禁吗？"</string>
-  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"解除封禁 %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"正在解除封禁 %1$s"</string>
 </resources>
diff --git a/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationViewTest.kt b/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationViewTest.kt
index 6508b28053..f99e517767 100644
--- a/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationViewTest.kt
+++ b/features/roommembermoderation/impl/src/test/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationViewTest.kt
@@ -6,39 +6,37 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.roommembermoderation.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.roommembermoderation.api.ModerationAction
 import io.element.android.features.roommembermoderation.api.ModerationActionState
 import io.element.android.features.roommembermoderation.api.RoomMemberModerationEvents
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.testtags.TestTags
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnceWithTwoParams
 import io.element.android.tests.testutils.pressTag
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class RoomMemberModerationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class RoomMemberModerationViewTest : RobolectricTest() {
     @Test
-    fun `clicking on display profile action calls onSelectAction`() {
+    fun `clicking on display profile action calls onSelectAction`() = runAndroidComposeUiTest {
         val user = anAlice()
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>(expectEvents = false)
         ensureCalledOnceWithTwoParams<ModerationAction, MatrixUser>(ModerationAction.DisplayProfile, user) { callback ->
-            rule.setRoomMemberModerationView(
+            setRoomMemberModerationView(
                 aRoomMembersModerationState(
                     selectedUser = user,
                     actions = listOf(
@@ -48,16 +46,18 @@ class RoomMemberModerationViewTest {
                 ),
                 onSelectAction = callback
             )
-            rule.clickOn(R.string.screen_bottom_sheet_manage_room_member_member_user_info)
+            clickOn(R.string.screen_bottom_sheet_manage_room_member_member_user_info)
+            // Gives time for bottomsheet to hide
+            mainClock.advanceTimeBy(1_000)
         }
     }
 
     @Test
-    fun `clicking on kick user action calls onSelectAction`() {
+    fun `clicking on kick user action calls onSelectAction`() = runAndroidComposeUiTest {
         val user = anAlice()
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>(expectEvents = false)
         ensureCalledOnceWithTwoParams<ModerationAction, MatrixUser>(ModerationAction.KickUser, user) { callback ->
-            rule.setRoomMemberModerationView(
+            setRoomMemberModerationView(
                 aRoomMembersModerationState(
                     selectedUser = user,
                     actions = listOf(
@@ -67,18 +67,18 @@ class RoomMemberModerationViewTest {
                 ),
                 onSelectAction = callback
             )
-            rule.clickOn(R.string.screen_bottom_sheet_manage_room_member_remove)
+            clickOn(R.string.screen_bottom_sheet_manage_room_member_remove)
             // Gives time for bottomsheet to hide
-            rule.mainClock.advanceTimeBy(1_000)
+            mainClock.advanceTimeBy(1_000)
         }
     }
 
     @Test
-    fun `clicking on ban user action calls onSelectAction`() {
+    fun `clicking on ban user action calls onSelectAction`() = runAndroidComposeUiTest {
         val user = anAlice()
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>(expectEvents = false)
         ensureCalledOnceWithTwoParams<ModerationAction, MatrixUser>(ModerationAction.BanUser, user) { callback ->
-            rule.setRoomMemberModerationView(
+            setRoomMemberModerationView(
                 aRoomMembersModerationState(
                     selectedUser = user,
                     actions = listOf(
@@ -88,18 +88,18 @@ class RoomMemberModerationViewTest {
                 ),
                 onSelectAction = callback
             )
-            rule.clickOn(R.string.screen_bottom_sheet_manage_room_member_ban)
+            clickOn(R.string.screen_bottom_sheet_manage_room_member_ban)
             // Gives time for bottomsheet to hide
-            rule.mainClock.advanceTimeBy(1_000)
+            mainClock.advanceTimeBy(1_000)
         }
     }
 
     @Test
-    fun `clicking on unban user action calls onSelectAction`() {
+    fun `clicking on unban user action calls onSelectAction`() = runAndroidComposeUiTest {
         val user = anAlice()
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>(expectEvents = false)
         ensureCalledOnceWithTwoParams<ModerationAction, MatrixUser>(ModerationAction.UnbanUser, user) { callback ->
-            rule.setRoomMemberModerationView(
+            setRoomMemberModerationView(
                 aRoomMembersModerationState(
                     selectedUser = user,
                     actions = listOf(
@@ -109,100 +109,100 @@ class RoomMemberModerationViewTest {
                 ),
                 onSelectAction = callback
             )
-            rule.clickOn(R.string.screen_bottom_sheet_manage_room_member_unban)
+            clickOn(R.string.screen_bottom_sheet_manage_room_member_unban)
             // Gives time for bottomsheet to hide
-            rule.mainClock.advanceTimeBy(1_000)
+            mainClock.advanceTimeBy(1_000)
         }
     }
 
     @Test
-    fun `clicking submit on kick confirmation dialog sends DoKickUser event`() {
+    fun `clicking submit on kick confirmation dialog sends DoKickUser event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 kickUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.DoKickUser(reason = ""))
     }
 
     @Test
-    fun `clicking dismiss on kick confirmation dialog sends Reset event`() {
+    fun `clicking dismiss on kick confirmation dialog sends Reset event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 kickUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogNegative.value)
+        pressTag(TestTags.dialogNegative.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.Reset)
     }
 
     @Test
-    fun `clicking submit on ban confirmation dialog sends DoBanUser event`() {
+    fun `clicking submit on ban confirmation dialog sends DoBanUser event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 banUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.DoBanUser(reason = ""))
     }
 
     @Test
-    fun `clicking dismiss on ban confirmation dialog sends Reset event`() {
+    fun `clicking dismiss on ban confirmation dialog sends Reset event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 banUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogNegative.value)
+        pressTag(TestTags.dialogNegative.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.Reset)
     }
 
     @Test
-    fun `clicking confirm on unban confirmation dialog sends DoUnbanUser event`() {
+    fun `clicking confirm on unban confirmation dialog sends DoUnbanUser event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogPositive.value)
+        pressTag(TestTags.dialogPositive.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.DoUnbanUser(""))
     }
 
     @Test
-    fun `clicking dismiss on unban confirmation dialog sends Reset event`() {
+    fun `clicking dismiss on unban confirmation dialog sends Reset event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>()
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressTag(TestTags.dialogNegative.value)
+        pressTag(TestTags.dialogNegative.value)
         eventsRecorder.assertSingle(InternalRoomMemberModerationEvents.Reset)
     }
 
     @Test
-    fun `disabled actions are not clickable`() {
+    fun `disabled actions are not clickable`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<RoomMemberModerationEvents>(expectEvents = false)
-        rule.setRoomMemberModerationView(
+        setRoomMemberModerationView(
             aRoomMembersModerationState(
                 selectedUser = anAlice(),
                 actions = listOf(
@@ -211,18 +211,20 @@ class RoomMemberModerationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_bottom_sheet_manage_room_member_remove)
+        clickOn(R.string.screen_bottom_sheet_manage_room_member_remove)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomMemberModerationView(
+private fun AndroidComposeUiTest<ComponentActivity>.setRoomMemberModerationView(
     state: InternalRoomMemberModerationState,
     onSelectAction: (ModerationAction, MatrixUser) -> Unit = EnsureNeverCalledWithTwoParams(),
+    onAvatarClick: ((MatrixUser) -> Unit)? = EnsureNeverCalledWithParam(),
 ) {
     setSafeContent {
         RoomMemberModerationView(
             state = state,
             onSelectAction = onSelectAction,
+            onAvatarClick = onAvatarClick,
         )
     }
 }
diff --git a/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupSetupEntryPoint.kt b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupSetupEntryPoint.kt
new file mode 100644
index 0000000000..f674dac690
--- /dev/null
+++ b/features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupSetupEntryPoint.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securebackup.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.NodeInputs
+
+interface SecureBackupSetupEntryPoint : FeatureEntryPoint {
+    data class Inputs(val isChangeRecoveryKeyUserStory: Boolean) : NodeInputs
+
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: Inputs,
+    ): Node
+}
diff --git a/features/securebackup/impl/build.gradle.kts b/features/securebackup/impl/build.gradle.kts
index b6117271f7..54d87ef22e 100644
--- a/features/securebackup/impl/build.gradle.kts
+++ b/features/securebackup/impl/build.gradle.kts
@@ -28,13 +28,14 @@ setupDependencyInjection()
 
 dependencies {
     implementation(projects.appconfig)
+    implementation(projects.features.enterprise.api)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.oidc.api)
+    implementation(projects.libraries.oauth.api)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.testtags)
     api(libs.statemachine)
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPoint.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPoint.kt
new file mode 100644
index 0000000000..29465b1be1
--- /dev/null
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPoint.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securebackup.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.securebackup.api.SecureBackupSetupEntryPoint
+import io.element.android.features.securebackup.impl.setup.SecureBackupSetupNode
+import io.element.android.libraries.architecture.createNode
+
+@ContributesBinding(AppScope::class)
+class DefaultSecureBackupSetupEntryPoint : SecureBackupSetupEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: SecureBackupSetupEntryPoint.Inputs,
+    ): Node {
+        return parentNode.createNode<SecureBackupSetupNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                SecureBackupSetupNode.Inputs(
+                    isChangeRecoveryKeyUserStory = inputs.isChangeRecoveryKeyUserStory,
+                )
+            ),
+        )
+    }
+}
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
index d9fd8a1785..035e47d1c7 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
@@ -21,11 +21,11 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
+import io.element.android.features.securebackup.api.SecureBackupSetupEntryPoint
 import io.element.android.features.securebackup.impl.disable.SecureBackupDisableNode
 import io.element.android.features.securebackup.impl.enter.SecureBackupEnterRecoveryKeyNode
 import io.element.android.features.securebackup.impl.reset.ResetIdentityFlowNode
 import io.element.android.features.securebackup.impl.root.SecureBackupRootNode
-import io.element.android.features.securebackup.impl.setup.SecureBackupSetupNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.canPop
@@ -39,6 +39,7 @@ import kotlinx.parcelize.Parcelize
 class SecureBackupFlowNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    private val secureBackupSetupEntryPoint: SecureBackupSetupEntryPoint,
 ) : BaseFlowNode<SecureBackupFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = when (plugins.filterIsInstance<SecureBackupEntryPoint.Params>().first().initialElement) {
@@ -97,16 +98,18 @@ class SecureBackupFlowNode(
                 createNode<SecureBackupRootNode>(buildContext, listOf(callback))
             }
             NavTarget.Setup -> {
-                val inputs = SecureBackupSetupNode.Inputs(
-                    isChangeRecoveryKeyUserStory = false,
+                secureBackupSetupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = SecureBackupSetupEntryPoint.Inputs(isChangeRecoveryKeyUserStory = false),
                 )
-                createNode<SecureBackupSetupNode>(buildContext, listOf(inputs))
             }
             NavTarget.Change -> {
-                val inputs = SecureBackupSetupNode.Inputs(
-                    isChangeRecoveryKeyUserStory = true,
+                secureBackupSetupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = SecureBackupSetupEntryPoint.Inputs(isChangeRecoveryKeyUserStory = true),
                 )
-                createNode<SecureBackupSetupNode>(buildContext, listOf(inputs))
             }
             NavTarget.Disable -> {
                 createNode<SecureBackupDisableNode>(buildContext)
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
index 8b2bc4dc90..34fca33e96 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
@@ -9,22 +9,10 @@
 package io.element.android.features.securebackup.impl.enter
 
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.isImeVisible
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.relocation.BringIntoViewRequester
-import androidx.compose.foundation.relocation.bringIntoViewRequester
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -34,13 +22,11 @@ import io.element.android.features.securebackup.impl.setup.views.RecoveryKeyView
 import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.modifiers.bringIntoViewOnImeVisible
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
 fun SecureBackupEnterRecoveryKeyView(
@@ -71,29 +57,13 @@ fun SecureBackupEnterRecoveryKeyView(
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun Content(
     state: SecureBackupEnterRecoveryKeyState,
 ) {
-    val bringIntoViewRequester = remember { BringIntoViewRequester() }
-    var isFocused by remember { mutableStateOf(false) }
-    val isImeVisible = WindowInsets.isImeVisible
-    val coroutineScope = rememberCoroutineScope()
-    LaunchedEffect(isImeVisible, isFocused) {
-        // When the keyboard is shown, we want to scroll the text field into view
-        if (isImeVisible && isFocused) {
-            coroutineScope.launch {
-                // Delay to ensure the keyboard is fully shown
-                delay(100.milliseconds)
-                bringIntoViewRequester.bringIntoView()
-            }
-        }
-    }
     RecoveryKeyView(
         modifier = Modifier
-            .onFocusChanged { isFocused = it.isFocused }
-            .bringIntoViewRequester(bringIntoViewRequester)
+            .bringIntoViewOnImeVisible()
             .padding(top = 52.dp, bottom = 32.dp),
         state = state.recoveryKeyViewState,
         onClick = null,
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt
index c4a007f1d5..7dd6bf632a 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt
@@ -25,6 +25,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.securebackup.impl.reset.password.ResetIdentityPasswordNode
 import io.element.android.features.securebackup.impl.reset.root.ResetIdentityRootNode
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
@@ -36,7 +37,7 @@ import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
-import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle
+import io.element.android.libraries.matrix.api.encryption.IdentityOAuthResetHandle
 import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -53,6 +54,7 @@ class ResetIdentityFlowNode(
     private val resetIdentityFlowManager: ResetIdentityFlowManager,
     @SessionCoroutineScope
     private val sessionCoroutineScope: CoroutineScope,
+    private val sessionEnterpriseService: SessionEnterpriseService,
 ) : BaseFlowNode<ResetIdentityFlowNode.NavTarget>(
     backstack = BackStack(initialElement = NavTarget.Root, savedStateMap = buildContext.savedStateMap),
     buildContext = buildContext,
@@ -123,12 +125,13 @@ class ResetIdentityFlowNode(
                     null -> {
                         Timber.d("No reset handle return, the reset is done.")
                     }
-                    is IdentityOidcResetHandle -> {
+                    is IdentityOAuthResetHandle -> {
                         Timber.d("Launching reset confirmation in MAS")
-                        activity.openUrlInChromeCustomTab(null, darkTheme, handle.url)
-                        Timber.d("Starting resetOidc")
-                        resetJob = launch { handle.resetOidc() }
-                        resetJob?.invokeOnCompletion { Timber.d("resetOidc ended") }
+                        val url = sessionEnterpriseService.tweakMasUrl(handle.url)
+                        activity.openUrlInChromeCustomTab(null, darkTheme, url)
+                        Timber.d("Starting resetOAuth")
+                        resetJob = launch { handle.resetOAuth() }
+                        resetJob?.invokeOnCompletion { Timber.d("resetOAuth ended") }
                     }
                     is IdentityPasswordResetHandle -> backstack.push(NavTarget.ResetPassword)
                 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt
index 8d32433ac5..3bb77ac206 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt
@@ -8,8 +8,6 @@
 
 package io.element.android.features.securebackup.impl.reset.password
 
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -32,7 +30,7 @@ import io.element.android.libraries.designsystem.modifiers.onTabOrEnterKeyFocusN
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
-import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.PasswordVisibilityToggle
 import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TextFieldValidity
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -92,14 +90,10 @@ private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Bool
         singleLine = true,
         visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
         trailingIcon = {
-            val image =
-                if (showPassword) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff()
-            val description =
-                if (showPassword) stringResource(CommonStrings.a11y_hide_password) else stringResource(CommonStrings.a11y_show_password)
-
-            Box(Modifier.clickable { showPassword = !showPassword }) {
-                Icon(imageVector = image, description)
-            }
+            PasswordVisibilityToggle(
+                visible = showPassword,
+                onToggle = { showPassword = !showPassword },
+            )
         },
         validity = if (hasError) TextFieldValidity.Invalid else TextFieldValidity.None,
         supportingText = if (hasError) {
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt
index 97c82f446d..7ac8dbe4cf 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt
@@ -22,11 +22,11 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.securebackup.impl.R
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.atomic.pages.FlowStepPage
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
@@ -79,10 +79,10 @@ private fun Content() {
         modifier = Modifier.padding(top = 8.dp, bottom = 40.dp),
         verticalArrangement = Arrangement.spacedBy(24.dp),
     ) {
-        InfoListOrganism(
+        VisualList(
             modifier = Modifier.fillMaxWidth(),
             items = persistentListOf(
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_encryption_reset_bullet_1),
                     iconComposable = {
                         Icon(
@@ -93,7 +93,7 @@ private fun Content() {
                         )
                     },
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_encryption_reset_bullet_2),
                     iconComposable = {
                         Icon(
@@ -104,7 +104,7 @@ private fun Content() {
                         )
                     },
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(R.string.screen_encryption_reset_bullet_3),
                     iconComposable = {
                         Icon(
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
index 0aff81aafa..626a162152 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
@@ -55,7 +55,7 @@ fun SecureBackupRootView(
         snackbarHost = { SnackbarHost(snackbarHostState) },
     ) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = stringResource(id = R.string.screen_chat_backup_key_backup_title),
                 )
@@ -76,7 +76,7 @@ fun SecureBackupRootView(
 
         // Disable / Enable key storage
         ListItem(
-            headlineContent = {
+            content = {
                 Text(
                     text = stringResource(id = R.string.screen_chat_backup_key_storage_toggle_title),
                 )
@@ -137,7 +137,7 @@ fun SecureBackupRootView(
             RecoveryState.WAITING_FOR_SYNC -> Unit
             RecoveryState.DISABLED -> {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = stringResource(id = R.string.screen_chat_backup_recovery_action_setup),
                         )
@@ -161,7 +161,7 @@ fun SecureBackupRootView(
             }
             RecoveryState.ENABLED -> {
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = stringResource(id = R.string.screen_chat_backup_recovery_action_change),
                         )
@@ -184,7 +184,7 @@ fun SecureBackupRootView(
             }
             RecoveryState.INCOMPLETE ->
                 ListItem(
-                    headlineContent = {
+                    content = {
                         Text(
                             text = stringResource(id = R.string.screen_chat_backup_recovery_action_confirm),
                         )
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt
index 198891473c..8055709f20 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt
@@ -9,7 +9,6 @@
 package io.element.android.features.securebackup.impl.setup.views
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -50,6 +49,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.PasswordVisibilityToggle
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.testtags.TestTags
@@ -223,16 +223,10 @@ private fun RecoveryKeyFormContent(
         ),
         placeholder = stringResource(id = R.string.screen_recovery_key_confirm_key_placeholder),
         trailingIcon = {
-            val image =
-                if (state.displayTextFieldContents) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff()
-            val description =
-                if (state.displayTextFieldContents) stringResource(CommonStrings.a11y_hide_password) else stringResource(CommonStrings.a11y_show_password)
-            Box(Modifier.clickable { toggleRecoveryKeyVisibility(!state.displayTextFieldContents) }) {
-                Icon(
-                    imageVector = image,
-                    contentDescription = description,
-                )
-            }
+            PasswordVisibilityToggle(
+                visible = state.displayTextFieldContents,
+                onToggle = { toggleRecoveryKeyVisibility(!state.displayTextFieldContents) },
+            )
         },
     )
 }
diff --git a/features/securebackup/impl/src/main/res/values-ca/translations.xml b/features/securebackup/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..0ca99788ed
--- /dev/null
+++ b/features/securebackup/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_chat_backup_key_backup_action_disable">"Elimina l\'emmagatzematge de claus"</string>
+  <string name="screen_chat_backup_key_backup_action_enable">"Activa còpia de seguretat"</string>
+  <string name="screen_chat_backup_key_backup_description">"Emmagatzema la teva identitat criptogràfica i les claus de missatge de forma segura al servidor. Això et permetrà veure l\'historial de missatges en qualsevol dispositiu nou. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_title">"Emmagatzematge de claus"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"L\'emmagatzematge de claus ha d\'estar activat per poder configurar la recuperació."</string>
+  <string name="screen_chat_backup_key_storage_toggle_description">"Puja claus des d\'aquest dispositiu"</string>
+  <string name="screen_chat_backup_key_storage_toggle_title">"Permet l\'emmagatzematge de claus"</string>
+  <string name="screen_chat_backup_recovery_action_change">"Canvia la clau de recuperació"</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Recupera la teva identitat criptogràfica i l\'historial de missatges amb una clau de recuperació si has perdut tots els teus dispositius existents."</string>
+  <string name="screen_chat_backup_recovery_action_confirm">"Introdueix clau de recuperació"</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"L\'emmagatzematge de claus no està sincronitzat."</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Configura la recuperació"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Obre %1$s a un dispositiu d\'escriptori"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Torna a iniciar sessió"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Quan se\'t demani verificar el dispositiu, selecciona %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Restableix-ho tot”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Segueix les instruccions per crear una nova clau de recuperació"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Desa la nova clau de recuperació en un gestor de contrasenyes o en una nota xifrada"</string>
+  <string name="screen_create_new_recovery_key_title">"Restableix el xifrat del teu compte mitjançant un altre dispositiu"</string>
+  <string name="screen_encryption_reset_action_continue_reset">"Continua el restabliment"</string>
+  <string name="screen_encryption_reset_bullet_1">"Es conservaran les dades del compte, contactes, preferències i les llistes de xats."</string>
+  <string name="screen_encryption_reset_bullet_2">"Perdràs tots els missatges que estiguin desats únicament al servidor."</string>
+  <string name="screen_encryption_reset_bullet_3">"Hauràs de tornar a verificar tots els teus dispositius i contactes existents."</string>
+  <string name="screen_encryption_reset_footer">"Només restableix la teva identitat si no tens accés a cap altre dispositiu on tinguis la sessió iniciada i has perdut la clau de recuperació."</string>
+  <string name="screen_encryption_reset_title">"Si no pots confirmar la teva identitat, hauràs de restablir-la."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Desactiva"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Perdràs els missatges xifrats si tanques sessió en tots els dispositius."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Segur que vols desactivar la còpia de seguretat?"</string>
+  <string name="screen_key_backup_disable_description">"Si elimines l\'emmagatzematge de claus, s\'eliminarà la teva identitat criptogràfica i les claus de missatge del servidor i es desactivaran les funcions de seguretat següents:"</string>
+  <string name="screen_key_backup_disable_description_point_1">"No tindràs l\'historial de missatges xifrats als dispositius nous"</string>
+  <string name="screen_key_backup_disable_description_point_2">"Perdràs l\'accés als teus missatges xifrats si tanques la sessió d\'%1$s a tot arreu"</string>
+  <string name="screen_key_backup_disable_title">"Estàs segur que vols desactivar l\'emmagatzematge de claus i eliminar-lo?"</string>
+  <string name="screen_recovery_key_change_description">"Obté una nova clau de recuperació si has perdut la que tens. Després de canviar la clau de recuperació, l\'antiga deixarà de funcionar."</string>
+  <string name="screen_recovery_key_change_generate_key">"Genera una nova clau de recuperació"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"No ho comparteixis amb ningú!"</string>
+  <string name="screen_recovery_key_change_success">"Clau de recuperació canviada"</string>
+  <string name="screen_recovery_key_change_title">"Vols canviar la clau de recuperació?"</string>
+  <string name="screen_recovery_key_confirm_create_new_recovery_key">"Crea nova clau de recuperació"</string>
+  <string name="screen_recovery_key_confirm_description">"Assegura\'t que ningú vegi aquesta pantalla!"</string>
+  <string name="screen_recovery_key_confirm_error_content">"Torna a provar l\'accés a l\'emmagatzematge de claus."</string>
+  <string name="screen_recovery_key_confirm_error_title">"Clau de recuperació incorrecta"</string>
+  <string name="screen_recovery_key_confirm_key_description">"Si tens una clau de seguretat o una frase de seguretat, també funcionaran."</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"Introdueix…"</string>
+  <string name="screen_recovery_key_confirm_lost_recovery_key">"Has perdut la clau de recuperació?"</string>
+  <string name="screen_recovery_key_confirm_success">"Clau de recuperació confirmada"</string>
+  <string name="screen_recovery_key_confirm_title">"Introdueix clau de recuperació"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Clau de recuperació copiada"</string>
+  <string name="screen_recovery_key_generating_key">"Generant…"</string>
+  <string name="screen_recovery_key_save_action">"Desa clau de recuperació"</string>
+  <string name="screen_recovery_key_save_description">"Anota aquesta clau de recuperació en un lloc segur, com ara un gestor de contrasenyes, una nota xifrada o una caixa forta física."</string>
+  <string name="screen_recovery_key_save_key_description">"Toca per copiar la clau de recuperació"</string>
+  <string name="screen_recovery_key_save_title">"Desa la clau de recuperació en un lloc segur"</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"Després d\'aquest pas, no podràs accedir a la nova clau de recuperació."</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"Has desat la clau de recuperació?"</string>
+  <string name="screen_recovery_key_setup_description">"L\'emmagatzematge de claus està protegit amb una clau de recuperació. Si necessites una nova clau de recuperació després d\'haver establerta, pots tornar-la a crear seleccionant ‘Canvia clau de recuperació’."</string>
+  <string name="screen_recovery_key_setup_generate_key">"Genera clau de recuperació"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"No ho comparteixis amb ningú!"</string>
+  <string name="screen_recovery_key_setup_success">"Configuració de recuperació correcta"</string>
+  <string name="screen_recovery_key_setup_title">"Configura la recuperació"</string>
+  <string name="screen_reset_encryption_confirmation_alert_action">"Sí, restableix ara"</string>
+  <string name="screen_reset_encryption_confirmation_alert_subtitle">"Aquest procés és irreversible."</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Segur que vols restablir la teva identitat?"</string>
+  <string name="screen_reset_encryption_password_error">"S\'ha produït un error desconegut. Comprova la contrasenya del compte i torna-ho a provar."</string>
+  <string name="screen_reset_encryption_password_placeholder">"Introdueix…"</string>
+  <string name="screen_reset_encryption_password_subtitle">"Confirma que vols restablir la teva identitat."</string>
+  <string name="screen_reset_encryption_password_title">"Introdueix la contrasenya del compte per continuar"</string>
+</resources>
diff --git a/features/securebackup/impl/src/main/res/values-cs/translations.xml b/features/securebackup/impl/src/main/res/values-cs/translations.xml
index 3669da34ee..171900cede 100644
--- a/features/securebackup/impl/src/main/res/values-cs/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-cs/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Vypnout zálohování"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Zapnout zálohování"</string>
-  <string name="screen_chat_backup_key_backup_description">"Bezpečně uložte svou kryptografickou identitu a klíče zpráv na serveru. To vám umožní zobrazit historii zpráv na všech nových zařízeních. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"To vám umožní zobrazit historii chatu na všech nových zařízeních a je to nutné pro zálohování chatů a digitální identity. %1$s ."</string>
   <string name="screen_chat_backup_key_backup_title">"Úložiště klíčů"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Pro nastavení obnovení musí být zapnuto úložiště klíčů."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Pro zálohování chatů musí být zapnuto ukládání klíčů."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Nahrát klíče z tohoto zařízení"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Povolit ukládání klíčů"</string>
   <string name="screen_chat_backup_recovery_action_change">"Změnit klíč pro obnovení"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Obnovte svou kryptografickou identitu a historii zpráv pomocí klíče pro obnovení, pokud jste ztratili všechna stávající zařízení."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Vaše chaty jsou automaticky zálohovány pomocí koncového šifrování. Chcete-li tuto zálohu obnovit a zachovat si svou digitální identitu v případě, že ztratíte přístup ke všem svým zařízením, budete potřebovat svůj klíč pro obnovení."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Zadejte klíč pro obnovení"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaše úložiště klíčů je momentálně nesynchronizované."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Nastavení obnovy"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Získat klíč pro obnovení"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Vaše chaty jsou automaticky zálohovány pomocí koncového šifrování. Chcete-li tuto zálohu obnovit a zachovat si svou digitální identitu v případě, že ztratíte přístup ke všem svým zařízením, budete potřebovat svůj klíč pro obnovení."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Otevřít %1$s na stolním počítači"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Znovu se přihlaste ke svému účtu"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Když budete vyzváni k ověření vašeho zařízení, vyberte %1$s"</string>
@@ -23,12 +24,12 @@
   <string name="screen_encryption_reset_bullet_1">"Podrobnosti o vašem účtu, kontaktech, preferencích a seznamu chatu budou zachovány"</string>
   <string name="screen_encryption_reset_bullet_2">"Ztratíte svou stávající historii zpráv"</string>
   <string name="screen_encryption_reset_bullet_3">"Budete muset znovu ověřit všechna stávající zařízení a kontakty"</string>
-  <string name="screen_encryption_reset_footer">"Obnovte svou identitu pouze v případě, že nemáte přístup k jinému přihlášenému zařízení a ztratili jste klíč pro obnovení."</string>
-  <string name="screen_encryption_reset_title">"Obnovte svou identitu v případě, že nemůžete potvrdit jiným způsobem"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Vypnout"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Pokud se odhlásíte ze všech zařízení, přijdete o zašifrované zprávy."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Opravdu chcete vypnout zálohování?"</string>
-  <string name="screen_key_backup_disable_description">"Vypnutím zálohování odstraníte zálohu aktuálního šifrovacího klíče a vypnete další bezpečnostní funkce. V tomto případě budete:"</string>
+  <string name="screen_encryption_reset_footer">"Digitální identitu resetujte pouze v případě, že nemáte přístup k jinému ověřenému zařízení a nemáte klíč pro obnovení."</string>
+  <string name="screen_encryption_reset_title">"Nelze potvrdit? Budete muset resetovat svou digitální identitu."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Smazat"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Pokud odeberete všechna zařízení, ztratíte svou šifrovanou historii chatu a budete muset resetovat svou digitální identitu."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Opravdu chcete smazat úložiště klíčů?"</string>
+  <string name="screen_key_backup_disable_description">"Smazáním úložiště klíčů odstraníte ze serveru klíče digitální identity a zpráv a vypnete následující bezpečnostní funkce:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Nemít v nových zařízeních šifrovanou historii zpráv"</string>
   <string name="screen_key_backup_disable_description_point_2">"Ztratíte přístup k šifrovaným zprávám, pokud jste všude odhlášeni z %1$s"</string>
   <string name="screen_key_backup_disable_title">"Opravdu chcete vypnout zálohování?"</string>
@@ -58,12 +59,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Vygenerovat klíč pro obnovení"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Toto s nikým nesdílejte!"</string>
   <string name="screen_recovery_key_setup_success">"Nastavení obnovení bylo úspěšné"</string>
-  <string name="screen_recovery_key_setup_title">"Nastavení obnovy"</string>
+  <string name="screen_recovery_key_setup_title">"Získat klíč pro obnovení"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ano, resetovat nyní"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Tento proces je nevratný."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Opravdu chcete obnovit svou identitu?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Opravdu chcete resetovat svou digitální identitu?"</string>
   <string name="screen_reset_encryption_password_error">"Došlo k neznámé chybě. Zkontrolujte, zda je heslo k účtu správné a zkuste to znovu."</string>
   <string name="screen_reset_encryption_password_placeholder">"Zadejte…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Potvrďte, že chcete obnovit svou identitu."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Potvrďte, že chcete resetovat svou digitální identitu."</string>
   <string name="screen_reset_encryption_password_title">"Pro pokračování zadejte heslo k účtu"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-da/translations.xml b/features/securebackup/impl/src/main/res/values-da/translations.xml
index 93b949bfb6..941b7fc480 100644
--- a/features/securebackup/impl/src/main/res/values-da/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-da/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Slet nøglelager"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Aktivér sikkerhedskopiering"</string>
-  <string name="screen_chat_backup_key_backup_description">"Gem din kryptografiske identitet og meddelelsesnøgler sikkert på serveren. Dette giver dig mulighed for at se din meddelelseshistorik på alle nye enheder. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Dette giver dig mulighed for at se din chathistorik på alle nye enheder og er påkrævet til sikkerhedskopiering af chats og digital identitet.%1$s ."</string>
   <string name="screen_chat_backup_key_backup_title">"Nøgleopbevaring"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Nøglelagring skal være slået til for at konfigurere gendannelse."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Nøglelagring skal være slået til for at konfigurere gendannelse af dine samtaler."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Upload nøgler fra denne enhed"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Tillad lagring af nøgler"</string>
   <string name="screen_chat_backup_recovery_action_change">"Skift gendannelsesnøgle"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Gendan din kryptografiske identitet og beskedhistorik med en gendannelsesnøgle, hvis du har mistet alle dine eksisterende enheder."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Dine samtaler sikkerhedskopieres automatisk med end-to-end-kryptering. For at kunne gendanne denne sikkerhedskopi og bevare din digitale identitet, hvis du mister adgang til alle dine enheder, får du brug for din gendannelsesnøgle."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Indtast gendannelsesnøgle"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Din nøglelagring er i øjeblikket ikke synkroniseret."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Opsæt gendannelse"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Hent gendannelsesnøgle"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Dine chats sikkerhedskopieres automatisk med end-to-end-kryptering. For at kunne gendanne denne sikkerhedskopi og bevare din digitale identitet, hvis du mister adgang til alle dine enheder, får du brug for din gendannelsesnøgle."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Åbn %1$s på en stationær enhed"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Log ind på din konto igen"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Når du bliver bedt om at verificere din enhed, skal du vælge %1$s"</string>
@@ -23,12 +24,12 @@
   <string name="screen_encryption_reset_bullet_1">"Dine kontodetaljer, kontakter, personlige indstilliger og samtaler vil blive gemt"</string>
   <string name="screen_encryption_reset_bullet_2">"Du mister al beskedhistorik, der kun er gemt på serveren."</string>
   <string name="screen_encryption_reset_bullet_3">"Du bliver nødt til at verificere alle dine eksisterende enheder og kontakter påny"</string>
-  <string name="screen_encryption_reset_footer">"Nulstil kun din identitet, hvis du ikke har adgang til en anden enhed, der er logget ind, og du har mistet din gendannelsesnøgle."</string>
-  <string name="screen_encryption_reset_title">"Kan du ikke bekræfte? Du skal nulstille din identitet."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Slå fra"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Du mister dine krypterede meddelelser, hvis du er logget ud af alle enheder."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Er du sikker på, at du vil slå sikkerhedskopiering fra?"</string>
-  <string name="screen_key_backup_disable_description">"Hvis du sletter nøglelageret, fjernes din kryptografiske identitet og meddelelsesnøgler fra serveren og følgende sikkerhedsfunktioner deaktiveres:"</string>
+  <string name="screen_encryption_reset_footer">"Nulstil kun din digitale identitet, hvis du ikke har adgang til en anden enhed, der er logget ind, og du har mistet din gendannelsesnøgle."</string>
+  <string name="screen_encryption_reset_title">"Kan du ikke bekræfte? Du er nødt til at nulstille din digitale identitet."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Slet"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Du mister din krypterede chathistorik og skal nulstille din digitale identitet, hvis du fjerner alle dine enheder."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Er du sikker på, at du vil slette nøglelageret?"</string>
+  <string name="screen_key_backup_disable_description">"Hvis du sletter nøglelageret, fjernes din kryptografiske identitet og beskednøgler fra serveren og følgende sikkerhedsfunktioner deaktiveres:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Du vil ikke kunne se historikken for krypterede beskeder på nye enheder"</string>
   <string name="screen_key_backup_disable_description_point_2">"Du mister adgangen til dine krypterede meddelelser, hvis du er logget ud %1$s overalt"</string>
   <string name="screen_key_backup_disable_title">"Er du sikker på, at du vil deaktivere nøglelagring og slette lageret?"</string>
@@ -58,12 +59,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Generer din gendannelsesnøgle"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Del ikke dette med nogen!"</string>
   <string name="screen_recovery_key_setup_success">"Opsætning af gendannelse lykkedes"</string>
-  <string name="screen_recovery_key_setup_title">"Opsæt gendannelse"</string>
+  <string name="screen_recovery_key_setup_title">"Hent gendannelsesnøgle"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ja, nulstil nu"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Denne proces er irreversibel."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Er du sikker på, at du ønsker at nulstille din identitet?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Er du sikker på, at du vil nulstille din digitale identitet?"</string>
   <string name="screen_reset_encryption_password_error">"Der opstod en ukendt fejl. Kontroller, at adgangskoden til din konto er korrekt, og prøv igen."</string>
   <string name="screen_reset_encryption_password_placeholder">"Indtast…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Bekræft, at du ønsker at nulstille din identitet."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Bekræft, at du ønsker at nulstille din digitale identitet."</string>
   <string name="screen_reset_encryption_password_title">"Indtast adgangskoden til din konto for at fortsætte"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-de/translations.xml b/features/securebackup/impl/src/main/res/values-de/translations.xml
index 84140d4da0..d53086a6d1 100644
--- a/features/securebackup/impl/src/main/res/values-de/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-de/translations.xml
@@ -2,16 +2,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Backup deaktivieren"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Backup aktivieren"</string>
-  <string name="screen_chat_backup_key_backup_description">"Speichere deine kryptographische Identität und die Nachrichtenschlüssel auf dem Server. Auf diese Weise kannst du deinen Nachrichtenverlauf auf neuen Geräten einsehen. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Dadurch kannst du deinen Chatverlauf auf allen neuen Geräten einsehen. Er ist außerdem für die Sicherung von Chats und deiner digitalen Identität erforderlich. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Schlüsselspeicher"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Der Schlüsselspeicher muss aktiviert sein, um Datenwiederherstellung zu ermöglichen."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Die Schlüsselspeicherung muss aktiviert sein, damit deine Chats gesichert werden können."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Schlüssel von diesem Gerät hochladen"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Schlüsselspeicherung zulassen"</string>
   <string name="screen_chat_backup_recovery_action_change">"Wiederherstellungsschlüssel ändern"</string>
   <string name="screen_chat_backup_recovery_action_change_description">"Stelle deine kryptographische Identität und deinen Nachrichtenverlauf mit einem Wiederherstellungsschlüssel wieder her, falls du deine Geräte verloren hast."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Wiederherstellungsschlüssel eingeben"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Dein Schlüssel ist derzeit nicht synchronisiert."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Wiederherstellung einrichten"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Wiederherstellungsschlüssel einrichten"</string>
   <string name="screen_create_new_recovery_key_list_item_1">
     "Öffne "
     <b>"%1$s"</b>
@@ -32,12 +32,12 @@
   <string name="screen_encryption_reset_bullet_1">"Deine Kontodaten, Kontakte, Einstellungen und die Liste der Chats bleiben erhalten"</string>
   <string name="screen_encryption_reset_bullet_2">"Du verlierst alle bisherigen Nachrichten, wenn sie ausschließlich auf dem Server gespeichert sein sollten."</string>
   <string name="screen_encryption_reset_bullet_3">"Du musst alle deine bestehenden Geräte und Kontakte erneut verifizieren."</string>
-  <string name="screen_encryption_reset_footer">"Setze deine Identität nur dann zurück, wenn du keinen Zugriff mehr auf ein anderes angemeldetes Gerät hast und auch deinen Wiederherstellungsschlüssel verloren hast."</string>
-  <string name="screen_encryption_reset_title">"Bestätigung unmöglich? Dann musst du deine Identität zurücksetzen."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Ausschalten"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Du verlierst deine verschlüsselten Nachrichten, wenn du auf allen Geräten abgemeldet bist."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Bist du sicher, dass du das Backup deaktivieren willst?"</string>
-  <string name="screen_key_backup_disable_description">"Das Löschen des Schlüsselspeichers entfernt deine kryptografische Identität und deine Nachrichtenschlüssel vom Server. Die folgenden Sicherheitsfunktionen werden deaktiviert:"</string>
+  <string name="screen_encryption_reset_footer">"Setze deine digitale Identität nur dann zurück, wenn du keinen Zugriff auf ein anderes verifiziertes Gerät hast und deinen Wiederherstellungsschlüssel verloren hast."</string>
+  <string name="screen_encryption_reset_title">"Bestätigung nicht möglich? Setze deine digitale Identität zurück."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Löschen"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Wenn du alle deine Geräte entfernst, gehen deine verschlüsselten Chatverläufe verloren und du musst deine digitale Identität zurücksetzen."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Bist du sicher, dass du den Schlüsselspeicher löschen möchtest?"</string>
+  <string name="screen_key_backup_disable_description">"Durch das Löschen des Schlüsselspeichers werden deine digitale Identität und deine Nachrichtenschlüssel vom Server entfernt und die folgenden Sicherheitsfunktionen deaktiviert:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Kein Nachrichtenverlauf für verschlüsselte Nachrichten auf neuen Geräten"</string>
   <string name="screen_key_backup_disable_description_point_2">"Kein Zugriff auf verschlüsselten Nachrichten, wenn du überall von %1$s abgemeldet bist"</string>
   <string name="screen_key_backup_disable_title">"Möchtest du die Speicherung der Schlüssel wirklich deaktivieren und entfernen?"</string>
@@ -67,12 +67,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Wiederherstellungsschlüssel erstellen"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Teile das mit niemandem!"</string>
   <string name="screen_recovery_key_setup_success">"Einrichtung der Wiederherstellung erfolgreich"</string>
-  <string name="screen_recovery_key_setup_title">"Wiederherstellung einrichten"</string>
+  <string name="screen_recovery_key_setup_title">"Wiederherstellungsschlüssel einrichten"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ja, zurücksetzen"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Das Zurücksetzen kann nicht rückgängig gemacht werden."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Bist du sicher, dass du deine Identität zurücksetzen möchtest?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Bist du sicher, dass du deine digitale Identität zurücksetzen möchtest?"</string>
   <string name="screen_reset_encryption_password_error">"Es ist ein unbekannter Fehler aufgetreten. Bitte überprüfe das Passwort deines Kontos und versuche es erneut."</string>
   <string name="screen_reset_encryption_password_placeholder">"Eingeben…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Bestätige, dass du deine Identität zurücksetzen möchtest."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Bestätige, dass du deine digitale Identität zurücksetzen möchtest."</string>
   <string name="screen_reset_encryption_password_title">"Gib dein Passwort ein, um fortzufahren"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-el/translations.xml b/features/securebackup/impl/src/main/res/values-el/translations.xml
index ca9adbc5ac..0f4584271c 100644
--- a/features/securebackup/impl/src/main/res/values-el/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-el/translations.xml
@@ -12,6 +12,7 @@
   <string name="screen_chat_backup_recovery_action_confirm">"Εισαγωγή κλειδιού ανάκτησης"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Ο αποθηκευτικός χώρος κλειδιών σου δεν είναι συγχρονισμένος αυτήν τη στιγμή."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Λήψη κλειδιού ανάκτησης"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Οι συνομιλίες σας αποθηκεύονται αυτόματα με κρυπτογράφηση από άκρο σε άκρο. Για να επαναφέρετε αυτό το αντίγραφο ασφαλείας και να διατηρήσετε την ψηφιακή σας ταυτότητα όταν χάσετε την πρόσβαση σε όλες τις συσκευές σας, θα χρειαστείτε το κλειδί ανάκτησης. "</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Άνοιγμα %1$s σε συσκευή υπολογιστή"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Συνδέσου ξανά στο λογαριασμό σου"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Όταν σου ζητηθεί να επαληθεύσεις τη συσκευή σου, επέλεξε %1$s"</string>
diff --git a/features/securebackup/impl/src/main/res/values-et/translations.xml b/features/securebackup/impl/src/main/res/values-et/translations.xml
index 987fd88190..9958628dee 100644
--- a/features/securebackup/impl/src/main/res/values-et/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-et/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Lülita võtmete varundamine välja"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Lülita võtmete varundamine sisse"</string>
-  <string name="screen_chat_backup_key_backup_description">"Salvesta oma krüptoidentiteet ja sõnumite krüptovõtmed turvaliselt serveris. See tagab, et sinu sõnumite ajalugu on alati loetav, ka kõikides uutes seadmetes. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Salvesta oma digitaalne identiteet ja sõnumite krüptovõtmed turvaliselt serveris. See tagab, et sinu sõnumite ajalugu on alati loetav, ka kõikides uutes seadmetes. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Krüptovõtmete varundus"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Taastamise seadistamiseks peab võtmehoidla olema sisselülitatud."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Sinu vestluste varundamiseks peab võtmehoidla olema sisselülitatud."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Laadi siin seadmes leiduvad võtmed üles"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Luba krüptovõtmete salvestamine"</string>
   <string name="screen_chat_backup_recovery_action_change">"Muuda taastevõtit"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Kui sa oled kaotanud ligipääsu kõikidele oma olemasolevatele seadmetele, siis sa saad taastevõtme abil taastada ligipääsu oma krüptoidentiteedile ja sõnumite ajaloole."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Kui sa oled kaotanud ligipääsu kõikidele oma olemasolevatele seadmetele, siis sa saad taastevõtme abil taastada ligipääsu oma digitaalsele identiteedile ja sõnumite ajaloole."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Sisesta taastevõti"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Sinu krüptovõtmete varundus pole hetkel enam sünkroonis."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Seadista andmete taastamine"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Seadista taastevõti"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Sinu vestlused on automaatselt varundatud kasutades läbivat krüptimist. Kui peaksid kaotama ligipääsu kõikidele oma seadmetele, siis selle varukoopia taastamiseks ja oma digitaalse identiteedi säilitamiseks, on vaja taastevõtit."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Ava %1$s töölauaga seadmes"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Logi uuesti sisse oma kasutajakontole"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Kui sul palutakse seadet verifitseerida, vali %1$s"</string>
@@ -19,16 +20,37 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Uue taastevõtme loomiseks palun järgi juhendit"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Salvesta oma uus taastevõti kas salasõnahalduris, krüptitud failis või mõnel muul turvalisel viisil"</string>
   <string name="screen_create_new_recovery_key_title">"Lähtesta oma konto krüptimine mõnest muust oma seadmest"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Sisestatud taastevõti ei vasta süsteemis leiduvale"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Lõpeta seadistus"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Sisesta oma taastevõti uuesti."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Korda oma taastevõtit"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Vähemalt %1$d tähemärk. Ära pruugi kasutajakonto salasõna."</item>
+    <item quantity="other">"Vähemalt %1$d tähemärki. Ära pruugi kasutajakonto salasõna."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Tugevus"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Salafraasi tugevus: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Mõõdukas"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Tugev"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Väga tugev"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Väga kehv"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Kehv"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Sisesta taastevõti, mille saad meelde jätta."</string>
+  <string name="screen_custom_recovery_key_input_title">"Sisesta taastevõti"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Laadin taastevõtme nõudeid"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Taastevõtme muutmiseks ava menüü: Seadistused → Krüptimine → Varundamine"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Võid oma taastevõtit kasutada uute seadmete verifitseerimiseks või krüptitud vestluste taastamiseks, kui kaotate juurdepääsu kõigile oma seadmetele."</string>
+  <string name="screen_custom_recovery_key_success_title">"Sinu varundus on nüüd täielikult seadistatud"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Jätka lähtestamisega"</string>
   <string name="screen_encryption_reset_bullet_1">"Sinu kasutajakonto andmed, kontaktid, eelistused ja vestluste loend säiluvad"</string>
   <string name="screen_encryption_reset_bullet_2">"Sa kaotad seniste sõnumite ajaloo"</string>
   <string name="screen_encryption_reset_bullet_3">"Sa pead kõik oma olemasolevad seadmed ja kontaktid uuesti verifitseerima"</string>
-  <string name="screen_encryption_reset_footer">"Lähtesta oma identiteet vaid siis, kui sul pole ligipääsu mitte ühelegi oma seadmele ja sa oled kaotanud oma taastevõtme."</string>
-  <string name="screen_encryption_reset_title">"Kui sa ühtegi muud võimalust ei leia, siis lähtesta oma identiteet."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Lülita välja"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Kui sa logid välja kõikidest oma seadmetest, siis sa kaotad ligipääsu oma krüptitud sõnumitele."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Kas sa oled kindel, et soovid varukoopiate tegemise välja lülitada?"</string>
-  <string name="screen_key_backup_disable_description">"Varunduse väljalülitamisel kustutatakse hetkel olemasolev sinu krüptovõtmete varukoopia ning lülituvad välja veel mõned turvafunktsionaalsused. Sellisel juhul sul:"</string>
+  <string name="screen_encryption_reset_footer">"Lähtesta oma digitaalne identiteet vaid siis, kui sul pole ligipääsu mitte ühelegi oma seadmele ja sa oled kaotanud oma taastevõtme."</string>
+  <string name="screen_encryption_reset_title">"Kui sa ühtegi muud võimalust ei leia, siis lähtesta oma digitaalne identiteet."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Kustuta"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Kui sa eemaldad kõik oma seadmed, siis sa kaotad ligipääsu oma krüptitud sõnumitele ja pead oma digitaalse identiteedi lähtestama."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Kas oled kindel, et soovid võtmehoidla kustutada?"</string>
+  <string name="screen_key_backup_disable_description">"Võtmehoidla kustutamine eemaldab sinu digitaalse identiteedi ja sõnumivõtmed serverist ning lülitab välja järgmised turvafunktsionaalsused:"</string>
   <string name="screen_key_backup_disable_description_point_1">"sul ei ole krüptitud sõnumite ajalugu uutes seadmetes"</string>
   <string name="screen_key_backup_disable_description_point_2">"sa kaotad ligipääsu oma krüptitud sõnumitele, kui sa logid kõikjal välja rakendusest %1$s"</string>
   <string name="screen_key_backup_disable_title">"Kas sa oled kindel, et soovid varunduse välja lülitada?"</string>
@@ -58,12 +80,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Loo oma taastevõti"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Ära jaga seda kellegagi"</string>
   <string name="screen_recovery_key_setup_success">"Andmete taastamise seadistamine õnnestus"</string>
-  <string name="screen_recovery_key_setup_title">"Seadista andmete taastamine"</string>
+  <string name="screen_recovery_key_setup_title">"Seadista taastevõti"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Jah, lähtesta nüüd"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"See tegevus on tagasipöördumatu."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Kas sa oled kindel, et soovid oma andmete krüptimist lähtestada?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Kas sa oled kindel, et soovid oma digitaalse identiteedi lähtestada?"</string>
   <string name="screen_reset_encryption_password_error">"Tekkis teadmata viga. Palun kontrolli, kas sinu kasutajakonto salasõna on õige ja proovi uuesti."</string>
   <string name="screen_reset_encryption_password_placeholder">"Sisesta…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Palun kinnita, et soovid oma andmete krüptimist lähtestada."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Palun kinnita, et soovid oma digitaalse identiteedi lähtestada."</string>
   <string name="screen_reset_encryption_password_title">"Jätkamaks sisesta oma kasutajakonto salasõna"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-fa/translations.xml b/features/securebackup/impl/src/main/res/values-fa/translations.xml
index c16e5bd1d8..bd7a43ffba 100644
--- a/features/securebackup/impl/src/main/res/values-fa/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-fa/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_change">"تغییر کلید بازیابی"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"ورود کلید بازیابی"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"ذخیره‌ساز کلیدتان از هم‌گام بودن در آمده."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"برپایی بازیابی"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"دریافت کلید بازیابی"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"گشودن %1$s در افزارهٔ میزکار"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"ورود دوباره به حسابتان"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"گزینش %1$s هنگام درخواست تأیید افزاره‌تان"</string>
@@ -23,10 +23,10 @@
   <string name="screen_encryption_reset_bullet_3">"لازم است دوباره همهٔ آشنایان و افزاره‌های موجودتان را تأیید کنید"</string>
   <string name="screen_encryption_reset_footer">"فقط اگر به افزاره‌ای وارد شده از پیش دسترسی ندارید و کلید بازیابیتان را گم کرده‌اید بازنشانی کنید."</string>
   <string name="screen_encryption_reset_title">"نمی‌توانید تأیید کنید؟ لازم است هویتتان را بازنشانی کنید."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"خاموش کردن"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"اگر از سیستم همه دستگاه ها خارج شده باشید، پیام های رمزگذاری شده خود را از دست خواهید داد."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"مطمئنید که می‌خواهید پشتیبان گیری را خاموش کنید؟"</string>
-  <string name="screen_key_backup_disable_description">"حذف فضای ذخیره سازی کلید، هویت رمزنگاری و کلیدهای پیام شما را از کارساز حذف می کند و ویژگی های امنیتی زیر را خاموش می کند:"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"حذف"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"اگر از تمام دستگاه‌هایتان خارج شوید، تاریخچه چت رمزگذاری‌شده خود را از دست خواهید داد و باید هویت دیجیتال خود را مجدداً تنظیم کنید."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"آیا مطمئن هستید که می‌خواهید کلید ذخیره‌سازی را حذف کنید؟"</string>
+  <string name="screen_key_backup_disable_description">"حذف محل ذخیره‌سازی کلید، کلیدهای هویت دیجیتال و پیام شما را از سرور حذف کرده و ویژگی‌های امنیتی زیر را غیرفعال می‌کند:"</string>
   <string name="screen_key_backup_disable_description_point_1">"سابقه پیام رمزگذاری شده در دستگاه های جدید نخواهید داشت"</string>
   <string name="screen_key_backup_disable_description_point_2">"اگر از %1$s در همه جا خارج شده باشید، دسترسی به پیام های رمزگذاری شده خود را از دست خواهید داد"</string>
   <string name="screen_key_backup_disable_title">"مطمئنید که می‌خواهید فضای ذخیره سازی کلید را خاموش کرده و آن را حذف کنید؟"</string>
@@ -56,7 +56,7 @@
   <string name="screen_recovery_key_setup_generate_key">"تولید کلید بازیابیتان"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"با کسی هم‌رسانیش نکنید!"</string>
   <string name="screen_recovery_key_setup_success">"برپایی بازیابی موفّق بود"</string>
-  <string name="screen_recovery_key_setup_title">"برپایی بازیابی"</string>
+  <string name="screen_recovery_key_setup_title">"دریافت کلید بازیابی"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"بله. اکنون بازنشانی شود"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"این فرایند بازگشت‌ناپذیر است."</string>
   <string name="screen_reset_encryption_password_placeholder">"ورود…"</string>
diff --git a/features/securebackup/impl/src/main/res/values-fi/translations.xml b/features/securebackup/impl/src/main/res/values-fi/translations.xml
index f7d09bb6ca..7a8f44f51a 100644
--- a/features/securebackup/impl/src/main/res/values-fi/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-fi/translations.xml
@@ -12,6 +12,7 @@
   <string name="screen_chat_backup_recovery_action_confirm">"Anna palautusavain"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Avainten säilytys ei ole tällä hetkellä synkronoitu."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Hanki palautusavain"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Keskustelusi varmuuskopioidaan automaattisesti päästä päähän -salauksella. Jotta voit palauttaa tämän varmuuskopion ja säilyttää digitaalisen identiteettisi, kun menetät pääsyn kaikkiin laitteisiisi, tarvitset palautusavaimesi."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Avaa %1$s tietokoneella"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Kirjaudu tilillesi uudelleen"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Kun sinua pyydetään vahvistamaan laitteesi, valitse %1$s"</string>
@@ -19,6 +20,27 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Seuraa ohjeita uuden palautusavaimen luomiseksi"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Tallenna uusi palautusavaimesi salasanojen hallintaohjelmaan tai salattuun muistiinpanoon"</string>
   <string name="screen_create_new_recovery_key_title">"Nollaa tilisi salaus toisella laitteella"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Antamasi palautusavain ei täsmää"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Viimeistele määritys"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Anna palautusavaimesi uudelleen."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Vahvista palautusavaimesi"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Vähintään %1$d merkki. Älä käytä tilisi salasanaa"</item>
+    <item quantity="other">"Vähintään %1$d merkkiä. Älä käytä tilisi salasanaa"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Vahvuus"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Salasanan vahvuus: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Kohtalainen"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Vahva"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Erittäin vahva"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Erittäin heikko"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Heikko"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Valitse palautusavain, jonka osaat muistaa."</string>
+  <string name="screen_custom_recovery_key_input_title">"Anna palautusavain"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Palautusavaimen vaatimuksia ladataan"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Jos haluat vaihtaa palautusavaimesi, mene kohtaan Asetukset → Salaus"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Voit käyttää palautusavainta uusien laitteiden vahvistamiseen tai salattujen keskustelujen palauttamiseen, jos menetät pääsyn kaikkiin laitteisiisi."</string>
+  <string name="screen_custom_recovery_key_success_title">"Varmuuskopiointi on nyt täysin määritetty"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Jatka nollausta"</string>
   <string name="screen_encryption_reset_bullet_1">"Tilitietosi, yhteystiedot, asetukset ja keskustelulista säilytetään"</string>
   <string name="screen_encryption_reset_bullet_2">"Menetät kaiken viestihistorian, joka on tallella vain palvelimella"</string>
diff --git a/features/securebackup/impl/src/main/res/values-fr/translations.xml b/features/securebackup/impl/src/main/res/values-fr/translations.xml
index dcdac3d919..3b738bf61e 100644
--- a/features/securebackup/impl/src/main/res/values-fr/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-fr/translations.xml
@@ -20,6 +20,27 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Suivez les instructions pour créer une nouvelle clé de récupération"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Enregistrez votre nouvelle clé dans un gestionnaire de mots de passe ou dans une note chiffrée"</string>
   <string name="screen_create_new_recovery_key_title">"Réinitialisez le chiffrement de votre compte en utilisant un autre appareil"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"La clé de récupération ne correspond pas"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Terminer la configuration"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Saisissez à nouveau votre clé de récupération."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Confirmez votre clé de récupération"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"%1$d caractère minimum. N’utilisez pas le mot de passe de votre compte"</item>
+    <item quantity="other">"%1$d caractères minimum. N’utilisez pas le mot de passe de votre compte"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Force"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Force du mot de passe : %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Moyenne"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Forte"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Très forte"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Très faible"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Faible"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Choisissez une clé de récupération que vous pouvez mémoriser."</string>
+  <string name="screen_custom_recovery_key_input_title">"Saisissez une clé de récupération"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Chargement des exigences relatives à la clé de récupération"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Pour modifier votre clé de récupération, accédez à Paramètres → Chiffrement → Changer la clé de récupération"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Vous pouvez utiliser votre clé de récupération pour vérifier de nouveaux appareils ou restaurer vos conversations chiffrées si vous perdez l’accès à tous vos appareils."</string>
+  <string name="screen_custom_recovery_key_success_title">"Votre sauvegarde est maintenant entièrement configurée."</string>
   <string name="screen_encryption_reset_action_continue_reset">"Continuer la réinitialisation"</string>
   <string name="screen_encryption_reset_bullet_1">"Les détails de votre compte, vos contacts, vos préférences et votre liste de discussions seront conservés"</string>
   <string name="screen_encryption_reset_bullet_2">"Vous perdrez l’historique de vos messages"</string>
diff --git a/features/securebackup/impl/src/main/res/values-hr/translations.xml b/features/securebackup/impl/src/main/res/values-hr/translations.xml
index 3f146d279f..618be910fe 100644
--- a/features/securebackup/impl/src/main/res/values-hr/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-hr/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Brisanje pohrane ključeva"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Uključivanje sigurnosnog kopiranja"</string>
-  <string name="screen_chat_backup_key_backup_description">"Sigurno pohranite svoj kriptografski identitet i ključeve poruka na poslužitelju. To će vam omogućiti pregled povijesti poruka na svim novim uređajima. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"To će vam omogućiti pregled povijesti razgovora na svim novim uređajima i potrebno je za sigurnosnu kopiju razgovora i digitalnog identiteta. %1$s ."</string>
   <string name="screen_chat_backup_key_backup_title">"Pohrana ključeva"</string>
   <string name="screen_chat_backup_key_storage_disabled_error">"Za postavljanje oporavka mora biti uključena pohrana ključeva."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Prenesi ključeve s ovog uređaja"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Dopusti pohranu ključeva"</string>
   <string name="screen_chat_backup_recovery_action_change">"Promjena ključa za oporavak"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Ako ste izgubili sve postojeće uređaje, oporavite svoj kriptografski identitet i povijest poruka pomoću ključa za oporavak."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Vaši se razgovori automatski sigurnosno kopiraju enkripcijom od početka do kraja. Da biste vratili ovu sigurnosnu kopiju i zadržali svoj digitalni identitet kada izgubite pristup svim svojim uređajima, trebat će vam ključ za oporavak."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Unesi ključ za oporavak"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaša pohrana ključeva trenutačno nije sinkronizirana."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Postavljanje oporavka"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"ključ za oporavak"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Vaši se razgovori automatski sigurnosno kopiraju enkripcijom od početka do kraja. Da biste vratili ovu sigurnosnu kopiju i zadržali svoj digitalni identitet kada izgubite pristup svim svojim uređajima, trebat će vam ključ za oporavak."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Otvorite %1$s na stolnom uređaju"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Ponovno se prijavite na svoj račun"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Kada se od vas zatraži da potvrdite svoj uređaj, odaberite %1$s"</string>
@@ -19,14 +20,35 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Pridržavajte se uputa za izradu novog ključa za oporavak"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Spremite svoj novi ključ za oporavak u upravitelj zaporki ili šifriranu bilješku"</string>
   <string name="screen_create_new_recovery_key_title">"Resetirajte šifriranje za svoj račun pomoću drugog uređaja"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Ključ za oporavak koji ste unijeli ne odgovara"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Završi postavljanje"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Ponovno unesite svoj ključ za oporavak."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Potvrdite svoj ključ za oporavak"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Minimalno %1$d znakova. Nemojte koristiti lozinku računa."</item>
+    <item quantity="other">"Minimalno %1$d znakova. Nemojte koristiti lozinku računa."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Snaga"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Jačina lozinke: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Umjereno"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Jak"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Vrlo jaka"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Vrlo slaba"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Slaba"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Odaberite ključ za oporavak koji možete zapamtiti."</string>
+  <string name="screen_custom_recovery_key_input_title">"Unesite ključ za oporavak"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Učitavanje zahtjeva za ključ za oporavak"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Za promjenu ključa za oporavak, idite na Postavke → Šifriranje → Sigurnosna kopija"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Ključ za oporavak možete koristiti za potvrdu novih uređaja ili vraćanje šifriranih razgovora ako izgubite pristup svim svojim uređajima."</string>
+  <string name="screen_custom_recovery_key_success_title">"Vaša sigurnosna kopija je sada potpuno postavljena"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Nastavi s poništavanjem"</string>
   <string name="screen_encryption_reset_bullet_1">"Sačuvat će se podatci o vašem računu, kontakti, postavke i popis razgovora"</string>
   <string name="screen_encryption_reset_bullet_2">"Izgubit ćete svu povijest poruka koja je pohranjena samo na poslužitelju"</string>
   <string name="screen_encryption_reset_bullet_3">"Morat ćete ponovno potvrditi sve svoje postojeće uređaje i kontakte"</string>
   <string name="screen_encryption_reset_footer">"Poništite svoj identitet samo ako nemate pristup drugom prijavljenom uređaju i ako ste izgubili ključ za oporavak."</string>
-  <string name="screen_encryption_reset_title">"Ne možete potvrditi? Morat ćete poništiti svoj identitet."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Isključi"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Izgubit ćete šifrirane poruke ako se odjavite sa svih uređaja."</string>
+  <string name="screen_encryption_reset_title">"Ne možete potvrditi? Morat ćete resetirati svoj digitalni identitet."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Izbriši"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Izgubit ćete svoju šifriranu povijest razgovora i morat ćete resetirati svoj digitalni identitet ako uklonite sve svoje uređaje."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Jeste li sigurni da želite isključiti sigurnosno kopiranje?"</string>
   <string name="screen_key_backup_disable_description">"Brisanjem pohrane ključeva uklonit ćete svoj kriptografski identitet i ključeve poruka s poslužitelja te isključiti sljedeće sigurnosne značajke:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Na novim uređajima nećete imati šifriranu povijest poruka"</string>
@@ -58,12 +80,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Generirajte svoj ključ za oporavak"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Ne dijelite ovo ni s kim!"</string>
   <string name="screen_recovery_key_setup_success">"Postavljanje oporavka je uspjelo"</string>
-  <string name="screen_recovery_key_setup_title">"Postavljanje oporavka"</string>
+  <string name="screen_recovery_key_setup_title">"ključ za oporavak"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Da, poništi sada"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Ovaj je proces nepovratan."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Jeste li sigurni da želite poništiti svoj identitet?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Jeste li sigurni da želite resetirati svoj digitalni identitet?"</string>
   <string name="screen_reset_encryption_password_error">"Došlo je do nepoznate pogreške. Provjerite je li zaporka vašeg računa ispravna i pokušajte ponovno."</string>
   <string name="screen_reset_encryption_password_placeholder">"Unos…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Potvrdite da želite poništiti svoj identitet."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Potvrdite da želite resetirati svoj digitalni identitet."</string>
   <string name="screen_reset_encryption_password_title">"Unesite zaporku računa kako biste nastavili"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-hu/translations.xml b/features/securebackup/impl/src/main/res/values-hu/translations.xml
index cf7ab1cb0c..3d89c15c5c 100644
--- a/features/securebackup/impl/src/main/res/values-hu/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-hu/translations.xml
@@ -12,6 +12,7 @@
   <string name="screen_chat_backup_recovery_action_confirm">"Adja meg a helyreállítási kulcsot"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"A kulcstároló jelenleg nincs szinkronizálva."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Helyreállítási kulcs beszerzése"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"A csevegésekről automatikusan készül biztonsági mentés végpontok közötti titkosítással. A biztonsági mentés helyreállításához és digitális személyazonossága megőrzéséhez szüksége lesz a helyreállítási kulcsára, ha elveszíti a hozzáférést az összes eszközéhez."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Nyissa meg az %1$set egy asztali eszközön"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Jelentkezzen be újra a fiókjába"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Amikor az eszköz ellenőrzését kéri, válassza ezt a lehetőséget: %1$s"</string>
@@ -19,15 +20,36 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Kövesse az utasításokat egy új helyreállítási kulcs létrehozásához"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Mentse az új helyreállítási kulcsot egy jelszókezelőbe vagy egy titkosított jegyzetbe."</string>
   <string name="screen_create_new_recovery_key_title">"A fiók titkosításának visszaállítása egy másik eszköz használatával"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"A megadott helyreállítási kulcsok nem egyeznek"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Beállítás befejezése"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Írja be újra a helyreállítási kulcsot."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Erősítse meg a helyreállítási kulcsát"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Minimum %1$d karakter. Ne használja a fiók jelszavát."</item>
+    <item quantity="other">"Minimum %1$d karakter. Ne használja a fiók jelszavát."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Erősség"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Jelszó erőssége: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Mérsékelt"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Erős"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Nagyon erős"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Nagyon gyenge"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Gyenge"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Válasszon egy olyan helyreállítási kulcsot, amelyet könnyen megjegyezhet."</string>
+  <string name="screen_custom_recovery_key_input_title">"Adja meg a helyreállítási kulcsot"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Helyreállítási kulcs követelményeinek betöltése"</string>
+  <string name="screen_custom_recovery_key_success_notice">"A helyreállítási kulcs módosításához lépjen a Beállítások → Titkosítás → Biztonsági mentés menüpontra."</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"A helyreállítási kulcs segítségével megerősítheti az új eszközöket, vagy visszaállíthatja a titkosított csevegéseket, ha elveszítette a hozzáférését az összes eszközéhez."</string>
+  <string name="screen_custom_recovery_key_success_title">"A biztonsági mentés most már teljesen be van állítva"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Visszaállítás folytatása"</string>
   <string name="screen_encryption_reset_bullet_1">"A fiókadatok, a kapcsolatok, a beállítások és a csevegéslista megmarad"</string>
   <string name="screen_encryption_reset_bullet_2">"Elveszíti meglévő üzenetelőzményeit"</string>
   <string name="screen_encryption_reset_bullet_3">"Újból ellenőriznie kell az összes meglévő eszközét és csevegőpartnerét"</string>
-  <string name="screen_encryption_reset_footer">"Csak akkor állítsa alaphelyzetbe a személyazonosságát, ha nem fér hozzá másik bejelentkezett eszközhöz, és elvesztette a helyreállítási kulcsot."</string>
+  <string name="screen_encryption_reset_footer">"Csak akkor állítsa alaphelyzetbe a személyazonosságát, ha nem fér hozzá más bejelentkezett eszközhöz, és elveszítette a helyreállítási kulcsát."</string>
   <string name="screen_encryption_reset_title">"Nem tudja megerősíteni? Alaphelyzetbe kell állítania a digitális személyazonosságát."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Kikapcsolás"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Ha kijelentkezik az összes eszközéről, akkor elveszti a titkosított üzeneteit."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Biztos, hogy kikapcsolja a biztonsági mentéseket?"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Törlés"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Ha eltávolítja az összes eszközét, elveszíti titkosított csevegési előzményeit, és újra be kell állítania digitális személyazonosságát."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Biztosan törölni szeretné a kulcstárolót?"</string>
   <string name="screen_key_backup_disable_description">"A kulcstároló törlése eltávolítja a digitális személyazonosságát és az üzenetkulcsait a kiszolgálóról, és kikapcsolja a következő biztonsági funkciókat:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Nem lesznek meg a titkosított üzenetek előzményei az új eszközein"</string>
   <string name="screen_key_backup_disable_description_point_2">"Elveszti a hozzáférését a titkosított üzeneteihez, ha mindenhol kilép az %1$sből"</string>
diff --git a/features/securebackup/impl/src/main/res/values-in/translations.xml b/features/securebackup/impl/src/main/res/values-in/translations.xml
index 577093cb52..3c810938d7 100644
--- a/features/securebackup/impl/src/main/res/values-in/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-in/translations.xml
@@ -11,7 +11,8 @@
   <string name="screen_chat_backup_recovery_action_change_description">"Pulihkan identitas kriptografi dan riwayat pesan Anda dengan kunci pemulihan jika Anda kehilangan semua perangkat yang ada."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Masukkan kunci pemulihan"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Penyimpanan kunci Anda saat ini tidak sinkron."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Siapkan pemulihan"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Siapkan Kunci pemulihan"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Pulihkan identitas kriptografi dan riwayat pesan Anda dengan kunci pemulihan jika Anda kehilangan semua perangkat yang ada."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Buka %1$s di perangkat desktop"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Masuk ke akun Anda lagi"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Saat diminta untuk memverifikasi perangkat Anda, pilih %1$s"</string>
@@ -25,8 +26,8 @@
   <string name="screen_encryption_reset_bullet_3">"Anda perlu memverifikasi semua perangkat dan kontak yang ada lagi"</string>
   <string name="screen_encryption_reset_footer">"Hanya atur ulang identitas Anda jika Anda tidak memiliki akses ke perangkat lain yang masuk dan Anda kehilangan kunci pemulihan."</string>
   <string name="screen_encryption_reset_title">"Tidak dapat mengonfirmasi? Anda perlu mengatur ulang identitas Anda."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Matikan"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Anda akan kehilangan pesan terenkripsi jika Anda keluar dari semua perangkat."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Hapus"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Anda akan kehilangan pesan terenkripsi jika Anda menghapusnya dari semua perangkat."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Apakah Anda yakin ingin mematikan pencadangan?"</string>
   <string name="screen_key_backup_disable_description">"Mematikan pencadangan akan menghapus pencadangan kunci terenkripsi saat ini dan mematikan fitur keamanan lainnya. Dalam hal ini, Anda akan:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Tidak memiliki riwayat pesan terenkripsi di perangkat baru"</string>
@@ -58,7 +59,7 @@
   <string name="screen_recovery_key_setup_generate_key">"Buat kunci pemulihan Anda"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Jangan bagikan ini kepada siapa pun!"</string>
   <string name="screen_recovery_key_setup_success">"Penyiapan pemulihan berhasil"</string>
-  <string name="screen_recovery_key_setup_title">"Siapkan pemulihan"</string>
+  <string name="screen_recovery_key_setup_title">"Siapkan Kunci pemulihan"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ya, atur ulang sekarang"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Proses ini tidak dapat diurungkan."</string>
   <string name="screen_reset_encryption_confirmation_alert_title">"Apakah Anda yakin ingin mengatur ulang identitas Anda?"</string>
diff --git a/features/securebackup/impl/src/main/res/values-it/translations.xml b/features/securebackup/impl/src/main/res/values-it/translations.xml
index fe7ba13c60..137d5a39e8 100644
--- a/features/securebackup/impl/src/main/res/values-it/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-it/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Disattiva il backup"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Attiva il backup"</string>
-  <string name="screen_chat_backup_key_backup_description">"Archivia la tua identità crittografica e le chiavi dei messaggi in modo sicuro sul server. Ciò ti consentirà di visualizzare la cronologia dei messaggi su tutti i nuovi dispositivi. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Questo ti permetterà di visualizzare la cronologia delle conversazioni su qualsiasi nuovo dispositivo ed è necessario per il backup delle chat e dell\'identità digitale.%1$s ."</string>
   <string name="screen_chat_backup_key_backup_title">"Archiviazione chiavi"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"L\'archiviazione delle chiavi deve essere attivata per configurare il ripristino."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Per eseguire il backup delle tue conversazioni, devi attivare l\'archiviazione delle chiavi."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Carica le chiavi da questo dispositivo"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Consenti l\'archiviazione delle chiavi"</string>
   <string name="screen_chat_backup_recovery_action_change">"Cambia la chiave di recupero"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Recupera la tua identità crittografica e la cronologia dei messaggi con una chiave di recupero se hai perso tutti i dispositivi esistenti."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Le tue conversazioni vengono automaticamente salvate con crittografia end-to-end. Per ripristinare questo backup e conservare la tua identità digitale quando perdi l\'accesso a tutti i tuoi dispositivi, avrai bisogno della tua chiave di recupero."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Inserisci la chiave di recupero"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"L\'archiviazione delle chiavi non è sincronizzata."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Configura il recupero"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Ottieni la chiave di recupero"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Le tue conversazioni vengono automaticamente salvate con crittografia end-to-end. Per ripristinare questo backup e conservare la tua identità digitale quando perdi l\'accesso a tutti i tuoi dispositivi, avrai bisogno della tua chiave di recupero."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Apri %1$s in un dispositivo desktop"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Accedi nuovamente al tuo account"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Quando ti viene chiesto di verificare il tuo dispositivo, seleziona %1$s"</string>
@@ -19,16 +20,37 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Segui le istruzioni per creare una nuova chiave di recupero"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Salva la tua nuova chiave di recupero in un gestore di password o in una nota criptata"</string>
   <string name="screen_create_new_recovery_key_title">"Reimposta la crittografia del tuo account utilizzando un altro dispositivo"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"La chiave di recupero che hai inserito non corrisponde"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Completa la configurazione"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Inserisci nuovamente la tua chiave di recupero."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Conferma la tua chiave di recupero"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Minimo %1$d carattere. Non usare la password del tuo account"</item>
+    <item quantity="other">"Minimo %1$d caratteri. Non usare la password del tuo account"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Complessità"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Complessità della passphrase: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Moderata"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Sicura"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Molto sicura"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Molto debole"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Debole"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Scegli una chiave di recupero che puoi ricordare."</string>
+  <string name="screen_custom_recovery_key_input_title">"Inserisci una chiave di recupero"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Caricamento dei requisiti per la chiave di recupero"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Per modificare la chiave di recupero, vai su Impostazioni → Crittografia → Backup"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Puoi utilizzare la tua chiave di recupero per confermare nuovi dispositivi o ripristinare le tue chat crittografate se perdi l\'accesso a tutti i tuoi dispositivi."</string>
+  <string name="screen_custom_recovery_key_success_title">"Il tuo backup è ora completamente configurato."</string>
   <string name="screen_encryption_reset_action_continue_reset">"Continua il ripristino"</string>
   <string name="screen_encryption_reset_bullet_1">"I dettagli del tuo account, i contatti, le preferenze e l\'elenco delle conversazioni verranno conservati"</string>
   <string name="screen_encryption_reset_bullet_2">"Perderai la cronologia dei messaggi esistente"</string>
   <string name="screen_encryption_reset_bullet_3">"Dovrai verificare nuovamente tutti i dispositivi e i contatti esistenti"</string>
-  <string name="screen_encryption_reset_footer">"Reimposta la tua identità solo se non hai accesso a un altro dispositivo su cui hai effettuato l\'accesso e hai perso la chiave di recupero."</string>
-  <string name="screen_encryption_reset_title">"Reimposta la tua identità nel caso in cui non riesci a confermare in un altro modo"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Disattiva"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Perderai i tuoi messaggi cifrati se sei disconnesso da tutti i dispositivi."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Vuoi davvero disattivare il backup?"</string>
-  <string name="screen_key_backup_disable_description">"La disattivazione del backup rimuoverà il backup dell\'attuale chiave crittografica e disattiverà altre funzioni di sicurezza. In questo caso:"</string>
+  <string name="screen_encryption_reset_footer">"Reimposta la tua identità digitale solo se non hai accesso a un altro dispositivo verificato e non disponi della tua chiave di recupero."</string>
+  <string name="screen_encryption_reset_title">"Non riesci a confermare? Dovrai reimpostare la tua identità digitale."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Elimina"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Se rimuovi tutti i tuoi dispositivi, perderai la cronologia delle conversazioni cifrate e dovrai reimpostare la tua identità digitale."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Sei sicuro di voler eliminare l\'archivio delle chiavi?"</string>
+  <string name="screen_key_backup_disable_description">"L\'eliminazione della memoria delle chiavi rimuoverà l\'identità digitale e le chiavi dei messaggi dal server e disattiverà le seguenti funzionalità di sicurezza:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Non avrai la cronologia dei messaggi cifrati su nuovi dispositivi"</string>
   <string name="screen_key_backup_disable_description_point_2">"Perderai l\'accesso ai tuoi messaggi cifrati se ti sei disconnesso da %1$s ovunque"</string>
   <string name="screen_key_backup_disable_title">"Vuoi davvero disattivare il backup?"</string>
@@ -58,12 +80,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Genera la tua chiave di recupero"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Non condividerla con nessuno!"</string>
   <string name="screen_recovery_key_setup_success">"Configurazione del recupero completata"</string>
-  <string name="screen_recovery_key_setup_title">"Configura il recupero"</string>
+  <string name="screen_recovery_key_setup_title">"Ottieni la chiave di recupero"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Sì, reimposta ora"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Questo processo è irreversibile."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Sei sicuro di voler reimpostare la crittografia?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Sei sicuro di voler reimpostare la tua identità digitale?"</string>
   <string name="screen_reset_encryption_password_error">"Si è verificato un errore sconosciuto. Controlla che la password del tuo account sia corretta e riprova."</string>
   <string name="screen_reset_encryption_password_placeholder">"Inserisci…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Conferma di voler reimpostare la crittografia."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Conferma che desideri reimpostare la tua identità digitale."</string>
   <string name="screen_reset_encryption_password_title">"Inserisci la password del tuo account per continuare"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-ja/translations.xml b/features/securebackup/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..457f08fcea
--- /dev/null
+++ b/features/securebackup/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_chat_backup_key_backup_action_disable">"保存されている鍵を削除"</string>
+  <string name="screen_chat_backup_key_backup_action_enable">"バックアップを有効化"</string>
+  <string name="screen_chat_backup_key_backup_description">"暗号化されたデジタルIDとメッセージの鍵をサーバーに保存します。これにより、新しい端末から過去のメッセージを確認することができます。%1$s"</string>
+  <string name="screen_chat_backup_key_backup_title">"鍵の保管庫"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"チャットをバックアップするには、鍵の保管庫を使用する必要があります。"</string>
+  <string name="screen_chat_backup_key_storage_toggle_description">"この端末上の鍵をアップロードします"</string>
+  <string name="screen_chat_backup_key_storage_toggle_title">"鍵の保管庫を使用"</string>
+  <string name="screen_chat_backup_recovery_action_change">"回復鍵を変更"</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"あなたのチャットはエンドツーエンド暗号化を使用して自動的にバックアップされています。すべての端末を使用できない状況で、このバックアップからデジタルIDを復元するには、回復鍵が必要となります。"</string>
+  <string name="screen_chat_backup_recovery_action_confirm">"回復鍵を入力"</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"鍵の保管庫を現在同期できません。"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"回復鍵を作成"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"あなたのチャットはエンドツーエンド暗号化を使用して自動的にバックアップされています。すべての端末を使用できない状況で、このバックアップからデジタルIDを復元するには、回復鍵が必要となります。"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"%1$s をコンピュータで開く"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"再度サインインしてください"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"端末の認証を要求されたら %1$s を選択してください"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"\"すべてリセット\""</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"指示に従って回復鍵を作成してください"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"生成された回復鍵をパスワードマネージャや暗号化に対応するメモアプリに保存してください。"</string>
+  <string name="screen_create_new_recovery_key_title">"他の端末を使用して暗号化をリセット"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"入力した回復鍵が一致しません"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"設定完了"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"回復鍵を再度入力してください。"</string>
+  <string name="screen_custom_recovery_key_confirm_title">"回復鍵の確認"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="other">"%1$d字以上でアカウントのパスワードとは異なるものを設定してください。"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"強度"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"パスフレーズの強度: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"中程度"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"強い"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"とても強い"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"とても弱い"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"弱い"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"思い出せる回復鍵を作成してください。"</string>
+  <string name="screen_custom_recovery_key_input_title">"回復鍵の入力"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"回復鍵の要件を読み込み中"</string>
+  <string name="screen_custom_recovery_key_success_notice">"回復鍵を変更するには、「設定 - 暗号化 - バックアップ」を開いてください。"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"回復鍵は他の端末をすべて使用できない場合に、新しい端末を承認したり暗号化された会話を復元したりするために使用します。"</string>
+  <string name="screen_custom_recovery_key_success_title">"バックアップの設定完了"</string>
+  <string name="screen_encryption_reset_action_continue_reset">"リセットを続行"</string>
+  <string name="screen_encryption_reset_bullet_1">"アカウントの情報や連絡先, 設定などは残ります"</string>
+  <string name="screen_encryption_reset_bullet_2">"サーバー上にのみ存在する過去のメッセージは確認できなくなります"</string>
+  <string name="screen_encryption_reset_bullet_3">"すべての端末と連絡先を再度検証する必要があります"</string>
+  <string name="screen_encryption_reset_footer">"デジタルIDのリセットは、他のサインイン済みの端末と、回復鍵の両方へのアクセスを失った場合にのみ行ってください。"</string>
+  <string name="screen_encryption_reset_title">"認証できませんか？デジタルIDをリセットする必要があります。"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"削除"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"すべての端末を削除してしまうと、暗号化された会話が失われ、デジタルIDをリセットする必要があります。"</string>
+  <string name="screen_key_backup_disable_confirmation_title">"本当に鍵の保管庫を削除しますか？"</string>
+  <string name="screen_key_backup_disable_description">"鍵の保管庫を消去することにより、デジタルIDとメッセージの鍵はサーバーから削除され、次のセキュリティ機能が無効化されます:"</string>
+  <string name="screen_key_backup_disable_description_point_1">"新しい端末で暗号化された過去のメッセージを確認できなくなります"</string>
+  <string name="screen_key_backup_disable_description_point_2">"すべての端末で %1$s からサインアウトすると、暗号化されたメッセージを確認することはできなくなります。"</string>
+  <string name="screen_key_backup_disable_title">"本当に鍵を保管庫から削除しますか？"</string>
+  <string name="screen_recovery_key_change_description">"既存の回復鍵を紛失した場合は、新しい回復鍵を生成してください。回復鍵を更新すると、それ以前の回復鍵は使用できなくなります。"</string>
+  <string name="screen_recovery_key_change_generate_key">"新しい回復鍵を生成する"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"誰にも共有しないでください！"</string>
+  <string name="screen_recovery_key_change_success">"回復鍵を更新しました"</string>
+  <string name="screen_recovery_key_change_title">"回復鍵を変更しますか？"</string>
+  <string name="screen_recovery_key_confirm_create_new_recovery_key">"新しい回復鍵を生成"</string>
+  <string name="screen_recovery_key_confirm_description">"誰にもこの画面を見せないでください！"</string>
+  <string name="screen_recovery_key_confirm_error_content">"鍵の保管庫にアクセスするには、もう一度お試しください。"</string>
+  <string name="screen_recovery_key_confirm_error_title">"回復鍵が間違っています"</string>
+  <string name="screen_recovery_key_confirm_key_description">"代わりにセキュリティキーまたはセキュリティフレーズを入力することも可能です。"</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"回復鍵を入力してください…"</string>
+  <string name="screen_recovery_key_confirm_lost_recovery_key">"回復鍵を紛失しましたか？"</string>
+  <string name="screen_recovery_key_confirm_success">"回復鍵が承認されました"</string>
+  <string name="screen_recovery_key_confirm_title">"回復鍵を入力してください"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"回復鍵をコピーしました"</string>
+  <string name="screen_recovery_key_generating_key">"生成中…"</string>
+  <string name="screen_recovery_key_save_action">"回復鍵を保存"</string>
+  <string name="screen_recovery_key_save_description">"この回復鍵をパスワードマネージャーや、暗号化に対応するメモアプリなどに記録するか、物理的な金庫などに書き留めて保管してください。"</string>
+  <string name="screen_recovery_key_save_key_description">"タップして回復鍵をコピー"</string>
+  <string name="screen_recovery_key_save_title">"回復鍵を安全な場所に保管してください"</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"後からこの回復鍵を確認することはできません。"</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"回復鍵を保存しましたか？"</string>
+  <string name="screen_recovery_key_setup_description">"鍵の保管庫は回復鍵によって保護されています。新しい回復鍵が必要な場合は「回復鍵を変更」を選択して再生成できます。"</string>
+  <string name="screen_recovery_key_setup_generate_key">"新しい回復鍵を生成する"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"誰にも共有しないでください！"</string>
+  <string name="screen_recovery_key_setup_success">"回復鍵の設定に成功しました"</string>
+  <string name="screen_recovery_key_setup_title">"回復鍵を作成"</string>
+  <string name="screen_reset_encryption_confirmation_alert_action">"はい、リセットします"</string>
+  <string name="screen_reset_encryption_confirmation_alert_subtitle">"この操作は元に戻せません。"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"本当にデジタルIDをリセットしますか？"</string>
+  <string name="screen_reset_encryption_password_error">"不明な問題が発生しました。アカウントのパスワードが正しいことを確認してもう一度試してください。"</string>
+  <string name="screen_reset_encryption_password_placeholder">"回復鍵を入力してください…"</string>
+  <string name="screen_reset_encryption_password_subtitle">"デジタルIDをリセットしようとしています。"</string>
+  <string name="screen_reset_encryption_password_title">"アカウントのパスワードを入力"</string>
+</resources>
diff --git a/features/securebackup/impl/src/main/res/values-ko/translations.xml b/features/securebackup/impl/src/main/res/values-ko/translations.xml
index d2aec9c27d..182ae8d59a 100644
--- a/features/securebackup/impl/src/main/res/values-ko/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-ko/translations.xml
@@ -4,14 +4,15 @@
   <string name="screen_chat_backup_key_backup_action_enable">"백업 활성화"</string>
   <string name="screen_chat_backup_key_backup_description">"이 설정을 통해 새로운 기기에서도 대화 기록을 확인할 수 있으며, 대화 및 디지털 신원 백업을 위해 반드시 필요합니다. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"키 저장소"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"복구 설정을 하려면 키 저장을 켜야 합니다."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"대화 내용을 백업하려면 키 저장소를 켜야 합니다."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"이 장치에서 키 업로드"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"키 저장 허용"</string>
   <string name="screen_chat_backup_recovery_action_change">"복구 키 변경"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"기존의 모든 기기를 분실한 경우, 복구 키를 사용하여 암호화 ID와 메시지 기록을 복구할 수 있습니다."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"대화 내용은 종단간 암호화 기술로 자동 백업됩니다. 모든 기기를 사용할 수 없는 상황에서 백업을 복구하고 디지털 신원을 유지하려면 복구 키가 반드시 필요합니다."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"복구 키를 입력하세요"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"현재 키 저장소가 동기화되지 않았습니다."</string>
   <string name="screen_chat_backup_recovery_action_setup">"복구 키 가져오기"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"대화 내용은 종단간 암호화로 자동 백업됩니다. 모든 기기를 사용할 수 없는 상황에서 백업을 복구하고 디지털 신원을 유지하려면 복구 키가 반드시 필요합니다."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"데스크톱 장치에서 %1$s 을 엽니다."</string>
   <string name="screen_create_new_recovery_key_list_item_2">"계정에 다시 로그인하세요"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"장치를 확인하라는 메시지가 표시되면, %1$s 을 선택하세요"</string>
diff --git a/features/securebackup/impl/src/main/res/values-nb/translations.xml b/features/securebackup/impl/src/main/res/values-nb/translations.xml
index f65deda870..1d6438c933 100644
--- a/features/securebackup/impl/src/main/res/values-nb/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-nb/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Slett nøkkellagring"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Slå på sikkerhetskopiering"</string>
-  <string name="screen_chat_backup_key_backup_description">"Lagre din kryptografiske identitet og meldingsnøkler sikkert på serveren. Dette gjør at du kan se meldingshistorikken din på alle nye enheter. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Dette lar deg se chatloggen din på alle nye enheter, og det er nødvendig for sikkerhetskopiering av chatter og digital identitet. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Nøkkellagring"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Nøkkellagring må være slått på for å konfigurere gjenoppretting."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Nøkkellagring må være aktivert for å sikkerhetskopiere chattene dine."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Last opp nøkler fra denne enheten"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Tillat nøkkellagring"</string>
   <string name="screen_chat_backup_recovery_action_change">"Endre gjenopprettingsnøkkel"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Gjenopprett din kryptografiske identitet og meldingshistorikk med en gjenopprettingsnøkkel hvis du har mistet alle dine brukte enheter."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Chattene dine sikkerhetskopieres automatisk med ende-til-ende-kryptering. For å gjenopprette denne sikkerhetskopien og beholde din digitale identitet når du mister tilgang til alle enhetene dine, trenger du gjenopprettingsnøkkelen din."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Skriv inn gjenopprettingsnøkkel"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Nøkkellagringen din er for øyeblikket ikke synkronisert."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Hent gjenopprettingsnøkkel"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Chattene dine sikkerhetskopieres automatisk med ende-til-ende-kryptering. For å gjenopprette denne sikkerhetskopien og beholde din digitale identitet når du mister tilgang til alle enhetene dine, trenger du gjenopprettingsnøkkelen din."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Åpne %1$s på en datamaskin"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Logg på kontoen din igjen"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Når du blir bedt om å verifisere din enhet, velger du %1$s"</string>
@@ -19,14 +20,35 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Følg instruksjonene for å opprette en ny gjenopprettingsnøkkel"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Du bør lagre din nye gjenopprettingsnøkkel i en passordbehandler eller i et kryptert notat"</string>
   <string name="screen_create_new_recovery_key_title">"Tilbakestill krypteringen for kontoen din ved hjelp av en annen enhet"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Gjenopprettingsnøkkelen du skrev inn samsvarer ikke"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Fullfør oppsett"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Skriv inn gjenopprettingsnøkkelen din på nytt."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Bekreft gjenopprettingsnøkkelen din"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Minst %1$d tegn. Ikke bruk passordet til kontoen din"</item>
+    <item quantity="other">"Minst %1$d tegn. Ikke bruk passordet til kontoen din"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Styrke"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Passordstyrke: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Moderat"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Sterk"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Veldig sterk"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Veldig svak"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Svak"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Velg en gjenopprettingsnøkkel som du kan huske."</string>
+  <string name="screen_custom_recovery_key_input_title">"Skriv inn en gjenopprettingsnøkkel"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Laster inn krav til gjenopprettingsnøkkel"</string>
+  <string name="screen_custom_recovery_key_success_notice">"For å endre gjenopprettingsnøkkelen din, gå til Innstillinger → Kryptering → Sikkerhetskopi"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Du kan bruke gjenopprettingsnøkkelen din til å bekrefte nye enheter eller gjenopprette krypterte chatter hvis du mister tilgangen til alle enhetene dine."</string>
+  <string name="screen_custom_recovery_key_success_title">"Sikkerhetskopien din er nå ferdig konfigurert"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Fortsett tilbakestillingen"</string>
   <string name="screen_encryption_reset_bullet_1">"Dine kontodetaljer, kontakter, innstillinger og chatteliste vil bli beholdt"</string>
   <string name="screen_encryption_reset_bullet_2">"Du mister all meldingshistorikk som bare er lagret på serveren"</string>
   <string name="screen_encryption_reset_bullet_3">"Du må verifisere alle eksisterende enheter og kontakter på nytt"</string>
-  <string name="screen_encryption_reset_footer">"Tilbakestill identiteten din bare hvis du ikke har tilgang til en annen pålogget enhet og du har mistet gjenopprettingsnøkkelen."</string>
-  <string name="screen_encryption_reset_title">"Kan du ikke bekrefte? Du må tilbakestille identiteten din."</string>
+  <string name="screen_encryption_reset_footer">"Tilbakestill bare den digitale identiteten din hvis du ikke har tilgang til en annen bekreftet enhet og du ikke har gjenopprettingsnøkkelen din."</string>
+  <string name="screen_encryption_reset_title">"Kan du ikke bekrefte? Du må tilbakestille den digitale identiteten din."</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Slett"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Du mister de krypterte meldingene dine hvis du er logget ut av alle enheter."</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Du vil miste den krypterte chatloggen din og må tilbakestille den digitale identiteten din hvis du fjerner alle enhetene dine."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Er du sikker på at du vil slette nøkkellagringen?"</string>
   <string name="screen_key_backup_disable_description">"Sletting av nøkkellagring vil fjerne din kryptografiske identitet og meldingsnøkler fra serveren og deaktivere følgende sikkerhetsfunksjoner:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Du vil ikke ha kryptert meldingshistorikk på nye enheter"</string>
@@ -61,9 +83,9 @@
   <string name="screen_recovery_key_setup_title">"Hent gjenopprettingsnøkkel"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ja, tilbakestill nå"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Denne prosessen kan ikke angres."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Er du sikker på at du vil tilbakestille identiteten din?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Er du sikker på at du vil tilbakestille den digitale identiteten din?"</string>
   <string name="screen_reset_encryption_password_error">"En ukjent feil har oppstått. Vennligst sjekk at passordet ditt er riktig og prøv igjen."</string>
   <string name="screen_reset_encryption_password_placeholder">"Angi…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Bekreft at du vil tilbakestille identiteten din."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Bekreft at du vil tilbakestille din digitale identitet."</string>
   <string name="screen_reset_encryption_password_title">"Skriv inn passordet til kontoen din for å fortsette"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-pl/translations.xml b/features/securebackup/impl/src/main/res/values-pl/translations.xml
index fb30d786c0..fb1da3ca04 100644
--- a/features/securebackup/impl/src/main/res/values-pl/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-pl/translations.xml
@@ -2,34 +2,57 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Wyłącz backup"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Włącz backup"</string>
-  <string name="screen_chat_backup_key_backup_description">"Bezpiecznie przechowuj swoją tożsamość kryptograficzną i klucze wiadomości na serwerze. Umożliwi to przeglądanie historii wiadomości na każdym nowym urządzeniu. %1$s"</string>
+  <string name="screen_chat_backup_key_backup_description">"Umożliwi Ci to przeglądanie historii czatów na nowych urządzeniach i jest wymagane do tworzenia kopii zapasowych i tożsamości cyfrowej. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Magazyn kluczy"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Magazyn kluczy musi być włączony, aby włączyć przywracanie."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Magazyn kluczy musi być włączony, aby włączyć archiwizowanie czatów."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Prześlij klucze z tego urządzenia"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Zezwól na magazynowanie kluczy"</string>
   <string name="screen_chat_backup_recovery_action_change">"Zmień klucz przywracania"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Odzyskaj swoją tożsamość kryptograficzną i historię wiadomości za pomocą klucza przywracania, jeśli utraciłeś dostęp do wszystkich swoich urządzeń."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Twoje czaty są automatycznie archiwizowane za pomocą szyfrowania end-to-end. Aby przywrócić tę kopię zapasową i swoją tożsamość cyfrową, wymagany będzie klucz przywracania."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Wprowadź klucz przywracania"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Magazyn kluczy nie jest zsynchronizowany."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Skonfiguruj przywracanie"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Uzyskaj klucz przywracania"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Twoje czaty są automatycznie archiwizowane za pomocą szyfrowania end-to-end. Aby przywrócić tę kopię zapasową i swoją tożsamość cyfrową, wymagany będzie klucz przywracania."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Otwórz %1$s na urządzeniu stacjonarnym"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Zaloguj się ponownie na swoje konto"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Gdy pojawi się prośba o weryfikację urządzenia, wybierz %1$s"</string>
-  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Resetuj wszystko”"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Zresetuj wszystko”"</string>
   <string name="screen_create_new_recovery_key_list_item_4">"Postępuj zgodnie z instrukcjami, aby utworzyć nowy klucz przywracania"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Zapisz nowy klucz przywracania w menedżerze haseł lub notatce szyfrowanej"</string>
-  <string name="screen_create_new_recovery_key_title">"Resetuj szyfrowanie swojego konta za pomocą drugiego urządzenia"</string>
+  <string name="screen_create_new_recovery_key_title">"Zresetuj szyfrowanie swojego konta za pomocą drugiego urządzenia"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Wprowadzony klucz przywracania nie pasuje"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Zakończ konfigurację"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Wprowadź ponownie klucz przywracania."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Potwierdź swój klucz przywracania"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Co najmniej %1$d znak. Nie wykorzystuj swojego hasła."</item>
+    <item quantity="few">"Co najmniej %1$d znaki. Nie wykorzystuj swojego hasła."</item>
+    <item quantity="many">"Co najmniej %1$d znaków. Nie wykorzystuj swojego hasła."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Siła"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Siła hasła: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Średnie"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Silne"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Bardzo silne"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Bardzo słabe"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Słabe"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Wybierz klucz przywracania, który łatwo zapamiętasz."</string>
+  <string name="screen_custom_recovery_key_input_title">"Wprowadź klucz przywracania"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Wczytywanie wymagań hasła"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Aby zmienić klucz przywracania przejdź do Ustawienia → Szyfrowanie → Kopia zapasowa"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Możesz użyć klucza przywracania, żeby potwierdzić nowe urządzenia lub przywrócić zaszyfrowane czaty, jeśli stracisz dostęp do wszystkich swoich urządzeń."</string>
+  <string name="screen_custom_recovery_key_success_title">"Twoja kopia zapasowa jest gotowa."</string>
   <string name="screen_encryption_reset_action_continue_reset">"Kontynuuj resetowanie"</string>
   <string name="screen_encryption_reset_bullet_1">"Szczegóły konta, kontakty, preferencje i lista czatów zostaną zachowane"</string>
   <string name="screen_encryption_reset_bullet_2">"Utracisz istniejącą historię wiadomości"</string>
   <string name="screen_encryption_reset_bullet_3">"Wymagana będzie ponowna weryfikacja istniejących urządzeń i kontaktów"</string>
-  <string name="screen_encryption_reset_footer">"Zresetuj swoją tożsamość tylko wtedy, gdy nie jesteś zalogowany na żadnym urządzeniu i straciłeś swój klucz przywracania."</string>
-  <string name="screen_encryption_reset_title">"Zresetuj swoją tożsamość, jeśli nie możesz jej potwierdzić w inny sposób"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Wyłącz"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Jeśli wylogujesz się ze wszystkich urządzeń, stracisz wszystkie wiadomości szyfrowane."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Czy na pewno chcesz wyłączyć backup?"</string>
-  <string name="screen_key_backup_disable_description">"Wyłączenie backupu spowoduje usunięcie kopii klucza szyfrowania i wyłączenie innych funkcji bezpieczeństwa. W takim przypadku będziesz:"</string>
-  <string name="screen_key_backup_disable_description_point_1">"Posiadał historii wiadomości szyfrowanych na nowych urządzeniach"</string>
+  <string name="screen_encryption_reset_footer">"Zresetuj swoją tożsamość tylko wtedy, gdy nie posiadasz dostępu do żadnego innego zweryfikowanego urządzenia i straciłeś swój klucz przywracania."</string>
+  <string name="screen_encryption_reset_title">"Nie możesz potwierdzić? Zresetuj swoją tożsamość cyfrową."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Usuń"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Jeśli usuniesz wszystkie swoje urządzenia, stracisz zaszyfrowaną historię wiadomości i będziesz musiał zresetować swoją tożsamość cyfrową."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Czy na pewno chcesz usunąć magazyn kluczy?"</string>
+  <string name="screen_key_backup_disable_description">"Usunięcie magazynu kluczy usunie Twoją tożsamość cyfrową i klucze wiadomości z serwera, wyłączając następujące funkcje bezpieczeństwa:"</string>
+  <string name="screen_key_backup_disable_description_point_1">"Stracisz dostęp do zaszyfrowanej historii wiadomości na nowych urządzeniach"</string>
   <string name="screen_key_backup_disable_description_point_2">"Utracisz dostęp do wiadomości szyfrowanych, jeśli zostaniesz wszędzie wylogowany z %1$s"</string>
   <string name="screen_key_backup_disable_title">"Czy na pewno chcesz wyłączyć backup?"</string>
   <string name="screen_recovery_key_change_description">"Uzyskaj nowy klucz przywracania, jeśli straciłeś dostęp do obecnego. Po zmianie klucza przywracania stary nie będzie już działał."</string>
@@ -58,12 +81,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Wygeneruj klucz przywracania"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Nie udostępniaj tego nikomu!"</string>
   <string name="screen_recovery_key_setup_success">"Skonfigurowano przywracanie pomyślnie"</string>
-  <string name="screen_recovery_key_setup_title">"Skonfiguruj przywracanie"</string>
+  <string name="screen_recovery_key_setup_title">"Uzyskaj klucz przywracania"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Tak, zresetuj teraz"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Tego procesu nie można odwrócić."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Czy na pewno chcesz zresetować szyfrowanie?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Czy na pewno chcesz zresetować swoją tożsamość cyfrową?"</string>
   <string name="screen_reset_encryption_password_error">"Wystąpił nieznany błąd. Sprawdź, czy hasło jest poprawne i spróbuj ponownie."</string>
   <string name="screen_reset_encryption_password_placeholder">"Wprowadź…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Potwierdź, że chcesz zresetować szyfrowanie."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Potwierdź, że chcesz zresetować swoją tożsamość cyfrową."</string>
   <string name="screen_reset_encryption_password_title">"Wprowadź hasło, aby kontynuować"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml b/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
index 4423ae60ee..4dc368046d 100644
--- a/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Apagar o armazenamento de chaves"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Ativar o backup"</string>
-  <string name="screen_chat_backup_key_backup_description">"Armazene sua identidade criptográfica e chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em dispositivos futuros. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Isso te permite ver seu histórico de conversas em dispositivos novos, e é necessário para o backup de conversas e identidade digital. %1$s"</string>
   <string name="screen_chat_backup_key_backup_title">"Armazenamento de chaves"</string>
   <string name="screen_chat_backup_key_storage_disabled_error">"O armazenamento de chaves deve ser ativado para configurar a recuperação."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Enviar chaves a partir deste dispositivo"</string>
@@ -11,7 +11,7 @@
   <string name="screen_chat_backup_recovery_action_change_description">"Recupere sua identidade criptográfica e o histórico de mensagens com uma chave de recuperação, caso você tenha perdido todos os dispositivos existentes."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Digitar chave de recuperação"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Seu armazenamento de chaves está fora de sincronia no momento."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Configurar a recuperação"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Receber chave de recuperação"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Abra o %1$s em um computador"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Entre na sua conta novamente"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Ao ser solicitado para verificar o seu dispositivo, selecione %1$s"</string>
@@ -25,10 +25,10 @@
   <string name="screen_encryption_reset_bullet_3">"Você precisará verificar todos os seus dispositivos e contatos existentes novamente."</string>
   <string name="screen_encryption_reset_footer">"Redefina sua identidade somente se você não tiver acesso a outro dispositivo conectado e se tiver perdido sua chave de recuperação."</string>
   <string name="screen_encryption_reset_title">"Não consegue confirmar? Você precisará redefinir sua identidade."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Desativar"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Você perderá suas mensagens criptografadas se for desconectado de todos os dispositivos."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Tem certeza de que deseja desativar o backup?"</string>
-  <string name="screen_key_backup_disable_description">"Ao apagar o armazenamento de chaves, a sua identidade criptográfica e as chaves das mensagens serão apagadas do servidor e os seguintes recursos de segurança serão desativados:"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Apagar"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Você perderá o seu histórico de mensagens criptografadas e precisará reconfigurar sua identidade digital se remover todos os dispositivos."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Tem certeza de que deseja apagar o armazenamento de chaves?"</string>
+  <string name="screen_key_backup_disable_description">"Ao apagar o armazenamento de chaves, a sua identidade digital e as chaves das mensagens serão apagadas do servidor e os seguintes recursos de segurança serão desativados:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Você não terá o histórico de mensagens criptografadas em dispositivos novos"</string>
   <string name="screen_key_backup_disable_description_point_2">"Você perderá o acesso às suas mensagens criptografadas se for desconectado de %1$s em todos os dispositivos"</string>
   <string name="screen_key_backup_disable_title">"Tem certeza de que deseja desativar o armazenamento de chaves e apagá-lo?"</string>
@@ -58,7 +58,7 @@
   <string name="screen_recovery_key_setup_generate_key">"Gere sua chave de recuperação"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Não compartilhe isso com ninguém!"</string>
   <string name="screen_recovery_key_setup_success">"Configuração de recuperação bem-sucedida"</string>
-  <string name="screen_recovery_key_setup_title">"Configurar a recuperação"</string>
+  <string name="screen_recovery_key_setup_title">"Receber chave de recuperação"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Sim, redefinir agora"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Esse processo é irreversível."</string>
   <string name="screen_reset_encryption_confirmation_alert_title">"Você tem certeza de que deseja redefinir sua identidade?"</string>
diff --git a/features/securebackup/impl/src/main/res/values-pt/translations.xml b/features/securebackup/impl/src/main/res/values-pt/translations.xml
index 1e5d8b03ab..66051ca04b 100644
--- a/features/securebackup/impl/src/main/res/values-pt/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-pt/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Desativar a cópia de segurança"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Ativar a cópia de segurança"</string>
-  <string name="screen_chat_backup_key_backup_description">"Guarda a tua identidade criptográfica e as chaves de mensagens de forma segura no servidor. Isto permitir-te-á ver o teu histórico de mensagens em qualquer dispositivo novo. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Permite-te ver o teu histórico de mensagens em qualquer dispositivo novo. É necessário para teres cópias de segurança das tuas conversas e da tua identidade digital. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Armazenamento de chaves"</string>
   <string name="screen_chat_backup_key_storage_disabled_error">"O armazenamento de chaves deve ser ativado para configurar a recuperação."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Carrega chaves a partir deste dispositivo"</string>
@@ -11,7 +11,7 @@
   <string name="screen_chat_backup_recovery_action_change_description">"Recupera a tua identidade criptográfica e o histórico de mensagens com uma chave de recuperação, caso tenhas perdido todos os teus dispositivos existentes."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Insere a chave de recuperação"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"O teu armazenamento de chaves está atualmente dessincronizado."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Configurar recuperação"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Chave de recuperação"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Abre a %1$s num computador"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Iniciar sessão novamente"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Quando te for pedido para verificares o teu dispositivo, seleciona %1$s"</string>
@@ -25,10 +25,10 @@
   <string name="screen_encryption_reset_bullet_3">"Necessitarás de verificar todos os teus dispositivos e contactos novamente."</string>
   <string name="screen_encryption_reset_footer">"Repõe a tua identidade apenas se não tiveres acesso a mais nenhum dispositivo com sessão iniciada e se tiveres perdido a tua chave de recuperação."</string>
   <string name="screen_encryption_reset_title">"Repõe a tua identidade caso não consigas confirmar de outra forma"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Desligar"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Perderás as tuas mensagens cifradas se tiveres terminado a sessão em todos os teus dispositivos."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Tens a certeza que queres desativar a cópia de segurança?"</string>
-  <string name="screen_key_backup_disable_description">"Desativar a cópia de segurança irá remover a atual cópia da chave de cifragem e desativar outras funcionalidades de segurança. Neste caso, irás:"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Eliminar"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Perderás os históricos de conversas cifradas e terás que repor a tua identidade digital caso removas todos os teus dispositivos."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Tens a certeza que queres eliminar o armazenamento de chaves?"</string>
+  <string name="screen_key_backup_disable_description">"Eliminar o armazenamento de chaves irá remover a tua identidade digital e chaves de mensagem do servidor. Irá também desativar as seguintes funcionalidades de segurança:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Não ter o histórico de mensagens cifradas em novos dispositivos"</string>
   <string name="screen_key_backup_disable_description_point_2">"Perder o acesso às tuas mensagens cifradas se terminares todas as sessões %1$s"</string>
   <string name="screen_key_backup_disable_title">"Tens a certeza que queres desativar a cópia de segurança?"</string>
@@ -58,7 +58,7 @@
   <string name="screen_recovery_key_setup_generate_key">"Gerar a tua chave de recuperação"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Não partilhes isto com ninguém!"</string>
   <string name="screen_recovery_key_setup_success">"Recuperação configurada com sucesso"</string>
-  <string name="screen_recovery_key_setup_title">"Configurar recuperação"</string>
+  <string name="screen_recovery_key_setup_title">"Chave de recuperação"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Sim, repor agora"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Este processo é irreversível."</string>
   <string name="screen_reset_encryption_confirmation_alert_title">"Tens a certeza que pretendes repor a tua cifra?"</string>
diff --git a/features/securebackup/impl/src/main/res/values-ro/translations.xml b/features/securebackup/impl/src/main/res/values-ro/translations.xml
index f8adf79229..2351a54923 100644
--- a/features/securebackup/impl/src/main/res/values-ro/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-ro/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Dezactivați backupul"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Activați backupul"</string>
-  <string name="screen_chat_backup_key_backup_description">"Stocați identitatea criptografică și cheile de mesaje în siguranță pe server. Acest lucru vă va permite să vizualizați mesajele anterioare pe orice dispozitiv nou. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Acest lucru vă va permite să vizualizați istoricul camerelor pe orice dispozitiv nou și este necesar pentru backupul mesajelor și al identității digitale. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Backup"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Stocarea cheilor trebuie activată pentru a configura recuperarea."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Stocarea cheilor trebuie activată pentru a face un backup al mesajelor."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Încărcați cheile de pe acest dispozitiv"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Permiteți stocarea cheilor"</string>
   <string name="screen_chat_backup_recovery_action_change">"Schimbați cheia de recuperare"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Recuperați-vă identitatea criptografică și mesajele anterioare cu o cheie de recuperare dacă ați pierdut toate dispozitivele existente."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Mesajele dumneavoastră sunt copiate automat cu criptare end-to-end. Pentru a restaura această copie de rezervă și a vă păstra identitatea digitală atunci când pierdeți accesul la toate dispozitivele dumneavoastră, veți avea nevoie de cheia de recuperare."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Introduceți cheia de recuperare"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Backup-ul pentru chat nu este sincronizat în prezent."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Configurați recuperarea"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Obțineți cheia de recuperare"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Chaturile dumneavoastră sunt salvate automat cu criptare end-to-end. Pentru a restaura această copie de rezervă și a vă păstra identitatea digitală atunci când pierdeți accesul la toate dispozitivele dumneavoastră, veți avea nevoie de cheia de recuperare."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Deschideți %1$s pe un dispozitiv desktop"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Conectați-vă din nou la contul dumneavoastră"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Când vi se cere să vă verificați dispozitivul, selectați%1$s"</string>
@@ -23,8 +24,8 @@
   <string name="screen_encryption_reset_bullet_1">"Detaliile contului, contactele, preferințele și lista de chat vor fi păstrate"</string>
   <string name="screen_encryption_reset_bullet_2">"Veți pierde mesajele anterioare care au fost stocate doar pe server"</string>
   <string name="screen_encryption_reset_bullet_3">"Va trebui să verificați din nou toate dispozitivele și contactele existente"</string>
-  <string name="screen_encryption_reset_footer">"Resetați-vă identitatea numai dacă nu aveți acces la un alt dispozitiv conectat și ați pierdut cheia de recuperare."</string>
-  <string name="screen_encryption_reset_title">"Nu puteți confirma? Va trebui să vă resetați identitatea."</string>
+  <string name="screen_encryption_reset_footer">"Resetați-vă identitatea digitală numai dacă nu aveți acces la un alt dispozitiv conectat și ați pierdut cheia de recuperare."</string>
+  <string name="screen_encryption_reset_title">"Nu puteți confirma? Va trebui să vă resetați identitatea digitală."</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Dezactivare"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Veți pierde mesajele criptate dacă sunteți deconectat de pe toate dispozitivele."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Sunteți sigur că doriți să dezactivați backup-ul?"</string>
@@ -58,12 +59,12 @@
   <string name="screen_recovery_key_setup_generate_key">"Generați cheia de recuperare"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Nu împărtășiți cheia cu nimeni!"</string>
   <string name="screen_recovery_key_setup_success">"Configurarea recuperării a reușit"</string>
-  <string name="screen_recovery_key_setup_title">"Configurați recuperarea"</string>
+  <string name="screen_recovery_key_setup_title">"Obțineți cheia de recuperare"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Da, resetați acum"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Acest proces este ireversibil."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Sunteți sigur că doriți să vă resetați identitatea?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Sunteți sigur că doriți să vă resetați identitatea digitală?"</string>
   <string name="screen_reset_encryption_password_error">"S-a produs o eroare necunoscută. Vă rugăm să verificați dacă parola contului dvs. este corectă și să încercați din nou."</string>
   <string name="screen_reset_encryption_password_placeholder">"Introduceți…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Confirmați că doriți să vă resetați identitatea."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Confirmați că doriți să vă resetați identitatea digitală."</string>
   <string name="screen_reset_encryption_password_title">"Introduceți parola contului pentru a continua"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-ru/translations.xml b/features/securebackup/impl/src/main/res/values-ru/translations.xml
index 4ae9a2e423..7f24725c82 100644
--- a/features/securebackup/impl/src/main/res/values-ru/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-ru/translations.xml
@@ -8,27 +8,50 @@
   <string name="screen_chat_backup_key_storage_toggle_description">"Загрузить ключи с этого устройства"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Разрешить хранение ключей"</string>
   <string name="screen_chat_backup_recovery_action_change">"Изменить ключ восстановления"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Если вы потеряли доступ к другим устройствам, то сможете восстановить свою идентификацию и историю сообщений с помощью ключа восстановления."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Ваши чаты автоматически резервируются с помощью сквозного шифрования. Для восстановления резервной копии и сохранения Вашей цифровой личности в случае потери доступа ко всем устройствам потребуется ключ восстановления."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Введите ключ восстановления"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"В настоящее время резервная копия ваших чатов не синхронизирована."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Получить ключ восстановления"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Ваши чаты автоматически резервируются с использованием сквозного шифрования. Для восстановления этой резервной копии и сохранения вашей цифровой личности в случае потери доступа ко всем вашим устройствам вам потребуется ключ восстановления."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Откройте %1$s на компьютере"</string>
-  <string name="screen_create_new_recovery_key_list_item_2">"Войдите в свой аккаунт еще раз"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Войдите в свой аккаунт ещё раз"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Когда потребуется подтвердить устройство, выберите %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"«Сбросить все»"</string>
   <string name="screen_create_new_recovery_key_list_item_4">"Следуйте инструкциям, чтобы создать новый ключ восстановления"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Сохраните новый ключ восстановления в менеджере паролей или зашифрованной заметке"</string>
-  <string name="screen_create_new_recovery_key_title">"Сбросьте шифрование вашего аккаунта, используя другое устройство"</string>
+  <string name="screen_create_new_recovery_key_title">"Сбросьте шифрование Вашего аккаунта, используя другое устройство"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Введенный вами ключ восстановления не совпадает."</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Завершить настройку"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Введите ваш ключ восстановления еще раз."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Подтвердите ваш ключ восстановления."</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Минимальное количество символов: %1$d. Не используйте пароль от своей учетной записи."</item>
+    <item quantity="few">"Минимальное количество символов: %1$d. Не используйте пароль от своей учетной записи."</item>
+    <item quantity="many">"Минимальное количество символов: %1$d. Не используйте пароль от своей учетной записи."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Прочность"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Надежность парольной фразы: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Умеренный"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Сильный"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Очень сильный"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Очень слабый"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Слабый"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Выберите ключ восстановления, который вы сможете запомнить."</string>
+  <string name="screen_custom_recovery_key_input_title">"Введите ключ восстановления"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Загрузка требований к ключу восстановления"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Чтобы изменить ключ восстановления, перейдите в Настройки → Шифрование → Резервное копирование"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Вы можете использовать свой ключ восстановления для подтверждения новых устройств или восстановления зашифрованных чатов, если потеряете доступ ко всем своим устройствам."</string>
+  <string name="screen_custom_recovery_key_success_title">"Ваша резервная копия полностью настроена."</string>
   <string name="screen_encryption_reset_action_continue_reset">"Продолжить сброс"</string>
   <string name="screen_encryption_reset_bullet_1">"Данные вашего аккаунта, контакты, настройки и список чатов будут сохранены"</string>
   <string name="screen_encryption_reset_bullet_2">"Вы потеряете историю тех сообщений, которые хранятся только на сервере"</string>
   <string name="screen_encryption_reset_bullet_3">"Вам нужно будет заново подтвердить все существующие устройства и контакты."</string>
-  <string name="screen_encryption_reset_footer">"Сбрасывайте личность только в том случае, если у вас нет доступа к другим устройству, на которых выполнен вход, и вы потеряли ключ восстановления."</string>
-  <string name="screen_encryption_reset_title">"Не можете подтвердить? Вам потребуется сбросить личность вашей учетной записи."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Выключить"</string>
+  <string name="screen_encryption_reset_footer">"Сбрасывайте ключ шифрования только в том случае, если у Вас нет доступа к другому устройству, на котором выполнен вход, и Вы потеряли ключ восстановления."</string>
+  <string name="screen_encryption_reset_title">"Не можете подтвердить? Вам потребуется сбросить свою цифровую идентификацию."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Удалить"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Вы потеряете зашифрованные сообщения, если выйдете из всех устройств."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Вы действительно хотите отключить резервное копирование?"</string>
-  <string name="screen_key_backup_disable_description">"Удаление хранилища ключей приведёт к удалению вашей криптографической личности и ключей сообщений с сервера, а также отключению следующих функций безопасности:"</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Вы уверены, что хотите удалить хранилище ключей?"</string>
+  <string name="screen_key_backup_disable_description">"Удаление хранилища ключей приведет к удалению вашей цифровой идентификации и ключей сообщений с сервера, а также к отключению следующих функций безопасности:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Нет зашифрованной истории сообщений на новых устройствах"</string>
   <string name="screen_key_backup_disable_description_point_2">"Вы потеряете доступ к зашифрованным сообщениям, если выйдете из %1$s везде"</string>
   <string name="screen_key_backup_disable_title">"Вы уверены, что хотите отключить хранение ключей и удалить их?"</string>
@@ -39,9 +62,9 @@
   <string name="screen_recovery_key_change_title">"Изменить ключ восстановления?"</string>
   <string name="screen_recovery_key_confirm_create_new_recovery_key">"Создать новый ключ восстановления"</string>
   <string name="screen_recovery_key_confirm_description">"Убедитесь, что никто не подсматривает)"</string>
-  <string name="screen_recovery_key_confirm_error_content">"Пожалуйста, попробуйте еще раз, чтобы подтвердить доступ к резервной копии чата."</string>
+  <string name="screen_recovery_key_confirm_error_content">"Пожалуйста, попробуйте ещё раз, чтобы подтвердить доступ к резервной копии чата."</string>
   <string name="screen_recovery_key_confirm_error_title">"Неверный ключ восстановления"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Если у вас есть пароль для восстановления или секретный пароль/ключ, это тоже сработает."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Если у Вас есть ключ/фраза для восстановления, это тоже сработает."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Введите…"</string>
   <string name="screen_recovery_key_confirm_lost_recovery_key">"Потеряли ключ восстановления?"</string>
   <string name="screen_recovery_key_confirm_success">"Ключ восстановления подтвержден"</string>
diff --git a/features/securebackup/impl/src/main/res/values-sk/translations.xml b/features/securebackup/impl/src/main/res/values-sk/translations.xml
index b02d5ecfbb..4e646ef47e 100644
--- a/features/securebackup/impl/src/main/res/values-sk/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-sk/translations.xml
@@ -11,7 +11,7 @@
   <string name="screen_chat_backup_recovery_action_change_description">"Obnovte svoju kryptografickú totožnosť a históriu správ pomocou kľúča na obnovenie, ak ste stratili všetky svoje existujúce zariadenia."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Zadajte kľúč na obnovenie"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaše úložisko kľúčov nie je momentálne synchronizované."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Nastaviť obnovenie"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Získať kľúč na obnovenie"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Otvoriť %1$s v stolnom počítači"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Znova sa prihláste do svojho účtu"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Keď sa zobrazí výzva na overenie vášho zariadenia, vyberte %1$s"</string>
@@ -25,10 +25,10 @@
   <string name="screen_encryption_reset_bullet_3">"Budete musieť znova overiť všetky existujúce zariadenia a kontakty"</string>
   <string name="screen_encryption_reset_footer">"Obnovte svoju totožnosť iba vtedy, ak nemáte prístup k inému prihlásenému zariadeniu a stratili ste kľúč na obnovenie."</string>
   <string name="screen_encryption_reset_title">"Znovu nastavte svoju totožnosť v prípade, že ju nemôžete potvrdiť iným spôsobom"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Vypnúť"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Stratíte prístup k svojim zašifrovaným správam, ak sa odhlásite zo všetkých zariadení"</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Ste si istí, že chcete vypnúť zálohovanie?"</string>
-  <string name="screen_key_backup_disable_description">"Vypnutím zálohovania sa odstráni aktuálna záloha šifrovacích kľúčov a vypnú sa ďalšie bezpečnostné funkcie. V tomto prípade:"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Odstrániť"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Ak odstránite všetky svoje zariadenia, stratíte svoju zašifrovanú históriu správ a budete si musieť obnoviť svoju digitálnu identitu."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Naozaj chcete odstrániť úložisko kľúčov?"</string>
+  <string name="screen_key_backup_disable_description">"Odstránením úložiska kľúčov sa zo servera odstránia vaše kľúče digitálnej identity a správ a vypnú sa nasledujúce bezpečnostné funkcie:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Na nových zariadeniach nebudete mať zašifrovanú históriu správ"</string>
   <string name="screen_key_backup_disable_description_point_2">"Stratíte prístup k svojim zašifrovaným správam, ak sa odhlásite z aplikácie %1$s na všetkých zariadeniach"</string>
   <string name="screen_key_backup_disable_title">"Ste si istí, že chcete vypnúť zálohovanie?"</string>
@@ -58,7 +58,7 @@
   <string name="screen_recovery_key_setup_generate_key">"Vygenerujte si váš kľúč na obnovenie"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Nezdieľajte to s nikým!"</string>
   <string name="screen_recovery_key_setup_success">"Úspešné nastavenie obnovy"</string>
-  <string name="screen_recovery_key_setup_title">"Nastaviť obnovenie"</string>
+  <string name="screen_recovery_key_setup_title">"Získať kľúč na obnovenie"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Áno, znovu nastaviť teraz"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Tento proces je nezvratný."</string>
   <string name="screen_reset_encryption_confirmation_alert_title">"Naozaj chcete obnoviť svoje šifrovanie?"</string>
diff --git a/features/securebackup/impl/src/main/res/values-uk/translations.xml b/features/securebackup/impl/src/main/res/values-uk/translations.xml
index 218e6d64fd..c75f300b05 100644
--- a/features/securebackup/impl/src/main/res/values-uk/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-uk/translations.xml
@@ -2,33 +2,56 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Вимкнути резервне копіювання"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Увімкнути резервне копіювання"</string>
-  <string name="screen_chat_backup_key_backup_description">"Зберігайте свій криптографічний ідентифікатор і ключі повідомлень на сервері. Це дозволить вам переглядати історію повідомлень на будь-яких нових пристроях. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Це дозволить вам переглядати історію бесід на нових пристроях і необхідно для резервного копіювання бесід і цифрової ідентичності. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Резервне копіювання"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Щоб налаштувати відновлення, потрібно ввімкнути зберігання ключів."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Для створення резервної копії ваших бесід необхідно ввімкнути функцію зберігання ключів."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Завантажте ключі з цього пристрою"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Дозволити зберігання ключів"</string>
   <string name="screen_chat_backup_recovery_action_change">"Змінити ключ відновлення"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Відновіть криптографічну ідентичність та історію повідомлень за допомогою ключа відновлення, якщо ви втратили всі наявні пристрої."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Ваші бесіди автоматично резервуються з використанням наскрізного шифрування. Щоб відновити цю резервну копію та зберегти свою цифрову ідентичність у разі втрати доступу до всіх своїх пристроїв, вам знадобиться ключ відновлення."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Введіть ключ відновлення"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Сховище ключів наразі не синхронізовано."</string>
-  <string name="screen_chat_backup_recovery_action_setup">"Налаштувати відновлення"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Отримати ключ відновлення"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Ваші бесіди автоматично резервуються з використанням наскрізного шифрування. Щоб відновити цю резервну копію та зберегти свою цифрову ідентичність у разі втрати доступу до всіх своїх пристроїв, вам знадобиться ключ відновлення."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Відкрийте %1$s на комп\'ютері"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Увійдіть до вашого облікового запису знову"</string>
-  <string name="screen_create_new_recovery_key_list_item_3">"Коли вас попросять підтвердити пристрій, виберіть %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Коли вас попросять звірити пристрій, виберіть %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Скинути все”"</string>
   <string name="screen_create_new_recovery_key_list_item_4">"Дотримуйтесь інструкцій, щоб створити новий ключ відновлення"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Збережіть новий ключ відновлення у менеджері паролів або зашифрованій нотатці"</string>
   <string name="screen_create_new_recovery_key_title">"Скинути шифрування облікового запису за допомогою іншого пристрою"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"Введений ключ відновлення не збігається"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Завершити налаштування"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Повторно введіть свій ключ відновлення."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Підтвердьте свій ключ відновлення"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Щонайменше %1$d символ. Не використовуйте пароль облікового запису."</item>
+    <item quantity="few">"Щонайменше %1$d символи. Не використовуйте пароль облікового запису."</item>
+    <item quantity="many">"Щонайменше %1$d символів. Не використовуйте пароль облікового запису."</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Надійність"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Надійність парольної фрази: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Посередня"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Надійна"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Дуже надійна"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Дуже ненадійна"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Ненадійна"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Оберіть ключ відновлення, який ви зможете запам\'ятати."</string>
+  <string name="screen_custom_recovery_key_input_title">"Введіть ключ відновлення"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Завантаження вимог до ключа відновлення"</string>
+  <string name="screen_custom_recovery_key_success_notice">"Щоб змінити ключ відновлення, перейдіть до Налаштування → Шифрування → Резервне копіювання"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"Ви можете використовувати свій ключ відновлення для підтвердження нових пристроїв або відновлення зашифрованих бесід, якщо втратите доступ до всіх своїх пристроїв."</string>
+  <string name="screen_custom_recovery_key_success_title">"Налаштування резервного копіювання завершено"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Продовжити скидання налаштувань"</string>
   <string name="screen_encryption_reset_bullet_1">"Дані вашого облікового запису, контакти, налаштування й бесіди будуть збережені"</string>
   <string name="screen_encryption_reset_bullet_2">"Ви втратите свою наявну історію повідомлень"</string>
-  <string name="screen_encryption_reset_bullet_3">"Вам доведеться верифікувати всі наявні пристрої та контакти повторно"</string>
-  <string name="screen_encryption_reset_footer">"Скидайте ідентичність тільки якщо ви не маєте доступу до інших пристроїв в обліковому записі та втратили свій ключ відновлення."</string>
-  <string name="screen_encryption_reset_title">"Не можете підтвердити? Вам доведеться скинути свою ідентичність."</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Вимкнути"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Ви втратите зашифровані повідомлення, якщо вийдете з усіх пристроїв."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Ви впевнені, що хочете вимкнути резервне копіювання?"</string>
-  <string name="screen_key_backup_disable_description">"Вимкнення резервного копіювання призведе до видалення поточної резервної копії ключа шифрування та вимкнення інших функцій безпеки. В такому разі ви:"</string>
+  <string name="screen_encryption_reset_bullet_3">"Вам потрібно буде повторно звірити всі наявні пристрої та контакти"</string>
+  <string name="screen_encryption_reset_footer">"Скидайте свою цифрову ідентичність лише якщо у вас немає доступу до іншого звіреного пристрою та ключа відновлення."</string>
+  <string name="screen_encryption_reset_title">"Не можете підтвердити? Вам доведеться скинути свою цифрову ідентичність."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Видалити"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Якщо ви вилучите всі свої пристрої, ви втратите історію зашифрованих бесід і вам доведеться скинути свою цифрову ідентичність."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Ви впевнені, що хочете видалити сховище ключів?"</string>
+  <string name="screen_key_backup_disable_description">"Видалення сховища ключів призведе до видалення вашої цифрової ідентичності та ключів повідомлень із сервера, а також вимкне ці функції безпеки:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Не матимете історії зашифрованих повідомлень на нових пристроях"</string>
   <string name="screen_key_backup_disable_description_point_2">"Втратите доступ до зашифрованих повідомлень, якщо вийдете з усіх сеансів %1$s"</string>
   <string name="screen_key_backup_disable_title">"Ви впевнені, що хочете вимкнути резервне копіювання?"</string>
@@ -54,16 +77,16 @@
   <string name="screen_recovery_key_save_title">"Збережіть ключ відновлення"</string>
   <string name="screen_recovery_key_setup_confirmation_description">"Після цього кроку ви не зможете отримати доступ до нового ключа відновлення."</string>
   <string name="screen_recovery_key_setup_confirmation_title">"Ви зберегли ключ відновлення?"</string>
-  <string name="screen_recovery_key_setup_description">"Ваша резервна копія чату захищена ключем відновлення. Якщо вам потрібен новий ключ відновлення після налаштування, ви можете відтворити, вибравши «Змінити ключ відновлення»."</string>
+  <string name="screen_recovery_key_setup_description">"Ваше сховище ключів захищено ключем відновлення. Якщо вам знадобиться новий ключ відновлення після налаштування, ви можете створити його повторно, вибравши «Змінити ключ відновлення»."</string>
   <string name="screen_recovery_key_setup_generate_key">"Згенеруйте ключ відновлення"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"Не діліться цим ні з ким!"</string>
   <string name="screen_recovery_key_setup_success">"Налаштування відновлення виконано успішно"</string>
-  <string name="screen_recovery_key_setup_title">"Налаштувати відновлення"</string>
+  <string name="screen_recovery_key_setup_title">"Отримати ключ відновлення"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Так, скинути зараз"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Цей процес незворотний."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Ви впевнені, що хочете скинути шифрування?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Ви впевнені, що хочете скинути свою цифрову ідентичність?"</string>
   <string name="screen_reset_encryption_password_error">"Сталася невідома помилка. Будь ласка, перевірте правильність пароля свого облікового запису та повторіть спробу."</string>
   <string name="screen_reset_encryption_password_placeholder">"Входимо…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Підтвердьте, що ви хочете скинути шифрування."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Підтвердьте, що ви хочете скинути свою цифрову ідентичність."</string>
   <string name="screen_reset_encryption_password_title">"Введіть пароль облікового запису, щоб продовжити"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-uz/translations.xml b/features/securebackup/impl/src/main/res/values-uz/translations.xml
index 9e90d2f441..3a93e264dd 100644
--- a/features/securebackup/impl/src/main/res/values-uz/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-uz/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Zaxiralashni o\'chirib qo\'ying"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Zaxiralashni yoqing"</string>
-  <string name="screen_chat_backup_key_backup_description">"Kryptografik shaxsiyatingizni va xabar kalitlaringizni serverda xavfsiz saqlang. Bu sizga har qanday yangi qurilmalarda xabar tarixingizni ko\'rish imkonini beradi. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_description">"Bu sizga chat tarixingizni har qanday yangi qurilmalarda ko‘rish imkonini beradi hamda chatlar zaxirasi va raqamli identifikatsiya uchun talab qilinadi. %1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Kalitlar ombori"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"Tiklashni sozlash uchun kalitlar xotirasini yoqish kerak."</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Chatlarni zaxiralash uchun kalit xotirasi yoqilishi kerak."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Bu qurilmadan kalitlarni yuklash"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"Kalit saqlashga ruxsat berish"</string>
   <string name="screen_chat_backup_recovery_action_change">"Qayta tiklash kalitini o\'zgartiring"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"Agar barcha mavjud qurilmalaringizni yoʻqotgan boʻlsangiz, tiklash kaliti yordamida kriptografik shaxsingizni va xabarlar tarixingizni qayta tiklang."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Chatlaringiz avtomatik ravishda boshidan oxirigacha shifrlash bilan zaxiralanadi. Bu zaxirani tiklash va barcha qurilmalaringizdan foydalana olmay qolganingizda raqamli identifikatoringizni saqlab qolish uchun sizga tiklash kaliti kerak bo‘ladi."</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Tiklash kalitini kiriting"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"Kalit xotirasi hozirda sinxronlanmagan."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Qayta tiklashni sozlang"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Chatlaringiz avtomatik ravishda boshidan oxirigacha shifrlash bilan zaxiralanadi. Bu zaxirani tiklash va barcha qurilmalaringizdan foydalana olmay qolganingizda raqamli identifikatoringizni saqlab qolish uchun sizga tiklash kaliti kerak bo‘ladi."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"%1$s ni kompyuterda oching"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Hisobingizga qaytadan kiring"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Qurilmangizni tasdiqlash soʻralganda, %1$s ni tanlang"</string>
@@ -23,12 +24,12 @@
   <string name="screen_encryption_reset_bullet_1">"Hisob maʼlumotlaringiz, kontaktlaringiz, sozlamalaringiz va suhbatlar roʻyxatingiz saqlanib qoladi"</string>
   <string name="screen_encryption_reset_bullet_2">"Faqat serverda saqlangan har qanday xabarlar tarixi oʻchib ketadi"</string>
   <string name="screen_encryption_reset_bullet_3">"Barcha mavjud qurilma va kontaktlarni qayta tasdiqlashingiz kerak boʻladi"</string>
-  <string name="screen_encryption_reset_footer">"Agar boshqa hisobga kirilgan qurilmaga kira olmasangiz va tiklash kaliti yo‘qolgan bo‘lsa, shaxsingizni tiklang."</string>
-  <string name="screen_encryption_reset_title">"Tasdiqlanmadimi? Shaxsingizni tiklashingiz kerak."</string>
+  <string name="screen_encryption_reset_footer">"Agar boshqa tasdiqlangan qurilmaga kira olmasangiz va zaxira kalitingiz bo‘lmasa, raqamli identifikatoringizni asliga qaytaring."</string>
+  <string name="screen_encryption_reset_title">"Tasdiqlay olmayapsizmi? Raqamli identifikatoringizni asliga qaytarishingiz kerak."</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"O\'chirish"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"Agar barcha qurilmalardan chiqqan boʻlsangiz, shifrlangan xabarlaringizni yoʻqotasiz."</string>
-  <string name="screen_key_backup_disable_confirmation_title">"Haqiqatan ham zaxiralashni o‘chirib qo‘ymoqchimisiz?"</string>
-  <string name="screen_key_backup_disable_description">"Zaxiralashni o‘chirib qo‘ysangiz, joriy shifrlash kaliti zaxira nusxasi o‘chiriladi va boshqa xavfsizlik funksiyalari o‘chiriladi. Bunday holda siz:"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Agar barcha qurilmalaringizni olib tashlasangiz, shifrlangan chat tarixingizni yo‘qotasiz va raqamli identifikatoringizni asliga qaytarishingiz kerak bo‘ladi."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Kalitlar omborini o‘chirib tashlashni xohlaysizmi?"</string>
+  <string name="screen_key_backup_disable_description">"Kalit xotirasini o‘chirish raqamli identifikatsiya va xabar kalitlaringizni serverdan olib tashlaydi hamda quyidagi xavfsizlik funksiyalarini faolsizlantiradi:"</string>
   <string name="screen_key_backup_disable_description_point_1">"Yangi qurilmalarda shifrlangan xabarlar tarixi mavjud emas"</string>
   <string name="screen_key_backup_disable_description_point_2">"Agar tizimdan chiqqan boʻlsangiz, shifrlangan xabarlaringizga kirish huquqini yoʻqotasiz%1$s hamma joyda"</string>
   <string name="screen_key_backup_disable_title">"Haqiqatan ham zaxiralashni o‘chirib qo‘ymoqchimisiz?"</string>
@@ -61,9 +62,9 @@
   <string name="screen_recovery_key_setup_title">"Qayta tiklashni sozlang"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Ha, hozir asliga qaytarish"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"Bu jarayonni ortga qaytarib boʻlmaydi."</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"Haqiqatan ham shaxsingizni qayta tiklamoqchimisiz?"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Haqiqatan ham raqamli identifikatoringizni tiklamoqchimisiz?"</string>
   <string name="screen_reset_encryption_password_error">"Noma’lum xato yuz berdi. Iltimos, hisobingiz parolining to‘g‘riligini tekshiring va qaytadan urinib ko‘ring."</string>
   <string name="screen_reset_encryption_password_placeholder">"Kirish…"</string>
-  <string name="screen_reset_encryption_password_subtitle">"Shaxsingizni tiklashni tasdiqlang."</string>
+  <string name="screen_reset_encryption_password_subtitle">"Raqamli identifikatoringizni asliga qaytarmoqchi ekaningizni tasdiqlang."</string>
   <string name="screen_reset_encryption_password_title">"Davom etish uchun hisobingiz parolini kiriting"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-vi/translations.xml b/features/securebackup/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..74784f8921
--- /dev/null
+++ b/features/securebackup/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_chat_backup_key_backup_action_disable">"Xóa kho lưu trữ khóa"</string>
+  <string name="screen_chat_backup_key_backup_action_enable">"Bật tính năng sao lưu"</string>
+  <string name="screen_chat_backup_key_backup_description">"Điều này cho phép bạn xem lịch sử trò chuyện trên bất kỳ thiết bị mới nào và cần thiết để sao lưu trò chuyện cũng như danh tính kỹ thuật số. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_title">"Lưu trữ khóa"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Bạn cần bật tính năng lưu trữ khóa để sao lưu các cuộc trò chuyện của mình."</string>
+  <string name="screen_chat_backup_key_storage_toggle_description">"Tải lên các khóa từ thiết bị này"</string>
+  <string name="screen_chat_backup_key_storage_toggle_title">"Cho phép lưu trữ khóa"</string>
+  <string name="screen_chat_backup_recovery_action_change">"Thay đổi khóa khôi phục."</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Các cuộc trò chuyện của bạn được tự động sao lưu bằng mã hóa đầu cuối. Để khôi phục bản sao lưu này và giữ lại danh tính kỹ thuật số của bạn khi bạn mất quyền truy cập vào tất cả các thiết bị, bạn sẽ cần khóa khôi phục."</string>
+  <string name="screen_chat_backup_recovery_action_confirm">"Nhập mã khôi phục."</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"Kho lưu trữ khóa của bạn hiện đang không đồng bộ."</string>
+  <string name="screen_chat_backup_recovery_action_setup">"Lấy khóa khôi phục."</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Các cuộc trò chuyện của bạn được tự động sao lưu bằng mã hóa đầu cuối. Để khôi phục bản sao lưu này và giữ lại danh tính kỹ thuật số của bạn khi bạn mất quyền truy cập vào tất cả các thiết bị, bạn sẽ cần khóa khôi phục."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Mở %1$s trên máy tính để bàn"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Đăng nhập lại vào tài khoản của bạn"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Khi được yêu cầu xác minh thiết bị của bạn, chọn %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Khôi phục tất cả”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Hãy làm theo hướng dẫn để tạo khóa khôi phục mới."</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Hãy lưu khóa khôi phục mới của bạn vào trình quản lý mật khẩu hoặc ghi chú được mã hóa."</string>
+  <string name="screen_create_new_recovery_key_title">"Đặt lại mã hóa cho tài khoản của bạn bằng một thiết bị khác."</string>
+  <string name="screen_encryption_reset_action_continue_reset">"Tiếp tục đặt lại"</string>
+  <string name="screen_encryption_reset_bullet_1">"Thông tin tài khoản, danh bạ, tùy chọn và danh sách trò chuyện của bạn sẽ được lưu giữ."</string>
+  <string name="screen_encryption_reset_bullet_2">"Bạn sẽ mất toàn bộ lịch sử tin nhắn chỉ được lưu trữ trên máy chủ."</string>
+  <string name="screen_encryption_reset_bullet_3">"Bạn sẽ cần xác minh lại tất cả các thiết bị và danh bạ hiện có của mình."</string>
+  <string name="screen_encryption_reset_footer">"Chỉ nên đặt lại danh tính kỹ thuật số của bạn nếu bạn không có quyền truy cập vào thiết bị đã được xác minh khác và bạn không có khóa khôi phục."</string>
+  <string name="screen_encryption_reset_title">"Không thể xác nhận? Bạn cần phải thiết lập lại danh tính kỹ thuật số của mình."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Xoá"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Bạn sẽ mất các tin nhắn đã mã hóa nếu bạn đăng xuất khỏi tất cả các thiết bị."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Bạn có chắc muốn xóa lưu trữ khóa không?"</string>
+  <string name="screen_key_backup_disable_description">"Xóa lưu trữ khóa sẽ loại bỏ danh tính kỹ thuật số và khóa tin nhắn của bạn khỏi máy chủ, đồng thời tắt các tính năng bảo mật sau:"</string>
+  <string name="screen_key_backup_disable_description_point_1">"Lịch sử tin nhắn mã hóa sẽ không có trên thiết bị mới."</string>
+  <string name="screen_key_backup_disable_description_point_2">"Bạn sẽ mất quyền truy cập vào các tin nhắn được mã hóa nếu đăng xuất khỏi %1$s trên tất cả thiết bị"</string>
+  <string name="screen_key_backup_disable_title">"Bạn có chắc muốn tắt lưu trữ khóa và xóa nó không?"</string>
+  <string name="screen_recovery_key_change_description">"Nếu mất khóa khôi phục hiện tại, hãy tạo khóa mới. Khóa cũ sẽ không còn dùng được sau khi thay đổi."</string>
+  <string name="screen_recovery_key_change_generate_key">"Tạo khóa khôi phục mới."</string>
+  <string name="screen_recovery_key_change_generate_key_description">"Đừng chia sẻ điều này với bất kỳ ai!"</string>
+  <string name="screen_recovery_key_change_success">"Khóa khôi phục đã thay đổi."</string>
+  <string name="screen_recovery_key_change_title">"Thay đổi khóa khôi phục?"</string>
+  <string name="screen_recovery_key_confirm_description">"Đảm bảo không ai có thể nhìn thấy màn hình này!"</string>
+  <string name="screen_recovery_key_confirm_error_content">"Thử lại để xác nhận quyền truy cập lưu trữ khóa."</string>
+  <string name="screen_recovery_key_confirm_error_title">"Khóa khôi phục không chính xác."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Nếu bạn có khóa bảo mật hoặc mật khẩu, bạn cũng có thể dùng."</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"Nhập…"</string>
+  <string name="screen_recovery_key_confirm_success">"Khóa khôi phục xác nhận thành công."</string>
+  <string name="screen_recovery_key_confirm_title">"Nhập khóa khôi phục của bạn."</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Đã sao chép khóa khôi phục."</string>
+  <string name="screen_recovery_key_generating_key">"Đang tạo…"</string>
+  <string name="screen_recovery_key_save_action">"Lưu khóa khôi phục."</string>
+  <string name="screen_recovery_key_save_description">"Ghi khóa khôi phục vào nơi an toàn, như trình quản lý mật khẩu, ghi chú mã hóa hoặc két sắt."</string>
+  <string name="screen_recovery_key_save_key_description">"Chạm để sao chép khóa khôi phục."</string>
+  <string name="screen_recovery_key_save_title">"Hãy lưu khóa khôi phục ở nơi an toàn."</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"Sau bước này, bạn sẽ không còn truy cập khóa khôi phục mới."</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"Bạn đã lưu lại khóa khôi phục chưa?"</string>
+  <string name="screen_recovery_key_setup_description">"Lưu trữ khóa của bạn được bảo vệ bằng một khóa khôi phục. Nếu cần một khóa khôi phục mới sau khi thiết lập, bạn có thể tạo lại bằng cách chọn \'Thay đổi khóa khôi phục\'."</string>
+  <string name="screen_recovery_key_setup_generate_key">"Tạo khóa khôi phục của bạn."</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"Đừng chia sẻ điều này với bất kỳ ai!"</string>
+  <string name="screen_recovery_key_setup_success">"Thiết lập khôi phục thành công"</string>
+  <string name="screen_recovery_key_setup_title">"Lấy khóa khôi phục."</string>
+  <string name="screen_reset_encryption_password_placeholder">"Nhập…"</string>
+</resources>
diff --git a/features/securebackup/impl/src/main/res/values-zh-rTW/translations.xml b/features/securebackup/impl/src/main/res/values-zh-rTW/translations.xml
index 85061fe044..9b791eb938 100644
--- a/features/securebackup/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-zh-rTW/translations.xml
@@ -2,16 +2,17 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"關閉備份功能"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"開啟備份功能"</string>
-  <string name="screen_chat_backup_key_backup_description">"在伺服器上安全地儲存您的密碼學身份與訊息金鑰。這將讓您可以在任何新裝置上檢視訊息歷史紀錄。%1$s"</string>
+  <string name="screen_chat_backup_key_backup_description">"此舉將讓您能在任何新裝置上檢視聊天記錄，且對於備份聊天內容及數位身分而言是必要的。%1$s。"</string>
   <string name="screen_chat_backup_key_backup_title">"金鑰儲存空間"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"必須開啟金鑰儲存空間才能設定復原。"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"必須開啟金鑰儲存空間才能備份您的聊天。"</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"從此裝置上傳金鑰"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"允許金鑰儲存空間"</string>
   <string name="screen_chat_backup_recovery_action_change">"變更復原金鑰"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"若您遺失了您現有的所有裝置，請使用復原金鑰來還原您的密碼學身份與訊息歷史紀錄。"</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"您的聊天會自動以端到端加密方式進行備份。若您無法存取所有裝置，欲還原此備份並保留您的數位身分，您將需要使用還原金鑰。"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"輸入復原金鑰"</string>
   <string name="screen_chat_backup_recovery_action_confirm_description">"您的金鑰儲存空間目前並未同步。"</string>
-  <string name="screen_chat_backup_recovery_action_setup">"設定復原"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"取得還原金鑰"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"您的聊天會自動使用端到端加密備份。若您失去對您所有裝置的存取權，且要還原此備份並保留您的數位身份的話，您就會需要您的還原金鑰。"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"在桌上型裝置中開啟 %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"再次登入您的帳號"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"當要求驗證您的裝置時，請選取 %1$s"</string>
@@ -23,12 +24,12 @@
   <string name="screen_encryption_reset_bullet_1">"您的帳號詳細資訊、聯絡人、偏好設定與聊天清單都會保留"</string>
   <string name="screen_encryption_reset_bullet_2">"您將會遺失僅儲存在伺服器上的任何訊息歷史紀錄"</string>
   <string name="screen_encryption_reset_bullet_3">"您將需要再次驗證所有現有裝置與聯絡人"</string>
-  <string name="screen_encryption_reset_footer">"僅當您無法存取其他已登入裝置且遺失復原金鑰時才重設您的身份。"</string>
-  <string name="screen_encryption_reset_title">"無法確認？您需要重設身份。"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"關閉"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"若您登出所有裝置，您將失去加密訊息。"</string>
-  <string name="screen_key_backup_disable_confirmation_title">"您確定您要關閉備份嗎？"</string>
-  <string name="screen_key_backup_disable_description">"刪除金鑰儲存空間會從伺服器移除您的密碼學身份與訊息金鑰，並關閉以下安全性功能："</string>
+  <string name="screen_encryption_reset_footer">"僅當您無法存取其他已驗證的裝置且沒有還原金鑰時才重設您的數位身份。"</string>
+  <string name="screen_encryption_reset_title">"無法確認？您需要重設數位身份。"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"刪除"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"若您移除所有裝置，您將遺失加密的聊天記錄，並需重設您的數位身分。"</string>
+  <string name="screen_key_backup_disable_confirmation_title">"您確定您要刪除金鑰儲存空間嗎？"</string>
+  <string name="screen_key_backup_disable_description">"刪除金鑰儲存空間會從伺服器移除您的數位身份與訊息金鑰，並關閉以下安全性功能："</string>
   <string name="screen_key_backup_disable_description_point_1">"您將無法在新裝置上存取加密訊息歷史紀錄"</string>
   <string name="screen_key_backup_disable_description_point_2">"若您徹底登出 %1$s，您將無法存取加密訊息"</string>
   <string name="screen_key_backup_disable_title">"您確定要關閉金鑰儲存空間並刪除它嗎？"</string>
@@ -58,12 +59,12 @@
   <string name="screen_recovery_key_setup_generate_key">"產生您的復原金鑰"</string>
   <string name="screen_recovery_key_setup_generate_key_description">"不要與任何人分享！"</string>
   <string name="screen_recovery_key_setup_success">"復原設定成功"</string>
-  <string name="screen_recovery_key_setup_title">"設定復原"</string>
+  <string name="screen_recovery_key_setup_title">"取得還原金鑰"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"是的，立刻重設"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"此過程不可逆。"</string>
   <string name="screen_reset_encryption_confirmation_alert_title">"您確定您想要重設您的身份嗎？"</string>
   <string name="screen_reset_encryption_password_error">"發生了未知錯誤。請檢查您帳號的密碼是否正確，然後再試一次。"</string>
   <string name="screen_reset_encryption_password_placeholder">"輸入……"</string>
-  <string name="screen_reset_encryption_password_subtitle">"確認您要重設您的身份。"</string>
+  <string name="screen_reset_encryption_password_subtitle">"確認您要重設您的數位身份。"</string>
   <string name="screen_reset_encryption_password_title">"輸入您帳號的密碼以繼續"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-zh/translations.xml b/features/securebackup/impl/src/main/res/values-zh/translations.xml
index 438a05f893..2b59a54ada 100644
--- a/features/securebackup/impl/src/main/res/values-zh/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-zh/translations.xml
@@ -2,68 +2,89 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"关闭备份"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"开启备份"</string>
-  <string name="screen_chat_backup_key_backup_description">"将您的密码学身份和消息密钥安全地存储在服务器上。这样您就可以在任何新设备上查看您的消息历史记录。%1$s。"</string>
+  <string name="screen_chat_backup_key_backup_description">"这将允许你在新设备上查看聊天历史， 这是备份聊天与数字身份所必需的。%1$s。"</string>
   <string name="screen_chat_backup_key_backup_title">"密钥存储"</string>
-  <string name="screen_chat_backup_key_storage_disabled_error">"必须打开密钥存储才能设置恢复。"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"必须启用密钥存储才能备份聊天。"</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"从此设备上传密钥"</string>
   <string name="screen_chat_backup_key_storage_toggle_title">"允许密钥存储"</string>
   <string name="screen_chat_backup_recovery_action_change">"更改恢复密钥"</string>
-  <string name="screen_chat_backup_recovery_action_change_description">"如果您丢失了所有现有设备，使用恢复密钥恢复您的密码学身份和消息历史记录。"</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"你的聊天已被端到端加密自动备份。如果你无法访问所有设备，则需要使用恢复密钥并保留数字身份。"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"输入恢复密钥"</string>
-  <string name="screen_chat_backup_recovery_action_confirm_description">"您的密钥存储当前不同步。"</string>
-  <string name="screen_chat_backup_recovery_action_setup">"设置恢复"</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"当前密钥存储已脱离同步。"</string>
+  <string name="screen_chat_backup_recovery_action_setup">"获取恢复密钥"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"你的聊天已被端到端加密自动备份。如果你无法访问所有设备，则需要使用恢复密钥恢复备份并保留数字身份。"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"在桌面设备中打开 %1$s"</string>
-  <string name="screen_create_new_recovery_key_list_item_2">"再次登录您的账户"</string>
-  <string name="screen_create_new_recovery_key_list_item_3">"当要求验证您的设备时，选择 %1$s"</string>
-  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"「全部重置」"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"再次登录你的账户"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"当要求验证你的设备时，选择 %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“重置全部”"</string>
   <string name="screen_create_new_recovery_key_list_item_4">"按照说明创建新的恢复密钥"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"将新的恢复密钥保存在密码管理器或加密备忘录中"</string>
-  <string name="screen_create_new_recovery_key_title">"使用其他设备重置账户的加密"</string>
+  <string name="screen_create_new_recovery_key_title">"使用其它设备重置账户的加密"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"输入的恢复密钥不匹配"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"完成设置"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"再次输入恢复密钥。"</string>
+  <string name="screen_custom_recovery_key_confirm_title">"确认恢复密钥"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="other">"最少 %1$d 个字符。请勿使此处的内容与账户密码相同。"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"强度"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"口令强度：%1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"中等"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"强"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"非常强"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"非常弱"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"弱"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"选择你能记住的恢复密钥。"</string>
+  <string name="screen_custom_recovery_key_input_title">"输入恢复密钥"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"正在加载恢复密钥要求"</string>
+  <string name="screen_custom_recovery_key_success_notice">"转到“设置”→“加密”→“备份”以更改恢复密钥。"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"如果你无法访问所有设备，可以使用恢复密钥以确认新设备或恢复加密聊天。"</string>
+  <string name="screen_custom_recovery_key_success_title">"你已完成备份设置"</string>
   <string name="screen_encryption_reset_action_continue_reset">"继续重置"</string>
-  <string name="screen_encryption_reset_bullet_1">"您的账户信息、联系人、偏好设置和聊天列表将被保留"</string>
-  <string name="screen_encryption_reset_bullet_2">"您将丢失现有的消息历史记录"</string>
-  <string name="screen_encryption_reset_bullet_3">"您将需要再次验证所有您的现有设备和联系人"</string>
-  <string name="screen_encryption_reset_footer">"仅当您无法访问其他已登录设备并且丢失了恢复密钥时才重置您的身份。"</string>
-  <string name="screen_encryption_reset_title">"如果您无法通过其他方式确认，请重置您的身份"</string>
-  <string name="screen_key_backup_disable_confirmation_action_turn_off">"关闭"</string>
-  <string name="screen_key_backup_disable_confirmation_description">"如果您登出所有设备，您的加密消息将丢失。"</string>
-  <string name="screen_key_backup_disable_confirmation_title">"您确定要关闭备份吗？"</string>
-  <string name="screen_key_backup_disable_description">"关闭备份将删除您当前的加密密钥备份并关闭其他安全功能。在这种情况下，你将："</string>
+  <string name="screen_encryption_reset_bullet_1">"你的账户信息、联系人、偏好和聊天列表将被保留"</string>
+  <string name="screen_encryption_reset_bullet_2">"你将丢失所有仅存储在服务器上的消息历史"</string>
+  <string name="screen_encryption_reset_bullet_3">"你将需要再次验证所有现有设备与联系人"</string>
+  <string name="screen_encryption_reset_footer">"仅当你无法访问其它已登录的设备并且丢失了恢复密钥时才重置数字身份。"</string>
+  <string name="screen_encryption_reset_title">"无法确认？你需要重置数字身份。"</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"删除"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"如果移除所有设备，你将丢失加密聊天历史，并且需要重置数字身份。"</string>
+  <string name="screen_key_backup_disable_confirmation_title">"你确定要关闭密钥存储？"</string>
+  <string name="screen_key_backup_disable_description">"删除密钥存储将移除你的数字身份并关闭以下安全功能："</string>
   <string name="screen_key_backup_disable_description_point_1">"新设备上没有加密消息的历史记录"</string>
-  <string name="screen_key_backup_disable_description_point_2">"如果您在所有设备上登出了 %1$s，那将无法访问加密消息"</string>
-  <string name="screen_key_backup_disable_title">"您确定要关闭备份吗？"</string>
-  <string name="screen_recovery_key_change_description">"如果您丢失了现有的恢复密钥，请获取新的恢复密钥。更改恢复密钥后，您的旧密钥将不再起作用。"</string>
+  <string name="screen_key_backup_disable_description_point_2">"如果你在所有位置注销 %1$s，将无法访问加密消息"</string>
+  <string name="screen_key_backup_disable_title">"你确定要关闭并删除密钥存储？"</string>
+  <string name="screen_recovery_key_change_description">"如果你丢失了现有恢复密钥，请重新获取。旧密钥将随恢复密钥更改后失效。"</string>
   <string name="screen_recovery_key_change_generate_key">"生成新的恢复密钥"</string>
-  <string name="screen_recovery_key_change_generate_key_description">"不要告诉任何人！"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"请勿与任何人分享！"</string>
   <string name="screen_recovery_key_change_success">"恢复密钥已更改"</string>
   <string name="screen_recovery_key_change_title">"更改恢复密钥？"</string>
   <string name="screen_recovery_key_confirm_create_new_recovery_key">"创建新的恢复密钥"</string>
-  <string name="screen_recovery_key_confirm_description">"确保没有人能看到这个界面！"</string>
-  <string name="screen_recovery_key_confirm_error_content">"请重试以确认访问您的密钥存储。"</string>
+  <string name="screen_recovery_key_confirm_description">"确保没人能看到此界面！"</string>
+  <string name="screen_recovery_key_confirm_error_content">"请重试以确认访问密钥存储。"</string>
   <string name="screen_recovery_key_confirm_error_title">"恢复密钥不正确"</string>
-  <string name="screen_recovery_key_confirm_key_description">"如果您有安全密钥或安全短语，也可以用。"</string>
-  <string name="screen_recovery_key_confirm_key_placeholder">"输入……"</string>
+  <string name="screen_recovery_key_confirm_key_description">"如果你有安全密钥或安全口令也同样可用。"</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"输入…"</string>
   <string name="screen_recovery_key_confirm_lost_recovery_key">"丢失了恢复密钥？"</string>
   <string name="screen_recovery_key_confirm_success">"恢复密钥已确认"</string>
   <string name="screen_recovery_key_confirm_title">"输入恢复密钥"</string>
   <string name="screen_recovery_key_copied_to_clipboard">"恢复密钥已复制"</string>
-  <string name="screen_recovery_key_generating_key">"正在生成……"</string>
+  <string name="screen_recovery_key_generating_key">"正在生成…"</string>
   <string name="screen_recovery_key_save_action">"保存恢复密钥"</string>
   <string name="screen_recovery_key_save_description">"将此恢复密钥保存在安全的地方，例如密码管理器、加密笔记或物理保险箱。"</string>
   <string name="screen_recovery_key_save_key_description">"点击复制恢复密钥"</string>
-  <string name="screen_recovery_key_save_title">"保存您的恢复密钥"</string>
-  <string name="screen_recovery_key_setup_confirmation_description">"完成此步骤后，您将无法访问新的恢复密钥。"</string>
-  <string name="screen_recovery_key_setup_confirmation_title">"您保存了恢复密钥吗？"</string>
-  <string name="screen_recovery_key_setup_description">"您的聊天备份受恢复密钥保护。如果您在安装后需要新的恢复密钥，则可以通过选择「更改恢复密钥」来重新创建。"</string>
+  <string name="screen_recovery_key_save_title">"保存恢复密钥到安全的地方。"</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"此步骤之后将无法访问新的恢复密钥。"</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"你是否已保存恢复密钥？"</string>
+  <string name="screen_recovery_key_setup_description">"密钥存储受恢复密钥保护。如果在设置后需要新的恢复密钥，则可以通过选择“更改恢复密钥”重新创建。"</string>
   <string name="screen_recovery_key_setup_generate_key">"生成恢复密钥"</string>
-  <string name="screen_recovery_key_setup_generate_key_description">"不要告诉任何人！"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"请勿与任何人分享！"</string>
   <string name="screen_recovery_key_setup_success">"恢复设置成功"</string>
-  <string name="screen_recovery_key_setup_title">"设置恢复"</string>
-  <string name="screen_reset_encryption_confirmation_alert_action">"是的，立即重置"</string>
+  <string name="screen_recovery_key_setup_title">"获取恢复密钥"</string>
+  <string name="screen_reset_encryption_confirmation_alert_action">"是，立即重置"</string>
   <string name="screen_reset_encryption_confirmation_alert_subtitle">"此过程不可逆。"</string>
-  <string name="screen_reset_encryption_confirmation_alert_title">"您确定要重置加密吗？"</string>
-  <string name="screen_reset_encryption_password_error">"发生未知错误。请检查您的帐户密码是否正确，然后重试。"</string>
-  <string name="screen_reset_encryption_password_placeholder">"输入……"</string>
-  <string name="screen_reset_encryption_password_subtitle">"确认您要重置加密。"</string>
-  <string name="screen_reset_encryption_password_title">"输入您的账户密码以继续"</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"你确定要重置数字身份？"</string>
+  <string name="screen_reset_encryption_password_error">"发生未知错误。请检查你的账户密码是否正确并重试。"</string>
+  <string name="screen_reset_encryption_password_placeholder">"输入…"</string>
+  <string name="screen_reset_encryption_password_subtitle">"请确认你要重置数字身份。"</string>
+  <string name="screen_reset_encryption_password_title">"输入账户的密码以继续"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values/localazy.xml b/features/securebackup/impl/src/main/res/values/localazy.xml
index e0fc2d37e7..5acae5f07f 100644
--- a/features/securebackup/impl/src/main/res/values/localazy.xml
+++ b/features/securebackup/impl/src/main/res/values/localazy.xml
@@ -20,6 +20,27 @@
   <string name="screen_create_new_recovery_key_list_item_4">"Follow the instructions to create a new recovery key"</string>
   <string name="screen_create_new_recovery_key_list_item_5">"Save your new recovery key in a password manager or encrypted note"</string>
   <string name="screen_create_new_recovery_key_title">"Reset the encryption for your account using another device"</string>
+  <string name="screen_custom_recovery_key_confirm_error_mismatch">"The recovery key you entered doesn\'t match"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Finish setup"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Enter your recovery key again."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Confirm your recovery key"</string>
+  <plurals name="screen_custom_recovery_key_input_notice">
+    <item quantity="one">"Minimum %1$d character. Do not use your account password"</item>
+    <item quantity="other">"Minimum %1$d characters. Do not use your account password"</item>
+  </plurals>
+  <string name="screen_custom_recovery_key_input_strength">"Strength"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Passphrase strength: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Moderate"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Strong"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Very strong"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Very weak"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Weak"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Choose a recovery key that you can memorize."</string>
+  <string name="screen_custom_recovery_key_input_title">"Enter a recovery key"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Loading recovery key requirements"</string>
+  <string name="screen_custom_recovery_key_success_notice">"To change your recovery key, go to Settings → Encryption → Backup"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"You can use your recovery key to confirm new devices or restore your encrypted chats if you lose access to all your devices."</string>
+  <string name="screen_custom_recovery_key_success_title">"Your backup is now fully set up"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Continue reset"</string>
   <string name="screen_encryption_reset_bullet_1">"Your account details, contacts, preferences, and chat list will be kept"</string>
   <string name="screen_encryption_reset_bullet_2">"You will lose any message history that’s stored only on the server"</string>
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPointTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPointTest.kt
index 9e984f1ec0..6c2cb9984f 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPointTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPointTest.kt
@@ -32,6 +32,7 @@ class DefaultSecureBackupEntryPointTest {
             SecureBackupFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
+                secureBackupSetupEntryPoint = DefaultSecureBackupSetupEntryPoint(),
             )
         }
         val callback = object : SecureBackupEntryPoint.Callback {
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPointTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPointTest.kt
new file mode 100644
index 0000000000..e37dab748f
--- /dev/null
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupSetupEntryPointTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.securebackup.impl
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.securebackup.api.SecureBackupSetupEntryPoint
+import io.element.android.features.securebackup.impl.setup.SecureBackupSetupNode
+import io.element.android.features.securebackup.impl.setup.SecureBackupSetupPresenter
+import io.element.android.features.securebackup.impl.setup.SecureBackupSetupStateMachine
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
+import io.element.android.tests.testutils.node.TestParentNode
+import org.junit.Rule
+import org.junit.Test
+
+class DefaultSecureBackupSetupEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
+    @Test
+    fun `test node builder`() {
+        val entryPoint = DefaultSecureBackupSetupEntryPoint()
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            SecureBackupSetupNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                presenterFactory = object : SecureBackupSetupPresenter.Factory {
+                    override fun create(isChangeRecoveryKeyUserStory: Boolean) = SecureBackupSetupPresenter(
+                        isChangeRecoveryKeyUserStory = isChangeRecoveryKeyUserStory,
+                        stateMachine = SecureBackupSetupStateMachine(),
+                        encryptionService = FakeEncryptionService(),
+                    )
+                },
+                snackbarDispatcher = SnackbarDispatcher(),
+            )
+        }
+        val inputs = SecureBackupSetupEntryPoint.Inputs(isChangeRecoveryKeyUserStory = true)
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            inputs = inputs,
+        )
+        assertThat(result).isInstanceOf(SecureBackupSetupNode::class.java)
+        assertThat(result.plugins).contains(SecureBackupSetupNode.Inputs(isChangeRecoveryKeyUserStory = true))
+    }
+}
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
index d9324fdb91..fcf050f925 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
@@ -6,17 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securebackup.impl.enter
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performImeAction
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.securebackup.impl.setup.views.aFormattedRecoveryKey
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -26,58 +28,53 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class SecureBackupEnterRecoveryKeyViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class SecureBackupEnterRecoveryKeyViewTest : RobolectricTest() {
     @Test
-    fun `back key pressed - calls onBackClick`() {
+    fun `back key pressed - calls onBackClick`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setSecureBackupEnterRecoveryKeyView(
+            setSecureBackupEnterRecoveryKeyView(
                 aSecureBackupEnterRecoveryKeyState(),
                 onBackClick = callback,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `back button clicked - calls onBackClick`() {
+    fun `back button clicked - calls onBackClick`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setSecureBackupEnterRecoveryKeyView(
+            setSecureBackupEnterRecoveryKeyView(
                 aSecureBackupEnterRecoveryKeyState(),
                 onBackClick = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `tapping on Continue when key is valid - calls expected action`() {
+    fun `tapping on Continue when key is valid - calls expected action`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
-        rule.setSecureBackupEnterRecoveryKeyView(
+        setSecureBackupEnterRecoveryKeyView(
             aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder),
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
 
         recorder.assertSingle(SecureBackupEnterRecoveryKeyEvents.Submit)
     }
 
     @Test
-    fun `entering a char emits the expected event`() {
+    fun `entering a char emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
         val keyValue = aFormattedRecoveryKey()
-        rule.setSecureBackupEnterRecoveryKeyView(
+        setSecureBackupEnterRecoveryKeyView(
             aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder),
         )
-        rule.onNodeWithText(keyValue).performTextInput("X")
+        onNodeWithText(keyValue).performTextInput("X")
         recorder.assertSingle(
             SecureBackupEnterRecoveryKeyEvents.OnRecoveryKeyChange("X$keyValue")
         )
@@ -85,43 +82,43 @@ class SecureBackupEnterRecoveryKeyViewTest {
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `toggling the visibility of the textfield changes it`() {
+    fun `toggling the visibility of the textfield changes it`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
         val keyValue = aFormattedRecoveryKey()
-        rule.setSecureBackupEnterRecoveryKeyView(aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder))
+        setSecureBackupEnterRecoveryKeyView(aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder))
 
         // Initially, the text field should be visible
-        rule.onNodeWithText(keyValue).assertExists()
+        onNodeWithText(keyValue).assertExists()
 
-        rule.onNodeWithContentDescription(rule.activity.getString(CommonStrings.a11y_hide_password)).performClick()
+        onNodeWithContentDescription(activity!!.getString(CommonStrings.a11y_hide_password)).performClick()
 
-        rule.waitForIdle()
+        waitForIdle()
 
         recorder.assertSingle(SecureBackupEnterRecoveryKeyEvents.ChangeRecoveryKeyFieldContentsVisibility(false))
     }
 
     @Test
-    fun `validating from keyboard emits the expected event`() {
+    fun `validating from keyboard emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
         val keyValue = aFormattedRecoveryKey()
-        rule.setSecureBackupEnterRecoveryKeyView(
+        setSecureBackupEnterRecoveryKeyView(
             aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder),
         )
-        rule.onNodeWithText(keyValue).performImeAction()
+        onNodeWithText(keyValue).performImeAction()
         recorder.assertSingle(SecureBackupEnterRecoveryKeyEvents.Submit)
     }
 
     @Test
-    fun `when submit action succeeds - calls onDone`() {
+    fun `when submit action succeeds - calls onDone`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setSecureBackupEnterRecoveryKeyView(
+            setSecureBackupEnterRecoveryKeyView(
                 aSecureBackupEnterRecoveryKeyState(submitAction = AsyncAction.Success(Unit)),
                 onDone = callback,
             )
         }
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSecureBackupEnterRecoveryKeyView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setSecureBackupEnterRecoveryKeyView(
         state: SecureBackupEnterRecoveryKeyState,
         onDone: () -> Unit = EnsureNeverCalled(),
         onBackClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt
index 6cfd061103..8173c20b3d 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securebackup.impl.reset.password
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -22,64 +24,58 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ResetIdentityPasswordViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ResetIdentityPasswordViewTest : RobolectricTest() {
     @Test
-    fun `pressing the back HW button invokes the expected callback`() {
+    fun `pressing the back HW button invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setResetPasswordView(
+            setResetPasswordView(
                 ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = {}),
                 onBack = it,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `clicking on the back navigation button invokes the expected callback`() {
+    fun `clicking on the back navigation button invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setResetPasswordView(
+            setResetPasswordView(
                 ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = {}),
                 onBack = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking 'Reset identity' confirms the reset`() {
+    fun `clicking 'Reset identity' confirms the reset`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResetIdentityPasswordEvent>()
-        rule.setResetPasswordView(
+        setResetPasswordView(
             ResetIdentityPasswordState(resetAction = AsyncAction.Uninitialized, eventSink = eventsRecorder),
         )
-        rule.onNodeWithText("Password").performTextInput("A password")
+        onNodeWithText("Password").performTextInput("A password")
 
-        rule.clickOn(CommonStrings.action_reset_identity)
+        clickOn(CommonStrings.action_reset_identity)
 
         eventsRecorder.assertSingle(ResetIdentityPasswordEvent.Reset("A password"))
     }
 
     @Test
-    fun `modifying the password dismisses the error state`() {
+    fun `modifying the password dismisses the error state`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResetIdentityPasswordEvent>()
-        rule.setResetPasswordView(
+        setResetPasswordView(
             ResetIdentityPasswordState(resetAction = AsyncAction.Failure(IllegalStateException("A failure")), eventSink = eventsRecorder),
         )
-        rule.onNodeWithText("Password").performTextInput("A password")
+        onNodeWithText("Password").performTextInput("A password")
 
         eventsRecorder.assertSingle(ResetIdentityPasswordEvent.DismissError)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setResetPasswordView(
+private fun AndroidComposeUiTest<ComponentActivity>.setResetPasswordView(
     state: ResetIdentityPasswordState,
     onBack: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt
index a913a9af27..0d95bf709f 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securebackup.impl.reset.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.securebackup.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -20,76 +22,70 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class ResetIdentityRootViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class ResetIdentityRootViewTest : RobolectricTest() {
     @Test
-    fun `pressing the back HW button invokes the expected callback`() {
+    fun `pressing the back HW button invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setResetRootView(
+            setResetRootView(
                 ResetIdentityRootState(displayConfirmationDialog = false, eventSink = {}),
                 onBack = it,
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `clicking on the back navigation button invokes the expected callback`() {
+    fun `clicking on the back navigation button invokes the expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setResetRootView(
+            setResetRootView(
                 ResetIdentityRootState(displayConfirmationDialog = false, eventSink = {}),
                 onBack = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
     @Config(qualifiers = "h720dp")
-    fun `clicking Continue displays the confirmation dialog`() {
+    fun `clicking Continue displays the confirmation dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResetIdentityRootEvent>()
-        rule.setResetRootView(
+        setResetRootView(
             ResetIdentityRootState(displayConfirmationDialog = false, eventSink = eventsRecorder),
         )
 
-        rule.clickOn(R.string.screen_encryption_reset_action_continue_reset)
+        clickOn(R.string.screen_encryption_reset_action_continue_reset)
 
         eventsRecorder.assertSingle(ResetIdentityRootEvent.Continue)
     }
 
     @Test
-    fun `clicking 'Yes, reset now' confirms the reset`() {
+    fun `clicking 'Yes, reset now' confirms the reset`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setResetRootView(
+            setResetRootView(
                 ResetIdentityRootState(displayConfirmationDialog = true, eventSink = {}),
                 onContinue = it,
             )
-            rule.clickOn(R.string.screen_reset_encryption_confirmation_alert_action)
+            clickOn(R.string.screen_reset_encryption_confirmation_alert_action)
         }
     }
 
     @Test
-    fun `clicking Cancel dismisses the dialog`() {
+    fun `clicking Cancel dismisses the dialog`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<ResetIdentityRootEvent>()
-        rule.setResetRootView(
+        setResetRootView(
             ResetIdentityRootState(displayConfirmationDialog = true, eventSink = eventsRecorder),
         )
 
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ResetIdentityRootEvent.DismissDialog)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setResetRootView(
+private fun AndroidComposeUiTest<ComponentActivity>.setResetRootView(
     state: ResetIdentityRootState,
     onBack: () -> Unit = EnsureNeverCalled(),
     onContinue: () -> Unit = EnsureNeverCalled(),
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenterTest.kt
index a3cf920d82..4aede3c534 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenterTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupPresenterTest.kt
@@ -117,7 +117,7 @@ class SecureBackupSetupPresenterTest {
     @Test
     fun `present - handle errors`() = runTest {
         val encryptionService = FakeEncryptionService(
-            enableRecoveryLambda = { Result.failure(IllegalStateException("Test error")) }
+            enableRecoveryLambda = { _, _ -> Result.failure(IllegalStateException("Test error")) }
         )
         val presenter = createSecureBackupSetupPresenter(
             isChangeRecoveryKeyUserStory = false,
@@ -189,7 +189,7 @@ class SecureBackupSetupPresenterTest {
     private fun createSecureBackupSetupPresenter(
         isChangeRecoveryKeyUserStory: Boolean = false,
         encryptionService: EncryptionService = FakeEncryptionService(
-            enableRecoveryLambda = { Result.success(Unit) },
+            enableRecoveryLambda = { _, _ -> Result.success("") },
         ),
     ): SecureBackupSetupPresenter {
         return SecureBackupSetupPresenter(
diff --git a/features/securityandprivacy/impl/build.gradle.kts b/features/securityandprivacy/impl/build.gradle.kts
index bb9764eb60..d42bdef883 100644
--- a/features/securityandprivacy/impl/build.gradle.kts
+++ b/features/securityandprivacy/impl/build.gradle.kts
@@ -41,10 +41,12 @@ dependencies {
     implementation(projects.libraries.uiStrings)
     implementation(projects.services.analytics.api)
     implementation(projects.libraries.featureflag.api)
+    implementation(projects.features.enterprise.api)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.testtags)
+    testImplementation(projects.features.enterprise.test)
 }
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesView.kt
index 7208ee6115..514c38a3fd 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesView.kt
@@ -140,7 +140,7 @@ private fun CheckableSpaceListItem(
     enabled: Boolean = true,
 ) {
     ListItem(
-        headlineContent = {
+        content = {
             Text(text = headlineText)
         },
         supportingContent = supportingText?.let {
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
index 9230c1183a..32517cd18d 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenter.kt
@@ -22,6 +22,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.securityandprivacy.api.SecurityAndPrivacyPermissions
 import io.element.android.features.securityandprivacy.api.securityAndPrivacyPermissions
 import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
@@ -63,6 +64,7 @@ class SecurityAndPrivacyPresenter(
     private val matrixClient: MatrixClient,
     private val room: JoinedRoom,
     private val featureFlagService: FeatureFlagService,
+    private val sessionEnterpriseService: SessionEnterpriseService,
 ) : Presenter<SecurityAndPrivacyState> {
     @AssistedFactory
     interface Factory {
@@ -78,14 +80,15 @@ class SecurityAndPrivacyPresenter(
         val isKnockEnabled by remember {
             featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
         }.collectAsState(false)
-        val isSpaceSettingsEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.SpaceSettings)
-        }.collectAsState(false)
 
         val saveAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val homeserverName = remember { matrixClient.userIdServerName() }
         val roomInfo by room.roomInfoFlow.collectAsState()
 
+        val isEncryptionDisabledByHomeserver by produceState(false) {
+            value = sessionEnterpriseService.isEncryptionDisabledByHomeserver()
+        }
+
         val savedIsVisibleInRoomDirectory = remember { mutableStateOf<AsyncData<Boolean>>(AsyncData.Uninitialized) }
         LaunchedEffect(Unit) {
             isRoomVisibleInRoomDirectory(savedIsVisibleInRoomDirectory)
@@ -248,9 +251,9 @@ class SecurityAndPrivacyPresenter(
             saveAction = saveAction.value,
             permissions = permissions,
             isSpace = roomInfo.isSpace,
-            isSpaceSettingsEnabled = isSpaceSettingsEnabled,
             selectableJoinedSpaces = selectableJoinedSpaces,
             spaceSelectionMode = spaceSelectionMode,
+            isEncryptionDisabledByHomeserver = isEncryptionDisabledByHomeserver,
             eventSink = ::handleEvent,
         )
 
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
index 6ec47ba183..ddba5d0caa 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyState.kt
@@ -27,9 +27,9 @@ data class SecurityAndPrivacyState(
     // the settings the user wants to apply.
     val editedSettings: SecurityAndPrivacySettings,
     val homeserverName: String,
+    val isEncryptionDisabledByHomeserver: Boolean,
     val showEnableEncryptionConfirmation: Boolean,
     private val isKnockEnabled: Boolean,
-    private val isSpaceSettingsEnabled: Boolean,
     val saveAction: AsyncAction<Unit>,
     val isSpace: Boolean,
     private val permissions: SecurityAndPrivacyPermissions,
@@ -37,7 +37,7 @@ data class SecurityAndPrivacyState(
     private val spaceSelectionMode: SpaceSelectionMode,
     val eventSink: (SecurityAndPrivacyEvent) -> Unit
 ) {
-    val isSpaceMemberSelectable = isSpaceSettingsEnabled && spaceSelectionMode != SpaceSelectionMode.None
+    val isSpaceMemberSelectable = spaceSelectionMode != SpaceSelectionMode.None
 
     // Show SpaceMember option in two cases:
     // - SpaceMember is the current saved value
@@ -85,7 +85,7 @@ data class SecurityAndPrivacyState(
         editedSettings.roomAccess.canConfigureRoomVisibility()
 
     val showHistoryVisibilitySection = permissions.canChangeHistoryVisibility && !isSpace
-    val showEncryptionSection = permissions.canChangeEncryption && !isSpace
+    val showEncryptionSection = !isEncryptionDisabledByHomeserver && permissions.canChangeEncryption && !isSpace
 
     @Composable
     fun spaceMemberDescription(): String {
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
index 95cb45d641..998d61b564 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyStateProvider.kt
@@ -138,7 +138,7 @@ fun aSecurityAndPrivacyState(
     isSpace: Boolean = false,
     selectableJoinedSpaces: Set<SpaceRoom> = emptySet(),
     spaceSelectionMode: SpaceSelectionMode = SpaceSelectionMode.None,
-    isSpaceSettingsEnabled: Boolean = true,
+    isEncryptionDisabledByHomeserver: Boolean = false,
     eventSink: (SecurityAndPrivacyEvent) -> Unit = {}
 ) = SecurityAndPrivacyState(
     editedSettings = editedSettings,
@@ -151,6 +151,6 @@ fun aSecurityAndPrivacyState(
     isSpace = isSpace,
     selectableJoinedSpaces = selectableJoinedSpaces.toImmutableSet(),
     spaceSelectionMode = spaceSelectionMode,
-    isSpaceSettingsEnabled = isSpaceSettingsEnabled,
+    isEncryptionDisabledByHomeserver = isEncryptionDisabledByHomeserver,
     eventSink = eventSink,
 )
diff --git a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
index f4207ae3af..43feb99611 100644
--- a/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
+++ b/features/securityandprivacy/impl/src/main/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyView.kt
@@ -54,6 +54,8 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
 
@@ -78,14 +80,16 @@ fun SecurityAndPrivacyView(
                     state.eventSink(SecurityAndPrivacyEvent.Save)
                 },
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Column(
             modifier = Modifier
                 .padding(padding)
                 .imePadding()
                 .verticalScroll(rememberScrollState())
-                .consumeWindowInsets(padding),
+                .consumeWindowInsets(padding)
+                .padding(lazyColumnContentPadding),
             verticalArrangement = Arrangement.spacedBy(32.dp),
         ) {
             if (state.showRoomAccessSection) {
@@ -231,7 +235,7 @@ private fun RoomAccessSection(
         modifier = modifier,
     ) {
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_title)) },
+            content = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_title)) },
             supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_anyone_option_description)) },
             trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.Anyone),
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Public())),
@@ -239,7 +243,7 @@ private fun RoomAccessSection(
         )
         if (state.showSpaceMemberOption) {
             ListItem(
-                headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
+                content = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_space_members_option_title)) },
                 supportingContent = {
                     Text(text = state.spaceMemberDescription())
                 },
@@ -251,7 +255,7 @@ private fun RoomAccessSection(
         }
         if (state.showAskToJoinOption) {
             ListItem(
-                headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_title)) },
+                content = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_title)) },
                 supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_description)) },
                 trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.AskToJoin),
                 onClick = { onSelectOption(SecurityAndPrivacyRoomAccess.AskToJoin) },
@@ -261,7 +265,7 @@ private fun RoomAccessSection(
         }
         if (state.showAskToJoinWithSpaceMemberOption) {
             ListItem(
-                headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_title)) },
+                content = { Text(text = stringResource(R.string.screen_security_and_privacy_ask_to_join_option_title)) },
                 supportingContent = { Text(text = state.askToJoinWithSpaceMembersDescription()) },
                 trailingContent = ListItemContent.RadioButton(selected = edited is SecurityAndPrivacyRoomAccess.AskToJoinWithSpaceMember),
                 onClick = ::onAskToJoinWithSpaceMembersClick,
@@ -270,7 +274,7 @@ private fun RoomAccessSection(
             )
         }
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_title)) },
+            content = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_title)) },
             supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_access_invite_only_option_description)) },
             trailingContent = ListItemContent.RadioButton(selected = edited == SecurityAndPrivacyRoomAccess.InviteOnly),
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
@@ -326,7 +330,7 @@ private fun RoomAddressSection(
         modifier = modifier,
     ) {
         ListItem(
-            headlineContent = {
+            content = {
                 Text(text = roomAddress ?: stringResource(R.string.screen_security_and_privacy_add_room_address_action))
             },
             trailingContent = if (roomAddress.isNullOrEmpty()) ListItemContent.Icon(IconSource.Vector(CompoundIcons.Plus())) else null,
@@ -336,7 +340,7 @@ private fun RoomAddressSection(
         )
 
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)) },
+            content = { Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)) },
             supportingContent = {
                 Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_toggle_description, homeserverName))
             },
@@ -383,7 +387,7 @@ private fun EncryptionSection(
         modifier = modifier,
     ) {
         ListItem(
-            headlineContent = { Text(text = stringResource(R.string.screen_security_and_privacy_encryption_toggle_title)) },
+            content = { Text(text = stringResource(R.string.screen_security_and_privacy_encryption_toggle_title)) },
             supportingContent = { Text(text = stringResource(R.string.screen_security_and_privacy_encryption_section_footer)) },
             trailingContent = ListItemContent.Switch(
                 checked = isRoomEncrypted,
@@ -455,7 +459,7 @@ private fun HistoryVisibilityItem(
         SecurityAndPrivacyHistoryVisibility.WorldReadable -> stringResource(R.string.screen_security_and_privacy_room_history_anyone_option_title)
     }
     ListItem(
-        headlineContent = { Text(text = headlineText) },
+        content = { Text(text = headlineText) },
         trailingContent = ListItemContent.RadioButton(selected = isSelected, enabled = isEnabled),
         onClick = { onSelectOption(option) },
         enabled = isEnabled,
diff --git a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
index 45ca9760ac..b2e90afeee 100644
--- a/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-be/translations.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_title">"Рэдагаваць адрас"</string>
   <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Вашы прасторы"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Адрас"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ca/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..4d541af9d1
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"És necessària una adreça perquè sigui visible al directori públic."</string>
+  <string name="screen_edit_room_address_title">"Edita adreça"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Afegeix adreça"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Tothom ha de sol·licitar l\'accés."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Sol·licita unir-t\'hi"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sí, activa el xifrat"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Un cop activat, el xifrat d\'una sala no es pot desactivar. L\'històric de missatges només serà visible per als membres de la sala des que van ser convidats o des que s\'hi van unir.
+Ningú a part dels membres de la sala podrà llegir els missatges. Això pot impedir que els bots i els ponts (\'bridges\') funcionin correctament.
+No es recomana activar el xifrat a les sales que tothom pot trobar i unir-se."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Vols activar el xifrat?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Un cop activat, el xifrat no es pot desactivar."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Xifrat"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Activa el xifrat d\'extrem a extrem"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Tothom pot unir-s\'hi."</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Tothom"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Només s\'hi poden unir les persones convidades."</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Només amb invitació"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Accés"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Actualment els espais no són compatibles"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"És necessària una adreça perquè sigui visible al directori públic."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adreça"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permet trobar aquesta sala cercant %1$s al directori públic de sales"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visible al directori públic"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Tothom (historial públic)"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Qui pot llegir l\'historial?"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membres, des de quan es van convidar"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membres (historial complet)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Les adreces de sala són maneres de trobar i accedir a les sales. Això també garanteix que puguis compartir fàcilment la teva sala amb altres persones.
+Pots optar per publicar la teva sala al directori públic de sales del teu servidor local."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilitat"</string>
+  <string name="screen_security_and_privacy_title">"Seguretat i privadesa"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-da/translations.xml b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
index 659799693b..566c26b4af 100644
--- a/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-da/translations.xml
@@ -29,7 +29,7 @@ Vi anbefaler ikke at aktivere kryptering for rum, som alle kan finde og deltage
   <string name="screen_security_and_privacy_room_access_section_header">"Adgang"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Alle i autoriserede klynger kan deltage."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Alle i %1$s kan deltage."</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af rummet"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Medlemmer af klyngen"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Klynger understøttes ikke i øjeblikket"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du skal bruge en adresse for at gøre det synligt i det offentlige register."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
index 0bc6aa8877..c60efc009c 100644
--- a/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-de/translations.xml
@@ -29,6 +29,7 @@ Wir empfehlen keine Verschlüsselung für Chats zu aktivieren, die jeder finden
   <string name="screen_security_and_privacy_room_access_section_header">"Zugang"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Jeder in autorisierten Spaces kann beitreten."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Jeder in %1$s kann beitreten."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Space Mitglieder"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spaces werden zur Zeit nicht unterstützt."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Du benötigst eine Chat-Adresse, um den Chat im öffentlichen Verzeichnis sichtbar zu machen."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresse"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml b/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml
index 3dd3e7468d..4038a7a412 100644
--- a/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-hr/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adresu"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Svatko tko se nalazi u ovlaštenim prostorima može se pridružiti, ali svi ostali moraju zatražiti pristup."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Svi moraju zatražiti pristup."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Zatraži pridruživanje"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Svatko u %1$s može se pridružiti, ali svi ostali moraju zatražiti pristup."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, omogući šifriranje"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Nakon što se šifriranje za sobu omogući, više se neće moći onemogućiti. Povijest poruka bit će vidljiva samo članovima sobe otkad su pozvani ili otkad su joj se pridružili.
@@ -20,13 +21,15 @@ Ne preporučujemo omogućavanje šifriranja za sobe koje svatko može pronaći i
   <string name="screen_security_and_privacy_encryption_section_header">"Šifriranje"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Omogući sveobuhvatno šifriranje"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Svatko se može pridružiti."</string>
-  <string name="screen_security_and_privacy_room_access_footer">"Odaberite iz kojih se prostora članovi mogu pridružiti ovoj sobi bez pozivnice.  %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Bilo tko"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Odaberite iz kojih se prostora članovi mogu pridružiti ovoj sobi bez pozivnice. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Upravljaj prostorima"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Samo pozvane osobe mogu se pridružiti."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Samo s pozivnicom"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Pristup"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Svatko tko se nalazi u ovlaštenim prostorima može se pridružiti."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Svatko u %1$s može se pridružiti."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Članovi prostora"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Prostori trenutačno nisu podržani"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Trebat će vam adresa kako bi bila vidljiva u javnom direktoriju."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresa"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
index 9ae4ac9044..9861c08e80 100644
--- a/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-in/translations.xml
@@ -2,9 +2,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
   <string name="screen_edit_room_address_title">"Edit alamat"</string>
+  <string name="screen_manage_authorized_spaces_header">"Ruang di mana anggota dapat bergabung ke ruangan tanpa undangan."</string>
+  <string name="screen_manage_authorized_spaces_title">"Kelola ruang"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Ruang tak dikenal)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Ruang lain yang bukan merupakan keanggotaan Anda"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Ruang Anda"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Siapa pun yang berada di ruang yang diizinkan dapat bergabung, tetapi semua orang lain harus meminta akses."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Meminta hak akses pada administrator atau moderator."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Ijin bergabung"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Siapa pun di %1$s dapat bergabung, tetapi semua orang lain harus meminta akses."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ya, aktifkan enkripsi"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Setelah diaktifkan, encryption untuk sebuah ruangan tidak dapat dinonaktifkan, Riwayat pesan hanya akan terlihat oleh anggota ruangan sejak mereka diundang atau sejak mereka bergabung dengan ruangan tersebut.
 Tidak ada orang lain selain anggota ruangan yang dapat membaca pesan. Hal ini dapat mencegah bot dan jembatan bekerja dengan benar.
@@ -15,20 +22,28 @@ Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat dite
   <string name="screen_security_and_privacy_encryption_toggle_title">"Aktifkan enkripsi ujung ke ujung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Siapa pun dapat menemukan dan bergabung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Semua orang"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Pilih ruang mana yang anggotanya dapat bergabung ke ruangan ini tanpa undangan. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Kelola ruang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Siapa pun yang berada di area yang diizinkan dapat bergabung."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Siapa pun di %1$s dapat bergabung."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Space saat ini tidak didukung"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Alamat"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Izinkan agar dapat ditemukan melalui pencarian di direktori publik."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Tersedia di direktori publik"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa saja (riwayat publik)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Perubahan tidak akan memengaruhi pesan lama, hanya pesan baru. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Siapa yang bisa membaca riwayat"</string>
   <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Hanya sejak anggota diundang"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Anggota dapat melihat rekaman percakapan sejak memilih opsi ini"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat adalah cara untuk menemukan dan mengakses ruangan dan ruang. Ini juga memastikan Anda dapat dengan mudah membagikannya dengan orang lain."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Visibilitas"</string>
   <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-it/translations.xml b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
index 0cf3326022..41b0c1a047 100644
--- a/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-it/translations.xml
@@ -2,9 +2,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
   <string name="screen_edit_room_address_title">"Modifica indirizzo"</string>
+  <string name="screen_manage_authorized_spaces_header">"Spazi in cui i membri possono entrare nella stanza senza invito."</string>
+  <string name="screen_manage_authorized_spaces_title">"Gestisci gli spazi"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Spazio sconosciuto)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Altri spazi di cui non sei membro"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"I tuoi spazi"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Aggiungi indirizzo"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Chiunque si trovi in spazi autorizzati può partecipare, ma tutti gli altri devono richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Chiunque deve richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Chiedi di entrare"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Chiunque all\'interno di %1$s può partecipare, mentre tutti gli altri devono richiedere l\'accesso."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Sì, attiva la crittografia"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Una volta attivata, la crittografia di una stanza non può essere disattivata, la cronologia dei messaggi sarà visibile solo ai membri della stanza da quando sono stati invitati o da quando sono entrati nella stanza.
 Nessuno, oltre ai membri della stanza, sarà in grado di leggere i messaggi. Ciò potrebbe impedire ai bot e ai bridge di funzionare correttamente.
@@ -15,19 +22,25 @@ Non consigliamo di attivare la crittografia per le stanze che chiunque può trov
   <string name="screen_security_and_privacy_encryption_toggle_title">"Attiva la crittografia end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Chiunque può partecipare."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Scegli quali membri dello spazio possono accedere a questa stanza senza invito.%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gestisci gli spazi"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Solo le persone invitate possono entrare."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Solo su invito"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Accesso"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Chiunque si trovi in ​​spazi autorizzati può partecipare."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Chiunque in %1$s può partecipare."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membri dello spazio"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Gli spazi non sono attualmente supportati"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Per renderlo visibile nell\'elenco pubblico, avrai bisogno di un indirizzo."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Indirizzo"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Consenti la ricerca di questa stanza effettuando una ricerca nell\'elenco delle stanze pubbliche di %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Consenti di essere trovato effettuando una ricerca nell\'elenco pubblico."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Visibile nell\'elenco pubblico"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Chiunque (la cronologia è pubblica)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Le modifiche non interesseranno i messaggi passati, ma solo quelli nuovi. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Chi può leggere la cronologia messaggi"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Solo membri da quando sono stati invitati"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Solo membri da dopo aver selezionato questa opzione"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Members invited"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Members (cronologia completa)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Gli indirizzi delle stanze sono modi per trovare e accedervi. In questo modo puoi anche condividere facilmente la tua stanze con altri.
 Puoi scegliere di pubblicare la tua stanza nell\'elenco delle stanza pubbliche dell\'homeserver."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Pubblicazione della stanza"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ja/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..110d19a325
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"公開ディレクトリで自分を見つけられるようにするには、アドレスが必要です。"</string>
+  <string name="screen_edit_room_address_title">"アドレスの編集"</string>
+  <string name="screen_manage_authorized_spaces_header">"招待なしでルームへの参加が可能なスペース"</string>
+  <string name="screen_manage_authorized_spaces_title">"スペースを管理"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(不明なスペース)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"参加していない他のスペース"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"あなたのスペース"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"アドレスを追加"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"認証済みのスペースに所属するユーザーのみが参加できます。それ以外のユーザーは参加へのリクエストが必要です。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"参加のリクエストが必須です。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"参加をリクエスト"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s に所属するユーザーのみが参加できます。それ以外のユーザーは参加のリクエストが必要です。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"暗号化を有効にする"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"暗号化が有効のルームを再び無効化することはできません。過去のメッセージの参照は、ユーザーが招待された、あるいは参加した以降に投稿された内容に限定されます。
+ルームのメンバー以外がメッセージを確認することはできないため、bot やブリッジのサービスが正常に動作しない可能性があります。
+公開スペースを暗号化することは一般に推奨されません。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"暗号化を有効にしますか？"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"一度有効にすると元に戻すことはできません。"</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"暗号化"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"エンドツーエンド暗号化を有効にする"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"誰でも参加できます"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"全員"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"招待無しで参加できるユーザーが所属するルームを選択してください。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"スペースを管理"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"招待されたユーザーのみ参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"招待制"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"アクセス"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"認証済みのスペースに所属するすべてのユーザーが参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s に所属するすべてのユーザーが参加できます。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"スペースのメンバー"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"スペースは現在対応していません。"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"公開ディレクトリで自分を見つけられるようにするには、アドレスが必要です。"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"アドレス"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"%1$s の公開ルームの検索結果に、このルームを表示します"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"公開ディレクトリの検索結果に表示"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"公開ディレクトリに表示"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"全員(履歴を公開)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"過去のメッセージに変更は適用されません。新規のメッセージにのみ適用されます。%1$s"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"履歴を表示するユーザー"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"招待済みのユーザー"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"ユーザー (すべての履歴)"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"ルームアドレスはルームの検索やアクセスに役立ち、他のユーザーにルームを簡単に共有できます。
+ホームサーバーの公開ディレクトリにルームを表示するかを設定できます。"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"ルームの公開"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"ルームアドレスはルームの検索やアクセスに役立ち、他のユーザーにルームを簡単に共有できます。"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"視認性"</string>
+  <string name="screen_security_and_privacy_title">"セキュリティとプライバシー"</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
index c62c4f2af4..60415c2288 100644
--- a/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-pl/translations.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
-  <string name="screen_edit_room_address_title">"Adres pokoju"</string>
-  <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres pokoju"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić żądanie."</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi publicznych, potrzebny jest adres pokoju."</string>
+  <string name="screen_edit_room_address_title">"Edytuj adres"</string>
+  <string name="screen_manage_authorized_spaces_header">"Przestrzenie, których członkowie mogą dołączyć do pokoju bez zaproszenia."</string>
+  <string name="screen_manage_authorized_spaces_title">"Zarządzaj przestrzeniami"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"(Nieznana przestrzeń)"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Inne przestrzenie, których nie jesteś członkiem"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Twoje przestrzenie"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Dodaj adres"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Każdy w autoryzowanych przestrzeniach może dołączyć, ale wszyscy inni muszą poprosić o dostęp."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Każdy musi poprosić o dostęp."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Poproś o dołączenie"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Każdy w %1$s może dołączyć, ale wszyscy pozostali muszą poprosić o dostęp."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Tak, włącz szyfrowanie"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Po włączeniu szyfrowanie pokoju nie może zostać wyłączone, a historia wiadomości będzie widoczna tylko dla członków od momentu, w którym dołączyli lub zostali zaproszeni.
 Nikt poza członkami pokoju nie będzie mógł czytać wiadomości. Może to wpłynąć na prawidłowe działanie botów lub mostków.
@@ -13,23 +20,31 @@ Odradzamy włączanie szyfrowania dla pokoi, które każdy może znaleźć i do
   <string name="screen_security_and_privacy_encryption_section_footer">"Po włączeniu szyfrowania nie można wyłączyć."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Szyfrowanie"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Włącz szyfrowanie end-to-end"</string>
-  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może znaleźć i dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Każdy może dołączyć."</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Każdy"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko osoby z zaproszeniem mogą dołączyć"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko zaproszenie"</string>
-  <string name="screen_security_and_privacy_room_access_section_header">"Dostęp do pokoju"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Wybierz, którzy członkowie przestrzeni mogą dołączyć do tego pokoju bez zaproszenia. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Zarządzaj przestrzeniami"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Tylko zaproszone osoby mogą dołączyć"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Tylko na zaproszenie"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"Dostęp"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Każdy w autoryzowanych przestrzeniach może dołączyć."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Każdy w %1$s może dołączyć."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Członkowie przestrzeni"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Przestrzenie nie są obecnie wspierane"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu, potrzebny jest adres pokoju."</string>
-  <string name="screen_security_and_privacy_room_address_section_header">"Adres pokoju"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Aby pokój był widoczny w katalogu pokoi publicznych, potrzebny jest adres pokoju."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Adres"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Zezwól na znalezienie tego pokoju wyszukując %1$s w katalogu pokoi publicznych"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Zezwól, by inni mogli Cię znaleźć, przeszukując katalog publiczny."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Widoczny w katalogu pokoi publicznych"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Ktokolwiek"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Każdy (historia jest publiczna)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Zmiany nie zmienią przeszłych wiadomości, tylko nowe. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Kto może czytać historię"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Od momentu kiedy członkowie zostali zaproszeni"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie od momentu włączenia tej opcji"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Członkowie od kiedy zostali zaproszeni"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Członkowie (cała historia)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresy pokoju umożliwiają łatwe znalezienie i dołączenie do pokojów.
 Również możesz się zdecydować na upublicznienie Twojego serwera w katalogu pokoi publicznych."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publikowanie pokoju"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność pokoju"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Adresy pokoi pomagają w znalezieniu i dołączeniu do pokoi i przestrzeni. Umożliwiają również łatwe udostępnianie ich innym."</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"Widoczność"</string>
   <string name="screen_security_and_privacy_title">"Bezpieczeństwo i prywatność"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
index 83292637ce..2f3eaab319 100644
--- a/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-ro/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_security_and_privacy_add_room_address_action">"Adăugați o adresă"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Oricine se află în spațiile autorizate se poate alătura, dar toți ceilalți trebuie să solicite accesul."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Toată lumea trebuie să solicite acces."</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Solicitați să vă alăturați"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Oricine în %1$s se poate alătura, dar toți ceilalți trebuie să solicite acces."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Da, activați criptarea"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Odată activată, criptarea pentru o cameră nu poate fi dezactivată. Mesajele anterioare vor fi vizibile numai pentru membrii camerei de la momentul la care au fost invitați sau de la momentul la care s-au alăturat camerei. 
@@ -20,22 +21,26 @@ Nu recomandăm activarea criptării pentru camerele pe care oricine le poate gă
   <string name="screen_security_and_privacy_encryption_section_header">"Criptare"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"Activați criptarea end-to-end"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Oricine se poate alătura."</string>
-  <string name="screen_security_and_privacy_room_access_footer">"Alegeți membrii căror spații se pot alătura acestei camere fără invitație. %1$s"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Oricine"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"Alegeți membrii căror spații se pot alătura acestei cameră fără invitație. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Gestionați spațiile"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Doar persoanele invitate se pot alătura."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Doar pe bază de invitație"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Acces"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Oricine se află într-un spațiu autorizat poate participa."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Oricine din %1$s se poate alătura."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Membrii spațiului"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Spațiile nu sunt momentan suportate."</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Veți avea nevoie de o adresă pentru a o face vizibilă în directorul public."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Adresă"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Permiteți găsirea acestei camere prin căutarea în directorul de camere publice al %1$s"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Permiteți găsirea prin căutarea în directorul public."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Vizibilă în directorul de camere publice"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Oricine (istoricul este public)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"Modificările nu vor afecta mesajele anterioare, ci doar pe cele noi. %1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Cine poate citi mesajele anterioare"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Doar pentru membri, de la momentul în care au fost invitați"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Doar pentru membri, după selectarea acestei opțiuni"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Membri de la momentul invitației"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Membri (istoric complet)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Adresele camerelor sunt modalități de a găsi și accesa camere. Acest lucru vă asigură, de asemenea, că puteți partaja cu ușurință camera dumneavoastră cu alte persoane.
 Puteți alege să publicați camera în directorul public al camerelor serverului dumneavoastră."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Publicare cameră"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
index 2cae719a03..bd6ad0081d 100644
--- a/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-ru/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_edit_room_address_room_address_section_footer">"Необходимо задать адрес комнаты, чтобы опубликовать ее в каталоге комнат."</string>
   <string name="screen_edit_room_address_title">"Редактировать адрес комнаты"</string>
   <string name="screen_manage_authorized_spaces_header">"Пространства, где участники могут присоединиться к комнате без приглашения."</string>
-  <string name="screen_manage_authorized_spaces_title">"Управление пространством"</string>
+  <string name="screen_manage_authorized_spaces_title">"Управление пространствами"</string>
   <string name="screen_manage_authorized_spaces_unknown_space">"(неизвестное пространство)"</string>
   <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Другие пространства, в которых вы не состоите"</string>
   <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Ваши пространства"</string>
@@ -23,7 +23,7 @@
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Любой желающий может присоединиться"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Кто угодно"</string>
   <string name="screen_security_and_privacy_room_access_footer">"Выберите, участники каких пространств могут присоединиться к этой комнате без приглашения.%1$s"</string>
-  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Управление пространством"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Управление пространствами"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Присоединиться могут только приглашенные люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Только по приглашению"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
index f8b96ee6c5..0921887ccb 100644
--- a/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-uk/translations.xml
@@ -8,8 +8,10 @@
   <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"Інші простори, учасником яких ви не є"</string>
   <string name="screen_manage_authorized_spaces_your_spaces_section_title">"Ваші простори"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Додати адресу"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Будь-хто в авторизованих просторах може приєднатися, але всі інші повинні подати запит на доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Усі повинні запитувати доступ."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Запит на приєднання"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"Будь-хто з %1$s може приєднатися, але всі інші повинні подати запит на доступ."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Так, увімкнути шифрування"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Після ввімкнення шифрування кімнати, його неможливо вимкнути, історію повідомлень бачитимуть лише учасники кімнати, яких було запрошено або які приєдналися до кімнати.
 Ніхто, крім учасників кімнати, не зможе прочитати повідомлення. Це може перешкоджати коректній роботі ботів і мостів.
@@ -25,11 +27,14 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Приєднатися можуть лише запрошені люди."</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Лише запрошені"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Доступ"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Долучитися може будь-хто, хто має доступ до авторизованих просторів."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"Долучитися може будь-хто з %1$s."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Учасники простору"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Простори наразі не підтримуються"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Вам знадобиться адреса кімнати, щоб зробити її видимою в каталозі."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Адреса"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Дозвольте, щоб цю кімнату можна було знайти за допомогою пошуку в каталозі загальнодоступних кімнат %1$s "</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Дозвольте знаходити вас за допомогою пошуку в публічному каталозі."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Видима в загальному каталозі"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Будь-хто (загальнодоступна історія)"</string>
   <string name="screen_security_and_privacy_room_history_section_footer">"Зміни не вплинуть на попередні повідомлення, лише на нові. %1$s"</string>
@@ -39,6 +44,7 @@
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Адреси кімнат — це спосіб знайти кімнату та отримати до неї доступ. Це також гарантує, що ви можете легко поділитися своєю кімнатою з іншими.
 Ви можете опублікувати свою кімнату в каталозі загальнодоступних кімнат вашого домашнього сервера."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"Публікація в кімнаті"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Адреси — це спосіб знаходити кімнати та простори та отримувати до них доступ. Це також гарантує, що ви зможете легко ділитися ними з іншими."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Видимість"</string>
   <string name="screen_security_and_privacy_title">"Безпека й приватність"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
index 2197e52905..134378f4f5 100644
--- a/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-uz/translations.xml
@@ -10,6 +10,7 @@
   <string name="screen_security_and_privacy_add_room_address_action">"Xona manzilini kiritish"</string>
   <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"Vakolatli guruhlardagi har kim qo‘shilishi mumkin, lekin qolganlar ruxsat so‘rashi kerak. Tarjima eslatmasi yo‘q"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"Qo‘shilish uchun so‘rash"</string>
   <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s ichidagi istalgan kishi qo‘shilishi mumkin, lekin qolganlar ruxsat so‘rashi kerak."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ha, shifrlashni yoqish"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Yoqilgandan so‘ng, xona uchun shifrlashni o‘chirib bo‘lmaydi. Xabarlar tarixi faqat xona a’zolari taklif qilinganidan yoki xonaga qo‘shilganidan keyingi davrdan boshlab ko‘rinadi. Xona a’zolaridan tashqari hech kim xabarlarni o‘qiy olmaydi. Bu botlar va ko‘priklarning to‘g‘ri ishlashiga to‘sqinlik qilishi mumkin.
@@ -19,6 +20,7 @@ Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shi
   <string name="screen_security_and_privacy_encryption_section_header">"Shifrlash"</string>
   <string name="screen_security_and_privacy_encryption_toggle_title">"End-to-end shifrlashni yoqish"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"Istalgan kishi topishi va qo‘shilishi mumkin"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"Har kim"</string>
   <string name="screen_security_and_privacy_room_access_footer">"Qaysi maydonlar a’zolari bu xonaga taklifnomalarsiz kirishi mumkinligini tanlang. %1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"Maydonlarni boshqarish"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Odamlar faqat taklif qilingan taqdirdagina qo‘shilishi mumkin"</string>
@@ -26,15 +28,18 @@ Shu sababli, har kim topishi va qo‘shilishi mumkin bo‘lgan xonalar uchun shi
   <string name="screen_security_and_privacy_room_access_section_header">"Xonaga kirish huquqi"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"Ruxsat berilgan maydonlardagi istalgan kishi qo‘shilishi mumkin."</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s ichidagi istalgan kishi qo‘shilishi mumkin."</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Maydon a’zolari"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"Hozirda maydonlar qo‘llab-quvvatlanmaydi"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Katalogda ko‘rinadigan qilish uchun xona manzili kerak bo‘ladi."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Manzil"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Bu xonani %1$s umumiy xonalar ro‘yxatidan qidirib topish imkoniyatini berish"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"Umumiy katalogni qidirish orqali topishga ruxsat bering."</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Umumiy xona ro‘yxatida ko‘rinadi"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"Har kim (tarix hammaga ochiq)"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"O‘zgarishlar avvalgi xabarlarga ta’sir qilmaydi, faqat yangilariga ta’sir qiladi.%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"Tarixni kim o‘qiy oladi"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan buyon faqat a’zolar"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar faqat bu parametr tanlanganidan keyin"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Taklif qilinganidan beri a’zo"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"A’zolar (to‘liq tarix)"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"Xona manzillari xonalarni topish va ularga kirish usullaridir. Bu shuningdek xonangizni boshqalar bilan oson ulashish imkonini beradi.
 Xonangizni o‘z homeserveringizning ommaviy xonalar ro‘yxatida e’lon qilishni tanlashingiz mumkin."</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"xona nashriyoti"</string>
diff --git a/features/securityandprivacy/impl/src/main/res/values-vi/translations.xml b/features/securityandprivacy/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..c400036307
--- /dev/null
+++ b/features/securityandprivacy/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Bạn cần một địa chỉ để hiển thị trong danh bạ công khai."</string>
+  <string name="screen_edit_room_address_title">"Chỉnh sửa địa chỉ"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Sau khi được kích hoạt, mã hóa cho một phòng chat không thể tắt được. Lịch sử tin nhắn chỉ hiển thị cho các thành viên phòng chat kể từ khi họ được mời hoặc kể từ khi họ tham gia phòng chat.
+Không ai ngoài các thành viên phòng chat có thể đọc tin nhắn. Điều này có thể ngăn chặn bot và các thiết bị kết nối hoạt động đúng cách.
+Chúng tôi không khuyến khích bật mã hóa cho các phòng chat mà bất kỳ ai cũng có thể tìm thấy và tham gia."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"Mã hóa"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Thành viên không gian"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Bạn cần một địa chỉ để hiển thị trong danh bạ công khai."</string>
+</resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
index b9a93922f4..5239585201 100644
--- a/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-zh-rTW/translations.xml
@@ -2,9 +2,16 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
   <string name="screen_edit_room_address_title">"編輯地址"</string>
+  <string name="screen_manage_authorized_spaces_header">"在此空間中，成員可無須邀請直接加入聊天室。"</string>
+  <string name="screen_manage_authorized_spaces_title">"管理空間"</string>
+  <string name="screen_manage_authorized_spaces_unknown_space">"（未知空間）"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"您尚非成員的其他空間"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"您的空間"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"新增地址"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"任何在授權空間的人都可以加入，但其他人都必須提出申請。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"所有人都必須申請存取權。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"要求加入"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"任何在 %1$s 中的人都可以加入，但其他人都必須提出申請。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，啟用加密"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"啟用後就無法停用聊天室的加密，只有受邀的聊天室成員或加入聊天室後才能看到訊息歷史紀錄。
 除了聊天室成員以外，任何人都不能讀取訊息。這可能會讓機器人與橋接無法正常運作。
@@ -15,22 +22,29 @@
   <string name="screen_security_and_privacy_encryption_toggle_title">"啟用端到端加密"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"選擇哪些空間的成員不需要邀請就可以加入此聊天室。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"管理空間"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"僅受邀者才能加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"僅限邀請"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"存取權"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"任何位於已授權空間的人都可以加入。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"任何在 %1$s 中的人都可以加入。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"空間成員"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支援空間"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"您需要地址才能在公開目錄中顯示。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允許透過搜尋 %1$s 公開聊天室目錄找到此聊天室"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"允許其他人透過公開目錄找到。"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"在公開目錄中可見"</string>
-  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人（歷史紀錄公開）"</string>
+  <string name="screen_security_and_privacy_room_history_section_footer">"變更不會影響先前的訊息，只會影響新訊息。%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"誰可以讀取歷史紀錄"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"僅在成員被邀請後"</string>
-  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"選取此選項後僅限成員"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"成員，邀請後"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"成員（完整歷史）"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"聊天室地址是尋找與存取聊天室的方法。也確保您可以輕鬆與其他人分享聊天室。
 您可以選擇在家伺服器公開聊天室目錄中發佈您的聊天室。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"聊天室發佈"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是尋找與存取聊天室與空間的一種方式。這也讓您可以輕鬆地與其他人分享這些資訊。"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"能見度"</string>
   <string name="screen_security_and_privacy_title">"安全與隱私"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
index 8b10638e25..09a22f06b3 100644
--- a/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
+++ b/features/securityandprivacy/impl/src/main/res/values-zh/translations.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_edit_room_address_room_address_section_footer">"您需要一个地址才能在公共目录中显示。"</string>
+  <string name="screen_edit_room_address_room_address_section_footer">"你需要一个地址才能使其在公共目录中可见。"</string>
   <string name="screen_edit_room_address_title">"编辑地址"</string>
   <string name="screen_manage_authorized_spaces_header">"无需邀请即可加入的公共空间。"</string>
   <string name="screen_manage_authorized_spaces_title">"管理空间"</string>
   <string name="screen_manage_authorized_spaces_unknown_space">"（未知空间）"</string>
-  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"您尚未加入的其他空间"</string>
-  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"您的空间"</string>
+  <string name="screen_manage_authorized_spaces_unknown_spaces_section_title">"你尚不是其成员的其它空间"</string>
+  <string name="screen_manage_authorized_spaces_your_spaces_section_title">"你的空间"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"添加地址"</string>
-  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"授权空间内任何成员均可加入，其他人员需申请访问权限。"</string>
+  <string name="screen_security_and_privacy_ask_to_join_multiple_spaces_members_option_description">"已授权空间内的任何成员都可以加入，其他人必须申请访问。"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"所有用户均需申请访问权限。"</string>
-  <string name="screen_security_and_privacy_ask_to_join_option_title">"请求加入"</string>
-  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s 成员可自由加入，其他人员需申请访问权限。"</string>
-  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是的，启用加密"</string>
-  <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史记录只能在房间成员被邀请或加入房间后才可见。
-除房间成员外，任何人都无法阅读信息。这可能会妨碍机器人和网桥正常工作。
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"申请加入"</string>
+  <string name="screen_security_and_privacy_ask_to_join_single_space_members_option_description">"%1$s 成员可以加入，但其他人员必须申请访问。"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"是，启用加密"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"一旦启用，就不能再禁用房间的加密功能。消息历史只能在房间成员被邀请或加入房间后才可见。
+除房间成员外，任何人都无法阅读消息。这可能会阻止机器人和桥接器正常工作。
 我们不建议对任何人都能找到并加入的房间启用加密。"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"启用加密？"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"加密一旦启用，就无法禁用。"</string>
@@ -22,16 +22,16 @@
   <string name="screen_security_and_privacy_encryption_toggle_title">"启用端到端加密"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_description">"任何人都可以加入。"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"任何人"</string>
-  <string name="screen_security_and_privacy_room_access_footer">"选择哪些空间的成员无需邀请即可加入本聊天室。%1$s"</string>
+  <string name="screen_security_and_privacy_room_access_footer">"选择哪些无需邀请即可加入此房间的空间成员。%1$s"</string>
   <string name="screen_security_and_privacy_room_access_footer_manage_spaces_action">"管理空间"</string>
-  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"仅限受邀者加入。"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"仅限受邀人员加入。"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"仅限受邀者"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"访问权限"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_multiple_parents_description">"任何位于已授权空间的成员均可加入。"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_single_parent_description">"%1$s 中的任何人都可加入。"</string>
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"空间成员"</string>
-  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"目前不支持空间"</string>
-  <string name="screen_security_and_privacy_room_address_section_footer">"您需要一个地址才能在公共目录中显示。"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_unavailable_description">"“空间”功能当前不受支持"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"你需要一个地址才能使其在公共目录中可见。"</string>
   <string name="screen_security_and_privacy_room_address_section_header">"地址"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"允许通过搜索 %1$s 的公共房间目录来发现此房间"</string>
   <string name="screen_security_and_privacy_room_directory_visibility_toggle_description">"通过公共目录搜索功能实现可被发现性。"</string>
@@ -39,12 +39,12 @@
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"任何人（历史记录公开）"</string>
   <string name="screen_security_and_privacy_room_history_section_footer">"更改不会影响之前的消息，只会影响新消息。%1$s"</string>
   <string name="screen_security_and_privacy_room_history_section_header">"谁可以读取历史记录"</string>
-  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"自受邀以来的成员"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"自成员被邀请时起"</string>
   <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"成员（完整历史记录）"</string>
   <string name="screen_security_and_privacy_room_publishing_section_footer">"房间地址是查找和访问房间的方式。这也确保你可以轻松地向他人分享房间。
 你可以选择在你服务器的公共房间目录中发布你的房间。"</string>
   <string name="screen_security_and_privacy_room_publishing_section_header">"房间发布"</string>
-  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是查找和访问聊天室及空间的途径，同时确保您能轻松与他人共享。"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"地址是查找和访问房间及空间的途径，同时确保你能轻松与他人共享。"</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"可见性"</string>
   <string name="screen_security_and_privacy_title">"安全与隐私"</string>
 </resources>
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNodeTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNodeTest.kt
index a6f21c0162..5578d6b01c 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNodeTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/SecurityAndPrivacyFlowNodeTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.features.securityandprivacy.impl
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.AncestryInfo
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.navmodel.backstack.activeElement
@@ -20,12 +19,11 @@ import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class SecurityAndPrivacyFlowNodeTest {
+class SecurityAndPrivacyFlowNodeTest : RobolectricTest() {
     @Test
     fun `initial backstack contains SecurityAndPrivacy`() = runTest {
         val flowNode = createFlowNode()
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
index 17d6f3a88d..1d0886f52a 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/editroomaddress/EditRoomAddressViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securityandprivacy.impl.editroomaddress
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
 import io.element.android.libraries.testtags.TestTags
@@ -23,86 +25,81 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class EditRoomAddressViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class EditRoomAddressViewTest : RobolectricTest() {
     @Test
-    fun `click on back invokes expected callback`() {
+    fun `click on back invokes expected callback`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setEditRoomAddressView(onBackClick = callback)
-            rule.pressBack()
+            setEditRoomAddressView(onBackClick = callback)
+            pressBack()
         }
     }
 
     @Test
-    fun `click on disabled save doesn't emit event`() {
+    fun `click on disabled save doesn't emit event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<EditRoomAddressEvents>(expectEvents = false)
         val state = anEditRoomAddressState(eventSink = recorder)
-        rule.setEditRoomAddressView(state)
-        rule.clickOn(CommonStrings.action_save)
+        setEditRoomAddressView(state)
+        clickOn(CommonStrings.action_save)
         recorder.assertEmpty()
     }
 
     @Test
-    fun `click on enabled save emits the expected event`() {
+    fun `click on enabled save emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<EditRoomAddressEvents>()
         val state = anEditRoomAddressState(
             roomAddress = "room",
             roomAddressValidity = RoomAddressValidity.Valid,
             eventSink = recorder
         )
-        rule.setEditRoomAddressView(state)
-        rule.clickOn(CommonStrings.action_save)
+        setEditRoomAddressView(state)
+        clickOn(CommonStrings.action_save)
         recorder.assertSingle(EditRoomAddressEvents.Save)
     }
 
     @Test
-    fun `text changes on text field emits the expected event`() {
+    fun `text changes on text field emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<EditRoomAddressEvents>()
         val state = anEditRoomAddressState(
             roomAddress = "",
             eventSink = recorder
         )
-        rule.setEditRoomAddressView(state)
+        setEditRoomAddressView(state)
 
-        rule.onNodeWithTag(TestTags.roomAddressField.value).performTextInput("alias")
+        onNodeWithTag(TestTags.roomAddressField.value).performTextInput("alias")
         recorder.assertSingle(EditRoomAddressEvents.RoomAddressChanged("alias"))
     }
 
     @Test
-    fun `click on dismiss error emits the expected event`() {
+    fun `click on dismiss error emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<EditRoomAddressEvents>()
         val state = anEditRoomAddressState(
             roomAddress = "",
             saveAction = AsyncAction.Failure(IllegalStateException()),
             eventSink = recorder
         )
-        rule.setEditRoomAddressView(state)
-        rule.clickOn(CommonStrings.action_cancel)
+        setEditRoomAddressView(state)
+        clickOn(CommonStrings.action_cancel)
         recorder.assertSingle(EditRoomAddressEvents.DismissError)
     }
 
     @Test
-    fun `click on retry error emits the expected event`() {
+    fun `click on retry error emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<EditRoomAddressEvents>()
         val state = anEditRoomAddressState(
             roomAddress = "",
             saveAction = AsyncAction.Failure(IllegalStateException()),
             eventSink = recorder
         )
-        rule.setEditRoomAddressView(state)
-        rule.clickOn(CommonStrings.action_retry)
+        setEditRoomAddressView(state)
+        clickOn(CommonStrings.action_retry)
         recorder.assertSingle(EditRoomAddressEvents.Save)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setEditRoomAddressView(
+private fun AndroidComposeUiTest<ComponentActivity>.setEditRoomAddressView(
     state: EditRoomAddressState = anEditRoomAddressState(
         eventSink = EventsRecorder(expectEvents = false),
     ),
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesViewTest.kt
index c732df6df0..7d0a1aea16 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/manageauthorizedspaces/ManageAuthorizedSpacesViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securityandprivacy.impl.manageauthorizedspaces
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -22,28 +24,23 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ManageAuthorizedSpacesViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class ManageAuthorizedSpacesViewTest : RobolectricTest() {
     @Test
-    fun `clicking back emits Cancel event`() {
+    fun `clicking back emits Cancel event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ManageAuthorizedSpacesEvent>()
         val state = aManageAuthorizedSpacesState(eventSink = recorder)
-        rule.setManageAuthorizedSpacesView(state)
-        rule.pressBack()
+        setManageAuthorizedSpacesView(state)
+        pressBack()
         recorder.assertSingle(ManageAuthorizedSpacesEvent.Cancel)
     }
 
     @Test
-    fun `clicking space checkbox emits ToggleSpace event`() {
+    fun `clicking space checkbox emits ToggleSpace event`() = runAndroidComposeUiTest {
         val roomId = A_ROOM_ID
         val space = aSpaceRoom(roomId = roomId, displayName = "Test Space")
         val recorder = EventsRecorder<ManageAuthorizedSpacesEvent>()
@@ -51,37 +48,37 @@ class ManageAuthorizedSpacesViewTest {
             selectableSpaces = listOf(space),
             eventSink = recorder
         )
-        rule.setManageAuthorizedSpacesView(state)
-        rule.onNodeWithText("Test Space").performClick()
+        setManageAuthorizedSpacesView(state)
+        onNodeWithText("Test Space").performClick()
         recorder.assertSingle(ManageAuthorizedSpacesEvent.ToggleSpace(roomId))
     }
 
     @Test
-    fun `clicking done button emits Done event`() {
+    fun `clicking done button emits Done event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ManageAuthorizedSpacesEvent>()
         val state = aManageAuthorizedSpacesState(
             selectedIds = listOf(A_ROOM_ID),
             eventSink = recorder
         )
-        rule.setManageAuthorizedSpacesView(state)
-        rule.clickOn(CommonStrings.action_done)
+        setManageAuthorizedSpacesView(state)
+        clickOn(CommonStrings.action_done)
         recorder.assertSingle(ManageAuthorizedSpacesEvent.Done)
     }
 
     @Test
-    fun `done button is disabled when no spaces selected`() {
+    fun `done button is disabled when no spaces selected`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<ManageAuthorizedSpacesEvent>(expectEvents = false)
         val state = aManageAuthorizedSpacesState(
             selectedIds = emptyList(),
             eventSink = recorder
         )
-        rule.setManageAuthorizedSpacesView(state)
-        rule.clickOn(CommonStrings.action_done)
+        setManageAuthorizedSpacesView(state)
+        clickOn(CommonStrings.action_done)
         recorder.assertEmpty()
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setManageAuthorizedSpacesView(
+private fun AndroidComposeUiTest<ComponentActivity>.setManageAuthorizedSpacesView(
     state: ManageAuthorizedSpacesState = aManageAuthorizedSpacesState(
         eventSink = EventsRecorder(expectEvents = false)
     ),
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
index d2844c79f0..0b5133fe6a 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyPresenterTest.kt
@@ -8,6 +8,7 @@
 package io.element.android.features.securityandprivacy.impl.root
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.features.securityandprivacy.impl.FakeSecurityAndPrivacyNavigator
 import io.element.android.features.securityandprivacy.impl.SecurityAndPrivacyNavigator
 import io.element.android.features.securityandprivacy.impl.manageauthorizedspaces.SpaceSelectionStateHolder
@@ -416,11 +417,6 @@ class SecurityAndPrivacyPresenterTest {
         val presenter = createSecurityAndPrivacyPresenter(
             room = room,
             matrixClient = client,
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(
-                    FeatureFlags.SpaceSettings.key to true,
-                )
-            )
         )
         presenter.test {
             skipItems(1)
@@ -461,11 +457,6 @@ class SecurityAndPrivacyPresenterTest {
             room = room,
             navigator = navigator,
             matrixClient = client,
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(
-                    FeatureFlags.SpaceSettings.key to true,
-                )
-            )
         )
         presenter.test {
             skipItems(1)
@@ -587,7 +578,6 @@ class SecurityAndPrivacyPresenterTest {
             featureFlagService = FakeFeatureFlagService(
                 initialState = mapOf(
                     FeatureFlags.Knock.key to true,
-                    FeatureFlags.SpaceSettings.key to true,
                 )
             )
         )
@@ -633,7 +623,6 @@ class SecurityAndPrivacyPresenterTest {
             featureFlagService = FakeFeatureFlagService(
                 initialState = mapOf(
                     FeatureFlags.Knock.key to true,
-                    FeatureFlags.SpaceSettings.key to true,
                 )
             )
         )
@@ -859,9 +848,6 @@ class SecurityAndPrivacyPresenterTest {
         val presenter = createSecurityAndPrivacyPresenter(
             room = room,
             matrixClient = client,
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.SpaceSettings.key to true)
-            )
         )
         presenter.test {
             skipItems(1)
@@ -901,9 +887,6 @@ class SecurityAndPrivacyPresenterTest {
         val presenter = createSecurityAndPrivacyPresenter(
             room = room,
             matrixClient = client,
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(FeatureFlags.SpaceSettings.key to true)
-            )
         )
         presenter.test {
             skipItems(1)
@@ -975,7 +958,6 @@ class SecurityAndPrivacyPresenterTest {
             featureFlagService = FakeFeatureFlagService(
                 initialState = mapOf(
                     FeatureFlags.Knock.key to true,
-                    FeatureFlags.SpaceSettings.key to true,
                 )
             )
         )
@@ -1065,6 +1047,20 @@ class SecurityAndPrivacyPresenterTest {
         }
     }
 
+    @Test
+    fun `present - showEncryptionSection is false if the HS disabled encryption`() = runTest {
+        val sessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { true })
+        val presenter = createSecurityAndPrivacyPresenter(
+            sessionEnterpriseService = sessionEnterpriseService,
+        )
+        presenter.test {
+            skipItems(1)
+
+            // The HS has disabled encryption, so the encryption section should not be shown
+            assertThat(awaitItem().showEncryptionSection).isFalse()
+        }
+    }
+
     private fun roomPermissions(
         canChangeRoomAccess: Boolean = true,
         canChangeHistoryVisibility: Boolean = true,
@@ -1103,6 +1099,9 @@ class SecurityAndPrivacyPresenterTest {
             ),
         ),
         spaceSelectionStateHolder: SpaceSelectionStateHolder = SpaceSelectionStateHolder(),
+        sessionEnterpriseService: FakeSessionEnterpriseService = FakeSessionEnterpriseService(
+            isEncryptionDisabledResult = { false },
+        )
     ): SecurityAndPrivacyPresenter {
         return SecurityAndPrivacyPresenter(
             room = room,
@@ -1110,6 +1109,7 @@ class SecurityAndPrivacyPresenterTest {
             navigator = navigator,
             featureFlagService = featureFlagService,
             spaceSelectionStateHolder = spaceSelectionStateHolder,
+            sessionEnterpriseService = sessionEnterpriseService,
         )
     }
 }
diff --git a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
index a1f46b2938..220a8d3d6d 100644
--- a/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
+++ b/features/securityandprivacy/impl/src/test/kotlin/io/element/android/features/securityandprivacy/impl/root/SecurityAndPrivacyViewTest.kt
@@ -5,14 +5,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.securityandprivacy.impl.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.securityandprivacy.impl.R
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
@@ -22,74 +24,69 @@ import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.persistentListOf
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class SecurityAndPrivacyViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class SecurityAndPrivacyViewTest : RobolectricTest() {
     @Test
-    fun `click on back invokes emits the expected event`() {
+    fun `click on back invokes emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.pressBack()
+        setSecurityAndPrivacyView(state)
+        pressBack()
         recorder.assertSingle(SecurityAndPrivacyEvent.Exit)
     }
 
     @Test
-    fun `discard cancellation emits the expected event`() {
+    fun `discard cancellation emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             saveAction = AsyncAction.ConfirmingCancellation,
             eventSink = recorder,
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(CommonStrings.action_discard)
+        setSecurityAndPrivacyView(state)
+        clickOn(CommonStrings.action_discard)
         recorder.assertSingle(SecurityAndPrivacyEvent.Exit)
     }
 
     @Test
-    fun `save cancellation confirmation emits the expected event`() {
+    fun `save cancellation confirmation emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             saveAction = AsyncAction.ConfirmingCancellation,
             eventSink = recorder,
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(CommonStrings.action_save, inDialog = true)
+        setSecurityAndPrivacyView(state)
+        clickOn(CommonStrings.action_save, inDialog = true)
         recorder.assertSingle(SecurityAndPrivacyEvent.Save)
     }
 
     @Test
-    fun `click on room access item emits the expected event`() {
+    fun `click on room access item emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_room_access_invite_only_option_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_room_access_invite_only_option_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.ChangeRoomAccess(SecurityAndPrivacyRoomAccess.InviteOnly))
     }
 
     @Test
-    fun `click on disabled save doesn't emit event`() {
+    fun `click on disabled save doesn't emit event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>(expectEvents = false)
         val state = aSecurityAndPrivacyState(eventSink = recorder)
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(CommonStrings.action_save)
+        setSecurityAndPrivacyView(state)
+        clickOn(CommonStrings.action_save)
         recorder.assertEmpty()
     }
 
     @Test
-    fun `click on enabled save emits the expected event`() {
+    fun `click on enabled save emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
@@ -97,14 +94,14 @@ class SecurityAndPrivacyViewTest {
                 roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
             )
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(CommonStrings.action_save)
+        setSecurityAndPrivacyView(state)
+        clickOn(CommonStrings.action_save)
         recorder.assertSingle(SecurityAndPrivacyEvent.Save)
     }
 
     @Test
     @Config(qualifiers = "h640dp")
-    fun `click on room address item emits the expected event`() {
+    fun `click on room address item emits the expected event`() = runAndroidComposeUiTest {
         val address = "@alias:matrix.org"
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
@@ -114,14 +111,14 @@ class SecurityAndPrivacyViewTest {
                 roomAccess = SecurityAndPrivacyRoomAccess.Anyone,
             ),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.onNodeWithText(address).performClick()
+        setSecurityAndPrivacyView(state)
+        onNodeWithText(address).performClick()
         recorder.assertSingle(SecurityAndPrivacyEvent.EditRoomAddress)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `click on room visibility item emits the expected event`() {
+    fun `click on room visibility item emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
@@ -130,14 +127,14 @@ class SecurityAndPrivacyViewTest {
                 isVisibleInRoomDirectory = AsyncData.Success(false),
             ),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_room_directory_visibility_toggle_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.ToggleRoomVisibility)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `click on history visibility item emits the expected event`() {
+    fun `click on history visibility item emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
@@ -145,65 +142,65 @@ class SecurityAndPrivacyViewTest {
                 historyVisibility = SecurityAndPrivacyHistoryVisibility.Invited,
             ),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_room_history_since_invite_option_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_room_history_since_invite_option_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.ChangeHistoryVisibility(SecurityAndPrivacyHistoryVisibility.Invited))
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `click on encryption item emits the expected event`() {
+    fun `click on encryption item emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             savedSettings = aSecurityAndPrivacySettings(isEncrypted = false),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_encryption_toggle_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_encryption_toggle_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.ToggleEncryptionState)
     }
 
     @Test
-    fun `click on encryption confirm emits the expected event`() {
+    fun `click on encryption confirm emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             showEncryptionConfirmation = true,
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_enable_encryption_alert_confirm_button_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_enable_encryption_alert_confirm_button_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.ConfirmEnableEncryption)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `click on space member access emits the expected event`() {
+    fun `click on space member access emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             spaceSelectionMode = SpaceSelectionMode.Single(A_ROOM_ID, null),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_room_access_space_members_option_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_room_access_space_members_option_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.SelectSpaceMemberAccess)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `click on ask to join with space members emits the expected event`() {
+    fun `click on ask to join with space members emits the expected event`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>()
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
             spaceSelectionMode = SpaceSelectionMode.Single(A_ROOM_ID, null),
         )
-        rule.setSecurityAndPrivacyView(state)
-        rule.clickOn(R.string.screen_security_and_privacy_ask_to_join_option_title)
+        setSecurityAndPrivacyView(state)
+        clickOn(R.string.screen_security_and_privacy_ask_to_join_option_title)
         recorder.assertSingle(SecurityAndPrivacyEvent.SelectAskToJoinWithSpaceMembersAccess)
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `manage spaces footer is shown when space member access is selected`() {
+    fun `manage spaces footer is shown when space member access is selected`() = runAndroidComposeUiTest {
         val recorder = EventsRecorder<SecurityAndPrivacyEvent>(expectEvents = false)
         val state = aSecurityAndPrivacyState(
             eventSink = recorder,
@@ -212,15 +209,16 @@ class SecurityAndPrivacyViewTest {
                 roomAccess = SecurityAndPrivacyRoomAccess.SpaceMember(persistentListOf(A_ROOM_ID)),
             ),
         )
-        rule.setSecurityAndPrivacyView(state)
+        setSecurityAndPrivacyView(state)
         // The footer text uses AnnotatedString with a link. Verify the footer text is displayed.
-        val actionFooterText = rule.activity.getString(R.string.screen_security_and_privacy_room_access_footer_manage_spaces_action)
-        val footerText = rule.activity.getString(R.string.screen_security_and_privacy_room_access_footer, actionFooterText)
-        rule.onNodeWithText(footerText).assertExists()
+        val resources = activity!!.resources
+        val actionFooterText = resources.getString(R.string.screen_security_and_privacy_room_access_footer_manage_spaces_action)
+        val footerText = resources.getString(R.string.screen_security_and_privacy_room_access_footer, actionFooterText)
+        onNodeWithText(footerText).assertExists()
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSecurityAndPrivacyView(
+private fun AndroidComposeUiTest<ComponentActivity>.setSecurityAndPrivacyView(
     state: SecurityAndPrivacyState = aSecurityAndPrivacyState(
         eventSink = EventsRecorder(expectEvents = false),
     ),
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultOnSharedData.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultOnSharedData.kt
index 3a71f02dc3..daab3787b3 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultOnSharedData.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultOnSharedData.kt
@@ -7,6 +7,7 @@
 
 package io.element.android.features.share.impl
 
+import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -15,13 +16,14 @@ import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.share.api.OnSharedData
 import io.element.android.features.share.api.ShareIntentData
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.annotations.ApplicationContext
 import timber.log.Timber
-import kotlin.collections.forEach
 
 @ContributesBinding(AppScope::class)
 class DefaultOnSharedData(
     @ApplicationContext private val context: Context,
+    private val buildMeta: BuildMeta,
 ) : OnSharedData {
     override fun invoke(data: ShareIntentData) {
         when (data) {
@@ -29,6 +31,13 @@ class DefaultOnSharedData(
                 // No-op, there is nothing to do for plain text intents.
             }
             is ShareIntentData.Uris -> {
+                val fileProvider = "${buildMeta.applicationId}.fileprovider"
+                for (sharedUri in data.uris) {
+                    // Remove the local copy of the shared file, as it is not needed anymore
+                    if (sharedUri.uri.scheme == ContentResolver.SCHEME_CONTENT && sharedUri.uri.host == fileProvider) {
+                        context.contentResolver.delete(sharedUri.uri, null, emptyArray())
+                    }
+                }
                 revokeUriPermissions(data.uris.map { it.uri })
             }
         }
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
index 0597b3b678..1abac1afa6 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
@@ -70,7 +70,10 @@ class ShareNode(
         return roomSelectEntryPoint.createNode(
             parentNode = this,
             buildContext = buildContext,
-            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share),
+            params = RoomSelectEntryPoint.Params(
+                mode = RoomSelectMode.Share,
+                maxNumberOfRooms = RoomSelectEntryPoint.DEFAULT_MAX_NUMBER_OF_ROOMS,
+            ),
             callback = callback,
         )
     }
diff --git a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
index fee1278fce..ab3a260c01 100644
--- a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
+++ b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
@@ -32,15 +32,13 @@ import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.impl.DefaultActiveRoomsHolder
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class SharePresenterTest {
+class SharePresenterTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -76,7 +74,7 @@ class SharePresenterTest {
     fun `present - on room selected ok`() = runTest {
         val joinedRoom = FakeJoinedRoom(
             liveTimeline = FakeTimeline().apply {
-                sendMessageLambda = { _, _, _ -> Result.success(Unit) }
+                sendMessageLambda = { _, _, _, _, _ -> Result.success(Unit) }
             },
         )
         val matrixClient = FakeMatrixClient().apply {
@@ -103,7 +101,7 @@ class SharePresenterTest {
     fun `present - send text ok`() = runTest {
         val joinedRoom = FakeJoinedRoom(
             liveTimeline = FakeTimeline().apply {
-                sendMessageLambda = { _, _, _ -> Result.success(Unit) }
+                sendMessageLambda = { _, _, _, _, _ -> Result.success(Unit) }
             },
         )
         val matrixClient = FakeMatrixClient().apply {
diff --git a/features/signedout/impl/build.gradle.kts b/features/signedout/impl/build.gradle.kts
index 3c8aac5e25..b3801288be 100644
--- a/features/signedout/impl/build.gradle.kts
+++ b/features/signedout/impl/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.uiStrings)
 
     testCommonDependencies(libs)
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutStateProvider.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutStateProvider.kt
index 396339adbb..95a57db93e 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutStateProvider.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutStateProvider.kt
@@ -36,7 +36,7 @@ private fun aSessionData(
         accessToken = "anAccessToken",
         refreshToken = "aRefreshToken",
         homeserverUrl = "aHomeserverUrl",
-        oidcData = null,
+        oAuthData = null,
         loginTimestamp = null,
         isTokenValid = isTokenValid,
         loginType = LoginType.UNKNOWN,
diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
index f89b36e4d4..41a99713e7 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
@@ -21,14 +21,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
-import io.element.android.libraries.designsystem.atomic.organisms.InfoListOrganism
 import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.components.visuallist.VisualList
+import io.element.android.libraries.designsystem.components.visuallist.VisualListItemData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
@@ -75,23 +74,21 @@ private fun SignedOutContent() {
             verticalBias = -0.4f
         )
     ) {
-        InfoListOrganism(
+        VisualList(
             items = persistentListOf(
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_signed_out_reason_1),
                     iconVector = CompoundIcons.Lock(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_signed_out_reason_2),
                     iconVector = CompoundIcons.Devices(),
                 ),
-                InfoListItem(
+                VisualListItemData(
                     message = stringResource(id = R.string.screen_signed_out_reason_3),
                     iconVector = CompoundIcons.Block(),
                 ),
             ),
-            textStyle = ElementTheme.typography.fontBodyMdMedium,
-            iconTint = ElementTheme.colors.iconSecondary,
         )
     }
 }
diff --git a/features/signedout/impl/src/main/res/values-ca/translations.xml b/features/signedout/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..6cba810df9
--- /dev/null
+++ b/features/signedout/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signed_out_reason_1">"Has canviat la contrasenya en una altra sessió"</string>
+  <string name="screen_signed_out_reason_2">"Has eliminat la sessió des d\'una altra sessió"</string>
+  <string name="screen_signed_out_reason_3">"L\'administrador del teu servidor t\'ha invalidat l\'accés"</string>
+  <string name="screen_signed_out_subtitle">"S\'ha tancat la sessió per algun dels motius enumerats a continuació. Torna a iniciar sessió per continuar utilitzant %s."</string>
+  <string name="screen_signed_out_title">"Has tancat sessió"</string>
+</resources>
diff --git a/features/signedout/impl/src/main/res/values-ja/translations.xml b/features/signedout/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..27fc2a1d4b
--- /dev/null
+++ b/features/signedout/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signed_out_reason_1">"他のセッションでパスワードを変更しました"</string>
+  <string name="screen_signed_out_reason_2">"このセッションは他のセッションより削除されました"</string>
+  <string name="screen_signed_out_reason_3">"サーバー管理者があなたのアクセスを無効にしました"</string>
+  <string name="screen_signed_out_subtitle">"以下のいずれかの理由によってサインアウトされました。%s を引き続き使用するには再度サインインしてください。"</string>
+  <string name="screen_signed_out_title">"サインアウトしました"</string>
+</resources>
diff --git a/features/signedout/impl/src/main/res/values-ru/translations.xml b/features/signedout/impl/src/main/res/values-ru/translations.xml
index d3fd510afd..042cd0ca08 100644
--- a/features/signedout/impl/src/main/res/values-ru/translations.xml
+++ b/features/signedout/impl/src/main/res/values-ru/translations.xml
@@ -3,6 +3,6 @@
   <string name="screen_signed_out_reason_1">"Вы изменили свой пароль в другой сессии"</string>
   <string name="screen_signed_out_reason_2">"Вы удалили сессию из другой сессии"</string>
   <string name="screen_signed_out_reason_3">"Администратор вашего сервера аннулировал ваш доступ"</string>
-  <string name="screen_signed_out_subtitle">"Возможно, вы вышли из системы по одной из причин, перечисленных ниже. Пожалуйста, войдите в систему еще раз, чтобы продолжить использование %s."</string>
+  <string name="screen_signed_out_subtitle">"Возможно, Вы вышли из системы по одной из причин, перечисленных ниже. Пожалуйста, войдите в систему ещё раз, чтобы продолжить использовать %s."</string>
   <string name="screen_signed_out_title">"Вы вышли из системы"</string>
 </resources>
diff --git a/features/signedout/impl/src/main/res/values-vi/translations.xml b/features/signedout/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..320f4a8731
--- /dev/null
+++ b/features/signedout/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signed_out_reason_1">"Bạn đã thay đổi mật khẩu trên phiên đăng nhập khác."</string>
+  <string name="screen_signed_out_reason_2">"Bạn đã xóa phiên đăng nhập này từ một phiên khác."</string>
+  <string name="screen_signed_out_reason_3">"Quản trị viên của máy chủ đã thu hồi quyền truy cập của bạn."</string>
+  <string name="screen_signed_out_subtitle">"Bạn có thể đã bị đăng xuất vì một trong những lý do được liệt kê bên dưới. Vui lòng đăng nhập lại để tiếp tục sử dụng %s ."</string>
+  <string name="screen_signed_out_title">"Bạn đã đăng xuất."</string>
+</resources>
diff --git a/features/signedout/impl/src/main/res/values-zh/translations.xml b/features/signedout/impl/src/main/res/values-zh/translations.xml
index 87c7620d98..6768608294 100644
--- a/features/signedout/impl/src/main/res/values-zh/translations.xml
+++ b/features/signedout/impl/src/main/res/values-zh/translations.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_signed_out_reason_1">"你在另一个会话中更改了密码"</string>
-  <string name="screen_signed_out_reason_2">"你已从其他会话中删除本会话"</string>
-  <string name="screen_signed_out_reason_3">"您的服务器管理员已禁止您访问"</string>
-  <string name="screen_signed_out_subtitle">"您可能因下列原因而被登出。请重新登录以继续使用 %s。"</string>
-  <string name="screen_signed_out_title">"你已登出"</string>
+  <string name="screen_signed_out_reason_2">"你已从其它会话中删除此会话"</string>
+  <string name="screen_signed_out_reason_3">"服务器管理员已禁止你的访问"</string>
+  <string name="screen_signed_out_subtitle">"你可能因以下原因而被注销。请重新登录以继续使用 %s。"</string>
+  <string name="screen_signed_out_title">"你已注销"</string>
 </resources>
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceNode.kt
index dadd54cf6f..c7aea55488 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceNode.kt
@@ -41,7 +41,7 @@ class AddRoomToSpaceNode(
         AddRoomToSpaceView(
             state = state,
             onBackClick = callback::onFinish,
-            onRoomsAdded = callback::onFinish,
+            onAddRoom = callback::onFinish,
             modifier = modifier
         )
     }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpacePresenter.kt
index e4f58fdff2..b8d6c08215 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpacePresenter.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpacePresenter.kt
@@ -66,8 +66,8 @@ class AddRoomToSpacePresenter(
             derivedStateOf {
                 when {
                     filteredRooms.isNotEmpty() -> SearchBarResultState.Results(filteredRooms)
-                    isSearchActive && searchQuery.text.isNotEmpty() -> SearchBarResultState.NoResultsFound<ImmutableList<SelectRoomInfo>>()
-                    else -> SearchBarResultState.Initial<ImmutableList<SelectRoomInfo>>()
+                    isSearchActive && searchQuery.text.isNotEmpty() -> SearchBarResultState.NoResultsFound
+                    else -> SearchBarResultState.Initial
                 }
             }
         }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceSearchDataSource.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceSearchDataSource.kt
index 10c70d6f7d..882db26f00 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceSearchDataSource.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceSearchDataSource.kt
@@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.recent.getRecentlyVisitedRoomInfoFlow
 import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceStateProvider.kt
index 870b72ecb7..f9036f0452 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceStateProvider.kt
@@ -40,7 +40,7 @@ internal class AddRoomToSpaceStateProvider : PreviewParameterProvider<AddRoomToS
             anAddRoomToSpaceState(
                 isSearchActive = true,
                 searchQuery = "unknown",
-                searchResults = SearchBarResultState.NoResultsFound(),
+                searchResults = SearchBarResultState.NoResultsFound,
             ),
             // With selected rooms
             anAddRoomToSpaceState(
@@ -62,7 +62,7 @@ internal class AddRoomToSpaceStateProvider : PreviewParameterProvider<AddRoomToS
 
 internal fun anAddRoomToSpaceState(
     searchQuery: String = "",
-    searchResults: SearchBarResultState<ImmutableList<SelectRoomInfo>> = SearchBarResultState.Initial(),
+    searchResults: SearchBarResultState<ImmutableList<SelectRoomInfo>> = SearchBarResultState.Initial,
     selectedRooms: ImmutableList<SelectRoomInfo> = persistentListOf(),
     isSearchActive: Boolean = false,
     saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceView.kt
index c64efa8074..eb485f11b5 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceView.kt
@@ -23,6 +23,8 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -45,6 +47,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.OnVisibleRangeChangeEffect
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.ui.components.SelectedRoom
 import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
 import io.element.android.libraries.matrix.ui.model.getAvatarData
@@ -57,9 +61,10 @@ import kotlinx.collections.immutable.toImmutableList
 fun AddRoomToSpaceView(
     state: AddRoomToSpaceState,
     onBackClick: () -> Unit,
-    onRoomsAdded: () -> Unit,
+    onAddRoom: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val updatedOnAddRoom by rememberUpdatedState(onAddRoom)
     fun onRoomToggled(room: SelectRoomInfo) {
         state.eventSink(AddRoomToSpaceEvent.ToggleRoom(room))
     }
@@ -78,7 +83,7 @@ fun AddRoomToSpaceView(
     // Navigate back on success
     LaunchedEffect(state.saveAction) {
         if (state.saveAction is AsyncAction.Success) {
-            onRoomsAdded()
+            updatedOnAddRoom()
         }
     }
 
@@ -98,7 +103,8 @@ fun AddRoomToSpaceView(
                     )
                 }
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { paddingValues ->
         Column(
             Modifier
@@ -127,7 +133,9 @@ fun AddRoomToSpaceView(
                 OnVisibleRangeChangeEffect(lazyListState) { visibleRange ->
                     state.eventSink(AddRoomToSpaceEvent.UpdateSearchVisibleRange(visibleRange))
                 }
-                LazyColumn {
+                LazyColumn(
+                    contentPadding = lazyColumnContentPadding,
+                ) {
                     items(rooms, key = { it.roomId }) { roomInfo ->
                         RoomListItem(
                             roomInfo = roomInfo,
@@ -247,6 +255,6 @@ internal fun AddRoomToSpaceViewPreview(
     AddRoomToSpaceView(
         state = state,
         onBackClick = {},
-        onRoomsAdded = {},
+        onAddRoom = {},
     )
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
index 4e1fd34673..e0876c255c 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenter.kt
@@ -67,7 +67,7 @@ class LeaveSpacePresenter(
                 .orEmpty()
                 .partition { it.spaceRoom.roomId == leaveSpaceHandle.id }
             // By default select all rooms that can be left
-            val otherRoomsExcludingDm = otherRooms.filter { it.spaceRoom.isDirect != true }
+            val otherRoomsExcludingDm = otherRooms.filter { it.spaceRoom.isDm != true }
             selectedRoomIds = otherRoomsExcludingDm
                 .filter { it.isLastOwner.not() }
                 .map { it.spaceRoom.roomId }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
index 3d8df360a7..ddf34cb076 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
@@ -11,6 +11,7 @@ package io.element.android.features.space.impl.leave
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.previewutils.room.aSpaceRoom
@@ -117,7 +118,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
 }
 
 fun aLeaveSpaceState(
-    spaceName: String? = "Space name",
+    spaceName: String? = SPACE_NAME,
     isLastOwner: Boolean = false,
     areCreatorsPrivileged: Boolean = false,
     selectableSpaceRooms: AsyncData<ImmutableList<SelectableSpaceRoom>> = AsyncData.Uninitialized,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt
index 807d139e6a..5ce6575493 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt
@@ -29,8 +29,6 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.mapState
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
@@ -66,7 +64,6 @@ class SpacePresenter(
     private val joinRoom: JoinRoom,
     private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
     @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope,
-    private val featureFlagService: FeatureFlagService,
     private val spaceService: SpaceService,
 ) : Presenter<SpaceState> {
     private var children by mutableStateOf<ImmutableList<SpaceRoom>>(persistentListOf())
@@ -99,16 +96,13 @@ class SpacePresenter(
         val permissions by room.permissionsAsState(SpacePermissions.DEFAULT) { perms ->
             perms.spacePermissions()
         }
-        val isSpaceSettingsEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.SpaceSettings)
-        }.collectAsState(false)
 
         val roomInfo by room.roomInfoFlow.collectAsState()
         val canAccessSpaceSettings by remember {
-            derivedStateOf { isSpaceSettingsEnabled && permissions.settingsPermissions.hasAny(roomInfo.joinRule) }
+            derivedStateOf { permissions.settingsPermissions.hasAny(roomInfo.joinRule) }
         }
         val canEditSpaceGraph by remember {
-            derivedStateOf { isSpaceSettingsEnabled && permissions.canEditSpaceGraph }
+            derivedStateOf { permissions.canEditSpaceGraph }
         }
         val (joinActions, setJoinActions) = remember { mutableStateOf(emptyMap<RoomId, AsyncAction<Unit>>()) }
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
index c43257b383..6824cc6c10 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
@@ -109,6 +109,7 @@ private fun aSpaceInfo(
         avatarUrl = null,
         isPublic = true,
         isDirect = false,
+        isDm = false,
         isEncrypted = false,
         joinRule = joinRule,
         isSpace = true,
@@ -139,6 +140,7 @@ private fun aSpaceInfo(
         privilegedCreatorRole = false,
         isLowPriority = false,
         activeCallIntentConsensus = CallIntentConsensus.None,
+        fullyReadEventId = null,
     )
 }
 
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
index 05fb75ee5e..fe971091f5 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
@@ -82,6 +82,8 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
@@ -157,6 +159,7 @@ fun SpaceView(
                 }
             }
         },
+        contentWindowInsets = scaffoldScrollableContentInsets,
         content = { padding ->
             Box(
                 modifier = Modifier.padding(padding)
@@ -251,7 +254,10 @@ private fun SpaceViewContent(
     onAddRoomClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    LazyColumn(modifier.fillMaxSize()) {
+    LazyColumn(
+        modifier = modifier.fillMaxSize(),
+        contentPadding = lazyColumnContentPadding,
+    ) {
         val spaceInfo = state.spaceInfo
         item(key = "space_header") {
             AnimatedVisibility(
@@ -354,7 +360,8 @@ private fun EmptySpaceView(
             title = stringResource(R.string.screen_space_empty_state_title),
             subTitle = null,
             iconStyle = BigIcon.Style.Default(vectorIcon = CompoundIcons.Room(), usePrimaryTint = true),
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 24.dp),
         )
         ButtonColumnMolecule(
@@ -425,6 +432,7 @@ private fun SpaceViewTopBar(
                 modifier = Modifier
                     .clip(roundedCornerShape)
                     .clickable(enabled = canAccessSpaceSettings, onClick = onSettingsClick)
+                    .semantics { heading() }
             )
         },
         actions = {
@@ -532,6 +540,7 @@ private fun ManageModeTopBar(
             Text(
                 text = pluralStringResource(CommonPlurals.common_selected_count, selectedCount, selectedCount),
                 style = ElementTheme.typography.fontBodyLgMedium,
+                modifier = Modifier.semantics { heading() },
             )
         },
         actions = {
@@ -585,10 +594,7 @@ private fun SpaceAvatarAndNameRow(
         )
         Text(
             modifier = Modifier
-                .padding(horizontal = 8.dp)
-                .semantics {
-                    heading()
-                },
+                .padding(horizontal = 8.dp),
             text = name ?: stringResource(CommonStrings.common_no_space_name),
             style = ElementTheme.typography.fontBodyLgMedium,
             fontStyle = FontStyle.Italic.takeIf { name == null },
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsStateProvider.kt
index 2030b6885a..36f6a2a1d0 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsStateProvider.kt
@@ -9,6 +9,7 @@
 package io.element.android.features.space.impl.settings
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 
@@ -24,7 +25,7 @@ open class SpaceSettingsStateProvider : PreviewParameterProvider<SpaceSettingsSt
 
 fun aSpaceSettingsState(
     roomId: RoomId = RoomId("!aRoomId:element.io"),
-    name: String = "Space name",
+    name: String = SPACE_NAME,
     alias: RoomAlias? = RoomAlias("#spacename:element.io"),
     avatarUrl: String? = null,
     memberCount: Long = 100,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
index 63b83516ac..6237e443b0 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsView.kt
@@ -43,6 +43,8 @@ import io.element.android.libraries.designsystem.theme.components.ListItemStyle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -62,11 +64,13 @@ fun SpaceSettingsView(
         topBar = {
             SpaceSettingsTopBar(onBackClick = onBackClick)
         },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { padding ->
         Column(
             modifier = Modifier
                 .padding(padding)
                 .verticalScroll(rememberScrollState())
+                .padding(lazyColumnContentPadding)
         ) {
             SpaceInfoSection(
                 roomId = state.roomId,
@@ -165,7 +169,7 @@ private fun SecurityAndPrivacyItem(
     modifier: Modifier = Modifier,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_space_settings_security_and_privacy)) },
+        content = { Text(stringResource(R.string.screen_space_settings_security_and_privacy)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
         onClick = onClick,
         modifier = modifier,
@@ -179,7 +183,7 @@ private fun MembersItem(
     modifier: Modifier = Modifier,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(CommonStrings.common_people)) },
+        content = { Text(stringResource(CommonStrings.common_people)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.User())),
         trailingContent = ListItemContent.Text(memberCount.toString()),
         onClick = onClick,
@@ -193,7 +197,7 @@ private fun RolesAndPermissionsItem(
     modifier: Modifier = Modifier,
 ) {
     ListItem(
-        headlineContent = { Text(stringResource(R.string.screen_space_settings_roles_and_permissions)) },
+        content = { Text(stringResource(R.string.screen_space_settings_roles_and_permissions)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
         onClick = onClick,
         modifier = modifier,
@@ -206,7 +210,7 @@ private fun LeaveSpaceItem(
     modifier: Modifier = Modifier,
 ) {
     ListItem(
-        headlineContent = {
+        content = {
             Text(stringResource(CommonStrings.action_leave_space))
         },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Leave())),
diff --git a/features/space/impl/src/main/res/values-be/translations.xml b/features/space/impl/src/main/res/values-be/translations.xml
index dbd39abf09..1a3adafd72 100644
--- a/features/space/impl/src/main/res/values-be/translations.xml
+++ b/features/space/impl/src/main/res/values-be/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_settings_leave_space">"Пакінуць прастору"</string>
   <string name="screen_space_settings_roles_and_permissions">"Ролі і дазволы"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-ca/translations.xml b/features/space/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..66ebf7edc4
--- /dev/null
+++ b/features/space/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_space_settings_roles_and_permissions">"Rols i permisos"</string>
+  <string name="screen_space_settings_security_and_privacy">"Seguretat i privadesa"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-de/translations.xml b/features/space/impl/src/main/res/values-de/translations.xml
index bc1e4265b6..6dee82123f 100644
--- a/features/space/impl/src/main/res/values-de/translations.xml
+++ b/features/space/impl/src/main/res/values-de/translations.xml
@@ -8,9 +8,11 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Dadurch wirst du auch aus allen Chats in diesem Space entfernt."</string>
   <string name="screen_leave_space_subtitle_last_admin">"Du musst einen anderen Admin für diesen Space zuweisen, bevor du ihn verlassen kannst."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Du bist der einzige Eigentümer von %1$s. Du musst die Eigentumsrechte an jemand anderen übertragen, bevor du den Space verlässt."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Du wirst aus den folgenden Chats nicht entfernt, weil du der einzige Admin bist:"</string>
   <string name="screen_leave_space_title">"%1$s verlassen?"</string>
   <string name="screen_leave_space_title_last_admin">"Du bist der einzige Administrator für %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Eigentumsrechte übertragen"</string>
   <string name="screen_space_add_room_action">"Chat"</string>
   <string name="screen_space_add_rooms_room_access_description">"Das Hinzufügen eines Chats hat keinen Einfluss auf die Beitrittsregeln. Um die Regeln zu ändern, gehe zu \"Raum Info\" und dann zu \"Datenschutz und Sicherheit\""</string>
   <string name="screen_space_empty_state_title">"Füge deinen ersten Chat hinzu"</string>
diff --git a/features/space/impl/src/main/res/values-fa/translations.xml b/features/space/impl/src/main/res/values-fa/translations.xml
index dcab5c912a..d8f377c0b2 100644
--- a/features/space/impl/src/main/res/values-fa/translations.xml
+++ b/features/space/impl/src/main/res/values-fa/translations.xml
@@ -8,6 +8,6 @@
   <string name="screen_leave_space_title_last_admin">"تنها مدیر %1$s هستید"</string>
   <string name="screen_space_menu_action_members">"دیدن اعضا"</string>
   <string name="screen_space_settings_leave_space">"ترک فضا"</string>
-  <string name="screen_space_settings_roles_and_permissions">"نقش‌ها و اجازه‌ها"</string>
+  <string name="screen_space_settings_roles_and_permissions">"نقش‌ها و مجوزها"</string>
   <string name="screen_space_settings_security_and_privacy">"امنیت و محرمانگی"</string>
 </resources>
diff --git a/features/space/impl/src/main/res/values-hr/translations.xml b/features/space/impl/src/main/res/values-hr/translations.xml
index 91731dbe71..d1c6ba60a2 100644
--- a/features/space/impl/src/main/res/values-hr/translations.xml
+++ b/features/space/impl/src/main/res/values-hr/translations.xml
@@ -9,10 +9,20 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Odaberite sobe koje želite napustiti, a za koje niste jedini administrator:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Morate dodijeliti drugog administratora za ovaj prostor prije nego što ga napustite."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Vi ste jedini vlasnik %1$s . Prije odlaska morate prenijeti vlasništvo na nekog drugog."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Nećete biti uklonjeni iz sljedećih soba jer ste jedini administrator:"</string>
   <string name="screen_leave_space_title">"Želite li napustiti %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Vi ste jedini administrator za %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Prenesi vlasništvo"</string>
+  <string name="screen_space_add_room_action">"Soba"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Dodavanje sobe neće utjecati na pristup sobi. Za promjenu pristupa idite na Postavke sobe &gt; Sigurnost i privatnost."</string>
+  <string name="screen_space_empty_state_title">"sobu"</string>
   <string name="screen_space_menu_action_members">"Prikaži članove"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Uklanjanje sobe neće utjecati na pristup sobi. Za promjenu pristupa idite na Informacije o sobi &gt; Privatnost i sigurnost."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"Uklonite %1$d soba od %2$s"</item>
+    <item quantity="other">"Uklonite %1$d sobe od %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Napusti prostor"</string>
   <string name="screen_space_settings_roles_and_permissions">"Uloge i dopuštenja"</string>
   <string name="screen_space_settings_security_and_privacy">"Sigurnost i privatnost"</string>
diff --git a/features/space/impl/src/main/res/values-in/translations.xml b/features/space/impl/src/main/res/values-in/translations.xml
index f2e50ca04c..f049a0c180 100644
--- a/features/space/impl/src/main/res/values-in/translations.xml
+++ b/features/space/impl/src/main/res/values-in/translations.xml
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_choose_owners_action">"Pilih Pemilik"</string>
+  <string name="screen_leave_space_last_admin_info">"%1$s (Admin)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="other">"Tinggalkan ruangan dan ruang %1$d"</item>
+  </plurals>
   <string name="screen_leave_space_subtitle">"Pilih room yang ingin Anda tinggalkan di mana Anda bukan satu-satunya administrator:"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"Anda perlu menunjuk admin lain untuk ruang ini sebelum Anda dapat keluar."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Anda adalah satu-satunya pemilik dari %1$s. Anda harus mengalihkan kepemilikan kepada orang lain sebelum Anda pergi."</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"Anda tidak akan dikeluarkan dari ruangan berikut karena Anda adalah satu-satunya administrator:"</string>
   <string name="screen_leave_space_title">"Keluar dari %1$s?"</string>
+  <string name="screen_leave_space_title_last_admin">"Anda adalah satu-satunya admin untuk %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Transfer kepemilikan"</string>
+  <string name="screen_space_add_room_action">"Ruangan"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Menambahkan ruangan tidak akan memengaruhi akses ruangan. Untuk mengubah akses, buka Pengaturan ruangan &gt; Keamanan &amp;amp; privasi."</string>
+  <string name="screen_space_empty_state_title">"Tambahkan ruang pertama Anda"</string>
+  <string name="screen_space_menu_action_members">"Lihat anggota"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Menghapus ruangan tidak akan memengaruhi akses ruangan. Untuk mengubah akses, buka Info ruangan &gt; Privasi &amp;amp; keamanan."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="other">"Hapus ruangan %1$d dari %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Tinggalkan space"</string>
   <string name="screen_space_settings_roles_and_permissions">"Peran dan perizinan"</string>
   <string name="screen_space_settings_security_and_privacy">"Keamanan &amp; privasi"</string>
diff --git a/features/space/impl/src/main/res/values-it/translations.xml b/features/space/impl/src/main/res/values-it/translations.xml
index 62f4787002..20859ee70f 100644
--- a/features/space/impl/src/main/res/values-it/translations.xml
+++ b/features/space/impl/src/main/res/values-it/translations.xml
@@ -8,10 +8,20 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Seleziona le stanze che desideri abbandonare e di cui non sei l\'unico amministratore:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Prima di poter uscire, devi assegnare un altro amministratore a questo spazio."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Sei l\'unico proprietario di %1$s. Devi trasferire la proprietà a qualcun altro prima di andartene."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Non verrai rimosso dalle seguenti stanze perché sei l\'unico amministratore:"</string>
   <string name="screen_leave_space_title">"Uscire da %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Sei l\'unico amministratore di %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Trasferisci proprietà"</string>
+  <string name="screen_space_add_room_action">"Stanza"</string>
+  <string name="screen_space_add_rooms_room_access_description">"L\'aggiunta di una stanza non influirà sull\'accesso alla stessa. Per modificare l\'accesso, vai su Impostazioni stanza &gt; Sicurezza &amp; privacy."</string>
+  <string name="screen_space_empty_state_title">"Aggiungi la tua prima stanza"</string>
   <string name="screen_space_menu_action_members">"Visualizza membri"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"La rimozione di una stanza non influirà sull\'accesso alla stessa. Per modificare l\'accesso, vai su Informazioni sulla stanza &gt; Sicurezza &amp; privacy"</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"Rimuovi %1$d stanza da %2$s"</item>
+    <item quantity="other">"Rimuovi %1$d stanze da %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Esci dallo spazio"</string>
   <string name="screen_space_settings_roles_and_permissions">"Ruoli e autorizzazioni"</string>
   <string name="screen_space_settings_security_and_privacy">"Sicurezza e privacy"</string>
diff --git a/features/space/impl/src/main/res/values-ja/translations.xml b/features/space/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..e00d045038
--- /dev/null
+++ b/features/space/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_leave_space_choose_owners_action">"所有者を選択"</string>
+  <string name="screen_leave_space_last_admin_info">"%1$s (管理者)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="other">"%1$d 個のルームとスペースを退出"</item>
+  </plurals>
+  <string name="screen_leave_space_subtitle">"あなたが唯一の管理者であるルーム以外を選択してください。"</string>
+  <string name="screen_leave_space_subtitle_last_admin">"このスペースを退出する前に、新しく管理者を設定してください。"</string>
+  <string name="screen_leave_space_subtitle_last_owner">"あなたは %1$s の唯一の所有者です。退出する前に所有権を譲与する必要があります。"</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"あなたが唯一の管理者であるため、以下のルームからは退出しません。"</string>
+  <string name="screen_leave_space_title">"%1$s を退出しますか？"</string>
+  <string name="screen_leave_space_title_last_admin">"あなたが唯一の %1$s の管理者です。"</string>
+  <string name="screen_leave_space_title_last_owner">"所有権の譲渡"</string>
+  <string name="screen_space_add_room_action">"ルーム"</string>
+  <string name="screen_space_add_rooms_room_access_description">"ルームの追加はルームへのアクセスに影響しません。アクセスの設定は、ルームの設定 &gt; セキュリティーとプライバシー から変更できます。"</string>
+  <string name="screen_space_empty_state_title">"最初のルームを追加しましょう"</string>
+  <string name="screen_space_menu_action_members">"メンバーを表示"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"ルームの削除はルームへのアクセスに影響しません。アクセスの設定は、ルームの設定 &gt; セキュリティーとプライバシー から変更できます。"</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="other">"%2$s から%1$d 個のルームを削除"</item>
+  </plurals>
+  <string name="screen_space_settings_leave_space">"スペースを退出"</string>
+  <string name="screen_space_settings_roles_and_permissions">"役割と権限"</string>
+  <string name="screen_space_settings_security_and_privacy">"セキュリティとプライバシー"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-nb/translations.xml b/features/space/impl/src/main/res/values-nb/translations.xml
index d2b218f474..eff2588c2a 100644
--- a/features/space/impl/src/main/res/values-nb/translations.xml
+++ b/features/space/impl/src/main/res/values-nb/translations.xml
@@ -14,10 +14,10 @@
   <string name="screen_leave_space_title_last_admin">"Du er den eneste administratoren for %1$s"</string>
   <string name="screen_leave_space_title_last_owner">"Overfør eierskap"</string>
   <string name="screen_space_add_room_action">"Rom"</string>
-  <string name="screen_space_add_rooms_room_access_description">"Hvis du legger til et rom, vil det ikke påvirke tilgangen til rommet. For å endre tilgangen, gå til Rominnstillinger &gt; Sikkerhet og personvern."</string>
+  <string name="screen_space_add_rooms_room_access_description">"Hvis du legger til et rom, vil det ikke påvirke tilgangen til rommet. For å endre tilgangen, gå til Rominnstillinger → Sikkerhet og personvern."</string>
   <string name="screen_space_empty_state_title">"Legg til ditt første rom"</string>
   <string name="screen_space_menu_action_members">"Vis medlemmer"</string>
-  <string name="screen_space_remove_rooms_confirmation_content">"Fjerning av et rom vil ikke påvirke tilgangen til rommet. For å endre tilgangen, gå til Rominformasjon &gt; Personvern og sikkerhet."</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Fjerning av et rom vil ikke påvirke tilgangen til rommet. For å endre tilgangen, gå til Rominformasjon → Personvern og sikkerhet."</string>
   <plurals name="screen_space_remove_rooms_confirmation_title">
     <item quantity="one">"Fjern %1$d rom fra %2$s"</item>
     <item quantity="other">"Fjern %1$d rommene fra %2$s"</item>
diff --git a/features/space/impl/src/main/res/values-pl/translations.xml b/features/space/impl/src/main/res/values-pl/translations.xml
index f1a964c6e3..9c3097b75f 100644
--- a/features/space/impl/src/main/res/values-pl/translations.xml
+++ b/features/space/impl/src/main/res/values-pl/translations.xml
@@ -9,9 +9,21 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Wybierz pokoje, które chcesz opuścić, a których nie jesteś jedynym administratorem:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Aby opuścić tę przestrzeń, musisz przypisać do niej innego administratora."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Jesteś jedynym właścicielem %1$s. Musisz przenieść własność zanim odejdziesz."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Nie zostaniesz usunięty z następujących pokoi, ponieważ jesteś ich jedynym administratorem:"</string>
   <string name="screen_leave_space_title">"Opuścić %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Jesteś jedynym administratorem %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Przenieś własność"</string>
+  <string name="screen_space_add_room_action">"Pokój"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Dodanie pokoju nie wpłynie na dostęp do niego. Aby zmienić ustawienia dostępu, przejdź do Ustawienia pokoju &gt; Bezpieczeństwo i prywatność."</string>
+  <string name="screen_space_empty_state_title">"Dodaj swój pierwszy pokój"</string>
+  <string name="screen_space_menu_action_members">"Zobacz członków"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Usunięcie pokoju nie wpłynie na dostęp do niego. Aby zmienić ustawienia dostępu, przejdź do Ustawienia pokoju &gt; Bezpieczeństwo i prywatność."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"Usuń %1$d pokój z %2$s"</item>
+    <item quantity="few">"Usuń %1$d pokoje z %2$s"</item>
+    <item quantity="many">"Usuń %1$d pokoi z %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Opuść przestrzeń"</string>
   <string name="screen_space_settings_roles_and_permissions">"Role i uprawnienia"</string>
   <string name="screen_space_settings_security_and_privacy">"Bezpieczeństwo i prywatność"</string>
diff --git a/features/space/impl/src/main/res/values-ro/translations.xml b/features/space/impl/src/main/res/values-ro/translations.xml
index 2bf5d0e251..7748f44ee2 100644
--- a/features/space/impl/src/main/res/values-ro/translations.xml
+++ b/features/space/impl/src/main/res/values-ro/translations.xml
@@ -9,10 +9,21 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Selectați camerele pe care doriți să le părăsiți și în care nu sunteți singurul administrator:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Trebuie să desemnați un alt administrator pentru acest spațiu înainte de a-l părăsi."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Sunteți singurul proprietar al %1$s. Trebuie să transferați dreptul de proprietate către altcineva înainte de a parăsi camera."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Nu veți părăsi următoarele camere deoarece sunteți singurul administrator:"</string>
   <string name="screen_leave_space_title">"Părăsiți %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Sunteți singurul administrator pentru %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Transferați proprietatea"</string>
+  <string name="screen_space_add_room_action">"Cameră"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Adăugarea unei camere nu va afecta accesul la cameră. Pentru a modifica accesul, accesați Setări cameră &gt; Securitate și confidențialitate."</string>
+  <string name="screen_space_empty_state_title">"Adăugați prima dumneavoastră cameră"</string>
   <string name="screen_space_menu_action_members">"Vizualizați membrii"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Eliminarea unei camere nu va afecta accesul la aceasta. Pentru a modifica accesul, accesați Informații despre cameră &gt; Confidențialitate și securitate."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"Eliminați camera %1$d din %2$s"</item>
+    <item quantity="few">"Eliminați camerele %1$d din %2$s"</item>
+    <item quantity="other">"Eliminați camerele %1$d din %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Părăsiți spațiul"</string>
   <string name="screen_space_settings_roles_and_permissions">"Roluri și permisiuni"</string>
   <string name="screen_space_settings_security_and_privacy">"Securitate &amp; confidențialitate"</string>
diff --git a/features/space/impl/src/main/res/values-sv/translations.xml b/features/space/impl/src/main/res/values-sv/translations.xml
index 794d7db626..f4427c384d 100644
--- a/features/space/impl/src/main/res/values-sv/translations.xml
+++ b/features/space/impl/src/main/res/values-sv/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_choose_owners_action">"Välj ägare"</string>
+  <string name="screen_leave_space_subtitle">"Välj de rum du vill lämna och som du inte är ensam administratör för:"</string>
   <string name="screen_leave_space_title">"Lämna %1$s?"</string>
   <string name="screen_space_settings_leave_space">"Lämna utrymmet"</string>
   <string name="screen_space_settings_roles_and_permissions">"Roller och behörigheter"</string>
diff --git a/features/space/impl/src/main/res/values-uk/translations.xml b/features/space/impl/src/main/res/values-uk/translations.xml
index e124f72826..df4b4fb922 100644
--- a/features/space/impl/src/main/res/values-uk/translations.xml
+++ b/features/space/impl/src/main/res/values-uk/translations.xml
@@ -2,14 +2,28 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_choose_owners_action">"Оберіть власників"</string>
   <string name="screen_leave_space_last_admin_info">"%1$s (Адміністратор)"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="one">"Залишити %1$d кімнату та простір"</item>
+    <item quantity="few">"Залишити %1$d кімнату та простори"</item>
+    <item quantity="many">"Залишити %1$d кімнат та просторів"</item>
+  </plurals>
   <string name="screen_leave_space_subtitle">"Виберіть кімнати, з яких ви хочете вийти, і в них ви не єдиний адміністратор:"</string>
   <string name="screen_leave_space_subtitle_last_admin">"Перш ніж ви зможете вийти, вам потрібно призначити іншого адміністратора для цього простору."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Ви єдиний власник %1$s. Перш ніж піти, вам потрібно передати право володіння комусь іншому."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Вас не буде видалено з цих кімнат, оскільки ви єдиний адміністратор:"</string>
   <string name="screen_leave_space_title">"Вийти з %1$s?"</string>
   <string name="screen_leave_space_title_last_admin">"Ви єдиний адміністратор у %1$s"</string>
+  <string name="screen_leave_space_title_last_owner">"Передача права володіння"</string>
   <string name="screen_space_add_room_action">"Кімната"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Додавання кімнати не вплине на доступ до неї. Щоб змінити доступ, перейдіть до «Налаштування кімнати» &gt; «Безпека та конфіденційність»."</string>
   <string name="screen_space_empty_state_title">"Додайте свою першу кімнату"</string>
   <string name="screen_space_menu_action_members">"Переглянути учасників"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Видалення кімнати не вплине на доступ до неї. Щоб змінити доступ, перейдіть до розділу «Налаштування кімнати» &gt; «Безпека та конфіденційність»."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"Видалити %1$d кімнату з %2$s"</item>
+    <item quantity="few">"Видалити %1$d кімнати з %2$s"</item>
+    <item quantity="many">"Видалити %1$d кімнат з %2$s"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Вийти з простору"</string>
   <string name="screen_space_settings_roles_and_permissions">"Ролі та дозволи"</string>
   <string name="screen_space_settings_security_and_privacy">"Безпека й приватність"</string>
diff --git a/features/space/impl/src/main/res/values-uz/translations.xml b/features/space/impl/src/main/res/values-uz/translations.xml
index ae0bee0a51..3a924aa7ae 100644
--- a/features/space/impl/src/main/res/values-uz/translations.xml
+++ b/features/space/impl/src/main/res/values-uz/translations.xml
@@ -8,10 +8,20 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"Siz yagona administrator bo‘lmagan xonalardan chiqishni xohlasangiz, ularni tanlang:"</string>
   <string name="screen_leave_space_subtitle_last_admin">" Ketishingizdan oldin bu maydon uchun boshqa administrator tayinlashingiz kerak."</string>
+  <string name="screen_leave_space_subtitle_last_owner">"Siz %1$s yagona egasisiz. Ketishdan oldin egalik huquqini boshqa shaxsga o‘tkazishingiz kerak."</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"Siz quyidagi xona(lar)dan olib tashlanmaysiz, chunki siz yagona administratorsiz:"</string>
   <string name="screen_leave_space_title">"%1$s dan chiqasizmi?"</string>
   <string name="screen_leave_space_title_last_admin">"Siz %1$s uchun yagona administratorsiz"</string>
+  <string name="screen_leave_space_title_last_owner">"Egalikni topshirish"</string>
+  <string name="screen_space_add_room_action">"Xona"</string>
+  <string name="screen_space_add_rooms_room_access_description">"Xona kiritish xonaga kirishga ta’sir qilmaydi. Ruxsatni o‘zgartirish uchun Xona sozlamalari &gt; Xavfsizlik va maxfiylik rukniga kiring."</string>
+  <string name="screen_space_empty_state_title">"Birinchi xonangizni qo‘shing"</string>
   <string name="screen_space_menu_action_members">"A’zolarni ko‘rish"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"Xona olib tashlansa, unga kirish ruxsatiga ta’sir qilmaydi. Ruxsatni o‘zgartirish uchun Xona haqida &gt; Maxfiylik va xavfsizlik rukniga kiring."</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="one">"%1$d ta xonani %2$sdan olib tashlash"</item>
+    <item quantity="other">"%1$d ta xonani %2$sdan olib tashlash"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"Maydondan chiqish"</string>
   <string name="screen_space_settings_roles_and_permissions">"Rollar va ruxsatlar"</string>
   <string name="screen_space_settings_security_and_privacy">"Xavfsizlik va maxfiylik"</string>
diff --git a/features/space/impl/src/main/res/values-vi/translations.xml b/features/space/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..f8c0f5b6c5
--- /dev/null
+++ b/features/space/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_leave_space_choose_owners_action">"Chọn chủ sở hữu"</string>
+  <plurals name="screen_leave_space_submit">
+    <item quantity="other">"Rời khỏi %1$d phòng và không gian"</item>
+  </plurals>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="other">"Xoá %1$d phòng từ %2$s"</item>
+  </plurals>
+  <string name="screen_space_settings_leave_space">"Rời space"</string>
+  <string name="screen_space_settings_roles_and_permissions">"Vai trò và quyền hạn"</string>
+</resources>
diff --git a/features/space/impl/src/main/res/values-zh-rTW/translations.xml b/features/space/impl/src/main/res/values-zh-rTW/translations.xml
index f2be9a1875..623f30923e 100644
--- a/features/space/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/space/impl/src/main/res/values-zh-rTW/translations.xml
@@ -7,10 +7,19 @@
   </plurals>
   <string name="screen_leave_space_subtitle">"這也會將您從此空間中的所有聊天室移除。"</string>
   <string name="screen_leave_space_subtitle_last_admin">"您必須為此空間另外指定一位管理員後才能離開。"</string>
+  <string name="screen_leave_space_subtitle_last_owner">"您是 %1$s 唯一的擁有者。在您離開前，您必須將所有權轉移給其他人。"</string>
   <string name="screen_leave_space_subtitle_only_last_admin">"您不會被從以下聊天室移除，因為您是唯一的管理員："</string>
   <string name="screen_leave_space_title">"離開 %1$s？"</string>
   <string name="screen_leave_space_title_last_admin">"您是 %1$s 唯一的管理員"</string>
+  <string name="screen_leave_space_title_last_owner">"轉移所有權"</string>
+  <string name="screen_space_add_room_action">"聊天室"</string>
+  <string name="screen_space_add_rooms_room_access_description">"新增聊天室不會影響聊天室存取權。要變更存取權，請前往「聊天室設定」→「安全性與隱私權」"</string>
+  <string name="screen_space_empty_state_title">"新增您的第一個聊天室"</string>
   <string name="screen_space_menu_action_members">"檢視成員"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"移除聊天室不會影響聊天室存取權。要變更存取權，請前往「聊天室資訊」→「隱私權與安全性」。"</string>
+  <plurals name="screen_space_remove_rooms_confirmation_title">
+    <item quantity="other">"從 %2$s 移除 %1$d 個聊天室"</item>
+  </plurals>
   <string name="screen_space_settings_leave_space">"離開空間"</string>
   <string name="screen_space_settings_roles_and_permissions">"角色與權限"</string>
   <string name="screen_space_settings_security_and_privacy">"安全與隱私"</string>
diff --git a/features/space/impl/src/main/res/values-zh/translations.xml b/features/space/impl/src/main/res/values-zh/translations.xml
index cdac25a8ae..bf5c298590 100644
--- a/features/space/impl/src/main/res/values-zh/translations.xml
+++ b/features/space/impl/src/main/res/values-zh/translations.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_leave_space_choose_owners_action">"选择所有者"</string>
-  <string name="screen_leave_space_last_admin_info">"%1$s (管理员)"</string>
+  <string name="screen_leave_space_last_admin_info">"%1$s（管理员）"</string>
   <plurals name="screen_leave_space_submit">
     <item quantity="other">"离开 %1$d 个房间和空间"</item>
   </plurals>
-  <string name="screen_leave_space_subtitle">"选择您想要离开且您不是其唯一管理员的房间："</string>
-  <string name="screen_leave_space_subtitle_last_admin">"您需要为该空间指定另一位管理员才能离开。"</string>
-  <string name="screen_leave_space_subtitle_last_owner">"您是%1$s 的唯一所有者。在您离开前，需要将所有权转移给他人。"</string>
-  <string name="screen_leave_space_subtitle_only_last_admin">"您不会从以下房间中被移除，因为您是唯一的管理员："</string>
-  <string name="screen_leave_space_title">"离开%1$s？"</string>
-  <string name="screen_leave_space_title_last_admin">"您是 %1$s 的唯一管理员"</string>
+  <string name="screen_leave_space_subtitle">"选择想要退出并且你不是其唯一管理员的房间："</string>
+  <string name="screen_leave_space_subtitle_last_admin">"你需要为该空间指定另一位管理员才能离开。"</string>
+  <string name="screen_leave_space_subtitle_last_owner">"你是 %1$s 的唯一所有者。在离开前需要将所有权转移给他人。"</string>
+  <string name="screen_leave_space_subtitle_only_last_admin">"由于因为你是唯一的管理员，你不会从以下房间被移除："</string>
+  <string name="screen_leave_space_title">"离开 %1$s？"</string>
+  <string name="screen_leave_space_title_last_admin">"你是 %1$s 中唯一的管理员"</string>
   <string name="screen_leave_space_title_last_owner">"转让所有权"</string>
-  <string name="screen_space_add_room_action">"聊天室"</string>
-  <string name="screen_space_add_rooms_room_access_description">"添加聊天室不会影响其访问权限。如需更改访问权限，请前往“聊天室设置” &gt; “安全与隐私”。"</string>
-  <string name="screen_space_empty_state_title">"添加您的第一个聊天室"</string>
+  <string name="screen_space_add_room_action">"房间"</string>
+  <string name="screen_space_add_rooms_room_access_description">"添加房间不会影响其访问权限。如需更改访问权限，请前往“房间设置” &gt; “安全与隐私”。"</string>
+  <string name="screen_space_empty_state_title">"添加第一个房间"</string>
   <string name="screen_space_menu_action_members">"查看成员"</string>
-  <string name="screen_space_remove_rooms_confirmation_content">"移除聊天室不会影响其访问权限。要更改访问权限，请转到“聊天室信息”&gt;“隐私和安全”。"</string>
+  <string name="screen_space_remove_rooms_confirmation_content">"移除房间不会影响其访问权限。要更改访问权限，请转到“房间信息”→“隐私与安全”。"</string>
   <plurals name="screen_space_remove_rooms_confirmation_title">
-    <item quantity="other">"移除 %1$d 个 %2$s 中的聊天室"</item>
+    <item quantity="other">"移除 %2$s 个房间，共 %1$d 个"</item>
   </plurals>
   <string name="screen_space_settings_leave_space">"离开空间"</string>
   <string name="screen_space_settings_roles_and_permissions">"角色与权限"</string>
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceViewTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceViewTest.kt
index d75fecd05a..c49144f1c9 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceViewTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/addroom/AddRoomToSpaceViewTest.kt
@@ -5,14 +5,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.space.impl.addroom
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -21,78 +23,73 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.toImmutableList
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class AddRoomToSpaceViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class AddRoomToSpaceViewTest : RobolectricTest() {
     @Test
-    fun `clicking back when search inactive emits Dismiss and invokes onBackClick`() {
+    fun `clicking back when search inactive emits Dismiss and invokes onBackClick`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AddRoomToSpaceEvent>()
         ensureCalledOnce {
-            rule.setAddRoomToSpaceView(
+            setAddRoomToSpaceView(
                 anAddRoomToSpaceState(
                     isSearchActive = false,
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it,
             )
-            rule.pressBack()
+            pressBack()
         }
         eventsRecorder.assertSingle(AddRoomToSpaceEvent.Dismiss)
     }
 
     @Test
-    fun `clicking back when search active emits CloseSearch event`() {
+    fun `clicking back when search active emits CloseSearch event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AddRoomToSpaceEvent>()
-        rule.setAddRoomToSpaceView(
+        setAddRoomToSpaceView(
             anAddRoomToSpaceState(
                 isSearchActive = true,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.pressBack()
+        pressBack()
         eventsRecorder.assertSingle(AddRoomToSpaceEvent.OnSearchActiveChanged(false))
     }
 
     @Test
-    fun `clicking save emits Save event`() {
+    fun `clicking save emits Save event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AddRoomToSpaceEvent>()
-        rule.setAddRoomToSpaceView(
+        setAddRoomToSpaceView(
             anAddRoomToSpaceState(
                 selectedRooms = aSelectRoomInfoList().take(1).toImmutableList(),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_save)
+        clickOn(CommonStrings.action_save)
         eventsRecorder.assertSingle(AddRoomToSpaceEvent.Save)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking room in suggestions emits ToggleRoom event`() {
+    fun `clicking room in suggestions emits ToggleRoom event`() = runAndroidComposeUiTest {
         val suggestions = aSelectRoomInfoList()
         val eventsRecorder = EventsRecorder<AddRoomToSpaceEvent>()
-        rule.setAddRoomToSpaceView(
+        setAddRoomToSpaceView(
             anAddRoomToSpaceState(
                 suggestions = suggestions,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithText(suggestions.first().name!!).performClick()
+        onNodeWithText(suggestions.first().name!!).performClick()
         eventsRecorder.assertSingle(AddRoomToSpaceEvent.ToggleRoom(suggestions.first()))
     }
 
     @Test
-    fun `onRoomsAdded called when saveAction is Success`() {
+    fun `onRoomsAdded called when saveAction is Success`() = runAndroidComposeUiTest {
         ensureCalledOnce {
-            rule.setAddRoomToSpaceView(
+            setAddRoomToSpaceView(
                 anAddRoomToSpaceState(
                     saveAction = AsyncAction.Success(Unit),
                 ),
@@ -103,10 +100,10 @@ class AddRoomToSpaceViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `displaying search results sends UpdateSearchVisibleRange event`() {
+    fun `displaying search results sends UpdateSearchVisibleRange event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<AddRoomToSpaceEvent>()
         val rooms = aSelectRoomInfoList()
-        rule.setAddRoomToSpaceView(
+        setAddRoomToSpaceView(
             anAddRoomToSpaceState(
                 isSearchActive = true,
                 searchResults = SearchBarResultState.Results(rooms),
@@ -117,7 +114,7 @@ class AddRoomToSpaceViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAddRoomToSpaceView(
+private fun AndroidComposeUiTest<ComponentActivity>.setAddRoomToSpaceView(
     state: AddRoomToSpaceState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onRoomsAdded: () -> Unit = EnsureNeverCalled(),
@@ -126,7 +123,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAddRo
         AddRoomToSpaceView(
             state = state,
             onBackClick = onBackClick,
-            onRoomsAdded = onRoomsAdded,
+            onAddRoom = onRoomsAdded,
         )
     }
 }
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
index b3b6fc7976..021f52defd 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
@@ -98,13 +98,13 @@ class LeaveSpacePresenterTest {
                         listOf(
                             aLeaveSpaceRoom(spaceRoom = aSpace),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID, isDirect = false)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID, isDm = false)
                             ),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_2, isDirect = true)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_2, isDm = true)
                             ),
                             aLeaveSpaceRoom(
-                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_3, isDirect = null)
+                                spaceRoom = aSpaceRoom(roomId = A_ROOM_ID_3, isDm = null)
                             ),
                         )
                     )
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt
index 1d38e2e0f7..ba4e10a447 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt
@@ -11,6 +11,9 @@
 package io.element.android.features.space.impl.root
 
 import com.google.common.truth.Truth.assertThat
+import com.google.testing.junit.testparameterinjector.KotlinTestParameters.namedTestValues
+import com.google.testing.junit.testparameterinjector.TestParameter
+import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
@@ -19,8 +22,6 @@ import io.element.android.features.invite.api.toInviteData
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
@@ -51,8 +52,10 @@ import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
+import org.junit.runner.RunWith
 import im.vector.app.features.analytics.plan.JoinedRoom as AnalyticsJoinedRoom
 
+@RunWith(TestParameterInjector::class)
 class SpacePresenterTest {
     @Test
     fun `present - initial state`() = runTest {
@@ -75,16 +78,7 @@ class SpacePresenterTest {
     }
 
     @Test
-    fun `present - canAccessSpaceSettings false when space settings ff is enabled but no permissions`() = runTest {
-        val presenter = createSpacePresenter(spaceSettingsEnabled = true)
-        presenter.test {
-            val state = awaitItem()
-            assertThat(state.canAccessSpaceSettings).isFalse()
-        }
-    }
-
-    @Test
-    fun `present - canAccessSpaceSettings true when space settings ff is enabled and has permissions`() = runTest {
+    fun `present - canAccessSpaceSettings true when has permissions`() = runTest {
         val room = FakeBaseRoom(
             roomPermissions = FakeRoomPermissions(
                 canSendState = { true }
@@ -92,7 +86,6 @@ class SpacePresenterTest {
         )
         val presenter = createSpacePresenter(
             room = room,
-            spaceSettingsEnabled = true,
         )
         presenter.test {
             skipItems(1)
@@ -271,21 +264,11 @@ class SpacePresenterTest {
     }
 
     @Test
-    fun `present - accept invite is transmitted to acceptDeclineInviteState`() {
-        `invite action is transmitted to acceptDeclineInviteState`(
-            acceptInvite = true,
-        )
-    }
-
-    @Test
-    fun `present - decline invite is transmitted to acceptDeclineInviteState`() {
-        `invite action is transmitted to acceptDeclineInviteState`(
-            acceptInvite = false,
-        )
-    }
-
-    private fun `invite action is transmitted to acceptDeclineInviteState`(
-        acceptInvite: Boolean,
+    fun `present - invite action is transmitted to acceptDeclineInviteState`(
+        @TestParameter acceptInvite: Boolean = namedTestValues(
+            "accept" to true,
+            "decline" to false,
+        ),
     ) = runTest {
         val eventRecorder = EventsRecorder<AcceptDeclineInviteEvents>()
         val anInvitedRoom = aSpaceRoom(
@@ -627,7 +610,6 @@ class SpacePresenterTest {
             lambda = { _, _, _ -> Result.success(Unit) },
         ),
         acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
-        spaceSettingsEnabled: Boolean = false,
         spaceService: FakeSpaceService = FakeSpaceService(),
     ): SpacePresenter {
         return SpacePresenter(
@@ -638,11 +620,6 @@ class SpacePresenterTest {
             joinRoom = joinRoom,
             acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
             sessionCoroutineScope = this,
-            featureFlagService = FakeFeatureFlagService(
-                initialState = mapOf(
-                    FeatureFlags.SpaceSettings.key to spaceSettingsEnabled,
-                )
-            ),
             spaceService = spaceService,
         )
     }
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
index 87343b6e34..042d6a00ff 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
@@ -6,15 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.space.impl.root
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
@@ -33,37 +35,32 @@ import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class SpaceViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class SpaceViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setSpaceView(
+            setSpaceView(
                 aSpaceState(
                     hasMoreToLoad = false,
                     eventSink = eventsRecorder,
                 ),
                 onBackClick = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on a room name invokes the expected callback`() {
+    fun `clicking on a room name invokes the expected callback`() = runAndroidComposeUiTest {
         val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, displayName = A_ROOM_NAME)
         val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
         ensureCalledOnceWithParam(aSpaceRoom) {
-            rule.setSpaceView(
+            setSpaceView(
                 aSpaceState(
                     children = listOf(aSpaceRoom),
                     hasMoreToLoad = false,
@@ -71,91 +68,91 @@ class SpaceViewTest {
                 ),
                 onRoomClick = it,
             )
-            rule.onNodeWithText(A_ROOM_NAME).performClick()
+            onNodeWithText(A_ROOM_NAME).performClick()
         }
     }
 
     @Test
-    fun `clicking on Join room emits the expected Event`() {
+    fun `clicking on Join room emits the expected Event`() = runAndroidComposeUiTest {
         val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, state = null)
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = listOf(aSpaceRoom),
                 hasMoreToLoad = false,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_join)
+        clickOn(CommonStrings.action_join)
         eventsRecorder.assertSingle(SpaceEvents.Join(aSpaceRoom))
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on accept invite emits the expected Event`() {
+    fun `clicking on accept invite emits the expected Event`() = runAndroidComposeUiTest {
         val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, state = CurrentUserMembership.INVITED)
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 hasMoreToLoad = false,
                 children = listOf(aSpaceRoom),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_accept)
+        clickOn(CommonStrings.action_accept)
         eventsRecorder.assertSingle(SpaceEvents.AcceptInvite(aSpaceRoom))
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on decline invite emits the expected Event`() {
+    fun `clicking on decline invite emits the expected Event`() = runAndroidComposeUiTest {
         val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, state = CurrentUserMembership.INVITED)
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 hasMoreToLoad = false,
                 children = listOf(aSpaceRoom),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_decline)
+        clickOn(CommonStrings.action_decline)
         eventsRecorder.assertSingle(SpaceEvents.DeclineInvite(aSpaceRoom))
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on topic emits the expected Event`() {
+    fun `clicking on topic emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 spaceInfo = aRoomInfo(topic = A_ROOM_TOPIC),
                 hasMoreToLoad = false,
                 eventSink = eventsRecorder,
             )
         )
-        rule.onNodeWithText(A_ROOM_TOPIC).performClick()
+        onNodeWithText(A_ROOM_TOPIC).performClick()
         eventsRecorder.assertSingle(SpaceEvents.ShowTopicViewer(A_ROOM_TOPIC))
     }
 
     @Test
-    fun `clicking back in manage mode emits ExitManageMode event`() {
+    fun `clicking back in manage mode emits ExitManageMode event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 hasMoreToLoad = false,
                 isManageMode = true,
                 eventSink = eventsRecorder,
             )
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(SpaceEvents.ExitManageMode)
     }
 
     @Test
-    fun `clicking on room in manage mode emits ToggleRoomSelection event`() {
+    fun `clicking on room in manage mode emits ToggleRoomSelection event`() = runAndroidComposeUiTest {
         val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, displayName = A_ROOM_NAME)
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = listOf(aSpaceRoom),
                 hasMoreToLoad = false,
@@ -163,14 +160,14 @@ class SpaceViewTest {
                 eventSink = eventsRecorder,
             )
         )
-        rule.onNodeWithText(A_ROOM_NAME).performClick()
+        onNodeWithText(A_ROOM_NAME).performClick()
         eventsRecorder.assertSingle(SpaceEvents.ToggleRoomSelection(A_ROOM_ID))
     }
 
     @Test
-    fun `clicking remove button emits RemoveSelectedRooms event`() {
+    fun `clicking remove button emits RemoveSelectedRooms event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = listOf(aSpaceRoom(roomId = A_ROOM_ID)),
                 hasMoreToLoad = false,
@@ -179,15 +176,15 @@ class SpaceViewTest {
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_remove)
+        clickOn(CommonStrings.action_remove)
         eventsRecorder.assertSingle(SpaceEvents.RemoveSelectedRooms)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking confirm in removal dialog emits ConfirmRoomRemoval event`() {
+    fun `clicking confirm in removal dialog emits ConfirmRoomRemoval event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<SpaceEvents>()
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = listOf(aSpaceRoom(roomId = A_ROOM_ID)),
                 hasMoreToLoad = false,
@@ -198,14 +195,14 @@ class SpaceViewTest {
             )
         )
         // Click on the Remove button in the confirmation dialog
-        rule.clickOn(CommonStrings.action_remove, inDialog = true)
+        clickOn(CommonStrings.action_remove, inDialog = true)
         eventsRecorder.assertSingle(SpaceEvents.ConfirmRoomRemoval)
     }
 
     @Test
-    fun `clicking create room button calls the expected callback`() {
+    fun `clicking create room button calls the expected callback`() = runAndroidComposeUiTest {
         val onCreateRoomClick = lambdaRecorder<Unit> { }
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = emptyList(),
                 hasMoreToLoad = false,
@@ -214,14 +211,14 @@ class SpaceViewTest {
             ),
             onCreateRoomClick = onCreateRoomClick,
         )
-        rule.clickOn(CommonStrings.action_create_room)
+        clickOn(CommonStrings.action_create_room)
         onCreateRoomClick.assertions().isCalledOnce()
     }
 
     @Test
-    fun `clicking add existing room button calls the expected callback`() {
+    fun `clicking add existing room button calls the expected callback`() = runAndroidComposeUiTest {
         val onAddRoomClick = lambdaRecorder<Unit> { }
-        rule.setSpaceView(
+        setSpaceView(
             aSpaceState(
                 children = emptyList(),
                 hasMoreToLoad = false,
@@ -230,12 +227,12 @@ class SpaceViewTest {
             ),
             onAddRoomClick = onAddRoomClick,
         )
-        rule.clickOn(CommonStrings.action_add_existing_rooms)
+        clickOn(CommonStrings.action_add_existing_rooms)
         onAddRoomClick.assertions().isCalledOnce()
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpaceView(
+private fun AndroidComposeUiTest<ComponentActivity>.setSpaceView(
     state: SpaceState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
     onRoomClick: (SpaceRoom) -> Unit = EnsureNeverCalledWithParam(),
diff --git a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/ConfirmingStartDmWithMatrixUser.kt b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/ConfirmingStartDmWithMatrixUser.kt
index 5bf015c0f0..059002d983 100644
--- a/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/ConfirmingStartDmWithMatrixUser.kt
+++ b/features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/ConfirmingStartDmWithMatrixUser.kt
@@ -13,4 +13,5 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class ConfirmingStartDmWithMatrixUser(
     val matrixUser: MatrixUser,
+    val isUserIdentityUnknown: Boolean,
 ) : AsyncAction.Confirming
diff --git a/features/startchat/impl/build.gradle.kts b/features/startchat/impl/build.gradle.kts
index 6ab1a361e9..fe7bfa9ae2 100644
--- a/features/startchat/impl/build.gradle.kts
+++ b/features/startchat/impl/build.gradle.kts
@@ -38,11 +38,12 @@ dependencies {
     implementation(projects.libraries.mediapickers.api)
     implementation(projects.libraries.mediaupload.api)
     implementation(projects.libraries.permissions.api)
-    implementation(projects.libraries.usersearch.impl)
+    implementation(projects.libraries.usersearch.api)
     implementation(projects.services.analytics.api)
     implementation(libs.coil.compose)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.features.createroom.api)
+    implementation(projects.features.enterprise.api)
     api(projects.features.startchat.api)
 
     testCommonDependencies(libs, true)
@@ -55,4 +56,5 @@ dependencies {
     testImplementation(projects.features.createroom.test)
     testImplementation(projects.features.startchat.test)
     testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.features.enterprise.test)
 }
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartDMAction.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartDMAction.kt
index a484fe2e72..0e6b3faf1c 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartDMAction.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/DefaultStartDMAction.kt
@@ -11,6 +11,7 @@ package io.element.android.features.startchat.impl
 import androidx.compose.runtime.MutableState
 import dev.zacsweers.metro.ContributesBinding
 import im.vector.app.features.analytics.plan.CreatedRoom
+import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.startchat.api.ConfirmingStartDmWithMatrixUser
 import io.element.android.features.startchat.api.StartDMAction
 import io.element.android.libraries.architecture.AsyncAction
@@ -26,6 +27,7 @@ import io.element.android.services.analytics.api.AnalyticsService
 class DefaultStartDMAction(
     private val matrixClient: MatrixClient,
     private val analyticsService: AnalyticsService,
+    private val sessionEnterpriseService: SessionEnterpriseService,
 ) : StartDMAction {
     override suspend fun execute(
         matrixUser: MatrixUser,
@@ -33,7 +35,11 @@ class DefaultStartDMAction(
         actionState: MutableState<AsyncAction<RoomId>>,
     ) {
         actionState.value = AsyncAction.Loading
-        when (val result = matrixClient.startDM(matrixUser.userId, createIfDmDoesNotExist)) {
+        when (val result = matrixClient.startDM(
+            userId = matrixUser.userId,
+            createIfDmDoesNotExist = createIfDmDoesNotExist,
+            isEncryped = !sessionEnterpriseService.isEncryptionDisabledByHomeserver(),
+        )) {
             is StartDMResult.Success -> {
                 if (result.isNew) {
                     analyticsService.capture(CreatedRoom(isDM = true))
@@ -44,7 +50,11 @@ class DefaultStartDMAction(
                 actionState.value = AsyncAction.Failure(result.throwable)
             }
             StartDMResult.DmDoesNotExist -> {
-                actionState.value = ConfirmingStartDmWithMatrixUser(matrixUser = matrixUser)
+                val identityState = matrixClient.encryptionService.getUserIdentity(matrixUser.userId, fallbackToServer = false).getOrNull()
+                actionState.value = ConfirmingStartDmWithMatrixUser(
+                    matrixUser = matrixUser,
+                    isUserIdentityUnknown = identityState == null
+                )
             }
         }
     }
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/UserListView.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/UserListView.kt
index cab1c57015..c8587d9784 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/UserListView.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/components/UserListView.kt
@@ -10,7 +10,14 @@ package io.element.android.features.startchat.impl.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.plus
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -25,6 +32,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.CheckableUserRow
 import io.element.android.libraries.matrix.ui.components.CheckableUserRowData
@@ -44,8 +52,10 @@ fun UserListView(
     Column(
         modifier = modifier,
     ) {
+        val contentPaddingValues = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()
         SearchUserBar(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth()
+                .padding(contentPaddingValues),
             queryState = state.searchQuery,
             resultState = state.searchResults,
             selectedUsers = state.selectedUsers,
@@ -66,7 +76,7 @@ fun UserListView(
 
         if (state.isMultiSelectionEnabled && !state.isSearchActive && state.selectedUsers.isNotEmpty()) {
             SelectedUsersRowList(
-                contentPadding = PaddingValues(16.dp),
+                contentPadding = contentPaddingValues + PaddingValues(16.dp),
                 selectedUsers = state.selectedUsers,
                 autoScroll = true,
                 onUserRemove = {
@@ -76,7 +86,9 @@ fun UserListView(
             )
         }
         if (!state.isSearchActive && state.recentDirectRooms.isNotEmpty()) {
-            LazyColumn {
+            LazyColumn(
+                contentPadding = lazyColumnContentPadding,
+            ) {
                 item {
                     ListSectionHeader(
                         title = stringResource(id = CommonStrings.common_suggestions),
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressView.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressView.kt
index e4f8a4faf2..ffe6a47f0d 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressView.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressView.kt
@@ -13,10 +13,13 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -45,18 +48,23 @@ fun JoinRoomByAddressView(
     state: JoinRoomByAddressState,
     modifier: Modifier = Modifier,
 ) {
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+    )
     ModalBottomSheet(
         modifier = modifier,
         sheetState = sheetState,
         onDismissRequest = {
             state.eventSink(JoinRoomByAddressEvent.Dismiss)
         },
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(all = 16.dp),
+                .padding(all = 16.dp)
+                .verticalScroll(rememberScrollState()),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             RoomAddressField(
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenter.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenter.kt
index e176f202ad..079ece4180 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenter.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenter.kt
@@ -10,8 +10,6 @@ package io.element.android.features.startchat.impl.root
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -24,8 +22,6 @@ import io.element.android.features.startchat.impl.userlist.UserListPresenterArgs
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.usersearch.api.UserRepository
 import kotlinx.coroutines.launch
@@ -37,7 +33,6 @@ class StartChatPresenter(
     userListDataStore: UserListDataStore,
     private val startDMAction: StartDMAction,
     private val buildMeta: BuildMeta,
-    private val featureFlagService: FeatureFlagService,
 ) : Presenter<StartChatState> {
     private val presenter = presenterFactory.create(
         UserListPresenterArgs(
@@ -54,10 +49,6 @@ class StartChatPresenter(
         val localCoroutineScope = rememberCoroutineScope()
         val startDmActionState: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        val isRoomDirectorySearchEnabled by remember {
-            featureFlagService.isFeatureEnabledFlow(FeatureFlags.RoomDirectorySearch)
-        }.collectAsState(initial = false)
-
         fun handleEvent(event: StartChatEvents) {
             when (event) {
                 is StartChatEvents.StartDM -> localCoroutineScope.launch {
@@ -75,7 +66,6 @@ class StartChatPresenter(
             applicationName = buildMeta.applicationName,
             userListState = userListState,
             startDmAction = startDmActionState.value,
-            isRoomDirectorySearchEnabled = isRoomDirectorySearchEnabled,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatState.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatState.kt
index 65f977d3e3..e6746e1302 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatState.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatState.kt
@@ -16,6 +16,5 @@ data class StartChatState(
     val applicationName: String,
     val userListState: UserListState,
     val startDmAction: AsyncAction<RoomId>,
-    val isRoomDirectorySearchEnabled: Boolean,
     val eventSink: (StartChatEvents) -> Unit,
 )
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatStateProvider.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatStateProvider.kt
index 448ad1a80a..41a3551d1d 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatStateProvider.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatStateProvider.kt
@@ -16,6 +16,7 @@ import io.element.android.features.startchat.impl.userlist.aUserListState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.usersearch.api.UserSearchResult
 import kotlinx.collections.immutable.persistentListOf
@@ -52,24 +53,29 @@ open class StartChatStateProvider : PreviewParameterProvider<StartChatState> {
                 )
             ),
             aCreateRoomRootState(
-                startDmAction = ConfirmingStartDmWithMatrixUser(aMatrixUser()),
-            ),
-            aCreateRoomRootState(
-                isRoomDirectorySearchEnabled = true,
+                startDmAction = aConfirmingStartDmWithMatrixUser()
             ),
         )
 }
 
+fun aConfirmingStartDmWithMatrixUser(
+    matrixUser: MatrixUser = aMatrixUser(),
+    isUserIdentityUnknown: Boolean = false
+): ConfirmingStartDmWithMatrixUser {
+    return ConfirmingStartDmWithMatrixUser(
+        matrixUser,
+        isUserIdentityUnknown
+    )
+}
+
 fun aCreateRoomRootState(
     applicationName: String = "Element X Preview",
     userListState: UserListState = aUserListState(),
     startDmAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
-    isRoomDirectorySearchEnabled: Boolean = false,
     eventSink: (StartChatEvents) -> Unit = {},
 ) = StartChatState(
     applicationName = applicationName,
     userListState = userListState,
     startDmAction = startDmAction,
-    isRoomDirectorySearchEnabled = isRoomDirectorySearchEnabled,
     eventSink = eventSink,
 )
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatView.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatView.kt
index 0b8da1bd94..104a8cecf7 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatView.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/root/StartChatView.kt
@@ -45,6 +45,8 @@ import io.element.android.libraries.designsystem.theme.components.ListSectionHea
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.CreateDmConfirmationBottomSheet
 import io.element.android.libraries.matrix.ui.components.MatrixUserRow
@@ -71,7 +73,8 @@ fun StartChatView(
             if (!state.userListState.isSearchActive) {
                 CreateRoomRootViewTopBar(onCloseClick = onCloseClick)
             }
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { paddingValues ->
         Column(
             modifier = Modifier
@@ -130,6 +133,7 @@ fun StartChatView(
             if (data is ConfirmingStartDmWithMatrixUser) {
                 CreateDmConfirmationBottomSheet(
                     matrixUser = data.matrixUser,
+                    isUserIdentityUnknown = data.isUserIdentityUnknown,
                     onSendInvite = {
                         state.eventSink(StartChatEvents.StartDM(data.matrixUser))
                     },
@@ -167,7 +171,9 @@ private fun CreateRoomActionButtonsList(
     onRoomDirectorySearchClick: () -> Unit,
     onDmClick: (RoomId) -> Unit,
 ) {
-    LazyColumn {
+    LazyColumn(
+        contentPadding = lazyColumnContentPadding,
+    ) {
         item {
             CreateRoomActionButton(
                 iconRes = CompoundDrawables.ic_compound_plus,
@@ -175,14 +181,12 @@ private fun CreateRoomActionButtonsList(
                 onClick = onNewRoomClick,
             )
         }
-        if (state.isRoomDirectorySearchEnabled) {
-            item {
-                CreateRoomActionButton(
-                    iconRes = CompoundDrawables.ic_compound_list_bulleted,
-                    text = stringResource(id = R.string.screen_room_directory_search_title),
-                    onClick = onRoomDirectorySearchClick,
-                )
-            }
+        item {
+            CreateRoomActionButton(
+                iconRes = CompoundDrawables.ic_compound_list_bulleted,
+                text = stringResource(id = R.string.screen_room_directory_search_title),
+                onClick = onRoomDirectorySearchClick,
+            )
         }
         item {
             CreateRoomActionButton(
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenter.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenter.kt
index ce579c5b50..286f0abe68 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenter.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenter.kt
@@ -67,19 +67,19 @@ class DefaultUserListPresenter(
         val selectedUsers by userListDataStore.selectedUsers.collectAsState(emptyList())
         val queryState = rememberTextFieldState()
         var searchResults: SearchBarResultState<ImmutableList<UserSearchResult>> by remember {
-            mutableStateOf(SearchBarResultState.Initial())
+            mutableStateOf(SearchBarResultState.Initial)
         }
         var showSearchLoader by remember { mutableStateOf(false) }
 
         val searchQuery = queryState.text.toString()
         LaunchedEffect(searchQuery) {
-            searchResults = SearchBarResultState.Initial()
+            searchResults = SearchBarResultState.Initial
             showSearchLoader = false
             userRepository.search(searchQuery).onEach { state ->
                 showSearchLoader = state.isSearching
                 searchResults = when {
-                    state.results.isEmpty() && state.isSearching -> SearchBarResultState.Initial()
-                    state.results.isEmpty() && !state.isSearching -> SearchBarResultState.NoResultsFound()
+                    state.results.isEmpty() && state.isSearching -> SearchBarResultState.Initial
+                    state.results.isEmpty() && !state.isSearching -> SearchBarResultState.NoResultsFound
                     else -> SearchBarResultState.Results(state.results.toImmutableList())
                 }
             }.launchIn(this)
diff --git a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListStateProvider.kt b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListStateProvider.kt
index 3da8bfdabe..91d047d238 100644
--- a/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListStateProvider.kt
+++ b/features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/userlist/UserListStateProvider.kt
@@ -47,7 +47,7 @@ open class UserListStateProvider : PreviewParameterProvider<UserListState> {
             aUserListState(
                 isSearchActive = true,
                 searchQuery = "something-with-no-results",
-                searchResults = SearchBarResultState.NoResultsFound()
+                searchResults = SearchBarResultState.NoResultsFound
             ),
             aUserListState(
                 isSearchActive = true,
@@ -63,7 +63,7 @@ open class UserListStateProvider : PreviewParameterProvider<UserListState> {
 fun aUserListState(
     searchQuery: String = "",
     isSearchActive: Boolean = false,
-    searchResults: SearchBarResultState<ImmutableList<UserSearchResult>> = SearchBarResultState.Initial(),
+    searchResults: SearchBarResultState<ImmutableList<UserSearchResult>> = SearchBarResultState.Initial,
     selectedUsers: List<MatrixUser> = emptyList(),
     showSearchLoader: Boolean = false,
     selectionMode: SelectionMode = SelectionMode.Single,
diff --git a/features/startchat/impl/src/main/res/values-ca/translations.xml b/features/startchat/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..e249d61582
--- /dev/null
+++ b/features/startchat/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"Sala nova"</string>
+  <string name="screen_room_directory_search_title">"Directori de sales"</string>
+  <string name="screen_start_chat_error_starting_chat">"S\'ha produït un error en intentar iniciar un xat"</string>
+  <string name="screen_start_chat_join_room_by_address_action">"Uneix-te a una sala mitjançant l\'adreça"</string>
+  <string name="screen_start_chat_join_room_by_address_invalid_address">"Adreça invàlida"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Introdueix…"</string>
+  <string name="screen_start_chat_join_room_by_address_room_found">"S\'ha trobat una sala coincident"</string>
+  <string name="screen_start_chat_join_room_by_address_room_not_found">"Sala no trobada"</string>
+  <string name="screen_start_chat_join_room_by_address_supporting_text">"p. ex. #nom-sala:matrix.org"</string>
+</resources>
diff --git a/features/startchat/impl/src/main/res/values-el/translations.xml b/features/startchat/impl/src/main/res/values-el/translations.xml
index 19e6250d12..b07e1a827c 100644
--- a/features/startchat/impl/src/main/res/values-el/translations.xml
+++ b/features/startchat/impl/src/main/res/values-el/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Παρουσιάστηκε σφάλμα κατά την προσπάθεια έναρξης μιας συνομιλίας"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Συμμετοχή σε αίθουσα μέσω διεύθυνσης"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Μη έγκυρη διεύθυνση"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Εισάγετε…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Εισαγάγετε διεύθυνση…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Βρέθηκε η αντίστοιχη αίθουσα"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Η αίθουσα δεν βρέθηκε"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"π.χ. #όνομα-αίθουσας:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-et/translations.xml b/features/startchat/impl/src/main/res/values-et/translations.xml
index 65459475a8..527d036cd4 100644
--- a/features/startchat/impl/src/main/res/values-et/translations.xml
+++ b/features/startchat/impl/src/main/res/values-et/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Vestluse alustamisel tekkis viga"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Liitu jututoaga aadressi alusel"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"See pole kehtiv aadress"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Sisene…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Sisesta aadress…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Leidsime vastava jututoa"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Jututuba ei leidu"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"nt. #jututoa-nimi:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-fi/translations.xml b/features/startchat/impl/src/main/res/values-fi/translations.xml
index bb59e375e4..ce0741a35e 100644
--- a/features/startchat/impl/src/main/res/values-fi/translations.xml
+++ b/features/startchat/impl/src/main/res/values-fi/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Keskustelun aloituksessa tapahtui virhe"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Liity huoneeseen osoitteella"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Osoite ei ole kelvollinen"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Kirjoita…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Kirjoita osoite…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Täsmäävä huone löytyi"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Huonetta ei löytynyt"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"esim. #huoneen-nimi:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-hr/translations.xml b/features/startchat/impl/src/main/res/values-hr/translations.xml
index 8f0407fcde..0cd7926ca0 100644
--- a/features/startchat/impl/src/main/res/values-hr/translations.xml
+++ b/features/startchat/impl/src/main/res/values-hr/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Došlo je do pogreške prilikom pokretanja razgovora"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Pridruži se sobi putem adrese"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Adresa nije valjana"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Unos…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Unesite adresu…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Pronađena je odgovarajuća soba"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Soba nije pronađena"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"npr. #naziv-sobe:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-hu/translations.xml b/features/startchat/impl/src/main/res/values-hu/translations.xml
index 014f7baaac..c9ce9f3c20 100644
--- a/features/startchat/impl/src/main/res/values-hu/translations.xml
+++ b/features/startchat/impl/src/main/res/values-hu/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Hiba történt a csevegés indításakor"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Csatlakozás a szobához cím szerint"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Nem érvényes cím"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Írja be…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Cím megadása…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Megfelelő szoba található"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Szoba nem található"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"pl. #szoba-neve:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-in/translations.xml b/features/startchat/impl/src/main/res/values-in/translations.xml
index 5f796bb8da..b711d6c6cb 100644
--- a/features/startchat/impl/src/main/res/values-in/translations.xml
+++ b/features/startchat/impl/src/main/res/values-in/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Terjadi kesalahan saat mencoba memulai obrolan"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Bergabung dalam ruangan berdasarkan alamat"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Bukan alamat yang valid"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Masuk…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Masukkan alamat…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Ruangan yang cocok ditemukan"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Ruangan tidak ditemukan"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"mis. #nama-ruangan:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-it/translations.xml b/features/startchat/impl/src/main/res/values-it/translations.xml
index 94818d7ab1..3c58bc6911 100644
--- a/features/startchat/impl/src/main/res/values-it/translations.xml
+++ b/features/startchat/impl/src/main/res/values-it/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Si è verificato un errore durante il tentativo di avviare una chat"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Accedi alla stanza tramite indirizzo"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Indirizzo non valido"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Inserisci…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Inserisci l\'indirizzo…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Stanza trovata"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Stanza non trovata"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"ad esempio #room -name:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-ja/translations.xml b/features/startchat/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..52b287fcc8
--- /dev/null
+++ b/features/startchat/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"新しいルーム"</string>
+  <string name="screen_room_directory_search_title">"ルーム階層"</string>
+  <string name="screen_start_chat_error_starting_chat">"新しい会話を開始する際に問題が発生しました。"</string>
+  <string name="screen_start_chat_join_room_by_address_action">"アドレスからルームに参加"</string>
+  <string name="screen_start_chat_join_room_by_address_invalid_address">"有効なアドレスではありません"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"アドレスを入力…"</string>
+  <string name="screen_start_chat_join_room_by_address_room_found">"ルームが見つかりました"</string>
+  <string name="screen_start_chat_join_room_by_address_room_not_found">"ルームが見つかりません"</string>
+  <string name="screen_start_chat_join_room_by_address_supporting_text">"例) #room-name:matrix.org"</string>
+</resources>
diff --git a/features/startchat/impl/src/main/res/values-nb/translations.xml b/features/startchat/impl/src/main/res/values-nb/translations.xml
index ffd8fe9cfc..9b96eee0a1 100644
--- a/features/startchat/impl/src/main/res/values-nb/translations.xml
+++ b/features/startchat/impl/src/main/res/values-nb/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Det oppstod en feil når du prøvde å starte en chat"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Bli med i rommet med adresse"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Ikke en gyldig adresse"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Gå inn…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Skriv inn adresse…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Matchende rom funnet"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Rom ikke funnet"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"f.eks. #rom-navn:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-pl/translations.xml b/features/startchat/impl/src/main/res/values-pl/translations.xml
index fe6b4a2c8d..10b88f0658 100644
--- a/features/startchat/impl/src/main/res/values-pl/translations.xml
+++ b/features/startchat/impl/src/main/res/values-pl/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Wystąpił błąd podczas próby rozpoczęcia czatu"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Dołącz do pokoju za pomocą adresu"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Nieprawidłowy adres"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Wprowadź…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Wprowadź adres…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Znaleziono pasujący pokój"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Nie znaleziono pokoju"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"np. #room-name:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-ru/translations.xml b/features/startchat/impl/src/main/res/values-ru/translations.xml
index 4a5fd0aef0..0031861825 100644
--- a/features/startchat/impl/src/main/res/values-ru/translations.xml
+++ b/features/startchat/impl/src/main/res/values-ru/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Произошла ошибка при попытке начать чат"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Присоединиться к комнате по адресу"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Недействительный адрес"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Ввести…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Введите адрес…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Комната найдена"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Комната не найдена"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"прим. #room-name:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-uk/translations.xml b/features/startchat/impl/src/main/res/values-uk/translations.xml
index 3c2b09939c..5d7e0f13b3 100644
--- a/features/startchat/impl/src/main/res/values-uk/translations.xml
+++ b/features/startchat/impl/src/main/res/values-uk/translations.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"Під час спроби почати бесіду сталася помилка"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Приєднатися до кімнати за адресою"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Недійсна адреса"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Введіть…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Увести адресу…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Знайдено відповідну кімнату"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Кімната не знайдена"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"наприклад, #room-name:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values-vi/translations.xml b/features/startchat/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..765b5bc302
--- /dev/null
+++ b/features/startchat/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"Phòng mới"</string>
+  <string name="screen_room_directory_search_title">"Danh sách phòng"</string>
+  <string name="screen_start_chat_error_starting_chat">"Đã xảy ra lỗi khi cố gắng bắt đầu cuộc trò chuyện"</string>
+</resources>
diff --git a/features/startchat/impl/src/main/res/values-zh/translations.xml b/features/startchat/impl/src/main/res/values-zh/translations.xml
index fcbb6afd45..bd41a627b1 100644
--- a/features/startchat/impl/src/main/res/values-zh/translations.xml
+++ b/features/startchat/impl/src/main/res/values-zh/translations.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_create_room_action_create_room">"新聊天室"</string>
-  <string name="screen_room_directory_search_title">"聊天室目录"</string>
+  <string name="screen_create_room_action_create_room">"新房间"</string>
+  <string name="screen_room_directory_search_title">"房间目录"</string>
   <string name="screen_start_chat_error_starting_chat">"在开始聊天时发生了错误"</string>
   <string name="screen_start_chat_join_room_by_address_action">"输入地址加入房间"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"地址无效"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"输入…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"输入地址…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"找到匹配的房间"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"未找到房间"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"例如 #room-name:matrix.org"</string>
diff --git a/features/startchat/impl/src/main/res/values/localazy.xml b/features/startchat/impl/src/main/res/values/localazy.xml
index 48b6449263..dedfbfb5cc 100644
--- a/features/startchat/impl/src/main/res/values/localazy.xml
+++ b/features/startchat/impl/src/main/res/values/localazy.xml
@@ -5,7 +5,7 @@
   <string name="screen_start_chat_error_starting_chat">"An error occurred when trying to start a chat"</string>
   <string name="screen_start_chat_join_room_by_address_action">"Join room by address"</string>
   <string name="screen_start_chat_join_room_by_address_invalid_address">"Not a valid address"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Enter…"</string>
+  <string name="screen_start_chat_join_room_by_address_placeholder">"Enter address…"</string>
   <string name="screen_start_chat_join_room_by_address_room_found">"Matching room found"</string>
   <string name="screen_start_chat_join_room_by_address_room_not_found">"Room not found"</string>
   <string name="screen_start_chat_join_room_by_address_supporting_text">"e.g. #room-name:matrix.org"</string>
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartDMActionTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartDMActionTest.kt
index 122775f2cc..16b59f35df 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartDMActionTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/DefaultStartDMActionTest.kt
@@ -11,16 +11,23 @@ package io.element.android.features.startchat.impl
 import androidx.compose.runtime.mutableStateOf
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.CreatedRoom
+import io.element.android.features.enterprise.api.SessionEnterpriseService
+import io.element.android.features.enterprise.test.FakeSessionEnterpriseService
 import io.element.android.features.startchat.api.ConfirmingStartDmWithMatrixUser
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -67,7 +74,12 @@ class DefaultStartDMActionTest {
 
     @Test
     fun `when dm is not found, and createIfDmDoesNotExist is false, assert dm is not created and state is updated to confirmation state`() = runTest {
-        val matrixClient = FakeMatrixClient().apply {
+        val encryptionService = FakeEncryptionService(
+            getUserIdentityResult = { Result.success(null) }
+        )
+        val matrixClient = FakeMatrixClient(
+            encryptionService = encryptionService
+        ).apply {
             givenFindDmResult(Result.success(null))
             givenCreateDmResult(Result.success(A_ROOM_ID))
         }
@@ -76,7 +88,7 @@ class DefaultStartDMActionTest {
         val state = mutableStateOf<AsyncAction<RoomId>>(AsyncAction.Uninitialized)
         val matrixUser = aMatrixUser()
         action.execute(matrixUser, false, state)
-        assertThat(state.value).isEqualTo(ConfirmingStartDmWithMatrixUser(matrixUser))
+        assertThat(state.value).isEqualTo(ConfirmingStartDmWithMatrixUser(matrixUser, isUserIdentityUnknown = true))
         assertThat(analyticsService.capturedEvents).isEmpty()
     }
 
@@ -94,13 +106,60 @@ class DefaultStartDMActionTest {
         assertThat(analyticsService.capturedEvents).isEmpty()
     }
 
+    @Test
+    fun `when user identity fetched and identity unknown`() = runTest {
+        val getUserIdentityResult = lambdaRecorder<UserId, Result<IdentityState?>> { _ -> Result.success(null) }
+        val encryptionService = FakeEncryptionService(getUserIdentityResult = getUserIdentityResult)
+        val matrixClient = FakeMatrixClient(encryptionService = encryptionService).apply {
+            givenFindDmResult(Result.success(null))
+        }
+
+        val action = createStartDMAction(
+            matrixClient = matrixClient,
+        )
+        val state = mutableStateOf<AsyncAction<RoomId>>(AsyncAction.Uninitialized)
+
+        action.execute(aMatrixUser(), false, state)
+
+        getUserIdentityResult.assertions().isCalledOnce()
+        assertThat(state.value).isEqualTo(ConfirmingStartDmWithMatrixUser(aMatrixUser(), isUserIdentityUnknown = true))
+    }
+
+    @Test
+    fun `when SessionEnterpriseService disables encryption the DM is created without encryption`() = runTest {
+        val createDmLambda = lambdaRecorder<UserId, Boolean, Result<RoomId>> { _, _ -> Result.success(A_ROOM_ID) }
+        val matrixClient = FakeMatrixClient().apply {
+            givenFindDmResult(Result.success(null))
+            createDmResult = createDmLambda
+        }
+
+        val action = createStartDMAction(
+            matrixClient = matrixClient,
+            sessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { true })
+        )
+        val state = mutableStateOf<AsyncAction<RoomId>>(AsyncAction.Uninitialized)
+
+        val matrixUser = aMatrixUser()
+        action.execute(matrixUser = matrixUser, createIfDmDoesNotExist = true, actionState = state)
+
+        createDmLambda.assertions().isCalledOnce().with(
+            value(matrixUser.userId),
+            // isEncrypted should be false because encryption is disabled
+            value(false),
+        )
+
+        assertThat(state.value).isEqualTo(AsyncAction.Success(A_ROOM_ID))
+    }
+
     private fun createStartDMAction(
         matrixClient: MatrixClient = FakeMatrixClient(),
         analyticsService: AnalyticsService = FakeAnalyticsService(),
+        sessionEnterpriseService: SessionEnterpriseService = FakeSessionEnterpriseService(isEncryptionDisabledResult = { false }),
     ): DefaultStartDMAction {
         return DefaultStartDMAction(
             matrixClient = matrixClient,
             analyticsService = analyticsService,
+            sessionEnterpriseService = sessionEnterpriseService,
         )
     }
 }
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
index 92162ca82c..421f8c7089 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
@@ -6,56 +6,52 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.startchat.impl.joinbyaddress
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performTextInput
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.startchat.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class JoinBaseRoomByAddressViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class JoinBaseRoomByAddressViewTest : RobolectricTest() {
     @Test
-    fun `entering text emits the expected event`() {
+    fun `entering text emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomByAddressEvent>()
-        rule.setJoinRoomByAddressView(
+        setJoinRoomByAddressView(
             aJoinRoomByAddressState(
                 eventSink = eventsRecorder,
             )
         )
-        val text = rule.activity.getString(R.string.screen_start_chat_join_room_by_address_action)
-        rule.onNodeWithText(text).performTextInput("#address:matrix.org")
+        val text = activity!!.getString(R.string.screen_start_chat_join_room_by_address_action)
+        onNodeWithText(text).performTextInput("#address:matrix.org")
         eventsRecorder.assertSingle(JoinRoomByAddressEvent.UpdateAddress("#address:matrix.org"))
     }
 
     @Test
-    fun `clicking on continue emits the expected event`() {
+    fun `clicking on continue emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<JoinRoomByAddressEvent>()
-        rule.setJoinRoomByAddressView(
+        setJoinRoomByAddressView(
             aJoinRoomByAddressState(
                 eventSink = eventsRecorder,
             )
         )
-        rule.clickOn(CommonStrings.action_continue)
+        clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(JoinRoomByAddressEvent.Continue)
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinRoomByAddressView(
+private fun AndroidComposeUiTest<ComponentActivity>.setJoinRoomByAddressView(
     state: JoinRoomByAddressState,
 ) {
     setSafeContent {
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenterTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenterTest.kt
index 7c209d9052..57f6cd2333 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenterTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatPresenterTest.kt
@@ -17,8 +17,6 @@ import io.element.android.features.startchat.impl.userlist.FakeUserListPresenter
 import io.element.android.features.startchat.impl.userlist.FakeUserListPresenterFactory
 import io.element.android.features.startchat.impl.userlist.UserListDataStore
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -102,7 +100,7 @@ class StartChatPresenterTest {
     @Test
     fun `present - start DM action confirmation scenario - cancel`() = runTest {
         val matrixUser = MatrixUser(UserId("@name:domain"))
-        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser)
+        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser, isUserIdentityUnknown = false)
         val executeResult = lambdaRecorder<MatrixUser, Boolean, MutableState<AsyncAction<RoomId>>, Unit> { _, _, actionState ->
             actionState.value = startDMConfirmationResult
         }
@@ -130,7 +128,7 @@ class StartChatPresenterTest {
     @Test
     fun `present - start DM action confirmation scenario - confirm`() = runTest {
         val matrixUser = MatrixUser(UserId("@name:domain"))
-        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser)
+        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser, isUserIdentityUnknown = false)
         val executeResult = lambdaRecorder<MatrixUser, Boolean, MutableState<AsyncAction<RoomId>>, Unit> { _, _, actionState ->
             actionState.value = startDMConfirmationResult
         }
@@ -155,34 +153,16 @@ class StartChatPresenterTest {
             )
         }
     }
-
-    @Test
-    fun `present - room directory search`() = runTest {
-        val presenter = createStartChatPresenter(isRoomDirectorySearchEnabled = true)
-        presenter.test {
-            skipItems(1)
-            awaitItem().let { state ->
-                assertThat(state.isRoomDirectorySearchEnabled).isTrue()
-            }
-        }
-    }
 }
 
 internal fun createStartChatPresenter(
     startDMAction: StartDMAction = FakeStartDMAction(),
-    isRoomDirectorySearchEnabled: Boolean = false,
 ): StartChatPresenter {
-    val featureFlagService = FakeFeatureFlagService(
-        initialState = mapOf(
-            FeatureFlags.RoomDirectorySearch.key to isRoomDirectorySearchEnabled,
-        ),
-    )
     return StartChatPresenter(
         presenterFactory = FakeUserListPresenterFactory(FakeUserListPresenter()),
         userRepository = FakeUserRepository(),
         userListDataStore = UserListDataStore(),
         startDMAction = startDMAction,
-        featureFlagService = featureFlagService,
         buildMeta = aBuildMeta(),
     )
 }
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatViewTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatViewTest.kt
index 9237f3433c..8b5e1da8e6 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatViewTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/root/StartChatViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.startchat.impl.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.startchat.impl.R
 import io.element.android.features.startchat.impl.userlist.aRecentDirectRoomList
 import io.element.android.features.startchat.impl.userlist.aUserListState
@@ -27,70 +29,64 @@ import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class StartChatViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class StartChatViewTest : RobolectricTest() {
     @Test
-    fun `clicking on back invokes the expected callback`() {
+    fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
                 ),
                 onCloseClick = it
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on New room invokes the expected callback`() {
+    fun `clicking on New room invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
                 ),
                 onNewRoomClick = it
             )
-            rule.clickOn(R.string.screen_create_room_action_create_room)
+            clickOn(R.string.screen_create_room_action_create_room)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on Invite people invokes the expected callback`() {
+    fun `clicking on Invite people invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     applicationName = "test",
                     eventSink = eventsRecorder,
                 ),
                 onInviteFriendsClick = it
             )
-            val text = rule.activity.getString(CommonStrings.action_invite_friends_to_app, "test")
-            rule.onNodeWithText(text).performClick()
+            val text = activity!!.getString(CommonStrings.action_invite_friends_to_app, "test")
+            onNodeWithText(text).performClick()
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on a user suggestion invokes the expected callback`() {
+    fun `clicking on a user suggestion invokes the expected callback`() = runAndroidComposeUiTest {
         val recentDirectRoomList = aRecentDirectRoomList()
         val firstRoom = recentDirectRoomList[0]
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnceWithParam(firstRoom.roomId) {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     userListState = aUserListState(
                         recentDirectRooms = recentDirectRoomList
@@ -99,42 +95,41 @@ class StartChatViewTest {
                 ),
                 onOpenDM = it
             )
-            rule.onNodeWithText(firstRoom.matrixUser.getBestName()).performClick()
+            onNodeWithText(firstRoom.matrixUser.getBestName()).performClick()
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on Join room by address invokes the expected callback`() {
+    fun `clicking on Join room by address invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
                 ),
                 onJoinRoomByAddressClick = it
             )
-            rule.clickOn(R.string.screen_start_chat_join_room_by_address_action)
+            clickOn(R.string.screen_start_chat_join_room_by_address_action)
         }
     }
 
     @Test
-    fun `clicking on room directory invokes the expected callback`() {
+    fun `clicking on room directory invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<StartChatEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setStartChatView(
+            setStartChatView(
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
-                    isRoomDirectorySearchEnabled = true
                 ),
                 onRoomDirectorySearchClick = it
             )
-            rule.clickOn(R.string.screen_room_directory_search_title)
+            clickOn(R.string.screen_room_directory_search_title)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setStartChatView(
+private fun AndroidComposeUiTest<ComponentActivity>.setStartChatView(
     state: StartChatState,
     onCloseClick: () -> Unit = EnsureNeverCalled(),
     onNewRoomClick: () -> Unit = EnsureNeverCalled(),
diff --git a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenterTest.kt b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenterTest.kt
index 4d958011a7..55fd30a84e 100644
--- a/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenterTest.kt
+++ b/features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/userlist/DefaultUserListPresenterTest.kt
@@ -40,7 +40,6 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.searchQuery.text.toString()).isEmpty()
             assertThat(initialState.isMultiSelectionEnabled).isFalse()
@@ -60,7 +59,6 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
             assertThat(initialState.searchQuery.text.toString()).isEmpty()
             assertThat(initialState.isMultiSelectionEnabled).isTrue()
@@ -80,7 +78,6 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
 
             initialState.eventSink(UserListEvents.OnSearchActiveChanged(true))
@@ -90,13 +87,11 @@ class DefaultUserListPresenterTest {
             initialState.searchQuery.setTextAndPlaceCursorAtEnd(matrixIdQuery)
             assertThat(awaitItem().searchQuery.text.toString()).isEqualTo(matrixIdQuery)
             assertThat(userRepository.providedQuery).isEqualTo(matrixIdQuery)
-            skipItems(1)
 
             val notMatrixIdQuery = "name"
             initialState.searchQuery.setTextAndPlaceCursorAtEnd(notMatrixIdQuery)
             assertThat(awaitItem().searchQuery.text.toString()).isEqualTo(notMatrixIdQuery)
             assertThat(userRepository.providedQuery).isEqualTo(notMatrixIdQuery)
-            skipItems(1)
 
             initialState.eventSink(UserListEvents.OnSearchActiveChanged(false))
             assertThat(awaitItem().isSearchActive).isFalse()
@@ -115,13 +110,12 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
 
             initialState.searchQuery.setTextAndPlaceCursorAtEnd("alice")
             assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
             assertThat(userRepository.providedQuery).isEqualTo("alice")
-            skipItems(2)
+            skipItems(1)
 
             // When the user repository emits a result, it's copied to the state
             val result = UserSearchResultState(
@@ -166,13 +160,12 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
 
             initialState.searchQuery.setTextAndPlaceCursorAtEnd("alice")
             assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
             assertThat(userRepository.providedQuery).isEqualTo("alice")
-            skipItems(2)
+            skipItems(1)
 
             // When the results list is empty, the state is set to NoResults
             userRepository.emitState(UserSearchResultState(results = emptyList(), isSearching = false))
@@ -190,7 +183,6 @@ class DefaultUserListPresenterTest {
                 FakeMatrixClient(),
             )
         presenter.test {
-            skipItems(1)
             val initialState = awaitItem()
 
             val userA = aMatrixUser("@userA:domain", "A")
diff --git a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileState.kt b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileState.kt
index 0e0016ee14..4de0d50ca4 100644
--- a/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileState.kt
+++ b/features/userprofile/api/src/main/kotlin/io/element/android/features/userprofile/api/UserProfileState.kt
@@ -13,6 +13,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 
 data class UserProfileState(
     val userId: UserId,
@@ -26,6 +27,7 @@ data class UserProfileState(
     val dmRoomId: RoomId?,
     val canCall: Boolean,
     val snackbarMessage: SnackbarMessage?,
+    val displayedStatus: DisplayedStatus?,
     val eventSink: (UserProfileEvents) -> Unit
 ) {
     enum class ConfirmationDialog {
diff --git a/features/userprofile/impl/build.gradle.kts b/features/userprofile/impl/build.gradle.kts
index 0b65441cc3..3e68fb2b9c 100644
--- a/features/userprofile/impl/build.gradle.kts
+++ b/features/userprofile/impl/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.mediaviewer.api)
+    implementation(projects.libraries.featureflag.api)
     implementation(projects.features.call.api)
     implementation(projects.features.enterprise.api)
     implementation(projects.features.verifysession.api)
@@ -46,6 +47,7 @@ dependencies {
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.mediaviewer.test)
+    testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.features.call.test)
     testImplementation(projects.features.verifysession.test)
     testImplementation(projects.features.startchat.test)
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt
index aaafbe04be..aff9e3502d 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/UserProfileFlowNode.kt
@@ -20,7 +20,7 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.userprofile.impl.root.UserProfileNode
@@ -86,7 +86,7 @@ class UserProfileFlowNode(
 
                     override fun startCall(dmRoomId: RoomId, callIntent: CallIntent) {
                         elementCallEntryPoint.startCall(
-                            CallType.RoomCall(
+                            CallData(
                                 sessionId = sessionId,
                                 roomId = dmRoomId,
                                 isAudioCall = callIntent == CallIntent.AUDIO
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt
index 7e09a03ec3..24977713c0 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfilePresenter.kt
@@ -145,6 +145,7 @@ class UserProfilePresenter(
             userId = userId,
             userName = userProfile?.displayName,
             avatarUrl = userProfile?.avatarUrl,
+            displayedStatus = userProfile?.displayedStatus,
             isBlocked = isBlocked.value,
             verificationState = UserProfileVerificationState.UNKNOWN,
             startDmActionState = startDmActionState.value,
diff --git a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
index 511effe750..bbdc698f17 100644
--- a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
+++ b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
@@ -324,7 +324,7 @@ class UserProfilePresenterTest {
     @Test
     fun `present - start DM action confirmation scenario - cancel`() = runTest {
         val matrixUser = MatrixUser(UserId("@alice:server.org"))
-        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser)
+        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser, false)
         val executeResult = lambdaRecorder<MatrixUser, Boolean, MutableState<AsyncAction<RoomId>>, Unit> { _, _, actionState ->
             actionState.value = startDMConfirmationResult
         }
@@ -354,7 +354,7 @@ class UserProfilePresenterTest {
     @Test
     fun `present - start DM action confirmation scenario - confirm`() = runTest {
         val matrixUser = MatrixUser(UserId("@alice:server.org"))
-        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser)
+        val startDMConfirmationResult = ConfirmingStartDmWithMatrixUser(matrixUser, false)
         val executeResult = lambdaRecorder<MatrixUser, Boolean, MutableState<AsyncAction<RoomId>>, Unit> { _, _, actionState ->
             actionState.value = startDMConfirmationResult
         }
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
index ac146a36a7..4f1c56e80e 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileHeaderSection.kt
@@ -37,10 +37,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.modifiers.niceClickable
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.theme.components.ButtonSize
 import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.ui.model.toText
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -55,6 +58,7 @@ fun UserProfileHeaderSection(
     openAvatarPreview: (url: String) -> Unit,
     onUserIdClick: () -> Unit,
     withdrawVerificationClick: () -> Unit,
+    displayedStatus: DisplayedStatus?,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -89,7 +93,16 @@ fun UserProfileHeaderSection(
                 style = ElementTheme.typography.fontHeadingLgBold,
                 textAlign = TextAlign.Center,
             )
-            Spacer(modifier = Modifier.height(6.dp))
+            Spacer(modifier = Modifier.height(12.dp))
+        }
+        displayedStatus?.let { status ->
+            Text(
+                text = status.toText(),
+                style = ElementTheme.typography.fontBodyLgMedium,
+                color = ElementTheme.colors.textSecondary,
+                textAlign = TextAlign.Center,
+            )
+            Spacer(modifier = Modifier.height(12.dp))
         }
         Text(
             modifier = Modifier.niceClickable { onUserIdClick() },
@@ -98,6 +111,7 @@ fun UserProfileHeaderSection(
             color = ElementTheme.colors.textSecondary,
             textAlign = TextAlign.Center,
         )
+        Spacer(modifier = Modifier.height(12.dp))
         when (verificationState) {
             UserProfileVerificationState.UNKNOWN, UserProfileVerificationState.UNVERIFIED -> Unit
             UserProfileVerificationState.VERIFIED -> {
@@ -140,8 +154,9 @@ internal fun UserProfileHeaderSectionPreview() = ElementPreview {
     UserProfileHeaderSection(
         avatarUrl = null,
         userId = UserId("@alice:example.com"),
-        userName = "Alice",
+        userName = USER_NAME_ALICE,
         verificationState = UserProfileVerificationState.VERIFIED,
+        displayedStatus = DisplayedStatus.InCall(0L),
         openAvatarPreview = {},
         onUserIdClick = {},
         withdrawVerificationClick = {},
@@ -154,8 +169,9 @@ internal fun UserProfileHeaderSectionWithVerificationViolationPreview() = Elemen
     UserProfileHeaderSection(
         avatarUrl = null,
         userId = UserId("@alice:example.com"),
-        userName = "Alice",
+        userName = USER_NAME_ALICE,
         verificationState = UserProfileVerificationState.VERIFICATION_VIOLATION,
+        displayedStatus = DisplayedStatus.InCall(0L),
         openAvatarPreview = {},
         onUserIdClick = {},
         withdrawVerificationClick = {},
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileStateProvider.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileStateProvider.kt
index 49a2fee4b5..4e25284753 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileStateProvider.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileStateProvider.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 
 open class UserProfileStateProvider : PreviewParameterProvider<UserProfileState> {
@@ -31,7 +32,7 @@ open class UserProfileStateProvider : PreviewParameterProvider<UserProfileState>
             aUserProfileState(isBlocked = AsyncData.Loading(true), verificationState = UserProfileVerificationState.UNKNOWN),
             aUserProfileState(startDmActionState = AsyncAction.Loading),
             aUserProfileState(canCall = true),
-            aUserProfileState(startDmActionState = ConfirmingStartDmWithMatrixUser(aMatrixUser())),
+            aUserProfileState(startDmActionState = ConfirmingStartDmWithMatrixUser(aMatrixUser(), isUserIdentityUnknown = false)),
             aUserProfileState(verificationState = UserProfileVerificationState.VERIFICATION_VIOLATION),
         )
 }
@@ -48,6 +49,7 @@ fun aUserProfileState(
     dmRoomId: RoomId? = null,
     canCall: Boolean = false,
     snackbarMessage: SnackbarMessage? = null,
+    displayedStatus: DisplayedStatus? = null,
     eventSink: (UserProfileEvents) -> Unit = {},
 ) = UserProfileState(
     userId = userId,
@@ -61,5 +63,6 @@ fun aUserProfileState(
     dmRoomId = dmRoomId,
     canCall = canCall,
     snackbarMessage = snackbarMessage,
+    displayedStatus = displayedStatus,
     eventSink = eventSink,
 )
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
index 380bb006ab..c5a661dbac 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
@@ -78,6 +78,7 @@ fun UserProfileView(
                 userId = state.userId,
                 userName = state.userName,
                 verificationState = state.verificationState,
+                displayedStatus = state.displayedStatus,
                 openAvatarPreview = { avatarUrl ->
                     openAvatarPreview(state.userName ?: state.userId.value, avatarUrl)
                 },
@@ -114,6 +115,7 @@ fun UserProfileView(
                     if (data is ConfirmingStartDmWithMatrixUser) {
                         CreateDmConfirmationBottomSheet(
                             matrixUser = data.matrixUser,
+                            isUserIdentityUnknown = data.isUserIdentityUnknown,
                             onSendInvite = {
                                 state.eventSink(UserProfileEvents.StartDM)
                             },
@@ -135,7 +137,7 @@ private fun VerifyUserSection(
 ) {
     if (state.verificationState == UserProfileVerificationState.UNVERIFIED) {
         ListItem(
-            headlineContent = { Text(stringResource(CommonStrings.common_verify_user)) },
+            content = { Text(stringResource(CommonStrings.common_verify_user)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Lock())),
             onClick = onVerifyClick,
         )
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserSection.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserSection.kt
index c3caffa7f3..30f8c28607 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserSection.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserSection.kt
@@ -80,15 +80,14 @@ private fun PreferenceBlockUser(
     }
     if (isBlocked.orFalse()) {
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_dm_details_unblock_user)) },
+            content = { Text(stringResource(R.string.screen_dm_details_unblock_user)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
             onClick = { if (!isLoading) eventSink(UserProfileEvents.UnblockUser(needsConfirmation = true)) },
             trailingContent = if (isLoading) ListItemContent.Custom(loadingCurrentValue) else null,
-            style = ListItemStyle.Primary,
         )
     } else {
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_dm_details_block_user)) },
+            content = { Text(stringResource(R.string.screen_dm_details_block_user)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Block())),
             style = ListItemStyle.Destructive,
             onClick = { if (!isLoading) eventSink(UserProfileEvents.BlockUser(needsConfirmation = true)) },
diff --git a/features/userprofile/shared/src/main/res/values-ca/translations.xml b/features/userprofile/shared/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..bacb920a58
--- /dev/null
+++ b/features/userprofile/shared/src/main/res/values-ca/translations.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_dm_details_block_alert_action">"Bloqueja"</string>
+  <string name="screen_dm_details_block_alert_description">"Els usuaris bloquejats no podran enviar-te missatges i tots els seus missatges s\'amagaran. Pots desbloquejar-los en qualsevol moment."</string>
+  <string name="screen_dm_details_block_user">"Bloqueja usuari"</string>
+  <string name="screen_dm_details_unblock_alert_action">"Desbloqueja"</string>
+  <string name="screen_dm_details_unblock_alert_description">"Podràs tornar a veure tots els seus missatges."</string>
+  <string name="screen_dm_details_unblock_user">"Desbloqueja usuari"</string>
+  <string name="screen_room_member_details_block_alert_action">"Bloqueja"</string>
+  <string name="screen_room_member_details_block_alert_description">"Els usuaris bloquejats no podran enviar-te missatges i tots els seus missatges s\'amagaran. Pots desbloquejar-los en qualsevol moment."</string>
+  <string name="screen_room_member_details_block_user">"Bloqueja usuari"</string>
+  <string name="screen_room_member_details_title">"Perfil"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"Desbloqueja"</string>
+  <string name="screen_room_member_details_unblock_alert_description">"Podràs tornar a veure tots els seus missatges."</string>
+  <string name="screen_room_member_details_unblock_user">"Desbloqueja usuari"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"Utilitza l\'aplicació web per verificar aquest usuari."</string>
+  <string name="screen_room_member_details_verify_button_title">"Verifica %1$s"</string>
+  <string name="screen_start_chat_error_starting_chat">"S\'ha produït un error en intentar iniciar un xat"</string>
+</resources>
diff --git a/features/userprofile/shared/src/main/res/values-ja/translations.xml b/features/userprofile/shared/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..33ba6b6a85
--- /dev/null
+++ b/features/userprofile/shared/src/main/res/values-ja/translations.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_dm_details_block_alert_action">"ブロック"</string>
+  <string name="screen_dm_details_block_alert_description">"ブロックしたユーザーのメッセージは非表示になり、新しく送信することもできません。ブロックはいつでも解除することができます。"</string>
+  <string name="screen_dm_details_block_user">"ユーザーをブロック"</string>
+  <string name="screen_dm_details_unblock_alert_action">"ブロックを解除"</string>
+  <string name="screen_dm_details_unblock_alert_description">"すべてのメッセージが再表示されます。"</string>
+  <string name="screen_dm_details_unblock_user">"ユーザーのブロックを解除"</string>
+  <string name="screen_room_member_details_block_alert_action">"ブロック"</string>
+  <string name="screen_room_member_details_block_alert_description">"ブロックしたユーザーのメッセージは非表示になり、新しく送信することもできません。ブロックはいつでも解除することができます。"</string>
+  <string name="screen_room_member_details_block_user">"ユーザーをブロック"</string>
+  <string name="screen_room_member_details_title">"プロフィール"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"ブロックを解除"</string>
+  <string name="screen_room_member_details_unblock_alert_description">"すべてのメッセージが再表示されます。"</string>
+  <string name="screen_room_member_details_unblock_user">"ユーザーのブロックを解除"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"このユーザーを検証するにはWeb版アプリを使用してください。"</string>
+  <string name="screen_room_member_details_verify_button_title">"%1$s を検証"</string>
+  <string name="screen_start_chat_error_starting_chat">"新しい会話を開始する際に問題が発生しました。"</string>
+</resources>
diff --git a/features/userprofile/shared/src/main/res/values-uk/translations.xml b/features/userprofile/shared/src/main/res/values-uk/translations.xml
index 40dfa190ba..8d50f5aeb7 100644
--- a/features/userprofile/shared/src/main/res/values-uk/translations.xml
+++ b/features/userprofile/shared/src/main/res/values-uk/translations.xml
@@ -13,7 +13,7 @@
   <string name="screen_room_member_details_unblock_alert_action">"Розблокувати"</string>
   <string name="screen_room_member_details_unblock_alert_description">"Ви знову зможете бачити всі повідомлення від них."</string>
   <string name="screen_room_member_details_unblock_user">"Розблокувати користувача"</string>
-  <string name="screen_room_member_details_verify_button_subtitle">"Використовуйте веб-додаток, щоб верифікувати цього користувача."</string>
-  <string name="screen_room_member_details_verify_button_title">"Перевірте %1$s"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"Використовуйте вебзастосунок, щоб звірити цього користувача."</string>
+  <string name="screen_room_member_details_verify_button_title">"Звірити %1$s"</string>
   <string name="screen_start_chat_error_starting_chat">"Під час спроби почати бесіду сталася помилка"</string>
 </resources>
diff --git a/features/userprofile/shared/src/main/res/values-vi/translations.xml b/features/userprofile/shared/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..122d8a2153
--- /dev/null
+++ b/features/userprofile/shared/src/main/res/values-vi/translations.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_dm_details_block_alert_action">"Chặn"</string>
+  <string name="screen_dm_details_block_alert_description">"Người dùng bị chặn sẽ không thể gửi tin nhắn cho bạn và tất cả tin nhắn của họ sẽ bị ẩn. Bạn có thể bỏ chặn họ bất cứ lúc nào."</string>
+  <string name="screen_dm_details_block_user">"Chặn người dùng"</string>
+  <string name="screen_dm_details_unblock_alert_action">"Bỏ chặn"</string>
+  <string name="screen_dm_details_unblock_alert_description">"Bạn sẽ có thể xem lại tất cả tin nhắn từ họ."</string>
+  <string name="screen_dm_details_unblock_user">"Bỏ chặn người dùng"</string>
+  <string name="screen_room_member_details_block_alert_action">"Chặn"</string>
+  <string name="screen_room_member_details_block_alert_description">"Người dùng bị chặn sẽ không thể gửi tin nhắn cho bạn và tất cả tin nhắn của họ sẽ bị ẩn. Bạn có thể bỏ chặn họ bất cứ lúc nào."</string>
+  <string name="screen_room_member_details_block_user">"Chặn người dùng"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"Bỏ chặn"</string>
+  <string name="screen_room_member_details_unblock_alert_description">"Bạn sẽ có thể xem lại tất cả tin nhắn từ họ."</string>
+  <string name="screen_room_member_details_unblock_user">"Bỏ chặn người dùng"</string>
+  <string name="screen_start_chat_error_starting_chat">"Đã xảy ra lỗi khi cố gắng bắt đầu cuộc trò chuyện"</string>
+</resources>
diff --git a/features/userprofile/shared/src/main/res/values-zh/translations.xml b/features/userprofile/shared/src/main/res/values-zh/translations.xml
index b1b37bdbdc..fd1906725d 100644
--- a/features/userprofile/shared/src/main/res/values-zh/translations.xml
+++ b/features/userprofile/shared/src/main/res/values-zh/translations.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_dm_details_block_alert_action">"封禁"</string>
-  <string name="screen_dm_details_block_alert_description">"被封禁的用户无法给你发消息，并且他们的消息会被隐藏。你可以随时解封。"</string>
-  <string name="screen_dm_details_block_user">"封禁用户"</string>
-  <string name="screen_dm_details_unblock_alert_action">"解封"</string>
+  <string name="screen_dm_details_block_alert_action">"屏蔽"</string>
+  <string name="screen_dm_details_block_alert_description">"被屏蔽的用户无法给你发消息，并且他们的消息会被隐藏。你可以随时解除屏蔽。"</string>
+  <string name="screen_dm_details_block_user">"屏蔽用户"</string>
+  <string name="screen_dm_details_unblock_alert_action">"解除屏蔽"</string>
   <string name="screen_dm_details_unblock_alert_description">"可以重新接收他们的消息。"</string>
-  <string name="screen_dm_details_unblock_user">"解封用户"</string>
-  <string name="screen_room_member_details_block_alert_action">"封禁"</string>
-  <string name="screen_room_member_details_block_alert_description">"被封禁的用户无法给你发消息，并且他们的消息会被隐藏。你可以随时解封。"</string>
-  <string name="screen_room_member_details_block_user">"封禁用户"</string>
+  <string name="screen_dm_details_unblock_user">"解除屏蔽用户"</string>
+  <string name="screen_room_member_details_block_alert_action">"屏蔽"</string>
+  <string name="screen_room_member_details_block_alert_description">"被屏蔽的用户无法给你发消息，并且他们的消息会被隐藏。你可以随时解除屏蔽。"</string>
+  <string name="screen_room_member_details_block_user">"屏蔽用户"</string>
   <string name="screen_room_member_details_title">"个人资料"</string>
-  <string name="screen_room_member_details_unblock_alert_action">"解封"</string>
+  <string name="screen_room_member_details_unblock_alert_action">"解除屏蔽"</string>
   <string name="screen_room_member_details_unblock_alert_description">"可以重新接收他们的消息。"</string>
-  <string name="screen_room_member_details_unblock_user">"解封用户"</string>
-  <string name="screen_room_member_details_verify_button_subtitle">"使用 Web 应用程序验证此用户。"</string>
+  <string name="screen_room_member_details_unblock_user">"解除屏蔽用户"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"使用 Web 客户端验证此用户。"</string>
   <string name="screen_room_member_details_verify_button_title">"验证 %1$s"</string>
   <string name="screen_start_chat_error_starting_chat">"在开始聊天时发生了错误"</string>
 </resources>
diff --git a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
index 83b10e2a53..63930affee 100644
--- a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
+++ b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.userprofile
 
 import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.hasTestTag
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.userprofile.api.UserProfileEvents
 import io.element.android.features.userprofile.api.UserProfileState
 import io.element.android.features.userprofile.api.UserProfileVerificationState
@@ -39,193 +41,187 @@ import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.ensureCalledOnceWithTwoParams
 import io.element.android.tests.testutils.pressBack
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class UserProfileViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class UserProfileViewTest : RobolectricTest() {
     @Test
-    fun `on back button click - the expected callback is called`() = runTest {
+    fun `on back button click - the expected callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 goBack = callback,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `on avatar clicked - the expected callback is called`() = runTest {
+    fun `on avatar clicked - the expected callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnceWithTwoParams(A_USER_NAME, AN_AVATAR_URL) { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 state = aUserProfileState(userName = A_USER_NAME, avatarUrl = AN_AVATAR_URL),
                 openAvatarPreview = callback,
             )
-            rule.onNode(hasTestTag(TestTags.memberDetailAvatar.value)).performClick()
+            onNode(hasTestTag(TestTags.memberDetailAvatar.value)).performClick()
         }
     }
 
     @Test
-    fun `on avatar clicked with no avatar - nothing happens`() = runTest {
+    fun `on avatar clicked with no avatar - nothing happens`() = runAndroidComposeUiTest {
         val callback = EnsureNeverCalledWithTwoParams<String, String>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(userName = A_USER_NAME, avatarUrl = null),
             openAvatarPreview = callback,
         )
-        rule.onNode(hasTestTag(TestTags.memberDetailAvatar.value)).performClick()
+        onNode(hasTestTag(TestTags.memberDetailAvatar.value)).performClick()
     }
 
     @Test
-    fun `on Share clicked - the expected callback is called`() = runTest {
+    fun `on Share clicked - the expected callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 onShareUser = callback,
             )
-            rule.clickOn(CommonStrings.action_share)
+            clickOn(CommonStrings.action_share)
         }
     }
 
     @Test
-    fun `on Message clicked - the StartDm event is emitted`() = runTest {
+    fun `on Message clicked - the StartDm event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 dmRoomId = A_ROOM_ID,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_message)
+        clickOn(CommonStrings.action_message)
         eventsRecorder.assertSingle(UserProfileEvents.StartDM)
     }
 
     @Test
-    fun `on Call clicked - the expected callback is called`() = runTest {
+    fun `on Call clicked - the expected callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnceWithTwoParams(A_ROOM_ID, CallIntent.AUDIO) { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 state = aUserProfileState(
                     dmRoomId = A_ROOM_ID,
                     canCall = true,
                 ),
                 onStartCall = callback,
             )
-            rule.clickOn(CommonStrings.action_call)
+            clickOn(CommonStrings.action_call)
         }
     }
 
     @Test
-    fun `on Video Call clicked - the expected callback is called`() = runTest {
+    fun `on Video Call clicked - the expected callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnceWithTwoParams(A_ROOM_ID, CallIntent.VIDEO) { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 state = aUserProfileState(
                     dmRoomId = A_ROOM_ID,
                     canCall = true,
                 ),
                 onStartCall = callback,
             )
-            rule.clickOn(CommonStrings.common_video)
+            clickOn(CommonStrings.common_video)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `on Block user clicked - a BlockUser event is emitted with needsConfirmation`() = runTest {
+    fun `on Block user clicked - a BlockUser event is emitted with needsConfirmation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_dm_details_block_user)
+        clickOn(R.string.screen_dm_details_block_user)
         eventsRecorder.assertSingle(UserProfileEvents.BlockUser(needsConfirmation = true))
     }
 
     @Test
-    fun `on confirming block user - a BlockUser event is emitted without needsConfirmation`() = runTest {
+    fun `on confirming block user - a BlockUser event is emitted without needsConfirmation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 displayConfirmationDialog = UserProfileState.ConfirmationDialog.Block,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_dm_details_block_alert_action)
+        clickOn(R.string.screen_dm_details_block_alert_action)
         eventsRecorder.assertSingle(UserProfileEvents.BlockUser(needsConfirmation = false))
     }
 
     @Test
-    fun `on canceling blocking a user - a ClearConfirmationDialog event is emitted`() = runTest {
+    fun `on canceling blocking a user - a ClearConfirmationDialog event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 displayConfirmationDialog = UserProfileState.ConfirmationDialog.Block,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(UserProfileEvents.ClearConfirmationDialog)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `on Unblock user clicked - an UnblockUser event is emitted with needsConfirmation`() = runTest {
+    fun `on Unblock user clicked - an UnblockUser event is emitted with needsConfirmation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 isBlocked = AsyncData.Success(true),
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_dm_details_unblock_user)
+        clickOn(R.string.screen_dm_details_unblock_user)
         eventsRecorder.assertSingle(UserProfileEvents.UnblockUser(needsConfirmation = true))
     }
 
     @Test
-    fun `on confirming Unblock user - an UnblockUser event is emitted without needsConfirmation`() = runTest {
+    fun `on confirming Unblock user - an UnblockUser event is emitted without needsConfirmation`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 isBlocked = AsyncData.Success(true),
                 displayConfirmationDialog = UserProfileState.ConfirmationDialog.Unblock,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(R.string.screen_dm_details_unblock_alert_action)
+        clickOn(R.string.screen_dm_details_unblock_alert_action)
         eventsRecorder.assertSingle(UserProfileEvents.UnblockUser(needsConfirmation = false))
     }
 
     @Test
-    fun `on canceling unblocking a user - a ClearConfirmationDialog event is emitted`() = runTest {
+    fun `on canceling unblocking a user - a ClearConfirmationDialog event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setUserProfileView(
+        setUserProfileView(
             state = aUserProfileState(
                 isBlocked = AsyncData.Success(true),
                 displayConfirmationDialog = UserProfileState.ConfirmationDialog.Unblock,
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(UserProfileEvents.ClearConfirmationDialog)
     }
 
     @Test
-    fun `on verify user clicked - the right callback is called`() = runTest {
+    fun `on verify user clicked - the right callback is called`() = runAndroidComposeUiTest {
         ensureCalledOnceWithParam(A_USER_ID) { callback ->
-            rule.setUserProfileView(
+            setUserProfileView(
                 state = aUserProfileState(userId = A_USER_ID, verificationState = UserProfileVerificationState.UNVERIFIED),
                 onVerifyClick = callback,
             )
-            rule.clickOn(CommonStrings.common_verify_user)
+            clickOn(CommonStrings.common_verify_user)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setUserProfileView(
+private fun AndroidComposeUiTest<ComponentActivity>.setUserProfileView(
     state: UserProfileState = aUserProfileState(
         eventSink = EventsRecorder(expectEvents = false),
     ),
diff --git a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogsTest.kt b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogsTest.kt
index 3219658796..b0a2590e8a 100644
--- a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogsTest.kt
+++ b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogsTest.kt
@@ -6,11 +6,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.userprofile.shared.blockuser
 
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.userprofile.api.UserProfileEvents
 import io.element.android.features.userprofile.api.UserProfileState
 import io.element.android.features.userprofile.shared.R
@@ -18,18 +19,14 @@ import io.element.android.features.userprofile.shared.aUserProfileState
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class BlockUserDialogsTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class BlockUserDialogsTest : RobolectricTest() {
     @Test
-    fun `confirm block user emit expected Event`() {
+    fun `confirm block user emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setContent {
+        setContent {
             BlockUserDialogs(
                 state = aUserProfileState(
                     displayConfirmationDialog = UserProfileState.ConfirmationDialog.Block,
@@ -37,14 +34,14 @@ class BlockUserDialogsTest {
                 )
             )
         }
-        rule.clickOn(R.string.screen_dm_details_block_alert_action)
+        clickOn(R.string.screen_dm_details_block_alert_action)
         eventsRecorder.assertSingle(UserProfileEvents.BlockUser(false))
     }
 
     @Test
-    fun `cancel block user emit expected Event`() {
+    fun `cancel block user emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setContent {
+        setContent {
             BlockUserDialogs(
                 state = aUserProfileState(
                     displayConfirmationDialog = UserProfileState.ConfirmationDialog.Block,
@@ -52,14 +49,14 @@ class BlockUserDialogsTest {
                 )
             )
         }
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(UserProfileEvents.ClearConfirmationDialog)
     }
 
     @Test
-    fun `confirm unblock user emit expected Event`() {
+    fun `confirm unblock user emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setContent {
+        setContent {
             BlockUserDialogs(
                 state = aUserProfileState(
                     displayConfirmationDialog = UserProfileState.ConfirmationDialog.Unblock,
@@ -67,14 +64,14 @@ class BlockUserDialogsTest {
                 )
             )
         }
-        rule.clickOn(R.string.screen_dm_details_unblock_alert_action)
+        clickOn(R.string.screen_dm_details_unblock_alert_action)
         eventsRecorder.assertSingle(UserProfileEvents.UnblockUser(false))
     }
 
     @Test
-    fun `cancel unblock user emit expected Event`() {
+    fun `cancel unblock user emit expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<UserProfileEvents>()
-        rule.setContent {
+        setContent {
             BlockUserDialogs(
                 state = aUserProfileState(
                     displayConfirmationDialog = UserProfileState.ConfirmationDialog.Unblock,
@@ -82,7 +79,7 @@ class BlockUserDialogsTest {
                 )
             )
         }
-        rule.clickOn(CommonStrings.action_cancel)
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(UserProfileEvents.ClearConfirmationDialog)
     }
 }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateProvider.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateProvider.kt
index 77f5af4a2e..895f78cbdc 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateProvider.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationStateProvider.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.verifysession.impl.incoming.IncomingVerificationState.Step
 import io.element.android.features.verifysession.impl.ui.aDecimalsSessionVerificationData
 import io.element.android.features.verifysession.impl.ui.aEmojisSessionVerificationData
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.FlowId
 import io.element.android.libraries.matrix.api.core.UserId
@@ -59,7 +60,7 @@ internal fun anIncomingSessionVerificationRequest() = VerificationRequest.Incomi
     details = SessionVerificationRequestDetails(
         senderProfile = MatrixUser(
             userId = UserId("@alice:example.com"),
-            displayName = "Alice",
+            displayName = USER_NAME_ALICE,
             avatarUrl = null,
         ),
         flowId = FlowId("1234"),
@@ -73,7 +74,7 @@ internal fun anIncomingUserVerificationRequest() = VerificationRequest.Incoming.
     details = SessionVerificationRequestDetails(
         senderProfile = MatrixUser(
             userId = UserId("@alice:example.com"),
-            displayName = "Alice",
+            displayName = USER_NAME_ALICE,
             avatarUrl = null,
         ),
         flowId = FlowId("1234"),
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateMachine.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateMachine.kt
index 7932ccc484..465fc20066 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateMachine.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationStateMachine.kt
@@ -46,7 +46,7 @@ class OutgoingVerificationStateMachine(
             inState<State.RequestingVerification> {
                 onEnterEffect { event ->
                     when (event.verificationRequest) {
-                        is VerificationRequest.Outgoing.CurrentSession -> sessionVerificationService.requestCurrentSessionVerification()
+                        is VerificationRequest.Outgoing.CurrentSession -> sessionVerificationService.requestDeviceVerification()
                         is VerificationRequest.Outgoing.User -> sessionVerificationService.requestUserVerification(event.verificationRequest.userId)
                     }
                 }
@@ -56,7 +56,7 @@ class OutgoingVerificationStateMachine(
             }
             inState<State.StartingSasVerification> {
                 onEnterEffect {
-                    sessionVerificationService.startVerification()
+                    sessionVerificationService.startSasVerification()
                 }
             }
             inState<State.VerificationRequestAccepted> {
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt
index 2dd2850174..9131ad63fb 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt
@@ -24,8 +24,10 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.focused
+import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -64,7 +66,8 @@ fun OutgoingVerificationView(
     fun cancelOrResetFlow() {
         when (step) {
             is Step.Canceled -> state.eventSink(OutgoingVerificationViewEvents.Reset)
-            Step.Initial, Step.Completed -> onBack()
+            Step.Initial -> onBack()
+            Step.Completed -> onFinish()
             Step.Ready, is Step.AwaitingOtherDeviceResponse -> state.eventSink(OutgoingVerificationViewEvents.Cancel)
             is Step.Verifying -> {
                 if (!step.state.isLoading()) {
@@ -94,7 +97,9 @@ fun OutgoingVerificationView(
                 TopAppBar(
                     title = {},
                     navigationIcon = {
-                        BackButton(onClick = ::cancelOrResetFlow)
+                        if (step !is Step.Completed) {
+                            BackButton(onClick = ::cancelOrResetFlow)
+                        }
                     },
                     colors = topAppBarColors(containerColor = Color.Transparent),
                 )
@@ -106,7 +111,7 @@ fun OutgoingVerificationView(
                 OutgoingVerificationBottomMenu(
                     state = state,
                     onCancelClick = ::cancelOrResetFlow,
-                    onContinueClick = onFinish,
+                    onDoneClick = onFinish,
                 )
             },
             isScrollable = true,
@@ -227,7 +232,11 @@ private fun ContentInitial(
         Text(
             modifier = Modifier
                 .clickable { onLearnMoreClick() }
-                .padding(vertical = 4.dp, horizontal = 16.dp),
+                .padding(vertical = 4.dp, horizontal = 16.dp)
+                .semantics {
+                    // Note: there is no Role.Link, so we use Role.Button for better accessibility support
+                    role = Role.Button
+                },
             text = stringResource(CommonStrings.action_learn_more),
             style = ElementTheme.typography.fontBodyLgMedium
         )
@@ -238,7 +247,7 @@ private fun ContentInitial(
 private fun OutgoingVerificationBottomMenu(
     state: OutgoingVerificationState,
     onCancelClick: () -> Unit,
-    onContinueClick: () -> Unit,
+    onDoneClick: () -> Unit,
 ) {
     val eventSink = state.eventSink
     when (val step = state.step) {
@@ -307,8 +316,8 @@ private fun OutgoingVerificationBottomMenu(
             VerificationBottomMenu {
                 Button(
                     modifier = Modifier.fillMaxWidth(),
-                    text = stringResource(CommonStrings.action_continue),
-                    onClick = onContinueClick,
+                    text = stringResource(CommonStrings.action_done),
+                    onClick = onDoneClick,
                 )
                 InvisibleButton()
             }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationContentVerifying.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationContentVerifying.kt
index 6fc593ffb2..891b2a108c 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationContentVerifying.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationContentVerifying.kt
@@ -35,6 +35,7 @@ import io.element.android.features.verifysession.impl.emoji.toEmojiResource
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.verification.SessionVerificationData
 import io.element.android.libraries.matrix.api.verification.VerificationEmoji
+import io.element.android.libraries.ui.strings.Strings
 
 @Composable
 internal fun VerificationContentVerifying(
@@ -49,7 +50,7 @@ internal fun VerificationContentVerifying(
     ) {
         when (data) {
             is SessionVerificationData.Decimals -> {
-                val text = data.decimals.joinToString(separator = " - ")
+                val text = data.decimals.joinToString(separator = Strings.NICE_SEPARATOR)
                 Text(
                     modifier = Modifier
                         .fillMaxWidth()
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
index edaadc583d..c398d72ddd 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
@@ -29,6 +29,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.matrix.api.core.UserId
@@ -86,7 +87,7 @@ internal fun VerificationUserProfileContentPreview() = ElementPreview(
     VerificationUserProfileContent(
         user = MatrixUser(
             userId = UserId("@alice:example.com"),
-            displayName = "Alice",
+            displayName = USER_NAME_ALICE,
             avatarUrl = "https://example.com/avatar.png",
         )
     )
diff --git a/features/verifysession/impl/src/main/res/values-be/translations.xml b/features/verifysession/impl/src/main/res/values-be/translations.xml
index a11cb7d607..375274c05e 100644
--- a/features/verifysession/impl/src/main/res/values-be/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-be/translations.xml
@@ -11,11 +11,11 @@
   <string name="screen_identity_use_another_device">"Выкарыстоўвайце іншую прыладу"</string>
   <string name="screen_identity_waiting_on_other_device">"Чаканне на іншай прыладзе…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Здаецца, нешта не так. Альбо час чакання запыту скончыўся, альбо запыт быў адхілены."</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"Пераканайцеся, што прыведзеныя ніжэй эмодзі супадаюць з эмодзі, паказанымі ў вашым іншым сеансе."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Пераканайцеся, што эмодзі ніжэй супадаюць з тымі, што паказаны на вашай іншай прыладзе."</string>
   <string name="screen_session_verification_compare_emojis_title">"Параўнайце эмодзі"</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Пераканайцеся, што прыведзеныя ніжэй лічбы супадаюць з лічбамі, паказанымі ў іншым сеансе."</string>
   <string name="screen_session_verification_compare_numbers_title">"Параўнайце лічбы"</string>
-  <string name="screen_session_verification_complete_subtitle">"Ваш новы сеанс пацверджаны. Ён мае доступ да вашых зашыфраваных паведамленняў, і іншыя карыстальнікі будуць лічыць яго давераным."</string>
+  <string name="screen_session_verification_complete_subtitle">"Цяпер вы можаце бяспечна чытаць або адпраўляць паведамленні на іншай прыладзе."</string>
   <string name="screen_session_verification_device_verified">"Прылада праверана"</string>
   <string name="screen_session_verification_enter_recovery_key">"Увядзіце ключ аднаўлення"</string>
   <string name="screen_session_verification_open_existing_session_subtitle">"Дакажыце, што гэта вы, каб атрымаць доступ да вашай зашыфраванай гісторыі паведамленняў."</string>
@@ -25,11 +25,11 @@
   <string name="screen_session_verification_positive_button_verifying_ongoing">"Чаканне супадзення"</string>
   <string name="screen_session_verification_ready_subtitle">"Параўнайце ўнікальны набор эмодзі."</string>
   <string name="screen_session_verification_request_accepted_subtitle">"Параўнайце ўнікальныя эмодзі, пераканаўшыся, што яны размешчаны ў тым жа парадку."</string>
-  <string name="screen_session_verification_request_success_subtitle">"Ваш новы сеанс пацверджаны. Ён мае доступ да вашых зашыфраваных паведамленняў, і іншыя карыстальнікі будуць лічыць яго давераным."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Цяпер вы можаце бяспечна чытаць або адпраўляць паведамленні на іншай прыладзе."</string>
   <string name="screen_session_verification_request_success_title">"Прылада праверана"</string>
   <string name="screen_session_verification_they_dont_match">"Яны не супадаюць"</string>
   <string name="screen_session_verification_they_match">"Яны супадаюць"</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Для працягу працы прыміце запыт на запуск працэсу праверкі ў іншым сеансе."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Чаканне прыняцця запыту"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выхад…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Выдаленне прылады…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-ca/translations.xml b/features/verifysession/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..d5ca8fb167
--- /dev/null
+++ b/features/verifysession/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"No pots confirmar-la?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Crea nova clau de recuperació"</string>
+  <string name="screen_identity_confirmation_subtitle">"Verifica aquest dispositiu per configurar missatges segurs."</string>
+  <string name="screen_identity_confirmation_title">"Confirma la teva identitat"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Utilitza un altre dispositiu"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Utilitza clau de recuperació"</string>
+  <string name="screen_identity_confirmed_subtitle">"Ara pots llegir o enviar missatges de manera segura, i qualsevol persona amb qui xategis també confiarà en aquest dispositiu."</string>
+  <string name="screen_identity_confirmed_title">"Dispositiu verificat"</string>
+  <string name="screen_identity_use_another_device">"Utilitza un altre dispositiu"</string>
+  <string name="screen_identity_waiting_on_other_device">"Esperant un altre dispositiu…"</string>
+  <string name="screen_session_verification_cancelled_subtitle">"Alguna cosa no ha anat bé. O bé s\'ha superat el temps màxim d\'espera de la sol·licitud o bé s\'ha denegat."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Verifica que les emoticones següents coincideixen amb les que es mostren a l\'altre dispositiu."</string>
+  <string name="screen_session_verification_compare_emojis_title">"Compara emoticones"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Verifica que les emoticones següents coincideixen amb les que es mostren al dispositiu de l\'altre usuari."</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Comprova que els números següents coincideixen amb els mostrats a l\'altra sessió."</string>
+  <string name="screen_session_verification_compare_numbers_title">"Compara números"</string>
+  <string name="screen_session_verification_complete_subtitle">"Ara ja pots enviar i llegir missatges de manera segura al teu altre dispositiu."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Ara pots confiar en la identitat d\'aquest usuari quan enviïs o rebis missatges."</string>
+  <string name="screen_session_verification_device_verified">"Dispositiu verificat"</string>
+  <string name="screen_session_verification_enter_recovery_key">"Introdueix clau de recuperació"</string>
+  <string name="screen_session_verification_failed_subtitle">"S\'ha esgotat el temps d\'espera de la sol·licitud, s\'ha denegat la sol·licitud o ha fallat la verificació."</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"Demostra que ets tu per poder accedir a l\'historial de missatges xifrats."</string>
+  <string name="screen_session_verification_open_existing_session_title">"Obre una sessió existent"</string>
+  <string name="screen_session_verification_positive_button_canceled">"Torna a intentar verificació"</string>
+  <string name="screen_session_verification_positive_button_initial">"Estic a punt"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"Esperant a que coincideixin…"</string>
+  <string name="screen_session_verification_ready_subtitle">"Compara un conjunt únic d\'emoticones."</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"Compara les emoticones i assegura\'t que apareixen en el mateix ordre."</string>
+  <string name="screen_session_verification_request_details_timestamp">"Sessió iniciada"</string>
+  <string name="screen_session_verification_request_failure_subtitle">"S\'ha esgotat el temps d\'espera de la sol·licitud, s\'ha denegat la sol·licitud o ha fallat la verificació."</string>
+  <string name="screen_session_verification_request_failure_title">"Error de verificació"</string>
+  <string name="screen_session_verification_request_footer">"Només continua si tu has iniciat aquesta verificació."</string>
+  <string name="screen_session_verification_request_subtitle">"Verifica l\'altre dispositiu per mantenir segur l\'historial de missatges."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Ara ja pots enviar i llegir missatges de manera segura al teu altre dispositiu."</string>
+  <string name="screen_session_verification_request_success_title">"Dispositiu verificat"</string>
+  <string name="screen_session_verification_request_title">"Verificació sol·licitada"</string>
+  <string name="screen_session_verification_they_dont_match">"No coincideixen"</string>
+  <string name="screen_session_verification_they_match">"Coincideixen"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Assegura\'t que tens l\'aplicació oberta a l\'altre dispositiu abans d\'inicar la verificació des d\'aquí."</string>
+  <string name="screen_session_verification_use_another_device_title">"Obre l\'aplicació en un altre dispositiu verificat"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Per a més seguretat, verifica aquest usuari comparant un conjunt d\'emoticones vostres dispositius. Fes-ho a través d\'un mitjà de comunicació fiable, o en persona."</string>
+  <string name="screen_session_verification_user_initiator_title">"Vols verificar aquest usuari?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Per a més seguretat, un altre usuari vol verificar la teva identitat. Se\'t mostrarà un conjunt d\'emoticones a comparar."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"Hauries de veure una finestra emergent a l\'altre dispositiu. Inicia, ara, la verificació des d\'allà."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Inicia la verificació a l\'altre dispositiu"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Inicia la verificació a l\'altre dispositiu"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Esperant a l\'altre usuari"</string>
+  <string name="screen_session_verification_waiting_subtitle">"Un cop acceptat, podràs continuar amb la verificació."</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"Per continuar, accepta la sol·licitud per iniciar el procés de verificació a l\'altra sessió."</string>
+  <string name="screen_session_verification_waiting_to_accept_title">"Esperant que s\'accepti la sol·licitud"</string>
+  <string name="screen_signout_in_progress_dialog_content">"S\'està tancant la sessió…"</string>
+</resources>
diff --git a/features/verifysession/impl/src/main/res/values-cs/translations.xml b/features/verifysession/impl/src/main/res/values-cs/translations.xml
index 5d0b28bc0a..3c3e68e1f0 100644
--- a/features/verifysession/impl/src/main/res/values-cs/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-cs/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nemůžete potvrdit?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Vytvoření nového klíče pro obnovení"</string>
-  <string name="screen_identity_confirmation_subtitle">"Ověřte toto zařízení a nastavte zabezpečené zasílání zpráv."</string>
-  <string name="screen_identity_confirmation_title">"Potvrďte, že jste to vy"</string>
+  <string name="screen_identity_confirmation_subtitle">"Vyberte způsob ověření pro nastavení zabezpečeného zasílání zpráv."</string>
+  <string name="screen_identity_confirmation_title">"Potvrďte svou digitální identitu"</string>
   <string name="screen_identity_confirmation_use_another_device">"Použít jiné zařízení"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Použít klíč pro obnovení"</string>
   <string name="screen_identity_confirmed_subtitle">"Nyní můžete bezpečně číst nebo odesílat zprávy, a kdokoli, s kým chatujete, může tomuto zařízení důvěřovat."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Potvrďte, že níže uvedená čísla odpovídají číslům zobrazeným na vaší druhé relaci."</string>
   <string name="screen_session_verification_compare_numbers_title">"Porovnejte čísla"</string>
   <string name="screen_session_verification_complete_subtitle">"Nyní můžete bezpečně číst nebo odesílat zprávy na svém druhém zařízení."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Nyní můžete důvěřovat identitě tohoto uživatele při odesílání nebo přijímání zpráv."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Nyní můžete při odesílání nebo přijímání zpráv důvěřovat digitální identitě tohoto uživatele."</string>
   <string name="screen_session_verification_device_verified">"Zařízení ověřeno"</string>
   <string name="screen_session_verification_enter_recovery_key">"Zadejte klíč pro obnovení"</string>
   <string name="screen_session_verification_failed_subtitle">"Buď vypršel časový limit požadavku, požadavek byl zamítnut, nebo došlo k nesouladu ověření."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Otevřete aplikaci na jiném ověřeném zařízení"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"Pro větší bezpečnost ověřte tohoto uživatele porovnáním sady emotikonů na svých zařízeních. Proveďte to pomocí důvěryhodného způsobu komunikace."</string>
   <string name="screen_session_verification_user_initiator_title">"Ověřte tohoto uživatele?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Pro větší bezpečnost chce jiný uživatel ověřit vaši identitu. Zobrazí se vám sada emotikonů k porovnání."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Z důvodu zvýšené bezpečnosti chce jiný uživatel ověřit vaši digitální identitu. Zobrazí se vám sada emodži, které je třeba porovnat."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Na druhém zařízení byste měli vidět vyskakovací okno. Začněte s ověrením tam."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Spusťte ověření na druhém zařízení"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Spusťte ověření na druhém zařízení"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Po přijetí budete moci pokračovat v ověřování."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Pro pokračování přijměte požadavek na zahájení ověření v jiné relaci."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Čekání na přijetí žádosti"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odhlašování…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odebírání zařízení…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-da/translations.xml b/features/verifysession/impl/src/main/res/values-da/translations.xml
index 32cdf159d5..90e227eae6 100644
--- a/features/verifysession/impl/src/main/res/values-da/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-da/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kan ikke bekræfte?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Opret en ny gendannelsesnøgle"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verificér denne enhed for at konfigurere sikre meddelelser."</string>
-  <string name="screen_identity_confirmation_title">"Bekræft din identitet"</string>
+  <string name="screen_identity_confirmation_subtitle">"Vælg, hvordan du vil verificere dig for at konfigurere sikre beskeder."</string>
+  <string name="screen_identity_confirmation_title">"Bekræft din digitale identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Brug en anden enhed"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Brug gendannelsesnøgle"</string>
   <string name="screen_identity_confirmed_subtitle">"Nu kan du læse eller sende beskeder sikkert, og enhver du samtaler med kan også stole på denne enhed."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Bekræft, at numrene nedenfor stemmer overens med dem, der vises på din anden session."</string>
   <string name="screen_session_verification_compare_numbers_title">"Sammenlign tal"</string>
   <string name="screen_session_verification_complete_subtitle">"Nu kan du læse eller sende beskeder sikkert med din anden enhed."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Nu kan du stole på identiteten af denne bruger, når I sender og modtager beskeder fra hinanden."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Nu kan du stole på denne brugers digitale identitet, når I sender eller modtager beskeder."</string>
   <string name="screen_session_verification_device_verified">"Enhed verificeret"</string>
   <string name="screen_session_verification_enter_recovery_key">"Indtast gendannelsesnøgle"</string>
   <string name="screen_session_verification_failed_subtitle">"Enten udløb anmodningen, den blev afvist, eller der var en fejl i verifikationen."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Åbn appen på en anden bekræftet enhed"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"For ekstra sikkerhed, verificér denne bruger ved at sammenligne et sæt emojier på jeres enheder. Gør dette ved at bruge en kommunikationsmetode i stoler på."</string>
   <string name="screen_session_verification_user_initiator_title">"Verificér denne bruger?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"For ekstra sikkerhed ønsker en anden bruger at bekræfte din identitet. Du får vist et sæt emojier til sammenligning."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"For ekstra sikkerhed ønsker en anden bruger at bekræfte din digitale identitet. I vil blive vist et sæt emojis, der skal sammenlignes."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Du burde se en popup på den anden enhed. Start verifikationen derfra nu."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Start verifikation på den anden enhed"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Start verifikation på den anden enhed"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Når du er blevet accepteret, kan du fortsætte med verifikationen."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Accepter anmodningen om at starte bekræftelsesprocessen i din anden session for at fortsætte."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Venter på at acceptere anmodningen"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logger ud…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Fjerner enhed…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-de/translations.xml b/features/verifysession/impl/src/main/res/values-de/translations.xml
index 377da35af3..2e46202dd4 100644
--- a/features/verifysession/impl/src/main/res/values-de/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-de/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Bestätigung unmöglich?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Erstelle einen neuen Wiederherstellungsschlüssel"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifiziere dieses Gerät, um sichere Chats einzurichten."</string>
-  <string name="screen_identity_confirmation_title">"Bestätige deine Identität"</string>
+  <string name="screen_identity_confirmation_subtitle">"Wähle eine Verifizierungsmethode, um den sicheren Nachrichtenversand einzurichten."</string>
+  <string name="screen_identity_confirmation_title">"Bestätige deine digitale Identität"</string>
   <string name="screen_identity_confirmation_use_another_device">"Ein anderes Gerät verwenden"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Wiederherstellungsschlüssel verwenden"</string>
   <string name="screen_identity_confirmed_subtitle">"Du kannst jetzt verschlüsselte Nachrichten lesen und versenden. Dein Chatpartner vertraut nun diesem Gerät."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Bestätige, dass die folgenden Zahlen mit denen in deiner anderen Sitzung übereinstimmen."</string>
   <string name="screen_session_verification_compare_numbers_title">"Vergleiche die Zahlen"</string>
   <string name="screen_session_verification_complete_subtitle">"Jetzt kannst du verschlüsselte Nachrichten sicher auf deinem anderen Gerät schreiben und lesen."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Jetzt kannst du der Identität dieses Nutzers vertrauen, wenn du Nachrichten sendest oder empfängst."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Jetzt kannst du beim Senden oder Empfangen von Nachrichten der digitalen Identität dieses Nutzers vertrauen."</string>
   <string name="screen_session_verification_device_verified">"Gerät verifiziert"</string>
   <string name="screen_session_verification_enter_recovery_key">"Wiederherstellungsschlüssel eingeben"</string>
   <string name="screen_session_verification_failed_subtitle">"Entweder ist die Anfrage abgelaufen, oder die Anfrage wurde abgelehnt, oder es gab eine Unstimmigkeit bei der Überprüfung."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Öffne die App auf einem anderen verifizierten Gerät"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"Verifiziere diesen Nutzer für zusätzliche Sicherheit durch den Vergleich einer Reihe von Emojis auf den Geräten. Verwende dazu einen vertraulichen Kommunikationskanal."</string>
   <string name="screen_session_verification_user_initiator_title">"Diesen Nutzer verifizieren?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Für zusätzliche Sicherheit möchte ein anderer Nutzer deine Identität verifizieren. Es werden dir einige Emojis zum Vergleich angezeigt."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Zur zusätzlichen Sicherheit möchte ein anderer Nutzer deine digitale Identität verifizieren. Dir werden einige Emojis zum Abgleich angezeigt."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Du solltest ein Popup-Fenster auf dem anderen Gerät sehen. Starte die Verifizierung von dort aus."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Starte die Verifizierung auf dem anderen Gerät"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Starte die Verifizierung auf dem anderen Gerät"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Nach der Bestätigung kannst du mit der Verifizierung fortfahren."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Akzeptiere die Anfrage für die Verifizierung in deiner anderen Sitzung um fortzufahren."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Warten auf die Annahme der Anfrage"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Abmelden…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Gerät wird entfernt…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-et/translations.xml b/features/verifysession/impl/src/main/res/values-et/translations.xml
index 2c43794b72..25cf6272fe 100644
--- a/features/verifysession/impl/src/main/res/values-et/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-et/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kas kinnitamine pole võimalik?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Loo uus taastevõti"</string>
-  <string name="screen_identity_confirmation_subtitle">"Krüptitud sõnumivahetuse tagamiseks verifitseeri see seade."</string>
-  <string name="screen_identity_confirmation_title">"Kinnita, et see oled sina"</string>
+  <string name="screen_identity_confirmation_subtitle">"Turvalise sõnumside seadistamiseks vali verifitseerimise viis."</string>
+  <string name="screen_identity_confirmation_title">"Kinnita oma digitaalne identiteet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Kasuta teist seadet"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Kasuta taastevõtit"</string>
   <string name="screen_identity_confirmed_subtitle">"Nüüd saad saata või lugeda sõnumeid turvaliselt ning kõik sinu vestluspartnerid võivad usaldada seda seadet."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Kinnita, et kõik järgnevalt kuvatud numbrid on täpselt samad, mida sa näed oma teises sessioonis."</string>
   <string name="screen_session_verification_compare_numbers_title">"Võrdle numbreid"</string>
   <string name="screen_session_verification_complete_subtitle">"Võid nüüd sõnumeid oma teises seadmes turvaliselt saata ja vastu võtta."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Nüüd sa võid sõnumite vastuvõtmisel ja saatmisel selle kasutaja identiteeti usaldada."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Nüüd sa võid sõnumite vastuvõtmisel ja saatmisel selle kasutaja digitaalset identiteeti usaldada."</string>
   <string name="screen_session_verification_device_verified">"Seade on verifitseeritud"</string>
   <string name="screen_session_verification_enter_recovery_key">"Sisesta taastevõti"</string>
   <string name="screen_session_verification_failed_subtitle">"Kas verifitseerimine aegus, teine osapool keeldus vastamast või tekkis vastuste mittevastavus."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Ava rakendus teises verifitseeritud seadmes"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"Lisaturvalisuse nimel verifitseeri seee kasutaja, võrreldes oma seadmetes olevaid emojisid. Tee seda, kasutades usaldusväärset suhtlusviisi."</string>
   <string name="screen_session_verification_user_initiator_title">"Kas verifitseerime selle kasutaja?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Lisaturvalisuse nimel soovib teine kasutaja sinu identiteeti verifitseerida. Järgmiseks näed sa emojisid, mida peate omavahel võrdlema."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Lisaturvalisuse nimel soovib teine kasutaja sinu digitaalse identiteeti verifitseerida. Järgmiseks näed sa emojisid, mida peate omavahel võrdlema."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Sa peaksid teises seadmes nägema hüpikakent. Palun alusta sealt verifitseerimist."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Alusta verifitseerimist teises seadmes"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Alusta verifitseerimist teises seadmes"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Kui oled nõustunud, siis saad sa verifitseerimist jätkata."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Jätkamaks nõustu verifitseerimisprotsessi alustamisega oma teises sessioonis."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Ootame nõustumist verifitseerimispäringuga"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Logime välja…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eemaldan seadet…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-fa/translations.xml b/features/verifysession/impl/src/main/res/values-fa/translations.xml
index ffc03e1f19..d68ec29229 100644
--- a/features/verifysession/impl/src/main/res/values-fa/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-fa/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"نمی‌توانید تأیید کنید؟"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"ایجاد کلید بازیابی جدید"</string>
-  <string name="screen_identity_confirmation_subtitle">"تأیید این افزاره برای برپایی پیام‌رسانی امن."</string>
-  <string name="screen_identity_confirmation_title">"تأیید هویتتان"</string>
+  <string name="screen_identity_confirmation_subtitle">"گزینش چگونگی تأیید برای برپایی پیام‌رسانی امن."</string>
+  <string name="screen_identity_confirmation_title">"تأیید هویت دیجیتالیتان"</string>
   <string name="screen_identity_confirmation_use_another_device">"استفاده از افزاره‌ای دیگر"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"استفاده از کلید بازیابی"</string>
   <string name="screen_identity_confirmed_subtitle">"اکنون می‌توانید پیام‌ها را به صورت امن فرستاده و بگیرید و هرکسی که با او گپ می‌زنید نیز می‌تواند به این افزاره اعتماد کند."</string>
@@ -13,6 +13,7 @@
   <string name="screen_session_verification_cancelled_subtitle">"يه چيزي درست به نظر نمياد یا زمان درخواست به پایان رسید یا درخواست رد شد."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"تأیید تطابق شکلک‌های زیر با شکلک‌های نشان داده شده روی افزارهٔ دیگرتان."</string>
   <string name="screen_session_verification_compare_emojis_title">"مقایسهٔ شکلک‌ها"</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"تأیید کنید که اعداد زیر با اعداد نشان داده شده در جلسه دیگر شما مطابقت دارند."</string>
   <string name="screen_session_verification_compare_numbers_title">"مقایسهٔ اعداد"</string>
   <string name="screen_session_verification_complete_subtitle">"اکنون می‌توانید روی افزارهٔ دیگرتان با امنیت پیام فرستاده و بخوانید."</string>
   <string name="screen_session_verification_device_verified">"افزاره تأیید شده"</string>
@@ -32,5 +33,5 @@
   <string name="screen_session_verification_they_match">"مطابقند"</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"برای ادامه، درخواست شروع فرآیند تأیید را در جلسه دیگر خود بپذیرید."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"منظر پذیرش درخواست"</string>
-  <string name="screen_signout_in_progress_dialog_content">"خارج شدن…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"برداشتن افزاره…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-hr/translations.xml b/features/verifysession/impl/src/main/res/values-hr/translations.xml
index a2ccb7ce0a..91fecd1744 100644
--- a/features/verifysession/impl/src/main/res/values-hr/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-hr/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Ne možete potvrditi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Izradi novi ključ za oporavak"</string>
-  <string name="screen_identity_confirmation_subtitle">"Potvrdite ovaj uređaj kako biste postavili sigurnu razmjenu poruka."</string>
-  <string name="screen_identity_confirmation_title">"Potvrdite svoj identitet"</string>
+  <string name="screen_identity_confirmation_subtitle">"Odaberite način potvrde za postavljanje sigurne razmjene poruka."</string>
+  <string name="screen_identity_confirmation_title">"Potvrdite svoj digitalni identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Upotrijebite drugi uređaj"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Upotrijebi ključ za oporavak"</string>
   <string name="screen_identity_confirmed_subtitle">"Sada možete sigurno čitati ili slati poruke, a svatko s kim razgovarate također može vjerovati ovom uređaju."</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Nakon prihvaćanja moći ćete nastaviti s potvrđivanjem."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Prihvatite zahtjev za pokretanje postupka provjere u drugoj sesiji kako biste nastavili."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Čekanje na prihvaćanje zahtjeva"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Odjavljivanje…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Uklanjanje uređaja…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-hu/translations.xml b/features/verifysession/impl/src/main/res/values-hu/translations.xml
index b7617168ee..666ff26af1 100644
--- a/features/verifysession/impl/src/main/res/values-hu/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-hu/translations.xml
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Az elfogadása után folytathatja az ellenőrzést."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"A folytatáshoz fogadja el az ellenőrzési folyamat indítási kérését a másik munkamenetében."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Várakozás a kérés elfogadására"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Kijelentkezés…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Eszköz eltávolítása…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-in/translations.xml b/features/verifysession/impl/src/main/res/values-in/translations.xml
index 021a528646..7c84cd5d05 100644
--- a/features/verifysession/impl/src/main/res/values-in/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-in/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Tidak dapat mengonfirmasi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Buat kunci pemulihan baru"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifikasi perangkat ini untuk menyiapkan perpesanan aman."</string>
+  <string name="screen_identity_confirmation_subtitle">"Pilih cara verifikasi untuk mengatur pengiriman pesan yang aman."</string>
   <string name="screen_identity_confirmation_title">"Konfirmasi bahwa ini Anda"</string>
   <string name="screen_identity_confirmation_use_another_device">"Gunakan perangkat lain"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Gunakan kunci pemulihan"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Setelah diterima, Anda akan dapat melanjutkan verifikasi."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Terima permintaan untuk memulai proses verifikasi di sesi Anda yang lain untuk melanjutkan."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Menunggu untuk menerima permintaan"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan dari akun…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Mengeluarkan device dari akun…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-it/translations.xml b/features/verifysession/impl/src/main/res/values-it/translations.xml
index 5b11c27cbe..2bb22e98f9 100644
--- a/features/verifysession/impl/src/main/res/values-it/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-it/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Non puoi confermare?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Crea una nuova chiave di recupero"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifica questo dispositivo per segnare i tuoi messaggi come sicuri."</string>
-  <string name="screen_identity_confirmation_title">"Conferma la tua identità"</string>
+  <string name="screen_identity_confirmation_subtitle">"Scegli come effettuare la verifica per configurare la messaggistica sicura."</string>
+  <string name="screen_identity_confirmation_title">"Conferma la tua identità digitale"</string>
   <string name="screen_identity_confirmation_use_another_device">"Usa un altro dispositivo"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Usa la chiave di recupero"</string>
   <string name="screen_identity_confirmed_subtitle">"Ora puoi leggere o inviare messaggi in tutta sicurezza e anche chi chatta con te può fidarsi di questo dispositivo."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Conferma che i numeri seguenti corrispondano a quelli mostrati nell\'altra sessione."</string>
   <string name="screen_session_verification_compare_numbers_title">"Confronta i numeri"</string>
   <string name="screen_session_verification_complete_subtitle">"Ora puoi leggere o inviare messaggi in modo sicuro sul tuo altro dispositivo."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Ora puoi fidarti dell\'identità di questo utente quando invii o ricevi messaggi."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Ora puoi fidarti dell\'identità digitale di questo utente quando invii o ricevi messaggi."</string>
   <string name="screen_session_verification_device_verified">"Dispositivo verificato"</string>
   <string name="screen_session_verification_enter_recovery_key">"Inserisci la chiave di recupero"</string>
   <string name="screen_session_verification_failed_subtitle">"La richiesta è scaduta, è stata rifiutata o c\'è stata una mancata corrispondenza nella verifica."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Apri l\'app su un altro dispositivo verificato"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"Per una maggiore sicurezza, verifica questo utente confrontando un set di emoji sui tuoi dispositivi. A tale scopo, utilizza un metodo di comunicazione affidabile."</string>
   <string name="screen_session_verification_user_initiator_title">"Verificare questo utente?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Per una maggiore sicurezza, un altro utente desidera verificare la tua identità. Ti verrà mostrato un set di emoji da confrontare."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Per maggiore sicurezza, un altro utente vuole verificare la tua identità digitale. Ti verrà mostrata una serie di emoji da confrontare."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Dovresti vedere un popup sull\'altro dispositivo. Inizia subito la verifica da lì."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Avvia la verifica sull\'altro dispositivo"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Avvia la verifica sull\'altro dispositivo"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Una volta accettata, potrai proseguire con la verifica."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Accetta la richiesta di avviare il processo di verifica nell\'altra sessione per continuare."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"In attesa di accettare la richiesta"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Disconnessione in corso…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Rimozione del dispositivo…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-ja/translations.xml b/features/verifysession/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..72360fda21
--- /dev/null
+++ b/features/verifysession/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"認証できませんか？"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"回復鍵を新規作成します"</string>
+  <string name="screen_identity_confirmation_subtitle">"安全なメッセージを設定するための検証方法を選択してください。"</string>
+  <string name="screen_identity_confirmation_title">"デジタルIDの認証"</string>
+  <string name="screen_identity_confirmation_use_another_device">"他の端末を使用"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"回復鍵を使用"</string>
+  <string name="screen_identity_confirmed_subtitle">"メッセージのやり取りを安全に行えるようになりました。他のユーザーはこの端末を信頼できます。"</string>
+  <string name="screen_identity_confirmed_title">"検証済みの端末"</string>
+  <string name="screen_identity_use_another_device">"他の端末を使用"</string>
+  <string name="screen_identity_waiting_on_other_device">"一方の端末を待機中…"</string>
+  <string name="screen_session_verification_cancelled_subtitle">"問題が発生しました。リクエストがタイムアウトまたは拒否されました。"</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"以下の絵文字が、もう一方の端末の表示と一致することを確認してください。"</string>
+  <string name="screen_session_verification_compare_emojis_title">"絵文字の比較"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"一方のユーザーの端末上に表示される絵文字と一致することを確認してください。"</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"もう一方のセッションと数字が一致することを確認してください。"</string>
+  <string name="screen_session_verification_compare_numbers_title">"数字を比較してください"</string>
+  <string name="screen_session_verification_complete_subtitle">"もう一方の端末でも、安全なメッセージのやり取りが可能になりました。"</string>
+  <string name="screen_session_verification_complete_user_subtitle">"メッセージのやり取りにおいて、このユーザーのデジタルIDを信頼できるようになりました。"</string>
+  <string name="screen_session_verification_device_verified">"検証済みの端末"</string>
+  <string name="screen_session_verification_enter_recovery_key">"回復鍵を入力"</string>
+  <string name="screen_session_verification_failed_subtitle">"リクエストがタイムアウトしたか、リクエストの拒否あるいは検証に不一致がありました。"</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"暗号化された過去のメッセージを確認するには本人検証が必要です。"</string>
+  <string name="screen_session_verification_open_existing_session_title">"既存のセッションを使用"</string>
+  <string name="screen_session_verification_positive_button_canceled">"検証を再試行"</string>
+  <string name="screen_session_verification_positive_button_initial">"検証を実行"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"一致を待機中…"</string>
+  <string name="screen_session_verification_ready_subtitle">"絵文字の組み合わせを比較してください。"</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"絵文字が双方で一致して表示されていることを確認してください。"</string>
+  <string name="screen_session_verification_request_details_timestamp">"サインイン済み"</string>
+  <string name="screen_session_verification_request_failure_subtitle">"リクエストがタイムアウトしたか、リクエストの拒否あるいは検証に不一致がありました。"</string>
+  <string name="screen_session_verification_request_failure_title">"検証に失敗しました"</string>
+  <string name="screen_session_verification_request_footer">"あなたが検証を開始した場合にのみ続行してください。"</string>
+  <string name="screen_session_verification_request_subtitle">"他の端末を検証して過去のメッセージの安全を保ってください。"</string>
+  <string name="screen_session_verification_request_success_subtitle">"もう一方の端末でも、安全なメッセージのやり取りが可能になりました。"</string>
+  <string name="screen_session_verification_request_success_title">"検証済みの端末"</string>
+  <string name="screen_session_verification_request_title">"検証をリクエスト済み"</string>
+  <string name="screen_session_verification_they_dont_match">"一致しません"</string>
+  <string name="screen_session_verification_they_match">"一致します"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"検証を開始する前に、他の端末でアプリケーションを開いてください。"</string>
+  <string name="screen_session_verification_use_another_device_title">"検証済みの他の端末でアプリケーションを開いてください"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"安全性を高めるために、絵文字の組み合わせを使用してこのユーザーを検証してください。これにより安全にやり取りを行うことができるようになります。"</string>
+  <string name="screen_session_verification_user_initiator_title">"このユーザーを検証しますか？"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"安全性を高めるために、相手ユーザーがあなたのデジタルIDを検証することを要求しています。比較用の絵文字の組み合わせが表示されます。"</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"一方の端末でポップアップが表示されます。そこから検証を開始してください。"</string>
+  <string name="screen_session_verification_waiting_another_device_title">"一方の端末で検証を開始してください"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"一方の端末で検証を開始してください"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"一方の端末を待機中"</string>
+  <string name="screen_session_verification_waiting_subtitle">"検証を承認することで続行できます。"</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"他の端末で検証リクエストを承認してください。"</string>
+  <string name="screen_session_verification_waiting_to_accept_title">"リクエストの承認を待機中"</string>
+  <string name="screen_signout_in_progress_dialog_content">"削除中…"</string>
+</resources>
diff --git a/features/verifysession/impl/src/main/res/values-ko/translations.xml b/features/verifysession/impl/src/main/res/values-ko/translations.xml
index 262a4d3052..493ac0d685 100644
--- a/features/verifysession/impl/src/main/res/values-ko/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-ko/translations.xml
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"아래 숫자가 다른 세션에 표시된 숫자와 일치하는지 확인하세요."</string>
   <string name="screen_session_verification_compare_numbers_title">"숫자 비교"</string>
   <string name="screen_session_verification_complete_subtitle">"이제 다른 기기에서도 안전하게 메시지를 읽거나 보낼 수 있습니다."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"이제 메시지를 보내거나 받을 때 이 사용자의 신원을 신뢰할 수 있습니다."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"이제 메시지를 주고받을 때 이 사용자의 디지털 신원을 신뢰할 수 있습니다."</string>
   <string name="screen_session_verification_device_verified">"기기 검증됨"</string>
   <string name="screen_session_verification_enter_recovery_key">"복구 키를 입력하세요"</string>
   <string name="screen_session_verification_failed_subtitle">"요청이 시간 초과되었거나, 요청이 거부되었거나, 검증 불일치가 발생했습니다."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"다른 검증된 장치에서 앱을 실행하세요"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"보안을 강화하려면, 기기에 표시된 이모티콘을 비교하여 이 사용자를 확인하세요. 신뢰할 수 있는 통신 수단을 사용하여 확인하시기 바랍니다."</string>
   <string name="screen_session_verification_user_initiator_title">"이 사용자를 검증하시겠습니까?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"추가 보안 위해 다른 사용자가 귀하의 신원을 확인하고자 합니다. 비교할 이모티콘 세트가 표시됩니다."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"보안 강화를 위해 상대방이 귀하의 디지털 신원을 확인하려고 합니다. 화면에 표시되는 이모지 세트가 서로 일치하는지 비교해 주세요."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"다른 기기에 팝업이 표시될 것입니다. 지금 그곳에서 확인을 시작하세요."</string>
   <string name="screen_session_verification_waiting_another_device_title">"다른 장치에서 검증 시작"</string>
   <string name="screen_session_verification_waiting_other_device_title">"다른 장치에서 검증 시작"</string>
diff --git a/features/verifysession/impl/src/main/res/values-nb/translations.xml b/features/verifysession/impl/src/main/res/values-nb/translations.xml
index 36a2e39c3d..388da1f287 100644
--- a/features/verifysession/impl/src/main/res/values-nb/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-nb/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Kan du ikke bekrefte?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Opprett en ny gjenopprettingsnøkkel"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verifiser denne enheten for å sette opp sikker meldingsutveksling."</string>
+  <string name="screen_identity_confirmation_subtitle">"Velg hvordan du vil verifisere deg for å sette opp sikker meldingsutveksling."</string>
   <string name="screen_identity_confirmation_title">"Bekreft din digitale identitet"</string>
   <string name="screen_identity_confirmation_use_another_device">"Bruk en annen enhet"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Bruk gjenopprettingsnøkkel"</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Kontroller at tallene nedenfor stemmer overens med dem som vises på den andre sesjonen."</string>
   <string name="screen_session_verification_compare_numbers_title">"Sammenlign tallene"</string>
   <string name="screen_session_verification_complete_subtitle">"Nå kan du lese eller sende meldinger sikkert på den andre enheten din."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Nå kan du stole på identiteten til denne brukeren når du sender eller mottar meldinger."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Nå kan du stole på den digitale identiteten til denne brukeren når du sender eller mottar meldinger."</string>
   <string name="screen_session_verification_device_verified">"Enhet verifisert"</string>
   <string name="screen_session_verification_enter_recovery_key">"Skriv inn gjenopprettingsnøkkel"</string>
   <string name="screen_session_verification_failed_subtitle">"Enten ble forespørselen tidsavbrutt, forespørselen ble avslått eller det var en feil i verifiseringen."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Åpne appen på en annen bekreftet enhet"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"For ekstra sikkerhet, verifiser denne brukeren ved å sammenligne et sett med emojier på enhetene dine. Gjør dette ved å bruke en pålitelig måte å kommunisere på."</string>
   <string name="screen_session_verification_user_initiator_title">"Vil du verifisere denne brukeren?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"For ekstra sikkerhet vil en annen bruker bekrefte identiteten din. Du får se et sett med emojier som du må sammenligne."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"For ekstra sikkerhet ønsker en annen bruker å bekrefte din digitale identitet. Du vil se et sett med emojier du kan sammenligne."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Du skal se en popup på den andre enheten. Start bekreftelsen derfra nå."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Start verifiseringen på den andre enheten"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Start verifiseringen på den andre enheten"</string>
diff --git a/features/verifysession/impl/src/main/res/values-pl/translations.xml b/features/verifysession/impl/src/main/res/values-pl/translations.xml
index 92b0572d08..39ce9f6fa3 100644
--- a/features/verifysession/impl/src/main/res/values-pl/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pl/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nie możesz potwierdzić?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Utwórz nowy klucz przywracania"</string>
-  <string name="screen_identity_confirmation_subtitle">"Zweryfikuj to urządzenie, aby skonfigurować bezpieczne przesyłanie wiadomości."</string>
-  <string name="screen_identity_confirmation_title">"Potwierdź, że to Ty"</string>
+  <string name="screen_identity_confirmation_subtitle">"Wybierz sposób weryfikacji, aby skonfigurować bezpieczne wiadomości."</string>
+  <string name="screen_identity_confirmation_title">"Potwierdź swoją tożsamość cyfrową"</string>
   <string name="screen_identity_confirmation_use_another_device">"Użyj innego urządzenia"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Użyj klucza przywracania"</string>
   <string name="screen_identity_confirmed_subtitle">"Teraz możesz bezpiecznie czytać i wysyłać wiadomości, każdy z kim czatujesz również może ufać temu urządzeniu."</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Po zaakceptowaniu będziesz mógł kontynuować weryfikację."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Zaakceptuj prośbę o rozpoczęcie procesu weryfikacji w innej sesji, aby kontynuować."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Oczekiwanie na zaakceptowanie prośby"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Wylogowywanie…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Usuwam urządzenie…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml b/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
index 591c482ca6..30db294efa 100644
--- a/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pt-rBR/translations.xml
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Depois de aceito, você poderá continuar com a verificação."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Aceite a solicitação para iniciar o processo de verificação na sua outra sessão para continuar."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Aguardando para aceitar a solicitação"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Saindo…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Removendo dispositivo…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-pt/translations.xml b/features/verifysession/impl/src/main/res/values-pt/translations.xml
index bf32d3c7b9..2bbda1497a 100644
--- a/features/verifysession/impl/src/main/res/values-pt/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-pt/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_identity_confirmation_cannot_confirm">"Não é possível confirmar?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Criar uma nova chave de recuperação"</string>
   <string name="screen_identity_confirmation_subtitle">"Verifica este dispositivo para configurar o envio seguro de mensagens."</string>
-  <string name="screen_identity_confirmation_title">"Confirma que és tu"</string>
+  <string name="screen_identity_confirmation_title">"Confirma a tua identidade digital"</string>
   <string name="screen_identity_confirmation_use_another_device">"Utilizar outro dispositivo"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Utilizar chave de recuperação"</string>
   <string name="screen_identity_confirmed_subtitle">"Agora podes ler ou enviar mensagens de forma segura, e qualquer pessoa com quem converses também pode confiar neste dispositivo."</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Uma vez aceite, poderás continuar com a verificação."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Para continuar, aceita o pedido de verificação na tua outra sessão."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"À aguardar a aceitação do pedido"</string>
-  <string name="screen_signout_in_progress_dialog_content">"A terminar sessão…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"A remover dispositivo…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-ro/translations.xml b/features/verifysession/impl/src/main/res/values-ro/translations.xml
index 0d1ddd0530..25f897d954 100644
--- a/features/verifysession/impl/src/main/res/values-ro/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-ro/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Nu puteți confirma?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Creați o nouă cheie de recuperare"</string>
-  <string name="screen_identity_confirmation_subtitle">"Verificați acest dispozitiv pentru a configura mesagerie securizată."</string>
-  <string name="screen_identity_confirmation_title">"Confirmați că sunteți dumneavoastră"</string>
+  <string name="screen_identity_confirmation_subtitle">"Alegeți cum doriți să vă verificați pentru a configura mesageria securizată."</string>
+  <string name="screen_identity_confirmation_title">"Confirmați-vă identitatea digitală"</string>
   <string name="screen_identity_confirmation_use_another_device">"Utilizați un alt dispozitiv"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Utilizați cheia de recuperare"</string>
   <string name="screen_identity_confirmed_subtitle">"Acum puteți citi sau trimite mesaje în siguranță, iar oricine cu care conversați poate avea încredere în acest dispozitiv."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Confirmați că numerele de mai jos se potrivesc cu cele afișate în cealaltă sesiune."</string>
   <string name="screen_session_verification_compare_numbers_title">"Comparați numerele"</string>
   <string name="screen_session_verification_complete_subtitle">"Noua dumneavoastră sesiune este acum verificată. Are acces la mesajele dumneavoastră criptate, iar ceilalti utilizatori vă vor vedea ca fiind de încredere."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Acum puteți avea încredere în identitatea acestui utilizator atunci când trimiteți sau primiți mesaje."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Acum puteți avea încredere în identitatea digitală a acestui utilizator atunci când trimiteți sau primiți mesaje."</string>
   <string name="screen_session_verification_device_verified">"Dispozitiv verificat"</string>
   <string name="screen_session_verification_enter_recovery_key">"Introduceți cheia de recuperare"</string>
   <string name="screen_session_verification_failed_subtitle">"Fie cererea a expirat, cererea a fost respinsă, fie a existat o nepotrivire de verificare."</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"Deschideți aplicația pe un alt dispozitiv verificat"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"Pentru securitate suplimentară, verificați acest utilizator comparând un set de emoji-uri pe dispozitivele dvs. Faceți acest lucru utilizând o metodă de comunicare de încredere."</string>
   <string name="screen_session_verification_user_initiator_title">"Verificați acest utilizator?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Pentru o securitate suplimentară, un alt utilizator dorește să vă verifice identitatea. Vi se va afișa un set de emoji-uri pentru comparație."</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Pentru o securitate sporită, un alt utilizator dorește să vă verifice identitatea digitală. Vi se va afișa un set de emoji-uri pentru comparație."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Ar trebui să vedeți o fereastră pop-up pe celălalt dispozitiv. Începeți verificarea de acolo acum."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Începeți verificarea pe celălalt dispozitiv"</string>
   <string name="screen_session_verification_waiting_other_device_title">"Începeți verificarea pe celălalt dispozitiv"</string>
diff --git a/features/verifysession/impl/src/main/res/values-ru/translations.xml b/features/verifysession/impl/src/main/res/values-ru/translations.xml
index 8672229640..d90cd71386 100644
--- a/features/verifysession/impl/src/main/res/values-ru/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-ru/translations.xml
@@ -2,11 +2,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Не можете подтвердить?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Создайте новый ключ восстановления"</string>
-  <string name="screen_identity_confirmation_subtitle">"Подтвердите это устройство, чтобы настроить безопасный обмен сообщениями."</string>
+  <string name="screen_identity_confirmation_subtitle">"Выберите способ подтверждения для настройки защищенного обмена сообщениями."</string>
   <string name="screen_identity_confirmation_title">"Подтвердите личность"</string>
   <string name="screen_identity_confirmation_use_another_device">"Использовать другое устройство"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Использовать ключ восстановления"</string>
-  <string name="screen_identity_confirmed_subtitle">"Теперь вы можете безопасно читать и отправлять сообщения, и все, с кем вы общаетесь в чате, также могут доверять этому устройству."</string>
+  <string name="screen_identity_confirmed_subtitle">"Теперь Вы можете безопасно читать и отправлять сообщения, и все, с кем Вы общаетесь в чате, также могут доверять этому устройству."</string>
   <string name="screen_identity_confirmed_title">"Устройство проверено"</string>
   <string name="screen_identity_use_another_device">"Использовать другое устройство"</string>
   <string name="screen_identity_waiting_on_other_device">"Ожидание другого устройства…"</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Убедитесь, что приведенные ниже числа совпадают с цифрами, показанными в другом сеансе."</string>
   <string name="screen_session_verification_compare_numbers_title">"Сравните числа"</string>
   <string name="screen_session_verification_complete_subtitle">"Теперь вы можете безопасно читать или отправлять сообщения на новом устройстве."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Теперь вы можете доверять сообщениям этого пользователя."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Теперь ты можешь доверять цифровой идентичности этого пользователя при отправке или получении сообщений."</string>
   <string name="screen_session_verification_device_verified">"Устройство проверено"</string>
   <string name="screen_session_verification_enter_recovery_key">"Введите ключ восстановления"</string>
   <string name="screen_session_verification_failed_subtitle">"Время ожидания подтверждения истекло, запрос был отклонён, или произошла ошибка."</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"После принятия запроса вы сможете продолжить проверку."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Чтобы продолжить, примите запрос на запуск процесса подтверждения в другом сеансе."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Ожидание принятия запроса"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Выполняется выход…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Удаление устройства…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-sk/translations.xml b/features/verifysession/impl/src/main/res/values-sk/translations.xml
index 932b8555fc..d4e6f60402 100644
--- a/features/verifysession/impl/src/main/res/values-sk/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sk/translations.xml
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"Po prijatí budete môcť pokračovať v overovaní."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Ak chcete pokračovať, prijmite žiadosť o spustenie procesu overenia vo vašej druhej relácii."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Čaká sa na prijatie žiadosti"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Prebieha odhlasovanie…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Odoberanie zariadenia…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-sv/translations.xml b/features/verifysession/impl/src/main/res/values-sv/translations.xml
index 100f4964da..9f4008d0a4 100644
--- a/features/verifysession/impl/src/main/res/values-sv/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-sv/translations.xml
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"När det har accepterats kommer du kunna fortsätta verifieringen."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Godkänn begäran om att starta verifieringsprocessen på din andra session för att fortsätta."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Väntar på att acceptera begäran"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Loggar ut …"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Tar bort enhet …"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-uk/translations.xml b/features/verifysession/impl/src/main/res/values-uk/translations.xml
index 1967fef383..a81fdd3395 100644
--- a/features/verifysession/impl/src/main/res/values-uk/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-uk/translations.xml
@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Не можете підтвердити?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Створити новий ключ відновлення"</string>
-  <string name="screen_identity_confirmation_subtitle">"Верифікуйте цей пристрій, щоб налаштувати безпечний обмін повідомленнями."</string>
-  <string name="screen_identity_confirmation_title">"Підтвердьте, що це ви"</string>
+  <string name="screen_identity_confirmation_subtitle">"Виберіть спосіб звіряння, щоб налаштувати безпечний обмін повідомленнями."</string>
+  <string name="screen_identity_confirmation_title">"Підтвердьте свою цифрову ідентичність"</string>
   <string name="screen_identity_confirmation_use_another_device">"Використовуйте інший пристрій"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Використовуйте ключ відновлення"</string>
   <string name="screen_identity_confirmed_subtitle">"Тепер ви можете безпечно читати або надсилати повідомлення, і кожен, з ким ви спілкуєтесь, також може довіряти цьому пристрою."</string>
-  <string name="screen_identity_confirmed_title">"Пристрій перевірено"</string>
+  <string name="screen_identity_confirmed_title">"Пристрій звірено"</string>
   <string name="screen_identity_use_another_device">"Використовуйте інший пристрій"</string>
   <string name="screen_identity_waiting_on_other_device">"Чекає на інше пристрій…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"Щось не так. Або час очікування запиту минув, або в запиті було відмовлено."</string>
@@ -17,38 +17,38 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Переконайтеся, що наведені нижче цифри збігаються з тими, що показані під час вашого іншого сеансу."</string>
   <string name="screen_session_verification_compare_numbers_title">"Порівняйте цифри"</string>
   <string name="screen_session_verification_complete_subtitle">"Тепер ви можете безпечно читати або надсилати повідомлення на іншому пристрої."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Тепер ви можете довіряти особистості цього користувача під час надсилання або отримання повідомлень."</string>
-  <string name="screen_session_verification_device_verified">"Пристрій перевірено"</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Відтепер ви можете довіряти цифровій ідентичності цього користувача під час надсилання або отримання повідомлень"</string>
+  <string name="screen_session_verification_device_verified">"Пристрій звірено"</string>
   <string name="screen_session_verification_enter_recovery_key">"Введіть ключ відновлення"</string>
-  <string name="screen_session_verification_failed_subtitle">"Або час очікування запиту минув, або запит було відхилено, або виникла розбіжність у верифікації."</string>
+  <string name="screen_session_verification_failed_subtitle">"Або час очікування запиту минув, або запит було відхилено, або виникла розбіжність у звірянні."</string>
   <string name="screen_session_verification_open_existing_session_subtitle">"Доведіть, що це ви, щоб отримати доступ до історії зашифрованих повідомлень."</string>
   <string name="screen_session_verification_open_existing_session_title">"Відкрийте активний сеанс"</string>
-  <string name="screen_session_verification_positive_button_canceled">"Повторити верифікацію"</string>
+  <string name="screen_session_verification_positive_button_canceled">"Повторити звіряння"</string>
   <string name="screen_session_verification_positive_button_initial">"У мене все готово"</string>
   <string name="screen_session_verification_positive_button_verifying_ongoing">"Очікування збігу"</string>
   <string name="screen_session_verification_ready_subtitle">"Порівняйте унікальний набір емоджі."</string>
   <string name="screen_session_verification_request_accepted_subtitle">"Порівняйте унікальні емоджі, переконавшись, що вони показані в однаковому порядку."</string>
   <string name="screen_session_verification_request_details_timestamp">"Увійшов"</string>
-  <string name="screen_session_verification_request_failure_subtitle">"Або час очікування запиту минув, або запит було відхилено, або виникла розбіжність у верифікації."</string>
-  <string name="screen_session_verification_request_failure_title">"Перевірка не вдалася"</string>
-  <string name="screen_session_verification_request_footer">"Продовжуйте, лише якщо ви ініціювали цю перевірку."</string>
-  <string name="screen_session_verification_request_subtitle">"Перевірте інший пристрій, щоб захистити історію повідомлень."</string>
+  <string name="screen_session_verification_request_failure_subtitle">"Або час очікування запиту минув, або запит було відхилено, або виникла розбіжність у звірянні."</string>
+  <string name="screen_session_verification_request_failure_title">"Не вдалося звірити"</string>
+  <string name="screen_session_verification_request_footer">"Продовжуйте, лише якщо ви ініціювали це звіряння."</string>
+  <string name="screen_session_verification_request_subtitle">"Звірте інший пристрій, щоб захистити історію повідомлень."</string>
   <string name="screen_session_verification_request_success_subtitle">"Тепер ви можете безпечно читати або надсилати повідомлення на іншому пристрої."</string>
-  <string name="screen_session_verification_request_success_title">"Пристрій перевірено"</string>
-  <string name="screen_session_verification_request_title">"Запитано на верифікацію"</string>
+  <string name="screen_session_verification_request_success_title">"Пристрій звірено"</string>
+  <string name="screen_session_verification_request_title">"Запит на звіряння"</string>
   <string name="screen_session_verification_they_dont_match">"Вони не збігаються"</string>
   <string name="screen_session_verification_they_match">"Вони збігаються"</string>
-  <string name="screen_session_verification_use_another_device_subtitle">"Перш ніж починати перевірку звідси, переконайтеся, що програму відкрито на іншому пристрої."</string>
-  <string name="screen_session_verification_use_another_device_title">"Відкрийте додаток на іншому перевіреному пристрої"</string>
-  <string name="screen_session_verification_user_initiator_subtitle">"Для додаткової безпеки верифікуйте цього користувача, порівнявши набір емоджі на ваших пристроях. Зробіть це, використовуючи надійний спосіб спілкування."</string>
-  <string name="screen_session_verification_user_initiator_title">"Верифікувати цього користувача?"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"Для додаткової безпеки інший користувач хоче верифікувати вашу особистість. Вам буде показано набір емоджі для порівняння."</string>
-  <string name="screen_session_verification_waiting_another_device_subtitle">"Ви повинні побачити спливаюче вікно на іншому пристрої. Почніть перевірку звідти."</string>
-  <string name="screen_session_verification_waiting_another_device_title">"Почніть перевірку на іншому пристрої"</string>
-  <string name="screen_session_verification_waiting_other_device_title">"Почніть перевірку на іншому пристрої"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Перш ніж розпочати звіряння звідси, переконайтеся, що ви відкрили застосунок на іншому пристрої."</string>
+  <string name="screen_session_verification_use_another_device_title">"Відкрийте застосунок на іншому звіреному пристрої"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Для додаткової безпеки звірте цього користувача, порівнявши набір емоджі на ваших пристроях. Зробіть це, використовуючи надійний спосіб спілкування."</string>
+  <string name="screen_session_verification_user_initiator_title">"Звірити цього користувача?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Для додаткової безпеки інший користувач хоче звірити вашу цифрову ідентичність. Вам буде показано набір емодзі для порівняння."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"На іншому пристрої має з’явитися спливне вікно. Розпочніть звіряння звідти."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Розпочати звіряння на іншому пристрої"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Розпочати звіряння на іншому пристрої"</string>
   <string name="screen_session_verification_waiting_other_user_title">"Очікування іншого користувача"</string>
-  <string name="screen_session_verification_waiting_subtitle">"Після погодження ви зможете продовжити верифікацію."</string>
-  <string name="screen_session_verification_waiting_to_accept_subtitle">"Щоб продовжити, прийміть запит на початок процесу верифікації в іншому сеансі."</string>
+  <string name="screen_session_verification_waiting_subtitle">"Після схвалення ви зможете продовжити звіряння."</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"Прийміть запит, щоб розпочати процес звіряння в іншому сеансі та продовжити роботу."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Очікування на прийняття запиту"</string>
-  <string name="screen_signout_in_progress_dialog_content">"Вихід…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Видалення пристрою…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-uz/translations.xml b/features/verifysession/impl/src/main/res/values-uz/translations.xml
index 26ba7393df..3753b13ec7 100644
--- a/features/verifysession/impl/src/main/res/values-uz/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-uz/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"Tasdiqlay olmayapsizmi?"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"Yangi tiklash kalitini yarating"</string>
-  <string name="screen_identity_confirmation_subtitle">"Xavfsiz xabarlashuvni sozlash uchun ushbu qurilmani tasdiqlang."</string>
-  <string name="screen_identity_confirmation_title">"Shaxsingizni tasdiqlang"</string>
+  <string name="screen_identity_confirmation_subtitle">"Xavfsiz xabar almashinuvni sozlash uchun tasdiqlash usulini tanlang."</string>
+  <string name="screen_identity_confirmation_title">"Raqamli shaxsingizni tasdiqlang"</string>
   <string name="screen_identity_confirmation_use_another_device">"Boshqa qurilmadan foydalanish"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"Qayta tiklash kalitidan foydalaning"</string>
   <string name="screen_identity_confirmed_subtitle">"Endi xabarlarni xavfsiz tarzda o‘qish yoki yuborish imkoniyatiga egasiz, shuningdek, siz bilan muloqot qilayotgan har qanday kishi ham bu qurilmaga ishonch bildirishi mumkin."</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"Quyidagi raqamlarning boshqa sessiyangizda koʻrsatilgan raqamlarga mos kelishini tasdiqlang."</string>
   <string name="screen_session_verification_compare_numbers_title">"Sonlarni taqqoslash"</string>
   <string name="screen_session_verification_complete_subtitle">"Endi xabarlarni boshqa qurilmangizda xavfsiz o‘qish yoki yuborishingiz mumkin."</string>
-  <string name="screen_session_verification_complete_user_subtitle">"Endi xabarlarni yuborish yoki qabul qilishda bu foydalanuvchining shaxsiga ishonishingiz mumkin."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Endi xabarlarni yuborish yoki qabul qilishda bu foydalanuvchining raqamli identifikatoriga ishonishingiz mumkin."</string>
   <string name="screen_session_verification_device_verified">"Qurilma tasdiqlandi"</string>
   <string name="screen_session_verification_enter_recovery_key">"Tiklash kalitini kiriting"</string>
   <string name="screen_session_verification_failed_subtitle">"So‘rov vaqti tugab qoldi, so‘rov rad etildi yoki tekshiruv mos kelmadi."</string>
diff --git a/features/verifysession/impl/src/main/res/values-vi/translations.xml b/features/verifysession/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..4a4b27ab2a
--- /dev/null
+++ b/features/verifysession/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Không thể xác nhận?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Tạo khóa khôi phục mới"</string>
+  <string name="screen_identity_confirmation_subtitle">"Chọn phương thức xác minh để bật nhắn tin bảo mật."</string>
+  <string name="screen_identity_confirmation_title">"Xác nhận danh tính kỹ thuật số của bạn"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Dùng thiết bị khác"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Sử dụng khóa khôi phục"</string>
+  <string name="screen_identity_confirmed_subtitle">"Giờ đây bạn có thể đọc và gửi tin nhắn một cách an toàn, và những người bạn trò chuyện cũng có thể tin tưởng thiết bị này."</string>
+  <string name="screen_identity_confirmed_title">"Thiết bị được xác thực"</string>
+  <string name="screen_identity_use_another_device">"Dùng thiết bị khác"</string>
+  <string name="screen_identity_waiting_on_other_device">"Đang chờ trên thiết bị khác…"</string>
+  <string name="screen_session_verification_cancelled_subtitle">"Có vẻ như có điều gì đó không đúng. Hoặc yêu cầu đã hết thời gian chờ hoặc yêu cầu đã bị từ chối."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Hãy xác nhận rằng các biểu tượng cảm xúc bên dưới khớp với các biểu tượng hiển thị trên thiết bị khác của bạn."</string>
+  <string name="screen_session_verification_compare_emojis_title">"So sánh các biểu tượng cảm xúc"</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Xác nhận rằng các số bên dưới khớp với số hiển thị trên thiết bị đăng nhập khác của bạn."</string>
+  <string name="screen_session_verification_compare_numbers_title">"So sánh số liệu"</string>
+  <string name="screen_session_verification_complete_subtitle">"Giờ đây, bạn có thể đọc hoặc gửi tin nhắn một cách an toàn trên thiết bị khác của mình."</string>
+  <string name="screen_session_verification_device_verified">"Thiết bị được xác thực"</string>
+  <string name="screen_session_verification_enter_recovery_key">"Nhập mã khôi phục."</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"Hãy chứng minh đó là bạn để truy cập vào lịch sử tin nhắn đã mã hóa của bạn."</string>
+  <string name="screen_session_verification_open_existing_session_title">"Mở một phiên hiện có"</string>
+  <string name="screen_session_verification_positive_button_canceled">"Thử xác minh lại"</string>
+  <string name="screen_session_verification_positive_button_initial">"Tôi đã sẵn sàng"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"Đang chờ ghép đôi…"</string>
+  <string name="screen_session_verification_ready_subtitle">"So sánh một bộ biểu tượng cảm xúc duy nhất."</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"So sánh các biểu tượng cảm xúc riêng biệt, đảm bảo chúng xuất hiện theo cùng một thứ tự."</string>
+  <string name="screen_session_verification_request_failure_title">"Xác minh thất bại"</string>
+  <string name="screen_session_verification_request_success_subtitle">"Giờ đây, bạn có thể đọc hoặc gửi tin nhắn một cách an toàn trên thiết bị khác của mình."</string>
+  <string name="screen_session_verification_request_success_title">"Thiết bị được xác thực"</string>
+  <string name="screen_session_verification_they_dont_match">"Chúng không khớp nhau"</string>
+  <string name="screen_session_verification_they_match">"Chúng khớp với nhau"</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"Hãy chấp nhận yêu cầu bắt đầu quá trình xác minh trong phiên làm việc khác của bạn để tiếp tục."</string>
+  <string name="screen_session_verification_waiting_to_accept_title">"Đang chờ chấp nhận yêu cầu"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Đang gỡ thiết bị…"</string>
+</resources>
diff --git a/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml b/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml
index 658e5242f6..5472fba56e 100644
--- a/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh-rTW/translations.xml
@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"無法確認？"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"建立新的復原金鑰"</string>
-  <string name="screen_identity_confirmation_subtitle">"驗證這部裝置以設定安全通訊。"</string>
-  <string name="screen_identity_confirmation_title">"確認這是你本人"</string>
+  <string name="screen_identity_confirmation_subtitle">"選擇驗證方式以設定安全訊息傳遞。"</string>
+  <string name="screen_identity_confirmation_title">"確認您的數位身份"</string>
   <string name="screen_identity_confirmation_use_another_device">"使用另一部裝置"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"使用復原金鑰"</string>
   <string name="screen_identity_confirmed_subtitle">"您可以安全地讀取和發送訊息了，與您聊天的人也可以信任這部裝置。"</string>
@@ -17,7 +17,7 @@
   <string name="screen_session_verification_compare_numbers_subtitle">"確認以下數字是否與其他作業階段中顯示的數字相符。"</string>
   <string name="screen_session_verification_compare_numbers_title">"比較數字"</string>
   <string name="screen_session_verification_complete_subtitle">"現在您可以在其他裝置上安全地閱讀或傳送訊息。"</string>
-  <string name="screen_session_verification_complete_user_subtitle">"現在，您可以在傳送或接收訊息時信任此使用者的身份。"</string>
+  <string name="screen_session_verification_complete_user_subtitle">"現在，您可以在傳送或接收訊息時信任此使用者的數位身份。"</string>
   <string name="screen_session_verification_device_verified">"裝置已驗證"</string>
   <string name="screen_session_verification_enter_recovery_key">"輸入復原金鑰"</string>
   <string name="screen_session_verification_failed_subtitle">"請求逾時、請求被拒或是驗證不符。"</string>
@@ -42,7 +42,7 @@
   <string name="screen_session_verification_use_another_device_title">"在另外一個已驗證的裝置上開啟應用程式"</string>
   <string name="screen_session_verification_user_initiator_subtitle">"為了提昇安全性，請透過比較您裝置上的一組表情符號來驗證此使用者。請透過可信的通訊方式來執行此動作。"</string>
   <string name="screen_session_verification_user_initiator_title">"驗證此使用者？"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"為了提昇安全性，另一個使用者希望驗證您的身份。您將會看到一組表情符號以進行比較。"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"為了強化安全性，另一位使用者希望驗證您的數位身分。系統將顯示一組表情符號供您比對。"</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"您應該會在其他裝置上看到一個彈出式視窗。立刻從那裡開始驗證。"</string>
   <string name="screen_session_verification_waiting_another_device_title">"在其他裝置上開始驗證"</string>
   <string name="screen_session_verification_waiting_other_device_title">"在其他裝置上開始驗證"</string>
@@ -50,5 +50,5 @@
   <string name="screen_session_verification_waiting_subtitle">"接受後，您就可以繼續進行驗證。"</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"準備開始驗證，請到您的其他工作階段接受請求。"</string>
   <string name="screen_session_verification_waiting_to_accept_title">"等待接受請求"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除裝置……"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-zh/translations.xml b/features/verifysession/impl/src/main/res/values-zh/translations.xml
index 54b6de5d68..61b7b078dd 100644
--- a/features/verifysession/impl/src/main/res/values-zh/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh/translations.xml
@@ -2,53 +2,53 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_identity_confirmation_cannot_confirm">"无法确认？"</string>
   <string name="screen_identity_confirmation_create_new_recovery_key">"创建新的恢复密钥"</string>
-  <string name="screen_identity_confirmation_subtitle">"验证此设备以开始安全地收发消息。"</string>
-  <string name="screen_identity_confirmation_title">"确认这是你"</string>
-  <string name="screen_identity_confirmation_use_another_device">"使用其他设备"</string>
+  <string name="screen_identity_confirmation_subtitle">"选择验证方式以设置安全的消息传输。"</string>
+  <string name="screen_identity_confirmation_title">"确认你的数字身份"</string>
+  <string name="screen_identity_confirmation_use_another_device">"使用其它设备"</string>
   <string name="screen_identity_confirmation_use_recovery_key">"使用恢复密钥"</string>
-  <string name="screen_identity_confirmed_subtitle">"现在，您可以安全地阅读或发送消息，与您聊天的人也会信任此设备。"</string>
+  <string name="screen_identity_confirmed_subtitle">"现在你可以安全地读取或发送消息，并且与你聊天的任何人也可以信任此设备。"</string>
   <string name="screen_identity_confirmed_title">"设备已验证"</string>
-  <string name="screen_identity_use_another_device">"使用其他设备"</string>
-  <string name="screen_identity_waiting_on_other_device">"正在等待其他设备……"</string>
+  <string name="screen_identity_use_another_device">"使用其它设备"</string>
+  <string name="screen_identity_waiting_on_other_device">"正在等待其它设备…"</string>
   <string name="screen_session_verification_cancelled_subtitle">"发生了一些错误。网络请求超时，或者被服务器拒绝。"</string>
-  <string name="screen_session_verification_compare_emojis_subtitle">"确认下面的表情符号与您其他设备上显示的表情符号相匹配。"</string>
-  <string name="screen_session_verification_compare_emojis_title">"比较表情符号"</string>
-  <string name="screen_session_verification_compare_emojis_user_subtitle">"请验证下方表情是否与对方设备显示一致"</string>
-  <string name="screen_session_verification_compare_numbers_subtitle">"确认以下数字与其他会话中显示的一致。"</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"确认以下 Emoji 与你的其它设备上显示的相匹配。"</string>
+  <string name="screen_session_verification_compare_emojis_title">"比较 Emoji"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"请验证以下 Emoji 是否与对方设备显示的一致"</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"确认以下数字与其它会话中显示的一致。"</string>
   <string name="screen_session_verification_compare_numbers_title">"比较数字"</string>
-  <string name="screen_session_verification_complete_subtitle">"现在您可以在其他设备上安全地阅读或发送消息。"</string>
-  <string name="screen_session_verification_complete_user_subtitle">"现在您可以在发送或接收消息时信任该用户的身份。"</string>
+  <string name="screen_session_verification_complete_subtitle">"现在可以在其它设备上安全地阅读或发送消息。"</string>
+  <string name="screen_session_verification_complete_user_subtitle">"现在可以在发送或接收消息时信任该用户的数字身份。"</string>
   <string name="screen_session_verification_device_verified">"设备已验证"</string>
   <string name="screen_session_verification_enter_recovery_key">"输入恢复密钥"</string>
   <string name="screen_session_verification_failed_subtitle">"要么请求超时，要么请求被拒绝，要么验证不匹配。"</string>
-  <string name="screen_session_verification_open_existing_session_subtitle">"证明自己的身份以访问加密历史消息。"</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"证明身份以访问加密消息历史。"</string>
   <string name="screen_session_verification_open_existing_session_title">"打开已有会话"</string>
   <string name="screen_session_verification_positive_button_canceled">"重试验证"</string>
   <string name="screen_session_verification_positive_button_initial">"准备就绪"</string>
-  <string name="screen_session_verification_positive_button_verifying_ongoing">"等待比对……"</string>
-  <string name="screen_session_verification_ready_subtitle">"比较一组表情符号。"</string>
-  <string name="screen_session_verification_request_accepted_subtitle">"比较表情符号，确保它们以相同顺序排列。"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"正在等待对比…"</string>
+  <string name="screen_session_verification_ready_subtitle">"比较一组唯一的 Emoji。"</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"比较唯一的 Emoji，确保它们以相同顺序排列。"</string>
   <string name="screen_session_verification_request_details_timestamp">"已登录"</string>
   <string name="screen_session_verification_request_failure_subtitle">"要么请求超时，要么请求被拒绝，要么验证不匹配。"</string>
   <string name="screen_session_verification_request_failure_title">"验证失败"</string>
   <string name="screen_session_verification_request_footer">"仅在你发起此验证后才继续。"</string>
-  <string name="screen_session_verification_request_subtitle">"验证另一台设备以确保您的消息历史记录保密。"</string>
-  <string name="screen_session_verification_request_success_subtitle">"现在您可以在其他设备上安全地阅读或发送消息。"</string>
+  <string name="screen_session_verification_request_subtitle">"验证另一台设备以确保消息历史的安全。"</string>
+  <string name="screen_session_verification_request_success_subtitle">"现在可以在其它设备上安全地阅读或发送消息。"</string>
   <string name="screen_session_verification_request_success_title">"设备已验证"</string>
   <string name="screen_session_verification_request_title">"已请求验证"</string>
   <string name="screen_session_verification_they_dont_match">"不匹配"</string>
   <string name="screen_session_verification_they_match">"匹配"</string>
-  <string name="screen_session_verification_use_another_device_subtitle">"从此处开始验证之前，请确保您已在其他设备上打开了该应用程序。"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"从此处开始验证之前请确保你已在其它设备上打开了 app。"</string>
   <string name="screen_session_verification_use_another_device_title">"在另一台验证的设备上打开应用"</string>
-  <string name="screen_session_verification_user_initiator_subtitle">"为了提高安全性，请通过比较设备上的一组表情符号来验证此用户。通过使用安全方式来做到这一点，如面对面。"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"为提高安全性，请通过比较设备上的一组 Emoji 以验证此用户。通过使用安全的方式比如面对面来实施此步骤。"</string>
   <string name="screen_session_verification_user_initiator_title">"验证此用户？"</string>
-  <string name="screen_session_verification_user_responder_subtitle">"为了提高安全性，另一位用户想要验证您的身份。您将看到一组表情符号供您比较。"</string>
-  <string name="screen_session_verification_waiting_another_device_subtitle">"您应该会在另一台设备上看到一个弹出窗口。现在从那里开始验证。"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"为提高安全性，另一用户想要验证你的数字身份。你将看到一组 Emoij 供你比较。"</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"你应该会在另一台设备上看到一个弹出窗口。现在从该处开始验证。"</string>
   <string name="screen_session_verification_waiting_another_device_title">"在另一台设备上开始验证"</string>
   <string name="screen_session_verification_waiting_other_device_title">"在另一台设备上开始验证"</string>
-  <string name="screen_session_verification_waiting_other_user_title">"等待其他用户"</string>
-  <string name="screen_session_verification_waiting_subtitle">"一旦被接受，您将能够继续进行验证。"</string>
-  <string name="screen_session_verification_waiting_to_accept_subtitle">"请在其他会话中接受验证请求。"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"正在等待其他用户"</string>
+  <string name="screen_session_verification_waiting_subtitle">"一旦被接受，你将能够继续进行验证。"</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"接受此请求以在另一会话中开始验证流程以继续操作。"</string>
   <string name="screen_session_verification_waiting_to_accept_title">"等待接受请求"</string>
-  <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
+  <string name="screen_signout_in_progress_dialog_content">"正在移除设备…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt
index c9b9e25b74..a8d3802268 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationPresenterTest.kt
@@ -99,6 +99,7 @@ class IncomingVerificationPresenterTest {
             emojiState.eventSink(IncomingVerificationViewEvents.ConfirmVerification)
             val emojiWaitingItem = awaitItem()
             assertThat((emojiWaitingItem.step as IncomingVerificationState.Step.Verifying).isWaiting).isTrue()
+            advanceUntilIdle()
             approveVerificationLambda.assertions().isCalledOnce()
             // Remote confirm that the emojis match
             fakeSessionVerificationService.emitVerificationFlowState(
@@ -161,6 +162,7 @@ class IncomingVerificationPresenterTest {
             emojiState.eventSink(IncomingVerificationViewEvents.DeclineVerification)
             val emojiWaitingItem = awaitItem()
             assertThat((emojiWaitingItem.step as IncomingVerificationState.Step.Verifying).isWaiting).isTrue()
+            advanceUntilIdle()
             declineVerificationLambda.assertions().isCalledOnce()
             // Remote confirm that there is a failure
             fakeSessionVerificationService.emitVerificationFlowState(
@@ -260,6 +262,7 @@ class IncomingVerificationPresenterTest {
             emojiState.eventSink(IncomingVerificationViewEvents.GoBack)
             val emojiWaitingItem = awaitItem()
             assertThat((emojiWaitingItem.step as IncomingVerificationState.Step.Verifying).isWaiting).isTrue()
+            advanceUntilIdle()
             declineVerificationLambda.assertions().isCalledOnce()
             // Remote confirm that there is a failure
             fakeSessionVerificationService.emitVerificationFlowState(
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewTest.kt
index 4aa63f3ab8..5947d1d0a5 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationViewTest.kt
@@ -6,71 +6,68 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.verifysession.impl.incoming
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.verifysession.impl.R
 import io.element.android.features.verifysession.impl.ui.aEmojisSessionVerificationData
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class IncomingVerificationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class IncomingVerificationViewTest : RobolectricTest() {
     // region step Initial
     @Test
-    fun `back key pressed - ignore the verification`() {
+    fun `back key pressed - ignore the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = aStepInitial(),
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
     @Test
-    fun `ignore incoming verification emits the expected event`() {
+    fun `ignore incoming verification emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = aStepInitial(),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_ignore)
+        clickOn(CommonStrings.action_ignore)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.IgnoreVerification)
     }
 
     @Test
-    fun `start incoming verification emits the expected event`() {
+    fun `start incoming verification emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = aStepInitial(),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_start_verification)
+        clickOn(CommonStrings.action_start_verification)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.StartVerification)
     }
 
     @Test
-    fun `back key pressed - when awaiting response cancels the verification`() {
+    fun `back key pressed - when awaiting response cancels the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = aStepInitial(
                     isWaiting = true,
@@ -78,16 +75,16 @@ class IncomingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
     // endregion step Initial
 
     // region step Verifying
     @Test
-    fun `back key pressed - when ready to verify cancels the verification`() {
+    fun `back key pressed - when ready to verify cancels the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -96,14 +93,14 @@ class IncomingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
     @Test
-    fun `back key pressed - when verifying and loading emits the expected event`() {
+    fun `back key pressed - when verifying and loading emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -112,14 +109,14 @@ class IncomingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
     @Test
-    fun `clicking on they do not match emits the expected event`() {
+    fun `clicking on they do not match emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -128,14 +125,14 @@ class IncomingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_session_verification_they_dont_match)
+        clickOn(R.string.screen_session_verification_they_dont_match)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.DeclineVerification)
     }
 
     @Test
-    fun `clicking on they match emits the expected event`() {
+    fun `clicking on they match emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -144,35 +141,35 @@ class IncomingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_session_verification_they_match)
+        clickOn(R.string.screen_session_verification_they_match)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.ConfirmVerification)
     }
     // endregion
 
     // region step Failure
     @Test
-    fun `back key pressed - when failure resets the flow`() {
+    fun `back key pressed - when failure resets the flow`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Failure,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
     @Test
-    fun `click on done - when failure resets the flow`() {
+    fun `click on done - when failure resets the flow`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Failure,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_done)
+        clickOn(CommonStrings.action_done)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
@@ -180,33 +177,33 @@ class IncomingVerificationViewTest {
 
     // region step Completed
     @Test
-    fun `back key pressed - on Completed step emits the expected event`() {
+    fun `back key pressed - on Completed step emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Completed,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
 
     @Test
-    fun `when flow is completed and the user clicks on the done button, the expected event is emitted`() {
+    fun `when flow is completed and the user clicks on the done button, the expected event is emitted`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<IncomingVerificationViewEvents>()
-        rule.setIncomingVerificationView(
+        setIncomingVerificationView(
             anIncomingVerificationState(
                 step = IncomingVerificationState.Step.Completed,
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_done)
+        clickOn(CommonStrings.action_done)
         eventsRecorder.assertSingle(IncomingVerificationViewEvents.GoBack)
     }
     // endregion
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setIncomingVerificationView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setIncomingVerificationView(
         state: IncomingVerificationState,
     ) {
         setContent {
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenterTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenterTest.kt
index f02f24c9ef..c6cbfca281 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenterTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationPresenterTest.kt
@@ -6,6 +6,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:Suppress("UnusedImports")
+
 package io.element.android.features.verifysession.impl.outgoing
 
 import app.cash.turbine.ReceiveTurbine
@@ -27,6 +29,8 @@ import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -50,11 +54,11 @@ class OutgoingVerificationPresenterTest {
 
     @Test
     fun `present - Handles requestVerification for session verification`() = runTest {
-        val requestSessionVerificationRecorder = lambdaRecorder<Unit> {}
-        val startVerificationRecorder = lambdaRecorder<Unit> {}
+        val requestDeviceVerificationRecorder = lambdaRecorder<Unit> {}
+        val startSasVerificationRecorder = lambdaRecorder<Unit> {}
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = requestSessionVerificationRecorder,
-            startVerificationLambda = startVerificationRecorder,
+            requestDeviceVerificationLambda = requestDeviceVerificationRecorder,
+            startSasVerificationLambda = startSasVerificationRecorder,
         )
         val presenter = createOutgoingVerificationPresenter(
             service = service,
@@ -63,18 +67,18 @@ class OutgoingVerificationPresenterTest {
         presenter.test {
             requestVerificationAndAwaitVerifyingState(service)
 
-            requestSessionVerificationRecorder.assertions().isCalledOnce()
-            startVerificationRecorder.assertions().isCalledOnce()
+            requestDeviceVerificationRecorder.assertions().isCalledOnce()
+            startSasVerificationRecorder.assertions().isCalledOnce()
         }
     }
 
     @Test
     fun `present - Handles requestVerification for user verification`() = runTest {
         val requestUserVerificationRecorder = lambdaRecorder<UserId, Unit> {}
-        val startVerificationRecorder = lambdaRecorder<Unit> {}
+        val startSasVerificationRecorder = lambdaRecorder<Unit> {}
         val service = unverifiedSessionService(
             requestUserVerificationLambda = requestUserVerificationRecorder,
-            startVerificationLambda = startVerificationRecorder,
+            startSasVerificationLambda = startSasVerificationRecorder,
         )
         val presenter = createOutgoingVerificationPresenter(
             service = service,
@@ -84,7 +88,7 @@ class OutgoingVerificationPresenterTest {
             requestVerificationAndAwaitVerifyingState(service)
 
             requestUserVerificationRecorder.assertions().isCalledOnce()
-            startVerificationRecorder.assertions().isCalledOnce()
+            startSasVerificationRecorder.assertions().isCalledOnce()
         }
     }
 
@@ -106,8 +110,8 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - A failure when verifying cancels it`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
             approveVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
@@ -125,7 +129,7 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - A fail when requesting verification resets the state to the canceled one`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
         presenter.test {
@@ -139,8 +143,8 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - Canceling the flow once it's verifying cancels it`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
             cancelVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
@@ -154,8 +158,8 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - When verifying, if we receive another challenge we ignore it`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
         presenter.test {
@@ -168,8 +172,8 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - Go back after cancellation returns to initial state`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
         presenter.test {
@@ -189,8 +193,8 @@ class OutgoingVerificationPresenterTest {
             VerificationEmoji(number = 30)
         )
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
             approveVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
@@ -215,8 +219,8 @@ class OutgoingVerificationPresenterTest {
     @Test
     fun `present - When verification is declined, the flow is canceled`() = runTest {
         val service = unverifiedSessionService(
-            requestSessionVerificationLambda = { },
-            startVerificationLambda = { },
+            requestDeviceVerificationLambda = { },
+            startSasVerificationLambda = { },
             declineVerificationLambda = { },
         )
         val presenter = createOutgoingVerificationPresenter(service)
@@ -271,6 +275,7 @@ class OutgoingVerificationPresenterTest {
         }
     }
 
+    context(testScope: TestScope)
     private suspend fun ReceiveTurbine<OutgoingVerificationState>.requestVerificationAndAwaitVerifyingState(
         fakeService: FakeSessionVerificationService,
         sessionVerificationData: SessionVerificationData = SessionVerificationData.Emojis(emptyList()),
@@ -278,6 +283,7 @@ class OutgoingVerificationPresenterTest {
         var state = awaitItem()
         assertThat(state.step).isEqualTo(Step.Initial)
         state.eventSink(OutgoingVerificationViewEvents.RequestVerification)
+        testScope.advanceUntilIdle()
         // Await for other device response:
         fakeService.emitVerificationFlowState(VerificationFlowState.DidAcceptVerificationRequest)
         state = awaitItem()
@@ -286,6 +292,7 @@ class OutgoingVerificationPresenterTest {
         state = awaitItem()
         assertThat(state.step).isEqualTo(Step.Ready)
         state.eventSink(OutgoingVerificationViewEvents.StartSasVerification)
+        testScope.advanceUntilIdle()
         // Await for other device response (again):
         fakeService.emitVerificationFlowState(VerificationFlowState.DidStartSasVerification)
         state = awaitItem()
@@ -297,30 +304,29 @@ class OutgoingVerificationPresenterTest {
         return state
     }
 
-    private suspend fun unverifiedSessionService(
-        requestSessionVerificationLambda: () -> Unit = { lambdaError() },
+    private fun unverifiedSessionService(
+        requestDeviceVerificationLambda: () -> Unit = { lambdaError() },
         requestUserVerificationLambda: (UserId) -> Unit = { lambdaError() },
         cancelVerificationLambda: () -> Unit = { lambdaError() },
         approveVerificationLambda: () -> Unit = { lambdaError() },
         declineVerificationLambda: () -> Unit = { lambdaError() },
-        startVerificationLambda: () -> Unit = { lambdaError() },
+        startSasVerificationLambda: () -> Unit = { lambdaError() },
         resetLambda: (Boolean) -> Unit = { },
         acknowledgeVerificationRequestLambda: (VerificationRequest.Incoming) -> Unit = { lambdaError() },
         acceptVerificationRequestLambda: () -> Unit = { lambdaError() },
     ): FakeSessionVerificationService {
         return FakeSessionVerificationService(
-            requestCurrentSessionVerificationLambda = requestSessionVerificationLambda,
+            initialSessionVerifiedStatus = SessionVerifiedStatus.NotVerified,
+            requestDeviceVerificationLambda = requestDeviceVerificationLambda,
             requestUserVerificationLambda = requestUserVerificationLambda,
             cancelVerificationLambda = cancelVerificationLambda,
             approveVerificationLambda = approveVerificationLambda,
             declineVerificationLambda = declineVerificationLambda,
-            startVerificationLambda = startVerificationLambda,
+            startSasVerificationLambda = startSasVerificationLambda,
             resetLambda = resetLambda,
             acknowledgeVerificationRequestLambda = acknowledgeVerificationRequestLambda,
             acceptVerificationRequestLambda = acceptVerificationRequestLambda,
-        ).apply {
-            emitVerifiedStatus(SessionVerifiedStatus.NotVerified)
-        }
+        )
     }
 }
 
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewTest.kt
index 71b55fac10..2b5ec63ced 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationViewTest.kt
@@ -6,12 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.features.verifysession.impl.outgoing
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.features.verifysession.impl.R
 import io.element.android.features.verifysession.impl.ui.aEmojisSessionVerificationData
 import io.element.android.libraries.architecture.AsyncData
@@ -21,58 +23,53 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBackKey
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class OutgoingVerificationViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class OutgoingVerificationViewTest : RobolectricTest() {
     @Test
-    fun `back key pressed - when canceled resets the flow`() {
+    fun `back key pressed - when canceled resets the flow`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Canceled,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.Reset)
     }
 
     @Test
-    fun `back key pressed - when awaiting response cancels the verification`() {
+    fun `back key pressed - when awaiting response cancels the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.AwaitingOtherDeviceResponse,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.Cancel)
     }
 
     @Test
-    fun `back key pressed - when ready to verify cancels the verification`() {
+    fun `back key pressed - when ready to verify cancels the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Ready,
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.Cancel)
     }
 
     @Test
-    fun `back key pressed - when verifying and not loading declines the verification`() {
+    fun `back key pressed - when verifying and not loading declines the verification`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -81,14 +78,14 @@ class OutgoingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.DeclineVerification)
     }
 
     @Test
-    fun `back key pressed - when verifying and loading does nothing`() {
+    fun `back key pressed - when verifying and loading does nothing`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -97,42 +94,42 @@ class OutgoingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.pressBackKey()
+        pressBackKey()
         eventsRecorder.assertEmpty()
     }
 
     @Test
-    fun `back key pressed - on Completed exits the flow`() {
+    fun `back key pressed - on Completed finishes the flow`() = runAndroidComposeUiTest {
         ensureCalledOnce { callback ->
-            rule.setOutgoingVerificationView(
-                onBack = callback,
+            setOutgoingVerificationView(
+                onFinished = callback,
                 state = anOutgoingVerificationState(
                     step = OutgoingVerificationState.Step.Completed,
                 ),
             )
-            rule.pressBackKey()
+            pressBackKey()
         }
     }
 
     @Test
-    fun `when flow is completed and the user clicks on the continue button, the expected callback is invoked`() {
+    fun `when flow is completed and the user clicks on the done button, the expected callback is invoked`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>(expectEvents = false)
         ensureCalledOnce { callback ->
-            rule.setOutgoingVerificationView(
+            setOutgoingVerificationView(
                 anOutgoingVerificationState(
                     step = OutgoingVerificationState.Step.Completed,
                     eventSink = eventsRecorder
                 ),
                 onFinished = callback,
             )
-            rule.clickOn(CommonStrings.action_continue)
+            clickOn(CommonStrings.action_done)
         }
     }
 
     @Test
-    fun `clicking on they match emits the expected event`() {
+    fun `clicking on they match emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -141,14 +138,14 @@ class OutgoingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_session_verification_they_match)
+        clickOn(R.string.screen_session_verification_they_match)
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.ConfirmVerification)
     }
 
     @Test
-    fun `clicking on they do not match emits the expected event`() {
+    fun `clicking on they do not match emits the expected event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<OutgoingVerificationViewEvents>()
-        rule.setOutgoingVerificationView(
+        setOutgoingVerificationView(
             anOutgoingVerificationState(
                 step = OutgoingVerificationState.Step.Verifying(
                     data = aEmojisSessionVerificationData(),
@@ -157,11 +154,11 @@ class OutgoingVerificationViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(R.string.screen_session_verification_they_dont_match)
+        clickOn(R.string.screen_session_verification_they_dont_match)
         eventsRecorder.assertSingle(OutgoingVerificationViewEvents.DeclineVerification)
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setOutgoingVerificationView(
+    private fun AndroidComposeUiTest<ComponentActivity>.setOutgoingVerificationView(
         state: OutgoingVerificationState,
         onLearnMoreClick: () -> Unit = EnsureNeverCalled(),
         onFinished: () -> Unit = EnsureNeverCalled(),
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
index dce5ffeae3..86cd5302c8 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.SubdirectoryArrowLeft
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
@@ -99,7 +100,7 @@ private fun ItemRow(
         Item.Parent -> {
             ListItem(
                 leadingContent = ListItemContent.Icon(IconSource.Vector(Icons.Outlined.SubdirectoryArrowLeft)),
-                headlineContent = {
+                content = {
                     Text(
                         text = "..",
                         modifier = Modifier.padding(16.dp),
@@ -111,8 +112,8 @@ private fun ItemRow(
         }
         is Item.Folder -> {
             ListItem(
-                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Folder())),
-                headlineContent = {
+                leadingContent = ListItemContent.Icon(IconSource.Vector(Icons.Outlined.Folder)),
+                content = {
                     Text(
                         text = item.name,
                         modifier = Modifier.padding(16.dp),
@@ -125,7 +126,7 @@ private fun ItemRow(
         is Item.File -> {
             ListItem(
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Document())),
-                headlineContent = {
+                content = {
                     Text(
                         text = item.name,
                         modifier = Modifier.padding(16.dp),
diff --git a/gradle.properties b/gradle.properties
index ce03899940..4323d20107 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,10 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 -XX:+UseG1GC
+# Matches the heap size CI already uses for release builds (see GRADLE_OPTS in
+# .github/workflows/release.yml and nightly.yml) - a local `assembleRelease`/`bundleRelease`
+# runs R8 on the full app and can run out of heap well before 4g on this codebase's size.
+org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8 -XX:+UseG1GC
 
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
@@ -62,3 +65,6 @@ roborazzi.test.verify=true
 
 # Needed after enabling proguard on AGP 8.13.1
 android.r8.gradual.support=true
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a8ca47e959..ce602f0e93 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,68 +3,70 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.13.2"
+android_gradle_plugin = "9.3.1"
 # When updating this, please also update the version in the file ./idea/kotlinc.xml
-kotlin = "2.3.20"
-kotlinpoet = "2.2.0"
-ksp = "2.3.6"
-firebaseAppDistribution = "5.2.1"
+kotlin = "2.4.10"
+kotlinpoet = "2.3.0"
+ksp = "2.3.10"
+firebaseAppDistribution = "5.3.0"
 
 # AndroidX
-core = "1.17.0"
+core = "1.18.0"
 datastore = "1.2.1"
-constraintlayout = "2.2.1"
+constraintlayout = "2.2.2"
 constraintlayout_compose = "1.1.1"
-lifecycle = "2.10.0"
+lifecycle = "2.11.0"
 activity = "1.13.0"
-media3 = "1.9.3"
-camera = "1.5.3"
-work = "2.11.1"
+media3 = "1.10.1"
+camera = "1.6.1"
+work = "2.11.2"
 
 # Compose
-compose_bom = "2026.03.00"
+compose_bom = "2026.06.01"
 
 # Coroutines
-coroutines = "1.10.2"
+coroutines = "1.11.0"
 
 # Accompanist
 accompanist = "0.37.3"
 
 # Test
 test_core = "1.7.0"
-roborazzi = "1.59.0"
+roborazzi = "1.70.0"
 
 # Jetbrain
-datetime = "0.7.1"
-serialization_json = "1.10.0"
+datetime = "0.8.0"
+serialization_json = "1.11.0"
 
 #other
-coil = "3.4.0"
+coil = "3.5.0"
 # Rollback to 1.0.4, 1.0.5 has this issue: https://github.com/airbnb/Showkase/issues/420
 showkase = "1.0.5"
 # There is some custom logic in `RootFlowNode` that may break because it reuses some Appyx internal APIs.
 # When upgrading this version, check state restoration still works fine.
 appyx = "1.7.1"
 sqldelight = "2.3.2"
-wysiwyg = "2.41.1"
-telephoto = "0.18.0"
+wysiwyg = "2.42.0"
+telephoto = "0.19.0"
 haze = "1.7.2"
 
 # Dependency analysis
-dependencyAnalysis = "3.6.1"
+dependencyAnalysis = "3.18.0"
 
 # DI
-metro = "0.11.4"
+metro = "1.4.0"
 
 # Auto service
 autoservice = "1.1.1"
 
 # quality
 detekt = "1.23.8"
+# Stick to version < 0.5 since error detection is broken. See https://mrmans0n.github.io/compose-rules/detekt/#supported-versions-matrix
+detekt_compose_rules = "0.4.28"
 # See https://github.com/pinterest/ktlint/releases/
 ktlint = "1.8.0"
 androidx-test-ext-junit = "1.3.0"
-kover = "0.9.7"
+kover = "0.9.9"
 
 [libraries]
 # Project
@@ -72,6 +74,8 @@ android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref
 compose_compiler_plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 # https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 android_desugar = "com.android.tools:desugar_jdk_libs:2.1.5"
+# Used in build.gradle.kts
+detekt_compose_rules = { module = "io.nlopez.compose.rules:detekt", version.ref = "detekt_compose_rules" }
 kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 metro_gradle_plugin = { module = "dev.zacsweers.metro:gradle-plugin", version.ref = "metro" }
 kotlin_compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
@@ -80,16 +84,17 @@ kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin
 kover_gradle_plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kover" }
 ksp_gradle_plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 # https://firebase.google.com/docs/android/setup#available-libraries
-google_firebase_bom = "com.google.firebase:firebase-bom:34.10.0"
+google_firebase_bom = "com.google.firebase:firebase-bom:34.17.0"
 firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" }
 autonomousapps_dependencyanalysis_plugin = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version.ref = "dependencyAnalysis" }
 ksp_plugin = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
-google_tink = "com.google.crypto.tink:tink-android:1.20.0"
+google_tink = "com.google.crypto.tink:tink-android:1.23.0"
+jna = "net.java.dev.jna:jna:5.19.1"
 
 # AndroidX
 androidx_core = { module = "androidx.core:core", version.ref = "core" }
 androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" }
-androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.9.1"
+androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.10.0"
 androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
 androidx_exifinterface = "androidx.exifinterface:exifinterface:1.4.2"
@@ -98,11 +103,11 @@ androidx_constraintlayout_compose = { module = "androidx.constraintlayout:constr
 androidx_camera_lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
 androidx_camera_view = { module = "androidx.camera:camera-view", version.ref = "camera" }
 androidx_camera_camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
-androidx_javascriptengine = "androidx.javascriptengine:javascriptengine:1.0.0"
+androidx_javascriptengine = "androidx.javascriptengine:javascriptengine:1.1.0"
 androidx_workmanager_runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
 
 androidx_recyclerview = "androidx.recyclerview:recyclerview:1.4.0"
-androidx_browser = "androidx.browser:browser:1.9.0"
+androidx_browser = "androidx.browser:browser:1.10.0"
 androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx_lifecycle_process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
 androidx_splash = "androidx.core:core-splashscreen:1.2.0"
@@ -111,19 +116,21 @@ androidx_media3_ui = { module = "androidx.media3:media3-ui", version.ref = "medi
 androidx_media3_transformer = { module = "androidx.media3:media3-transformer", version.ref = "media3" }
 androidx_media3_effect = { module = "androidx.media3:media3-effect", version.ref = "media3" }
 androidx_media3_common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+androidx_media3_exoplayer_midi = { module = "androidx.media3:media3-exoplayer-midi", version.ref = "media3" }
 androidx_biometric = "androidx.biometric:biometric-ktx:1.4.0-alpha02"
 
 androidx_activity_activity = { module = "androidx.activity:activity", version.ref = "activity" }
 androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
 androidx_startup = "androidx.startup:startup-runtime:1.2.0"
 androidx_preference = "androidx.preference:preference:1.2.1"
-androidx_webkit = "androidx.webkit:webkit:1.15.0"
+androidx_webkit = "androidx.webkit:webkit:1.16.0"
 
 androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
-androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha15' }
+androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha23' }
 androidx_compose_material3_windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class" }
 androidx_compose_material3_adaptive = "androidx.compose.material3:material3-adaptive-android:1.0.0-alpha06"
 androidx_compose_ui = { module = "androidx.compose.ui:ui" }
+androidx_compose_ui_text = { module = "androidx.compose.ui:ui-text" }
 androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx_compose_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest" }
@@ -142,7 +149,7 @@ accompanist_permission = { module = "com.google.accompanist:accompanist-permissi
 squareup_seismic = "com.squareup:seismic:1.0.3"
 
 # network
-network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:5.3.2"
+network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:5.4.0"
 network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" }
 network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" }
 network_okhttp = { module = "com.squareup.okhttp3:okhttp" }
@@ -161,14 +168,14 @@ test_corektx = { module = "androidx.test:core-ktx", version.ref = "test_core" }
 test_arch_core = "androidx.arch.core:core-testing:2.2.0"
 test_junit = "junit:junit:4.13.2"
 test_runner = "androidx.test:runner:1.7.0"
-test_mockk = "io.mockk:mockk:1.14.9"
+test_mockk = "io.mockk:mockk:1.14.11"
 test_konsist = "com.lemonappdev:konsist:0.17.3"
 test_turbine = "app.cash.turbine:turbine:1.2.1"
 test_truth = "com.google.truth:truth:1.4.5"
-test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.21"
+test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.22"
 test_robolectric = "org.robolectric:robolectric:4.16.1"
 test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
-test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.8.1"
+test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.9.1"
 test_detekt_api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
 test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
 
@@ -178,20 +185,21 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
 # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
 # All new features should not be implemented in the pull request that upgrades the version, developers should
 # only fix API breaks and may add some TODOs.
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.03.24"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.08.05"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
 coil_network_okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 coil_compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil_gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil" }
+coil_svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
 coil_test = { module = "io.coil-kt.coil3:coil-test", version.ref = "coil" }
 datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
 serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
-kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0"
+kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.5.1"
 showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
 showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
-jsoup = "org.jsoup:jsoup:1.21.2"
+jsoup = "org.jsoup:jsoup:1.22.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.2.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
@@ -200,40 +208,41 @@ matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose",
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-driver-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
-sqlcipher = "net.zetetic:sqlcipher-android:4.13.0"
-sqlite = "androidx.sqlite:sqlite-ktx:2.6.2"
-unifiedpush = "org.unifiedpush.android:connector:3.3.2"
+sqlcipher = "net.zetetic:sqlcipher-android:4.17.0"
+sqlite = "androidx.sqlite:sqlite-ktx:2.7.0"
+unifiedpush = "org.unifiedpush.android:connector:3.3.3"
 vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
-telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }
+telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil3", version.ref = "telephoto" }
 telephoto_flick = { module = "me.saket.telephoto:flick-android", version.ref = "telephoto" }
 statemachine = "com.freeletics.flowredux:compose:1.2.2"
-maplibre = "org.maplibre.gl:android-sdk:13.0.1"
+maplibre = "org.maplibre.gl:android-sdk:13.4.1"
 maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:3.0.2"
-maplibre_compose = "org.maplibre.compose:maplibre-compose:0.12.1"
+maplibre_compose = "org.maplibre.compose:maplibre-compose:0.13.1"
 maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:3.0.2"
 opusencoder = "io.element.android:opusencoder:1.2.0"
-zxing_cpp = "io.github.zxing-cpp:android:3.0.2"
+zxing_cpp = "io.github.zxing-cpp:android:3.1.1"
 google_zxing = "com.google.zxing:core:3.5.4"
+google_guava = "com.google.guava:guava:33.6.0-android"
 
 haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" }
 haze_materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref = "haze" }
 color_picker = "io.mhssn:colorpicker:1.0.0"
 
 # Analytics
-posthog = "com.posthog:posthog-android:3.37.0"
-sentry = "io.sentry:sentry-android:8.36.0"
+posthog = "com.posthog:posthog-android:3.56.4"
+sentry = "io.sentry:sentry-android:8.51.0"
 # main branch can be tested replacing the version with main-SNAPSHOT
-matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.33.2"
+matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.37.0"
 
 # Emojibase
-matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.5.0"
+matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.5.3"
 sigpwned_emoji4j = "com.sigpwned:emoji4j-core:16.0.0"
 
 # Di
 metro_runtime = { module = "dev.zacsweers.metro:runtime", version.ref = "metro" }
 
 # Element Call
-element_call_embedded = "io.element.android:element-call-embedded:0.18.0"
+element_call_embedded = "io.element.android:element-call-embedded:0.23.0"
 
 # Auto services
 google_autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
@@ -261,13 +270,13 @@ metro = { id = "dev.zacsweers.metro", version.ref = "metro" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 ktlint = "org.jlleitschuh.gradle.ktlint:14.2.0"
 dependencygraph = "com.savvasdalkitsis.module-dependency-graph:0.12"
-dependencycheck = "org.owasp.dependencycheck:12.2.0"
+dependencycheck = "org.owasp.dependencycheck:12.2.2"
 dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysis" }
-paparazzi = "app.cash.paparazzi:2.0.0-alpha04"
+paparazzi = "app.cash.paparazzi:2.0.0-alpha05"
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
 sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 firebaseAppDistribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
-sonarqube = "org.sonarqube:7.2.3.7755"
+sonarqube = "org.sonarqube:7.3.1.8318"
 licensee = "app.cash.licensee:1.14.1"
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-gms_google_services = { id = "com.google.gms.google-services", version = "4.4.4" }
+gms_google_services = { id = "com.google.gms.google-services", version = "4.5.0" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f8e1ee3125..eddabd2eef 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8a848873f3..84c5a9c661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index adff685a03..249efbb032 100755
--- a/gradlew
+++ b/gradlew
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/gradlew.bat b/gradlew.bat
index e509b2dd8f..8508ef684d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/libraries/androidutils/src/main/AndroidManifest.xml b/libraries/androidutils/src/main/AndroidManifest.xml
index 446c4606d7..c27910aee3 100644
--- a/libraries/androidutils/src/main/AndroidManifest.xml
+++ b/libraries/androidutils/src/main/AndroidManifest.xml
@@ -8,4 +8,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
 </manifest>
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ConsoleMessageLogger.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ConsoleMessageLogger.kt
index d165da8640..18d9990c0b 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ConsoleMessageLogger.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/browser/ConsoleMessageLogger.kt
@@ -33,6 +33,11 @@ class DefaultConsoleMessageLogger : ConsoleMessageLogger {
             else -> Log.DEBUG
         }
 
+        // Avoid logging any messages that contain "password" to prevent leaking sensitive information
+        if (consoleMessage.message().contains("password=")) {
+            return
+        }
+
         val message = buildString {
             append(consoleMessage.sourceId())
             append(":")
@@ -41,20 +46,6 @@ class DefaultConsoleMessageLogger : ConsoleMessageLogger {
             append(consoleMessage.message())
         }
 
-        // Avoid logging any messages that contain "password" to prevent leaking sensitive information
-        if (message.contains("password=")) {
-            return
-        }
-
-        Timber.tag(tag).log(
-            priority = priority,
-            message = buildString {
-                append(consoleMessage.sourceId())
-                append(":")
-                append(consoleMessage.lineNumber())
-                append(" ")
-                append(consoleMessage.message())
-            },
-        )
+        Timber.tag(tag).log(priority = priority, message = message)
     }
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/crypto/ClientSecret.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/crypto/ClientSecret.kt
new file mode 100644
index 0000000000..d07d302f39
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/crypto/ClientSecret.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.crypto
+
+/**
+ * Represents a client secret used to encrypt/decrypt data from databases, which can be either a passphrase or a raw key.
+ */
+sealed interface ClientSecret {
+    /**
+     * A passphrase that can be used to derive a key for encryption/decryption.
+     */
+    data class Passphrase(val value: String) : ClientSecret {
+        override fun formattedAsString(): String = value
+    }
+
+    /**
+     * A raw key that can be directly used for encryption/decryption. The key is represented as a byte array, and is formatted as a string in the form of
+     * `x'...'` where the bytes are encoded as hex characters.
+     */
+    data class RawKey(val bytes: ByteArray) : ClientSecret {
+        override fun formattedAsString() = "x'${bytes.toHexString()}'"
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            return bytes.contentEquals((other as RawKey).bytes)
+        }
+
+        override fun hashCode(): Int {
+            return bytes.contentHashCode()
+        }
+
+        override fun toString(): String {
+            return formattedAsString()
+        }
+    }
+
+    /**
+     * Format the client secret as a string that can be parsed back with [fromString].
+     * For a passphrase, this is just the passphrase value. For a raw key, this is the hex-encoded representation of the key formatted as `x'...'`.
+     */
+    fun formattedAsString(): String
+
+    companion object {
+        /**
+         * Parse a string representation of a client secret, which can be either a passphrase or a raw key formatted as `x'...'`.
+         */
+        fun fromString(secret: String): ClientSecret {
+            val regex = Regex("^x'([0-9a-fA-F]+)'$")
+            val rawKeyMatch = regex.matchEntire(secret)
+            return if (rawKeyMatch != null) {
+                RawKey(rawKeyMatch.groupValues[1].hexToByteArray())
+            } else {
+                Passphrase(secret)
+            }
+        }
+
+        /**
+         * Create a [ClientSecret] from raw bytes, which will be treated as a raw key.
+         */
+        fun fromRawBytes(bytes: ByteArray): ClientSecret = when (bytes.size) {
+            32 -> RawKey(bytes)
+            else -> Passphrase(bytes.toHexString())
+        }
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
index 1e25599962..12f2957678 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/json/JsonProvider.kt
@@ -23,6 +23,13 @@ fun interface JsonProvider {
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
 class DefaultJsonProvider : JsonProvider {
-    private val json: Json by lazy { Json { ignoreUnknownKeys = true } }
+    private val json: Json by lazy {
+        Json {
+            ignoreUnknownKeys = true
+            allowComments = true
+            allowTrailingComma = true
+        }
+    }
+
     override fun invoke() = json
 }
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/DnsResolver.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/DnsResolver.kt
new file mode 100644
index 0000000000..da84a99a17
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/DnsResolver.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.network
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.net.InetAddress
+
+interface DnsResolver {
+    suspend fun resolve(host: String): List<InetAddress>
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultDnsResolver : DnsResolver {
+    override suspend fun resolve(host: String): List<InetAddress> = withContext(Dispatchers.IO) {
+        InetAddress.getAllByName(host).toList()
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifier.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifier.kt
new file mode 100644
index 0000000000..b26ef49ac0
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifier.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.network
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.data.tryOrNull
+import java.net.Inet4Address
+import java.net.Inet6Address
+import java.net.InetAddress
+import java.net.URI
+
+sealed interface LocalNetworkClassification {
+    data object PublicIp : LocalNetworkClassification
+    data object LocalIp : LocalNetworkClassification
+    data object Unresolvable : LocalNetworkClassification
+}
+
+interface LocalNetworkAddressClassifier {
+    /**
+     * Classify [url] as pointing to a local network, a public host, or unresolvable.
+     */
+    suspend fun classify(url: String): LocalNetworkClassification
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultLocalNetworkAddressClassifier(
+    private val dnsResolver: DnsResolver,
+) : LocalNetworkAddressClassifier {
+    override suspend fun classify(url: String): LocalNetworkClassification {
+        val host = extractHost(url) ?: return LocalNetworkClassification.Unresolvable
+        // `.local` domains are always link-local by definition
+        if (host.endsWith(".local", ignoreCase = true)) return LocalNetworkClassification.LocalIp
+
+        val resolved = tryOrNull { dnsResolver.resolve(host) }
+
+        if (resolved.isNullOrEmpty()) return LocalNetworkClassification.Unresolvable
+
+        return if (resolved.any { it.isLocalRange() }) {
+            LocalNetworkClassification.LocalIp
+        } else {
+            LocalNetworkClassification.PublicIp
+        }
+    }
+
+    private fun extractHost(url: String): String? {
+        return tryOrNull {
+            val uri = URI(url)
+            uri.host?.takeIf { it.isNotBlank() }
+        }
+    }
+
+    private fun InetAddress.isLocalRange(): Boolean {
+        if (isLoopbackAddress || isLinkLocalAddress || isSiteLocalAddress) return true
+        // Cases not covered by jvm
+        // 1. IPV4 100.64.0.0/10
+        if (this is Inet4Address) {
+            val bytes = address
+            val b0 = bytes[0].toInt() and 0xff
+            val b1 = bytes[1].toInt() and 0xff
+            if (b0 == 100 && b1 in 64..127) return true
+        }
+        // 2. IPV6 fc00::/7
+        if (this is Inet6Address) {
+            val firstByte = address[0].toInt() and 0xff
+            if (firstByte and 0xfe == 0xfc) return true
+        }
+        return false
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/service/ServiceBinder.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/service/ServiceBinder.kt
new file mode 100644
index 0000000000..ba71ca131f
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/service/ServiceBinder.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.service
+
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.annotations.ApplicationContext
+
+interface ServiceBinder {
+    fun bindService(service: Intent, conn: ServiceConnection, flags: Int): Boolean
+    fun unbindService(conn: ServiceConnection)
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultServiceBinder(
+    @ApplicationContext private val context: Context,
+) : ServiceBinder {
+    override fun bindService(service: Intent, conn: ServiceConnection, flags: Int): Boolean {
+        return context.bindService(service, conn, flags)
+    }
+
+    override fun unbindService(conn: ServiceConnection) {
+        context.unbindService(conn)
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DeviceHasVulkanSupport.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DeviceHasVulkanSupport.kt
new file mode 100644
index 0000000000..e8e5edcca0
--- /dev/null
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/system/DeviceHasVulkanSupport.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.system
+
+import android.content.Context
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.di.annotations.ApplicationContext
+
+private const val VULKAN_VERSION_1_0 = 0x400003
+
+/**
+ * Checks if the device supports Vulkan 1.0.
+ *
+ * This is needed for the location screens that contain maps using MapLibre UI components.
+ *
+ * Needed until https://github.com/maplibre/maplibre-native/issues/3079 is resolved and we can automatically choose between OpenGL and Vulkan renderers,
+ * or no devices support OpenGL anymore.
+ */
+@Inject
+class DeviceHasVulkanSupport(
+    @ApplicationContext private val context: Context,
+) {
+    operator fun invoke(): Boolean {
+        return context.packageManager.hasSystemFeature("android.hardware.vulkan.version", VULKAN_VERSION_1_0)
+    }
+}
diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt
index ae724a7c44..2d63f12f2e 100644
--- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt
+++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt
@@ -16,9 +16,11 @@ import android.view.ViewTreeObserver
 import android.view.WindowInsets
 import android.view.inputmethod.InputMethodManager
 import androidx.core.content.getSystemService
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.withTimeoutOrNull
 import kotlin.coroutines.resume
+import kotlin.time.Duration.Companion.seconds
 
 fun View.hideKeyboard() {
     val imm = context?.getSystemService<InputMethodManager>()
@@ -26,29 +28,39 @@ fun View.hideKeyboard() {
 }
 
 suspend fun View.hideKeyboardAndAwaitAnimation() {
-    val imm = context?.getSystemService<InputMethodManager>()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !rootWindowInsets.isVisible(WindowInsets.Type.ime())) {
+        // Keyboard is already hidden, no need to do anything
+        return
+    }
 
-    val mutex = Mutex()
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+    val imm = context?.getSystemService<InputMethodManager>() ?: return
+    val future = CompletableDeferred<Unit>()
+
+    val requested = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
         setOnApplyWindowInsetsListener { view, insets ->
             if (!insets.isVisible(WindowInsets.Type.ime())) {
-                mutex.unlock()
+                future.complete(Unit)
+                // Remove the listener now, it's a single use operation
+                setOnApplyWindowInsetsListener(null)
             }
             insets
         }
-        imm?.hideSoftInputFromWindow(windowToken, 0)
+        imm.hideSoftInputFromWindow(windowToken, 0)
     } else {
         @Suppress("DEPRECATION")
-        imm?.hideSoftInputFromWindow(windowToken, 0, object : ResultReceiver(null) {
+        imm.hideSoftInputFromWindow(windowToken, 0, object : ResultReceiver(null) {
             override fun onReceiveResult(resultCode: Int, resultData: Bundle?) {
-                if (resultCode == InputMethodManager.RESULT_UNCHANGED_HIDDEN ||
-                    resultCode == InputMethodManager.RESULT_HIDDEN) {
-                    mutex.unlock()
+                if (resultCode == InputMethodManager.RESULT_UNCHANGED_HIDDEN || resultCode == InputMethodManager.RESULT_HIDDEN) {
+                    future.complete(Unit)
                 }
             }
         })
     }
-    mutex.lock()
+
+    if (requested) {
+        // Await the future to ensure the keyboard hide animation has completed before proceeding
+        withTimeoutOrNull(1.seconds) { future.await() }
+    }
 }
 
 fun View.showKeyboard(andRequestFocus: Boolean = false) {
@@ -60,6 +72,7 @@ fun View.showKeyboard(andRequestFocus: Boolean = false) {
         windowInsetsController?.show(WindowInsets.Type.ime())
     } else {
         val imm = context?.getSystemService<InputMethodManager>()
+        @Suppress("DEPRECATION")
         imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
     }
 }
diff --git a/libraries/androidutils/src/main/res/values-ca/translations.xml b/libraries/androidutils/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..aba099db1f
--- /dev/null
+++ b/libraries/androidutils/src/main/res/values-ca/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="error_no_compatible_app_found">"No s\'ha trobat cap aplicació compatible per gestionar aquesta acció."</string>
+</resources>
diff --git a/libraries/androidutils/src/main/res/values-ja/translations.xml b/libraries/androidutils/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..c27f0f3ed2
--- /dev/null
+++ b/libraries/androidutils/src/main/res/values-ja/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="error_no_compatible_app_found">"このアクションを処理できるアプリが見つかりません。"</string>
+</resources>
diff --git a/libraries/androidutils/src/main/res/values-vi/translations.xml b/libraries/androidutils/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..bf30372f4a
--- /dev/null
+++ b/libraries/androidutils/src/main/res/values-vi/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="error_no_compatible_app_found">"Không tìm thấy ứng dụng tương thích nào để xử lý hành động này."</string>
+</resources>
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt
index a83aa7d69f..6168f1017e 100644
--- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatterTest.kt
@@ -11,14 +11,12 @@ package io.element.android.libraries.androidutils.filesize
 import android.os.Build
 import com.google.common.truth.Truth.assertThat
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
-@RunWith(RobolectricTestRunner::class)
-class AndroidFileSizeFormatterTest {
+class AndroidFileSizeFormatterTest : RobolectricTest() {
     @Config(sdk = [Build.VERSION_CODES.N])
     @Test
     fun `test api 24 long format`() {
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt
index 158dd63845..e954d99dfa 100644
--- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt
@@ -9,13 +9,11 @@
 package io.element.android.libraries.androidutils.media
 
 import android.util.Size
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class VideoCompressorHelperTest {
+class VideoCompressorHelperTest : RobolectricTest() {
     @Test
     fun `test getOutputSize`() {
         val helper = VideoCompressorHelper(maxSize = 720)
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/FakeDnsResolver.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/FakeDnsResolver.kt
new file mode 100644
index 0000000000..5015abc307
--- /dev/null
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/FakeDnsResolver.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.network
+
+import io.element.android.libraries.core.data.tryOrNull
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+class FakeDnsResolver(
+    private val results: Map<String, List<InetAddress>> = emptyMap(),
+    private val throwOnUnknown: Boolean = true,
+) : DnsResolver {
+    override suspend fun resolve(host: String): List<InetAddress> {
+        // Mimic production DefaultDnsResolver: InetAddress resolves IP literals synchronously
+        // (no DNS lookup), so tests can pass literals through without registering them in [results].
+        if (looksLikeIpLiteral(host)) {
+            tryOrNull { InetAddress.getAllByName(host).toList() }?.let { return it }
+        }
+        return results[host]
+            ?: if (throwOnUnknown) throw UnknownHostException(host) else emptyList()
+    }
+
+    private fun looksLikeIpLiteral(host: String): Boolean {
+        if (':' in host) return true
+        val parts = host.split('.')
+        return parts.size == 4 && parts.all { it.toIntOrNull() != null }
+    }
+}
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifierTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifierTest.kt
new file mode 100644
index 0000000000..4c567822b2
--- /dev/null
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/network/LocalNetworkAddressClassifierTest.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.androidutils.network
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import java.net.InetAddress
+
+class LocalNetworkAddressClassifierTest {
+    private fun classifier(
+        resolver: DnsResolver = FakeDnsResolver(),
+    ) = DefaultLocalNetworkAddressClassifier(resolver)
+
+    @Test
+    fun `IPv4 loopback literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://127.0.0.1:8008")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 RFC1918 10 literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://10.0.0.5")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 RFC1918 172_16 literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://172.20.1.2")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 RFC1918 192_168 literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://192.168.1.10")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 link local literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://169.254.10.20")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 CGNAT 100_64_0_0_10 literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://100.100.0.1")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv4 public literal is PublicIp`() = runTest {
+        assertThat(classifier().classify("https://8.8.8.8")).isEqualTo(LocalNetworkClassification.PublicIp)
+    }
+
+    @Test
+    fun `IPv6 loopback literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://[::1]")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv6 link local literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://[fe80::1]")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv6 unique local literal is LocalIp`() = runTest {
+        assertThat(classifier().classify("https://[fc00::1]")).isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `IPv6 public literal is PublicIp`() = runTest {
+        assertThat(classifier().classify("https://[2606:4700:4700::1111]")).isEqualTo(LocalNetworkClassification.PublicIp)
+    }
+
+    @Test
+    fun `dot local mDNS name is LocalIp without DNS`() = runTest {
+        assertThat(classifier().classify("https://matrix.local"))
+            .isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `hostname resolving to public IP is PublicIp`() = runTest {
+        val resolver = FakeDnsResolver(
+            results = mapOf("matrix.org" to listOf(InetAddress.getByName("8.8.8.8")))
+        )
+        assertThat(classifier(resolver).classify("https://matrix.org"))
+            .isEqualTo(LocalNetworkClassification.PublicIp)
+    }
+
+    @Test
+    fun `hostname resolving to private IP is LocalIp`() = runTest {
+        val resolver = FakeDnsResolver(
+            results = mapOf("matrix.corp.internal" to listOf(InetAddress.getByName("10.0.0.5")))
+        )
+        assertThat(classifier(resolver).classify("https://matrix.corp.internal"))
+            .isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `hostname with mixed public and private addresses is LocalIp`() = runTest {
+        val resolver = FakeDnsResolver(
+            results = mapOf(
+                "matrix.example" to listOf(
+                    InetAddress.getByName("8.8.8.8"),
+                    InetAddress.getByName("10.0.0.5"),
+                )
+            )
+        )
+        assertThat(classifier(resolver).classify("https://matrix.example"))
+            .isEqualTo(LocalNetworkClassification.LocalIp)
+    }
+
+    @Test
+    fun `unresolvable hostname is Unresolvable`() = runTest {
+        val resolver = FakeDnsResolver(throwOnUnknown = true)
+        assertThat(classifier(resolver).classify("https://nonexistent.example"))
+            .isEqualTo(LocalNetworkClassification.Unresolvable)
+    }
+
+    @Test
+    fun `malformed URL is Unresolvable`() = runTest {
+        assertThat(classifier().classify("not a url")).isEqualTo(LocalNetworkClassification.Unresolvable)
+    }
+}
diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/text/LinkifierHelperTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/text/LinkifierHelperTest.kt
index 22928781c9..bb7a272908 100644
--- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/text/LinkifierHelperTest.kt
+++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/text/LinkifierHelperTest.kt
@@ -16,16 +16,14 @@ import androidx.core.text.inSpans
 import androidx.core.text.toSpannable
 import com.google.common.truth.Truth.assertThat
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import org.robolectric.shadow.api.Shadow.newInstanceOf
 
-@RunWith(RobolectricTestRunner::class)
-class LinkifierHelperTest {
+class LinkifierHelperTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/BaseFlowNode.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/BaseFlowNode.kt
index ce89e8a9d9..da849b753e 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/BaseFlowNode.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/BaseFlowNode.kt
@@ -11,7 +11,6 @@ package io.element.android.libraries.architecture
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Modifier
@@ -88,11 +87,9 @@ inline fun <reified NavTarget : Any> BaseFlowNode<NavTarget>.OverlayView(
 @Composable
 inline fun <reified NavTarget : Any> BaseFlowNode<NavTarget>.BackstackWithOverlayBox(
     modifier: Modifier = Modifier,
-    content: @Composable BoxScope.() -> Unit = {},
 ) {
     Box(modifier = modifier) {
         BackstackView()
         OverlayView()
-        content()
     }
 }
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/FaderOrSliderTransitionHandler.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/FaderOrSliderTransitionHandler.kt
new file mode 100644
index 0000000000..c8da7439a5
--- /dev/null
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/FaderOrSliderTransitionHandler.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.architecture.appyx
+
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.Transition
+import androidx.compose.animation.core.spring
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.navigation.transition.ModifierTransitionHandler
+import com.bumble.appyx.core.navigation.transition.TransitionDescriptor
+import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.NewRoot
+import com.bumble.appyx.navmodel.backstack.operation.Replace
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackFader
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider
+
+/**
+ * A TransitionHandler that uses fade transition when the operation is Replace or NewRoot,
+ * and slide transition for all other cases.
+ */
+private class FaderOrSliderTransitionHandler<NavTarget>(
+    private val slider: ModifierTransitionHandler<NavTarget, BackStack.State>,
+    private val fader: ModifierTransitionHandler<NavTarget, BackStack.State>,
+) : ModifierTransitionHandler<NavTarget, BackStack.State>() {
+    override fun createModifier(
+        modifier: Modifier,
+        transition: Transition<BackStack.State>,
+        descriptor: TransitionDescriptor<NavTarget, BackStack.State>
+    ): Modifier {
+        val operation = descriptor.operation
+        val useFader = operation is Replace || operation is NewRoot
+        val handler = if (useFader) fader else slider
+        return handler.createModifier(modifier, transition, descriptor)
+    }
+}
+
+@Composable
+fun <NavTarget> rememberFaderOrSliderTransitionHandler(): ModifierTransitionHandler<NavTarget, BackStack.State> {
+    val slider = rememberBackstackSlider<NavTarget>(
+        transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+    )
+    val fader = rememberBackstackFader<NavTarget>(
+        transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+    )
+    return rememberDelegateTransitionHandler {
+        FaderOrSliderTransitionHandler(slider, fader)
+    }
+}
diff --git a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/SafeChildrenTransitionScope.kt b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/SafeChildrenTransitionScope.kt
index 00e49d7bee..b90e95beca 100644
--- a/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/SafeChildrenTransitionScope.kt
+++ b/libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/appyx/SafeChildrenTransitionScope.kt
@@ -186,6 +186,7 @@ class SafeChildrenTransitionScope<T : Any, S>(
 }
 
 @OptIn(ExperimentalSharedTransitionApi::class)
+@Suppress("ContentSlotReused")
 @Composable
 inline fun <reified NavTarget : Any, State> ParentNode<NavTarget>.SafeChildren(
     navModel: NavModel<NavTarget, State>,
diff --git a/libraries/audio/impl/src/main/kotlin/io/element/android/libraries/audio/impl/DefaultAudioFocus.kt b/libraries/audio/impl/src/main/kotlin/io/element/android/libraries/audio/impl/DefaultAudioFocus.kt
index faab73593e..bc6a42d2f9 100644
--- a/libraries/audio/impl/src/main/kotlin/io/element/android/libraries/audio/impl/DefaultAudioFocus.kt
+++ b/libraries/audio/impl/src/main/kotlin/io/element/android/libraries/audio/impl/DefaultAudioFocus.kt
@@ -19,6 +19,7 @@ import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.audio.api.AudioFocus
 import io.element.android.libraries.audio.api.AudioFocusRequester
 import io.element.android.libraries.di.annotations.ApplicationContext
+import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
 class DefaultAudioFocus(
@@ -38,9 +39,11 @@ class DefaultAudioFocus(
             when (it) {
                 AudioManager.AUDIOFOCUS_GAIN -> {
                     // Do nothing
+                    Timber.d("AudioFocus: AUDIOFOCUS_GAIN")
                 }
                 AudioManager.AUDIOFOCUS_LOSS -> {
                     // Permanent focus loss (e.g., phone call) — always stop/pause.
+                    Timber.d("AudioFocus: AUDIOFOCUS_LOSS")
                     onFocusLost()
                 }
                 AudioManager.AUDIOFOCUS_LOSS_TRANSIENT,
diff --git a/libraries/cachestore/api/build.gradle.kts b/libraries/cachestore/api/build.gradle.kts
new file mode 100644
index 0000000000..0e03bb5136
--- /dev/null
+++ b/libraries/cachestore/api/build.gradle.kts
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.cachestore.api"
+}
diff --git a/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheData.kt b/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheData.kt
new file mode 100644
index 0000000000..a448ba7df8
--- /dev/null
+++ b/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheData.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.cachestore.api
+
+data class CacheData(
+    val value: String,
+    val updatedAt: Long,
+)
diff --git a/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheStore.kt b/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheStore.kt
new file mode 100644
index 0000000000..5df446f688
--- /dev/null
+++ b/libraries/cachestore/api/src/main/kotlin/io/element/android/libraries/cachestore/api/CacheStore.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.cachestore.api
+
+interface CacheStore {
+    suspend fun storeData(key: String, data: CacheData)
+    suspend fun getData(key: String): CacheData?
+    suspend fun deleteData(key: String)
+    suspend fun deleteAll()
+}
diff --git a/libraries/cachestore/impl/build.gradle.kts b/libraries/cachestore/impl/build.gradle.kts
new file mode 100644
index 0000000000..f0c7ba237c
--- /dev/null
+++ b/libraries/cachestore/impl/build.gradle.kts
@@ -0,0 +1,48 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+    alias(libs.plugins.sqldelight)
+}
+
+android {
+    namespace = "io.element.android.libraries.cachestore.impl"
+}
+
+setupDependencyInjection()
+
+dependencies {
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.encryptedDb)
+    api(projects.libraries.cachestore.api)
+    implementation(libs.sqldelight.driver.android)
+    implementation(libs.sqlcipher)
+    implementation(libs.sqlite)
+    implementation(projects.libraries.di)
+    implementation(libs.sqldelight.coroutines)
+
+    testCommonDependencies(libs)
+    testImplementation(libs.sqldelight.driver.jvm)
+}
+
+sqldelight {
+    databases {
+        create("CacheDatabase") {
+            // https://sqldelight.github.io/sqldelight/2.1.0/android_sqlite/migrations/
+            // To generate a .db file from your latest schema, run this task
+            // ./gradlew generateDebugCacheDatabaseSchema
+            // Test migration by running
+            // ./gradlew verifySqlDelightMigration
+            schemaOutputDirectory = File("src/main/sqldelight/databases")
+            verifyMigrations = true
+        }
+    }
+}
diff --git a/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/CacheDataMapper.kt b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/CacheDataMapper.kt
new file mode 100644
index 0000000000..2a33ce4fda
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/CacheDataMapper.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.cachestore.impl
+
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.cachestore.CacheData as DbCacheData
+
+internal fun CacheData.toDbModel(key: String): DbCacheData {
+    return DbCacheData(
+        key = key,
+        value_ = value,
+        updatedAt = updatedAt,
+    )
+}
+
+internal fun DbCacheData.toApiModel(): CacheData {
+    return CacheData(
+        value = value_,
+        updatedAt = updatedAt,
+    )
+}
diff --git a/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/DatabaseCacheStore.kt b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/DatabaseCacheStore.kt
new file mode 100644
index 0000000000..54766803f9
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/DatabaseCacheStore.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.cachestore.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.cachestore.api.CacheStore
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DatabaseCacheStore(
+    private val database: CacheDatabase,
+) : CacheStore {
+    override suspend fun getData(key: String): CacheData? {
+        return database.cacheDataQueries.selectData(key)
+            .executeAsOneOrNull()
+            ?.toApiModel()
+    }
+
+    override suspend fun storeData(key: String, data: CacheData) {
+        database.cacheDataQueries.insertData(
+            data.toDbModel(key)
+        ).await()
+    }
+
+    override suspend fun deleteData(key: String) {
+        database.cacheDataQueries.deleteData(key).await()
+    }
+
+    override suspend fun deleteAll() {
+        database.cacheDataQueries.deleteAll().await()
+    }
+}
diff --git a/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/di/CacheStoreModule.kt b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/di/CacheStoreModule.kt
new file mode 100644
index 0000000000..89de82a08f
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/kotlin/io/element/android/libraries/cachestore/impl/di/CacheStoreModule.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.cachestore.impl.di
+
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.cachestore.impl.CacheDatabase
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.encrypteddb.SqlCipherDriverFactory
+import io.element.encrypteddb.passphrase.RandomDatabaseSecretProvider
+import io.element.encrypteddb.utils.ReplaceDatabaseKey
+import timber.log.Timber
+
+@BindingContainer
+@ContributesTo(AppScope::class)
+object CacheStoreModule {
+    @Provides
+    @SingleIn(AppScope::class)
+    fun provideCacheDatabase(
+        @ApplicationContext context: Context,
+    ): CacheDatabase {
+        val name = "cache_database"
+        val secretFile = context.getDatabasePath("$name.key")
+
+        // Make sure the parent directory of the key file exists, otherwise it will crash in older Android versions
+        val parentDir = secretFile.parentFile
+        if (parentDir != null && !parentDir.exists()) {
+            parentDir.mkdirs()
+        }
+
+        val rekeyMigrationVersion = 2L
+        val passphraseProvider = RandomDatabaseSecretProvider(context, secretFile)
+        val driver = SqlCipherDriverFactory(passphraseProvider)
+            .create(
+                schema = CacheDatabase.Schema,
+                name = "$name.db",
+                context = context
+            ) { db, oldVersion, newVersion ->
+                Timber.d("Migrating $name database from version $oldVersion to $newVersion")
+                if (rekeyMigrationVersion in oldVersion..newVersion) {
+                    ReplaceDatabaseKey(passphraseProvider).replaceKey(name, db)
+                }
+            }
+
+        return CacheDatabase(driver)
+    }
+}
diff --git a/libraries/cachestore/impl/src/main/sqldelight/databases/1.db b/libraries/cachestore/impl/src/main/sqldelight/databases/1.db
new file mode 100644
index 0000000000..8e4b0cac72
Binary files /dev/null and b/libraries/cachestore/impl/src/main/sqldelight/databases/1.db differ
diff --git a/libraries/cachestore/impl/src/main/sqldelight/io/element/android/libraries/cachestore/CacheData.sq b/libraries/cachestore/impl/src/main/sqldelight/io/element/android/libraries/cachestore/CacheData.sq
new file mode 100644
index 0000000000..fd350ac7ba
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/sqldelight/io/element/android/libraries/cachestore/CacheData.sq
@@ -0,0 +1,28 @@
+--------------------------------------------------------------------
+-- Current version of the DB is the highest value of filename
+-- in the folder `sqldelight/databases`.
+--
+-- When upgrading the schema, you have to create a file .sqm in the
+-- `sqldelight/databases` folder and run the following task to
+-- generate a .db file using the latest schema
+-- > ./gradlew generateDebugCacheDatabaseSchema
+--------------------------------------------------------------------
+
+CREATE TABLE CacheData (
+    key TEXT NOT NULL PRIMARY KEY,
+    value TEXT NOT NULL,
+    updatedAt INTEGER NOT NULL
+);
+
+
+selectData:
+SELECT * FROM CacheData WHERE key = ?;
+
+insertData:
+INSERT OR REPLACE INTO CacheData VALUES ?;
+
+deleteData:
+DELETE FROM CacheData WHERE key = ?;
+
+deleteAll:
+DELETE FROM CacheData;
diff --git a/libraries/cachestore/impl/src/main/sqldelight/migrations/1.sqm b/libraries/cachestore/impl/src/main/sqldelight/migrations/1.sqm
new file mode 100644
index 0000000000..f038b85649
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/sqldelight/migrations/1.sqm
@@ -0,0 +1,8 @@
+-- Migrate DB from version 1
+-- Initial schema for CacheData table
+
+CREATE TABLE IF NOT EXISTS CacheData (
+    key TEXT NOT NULL PRIMARY KEY,
+    value TEXT NOT NULL,
+    updatedAt INTEGER NOT NULL
+);
diff --git a/libraries/cachestore/impl/src/main/sqldelight/migrations/2.sqm b/libraries/cachestore/impl/src/main/sqldelight/migrations/2.sqm
new file mode 100644
index 0000000000..e7adfb091a
--- /dev/null
+++ b/libraries/cachestore/impl/src/main/sqldelight/migrations/2.sqm
@@ -0,0 +1,2 @@
+-- Migrate DB from version 2
+-- Dummy migration to trigger a re-key
diff --git a/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseCacheStoreTest.kt b/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseCacheStoreTest.kt
new file mode 100644
index 0000000000..36d7e05532
--- /dev/null
+++ b/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/DatabaseCacheStoreTest.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.sessionstorage.impl
+
+import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.cachestore.impl.CacheDatabase
+import io.element.android.libraries.cachestore.impl.DatabaseCacheStore
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import io.element.android.libraries.cachestore.CacheData as DbCacheData
+
+private const val A_KEY = "aKey"
+private const val A_DATA_1 = "aData1"
+private const val A_DATA_2 = "aData2"
+
+class DatabaseCacheStoreTest {
+    private lateinit var database: CacheDatabase
+    private lateinit var databaseCacheStore: DatabaseCacheStore
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Before
+    fun setup() {
+        // Initialise in memory SQLite driver
+        val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
+        CacheDatabase.Schema.create(driver)
+
+        database = CacheDatabase(driver)
+        databaseCacheStore = DatabaseCacheStore(
+            database = database,
+        )
+    }
+
+    @Test
+    fun `storeData persists the CacheData into the DB, deleteData deletes it`() = runTest {
+        // Assert that no data is stored for the key
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isNull()
+        // Store data
+        databaseCacheStore.storeData(A_KEY, CacheData(A_DATA_1, 1))
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isEqualTo(
+            DbCacheData(
+                key = A_KEY,
+                value_ = A_DATA_1,
+                updatedAt = 1,
+            )
+        )
+        // Update data
+        databaseCacheStore.storeData(A_KEY, CacheData(A_DATA_2, 2))
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isEqualTo(
+            DbCacheData(
+                key = A_KEY,
+                value_ = A_DATA_2,
+                updatedAt = 2,
+            )
+        )
+        // Delete data
+        databaseCacheStore.deleteData(A_KEY)
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isNull()
+    }
+
+    @Test
+    fun `deleteAll deletes all the data`() = runTest {
+        // Assert that no data is stored for the key
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isNull()
+        // Store data
+        databaseCacheStore.storeData(A_KEY, CacheData(A_DATA_1, 1))
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isEqualTo(
+            DbCacheData(
+                key = A_KEY,
+                value_ = A_DATA_1,
+                updatedAt = 1,
+            )
+        )
+        // Delete all data
+        databaseCacheStore.deleteAll()
+        assertThat(database.cacheDataQueries.selectData(A_KEY).executeAsOneOrNull()).isNull()
+    }
+}
diff --git a/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt b/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt
new file mode 100644
index 0000000000..3dca9efaf3
--- /dev/null
+++ b/libraries/cachestore/impl/src/test/kotlin/io/element/android/libraries/sessionstorage/impl/Fixtures.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.sessionstorage.impl
+
+import io.element.android.libraries.cachestore.CacheData
+import java.util.Date
+
+internal fun aCacheData(
+    key: String = "aKey",
+    value: String = "aValue",
+    updatedAt: Date = Date(),
+) = CacheData(
+    key = key,
+    value_ = value,
+    updatedAt = updatedAt.time,
+)
diff --git a/libraries/cachestore/test/build.gradle.kts b/libraries/cachestore/test/build.gradle.kts
new file mode 100644
index 0000000000..7ad2ac48d9
--- /dev/null
+++ b/libraries/cachestore/test/build.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.cachestore.test"
+}
+
+dependencies {
+    implementation(projects.libraries.cachestore.api)
+}
diff --git a/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/CacheData.kt b/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/CacheData.kt
new file mode 100644
index 0000000000..30633e8ff9
--- /dev/null
+++ b/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/CacheData.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.sessionstorage.test
+
+import io.element.android.libraries.cachestore.api.CacheData
+
+fun aCacheData(
+    value: String = "aValue",
+    updatedAt: Long = 0,
+) = CacheData(
+    value = value,
+    updatedAt = updatedAt,
+)
diff --git a/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemoryCacheStore.kt b/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemoryCacheStore.kt
new file mode 100644
index 0000000000..f029c8bcde
--- /dev/null
+++ b/libraries/cachestore/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemoryCacheStore.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.sessionstorage.test
+
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.cachestore.api.CacheStore
+
+class InMemoryCacheStore(
+    initialData: Map<String, CacheData> = emptyMap(),
+) : CacheStore {
+    val dataMap = initialData.toMutableMap()
+
+    override suspend fun storeData(key: String, data: CacheData) {
+        dataMap[key] = data
+    }
+
+    override suspend fun getData(key: String): CacheData? {
+        return dataMap[key]
+    }
+
+    override suspend fun deleteData(key: String) {
+        dataMap.remove(key)
+    }
+
+    override suspend fun deleteAll() {
+        dataMap.clear()
+    }
+}
diff --git a/libraries/compound/screenshots/Compound Icons - Dark.png b/libraries/compound/screenshots/Compound Icons - Dark.png
index f140517dff..6d5057eaac 100644
--- a/libraries/compound/screenshots/Compound Icons - Dark.png	
+++ b/libraries/compound/screenshots/Compound Icons - Dark.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37f6acca46890e98087ece62e2716fa60791479fab02999406050517e3b79307
-size 240187
+oid sha256:78386a58e91be3213485f60909ec8d83cd535aabcec775aadf7b36e77d8542f0
+size 245853
diff --git a/libraries/compound/screenshots/Compound Icons - Light.png b/libraries/compound/screenshots/Compound Icons - Light.png
index c84421b6fa..f4f66317c3 100644
--- a/libraries/compound/screenshots/Compound Icons - Light.png	
+++ b/libraries/compound/screenshots/Compound Icons - Light.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2de5e6d24dcbe0baa75a69485f5a308466fa599625bcbdb0cb96e9bc5a1b708
-size 253233
+oid sha256:477ab18ffa1ca81ca5e4c9f30f4466b19e14fcaddf641fc860c6be19a0e33d4f
+size 259185
diff --git a/libraries/compound/screenshots/Compound Icons - Rtl.png b/libraries/compound/screenshots/Compound Icons - Rtl.png
index 89be63840a..d0374a65fb 100644
--- a/libraries/compound/screenshots/Compound Icons - Rtl.png	
+++ b/libraries/compound/screenshots/Compound Icons - Rtl.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae1cb46d82acbb23cc172f41e20a41bbe88c350ab53c20e5b2a91f2c16590fbf
-size 254525
+oid sha256:7edeebf9876aecd262fceb7d55a4bfd30a859a69b708af8dd4538ffc0f9be419
+size 260400
diff --git a/libraries/compound/screenshots/Compound Vector Icons - Dark.png b/libraries/compound/screenshots/Compound Vector Icons - Dark.png
index 702fd9b425..0d8e07d9fa 100644
--- a/libraries/compound/screenshots/Compound Vector Icons - Dark.png	
+++ b/libraries/compound/screenshots/Compound Vector Icons - Dark.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a8a9b6e61758a40d01028a4edb4a4d21b845b83b3e0793ed0934e48f3d9eea0
-size 94637
+oid sha256:cc6cc2d2e89c7460217c2075046e41bef727407ee422dcdea23f161f48441904
+size 97346
diff --git a/libraries/compound/screenshots/Compound Vector Icons - Light.png b/libraries/compound/screenshots/Compound Vector Icons - Light.png
index 76b1cc49bd..74b4c859c7 100644
--- a/libraries/compound/screenshots/Compound Vector Icons - Light.png	
+++ b/libraries/compound/screenshots/Compound Vector Icons - Light.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f29d225df71587fefe07ec8739b84f1a0469786c6b1d6778da0bad33d19574e
-size 101183
+oid sha256:4df16aee4a3a8b10c33e9724904c72b8dc502725204d2f86cf62cc381b35f4a1
+size 103870
diff --git a/libraries/compound/screenshots/MaterialText Colors.png b/libraries/compound/screenshots/MaterialText Colors.png
index f8f77ccca2..1273aee01e 100644
--- a/libraries/compound/screenshots/MaterialText Colors.png	
+++ b/libraries/compound/screenshots/MaterialText Colors.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4be10c3bb9900d27a3b406eca0cb902b0ff9cdf90e8e3cf1ae7760aa7c5d47d9
-size 377446
+oid sha256:1f1a277e76d351f48ae0041e082525422604fbf41d77fe078112349855dd3d2e
+size 453512
diff --git a/libraries/compound/src/main/assets/theme.iife.js b/libraries/compound/src/main/assets/theme.iife.js
index 1dd693cbd4..d1629a95bb 100644
--- a/libraries/compound/src/main/assets/theme.iife.js
+++ b/libraries/compound/src/main/assets/theme.iife.js
@@ -1 +1 @@
-var CompoundTheme=(function($t){"use strict";const{min:oi,max:si}=Math,qt=(e,t=0,r=1)=>oi(si(t,e),r),xe=e=>{e._clipped=!1,e._unclipped=e.slice(0);for(let t=0;t<=3;t++)t<3?((e[t]<0||e[t]>255)&&(e._clipped=!0),e[t]=qt(e[t],0,255)):t===3&&(e[t]=qt(e[t],0,1));return e},fn={};for(let e of["Boolean","Number","String","Function","Array","Date","RegExp","Undefined","Null"])fn[`[object ${e}]`]=e.toLowerCase();function N(e){return fn[Object.prototype.toString.call(e)]||"object"}const E=(e,t=null)=>e.length>=3?Array.prototype.slice.call(e):N(e[0])=="object"&&t?t.split("").filter(r=>e[0][r]!==void 0).map(r=>e[0][r]):e[0].slice(0),Et=e=>{if(e.length<2)return null;const t=e.length-1;return N(e[t])=="string"?e[t].toLowerCase():null},{PI:Wt,min:hn,max:dn}=Math,et=e=>Math.round(e*100)/100,Ce=e=>Math.round(e*100)/100,ft=Wt*2,ke=Wt/3,ii=Wt/180,ai=180/Wt;function bn(e){return[...e.slice(0,3).reverse(),...e.slice(3)]}const $={format:{},autodetect:[]};let _=class{constructor(...t){const r=this;if(N(t[0])==="object"&&t[0].constructor&&t[0].constructor===this.constructor)return t[0];let n=Et(t),o=!1;if(!n){o=!0,$.sorted||($.autodetect=$.autodetect.sort((i,s)=>s.p-i.p),$.sorted=!0);for(let i of $.autodetect)if(n=i.test(...t),n)break}if($.format[n]){const i=$.format[n].apply(null,o?t:t.slice(0,-1));r._rgb=xe(i)}else throw new Error("unknown format: "+t);r._rgb.length===3&&r._rgb.push(1)}toString(){return N(this.hex)=="function"?this.hex():`[${this._rgb.join(",")}]`}};const ci="3.2.0",k=(...e)=>new _(...e);k.version=ci;const Lt={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkgrey:"#a9a9a9",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",grey:"#808080",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",laserlemon:"#ffff54",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrod:"#fafad2",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",maroon2:"#7f0000",maroon3:"#b03060",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",purple2:"#7f007f",purple3:"#a020f0",rebeccapurple:"#663399",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"},ui=/^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,li=/^#?([A-Fa-f0-9]{8}|[A-Fa-f0-9]{4})$/,pn=e=>{if(e.match(ui)){(e.length===4||e.length===7)&&(e=e.substr(1)),e.length===3&&(e=e.split(""),e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);const t=parseInt(e,16),r=t>>16,n=t>>8&255,o=t&255;return[r,n,o,1]}if(e.match(li)){(e.length===5||e.length===9)&&(e=e.substr(1)),e.length===4&&(e=e.split(""),e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]+e[3]+e[3]);const t=parseInt(e,16),r=t>>24&255,n=t>>16&255,o=t>>8&255,i=Math.round((t&255)/255*100)/100;return[r,n,o,i]}throw new Error(`unknown hex color: ${e}`)},{round:Ut}=Math,mn=(...e)=>{let[t,r,n,o]=E(e,"rgba"),i=Et(e)||"auto";o===void 0&&(o=1),i==="auto"&&(i=o<1?"rgba":"rgb"),t=Ut(t),r=Ut(r),n=Ut(n);let a="000000"+(t<<16|r<<8|n).toString(16);a=a.substr(a.length-6);let c="0"+Ut(o*255).toString(16);switch(c=c.substr(c.length-2),i.toLowerCase()){case"rgba":return`#${a}${c}`;case"argb":return`#${c}${a}`;default:return`#${a}`}};_.prototype.name=function(){const e=mn(this._rgb,"rgb");for(let t of Object.keys(Lt))if(Lt[t]===e)return t.toLowerCase();return e},$.format.named=e=>{if(e=e.toLowerCase(),Lt[e])return pn(Lt[e]);throw new Error("unknown color name: "+e)},$.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&N(e)==="string"&&Lt[e.toLowerCase()])return"named"}}),_.prototype.alpha=function(e,t=!1){return e!==void 0&&N(e)==="number"?t?(this._rgb[3]=e,this):new _([this._rgb[0],this._rgb[1],this._rgb[2],e],"rgb"):this._rgb[3]},_.prototype.clipped=function(){return this._rgb._clipped||!1};const ct={Kn:18,labWhitePoint:"d65",Xn:.95047,Yn:1,Zn:1.08883,kE:216/24389,kKE:8,kK:24389/27,RefWhiteRGB:{X:.95047,Y:1,Z:1.08883},MtxRGB2XYZ:{m00:.4124564390896922,m01:.21267285140562253,m02:.0193338955823293,m10:.357576077643909,m11:.715152155287818,m12:.11919202588130297,m20:.18043748326639894,m21:.07217499330655958,m22:.9503040785363679},MtxXYZ2RGB:{m00:3.2404541621141045,m01:-.9692660305051868,m02:.055643430959114726,m10:-1.5371385127977166,m11:1.8760108454466942,m12:-.2040259135167538,m20:-.498531409556016,m21:.041556017530349834,m22:1.0572251882231791},As:.9414285350000001,Bs:1.040417467,Cs:1.089532651,MtxAdaptMa:{m00:.8951,m01:-.7502,m02:.0389,m10:.2664,m11:1.7135,m12:-.0685,m20:-.1614,m21:.0367,m22:1.0296},MtxAdaptMaI:{m00:.9869929054667123,m01:.43230526972339456,m02:-.008528664575177328,m10:-.14705425642099013,m11:.5183602715367776,m12:.04004282165408487,m20:.15996265166373125,m21:.0492912282128556,m22:.9684866957875502}},fi=new Map([["a",[1.0985,.35585]],["b",[1.0985,.35585]],["c",[.98074,1.18232]],["d50",[.96422,.82521]],["d55",[.95682,.92149]],["d65",[.95047,1.08883]],["e",[1,1,1]],["f2",[.99186,.67393]],["f7",[.95041,1.08747]],["f11",[1.00962,.6435]],["icc",[.96422,.82521]]]);function ht(e){const t=fi.get(String(e).toLowerCase());if(!t)throw new Error("unknown Lab illuminant "+e);ct.labWhitePoint=e,ct.Xn=t[0],ct.Zn=t[1]}function Kt(){return ct.labWhitePoint}const Re=(...e)=>{e=E(e,"lab");const[t,r,n]=e,[o,i,s]=hi(t,r,n),[a,c,u]=gn(o,i,s);return[a,c,u,e.length>3?e[3]:1]},hi=(e,t,r)=>{const{kE:n,kK:o,kKE:i,Xn:s,Yn:a,Zn:c}=ct,u=(e+16)/116,f=.002*t+u,l=u-.005*r,h=f*f*f,d=l*l*l,b=h>n?h:(116*f-16)/o,g=e>i?Math.pow((e+16)/116,3):e/o,m=d>n?d:(116*l-16)/o,y=b*s,L=g*a,w=m*c;return[y,L,w]},qe=e=>{const t=Math.sign(e);return e=Math.abs(e),(e<=.0031308?e*12.92:1.055*Math.pow(e,1/2.4)-.055)*t},gn=(e,t,r)=>{const{MtxAdaptMa:n,MtxAdaptMaI:o,MtxXYZ2RGB:i,RefWhiteRGB:s,Xn:a,Yn:c,Zn:u}=ct,f=a*n.m00+c*n.m10+u*n.m20,l=a*n.m01+c*n.m11+u*n.m21,h=a*n.m02+c*n.m12+u*n.m22,d=s.X*n.m00+s.Y*n.m10+s.Z*n.m20,b=s.X*n.m01+s.Y*n.m11+s.Z*n.m21,g=s.X*n.m02+s.Y*n.m12+s.Z*n.m22,m=(e*n.m00+t*n.m10+r*n.m20)*(d/f),y=(e*n.m01+t*n.m11+r*n.m21)*(b/l),L=(e*n.m02+t*n.m12+r*n.m22)*(g/h),w=m*o.m00+y*o.m10+L*o.m20,x=m*o.m01+y*o.m11+L*o.m21,S=m*o.m02+y*o.m12+L*o.m22,R=qe(w*i.m00+x*i.m10+S*i.m20),M=qe(w*i.m01+x*i.m11+S*i.m21),p=qe(w*i.m02+x*i.m12+S*i.m22);return[R*255,M*255,p*255]},Me=(...e)=>{const[t,r,n,...o]=E(e,"rgb"),[i,s,a]=_n(t,r,n),[c,u,f]=di(i,s,a);return[c,u,f,...o.length>0&&o[0]<1?[o[0]]:[]]};function di(e,t,r){const{Xn:n,Yn:o,Zn:i,kE:s,kK:a}=ct,c=e/n,u=t/o,f=r/i,l=c>s?Math.pow(c,1/3):(a*c+16)/116,h=u>s?Math.pow(u,1/3):(a*u+16)/116,d=f>s?Math.pow(f,1/3):(a*f+16)/116;return[116*h-16,500*(l-h),200*(h-d)]}function Oe(e){const t=Math.sign(e);return e=Math.abs(e),(e<=.04045?e/12.92:Math.pow((e+.055)/1.055,2.4))*t}const _n=(e,t,r)=>{e=Oe(e/255),t=Oe(t/255),r=Oe(r/255);const{MtxRGB2XYZ:n,MtxAdaptMa:o,MtxAdaptMaI:i,Xn:s,Yn:a,Zn:c,As:u,Bs:f,Cs:l}=ct;let h=e*n.m00+t*n.m10+r*n.m20,d=e*n.m01+t*n.m11+r*n.m21,b=e*n.m02+t*n.m12+r*n.m22;const g=s*o.m00+a*o.m10+c*o.m20,m=s*o.m01+a*o.m11+c*o.m21,y=s*o.m02+a*o.m12+c*o.m22;let L=h*o.m00+d*o.m10+b*o.m20,w=h*o.m01+d*o.m11+b*o.m21,x=h*o.m02+d*o.m12+b*o.m22;return L*=g/u,w*=m/f,x*=y/l,h=L*i.m00+w*i.m10+x*i.m20,d=L*i.m01+w*i.m11+x*i.m21,b=L*i.m02+w*i.m12+x*i.m22,[h,d,b]};_.prototype.lab=function(){return Me(this._rgb)},Object.assign(k,{lab:(...e)=>new _(...e,"lab"),getLabWhitePoint:Kt,setLabWhitePoint:ht}),$.format.lab=Re,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"lab"),N(e)==="array"&&e.length===3)return"lab"}}),_.prototype.darken=function(e=1){const t=this,r=t.lab();return r[0]-=ct.Kn*e,new _(r,"lab").alpha(t.alpha(),!0)},_.prototype.brighten=function(e=1){return this.darken(-e)},_.prototype.darker=_.prototype.darken,_.prototype.brighter=_.prototype.brighten,_.prototype.get=function(e){const[t,r]=e.split("."),n=this[t]();if(r){const o=t.indexOf(r)-(t.substr(0,2)==="ok"?2:0);if(o>-1)return n[o];throw new Error(`unknown channel ${r} in mode ${t}`)}else return n};const{pow:bi}=Math,pi=1e-7,mi=20;_.prototype.luminance=function(e,t="rgb"){if(e!==void 0&&N(e)==="number"){if(e===0)return new _([0,0,0,this._rgb[3]],"rgb");if(e===1)return new _([255,255,255,this._rgb[3]],"rgb");let r=this.luminance(),n=mi;const o=(s,a)=>{const c=s.interpolate(a,.5,t),u=c.luminance();return Math.abs(e-u)<pi||!n--?c:u>e?o(s,c):o(c,a)},i=(r>e?o(new _([0,0,0]),this):o(this,new _([255,255,255]))).rgb();return new _([...i,this._rgb[3]])}return gi(...this._rgb.slice(0,3))};const gi=(e,t,r)=>(e=Ae(e),t=Ae(t),r=Ae(r),.2126*e+.7152*t+.0722*r),Ae=e=>(e/=255,e<=.03928?e/12.92:bi((e+.055)/1.055,2.4)),H={},Nt=(e,t,r=.5,...n)=>{let o=n[0]||"lrgb";if(!H[o]&&!n.length&&(o=Object.keys(H)[0]),!H[o])throw new Error(`interpolation mode ${o} is not defined`);return N(e)!=="object"&&(e=new _(e)),N(t)!=="object"&&(t=new _(t)),H[o](e,t,r).alpha(e.alpha()+r*(t.alpha()-e.alpha()))};_.prototype.mix=_.prototype.interpolate=function(e,t=.5,...r){return Nt(this,e,t,...r)},_.prototype.premultiply=function(e=!1){const t=this._rgb,r=t[3];return e?(this._rgb=[t[0]*r,t[1]*r,t[2]*r,r],this):new _([t[0]*r,t[1]*r,t[2]*r,r],"rgb")};const{sin:_i,cos:vi}=Math,vn=(...e)=>{let[t,r,n]=E(e,"lch");return isNaN(n)&&(n=0),n=n*ii,[t,vi(n)*r,_i(n)*r]},Se=(...e)=>{e=E(e,"lch");const[t,r,n]=e,[o,i,s]=vn(t,r,n),[a,c,u]=Re(o,i,s);return[a,c,u,e.length>3?e[3]:1]},yi=(...e)=>{const t=bn(E(e,"hcl"));return Se(...t)},{sqrt:wi,atan2:xi,round:Ci}=Math,yn=(...e)=>{const[t,r,n]=E(e,"lab"),o=wi(r*r+n*n);let i=(xi(n,r)*ai+360)%360;return Ci(o*1e4)===0&&(i=Number.NaN),[t,o,i]},$e=(...e)=>{const[t,r,n,...o]=E(e,"rgb"),[i,s,a]=Me(t,r,n),[c,u,f]=yn(i,s,a);return[c,u,f,...o.length>0&&o[0]<1?[o[0]]:[]]};_.prototype.lch=function(){return $e(this._rgb)},_.prototype.hcl=function(){return bn($e(this._rgb))},Object.assign(k,{lch:(...e)=>new _(...e,"lch"),hcl:(...e)=>new _(...e,"hcl")}),$.format.lch=Se,$.format.hcl=yi,["lch","hcl"].forEach(e=>$.autodetect.push({p:2,test:(...t)=>{if(t=E(t,e),N(t)==="array"&&t.length===3)return e}})),_.prototype.saturate=function(e=1){const t=this,r=t.lch();return r[1]+=ct.Kn*e,r[1]<0&&(r[1]=0),new _(r,"lch").alpha(t.alpha(),!0)},_.prototype.desaturate=function(e=1){return this.saturate(-e)},_.prototype.set=function(e,t,r=!1){const[n,o]=e.split("."),i=this[n]();if(o){const s=n.indexOf(o)-(n.substr(0,2)==="ok"?2:0);if(s>-1){if(N(t)=="string")switch(t.charAt(0)){case"+":i[s]+=+t;break;case"-":i[s]+=+t;break;case"*":i[s]*=+t.substr(1);break;case"/":i[s]/=+t.substr(1);break;default:i[s]=+t}else if(N(t)==="number")i[s]=t;else throw new Error("unsupported value for Color.set");const a=new _(i,n);return r?(this._rgb=a._rgb,this):a}throw new Error(`unknown channel ${o} in mode ${n}`)}else return i},_.prototype.tint=function(e=.5,...t){return Nt(this,"white",e,...t)},_.prototype.shade=function(e=.5,...t){return Nt(this,"black",e,...t)};const ki=(e,t,r)=>{const n=e._rgb,o=t._rgb;return new _(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"rgb")};H.rgb=ki;const{sqrt:Ee,pow:Tt}=Math,Ri=(e,t,r)=>{const[n,o,i]=e._rgb,[s,a,c]=t._rgb;return new _(Ee(Tt(n,2)*(1-r)+Tt(s,2)*r),Ee(Tt(o,2)*(1-r)+Tt(a,2)*r),Ee(Tt(i,2)*(1-r)+Tt(c,2)*r),"rgb")};H.lrgb=Ri;const qi=(e,t,r)=>{const n=e.lab(),o=t.lab();return new _(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"lab")};H.lab=qi;const jt=(e,t,r,n)=>{let o,i;n==="hsl"?(o=e.hsl(),i=t.hsl()):n==="hsv"?(o=e.hsv(),i=t.hsv()):n==="hcg"?(o=e.hcg(),i=t.hcg()):n==="hsi"?(o=e.hsi(),i=t.hsi()):n==="lch"||n==="hcl"?(n="hcl",o=e.hcl(),i=t.hcl()):n==="oklch"&&(o=e.oklch().reverse(),i=t.oklch().reverse());let s,a,c,u,f,l;(n.substr(0,1)==="h"||n==="oklch")&&([s,c,f]=o,[a,u,l]=i);let h,d,b,g;return!isNaN(s)&&!isNaN(a)?(a>s&&a-s>180?g=a-(s+360):a<s&&s-a>180?g=a+360-s:g=a-s,d=s+r*g):isNaN(s)?isNaN(a)?d=Number.NaN:(d=a,(f==1||f==0)&&n!="hsv"&&(h=u)):(d=s,(l==1||l==0)&&n!="hsv"&&(h=c)),h===void 0&&(h=c+r*(u-c)),b=f+r*(l-f),n==="oklch"?new _([b,h,d],n):new _([d,h,b],n)},wn=(e,t,r)=>jt(e,t,r,"lch");H.lch=wn,H.hcl=wn;const Mi=e=>{if(N(e)=="number"&&e>=0&&e<=16777215){const t=e>>16,r=e>>8&255,n=e&255;return[t,r,n,1]}throw new Error("unknown num color: "+e)},Oi=(...e)=>{const[t,r,n]=E(e,"rgb");return(t<<16)+(r<<8)+n};_.prototype.num=function(){return Oi(this._rgb)},Object.assign(k,{num:(...e)=>new _(...e,"num")}),$.format.num=Mi,$.autodetect.push({p:5,test:(...e)=>{if(e.length===1&&N(e[0])==="number"&&e[0]>=0&&e[0]<=16777215)return"num"}});const Ai=(e,t,r)=>{const n=e.num(),o=t.num();return new _(n+r*(o-n),"num")};H.num=Ai;const{floor:Si}=Math,$i=(...e)=>{e=E(e,"hcg");let[t,r,n]=e,o,i,s;n=n*255;const a=r*255;if(r===0)o=i=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const c=Si(t),u=t-c,f=n*(1-r),l=f+a*(1-u),h=f+a*u,d=f+a;switch(c){case 0:[o,i,s]=[d,h,f];break;case 1:[o,i,s]=[l,d,f];break;case 2:[o,i,s]=[f,d,h];break;case 3:[o,i,s]=[f,l,d];break;case 4:[o,i,s]=[h,f,d];break;case 5:[o,i,s]=[d,f,l];break}}return[o,i,s,e.length>3?e[3]:1]},Ei=(...e)=>{const[t,r,n]=E(e,"rgb"),o=hn(t,r,n),i=dn(t,r,n),s=i-o,a=s*100/255,c=o/(255-s)*100;let u;return s===0?u=Number.NaN:(t===i&&(u=(r-n)/s),r===i&&(u=2+(n-t)/s),n===i&&(u=4+(t-r)/s),u*=60,u<0&&(u+=360)),[u,a,c]};_.prototype.hcg=function(){return Ei(this._rgb)};const Li=(...e)=>new _(...e,"hcg");k.hcg=Li,$.format.hcg=$i,$.autodetect.push({p:1,test:(...e)=>{if(e=E(e,"hcg"),N(e)==="array"&&e.length===3)return"hcg"}});const Ni=(e,t,r)=>jt(e,t,r,"hcg");H.hcg=Ni;const{cos:Pt}=Math,Ti=(...e)=>{e=E(e,"hsi");let[t,r,n]=e,o,i,s;return isNaN(t)&&(t=0),isNaN(r)&&(r=0),t>360&&(t-=360),t<0&&(t+=360),t/=360,t<1/3?(s=(1-r)/3,o=(1+r*Pt(ft*t)/Pt(ke-ft*t))/3,i=1-(s+o)):t<2/3?(t-=1/3,o=(1-r)/3,i=(1+r*Pt(ft*t)/Pt(ke-ft*t))/3,s=1-(o+i)):(t-=2/3,i=(1-r)/3,s=(1+r*Pt(ft*t)/Pt(ke-ft*t))/3,o=1-(i+s)),o=qt(n*o*3),i=qt(n*i*3),s=qt(n*s*3),[o*255,i*255,s*255,e.length>3?e[3]:1]},{min:ji,sqrt:Pi,acos:zi}=Math,Bi=(...e)=>{let[t,r,n]=E(e,"rgb");t/=255,r/=255,n/=255;let o;const i=ji(t,r,n),s=(t+r+n)/3,a=s>0?1-i/s:0;return a===0?o=NaN:(o=(t-r+(t-n))/2,o/=Pi((t-r)*(t-r)+(t-n)*(r-n)),o=zi(o),n>r&&(o=ft-o),o/=ft),[o*360,a,s]};_.prototype.hsi=function(){return Bi(this._rgb)};const Ii=(...e)=>new _(...e,"hsi");k.hsi=Ii,$.format.hsi=Ti,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"hsi"),N(e)==="array"&&e.length===3)return"hsi"}});const Gi=(e,t,r)=>jt(e,t,r,"hsi");H.hsi=Gi;const Le=(...e)=>{e=E(e,"hsl");const[t,r,n]=e;let o,i,s;if(r===0)o=i=s=n*255;else{const a=[0,0,0],c=[0,0,0],u=n<.5?n*(1+r):n+r-n*r,f=2*n-u,l=t/360;a[0]=l+1/3,a[1]=l,a[2]=l-1/3;for(let h=0;h<3;h++)a[h]<0&&(a[h]+=1),a[h]>1&&(a[h]-=1),6*a[h]<1?c[h]=f+(u-f)*6*a[h]:2*a[h]<1?c[h]=u:3*a[h]<2?c[h]=f+(u-f)*(2/3-a[h])*6:c[h]=f;[o,i,s]=[c[0]*255,c[1]*255,c[2]*255]}return e.length>3?[o,i,s,e[3]]:[o,i,s,1]},xn=(...e)=>{e=E(e,"rgba");let[t,r,n]=e;t/=255,r/=255,n/=255;const o=hn(t,r,n),i=dn(t,r,n),s=(i+o)/2;let a,c;return i===o?(a=0,c=Number.NaN):a=s<.5?(i-o)/(i+o):(i-o)/(2-i-o),t==i?c=(r-n)/(i-o):r==i?c=2+(n-t)/(i-o):n==i&&(c=4+(t-r)/(i-o)),c*=60,c<0&&(c+=360),e.length>3&&e[3]!==void 0?[c,a,s,e[3]]:[c,a,s]};_.prototype.hsl=function(){return xn(this._rgb)};const Fi=(...e)=>new _(...e,"hsl");k.hsl=Fi,$.format.hsl=Le,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"hsl"),N(e)==="array"&&e.length===3)return"hsl"}});const Ki=(e,t,r)=>jt(e,t,r,"hsl");H.hsl=Ki;const{floor:Xi}=Math,Di=(...e)=>{e=E(e,"hsv");let[t,r,n]=e,o,i,s;if(n*=255,r===0)o=i=s=n;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;const a=Xi(t),c=t-a,u=n*(1-r),f=n*(1-r*c),l=n*(1-r*(1-c));switch(a){case 0:[o,i,s]=[n,l,u];break;case 1:[o,i,s]=[f,n,u];break;case 2:[o,i,s]=[u,n,l];break;case 3:[o,i,s]=[u,f,n];break;case 4:[o,i,s]=[l,u,n];break;case 5:[o,i,s]=[n,u,f];break}}return[o,i,s,e.length>3?e[3]:1]},{min:Vi,max:Yi}=Math,Zi=(...e)=>{e=E(e,"rgb");let[t,r,n]=e;const o=Vi(t,r,n),i=Yi(t,r,n),s=i-o;let a,c,u;return u=i/255,i===0?(a=Number.NaN,c=0):(c=s/i,t===i&&(a=(r-n)/s),r===i&&(a=2+(n-t)/s),n===i&&(a=4+(t-r)/s),a*=60,a<0&&(a+=360)),[a,c,u]};_.prototype.hsv=function(){return Zi(this._rgb)};const Ji=(...e)=>new _(...e,"hsv");k.hsv=Ji,$.format.hsv=Di,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"hsv"),N(e)==="array"&&e.length===3)return"hsv"}});const Hi=(e,t,r)=>jt(e,t,r,"hsv");H.hsv=Hi;function Qt(e,t){let r=e.length;Array.isArray(e[0])||(e=[e]),Array.isArray(t[0])||(t=t.map(s=>[s]));let n=t[0].length,o=t[0].map((s,a)=>t.map(c=>c[a])),i=e.map(s=>o.map(a=>Array.isArray(s)?s.reduce((c,u,f)=>c+u*(a[f]||0),0):a.reduce((c,u)=>c+u*s,0)));return r===1&&(i=i[0]),n===1?i.map(s=>s[0]):i}const Ne=(...e)=>{e=E(e,"lab");const[t,r,n,...o]=e,[i,s,a]=Wi([t,r,n]),[c,u,f]=gn(i,s,a);return[c,u,f,...o.length>0&&o[0]<1?[o[0]]:[]]};function Wi(e){var t=[[1.2268798758459243,-.5578149944602171,.2813910456659647],[-.0405757452148008,1.112286803280317,-.0717110580655164],[-.0763729366746601,-.4214933324022432,1.5869240198367816]],r=[[1,.3963377773761749,.2158037573099136],[1,-.1055613458156586,-.0638541728258133],[1,-.0894841775298119,-1.2914855480194092]],n=Qt(r,e);return Qt(t,n.map(o=>o**3))}const Te=(...e)=>{const[t,r,n,...o]=E(e,"rgb"),i=_n(t,r,n);return[...Ui(i),...o.length>0&&o[0]<1?[o[0]]:[]]};function Ui(e){const t=[[.819022437996703,.3619062600528904,-.1288737815209879],[.0329836539323885,.9292868615863434,.0361446663506424],[.0481771893596242,.2642395317527308,.6335478284694309]],r=[[.210454268309314,.7936177747023054,-.0040720430116193],[1.9779985324311684,-2.42859224204858,.450593709617411],[.0259040424655478,.7827717124575296,-.8086757549230774]],n=Qt(t,e);return Qt(r,n.map(o=>Math.cbrt(o)))}_.prototype.oklab=function(){return Te(this._rgb)},Object.assign(k,{oklab:(...e)=>new _(...e,"oklab")}),$.format.oklab=Ne,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"oklab"),N(e)==="array"&&e.length===3)return"oklab"}});const Qi=(e,t,r)=>{const n=e.oklab(),o=t.oklab();return new _(n[0]+r*(o[0]-n[0]),n[1]+r*(o[1]-n[1]),n[2]+r*(o[2]-n[2]),"oklab")};H.oklab=Qi;const ta=(e,t,r)=>jt(e,t,r,"oklch");H.oklch=ta;const{pow:je,sqrt:Pe,PI:ze,cos:Cn,sin:kn,atan2:ea}=Math,ra=(e,t="lrgb",r=null)=>{const n=e.length;r||(r=Array.from(new Array(n)).map(()=>1));const o=n/r.reduce(function(l,h){return l+h});if(r.forEach((l,h)=>{r[h]*=o}),e=e.map(l=>new _(l)),t==="lrgb")return na(e,r);const i=e.shift(),s=i.get(t),a=[];let c=0,u=0;for(let l=0;l<s.length;l++)if(s[l]=(s[l]||0)*r[0],a.push(isNaN(s[l])?0:r[0]),t.charAt(l)==="h"&&!isNaN(s[l])){const h=s[l]/180*ze;c+=Cn(h)*r[0],u+=kn(h)*r[0]}let f=i.alpha()*r[0];e.forEach((l,h)=>{const d=l.get(t);f+=l.alpha()*r[h+1];for(let b=0;b<s.length;b++)if(!isNaN(d[b]))if(a[b]+=r[h+1],t.charAt(b)==="h"){const g=d[b]/180*ze;c+=Cn(g)*r[h+1],u+=kn(g)*r[h+1]}else s[b]+=d[b]*r[h+1]});for(let l=0;l<s.length;l++)if(t.charAt(l)==="h"){let h=ea(u/a[l],c/a[l])/ze*180;for(;h<0;)h+=360;for(;h>=360;)h-=360;s[l]=h}else s[l]=s[l]/a[l];return f/=n,new _(s,t).alpha(f>.99999?1:f,!0)},na=(e,t)=>{const r=e.length,n=[0,0,0,0];for(let o=0;o<e.length;o++){const i=e[o],s=t[o]/r,a=i._rgb;n[0]+=je(a[0],2)*s,n[1]+=je(a[1],2)*s,n[2]+=je(a[2],2)*s,n[3]+=a[3]*s}return n[0]=Pe(n[0]),n[1]=Pe(n[1]),n[2]=Pe(n[2]),n[3]>.9999999&&(n[3]=1),new _(xe(n))},{pow:oa}=Math;function te(e){let t="rgb",r=k("#ccc"),n=0,o=[0,1],i=[0,1],s=[],a=[0,0],c=!1,u=[],f=!1,l=0,h=1,d=!1,b={},g=!0,m=1;const y=function(p){if(p=p||["#fff","#000"],p&&N(p)==="string"&&k.brewer&&k.brewer[p.toLowerCase()]&&(p=k.brewer[p.toLowerCase()]),N(p)==="array"){p.length===1&&(p=[p[0],p[0]]),p=p.slice(0);for(let C=0;C<p.length;C++)p[C]=k(p[C]);s.length=0;for(let C=0;C<p.length;C++)s.push(C/(p.length-1))}return R(),u=p},L=function(p){if(c!=null){const C=c.length-1;let O=0;for(;O<C&&p>=c[O];)O++;return O-1}return 0};let w=p=>p,x=p=>p;const S=function(p,C){let O,q;if(C==null&&(C=!1),isNaN(p)||p===null)return r;C?q=p:c&&c.length>2?q=L(p)/(c.length-2):h!==l?q=(p-l)/(h-l):q=1,q=x(q),C||(q=w(q)),m!==1&&(q=oa(q,m)),q=a[0]+q*(1-a[0]-a[1]),q=qt(q,0,1);const T=Math.floor(q*1e4);if(g&&b[T])O=b[T];else{if(N(u)==="array")for(let A=0;A<s.length;A++){const P=s[A];if(q<=P){O=u[A];break}if(q>=P&&A===s.length-1){O=u[A];break}if(q>P&&q<s[A+1]){q=(q-P)/(s[A+1]-P),O=k.interpolate(u[A],u[A+1],q,t);break}}else N(u)==="function"&&(O=u(q));g&&(b[T]=O)}return O};var R=()=>b={};y(e);const M=function(p){const C=k(S(p));return f&&C[f]?C[f]():C};return M.classes=function(p){if(p!=null){if(N(p)==="array")c=p,o=[p[0],p[p.length-1]];else{const C=k.analyze(o);p===0?c=[C.min,C.max]:c=k.limits(C,"e",p)}return M}return c},M.domain=function(p){if(!arguments.length)return i;i=p.slice(0),l=p[0],h=p[p.length-1],s=[];const C=u.length;if(p.length===C&&l!==h)for(let O of Array.from(p))s.push((O-l)/(h-l));else{for(let O=0;O<C;O++)s.push(O/(C-1));if(p.length>2){const O=p.map((T,A)=>A/(p.length-1)),q=p.map(T=>(T-l)/(h-l));q.every((T,A)=>O[A]===T)||(x=T=>{if(T<=0||T>=1)return T;let A=0;for(;T>=q[A+1];)A++;const P=(T-q[A])/(q[A+1]-q[A]);return O[A]+P*(O[A+1]-O[A])})}}return o=[l,h],M},M.mode=function(p){return arguments.length?(t=p,R(),M):t},M.range=function(p,C){return y(p),M},M.out=function(p){return f=p,M},M.spread=function(p){return arguments.length?(n=p,M):n},M.correctLightness=function(p){return p==null&&(p=!0),d=p,R(),d?w=function(C){const O=S(0,!0).lab()[0],q=S(1,!0).lab()[0],T=O>q;let A=S(C,!0).lab()[0];const P=O+(q-O)*C;let G=A-P,Y=0,U=1,ut=20;for(;Math.abs(G)>.01&&ut-- >0;)(function(){return T&&(G*=-1),G<0?(Y=C,C+=(U-C)*.5):(U=C,C+=(Y-C)*.5),A=S(C,!0).lab()[0],G=A-P})();return C}:w=C=>C,M},M.padding=function(p){return p!=null?(N(p)==="number"&&(p=[p,p]),a=p,M):a},M.colors=function(p,C){arguments.length<2&&(C="hex");let O=[];if(arguments.length===0)O=u.slice(0);else if(p===1)O=[M(.5)];else if(p>1){const q=o[0],T=o[1]-q;O=sa(0,p).map(A=>M(q+A/(p-1)*T))}else{e=[];let q=[];if(c&&c.length>2)for(let T=1,A=c.length,P=1<=A;P?T<A:T>A;P?T++:T--)q.push((c[T-1]+c[T])*.5);else q=o;O=q.map(T=>M(T))}return k[C]&&(O=O.map(q=>q[C]())),O},M.cache=function(p){return p!=null?(g=p,M):g},M.gamma=function(p){return p!=null?(m=p,M):m},M.nodata=function(p){return p!=null?(r=k(p),M):r},M}function sa(e,t,r){let n=[],o=e<t,i=t;for(let s=e;o?s<i:s>i;o?s++:s--)n.push(s);return n}const ia=function(e){let t=[1,1];for(let r=1;r<e;r++){let n=[1];for(let o=1;o<=t.length;o++)n[o]=(t[o]||0)+t[o-1];t=n}return t},aa=function(e){let t,r,n,o;if(e=e.map(i=>new _(i)),e.length===2)[r,n]=e.map(i=>i.lab()),t=function(i){const s=[0,1,2].map(a=>r[a]+i*(n[a]-r[a]));return new _(s,"lab")};else if(e.length===3)[r,n,o]=e.map(i=>i.lab()),t=function(i){const s=[0,1,2].map(a=>(1-i)*(1-i)*r[a]+2*(1-i)*i*n[a]+i*i*o[a]);return new _(s,"lab")};else if(e.length===4){let i;[r,n,o,i]=e.map(s=>s.lab()),t=function(s){const a=[0,1,2].map(c=>(1-s)*(1-s)*(1-s)*r[c]+3*(1-s)*(1-s)*s*n[c]+3*(1-s)*s*s*o[c]+s*s*s*i[c]);return new _(a,"lab")}}else if(e.length>=5){let i,s,a;i=e.map(c=>c.lab()),a=e.length-1,s=ia(a),t=function(c){const u=1-c,f=[0,1,2].map(l=>i.reduce((h,d,b)=>h+s[b]*u**(a-b)*c**b*d[l],0));return new _(f,"lab")}}else throw new RangeError("No point in running bezier with only one color.");return t},ca=e=>{const t=aa(e);return t.scale=()=>te(t),t},{round:Rn}=Math;_.prototype.rgb=function(e=!0){return e===!1?this._rgb.slice(0,3):this._rgb.slice(0,3).map(Rn)},_.prototype.rgba=function(e=!0){return this._rgb.slice(0,4).map((t,r)=>r<3?e===!1?t:Rn(t):t)},Object.assign(k,{rgb:(...e)=>new _(...e,"rgb")}),$.format.rgb=(...e)=>{const t=E(e,"rgba");return t[3]===void 0&&(t[3]=1),t},$.autodetect.push({p:3,test:(...e)=>{if(e=E(e,"rgba"),N(e)==="array"&&(e.length===3||e.length===4&&N(e[3])=="number"&&e[3]>=0&&e[3]<=1))return"rgb"}});const nt=(e,t,r)=>{if(!nt[r])throw new Error("unknown blend mode "+r);return nt[r](e,t)},_t=e=>(t,r)=>{const n=k(r).rgb(),o=k(t).rgb();return k.rgb(e(n,o))},vt=e=>(t,r)=>{const n=[];return n[0]=e(t[0],r[0]),n[1]=e(t[1],r[1]),n[2]=e(t[2],r[2]),n},ua=e=>e,la=(e,t)=>e*t/255,fa=(e,t)=>e>t?t:e,ha=(e,t)=>e>t?e:t,da=(e,t)=>255*(1-(1-e/255)*(1-t/255)),ba=(e,t)=>t<128?2*e*t/255:255*(1-2*(1-e/255)*(1-t/255)),pa=(e,t)=>255*(1-(1-t/255)/(e/255)),ma=(e,t)=>e===255?255:(e=255*(t/255)/(1-e/255),e>255?255:e);nt.normal=_t(vt(ua)),nt.multiply=_t(vt(la)),nt.screen=_t(vt(da)),nt.overlay=_t(vt(ba)),nt.darken=_t(vt(fa)),nt.lighten=_t(vt(ha)),nt.dodge=_t(vt(ma)),nt.burn=_t(vt(pa));const{pow:ga,sin:_a,cos:va}=Math;function ya(e=300,t=-1.5,r=1,n=1,o=[0,1]){let i=0,s;N(o)==="array"?s=o[1]-o[0]:(s=0,o=[o,o]);const a=function(c){const u=ft*((e+120)/360+t*c),f=ga(o[0]+s*c,n),h=(i!==0?r[0]+c*i:r)*f*(1-f)/2,d=va(u),b=_a(u),g=f+h*(-.14861*d+1.78277*b),m=f+h*(-.29227*d-.90649*b),y=f+h*(1.97294*d);return k(xe([g*255,m*255,y*255,1]))};return a.start=function(c){return c==null?e:(e=c,a)},a.rotations=function(c){return c==null?t:(t=c,a)},a.gamma=function(c){return c==null?n:(n=c,a)},a.hue=function(c){return c==null?r:(r=c,N(r)==="array"?(i=r[1]-r[0],i===0&&(r=r[1])):i=0,a)},a.lightness=function(c){return c==null?o:(N(c)==="array"?(o=c,s=c[1]-c[0]):(o=[c,c],s=0),a)},a.scale=()=>k.scale(a),a.hue(r),a}const wa="0123456789abcdef",{floor:xa,random:Ca}=Math,ka=(e=Ca)=>{let t="#";for(let r=0;r<6;r++)t+=wa.charAt(xa(e()*16));return new _(t,"hex")},{log:qn,pow:Ra,floor:qa,abs:Ma}=Math;function Mn(e,t=null){const r={min:Number.MAX_VALUE,max:Number.MAX_VALUE*-1,sum:0,values:[],count:0};return N(e)==="object"&&(e=Object.values(e)),e.forEach(n=>{t&&N(n)==="object"&&(n=n[t]),n!=null&&!isNaN(n)&&(r.values.push(n),r.sum+=n,n<r.min&&(r.min=n),n>r.max&&(r.max=n),r.count+=1)}),r.domain=[r.min,r.max],r.limits=(n,o)=>On(r,n,o),r}function On(e,t="equal",r=7){N(e)=="array"&&(e=Mn(e));const{min:n,max:o}=e,i=e.values.sort((a,c)=>a-c);if(r===1)return[n,o];const s=[];if(t.substr(0,1)==="c"&&(s.push(n),s.push(o)),t.substr(0,1)==="e"){s.push(n);for(let a=1;a<r;a++)s.push(n+a/r*(o-n));s.push(o)}else if(t.substr(0,1)==="l"){if(n<=0)throw new Error("Logarithmic scales are only possible for values > 0");const a=Math.LOG10E*qn(n),c=Math.LOG10E*qn(o);s.push(n);for(let u=1;u<r;u++)s.push(Ra(10,a+u/r*(c-a)));s.push(o)}else if(t.substr(0,1)==="q"){s.push(n);for(let a=1;a<r;a++){const c=(i.length-1)*a/r,u=qa(c);if(u===c)s.push(i[u]);else{const f=c-u;s.push(i[u]*(1-f)+i[u+1]*f)}}s.push(o)}else if(t.substr(0,1)==="k"){let a;const c=i.length,u=new Array(c),f=new Array(r);let l=!0,h=0,d=null;d=[],d.push(n);for(let m=1;m<r;m++)d.push(n+m/r*(o-n));for(d.push(o);l;){for(let y=0;y<r;y++)f[y]=0;for(let y=0;y<c;y++){const L=i[y];let w=Number.MAX_VALUE,x;for(let S=0;S<r;S++){const R=Ma(d[S]-L);R<w&&(w=R,x=S),f[x]++,u[y]=x}}const m=new Array(r);for(let y=0;y<r;y++)m[y]=null;for(let y=0;y<c;y++)a=u[y],m[a]===null?m[a]=i[y]:m[a]+=i[y];for(let y=0;y<r;y++)m[y]*=1/f[y];l=!1;for(let y=0;y<r;y++)if(m[y]!==d[y]){l=!0;break}d=m,h++,h>200&&(l=!1)}const b={};for(let m=0;m<r;m++)b[m]=[];for(let m=0;m<c;m++)a=u[m],b[a].push(i[m]);let g=[];for(let m=0;m<r;m++)g.push(b[m][0]),g.push(b[m][b[m].length-1]);g=g.sort((m,y)=>m-y),s.push(g[0]);for(let m=1;m<g.length;m+=2){const y=g[m];!isNaN(y)&&s.indexOf(y)===-1&&s.push(y)}}return s}const Oa=(e,t)=>{e=new _(e),t=new _(t);const r=e.luminance(),n=t.luminance();return r>n?(r+.05)/(n+.05):(n+.05)/(r+.05)};const An=.027,Aa=5e-4,Sa=.1,Sn=1.14,ee=.022,$n=1.414,$a=(e,t)=>{e=new _(e),t=new _(t),e.alpha()<1&&(e=Nt(t,e,e.alpha(),"rgb"));const r=En(...e.rgb()),n=En(...t.rgb()),o=r>=ee?r:r+Math.pow(ee-r,$n),i=n>=ee?n:n+Math.pow(ee-n,$n),s=Math.pow(i,.56)-Math.pow(o,.57),a=Math.pow(i,.65)-Math.pow(o,.62),c=Math.abs(i-o)<Aa?0:o<i?s*Sn:a*Sn;return(Math.abs(c)<Sa?0:c>0?c-An:c+An)*100};function En(e,t,r){return .2126729*Math.pow(e/255,2.4)+.7151522*Math.pow(t/255,2.4)+.072175*Math.pow(r/255,2.4)}const{sqrt:dt,pow:F,min:Ea,max:La,atan2:Ln,abs:Nn,cos:re,sin:Tn,exp:Na,PI:jn}=Math;function Ta(e,t,r=1,n=1,o=1){var i=function(Ct){return 360*Ct/(2*jn)},s=function(Ct){return 2*jn*Ct/360};e=new _(e),t=new _(t);const[a,c,u]=Array.from(e.lab()),[f,l,h]=Array.from(t.lab()),d=(a+f)/2,b=dt(F(c,2)+F(u,2)),g=dt(F(l,2)+F(h,2)),m=(b+g)/2,y=.5*(1-dt(F(m,7)/(F(m,7)+F(25,7)))),L=c*(1+y),w=l*(1+y),x=dt(F(L,2)+F(u,2)),S=dt(F(w,2)+F(h,2)),R=(x+S)/2,M=i(Ln(u,L)),p=i(Ln(h,w)),C=M>=0?M:M+360,O=p>=0?p:p+360,q=Nn(C-O)>180?(C+O+360)/2:(C+O)/2,T=1-.17*re(s(q-30))+.24*re(s(2*q))+.32*re(s(3*q+6))-.2*re(s(4*q-63));let A=O-C;A=Nn(A)<=180?A:O<=C?A+360:A-360,A=2*dt(x*S)*Tn(s(A)/2);const P=f-a,G=S-x,Y=1+.015*F(d-50,2)/dt(20+F(d-50,2)),U=1+.045*R,ut=1+.015*R*T,xt=30*Na(-F((q-275)/25,2)),lt=-(2*dt(F(R,7)/(F(R,7)+F(25,7))))*Tn(2*s(xt)),Mt=dt(F(P/(r*Y),2)+F(G/(n*U),2)+F(A/(o*ut),2)+lt*(G/(n*U))*(A/(o*ut)));return La(0,Ea(100,Mt))}function ja(e,t,r="lab"){e=new _(e),t=new _(t);const n=e.get(r),o=t.get(r);let i=0;for(let s in n){const a=(n[s]||0)-(o[s]||0);i+=a*a}return Math.sqrt(i)}const Pa=(...e)=>{try{return new _(...e),!0}catch{return!1}},za={cool(){return te([k.hsl(180,1,.9),k.hsl(250,.7,.4)])},hot(){return te(["#000","#f00","#ff0","#fff"]).mode("rgb")}},Be={OrRd:["#fff7ec","#fee8c8","#fdd49e","#fdbb84","#fc8d59","#ef6548","#d7301f","#b30000","#7f0000"],PuBu:["#fff7fb","#ece7f2","#d0d1e6","#a6bddb","#74a9cf","#3690c0","#0570b0","#045a8d","#023858"],BuPu:["#f7fcfd","#e0ecf4","#bfd3e6","#9ebcda","#8c96c6","#8c6bb1","#88419d","#810f7c","#4d004b"],Oranges:["#fff5eb","#fee6ce","#fdd0a2","#fdae6b","#fd8d3c","#f16913","#d94801","#a63603","#7f2704"],BuGn:["#f7fcfd","#e5f5f9","#ccece6","#99d8c9","#66c2a4","#41ae76","#238b45","#006d2c","#00441b"],YlOrBr:["#ffffe5","#fff7bc","#fee391","#fec44f","#fe9929","#ec7014","#cc4c02","#993404","#662506"],YlGn:["#ffffe5","#f7fcb9","#d9f0a3","#addd8e","#78c679","#41ab5d","#238443","#006837","#004529"],Reds:["#fff5f0","#fee0d2","#fcbba1","#fc9272","#fb6a4a","#ef3b2c","#cb181d","#a50f15","#67000d"],RdPu:["#fff7f3","#fde0dd","#fcc5c0","#fa9fb5","#f768a1","#dd3497","#ae017e","#7a0177","#49006a"],Greens:["#f7fcf5","#e5f5e0","#c7e9c0","#a1d99b","#74c476","#41ab5d","#238b45","#006d2c","#00441b"],YlGnBu:["#ffffd9","#edf8b1","#c7e9b4","#7fcdbb","#41b6c4","#1d91c0","#225ea8","#253494","#081d58"],Purples:["#fcfbfd","#efedf5","#dadaeb","#bcbddc","#9e9ac8","#807dba","#6a51a3","#54278f","#3f007d"],GnBu:["#f7fcf0","#e0f3db","#ccebc5","#a8ddb5","#7bccc4","#4eb3d3","#2b8cbe","#0868ac","#084081"],Greys:["#ffffff","#f0f0f0","#d9d9d9","#bdbdbd","#969696","#737373","#525252","#252525","#000000"],YlOrRd:["#ffffcc","#ffeda0","#fed976","#feb24c","#fd8d3c","#fc4e2a","#e31a1c","#bd0026","#800026"],PuRd:["#f7f4f9","#e7e1ef","#d4b9da","#c994c7","#df65b0","#e7298a","#ce1256","#980043","#67001f"],Blues:["#f7fbff","#deebf7","#c6dbef","#9ecae1","#6baed6","#4292c6","#2171b5","#08519c","#08306b"],PuBuGn:["#fff7fb","#ece2f0","#d0d1e6","#a6bddb","#67a9cf","#3690c0","#02818a","#016c59","#014636"],Viridis:["#440154","#482777","#3f4a8a","#31678e","#26838f","#1f9d8a","#6cce5a","#b6de2b","#fee825"],Spectral:["#9e0142","#d53e4f","#f46d43","#fdae61","#fee08b","#ffffbf","#e6f598","#abdda4","#66c2a5","#3288bd","#5e4fa2"],RdYlGn:["#a50026","#d73027","#f46d43","#fdae61","#fee08b","#ffffbf","#d9ef8b","#a6d96a","#66bd63","#1a9850","#006837"],RdBu:["#67001f","#b2182b","#d6604d","#f4a582","#fddbc7","#f7f7f7","#d1e5f0","#92c5de","#4393c3","#2166ac","#053061"],PiYG:["#8e0152","#c51b7d","#de77ae","#f1b6da","#fde0ef","#f7f7f7","#e6f5d0","#b8e186","#7fbc41","#4d9221","#276419"],PRGn:["#40004b","#762a83","#9970ab","#c2a5cf","#e7d4e8","#f7f7f7","#d9f0d3","#a6dba0","#5aae61","#1b7837","#00441b"],RdYlBu:["#a50026","#d73027","#f46d43","#fdae61","#fee090","#ffffbf","#e0f3f8","#abd9e9","#74add1","#4575b4","#313695"],BrBG:["#543005","#8c510a","#bf812d","#dfc27d","#f6e8c3","#f5f5f5","#c7eae5","#80cdc1","#35978f","#01665e","#003c30"],RdGy:["#67001f","#b2182b","#d6604d","#f4a582","#fddbc7","#ffffff","#e0e0e0","#bababa","#878787","#4d4d4d","#1a1a1a"],PuOr:["#7f3b08","#b35806","#e08214","#fdb863","#fee0b6","#f7f7f7","#d8daeb","#b2abd2","#8073ac","#542788","#2d004b"],Set2:["#66c2a5","#fc8d62","#8da0cb","#e78ac3","#a6d854","#ffd92f","#e5c494","#b3b3b3"],Accent:["#7fc97f","#beaed4","#fdc086","#ffff99","#386cb0","#f0027f","#bf5b17","#666666"],Set1:["#e41a1c","#377eb8","#4daf4a","#984ea3","#ff7f00","#ffff33","#a65628","#f781bf","#999999"],Set3:["#8dd3c7","#ffffb3","#bebada","#fb8072","#80b1d3","#fdb462","#b3de69","#fccde5","#d9d9d9","#bc80bd","#ccebc5","#ffed6f"],Dark2:["#1b9e77","#d95f02","#7570b3","#e7298a","#66a61e","#e6ab02","#a6761d","#666666"],Paired:["#a6cee3","#1f78b4","#b2df8a","#33a02c","#fb9a99","#e31a1c","#fdbf6f","#ff7f00","#cab2d6","#6a3d9a","#ffff99","#b15928"],Pastel2:["#b3e2cd","#fdcdac","#cbd5e8","#f4cae4","#e6f5c9","#fff2ae","#f1e2cc","#cccccc"],Pastel1:["#fbb4ae","#b3cde3","#ccebc5","#decbe4","#fed9a6","#ffffcc","#e5d8bd","#fddaec","#f2f2f2"]},Pn=Object.keys(Be),zn=new Map(Pn.map(e=>[e.toLowerCase(),e])),Ba=typeof Proxy=="function"?new Proxy(Be,{get(e,t){const r=t.toLowerCase();if(zn.has(r))return e[zn.get(r)]},getOwnPropertyNames(){return Object.getOwnPropertyNames(Pn)}}):Be,Ia=(...e)=>{e=E(e,"cmyk");const[t,r,n,o]=e,i=e.length>4?e[4]:1;return o===1?[0,0,0,i]:[t>=1?0:255*(1-t)*(1-o),r>=1?0:255*(1-r)*(1-o),n>=1?0:255*(1-n)*(1-o),i]},{max:Bn}=Math,Ga=(...e)=>{let[t,r,n]=E(e,"rgb");t=t/255,r=r/255,n=n/255;const o=1-Bn(t,Bn(r,n)),i=o<1?1/(1-o):0,s=(1-t-o)*i,a=(1-r-o)*i,c=(1-n-o)*i;return[s,a,c,o]};_.prototype.cmyk=function(){return Ga(this._rgb)},Object.assign(k,{cmyk:(...e)=>new _(...e,"cmyk")}),$.format.cmyk=Ia,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"cmyk"),N(e)==="array"&&e.length===4)return"cmyk"}});const Fa=(...e)=>{const t=E(e,"hsla");let r=Et(e)||"lsa";return t[0]=et(t[0]||0)+"deg",t[1]=et(t[1]*100)+"%",t[2]=et(t[2]*100)+"%",r==="hsla"||t.length>3&&t[3]<1?(t[3]="/ "+(t.length>3?t[3]:1),r="hsla"):t.length=3,`${r.substr(0,3)}(${t.join(" ")})`},Ka=(...e)=>{const t=E(e,"lab");let r=Et(e)||"lab";return t[0]=et(t[0])+"%",t[1]=et(t[1]),t[2]=et(t[2]),r==="laba"||t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`lab(${t.join(" ")})`},Xa=(...e)=>{const t=E(e,"lch");let r=Et(e)||"lab";return t[0]=et(t[0])+"%",t[1]=et(t[1]),t[2]=isNaN(t[2])?"none":et(t[2])+"deg",r==="lcha"||t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`lch(${t.join(" ")})`},Da=(...e)=>{const t=E(e,"lab");return t[0]=et(t[0]*100)+"%",t[1]=Ce(t[1]),t[2]=Ce(t[2]),t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`oklab(${t.join(" ")})`},In=(...e)=>{const[t,r,n,...o]=E(e,"rgb"),[i,s,a]=Te(t,r,n),[c,u,f]=yn(i,s,a);return[c,u,f,...o.length>0&&o[0]<1?[o[0]]:[]]},Va=(...e)=>{const t=E(e,"lch");return t[0]=et(t[0]*100)+"%",t[1]=Ce(t[1]),t[2]=isNaN(t[2])?"none":et(t[2])+"deg",t.length>3&&t[3]<1?t[3]="/ "+(t.length>3?t[3]:1):t.length=3,`oklch(${t.join(" ")})`},{round:Ie}=Math,Ya=(...e)=>{const t=E(e,"rgba");let r=Et(e)||"rgb";if(r.substr(0,3)==="hsl")return Fa(xn(t),r);if(r.substr(0,3)==="lab"){const n=Kt();ht("d50");const o=Ka(Me(t),r);return ht(n),o}if(r.substr(0,3)==="lch"){const n=Kt();ht("d50");const o=Xa($e(t),r);return ht(n),o}return r.substr(0,5)==="oklab"?Da(Te(t)):r.substr(0,5)==="oklch"?Va(In(t)):(t[0]=Ie(t[0]),t[1]=Ie(t[1]),t[2]=Ie(t[2]),(r==="rgba"||t.length>3&&t[3]<1)&&(t[3]="/ "+(t.length>3?t[3]:1),r="rgba"),`${r.substr(0,3)}(${t.slice(0,r==="rgb"?3:4).join(" ")})`)},Gn=(...e)=>{e=E(e,"lch");const[t,r,n,...o]=e,[i,s,a]=vn(t,r,n),[c,u,f]=Ne(i,s,a);return[c,u,f,...o.length>0&&o[0]<1?[o[0]]:[]]},bt=/((?:-?\d+)|(?:-?\d+(?:\.\d+)?)%|none)/.source,ot=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)%?)|none)/.source,ne=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)%)|none)/.source,rt=/\s*/.source,zt=/\s+/.source,Ge=/\s*,\s*/.source,oe=/((?:-?(?:\d+(?:\.\d*)?|\.\d+)(?:deg)?)|none)/.source,Bt=/\s*(?:\/\s*((?:[01]|[01]?\.\d+)|\d+(?:\.\d+)?%))?/.source,Fn=new RegExp("^rgba?\\("+rt+[bt,bt,bt].join(zt)+Bt+"\\)$"),Kn=new RegExp("^rgb\\("+rt+[bt,bt,bt].join(Ge)+rt+"\\)$"),Xn=new RegExp("^rgba\\("+rt+[bt,bt,bt,ot].join(Ge)+rt+"\\)$"),Dn=new RegExp("^hsla?\\("+rt+[oe,ne,ne].join(zt)+Bt+"\\)$"),Vn=new RegExp("^hsl?\\("+rt+[oe,ne,ne].join(Ge)+rt+"\\)$"),Yn=/^hsla\(\s*(-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*,\s*([01]|[01]?\.\d+)\)$/,Zn=new RegExp("^lab\\("+rt+[ot,ot,ot].join(zt)+Bt+"\\)$"),Jn=new RegExp("^lch\\("+rt+[ot,ot,oe].join(zt)+Bt+"\\)$"),Hn=new RegExp("^oklab\\("+rt+[ot,ot,ot].join(zt)+Bt+"\\)$"),Wn=new RegExp("^oklch\\("+rt+[ot,ot,oe].join(zt)+Bt+"\\)$"),{round:Un}=Math,It=e=>e.map((t,r)=>r<=2?qt(Un(t),0,255):t),K=(e,t=0,r=100,n=!1)=>(typeof e=="string"&&e.endsWith("%")&&(e=parseFloat(e.substring(0,e.length-1))/100,n?e=t+(e+1)*.5*(r-t):e=t+e*(r-t)),+e),W=(e,t)=>e==="none"?t:e,Fe=e=>{if(e=e.toLowerCase().trim(),e==="transparent")return[0,0,0,0];let t;if($.format.named)try{return $.format.named(e)}catch{}if((t=e.match(Fn))||(t=e.match(Kn))){let r=t.slice(1,4);for(let o=0;o<3;o++)r[o]=+K(W(r[o],0),0,255);r=It(r);const n=t[4]!==void 0?+K(t[4],0,1):1;return r[3]=n,r}if(t=e.match(Xn)){const r=t.slice(1,5);for(let n=0;n<4;n++)r[n]=+K(r[n],0,255);return r}if((t=e.match(Dn))||(t=e.match(Vn))){const r=t.slice(1,4);r[0]=+W(r[0].replace("deg",""),0),r[1]=+K(W(r[1],0),0,100)*.01,r[2]=+K(W(r[2],0),0,100)*.01;const n=It(Le(r)),o=t[4]!==void 0?+K(t[4],0,1):1;return n[3]=o,n}if(t=e.match(Yn)){const r=t.slice(1,4);r[1]*=.01,r[2]*=.01;const n=Le(r);for(let o=0;o<3;o++)n[o]=Un(n[o]);return n[3]=+t[4],n}if(t=e.match(Zn)){const r=t.slice(1,4);r[0]=K(W(r[0],0),0,100),r[1]=K(W(r[1],0),-125,125,!0),r[2]=K(W(r[2],0),-125,125,!0);const n=Kt();ht("d50");const o=It(Re(r));ht(n);const i=t[4]!==void 0?+K(t[4],0,1):1;return o[3]=i,o}if(t=e.match(Jn)){const r=t.slice(1,4);r[0]=K(r[0],0,100),r[1]=K(W(r[1],0),0,150,!1),r[2]=+W(r[2].replace("deg",""),0);const n=Kt();ht("d50");const o=It(Se(r));ht(n);const i=t[4]!==void 0?+K(t[4],0,1):1;return o[3]=i,o}if(t=e.match(Hn)){const r=t.slice(1,4);r[0]=K(W(r[0],0),0,1),r[1]=K(W(r[1],0),-.4,.4,!0),r[2]=K(W(r[2],0),-.4,.4,!0);const n=It(Ne(r)),o=t[4]!==void 0?+K(t[4],0,1):1;return n[3]=o,n}if(t=e.match(Wn)){const r=t.slice(1,4);r[0]=K(W(r[0],0),0,1),r[1]=K(W(r[1],0),0,.4,!1),r[2]=+W(r[2].replace("deg",""),0);const n=It(Gn(r)),o=t[4]!==void 0?+K(t[4],0,1):1;return n[3]=o,n}};Fe.test=e=>Fn.test(e)||Dn.test(e)||Zn.test(e)||Jn.test(e)||Hn.test(e)||Wn.test(e)||Kn.test(e)||Xn.test(e)||Vn.test(e)||Yn.test(e)||e==="transparent",_.prototype.css=function(e){return Ya(this._rgb,e)};const Za=(...e)=>new _(...e,"css");k.css=Za,$.format.css=Fe,$.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&N(e)==="string"&&Fe.test(e))return"css"}}),$.format.gl=(...e)=>{const t=E(e,"rgba");return t[0]*=255,t[1]*=255,t[2]*=255,t};const Ja=(...e)=>new _(...e,"gl");k.gl=Ja,_.prototype.gl=function(){const e=this._rgb;return[e[0]/255,e[1]/255,e[2]/255,e[3]]},_.prototype.hex=function(e){return mn(this._rgb,e)};const Ha=(...e)=>new _(...e,"hex");k.hex=Ha,$.format.hex=pn,$.autodetect.push({p:4,test:(e,...t)=>{if(!t.length&&N(e)==="string"&&[3,4,5,6,7,8,9].indexOf(e.length)>=0)return"hex"}});const{log:se}=Math,Qn=e=>{const t=e/100;let r,n,o;return t<66?(r=255,n=t<6?0:-155.25485562709179-.44596950469579133*(n=t-2)+104.49216199393888*se(n),o=t<20?0:-254.76935184120902+.8274096064007395*(o=t-10)+115.67994401066147*se(o)):(r=351.97690566805693+.114206453784165*(r=t-55)-40.25366309332127*se(r),n=325.4494125711974+.07943456536662342*(n=t-50)-28.0852963507957*se(n),o=255),[r,n,o,1]},{round:Wa}=Math,Ua=(...e)=>{const t=E(e,"rgb"),r=t[0],n=t[2];let o=1e3,i=4e4;const s=.4;let a;for(;i-o>s;){a=(i+o)*.5;const c=Qn(a);c[2]/c[0]>=n/r?i=a:o=a}return Wa(a)};_.prototype.temp=_.prototype.kelvin=_.prototype.temperature=function(){return Ua(this._rgb)};const Ke=(...e)=>new _(...e,"temp");Object.assign(k,{temp:Ke,kelvin:Ke,temperature:Ke}),$.format.temp=$.format.kelvin=$.format.temperature=Qn,_.prototype.oklch=function(){return In(this._rgb)},Object.assign(k,{oklch:(...e)=>new _(...e,"oklch")}),$.format.oklch=Gn,$.autodetect.push({p:2,test:(...e)=>{if(e=E(e,"oklch"),N(e)==="array"&&e.length===3)return"oklch"}}),Object.assign(k,{analyze:Mn,average:ra,bezier:ca,blend:nt,brewer:Ba,Color:_,colors:Lt,contrast:Oa,contrastAPCA:$a,cubehelix:ya,deltaE:Ta,distance:ja,input:$,interpolate:Nt,limits:On,mix:Nt,random:ka,scale:te,scales:za,valid:Pa});class v{constructor(){this.hex="#000000",this.rgb_r=0,this.rgb_g=0,this.rgb_b=0,this.xyz_x=0,this.xyz_y=0,this.xyz_z=0,this.luv_l=0,this.luv_u=0,this.luv_v=0,this.lch_l=0,this.lch_c=0,this.lch_h=0,this.hsluv_h=0,this.hsluv_s=0,this.hsluv_l=0,this.hpluv_h=0,this.hpluv_p=0,this.hpluv_l=0,this.r0s=0,this.r0i=0,this.r1s=0,this.r1i=0,this.g0s=0,this.g0i=0,this.g1s=0,this.g1i=0,this.b0s=0,this.b0i=0,this.b1s=0,this.b1i=0}static fromLinear(t){return t<=.0031308?12.92*t:1.055*Math.pow(t,.4166666666666667)-.055}static toLinear(t){return t>.04045?Math.pow((t+.055)/1.055,2.4):t/12.92}static yToL(t){return t<=v.epsilon?t/v.refY*v.kappa:116*Math.pow(t/v.refY,.3333333333333333)-16}static lToY(t){return t<=8?v.refY*t/v.kappa:v.refY*Math.pow((t+16)/116,3)}static rgbChannelToHex(t){const r=Math.round(t*255),n=r%16,o=(r-n)/16|0;return v.hexChars.charAt(o)+v.hexChars.charAt(n)}static hexToRgbChannel(t,r){const n=v.hexChars.indexOf(t.charAt(r)),o=v.hexChars.indexOf(t.charAt(r+1));return(n*16+o)/255}static distanceFromOriginAngle(t,r,n){const o=r/(Math.sin(n)-t*Math.cos(n));return o<0?1/0:o}static distanceFromOrigin(t,r){return Math.abs(r)/Math.sqrt(Math.pow(t,2)+1)}static min6(t,r,n,o,i,s){return Math.min(t,Math.min(r,Math.min(n,Math.min(o,Math.min(i,s)))))}rgbToHex(){this.hex="#",this.hex+=v.rgbChannelToHex(this.rgb_r),this.hex+=v.rgbChannelToHex(this.rgb_g),this.hex+=v.rgbChannelToHex(this.rgb_b)}hexToRgb(){this.hex=this.hex.toLowerCase(),this.rgb_r=v.hexToRgbChannel(this.hex,1),this.rgb_g=v.hexToRgbChannel(this.hex,3),this.rgb_b=v.hexToRgbChannel(this.hex,5)}xyzToRgb(){this.rgb_r=v.fromLinear(v.m_r0*this.xyz_x+v.m_r1*this.xyz_y+v.m_r2*this.xyz_z),this.rgb_g=v.fromLinear(v.m_g0*this.xyz_x+v.m_g1*this.xyz_y+v.m_g2*this.xyz_z),this.rgb_b=v.fromLinear(v.m_b0*this.xyz_x+v.m_b1*this.xyz_y+v.m_b2*this.xyz_z)}rgbToXyz(){const t=v.toLinear(this.rgb_r),r=v.toLinear(this.rgb_g),n=v.toLinear(this.rgb_b);this.xyz_x=.41239079926595*t+.35758433938387*r+.18048078840183*n,this.xyz_y=.21263900587151*t+.71516867876775*r+.072192315360733*n,this.xyz_z=.019330818715591*t+.11919477979462*r+.95053215224966*n}xyzToLuv(){const t=this.xyz_x+15*this.xyz_y+3*this.xyz_z;let r=4*this.xyz_x,n=9*this.xyz_y;t!==0?(r/=t,n/=t):(r=NaN,n=NaN),this.luv_l=v.yToL(this.xyz_y),this.luv_l===0?(this.luv_u=0,this.luv_v=0):(this.luv_u=13*this.luv_l*(r-v.refU),this.luv_v=13*this.luv_l*(n-v.refV))}luvToXyz(){if(this.luv_l===0){this.xyz_x=0,this.xyz_y=0,this.xyz_z=0;return}const t=this.luv_u/(13*this.luv_l)+v.refU,r=this.luv_v/(13*this.luv_l)+v.refV;this.xyz_y=v.lToY(this.luv_l),this.xyz_x=0-9*this.xyz_y*t/((t-4)*r-t*r),this.xyz_z=(9*this.xyz_y-15*r*this.xyz_y-r*this.xyz_x)/(3*r)}luvToLch(){if(this.lch_l=this.luv_l,this.lch_c=Math.sqrt(this.luv_u*this.luv_u+this.luv_v*this.luv_v),this.lch_c<1e-8)this.lch_h=0;else{const t=Math.atan2(this.luv_v,this.luv_u);this.lch_h=t*180/Math.PI,this.lch_h<0&&(this.lch_h=360+this.lch_h)}}lchToLuv(){const t=this.lch_h/180*Math.PI;this.luv_l=this.lch_l,this.luv_u=Math.cos(t)*this.lch_c,this.luv_v=Math.sin(t)*this.lch_c}calculateBoundingLines(t){const r=Math.pow(t+16,3)/1560896,n=r>v.epsilon?r:t/v.kappa,o=n*(284517*v.m_r0-94839*v.m_r2),i=n*(838422*v.m_r2+769860*v.m_r1+731718*v.m_r0),s=n*(632260*v.m_r2-126452*v.m_r1),a=n*(284517*v.m_g0-94839*v.m_g2),c=n*(838422*v.m_g2+769860*v.m_g1+731718*v.m_g0),u=n*(632260*v.m_g2-126452*v.m_g1),f=n*(284517*v.m_b0-94839*v.m_b2),l=n*(838422*v.m_b2+769860*v.m_b1+731718*v.m_b0),h=n*(632260*v.m_b2-126452*v.m_b1);this.r0s=o/s,this.r0i=i*t/s,this.r1s=o/(s+126452),this.r1i=(i-769860)*t/(s+126452),this.g0s=a/u,this.g0i=c*t/u,this.g1s=a/(u+126452),this.g1i=(c-769860)*t/(u+126452),this.b0s=f/h,this.b0i=l*t/h,this.b1s=f/(h+126452),this.b1i=(l-769860)*t/(h+126452)}calcMaxChromaHpluv(){const t=v.distanceFromOrigin(this.r0s,this.r0i),r=v.distanceFromOrigin(this.r1s,this.r1i),n=v.distanceFromOrigin(this.g0s,this.g0i),o=v.distanceFromOrigin(this.g1s,this.g1i),i=v.distanceFromOrigin(this.b0s,this.b0i),s=v.distanceFromOrigin(this.b1s,this.b1i);return v.min6(t,r,n,o,i,s)}calcMaxChromaHsluv(t){const r=t/360*Math.PI*2,n=v.distanceFromOriginAngle(this.r0s,this.r0i,r),o=v.distanceFromOriginAngle(this.r1s,this.r1i,r),i=v.distanceFromOriginAngle(this.g0s,this.g0i,r),s=v.distanceFromOriginAngle(this.g1s,this.g1i,r),a=v.distanceFromOriginAngle(this.b0s,this.b0i,r),c=v.distanceFromOriginAngle(this.b1s,this.b1i,r);return v.min6(n,o,i,s,a,c)}hsluvToLch(){if(this.hsluv_l>99.9999999)this.lch_l=100,this.lch_c=0;else if(this.hsluv_l<1e-8)this.lch_l=0,this.lch_c=0;else{this.lch_l=this.hsluv_l,this.calculateBoundingLines(this.hsluv_l);const t=this.calcMaxChromaHsluv(this.hsluv_h);this.lch_c=t/100*this.hsluv_s}this.lch_h=this.hsluv_h}lchToHsluv(){if(this.lch_l>99.9999999)this.hsluv_s=0,this.hsluv_l=100;else if(this.lch_l<1e-8)this.hsluv_s=0,this.hsluv_l=0;else{this.calculateBoundingLines(this.lch_l);const t=this.calcMaxChromaHsluv(this.lch_h);this.hsluv_s=this.lch_c/t*100,this.hsluv_l=this.lch_l}this.hsluv_h=this.lch_h}hpluvToLch(){if(this.hpluv_l>99.9999999)this.lch_l=100,this.lch_c=0;else if(this.hpluv_l<1e-8)this.lch_l=0,this.lch_c=0;else{this.lch_l=this.hpluv_l,this.calculateBoundingLines(this.hpluv_l);const t=this.calcMaxChromaHpluv();this.lch_c=t/100*this.hpluv_p}this.lch_h=this.hpluv_h}lchToHpluv(){if(this.lch_l>99.9999999)this.hpluv_p=0,this.hpluv_l=100;else if(this.lch_l<1e-8)this.hpluv_p=0,this.hpluv_l=0;else{this.calculateBoundingLines(this.lch_l);const t=this.calcMaxChromaHpluv();this.hpluv_p=this.lch_c/t*100,this.hpluv_l=this.lch_l}this.hpluv_h=this.lch_h}hsluvToRgb(){this.hsluvToLch(),this.lchToLuv(),this.luvToXyz(),this.xyzToRgb()}hpluvToRgb(){this.hpluvToLch(),this.lchToLuv(),this.luvToXyz(),this.xyzToRgb()}hsluvToHex(){this.hsluvToRgb(),this.rgbToHex()}hpluvToHex(){this.hpluvToRgb(),this.rgbToHex()}rgbToHsluv(){this.rgbToXyz(),this.xyzToLuv(),this.luvToLch(),this.lchToHpluv(),this.lchToHsluv()}rgbToHpluv(){this.rgbToXyz(),this.xyzToLuv(),this.luvToLch(),this.lchToHpluv(),this.lchToHpluv()}hexToHsluv(){this.hexToRgb(),this.rgbToHsluv()}hexToHpluv(){this.hexToRgb(),this.rgbToHpluv()}}v.hexChars="0123456789abcdef",v.refY=1,v.refU=.19783000664283,v.refV=.46831999493879,v.kappa=903.2962962,v.epsilon=.0088564516,v.m_r0=3.240969941904521,v.m_r1=-1.537383177570093,v.m_r2=-.498610760293,v.m_g0=-.96924363628087,v.m_g1=1.87596750150772,v.m_g2=.041555057407175,v.m_b0=.055630079696993,v.m_b1=-.20397695888897,v.m_b2=1.056971514242878;function to(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var ie={exports:{}},Xe,eo;function Xt(){if(eo)return Xe;eo=1;function e(t,r){return Object.prototype.hasOwnProperty.call(t,r)}return Xe=e,Xe}var De,ro;function Ve(){if(ro)return De;ro=1;var e=Xt(),t,r;function n(){r=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],t=!0;for(var s in{toString:null})t=!1}function o(s,a,c){var u,f=0;t==null&&n();for(u in s)if(i(a,s,u,c)===!1)break;if(t)for(var l=s.constructor,h=!!l&&s===l.prototype;(u=r[f++])&&!((u!=="constructor"||!h&&e(s,u))&&s[u]!==Object.prototype[u]&&i(a,s,u,c)===!1););}function i(s,a,c,u){return s.call(u,a[c],c,a)}return De=o,De}var Ye,no;function oo(){if(no)return Ye;no=1;var e=Ve();function t(r){var n=[];return e(r,function(o,i){typeof o=="function"&&n.push(i)}),n.sort()}return Ye=t,Ye}var Ze,so;function Dt(){if(so)return Ze;so=1;function e(t,r,n){var o=t.length;r==null?r=0:r<0?r=Math.max(o+r,0):r=Math.min(r,o),n==null?n=o:n<0?n=Math.max(o+n,0):n=Math.min(n,o);for(var i=[];r<n;)i.push(t[r++]);return i}return Ze=e,Ze}var Je,io;function Qa(){if(io)return Je;io=1;var e=Dt();function t(r,n,o){var i=e(arguments,2);return function(){return r.apply(n,i.concat(e(arguments)))}}return Je=t,Je}var He,ao;function We(){if(ao)return He;ao=1;function e(t,r,n){if(t!=null)for(var o=-1,i=t.length;++o<i&&r.call(n,t[o],o,t)!==!1;);}return He=e,He}var Ue,co;function tc(){if(co)return Ue;co=1;var e=oo(),t=Qa(),r=We(),n=Dt();function o(i,s){var a=arguments.length>1?n(arguments,1):e(i);r(a,function(c){i[c]=t(i[c],i)})}return Ue=o,Ue}var Qe,uo;function V(){if(uo)return Qe;uo=1;var e=Xt(),t=Ve();function r(n,o,i){t(n,function(s,a){if(e(n,a))return o.call(i,n[a],a,n)})}return Qe=r,Qe}var tr,lo;function ec(){if(lo)return tr;lo=1;function e(t){return t}return tr=e,tr}var er,fo;function ho(){if(fo)return er;fo=1;function e(t){return function(r){return r[t]}}return er=e,er}var rr,bo;function nr(){if(bo)return rr;bo=1;var e=/^\[object (.*)\]$/,t=Object.prototype.toString,r;function n(o){return o===null?"Null":o===r?"Undefined":e.exec(t.call(o))[1]}return rr=n,rr}var or,po;function sr(){if(po)return or;po=1;var e=nr();function t(r,n){return e(r)===n}return or=t,or}var ir,mo;function rc(){if(mo)return ir;mo=1;var e=sr(),t=Array.isArray||function(r){return e(r,"Array")};return ir=t,ir}var ar,go;function _o(){if(go)return ar;go=1;var e=V(),t=rc();function r(s,a){for(var c=-1,u=s.length;++c<u;)if(i(s[c],a))return!0;return!1}function n(s,a){for(var c=-1,u=a.length;++c<u;)if(!r(s,a[c]))return!1;return!0}function o(s,a){var c=!0;return e(a,function(u,f){if(!i(s[f],u))return c=!1}),c}function i(s,a){return s&&typeof s=="object"?t(s)&&t(a)?n(s,a):o(s,a):s===a}return ar=i,ar}var cr,vo;function yt(){if(vo)return cr;vo=1;var e=ec(),t=ho(),r=_o();function n(o,i){if(o==null)return e;switch(typeof o){case"function":return typeof i<"u"?function(s,a,c){return o.call(i,s,a,c)}:o;case"object":return function(s){return r(s,o)};case"string":case"number":return t(o)}}return cr=n,cr}var ur,yo;function lr(){if(yo)return ur;yo=1;var e=V(),t=yt();function r(n,o,i){o=t(o,i);var s=!1;return e(n,function(a,c){if(o(a,c,n))return s=!0,!1}),s}return ur=r,ur}var fr,wo;function nc(){if(wo)return fr;wo=1;var e=lr();function t(r,n){return e(r,function(o){return o===n})}return fr=t,fr}var hr,xo;function Vt(){if(xo)return hr;xo=1;function e(t){return!!t&&typeof t=="object"&&t.constructor===Object}return hr=e,hr}var dr,Co;function oc(){if(Co)return dr;Co=1;var e=V(),t=Vt();function r(n,o){for(var i=0,s=arguments.length,a;++i<s;)a=arguments[i],a&&e(a,function(c,u){var f=n[u];f==null?n[u]=c:t(f)&&t(c)&&r(f,c)});return n}return dr=r,dr}var br,ko;function sc(){if(ko)return br;ko=1;var e=V(),t=Vt();function r(o,i){for(var s=0,a=arguments.length,c;++s<a;)c=arguments[s],c&&e(c,n,o);return o}function n(o,i){var s=this[i];t(o)&&t(s)?r(s,o):this[i]=o}return br=r,br}var pr,Ro;function qo(){if(Ro)return pr;Ro=1;var e=V(),t=yt();function r(n,o,i){o=t(o,i);var s=!0;return e(n,function(a,c){if(!o(a,c,n))return s=!1,!1}),s}return pr=r,pr}var mr,Mo;function Oo(){if(Mo)return mr;Mo=1;var e=sr();function t(r){return e(r,"Object")}return mr=t,mr}var gr,Ao;function ic(){if(Ao)return gr;Ao=1;function e(t,r){return t===r?t!==0||1/t===1/r:t!==t&&r!==r}return gr=e,gr}var _r,So;function ac(){if(So)return _r;So=1;var e=Xt(),t=qo(),r=Oo(),n=ic();function o(a){return function(c,u){return e(this,u)&&a(c,this[u])}}function i(a,c){return e(this,c)}function s(a,c,u){return u=u||n,!r(a)||!r(c)?u(a,c):t(a,o(u),c)&&t(c,i,a)}return _r=s,_r}var vr,$o;function cc(){if($o)return vr;$o=1;var e=We(),t=Dt(),r=V();function n(o,i){return e(t(arguments,1),function(s){r(s,function(a,c){o[c]==null&&(o[c]=a)})}),o}return vr=n,vr}var yr,Eo;function Lo(){if(Eo)return yr;Eo=1;var e=V(),t=yt();function r(n,o,i){o=t(o,i);var s={};return e(n,function(a,c,u){o(a,c,u)&&(s[c]=a)}),s}return yr=r,yr}var wr,No;function uc(){if(No)return wr;No=1;var e=lr(),t=yt();function r(n,o,i){o=t(o,i);var s;return e(n,function(a,c,u){if(o(a,c,u))return s=a,!0}),s}return wr=r,wr}var xr,To;function lc(){if(To)return xr;To=1;var e=V(),t=Vt();function r(o,i,s,a){return e(o,function(c,u){var f=s?s+"."+u:u;a!==0&&t(c)?r(c,i,f,a-1):i[f]=c}),i}function n(o,i){return o==null?{}:(i=i??-1,r(o,{},"",i))}return xr=n,xr}var Cr,jo;function Po(){if(jo)return Cr;jo=1;function e(t,r){for(var n=r.split("."),o=n.pop();r=n.shift();)if(t=t[r],t==null)return;return t[o]}return Cr=e,Cr}var kr,zo;function Bo(){if(zo)return kr;zo=1;var e=Po(),t;function r(n,o){return e(n,o)!==t}return kr=r,kr}var Rr,Io;function fc(){if(Io)return Rr;Io=1;var e=V(),t=Object.keys||function(r){var n=[];return e(r,function(o,i){n.push(i)}),n};return Rr=t,Rr}var qr,Go;function Fo(){if(Go)return qr;Go=1;var e=V(),t=yt();function r(n,o,i){o=t(o,i);var s={};return e(n,function(a,c,u){s[c]=o(a,c,u)}),s}return qr=r,qr}var Mr,Ko;function hc(){if(Ko)return Mr;Ko=1;var e=V();function t(r,n){var o=!0;return e(n,function(i,s){if(r[s]!==i)return o=!1}),o}return Mr=t,Mr}var Or,Xo;function dc(){if(Xo)return Or;Xo=1;var e=yt();function t(r,n,o){if(r==null||!r.length)return 1/0;if(r.length&&!n)return Math.max.apply(Math,r);n=e(n,o);for(var i,s=-1/0,a,c,u=-1,f=r.length;++u<f;)a=r[u],c=n(a,u,r),c>s&&(s=c,i=a);return i}return Or=t,Or}var Ar,Do;function Sr(){if(Do)return Ar;Do=1;var e=V();function t(r){var n=[];return e(r,function(o,i){n.push(o)}),n}return Ar=t,Ar}var $r,Vo;function bc(){if(Vo)return $r;Vo=1;var e=dc(),t=Sr();function r(n,o){return e(t(n),o)}return $r=r,$r}var Er,Yo;function Zo(){if(Yo)return Er;Yo=1;var e=V();function t(n,o){for(var i=0,s=arguments.length,a;++i<s;)a=arguments[i],a!=null&&e(a,r,n);return n}function r(n,o){this[o]=n}return Er=t,Er}var Lr,Jo;function pc(){if(Jo)return Lr;Jo=1;var e=nr(),t=Vt(),r=Zo();function n(c){switch(e(c)){case"Object":return o(c);case"Array":return a(c);case"RegExp":return i(c);case"Date":return s(c);default:return c}}function o(c){return t(c)?r({},c):c}function i(c){var u="";return u+=c.multiline?"m":"",u+=c.global?"g":"",u+=c.ignoreCase?"i":"",new RegExp(c.source,u)}function s(c){return new Date(+c)}function a(c){return c.slice()}return Lr=n,Lr}var Nr,Ho;function mc(){if(Ho)return Nr;Ho=1;var e=pc(),t=V(),r=nr(),n=Vt();function o(a,c){switch(r(a)){case"Object":return i(a,c);case"Array":return s(a,c);default:return e(a)}}function i(a,c){if(n(a)){var u={};return t(a,function(f,l){this[l]=o(f,c)},u),u}else return c?c(a):a}function s(a,c){for(var u=[],f=-1,l=a.length;++f<l;)u[f]=o(a[f],c);return u}return Nr=o,Nr}var Tr,Wo;function gc(){if(Wo)return Tr;Wo=1;var e=Xt(),t=mc(),r=Oo();function n(){var o=1,i,s,a,c;for(c=t(arguments[0]);a=arguments[o++];)for(i in a)e(a,i)&&(s=a[i],r(s)&&r(c[i])?c[i]=n(c[i],s):c[i]=t(s));return c}return Tr=n,Tr}var jr,Uo;function _c(){if(Uo)return jr;Uo=1;var e=yt();function t(r,n,o){if(r==null||!r.length)return-1/0;if(r.length&&!n)return Math.min.apply(Math,r);n=e(n,o);for(var i,s=1/0,a,c,u=-1,f=r.length;++u<f;)a=r[u],c=n(a,u,r),c<s&&(s=c,i=a);return i}return jr=t,jr}var Pr,Qo;function vc(){if(Qo)return Pr;Qo=1;var e=_c(),t=Sr();function r(n,o){return e(t(n),o)}return Pr=r,Pr}var zr,ts;function es(){if(ts)return zr;ts=1;var e=We();function t(r,n){return n&&e(n.split("."),function(o){r[o]||(r[o]={}),r=r[o]}),r}return zr=t,zr}var Br,rs;function yc(){if(rs)return Br;rs=1;function e(t,r,n){if(n=n||0,t==null)return-1;for(var o=t.length,i=n<0?o+n:n;i<o;){if(t[i]===r)return i;i++}return-1}return Br=e,Br}var Ir,ns;function wc(){if(ns)return Ir;ns=1;var e=yc();function t(r,n){return e(r,n)!==-1}return Ir=t,Ir}var Gr,os;function xc(){if(os)return Gr;os=1;var e=Dt(),t=wc();function r(n,o){var i=typeof arguments[1]!="string"?arguments[1]:e(arguments,1),s={};for(var a in n)n.hasOwnProperty(a)&&!t(i,a)&&(s[a]=n[a]);return s}return Gr=r,Gr}var Fr,ss;function Cc(){if(ss)return Fr;ss=1;var e=Dt();function t(r,n){for(var o=typeof arguments[1]!="string"?arguments[1]:e(arguments,1),i={},s=0,a;a=o[s++];)i[a]=r[a];return i}return Fr=t,Fr}var Kr,is;function kc(){if(is)return Kr;is=1;var e=Fo(),t=ho();function r(n,o){return e(n,t(o))}return Kr=r,Kr}var Xr,as;function cs(){if(as)return Xr;as=1;var e=V();function t(r){var n=0;return e(r,function(){n++}),n}return Xr=t,Xr}var Dr,us;function Rc(){if(us)return Dr;us=1;var e=V(),t=cs();function r(n,o,i,s){var a=arguments.length>2;if(!t(n)&&!a)throw new Error("reduce of empty object with no initial value");return e(n,function(c,u,f){a?i=o.call(s,i,c,u,f):(i=c,a=!0)}),i}return Dr=r,Dr}var Vr,ls;function qc(){if(ls)return Vr;ls=1;var e=Lo(),t=yt();function r(n,o,i){return o=t(o,i),e(n,function(s,a,c){return!o(s,a,c)},i)}return Vr=r,Vr}var Yr,fs;function Mc(){if(fs)return Yr;fs=1;var e=sr();function t(r){return e(r,"Function")}return Yr=t,Yr}var Zr,hs;function Oc(){if(hs)return Zr;hs=1;var e=Mc();function t(r,n){var o=r[n];if(o!==void 0)return e(o)?o.call(r):o}return Zr=t,Zr}var Jr,ds;function Ac(){if(ds)return Jr;ds=1;var e=es();function t(r,n,o){var i=/^(.+)\.(.+)$/.exec(n);i?e(r,i[1])[i[2]]=o:r[n]=o}return Jr=t,Jr}var Hr,bs;function Sc(){if(bs)return Hr;bs=1;var e=Bo();function t(r,n){if(e(r,n)){for(var o=n.split("."),i=o.pop();n=o.shift();)r=r[n];return delete r[i]}else return!0}return Hr=t,Hr}var Wr,ps;function Ur(){return ps||(ps=1,Wr={bindAll:tc(),contains:nc(),deepFillIn:oc(),deepMatches:_o(),deepMixIn:sc(),equals:ac(),every:qo(),fillIn:cc(),filter:Lo(),find:uc(),flatten:lc(),forIn:Ve(),forOwn:V(),functions:oo(),get:Po(),has:Bo(),hasOwn:Xt(),keys:fc(),map:Fo(),matches:hc(),max:bc(),merge:gc(),min:vc(),mixIn:Zo(),namespace:es(),omit:xc(),pick:Cc(),pluck:kc(),reduce:Rc(),reject:qc(),result:Oc(),set:Ac(),size:cs(),some:lr(),unset:Sc(),values:Sr()}),Wr}var ms;function gs(){return ms||(ms=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=Ur(),n={A:{x:.44758,y:.40745},C:{x:.31006,y:.31616},D50:{x:.34567,y:.35851},D65:{x:.31272,y:.32903},D55:{x:.33243,y:.34744},D75:{x:.29903,y:.31488}},o=(0,r.map)(n,function(i){var s=100*(i.x/i.y),a=100,c=100*(1-i.x-i.y)/i.y;return[s,a,c]});t.default=o,e.exports=t.default})(ie,ie.exports)),ie.exports}var ae={exports:{}},_s;function vs(){return _s||(_s=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=Math,n=r.pow,o=r.sign,i=r.abs,s={decode:function(l){return l<=.04045?l/12.92:n((l+.055)/1.055,2.4)},encode:function(l){return l<=.0031308?12.92*l:1.055*n(l,1/2.4)-.055}},a={encode:function(l){return l<.001953125?16*l:n(l,1/1.8)},decode:function(l){return l<16*.001953125?l/16:n(l,1.8)}};function c(f){return{decode:function(h){return o(h)*n(i(h),f)},encode:function(h){return o(h)*n(i(h),1/f)}}}var u={sRGB:{r:{x:.64,y:.33},g:{x:.3,y:.6},b:{x:.15,y:.06},gamma:s},"Adobe RGB":{r:{x:.64,y:.33},g:{x:.21,y:.71},b:{x:.15,y:.06},gamma:c(2.2)},"Wide Gamut RGB":{r:{x:.7347,y:.2653},g:{x:.1152,y:.8264},b:{x:.1566,y:.0177},gamma:c(563/256)},"ProPhoto RGB":{r:{x:.7347,y:.2653},g:{x:.1596,y:.8404},b:{x:.0366,y:1e-4},gamma:a}};t.default=u,e.exports=t.default})(ae,ae.exports)),ae.exports}var pt={},ys;function ws(){if(ys)return pt;ys=1,Object.defineProperty(pt,"__esModule",{value:!0});function e(s){return[[s[0][0],s[1][0],s[2][0]],[s[0][1],s[1][1],s[2][1]],[s[0][2],s[1][2],s[2][2]]]}function t(s){return s[0][0]*(s[2][2]*s[1][1]-s[2][1]*s[1][2])+s[1][0]*(s[2][1]*s[0][2]-s[2][2]*s[0][1])+s[2][0]*(s[1][2]*s[0][1]-s[1][1]*s[0][2])}function r(s){var a=1/t(s);return[[(s[2][2]*s[1][1]-s[2][1]*s[1][2])*a,(s[2][1]*s[0][2]-s[2][2]*s[0][1])*a,(s[1][2]*s[0][1]-s[1][1]*s[0][2])*a],[(s[2][0]*s[1][2]-s[2][2]*s[1][0])*a,(s[2][2]*s[0][0]-s[2][0]*s[0][2])*a,(s[1][0]*s[0][2]-s[1][2]*s[0][0])*a],[(s[2][1]*s[1][0]-s[2][0]*s[1][1])*a,(s[2][0]*s[0][1]-s[2][1]*s[0][0])*a,(s[1][1]*s[0][0]-s[1][0]*s[0][1])*a]]}function n(s,a){return[s[0][0]*a[0]+s[0][1]*a[1]+s[0][2]*a[2],s[1][0]*a[0]+s[1][1]*a[1]+s[1][2]*a[2],s[2][0]*a[0]+s[2][1]*a[1]+s[2][2]*a[2]]}function o(s,a){return[[s[0][0]*a[0],s[0][1]*a[1],s[0][2]*a[2]],[s[1][0]*a[0],s[1][1]*a[1],s[1][2]*a[2]],[s[2][0]*a[0],s[2][1]*a[1],s[2][2]*a[2]]]}function i(s,a){return[[s[0][0]*a[0][0]+s[0][1]*a[1][0]+s[0][2]*a[2][0],s[0][0]*a[0][1]+s[0][1]*a[1][1]+s[0][2]*a[2][1],s[0][0]*a[0][2]+s[0][1]*a[1][2]+s[0][2]*a[2][2]],[s[1][0]*a[0][0]+s[1][1]*a[1][0]+s[1][2]*a[2][0],s[1][0]*a[0][1]+s[1][1]*a[1][1]+s[1][2]*a[2][1],s[1][0]*a[0][2]+s[1][1]*a[1][2]+s[1][2]*a[2][2]],[s[2][0]*a[0][0]+s[2][1]*a[1][0]+s[2][2]*a[2][0],s[2][0]*a[0][1]+s[2][1]*a[1][1]+s[2][2]*a[2][1],s[2][0]*a[0][2]+s[2][1]*a[1][2]+s[2][2]*a[2][2]]]}return pt.transpose=e,pt.determinant=t,pt.inverse=r,pt.multiply=n,pt.scalar=o,pt.product=i,pt}var Yt={},xs;function $c(){if(xs)return Yt;xs=1,Object.defineProperty(Yt,"__esModule",{value:!0});var e=Math,t=e.PI;function r(o){for(var i=o*180/t;i<0;)i+=360;for(;i>360;)i-=360;return i}function n(o){for(var i=t*o/180;i<0;)i+=2*t;for(;i>2*t;)i-=2*t;return i}return Yt.fromRadian=r,Yt.toRadian=n,Yt}var Zt={},Cs;function Ec(){if(Cs)return Zt;Cs=1,Object.defineProperty(Zt,"__esModule",{value:!0});var e=Math,t=e.round;function r(o){return o[0]=="#"&&(o=o.slice(1)),o.length<6&&(o=o.split("").map(function(i){return i+i}).join("")),o.match(/../g).map(function(i){return parseInt(i,16)/255})}function n(o){var i=o.map(function(s){return s=t(255*s).toString(16),s.length<2&&(s="0"+s),s}).join("");return"#"+i}return Zt.fromHex=r,Zt.toHex=n,Zt}var ce={exports:{}},ks;function Lc(){return ks||(ks=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=ws(),n=u(r),o=gs(),i=c(o),s=vs(),a=c(s);function c(l){return l&&l.__esModule?l:{default:l}}function u(l){if(l&&l.__esModule)return l;var h={};if(l!=null)for(var d in l)Object.prototype.hasOwnProperty.call(l,d)&&(h[d]=l[d]);return h.default=l,h}function f(){var l=arguments.length<=0||arguments[0]===void 0?a.default.sRGB:arguments[0],h=arguments.length<=1||arguments[1]===void 0?i.default.D65:arguments[1],d=[l.r,l.g,l.b],b=n.transpose(d.map(function(w){var x=w.x/w.y,S=1,R=(1-w.x-w.y)/w.y;return[x,S,R]})),g=l.gamma,m=n.multiply(n.inverse(b),h),y=n.scalar(b,m),L=n.inverse(y);return{fromRgb:function(x){return n.multiply(y,x.map(g.decode))},toRgb:function(x){return n.multiply(L,x).map(g.encode)}}}t.default=f,e.exports=t.default})(ce,ce.exports)),ce.exports}var Qr,Rs;function ue(){if(Rs)return Qr;Rs=1;var e=gs(),t=vs(),r=ws(),n=$c(),o=Ec(),i=Lc();return Qr={illuminant:e,workspace:t,matrix:r,degree:n,rgb:o,xyz:i},Qr}var Nc=ue();const le=to(Nc);var st={},qs;function fe(){if(qs)return st;qs=1,Object.defineProperty(st,"__esModule",{value:!0}),st.cfs=st.distance=st.lerp=st.corLerp=void 0;var e=Ur();function t(h,d,b){return d in h?Object.defineProperty(h,d,{value:b,enumerable:!0,configurable:!0,writable:!0}):h[d]=b,h}function r(h){if(Array.isArray(h)){for(var d=0,b=Array(h.length);d<h.length;d++)b[d]=h[d];return b}else return Array.from(h)}var n=Math,o=n.abs,i=n.pow,s=n.sqrt,a={h:360,H:400};function c(h,d,b,g){var m=a[g];if(m){var y=o(h-d);y>m/2&&(h>d?d+=m:h+=m)}return((1-b)*h+b*d)%(m||1/0)}function u(h,d,b){var g={};for(var m in h)g[m]=c(h[m],d[m],b,m);return g}function f(h,d){var b=0;for(var g in h)b+=i(h[g]-d[g],2);return s(b)}function l(h){return e.merge.apply(void 0,r(h.split("").map(function(d){return t({},d,!0)})))}return st.corLerp=c,st.lerp=u,st.distance=f,st.cfs=l,st}var he={exports:{}},Ms;function Tc(){return Ms||(Ms=1,(function(e,t){var r=(function(){function s(a,c){var u=[],f=!0,l=!1,h=void 0;try{for(var d=a[Symbol.iterator](),b;!(f=(b=d.next()).done)&&(u.push(b.value),!(c&&u.length===c));f=!0);}catch(g){l=!0,h=g}finally{try{!f&&d.return&&d.return()}finally{if(l)throw h}}return u}return function(a,c){if(Array.isArray(a))return a;if(Symbol.iterator in Object(a))return s(a,c);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(t,"__esModule",{value:!0});var n=ue(),o=fe();function i(s,a){var c=arguments.length<=2||arguments[2]===void 0?1e-6:arguments[2],u=-c,f=1+c,l=Math,h=l.min,d=l.max,b=["000","fff"].map(function(R){return a.fromXyz(s.fromRgb(n.rgb.fromHex(R)))}),g=r(b,2),m=g[0],y=g[1];function L(R){var M=s.toRgb(a.toXyz(R)),p=M.map(function(C){return C>=u&&C<=f}).reduce(function(C,O){return C&&O},!0);return[p,M]}function w(R,M){for(var p=arguments.length<=2||arguments[2]===void 0?.001:arguments[2];(0,o.distance)(R,M)>p;){var C=(0,o.lerp)(R,M,.5),O=L(C),q=r(O,1),T=q[0];T?R=C:M=C}return R}function x(R){return(0,o.lerp)(m,y,R)}function S(R){return R.map(function(M){return d(u,h(f,M))})}return{contains:L,limit:w,spine:x,crop:S}}t.default=i,e.exports=t.default})(he,he.exports)),he.exports}var de={exports:{}},it={},Os;function As(){if(Os)return it;Os=1;var e=(function(){function l(h,d){var b=[],g=!0,m=!1,y=void 0;try{for(var L=h[Symbol.iterator](),w;!(g=(w=L.next()).done)&&(b.push(w.value),!(d&&b.length===d));g=!0);}catch(x){m=!0,y=x}finally{try{!g&&L.return&&L.return()}finally{if(m)throw y}}return b}return function(h,d){if(Array.isArray(h))return h;if(Symbol.iterator in Object(h))return l(h,d);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(it,"__esModule",{value:!0}),it.toNotation=it.fromNotation=it.toHue=it.fromHue=void 0;var t=fe(),r=Math,n=r.floor,o=[{s:"R",h:20.14,e:.8,H:0},{s:"Y",h:90,e:.7,H:100},{s:"G",h:164.25,e:1,H:200},{s:"B",h:237.53,e:1.2,H:300},{s:"R",h:380.14,e:.8,H:400}],i=o.map(function(l){return l.s}).slice(0,-1).join("");function s(l){l<o[0].h&&(l+=360);for(var h=0;o[h+1].h<l;)h++;var d=(l-o[h].h)/o[h].e,b=(o[h+1].h-l)/o[h+1].e,g=o[h].H;return g+100*d/(d+b)}function a(l){var h=n(l/100),d=l%100,b=o.slice(h,h+2),g=e(b,2),m=g[0],y=m.e,L=m.h,w=g[1],x=w.e,S=w.h,R=(d*(x*L-y*S)-100*L*x)/(d*(x-y)-100*x);return R}var c={O:"RY",S:"YG",T:"G25B",C:"GB",A:"B25G",V:"B25R",M:"BR",P:"R25B"};function u(l){var h=l.match(/^([a-z])(?:(.+)?([a-z]))?$/i),d=e(h,4),b=d[1],g=d[2],m=d[3];m===void 0&&(m=b),g===void 0&&(g="50");var y=[b,m].map(function(w){w=w.toUpperCase();var x=c[w];return x?u(x):100*i.indexOf(w)}),L=e(y,2);return b=L[0],m=L[1],g=parseFloat(g)/100,(0,t.corLerp)(b,m,g,"H")}function f(l){var h=n(l/100),d=(h+1)%i.length,b=l-h*100;if(b>50){var g=[d,h];h=g[0],d=g[1],b=100-b}return b<1?i[h]:i[h]+b.toFixed()+i[d]}return it.fromHue=s,it.toHue=a,it.fromNotation=u,it.toNotation=f,it}var Ss;function jc(){return Ss||(Ss=1,(function(e,t){var r=(function(){function P(G,Y){var U=[],ut=!0,xt=!1,Jt=void 0;try{for(var lt=G[Symbol.iterator](),Mt;!(ut=(Mt=lt.next()).done)&&(U.push(Mt.value),!(Y&&U.length===Y));ut=!0);}catch(Ct){xt=!0,Jt=Ct}finally{try{!ut&&lt.return&&lt.return()}finally{if(xt)throw Jt}}return U}return function(G,Y){if(Array.isArray(G))return G;if(Symbol.iterator in Object(G))return P(G,Y);throw new TypeError("Invalid attempt to destructure non-iterable instance")}})();Object.defineProperty(t,"__esModule",{value:!0});var n=ue(),o=As(),i=c(o),s=fe(),a=Ur();function c(P){if(P&&P.__esModule)return P;var G={};if(P!=null)for(var Y in P)Object.prototype.hasOwnProperty.call(P,Y)&&(G[Y]=P[Y]);return G.default=P,G}var u=Math,f=u.pow,l=u.sqrt,h=u.exp,d=u.abs,b=u.sign,g=Math,m=g.sin,y=g.cos,L=g.atan2,w={average:{F:1,c:.69,N_c:1},dim:{F:.9,c:.59,N_c:.9},dark:{F:.8,c:.535,N_c:.8}},x=[[.7328,.4296,-.1624],[-.7036,1.6975,.0061],[.003,.0136,.9834]],S=[[.38971,.68898,-.07868],[-.22981,1.1834,.04641],[0,0,1]],R=x,M=n.matrix.inverse(x),p=n.matrix.product(S,n.matrix.inverse(x)),C=n.matrix.product(x,n.matrix.inverse(S)),O={whitePoint:n.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:"average",discounting:!1},q=(0,s.cfs)("QJMCshH"),T=(0,s.cfs)("JCh");function A(){var P=arguments.length<=0||arguments[0]===void 0?{}:arguments[0],G=arguments.length<=1||arguments[1]===void 0?q:arguments[1];P=(0,a.merge)(O,P);var Y=P.whitePoint,U=P.adaptingLuminance,ut=P.backgroundLuminance,xt=w[P.surroundType],Jt=xt.F,lt=xt.c,Mt=xt.N_c,Ct=Y[1],Ys=1/(5*U+1),Ot=.2*f(Ys,4)*5*U+.1*f(1-f(Ys,4),2)*f(5*U,1/3),_e=ut/Ct,an=.725*f(1/_e,.2),Zs=an,Js=1.48+l(_e),Hs=P.discounting?1:Jt*(1-1/3.6*h(-(U+42)/92)),d0=n.matrix.multiply(x,Y),b0=d0.map(function(j){return Hs*Ct/j+1-Hs}),cn=r(b0,3),Ws=cn[0],Us=cn[1],Qs=cn[2],p0=ti(Y),m0=ei(p0),ve=ri(m0);function ti(j){var z=n.matrix.multiply(R,j),B=r(z,3),Z=B[0],D=B[1],tt=B[2];return[Ws*Z,Us*D,Qs*tt]}function g0(j){var z=r(j,3),B=z[0],Z=z[1],D=z[2];return n.matrix.multiply(M,[B/Ws,Z/Us,D/Qs])}function ei(j){return n.matrix.multiply(p,j).map(function(z){var B=f(Ot*d(z)/100,.42);return b(z)*400*B/(27.13+B)+.1})}function _0(j){return n.matrix.multiply(C,j.map(function(z){var B=z-.1;return b(B)*100/Ot*f(27.13*d(B)/(400-d(B)),2.380952380952381)}))}function ri(j){var z=r(j,3),B=z[0],Z=z[1],D=z[2];return(B*2+Z+D/20-.305)*an}function un(j){return 4/lt*l(j/100)*(ve+4)*f(Ot,.25)}function v0(j){return 6.25*f(lt*j/((ve+4)*f(Ot,.25)),2)}function ni(j){return j*f(Ot,.25)}function y0(j,z){return f(j/100,2)*z/f(Ot,.25)}function w0(j){return j/f(Ot,.25)}function x0(j,z){return 100*l(j/z)}function ln(j,z){var B=z.Q,Z=z.J,D=z.M,tt=z.C,at=z.s,mt=z.h,gt=z.H,J={};return j.J&&(J.J=isNaN(Z)?v0(B):Z),j.C&&(isNaN(tt)?isNaN(D)?(B=isNaN(B)?un(Z):B,J.C=y0(at,B)):J.C=w0(D):J.C=z.C),j.h&&(J.h=isNaN(mt)?i.toHue(gt):mt),j.Q&&(J.Q=isNaN(B)?un(Z):B),j.M&&(J.M=isNaN(D)?ni(tt):D),j.s&&(isNaN(at)?(B=isNaN(B)?un(Z):B,D=isNaN(D)?ni(tt):D,J.s=x0(D,B)):J.s=at),j.H&&(J.H=isNaN(gt)?i.fromHue(mt):gt),J}function C0(j){var z=ti(j),B=ei(z),Z=r(B,3),D=Z[0],tt=Z[1],at=Z[2],mt=D-tt*12/11+at/11,gt=(D+tt-2*at)/9,J=L(gt,mt),Ft=n.degree.fromRadian(J),ye=1/4*(y(J+2)+3.8),we=ri(B),Ht=100*f(we/ve,lt*Js),kt=5e4/13*Mt*Zs*ye*l(mt*mt+gt*gt)/(D+tt+21/20*at),Rt=f(kt,.9)*l(Ht/100)*f(1.64-f(.29,_e),.73);return ln(G,{J:Ht,C:Rt,h:Ft})}function k0(j){var z=ln(T,j),B=z.J,Z=z.C,D=z.h,tt=n.degree.toRadian(D),at=f(Z/(l(B/100)*f(1.64-f(.29,_e),.73)),10/9),mt=1/4*(y(tt+2)+3.8),gt=ve*f(B/100,1/lt/Js),J=5e4/13*Mt*Zs*mt/at,Ft=gt/an+.305,ye=Ft*61/20*460/1403,we=61/20*220/1403,Ht=21/20*6300/1403-27/1403,kt=m(tt),Rt=y(tt),At,St;at===0||isNaN(at)?At=St=0:d(kt)>=d(Rt)?(St=ye/(J/kt+we*Rt/kt+Ht),At=St*Rt/kt):(At=ye/(J/Rt+we+Ht*kt/Rt),St=At*kt/Rt);var R0=[20/61*Ft+451/1403*At+288/1403*St,20/61*Ft-891/1403*At-261/1403*St,20/61*Ft-220/1403*At-6300/1403*St],q0=_0(R0),M0=g0(q0);return M0}return{fromXyz:C0,toXyz:k0,fillOut:ln}}t.default=A,e.exports=t.default})(de,de.exports)),de.exports}var be={exports:{}},$s;function Pc(){return $s||($s=1,(function(e,t){Object.defineProperty(t,"__esModule",{value:!0});var r=ue(),n=Math,o=n.sqrt,i=n.pow,s=n.exp,a=n.log,c=n.cos,u=n.sin,f=n.atan2,l={LCD:{K_L:.77,c_1:.007,c_2:.0053},SCD:{K_L:1.24,c_1:.007,c_2:.0363},UCS:{K_L:1,c_1:.007,c_2:.0228}};function h(){var d=arguments.length<=0||arguments[0]===void 0?"UCS":arguments[0],b=l[d],g=b.K_L,m=b.c_1,y=b.c_2;function L(S){var R=S.J,M=S.M,p=S.h,C=r.degree.toRadian(p),O=(1+100*m)*R/(1+m*R),q=1/y*a(1+y*M),T=q*c(C),A=q*u(C);return{J_p:O,a_p:T,b_p:A}}function w(S){var R=S.J_p,M=S.a_p,p=S.b_p,C=-R/(m*R-100*m-1),O=o(i(M,2)+i(p,2)),q=(s(y*O)-1)/y,T=f(p,M),A=r.degree.fromRadian(T);return{J:C,M:q,h:A}}function x(S,R){return o(i((S.J_p-R.J_p)/g,2)+i(S.a_p-R.a_p,2)+i(S.b_p-R.b_p,2))}return{fromCam:L,toCam:w,distance:x}}t.default=h,e.exports=t.default})(be,be.exports)),be.exports}var tn,Es;function zc(){if(Es)return tn;Es=1;var e=fe(),t=Tc(),r=jc(),n=Pc(),o=As();return tn={gamut:t,cfs:e.cfs,lerp:e.lerp,cam:r,ucs:n,hq:o},tn}var Bc=zc();const Ls=to(Bc);function Ns(e){const t=new v;return t.rgb_r=e[0],t.rgb_g=e[1],t.rgb_b=e[2],t.rgbToHsluv(),[t.hsluv_h,t.hsluv_s,t.hsluv_l]}function Ic(e){const t=new v;return t.hsluv_h=e[0],t.hsluv_s=e[1],t.hsluv_l=e[2],t.hsluvToRgb(),[t.rgb_r,t.rgb_g,t.rgb_b]}const Ts=Ls.cam({whitePoint:le.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:"average",discounting:!1},Ls.cfs("JCh")),js=le.xyz(le.workspace.sRGB,le.illuminant.D65),Ps=e=>js.toRgb(Ts.toXyz({J:e[0],C:e[1],h:e[2]})),en=e=>{const t=Ts.fromXyz(js.fromRgb(e));return[t.J,t.C,t.h]},[Gc,Fc]=(()=>{const e={k_l:1,c1:.007,c2:.0228},t=Math.PI,r=64/t/5,n=1/(5*r+1),o=.2*n**4*(5*r)+.1*(1-n**4)**2*(5*r)**(1/3);return[i=>{const[s,a,c]=i,u=a*o**.25;let f=(1+100*e.c1)*s/(1+e.c1*s);f/=e.k_l;const l=1/e.c2*Math.log(1+e.c2*u),h=l*Math.cos(c*(t/180)),d=l*Math.sin(c*(t/180));return[f,h,d]},i=>{const[s,a,c]=i,u=Math.sqrt(a*a+c*c),f=(Math.exp(u*e.c2)-1)/e.c2,l=(180/t*Math.atan2(c,a)+360)%360,h=f/o**.25;return[s/(1+e.c1*(100-s)),h,l]}]})(),Kc=e=>Ps(Fc(e)),zs=e=>Gc(en(e)),pe=console;pe.color=(e,t="")=>{const n=k(e).luminance();pe.log(`%c${e} ${t}`,`background-color: ${e};padding: 5px; border-radius: 5px; color: ${n>.5?"#000":"#fff"}`)},pe.ramp=(e,t=1)=>{pe.log("%c ",`font-size: 1px;line-height: 16px;background: ${k.getCSSGradient(e,t)};padding: 0 0 0 200px; border-radius: 2px;`)};const Bs=(e,t,r,n,o,i,s=.1)=>{if(e===r||t===n)return!0;const a=(n-t)/(r-e),c=(i+o/a-t+a*e)/(a+1/a),u=i+o/a-c/a;return(o-c)**2+(i-u)**2<s**2},Xc=(e,t,r,n)=>{const o=(t[0]+r[0])/2,i=e(o);return Bs(...t,...r,o,i,n)?null:[o,i]},rn=(e,t,r,n=.1)=>{const o=(r-t)/10,i=[];for(let s=t;s<r;s+=o)i.push([s,e(s)]);i.push([r,e(r)]);for(let s=0;s<i.length-1;s++){const a=Xc(e,i[s],i[s+1],n);a&&(i.splice(s+1,0,a),s--)}for(let s=0;s<i.length-2;s++)Bs(...i[s],...i[s+2],...i[s+1],n)&&(i.splice(s+1,1),s--);return i},me=(e,t=4)=>Math.round(e*10**t)/10**t,Dc=(e,t=1,r=90,n=.005)=>{const o=rn(c=>e(c).gl()[0],0,t,n),i=rn(c=>e(c).gl()[1],0,t,n),s=rn(c=>e(c).gl()[2],0,t,n),a=Array.from(new Set([...o.map(c=>me(c[0])),...i.map(c=>me(c[0])),...s.map(c=>me(c[0]))].sort((c,u)=>c-u)));return`linear-gradient(${r}deg, ${a.map(c=>`${e(c).hex()} ${me(c*100)}%`).join()});`},Vc=e=>{e.Color.prototype.jch=function(){return en(this._rgb.slice(0,3).map(o=>o/255))},e.jch=(...o)=>new e.Color(...Ps(o).map(i=>Math.floor(i*255)),"rgb"),e.Color.prototype.jab=function(){return zs(this._rgb.slice(0,3).map(o=>o/255))},e.jab=(...o)=>new e.Color(...Kc(o).map(i=>Math.floor(i*255)),"rgb"),e.Color.prototype.hsluv=function(){return Ns(this._rgb.slice(0,3).map(o=>o/255))},e.hsluv=(...o)=>new e.Color(...Ic(o).map(i=>Math.floor(i*255)),"rgb");const t=e.interpolate,r={jch:en,jab:zs,hsluv:Ns},n=(o,i,s)=>(Math.abs(o-i)>360/2&&(o>i?i+=360:o+=360),((1-s)*o+s*i)%360);e.interpolate=(o,i,s=.5,a="lrgb")=>{if(r[a]){typeof o!="object"&&(o=new e.Color(o)),typeof i!="object"&&(i=new e.Color(i));const c=r[a](o.gl()),u=r[a](i.gl()),f=Number.isNaN(o.hsl()[0]),l=Number.isNaN(i.hsl()[0]);let h,d,b;switch(a){case"hsluv":c[1]<1e-10&&(c[0]=u[0]),c[1]===0&&(c[1]=u[1]),u[1]<1e-10&&(u[0]=c[0]),u[1]===0&&(u[1]=c[1]),h=n(c[0],u[0],s),d=c[1]+(u[1]-c[1])*s,b=c[2]+(u[2]-c[2])*s;break;case"jch":f&&(c[2]=u[2]),l&&(u[2]=c[2]),h=c[0]+(u[0]-c[0])*s,d=c[1]+(u[1]-c[1])*s,b=n(c[2],u[2],s);break;default:h=c[0]+(u[0]-c[0])*s,d=c[1]+(u[1]-c[1])*s,b=c[2]+(u[2]-c[2])*s}return e[a](h,d,b).alpha(o.alpha()+s*(i.alpha()-o.alpha()))}return t(o,i,s,a)},e.getCSSGradient=Dc};const X={mainTRC:2.4,sRco:.2126729,sGco:.7151522,sBco:.072175,normBG:.56,normTXT:.57,revTXT:.62,revBG:.65,blkThrs:.022,blkClmp:1.414,scaleBoW:1.14,scaleWoB:1.14,loBoWoffset:.027,loWoBoffset:.027,deltaYmin:5e-4,loClip:.1};function Is(e,t,r=-1){const n=[0,1.1];if(isNaN(e)||isNaN(t)||Math.min(e,t)<n[0]||Math.max(e,t)>n[1])return 0;let o=0,i=0,s="BoW";return e=e>X.blkThrs?e:e+Math.pow(X.blkThrs-e,X.blkClmp),t=t>X.blkThrs?t:t+Math.pow(X.blkThrs-t,X.blkClmp),Math.abs(t-e)<X.deltaYmin?0:(t>e?(o=(Math.pow(t,X.normBG)-Math.pow(e,X.normTXT))*X.scaleBoW,i=o<X.loClip?0:o-X.loBoWoffset):(s="WoB",o=(Math.pow(t,X.revBG)-Math.pow(e,X.revTXT))*X.scaleWoB,i=o>-.1?0:o+X.loWoBoffset),r<0?i*100:r==0?Math.round(Math.abs(i)*100)+"<sub>"+s+"</sub>":Number.isInteger(r)?(i*100).toFixed(r):0)}function ge(e=[0,0,0]){function t(r){return Math.pow(r/255,X.mainTRC)}return X.sRco*t(e[0])+X.sGco*t(e[1])+X.sBco*t(e[2])}const Gs=(e,t,r,n,o,i,s,a,c)=>{const u=1-c,f=u*u,l=f*u,d=c*c*c,b=l*e+f*3*c*r+u*3*c*c*o+d*s,g=l*t+f*3*c*n+u*3*c*c*i+d*a;return{x:b,y:g}},Yc=(e,t)=>{const r=[];let n={x:+e[0],y:+e[1]};for(let o=0,i=e.length;i-2*!0>o;o+=2){const s=[{x:+e[o-2],y:+e[o-1]},{x:+e[o],y:+e[o+1]},{x:+e[o+2],y:+e[o+3]},{x:+e[o+4],y:+e[o+5]}];i-4===o?s[3]=s[2]:o||(s[0]={x:+e[o],y:+e[o+1]}),r.push([n.x,n.y,(-s[0].x+6*s[1].x+s[2].x)/6,(-s[0].y+6*s[1].y+s[2].y)/6,(s[1].x+6*s[2].x-s[3].x)/6,(s[1].y+6*s[2].y-s[3].y)/6,s[2].x,s[2].y]),n=s[2]}return r},Zc=(e,t,r,n,o,i,s,a)=>{let u=e,f=t,l=0;for(let h=1;h<5;h++){const{x:d,y:b}=Gs(e,t,r,n,o,i,s,a,h/5);l+=Math.hypot(d-u,b-f),u=d,f=b}return l+=Math.hypot(s-u,a-f),l},Jc=(e,t,r,n,o,i,s,a)=>{const c=Math.floor(Zc(e,t,r,n,o,i,s,a)*.75),u=[];let f=0;for(let l=0;l<=c;l++){const h=l/c,d=Gs(e,t,r,n,o,i,s,a,h),b=Math.round(d.x);if(u[b]=d.y,b-f>1){const g=u[f],m=u[b];for(let y=f+1;y<b;y++)u[y]=g+(m-g)/(b-f)*(y-f)}f=b}return l=>u[Math.round(l)]||null},Gt={CAM02:"jab",CAM02p:"jch",HEX:"hex",HSL:"hsl",HSLuv:"hsluv",HSV:"hsv",LAB:"lab",LCH:"lch",RGB:"rgb",OKLAB:"oklab",OKLCH:"oklch"};function wt(e,t=0){const r=10**t;return Math.round(e*r)/r}function Hc(e,t){let r;return e>1?r=(e-1)*t+1:e<-1?r=(e+1)*t-1:r=1,wt(r,2)}function Wc(e){return k(String(e)).jch()}function Uc(e){return k(String(e)).hsluv()}function Qc(e,t,r){const n=[[],[],[]];if(e.forEach((i,s)=>n.forEach((a,c)=>a.push(t[s],i[c]))),r==="hcl"){const i=n[1];for(let s=1;s<i.length;s+=2)Number.isNaN(i[s])&&(i[s]=0)}n.forEach(i=>{const s=[];for(let a=1;a<i.length;a+=2)if(Number.isNaN(i[a]))s.push(a);else{s.forEach(c=>{i[c]=i[a]}),s.length=0;break}if(s.length){const a=k("#ccc").jch()[2];s.forEach(c=>{i[c]=a})}s.length=0;for(let a=i.length-1;a>0;a-=2)if(Number.isNaN(i[a]))s.push(a);else{s.forEach(c=>{i[c]=i[a]});break}for(let a=1;a<i.length;a+=2)Number.isNaN(i[a])&&(i.splice(a-1,2),a-=2);if(r in{hcl:1,hsl:1,hsluv:1,hsv:1,jch:1}){let a=i[1],c=0;for(let u=3;u<i.length;u+=2){const f=i[u]+c,l=Math.abs(a-f),h=Math.abs(a-(f+360)),d=Math.abs(a-(f-360));h<l&&h<d&&(c+=360),d<l&&d<h&&(c-=360),i[u]+=c,a=i[u]}}});const o=n.map(i=>Yc(i).map(s=>Jc(...s)));return i=>{const s=o.map(a=>{for(let c=0;c<a.length;c++){const u=a[c](i);if(u!=null)return u}return null});return r==="jch"&&s[1]<0&&(s[1]=0),k[r](...s).hex()}}function t0(e=1,t=[0,1],r=[0,1]){const n=(r[1]-r[0])/(t[1]**e-t[0]**e),o=r[0]-n*t[0]**e;return i=>n*i**e+o}function nn({swatches:e,colorKeys:t,colorspace:r,colorSpace:n=r??"LAB",shift:o=1,fullScale:i=!0,smooth:s=!1,distributeLightness:a="linear",sortColor:c=!0,asFun:u=!1}={}){r!==void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead.");const f=Gt[n];if(!f)throw new Error(`Colorspace “${n}” not supported`);if(!t)throw new Error(`Colorkeys missing: returned “${t}”`);let l;if(i)l=t.map(w=>e-e*(k(w).jch()[0]/100)).sort((w,x)=>w-x).concat(e),l.unshift(0);else{let w=t.map(R=>k(R).jch()[0]/100),x=Math.min(...w),S=Math.max(...w);l=w.map(R=>R===0||isNaN((R-x)/(S-x))?0:e-(R-x)/(S-x)*e).sort((R,M)=>R-M)}let h=t0(o,[1,e],[1,e]);if(h=l.map(w=>Math.max(0,h(w))),l=h,a==="polynomial"){const w=R=>Math.sqrt(Math.sqrt((Math.pow(R,2.25)+Math.pow(R,4))/2));l=h.map(R=>R/e).map(R=>w(R)*e)}const d=t.map((w,x)=>({colorKeys:Wc(w),index:x})).sort((w,x)=>x.colorKeys[0]-w.colorKeys[0]).map(w=>t[w.index]);let b=[],g;if(i){const w=f==="lch"?k.lch(...k("#fff").lch()):"#ffffff",x=f==="lch"?k.lch(...k("#000").lch()):"#000000";b=[w,...d,x]}else c?b=d:b=t;let m;if(s){const w=b;if(b=b.map(x=>k(String(x))[f]()),f==="hcl"&&b.forEach(x=>{x[1]=Number.isNaN(x[1])?0:x[1]}),f==="jch")for(let x=0;x<w.length;x++){const S=k(w[x]).hcl();Number.isNaN(S[0])&&(b[x][2]=NaN)}g=Qc(b,l,f),m=new Array(e).fill().map((x,S)=>g(S))}else g=k.scale(b.map(w=>typeof w=="object"&&w.constructor===k.Color?w:String(w))).domain(l).mode(f);return u?g:(!s||s===!1?g.colors(e):m).filter(w=>w!=null)}function e0(e,t){const r=[],n={};return Object.keys(e).forEach(s=>{n[e[s][t]]=e[s]}),Object.keys(n).forEach(s=>r.push(n[s])),r}function r0(e){return Number.isNaN(e)?0:e}function on(e,t,r=!1){if(!e)throw new Error(`Cannot convert color value of “${e}”`);if(!Gt[t])throw new Error(`Cannot convert to colorspace “${t}”`);const n=Gt[t],o=k(String(e))[n]();if(t==="HSL"&&o.pop(),t==="HEX"){if(r){const u=k(String(e)).rgb();return{r:u[0],g:u[1],b:u[2]}}return o}const i={};let s=o.map(r0);s=s.map((u,f)=>{let l=wt(u),h=f;n==="hsluv"&&(h+=2);let d=n.charAt(h);return n==="jch"&&d==="c"&&(d="C"),i[d==="j"?"J":d]=l,n in{lab:1,lch:1,jab:1,jch:1}?r||(d==="l"||d==="j")&&(l+="%"):n!=="hsluv"&&(d==="s"||d==="l"||d==="v")&&(i[d]=wt(u,2),r||(l=wt(u*100),l+="%")),l});const c=`${n}(${s.join(", ")})`;return r?i:c}function Fs(e,t,r){const n=[e,t,r].map(o=>(o/=255,o<=.03928?o/12.92:((o+.055)/1.055)**2.4));return n[0]*.2126+n[1]*.7152+n[2]*.0722}function n0(e,t,r,n="wcag2"){if(r===void 0){const o=k.rgb(...t).hsluv()[2];r=wt(o/100,2)}if(n==="wcag2"){const o=Fs(e[0],e[1],e[2]),i=Fs(t[0],t[1],t[2]),s=(o+.05)/(i+.05),a=(i+.05)/(o+.05);return r<.5?s>=1?s:-a:s<1?a:s===1?s:-s}else{if(n==="wcag3")return r<.5?Is(ge(e),ge(t))*-1:Is(ge(e),ge(t));throw new Error(`Contrast calculation method ${n} unsupported; use 'wcag2' or 'wcag3'`)}}function o0(e,t){if(!e)throw new Error("Array undefined");if(!Array.isArray(e))throw new Error("Passed object is not an array");const r=t==="wcag2"?0:1;return Math.min(...e.filter(n=>n>=r))}function s0(e,t){if(!e)throw new Error("Ratios undefined");e=e.sort((a,c)=>a-c);const r=o0(e,t),n=e.indexOf(r),o=[],i=e.slice(0,n),s=e.slice(n,e.length);for(let a=0;a<i.length;a++){const f=1/(i.length+1)*100*(a+1);o.push(wt(f))}for(let a=0;a<s.length;a++)o.push((a+1)*100);return o.sort((a,c)=>a-c),o}const i0=(e,t,r,n,o)=>{const s=nn({swatches:3e3,colorKeys:e._modifiedKeys,colorspace:e._colorspace,shift:1,smooth:e._smooth,asFun:!0}),a={},c=l=>{if(a[l])return a[l];const h=k(s(l)).rgb(),d=n0(h,t,r,o);return a[l]=d,d},u=l=>{const h=c(0),d=c(3e3),b=h<d?1:-1,g=.01;l+=.005*Math.sign(l);let m=3e3/2,y=m,L=c(y),w=100;for(;Math.abs(L-l)>g&&w;)w--,m/=2,L<l?y+=m*b:y-=m*b,L=c(y);return wt(y,3)},f=[];return n.forEach(l=>f.push(s(u(+l)))),f};class Q{constructor({name:t,colorKeys:r,colorspace:n,colorSpace:o=n??"RGB",ratios:i,smooth:s=!1,output:a="HEX",saturation:c=100}){if(n!==void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this._name=t,this._colorKeys=r,this._modifiedKeys=r,this._colorspace=o,this._ratios=i,this._smooth=s,this._output=a,this._saturation=c,!this._name)throw new Error("Color missing name");if(!this._colorKeys)throw new Error("Color Keys are undefined");if(!Gt[this._colorspace])throw new Error(`Colorspace “${o}” not supported`);if(!Gt[this._output])throw new Error(`Output “${this._output}” not supported`);for(let u=0;u<this._colorKeys.length;u++)if(!k.valid(this._colorKeys[u]))throw new Error(`Invalid Color Key “${this._colorKeys[u]}”`);this._colorScale=null}set colorKeys(t){this._colorKeys=t,this._updateColorSaturation()}get colorKeys(){return this._colorKeys}set saturation(t){this._saturation=t,this._updateColorSaturation()}get saturation(){return this._saturation}set colorSpace(t){this._colorspace=t,this._generateColorScale()}get colorSpace(){return this._colorspace}set colorspace(t){console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this.colorSpace=t}get colorspace(){return console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this.colorSpace}set ratios(t){this._ratios=t}get ratios(){return this._ratios}set name(t){this._name=t}get name(){return this._name}set smooth(t){t===!0||t==="true"?this._smooth=t:this._smooth=!1,this._generateColorScale()}get smooth(){return this._smooth}set output(t){this._output=t,this._colorScale=null}get output(){return this._output}get colorScale(){return this._colorScale||this._generateColorScale(),this._colorScale}_updateColorSaturation(){let t=[];this._colorKeys.forEach(r=>{let n=k(`${r}`).oklch(),i=n[1]*(this._saturation/100),s=k.oklch(n[0],i,n[2]),a=k.rgb(s).hex();t.push(a)}),this._modifiedKeys=t,this._generateColorScale()}_generateColorScale(){this._colorScale=nn({swatches:3e3,colorKeys:this._modifiedKeys,colorSpace:this._colorspace,shift:1,smooth:this._smooth,asFun:!0})}}class Ks extends Q{get backgroundColorScale(){return this._backgroundColorScale||this._generateColorScale(),this._backgroundColorScale}_generateColorScale(){Q.prototype._generateColorScale.call(this);const t=nn({swatches:1e3,colorKeys:this._colorKeys,colorspace:this._colorspace,shift:1,smooth:this._smooth});t.push(...this.colorKeys);const r=t.map((i,s)=>({value:Math.round(Uc(i)[2]),index:s})),o=e0(r,"value").map(i=>t[i.index]);return o.length>=101&&(o.length=100,o.push("#ffffff")),this._backgroundColorScale=o.map(i=>on(i,this._output)),this._backgroundColorScale}}class a0{constructor({colors:t,backgroundColor:r,lightness:n,contrast:o=1,saturation:i=100,output:s="HEX",formula:a="wcag2"}){if(this._output=s,this._colors=t,this._lightness=n,this._saturation=i,this._formula=a,this._setBackgroundColor(r),this._setBackgroundColorValue(),this._contrast=o,!this._colors)throw new Error("No colors are defined");if(!this._backgroundColor)throw new Error("Background color is undefined");if(t.forEach(c=>{if(!c.ratios)throw new Error(`Color ${c.name}'s ratios are undefined`)}),!Gt[this._output])throw new Error(`Output “${s}” not supported`);this._saturation<100&&this._updateColorSaturation(this._saturation),this._findContrastColors(),this._findContrastColorPairs(),this._findContrastColorValues()}set formula(t){this._formula=t,this._findContrastColors()}get formula(){return this._formula}set contrast(t){this._contrast=t,this._findContrastColors()}get contrast(){return this._contrast}set lightness(t){this._lightness=t,this._setBackgroundColor(this._backgroundColor),this._findContrastColors()}get lightness(){return this._lightness}set saturation(t){this._saturation=t,this._updateColorSaturation(t),this._findContrastColors()}get saturation(){return this._saturation}set backgroundColor(t){this._setBackgroundColor(t),this._findContrastColors()}get backgroundColorValue(){return this._backgroundColorValue}get backgroundColor(){return this._backgroundColor}set colors(t){this._colors=t,this._findContrastColors()}get colors(){return this._colors}set addColor(t){this._colors.push(t),this._findContrastColors()}set removeColor(t){const r=this._colors.filter(n=>n.name!==t.name);this._colors=r,this._findContrastColors()}set updateColor(t){if(Array.isArray(t))for(let r=0;r<t.length;r++){let n=this._colors.filter(s=>s.name===t[r].color);n=n[0];let o=this._colors.indexOf(n);const i=this._colors.filter(s=>s.name!==t[r].color);t[r].name&&(n.name=t[r].name),t[r].colorKeys&&(n.colorKeys=t[r].colorKeys),t[r].ratios&&(n.ratios=t[r].ratios),(t[r].colorSpace!==void 0||t[r].colorspace!==void 0)&&(t[r].colorspace!==void 0&&t[r].colorSpace===void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),n.colorSpace=t[r].colorSpace??t[r].colorspace),t[r].smooth&&(n.smooth=t[r].smooth),n._generateColorScale(),i.splice(o,0,n),this._colors=i}else{let r=this._colors.filter(i=>i.name===t.color);r=r[0];let n=this._colors.indexOf(r);const o=this._colors.filter(i=>i.name!==t.color);t.name&&(r.name=t.name),t.colorKeys&&(r.colorKeys=t.colorKeys),t.ratios&&(r.ratios=t.ratios),(t.colorSpace!==void 0||t.colorspace!==void 0)&&(t.colorspace!==void 0&&t.colorSpace===void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),r.colorSpace=t.colorSpace??t.colorspace),t.smooth&&(r.smooth=t.smooth),r._generateColorScale(),o.splice(n,0,r),this._colors=o}this._findContrastColors()}set output(t){this._output=t,this._colors.forEach(r=>{r.output=this._output}),this._backgroundColor.output=this._output,this._findContrastColors()}get output(){return this._output}get contrastColors(){return this._contrastColors}get contrastColorPairs(){return this._contrastColorPairs}get contrastColorValues(){return this._contrastColorValues}_setBackgroundColor(t){if(typeof t=="string"){const r=new Ks({name:"background",colorKeys:[t],output:"RGB"}),n=wt(k(String(t)).hsluv()[2]);this._backgroundColor=r,this._lightness=n,this._backgroundColorValue=r[this._lightness]}else{t.output="RGB";const r=t.backgroundColorScale[this._lightness];this._backgroundColor=t,this._backgroundColorValue=r}}_setBackgroundColorValue(){this._backgroundColorValue=this._backgroundColor.backgroundColorScale[this._lightness]}_updateColorSaturation(t){this._colors.map(r=>{r.saturation=t})}_findContrastColors(){const t=k(String(this._backgroundColorValue)).rgb(),r=this._lightness/100,o={background:on(this._backgroundColorValue,this._output)},i=[],s=[],a={...o};return i.push(o),this._colors.map(c=>{if(c.ratios!==void 0){let u;const f=[],l={name:c.name,values:f};let h;Array.isArray(c.ratios)?h=c.ratios:Array.isArray(c.ratios)||(u=Object.keys(c.ratios),h=Object.values(c.ratios)),h=h.map(b=>Hc(+b,this._contrast));const d=i0(c,t,r,h,this._formula).map(b=>on(b,this._output));for(let b=0;b<d.length;b++){let g;if(u)g=u[b];else{const y=s0(c.ratios,this._formula)[b];g=c.name.concat(y).replace(/\s+/g,"")}const m={name:g,contrast:h[b],value:d[b]};f.push(m),a[g]=d[b],s.push(d[b])}i.push(l)}return null}),this._contrastColorValues=s,this._contrastColorPairs=a,this._contrastColors=i,this._contrastColors}_findContrastColorPairs(){return this._contrastColorPairs}_findContrastColorValues(){return this._contrastColorValues}}Vc(k);function c0(e){return+`${Math.ceil(`${e}e+2`)}e-2`}const Xs=e=>{const t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return[Number.parseInt(t[1],16),Number.parseInt(t[2],16),Number.parseInt(t[3],16)]},Ds=(e,t,r)=>{const n=e/255,o=t/255,i=r/255,s=Math.min(n,o,i),a=Math.max(n,o,i),c=a-s;let u=0,f=0,l=0;return c===0?u=0:a===n?u=(o-i)/c%6:a===o?u=(i-n)/c+2:u=(n-o)/c+4,u=Math.round(u*60),u<0&&(u+=360),l=(a+s)/2,f=c===0?0:c/(1-Math.abs(2*l-1)),f=+(f*100).toFixed(1),l=+(l*100).toFixed(1),[u,f,Math.round(l)]},u0=(e,t,r,n)=>{const o=r/100,i=t*Math.min(o,1-o)/100,s=d=>{const b=(d+e/30)%12,g=o-i*Math.max(Math.min(b-3,9-b,1),-1);return Math.round(255*g).toString(16).padStart(2,"0").toUpperCase()},a=s(0),c=s(8),u=s(4),l=((d,b,g)=>Math.min(Math.max(d,b),g))(n,0,1),h=Math.round(l*255).toString(16).padStart(2,"0").toUpperCase();return`#${a}${c}${u}${h}`},l0=(e,t,r=1)=>{const n=Xs(e),o=Xs(t==="white"?"#FFFFFF":t==="black"?"#000000":t),i=n.map((u,f)=>[(u-o[f])/(255-o[f]),(u-o[f])/(0-o[f])]),s=c0(Math.max(...i.flat().filter(u=>/^-?\d+\.?\d*$/.test(u)))),a=n.map((u,f)=>Math.round((u-o[f]+o[f]*s)/s));if(a.includes(Number.NaN)){const u=Ds(n[0],n[1],n[2]);return{h:u[0],s:Math.round(u[1]*r),l:u[2],a:1}}const c=Ds(a[0],a[1],a[2]);return{h:c[0],s:Math.round(c[1]*r),l:c[2],a:s}},sn={backgroundColor:"gray",colorSpace:"OKLCH",colorSmoothing:!1,formula:"wcag2",output:"HEX",colors:{gray:[I(215,20,90),I(215,8,50),I(215,6,25)],red:[I(358,100,58),I(350,100,30)],orange:[I(32,100,48),I(12,100,30)],yellow:[I(50,100,50),I(25,100,20)],lime:[I(100,68,50),I(115,86,25)],green:[I(163,87,42),I(168,100,25)],cyan:[I(185,80,45),I(200,98,35)],blue:[I(212,98,46),I(222,95,25)],purple:[I(258,94,64),I(265,100,35)],fuchsia:[I(295,56,50),I(285,80,25)],pink:[I(334,90,50),I(330,91,25)]},themes:{light:{ratios:[1.03,1.06,1.12,1.25,1.5,1.75,2.25,3.5,5.25,6.5,8,10.5,13.75,16.75],contrast:1,lightness:100,saturation:100},dark:{ratios:[1.03,1.06,1.12,1.25,1.5,1.75,2.25,3.5,5.25,6.5,8,10.5,13.75,16],contrast:1,lightness:6,saturation:97},lightHc:{ratios:[1.06,1.12,1.25,1.37,1.75,2.25,3.25,4.75,8.87,10,11.75,13.25,16,17],contrast:1,lightness:100,saturation:100},darkHc:{ratios:[1.06,1.12,1.25,1.37,1.75,2.25,3.25,4.75,8.87,10,11.75,13.25,16,17],contrast:1,lightness:6,saturation:97}}};function I(e,t,r){return k.hsl(e,t/100,r/100).hex()}function f0(e,t){const r=e.colorSpace,n=e.colorSmoothing,o=e.themes[t].ratios,i=new Ks({name:"gray",colorKeys:e.colors.gray,colorspace:r,ratios:o,smooth:n}),s=new Q({name:"blue",colorKeys:e.colors.blue,colorspace:r,ratios:o,smooth:n}),a=new Q({name:"cyan",colorKeys:e.colors.cyan,colorspace:r,ratios:o,smooth:n}),c=new Q({name:"fuchsia",colorKeys:e.colors.fuchsia,colorspace:r,ratios:o,smooth:n}),u=new Q({name:"green",colorKeys:e.colors.green,colorspace:r,ratios:o,smooth:n}),f=new Q({name:"lime",colorKeys:e.colors.lime,colorspace:r,ratios:o,smooth:n}),l=new Q({name:"orange",colorKeys:e.colors.orange,colorspace:r,ratios:o,smooth:n}),h=new Q({name:"pink",colorKeys:e.colors.pink,colorspace:r,ratios:o,smooth:n}),d=new Q({name:"purple",colorKeys:e.colors.purple,colorspace:r,ratios:o,smooth:n}),b=new Q({name:"red",colorKeys:e.colors.red,colorspace:r,ratios:o,smooth:n}),g=new Q({name:"yellow",colorKeys:e.colors.yellow,colorspace:r,ratios:o,smooth:n}),m={gray:i,red:b,orange:l,yellow:g,lime:f,green:u,cyan:a,blue:s,purple:d,fuchsia:c,pink:h};return e.colors.custom&&(m.custom=new Q({name:"custom",colorKeys:e.colors.custom,colorspace:r,ratios:o,smooth:n})),new a0({colors:Object.values(m),backgroundColor:m[e.backgroundColor],contrast:e.themes[t].contrast,lightness:e.themes[t].lightness,saturation:e.themes[t].saturation,output:e.output,formula:e.formula}).contrastColors}function Vs(e){const t={};for(const r of Object.keys(e.themes))t[r]=f0(e,r);return t}function h0(e){sn.colors.custom=[e];const t=Vs(sn);return Object.fromEntries(Object.entries(t).map(([r,n])=>{const o=n.find(s=>s&&s.name==="custom"),i=Object.fromEntries(o.values.map(({name:s,value:a})=>[s,a]));for(const[s,a]of Object.entries(i)){const c=l0(a,n[0].background);i[`alpha${s.charAt(0).toUpperCase()+s.slice(1)}`]=u0(c.h,c.s,c.l,c.a)}return[r,i]}))}return $t.generateCustomColors=h0,$t.generateThemesJson=Vs,$t.hslToHex=I,$t.leonardoConfig=sn,Object.defineProperty($t,Symbol.toStringTag,{value:"Module"}),$t})({});
+var CompoundTheme=(function(e){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});var t=Object.create,n=Object.defineProperty,r=Object.getOwnPropertyDescriptor,i=Object.getOwnPropertyNames,a=Object.getPrototypeOf,o=Object.prototype.hasOwnProperty,s=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports),c=(e,t,a,s)=>{if(t&&typeof t==`object`||typeof t==`function`)for(var c=i(t),l=0,u=c.length,d;l<u;l++)d=c[l],!o.call(e,d)&&d!==a&&n(e,d,{get:(e=>t[e]).bind(null,d),enumerable:!(s=r(t,d))||s.enumerable});return e},l=(e,r,i)=>(i=e==null?{}:t(a(e)),c(r||!e||!e.__esModule?n(i,`default`,{value:e,enumerable:!0}):i,e)),{min:u,max:d}=Math,f=(e,t=0,n=1)=>u(d(t,e),n),p=e=>{e._clipped=!1,e._unclipped=e.slice(0);for(let t=0;t<=3;t++)t<3?((e[t]<0||e[t]>255)&&(e._clipped=!0),e[t]=f(e[t],0,255)):t===3&&(e[t]=f(e[t],0,1));return e},m={};for(let e of[`Boolean`,`Number`,`String`,`Function`,`Array`,`Date`,`RegExp`,`Undefined`,`Null`])m[`[object ${e}]`]=e.toLowerCase();function h(e){return m[Object.prototype.toString.call(e)]||`object`}var g=(e,t=null)=>e.length>=3?Array.prototype.slice.call(e):h(e[0])==`object`&&t?t.split(``).filter(t=>e[0][t]!==void 0).map(t=>e[0][t]):e[0].slice(0),_=e=>{if(e.length<2)return null;let t=e.length-1;return h(e[t])==`string`?e[t].toLowerCase():null},{PI:v,min:y,max:b}=Math,x=e=>Math.round(e*100)/100,S=e=>Math.round(e*100)/100,C=v*2,w=v/3,T=v/180,ee=180/v;function E(e){return[...e.slice(0,3).reverse(),...e.slice(3)]}var D={format:{},autodetect:[]},O=class{constructor(...e){let t=this;if(h(e[0])===`object`&&e[0].constructor&&e[0].constructor===this.constructor)return e[0];let n=_(e),r=!1;if(!n){r=!0,D.sorted||=(D.autodetect=D.autodetect.sort((e,t)=>t.p-e.p),!0);for(let t of D.autodetect)if(n=t.test(...e),n)break}if(D.format[n])t._rgb=p(D.format[n].apply(null,r?e:e.slice(0,-1)));else throw Error(`unknown format: `+e);t._rgb.length===3&&t._rgb.push(1)}toString(){return h(this.hex)==`function`?this.hex():`[${this._rgb.join(`,`)}]`}},te=`3.2.0`,k=(...e)=>new O(...e);k.version=te;var A={aliceblue:`#f0f8ff`,antiquewhite:`#faebd7`,aqua:`#00ffff`,aquamarine:`#7fffd4`,azure:`#f0ffff`,beige:`#f5f5dc`,bisque:`#ffe4c4`,black:`#000000`,blanchedalmond:`#ffebcd`,blue:`#0000ff`,blueviolet:`#8a2be2`,brown:`#a52a2a`,burlywood:`#deb887`,cadetblue:`#5f9ea0`,chartreuse:`#7fff00`,chocolate:`#d2691e`,coral:`#ff7f50`,cornflowerblue:`#6495ed`,cornsilk:`#fff8dc`,crimson:`#dc143c`,cyan:`#00ffff`,darkblue:`#00008b`,darkcyan:`#008b8b`,darkgoldenrod:`#b8860b`,darkgray:`#a9a9a9`,darkgreen:`#006400`,darkgrey:`#a9a9a9`,darkkhaki:`#bdb76b`,darkmagenta:`#8b008b`,darkolivegreen:`#556b2f`,darkorange:`#ff8c00`,darkorchid:`#9932cc`,darkred:`#8b0000`,darksalmon:`#e9967a`,darkseagreen:`#8fbc8f`,darkslateblue:`#483d8b`,darkslategray:`#2f4f4f`,darkslategrey:`#2f4f4f`,darkturquoise:`#00ced1`,darkviolet:`#9400d3`,deeppink:`#ff1493`,deepskyblue:`#00bfff`,dimgray:`#696969`,dimgrey:`#696969`,dodgerblue:`#1e90ff`,firebrick:`#b22222`,floralwhite:`#fffaf0`,forestgreen:`#228b22`,fuchsia:`#ff00ff`,gainsboro:`#dcdcdc`,ghostwhite:`#f8f8ff`,gold:`#ffd700`,goldenrod:`#daa520`,gray:`#808080`,green:`#008000`,greenyellow:`#adff2f`,grey:`#808080`,honeydew:`#f0fff0`,hotpink:`#ff69b4`,indianred:`#cd5c5c`,indigo:`#4b0082`,ivory:`#fffff0`,khaki:`#f0e68c`,laserlemon:`#ffff54`,lavender:`#e6e6fa`,lavenderblush:`#fff0f5`,lawngreen:`#7cfc00`,lemonchiffon:`#fffacd`,lightblue:`#add8e6`,lightcoral:`#f08080`,lightcyan:`#e0ffff`,lightgoldenrod:`#fafad2`,lightgoldenrodyellow:`#fafad2`,lightgray:`#d3d3d3`,lightgreen:`#90ee90`,lightgrey:`#d3d3d3`,lightpink:`#ffb6c1`,lightsalmon:`#ffa07a`,lightseagreen:`#20b2aa`,lightskyblue:`#87cefa`,lightslategray:`#778899`,lightslategrey:`#778899`,lightsteelblue:`#b0c4de`,lightyellow:`#ffffe0`,lime:`#00ff00`,limegreen:`#32cd32`,linen:`#faf0e6`,magenta:`#ff00ff`,maroon:`#800000`,maroon2:`#7f0000`,maroon3:`#b03060`,mediumaquamarine:`#66cdaa`,mediumblue:`#0000cd`,mediumorchid:`#ba55d3`,mediumpurple:`#9370db`,mediumseagreen:`#3cb371`,mediumslateblue:`#7b68ee`,mediumspringgreen:`#00fa9a`,mediumturquoise:`#48d1cc`,mediumvioletred:`#c71585`,midnightblue:`#191970`,mintcream:`#f5fffa`,mistyrose:`#ffe4e1`,moccasin:`#ffe4b5`,navajowhite:`#ffdead`,navy:`#000080`,oldlace:`#fdf5e6`,olive:`#808000`,olivedrab:`#6b8e23`,orange:`#ffa500`,orangered:`#ff4500`,orchid:`#da70d6`,palegoldenrod:`#eee8aa`,palegreen:`#98fb98`,paleturquoise:`#afeeee`,palevioletred:`#db7093`,papayawhip:`#ffefd5`,peachpuff:`#ffdab9`,peru:`#cd853f`,pink:`#ffc0cb`,plum:`#dda0dd`,powderblue:`#b0e0e6`,purple:`#800080`,purple2:`#7f007f`,purple3:`#a020f0`,rebeccapurple:`#663399`,red:`#ff0000`,rosybrown:`#bc8f8f`,royalblue:`#4169e1`,saddlebrown:`#8b4513`,salmon:`#fa8072`,sandybrown:`#f4a460`,seagreen:`#2e8b57`,seashell:`#fff5ee`,sienna:`#a0522d`,silver:`#c0c0c0`,skyblue:`#87ceeb`,slateblue:`#6a5acd`,slategray:`#708090`,slategrey:`#708090`,snow:`#fffafa`,springgreen:`#00ff7f`,steelblue:`#4682b4`,tan:`#d2b48c`,teal:`#008080`,thistle:`#d8bfd8`,tomato:`#ff6347`,turquoise:`#40e0d0`,violet:`#ee82ee`,wheat:`#f5deb3`,white:`#ffffff`,whitesmoke:`#f5f5f5`,yellow:`#ffff00`,yellowgreen:`#9acd32`},ne=/^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/,re=/^#?([A-Fa-f0-9]{8}|[A-Fa-f0-9]{4})$/,ie=e=>{if(e.match(ne)){(e.length===4||e.length===7)&&(e=e.substr(1)),e.length===3&&(e=e.split(``),e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]);let t=parseInt(e,16);return[t>>16,t>>8&255,t&255,1]}if(e.match(re)){(e.length===5||e.length===9)&&(e=e.substr(1)),e.length===4&&(e=e.split(``),e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]+e[3]+e[3]);let t=parseInt(e,16);return[t>>24&255,t>>16&255,t>>8&255,Math.round((t&255)/255*100)/100]}throw Error(`unknown hex color: ${e}`)},{round:ae}=Math,oe=(...e)=>{let[t,n,r,i]=g(e,`rgba`),a=_(e)||`auto`;i===void 0&&(i=1),a===`auto`&&(a=i<1?`rgba`:`rgb`),t=ae(t),n=ae(n),r=ae(r);let o=`000000`+(t<<16|n<<8|r).toString(16);o=o.substr(o.length-6);let s=`0`+ae(i*255).toString(16);switch(s=s.substr(s.length-2),a.toLowerCase()){case`rgba`:return`#${o}${s}`;case`argb`:return`#${s}${o}`;default:return`#${o}`}};O.prototype.name=function(){let e=oe(this._rgb,`rgb`);for(let t of Object.keys(A))if(A[t]===e)return t.toLowerCase();return e},D.format.named=e=>{if(e=e.toLowerCase(),A[e])return ie(A[e]);throw Error(`unknown color name: `+e)},D.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&h(e)===`string`&&A[e.toLowerCase()])return`named`}}),O.prototype.alpha=function(e,t=!1){return e!==void 0&&h(e)===`number`?t?(this._rgb[3]=e,this):new O([this._rgb[0],this._rgb[1],this._rgb[2],e],`rgb`):this._rgb[3]},O.prototype.clipped=function(){return this._rgb._clipped||!1};var j={Kn:18,labWhitePoint:`d65`,Xn:.95047,Yn:1,Zn:1.08883,t0:.137931034,t1:.206896552,t2:.12841855,t3:.008856452,kE:216/24389,kKE:8,kK:24389/27,RefWhiteRGB:{X:.95047,Y:1,Z:1.08883},MtxRGB2XYZ:{m00:.4124564390896922,m01:.21267285140562253,m02:.0193338955823293,m10:.357576077643909,m11:.715152155287818,m12:.11919202588130297,m20:.18043748326639894,m21:.07217499330655958,m22:.9503040785363679},MtxXYZ2RGB:{m00:3.2404541621141045,m01:-.9692660305051868,m02:.055643430959114726,m10:-1.5371385127977166,m11:1.8760108454466942,m12:-.2040259135167538,m20:-.498531409556016,m21:.041556017530349834,m22:1.0572251882231791},As:.9414285350000001,Bs:1.040417467,Cs:1.089532651,MtxAdaptMa:{m00:.8951,m01:-.7502,m02:.0389,m10:.2664,m11:1.7135,m12:-.0685,m20:-.1614,m21:.0367,m22:1.0296},MtxAdaptMaI:{m00:.9869929054667123,m01:.43230526972339456,m02:-.008528664575177328,m10:-.14705425642099013,m11:.5183602715367776,m12:.04004282165408487,m20:.15996265166373125,m21:.0492912282128556,m22:.9684866957875502}},se=new Map([[`a`,[1.0985,.35585]],[`b`,[1.0985,.35585]],[`c`,[.98074,1.18232]],[`d50`,[.96422,.82521]],[`d55`,[.95682,.92149]],[`d65`,[.95047,1.08883]],[`e`,[1,1,1]],[`f2`,[.99186,.67393]],[`f7`,[.95041,1.08747]],[`f11`,[1.00962,.6435]],[`icc`,[.96422,.82521]]]);function M(e){let t=se.get(String(e).toLowerCase());if(!t)throw Error(`unknown Lab illuminant `+e);j.labWhitePoint=e,j.Xn=t[0],j.Zn=t[1]}function ce(){return j.labWhitePoint}var N=(...e)=>{e=g(e,`lab`);let[t,n,r]=e,[i,a,o]=le(t,n,r),[s,c,l]=de(i,a,o);return[s,c,l,e.length>3?e[3]:1]},le=(e,t,n)=>{let{kE:r,kK:i,kKE:a,Xn:o,Yn:s,Zn:c}=j,l=(e+16)/116,u=.002*t+l,d=l-.005*n,f=u*u*u,p=d*d*d,m=f>r?f:(116*u-16)/i,h=e>a?((e+16)/116)**3:e/i,g=p>r?p:(116*d-16)/i;return[m*o,h*s,g*c]},ue=e=>{let t=Math.sign(e);return e=Math.abs(e),(e<=.0031308?e*12.92:1.055*e**(1/2.4)-.055)*t},de=(e,t,n)=>{let{MtxAdaptMa:r,MtxAdaptMaI:i,MtxXYZ2RGB:a,RefWhiteRGB:o,Xn:s,Yn:c,Zn:l}=j,u=s*r.m00+c*r.m10+l*r.m20,d=s*r.m01+c*r.m11+l*r.m21,f=s*r.m02+c*r.m12+l*r.m22,p=o.X*r.m00+o.Y*r.m10+o.Z*r.m20,m=o.X*r.m01+o.Y*r.m11+o.Z*r.m21,h=o.X*r.m02+o.Y*r.m12+o.Z*r.m22,g=(e*r.m00+t*r.m10+n*r.m20)*(p/u),_=(e*r.m01+t*r.m11+n*r.m21)*(m/d),v=(e*r.m02+t*r.m12+n*r.m22)*(h/f),y=g*i.m00+_*i.m10+v*i.m20,b=g*i.m01+_*i.m11+v*i.m21,x=g*i.m02+_*i.m12+v*i.m22,S=ue(y*a.m00+b*a.m10+x*a.m20),C=ue(y*a.m01+b*a.m11+x*a.m21),w=ue(y*a.m02+b*a.m12+x*a.m22);return[S*255,C*255,w*255]},fe=(...e)=>{let[t,n,r,...i]=g(e,`rgb`),[a,o,s]=he(t,n,r),[c,l,u]=pe(a,o,s);return[c,l,u,...i.length>0&&i[0]<1?[i[0]]:[]]};function pe(e,t,n){let{Xn:r,Yn:i,Zn:a,kE:o,kK:s}=j,c=e/r,l=t/i,u=n/a,d=c>o?c**(1/3):(s*c+16)/116,f=l>o?l**(1/3):(s*l+16)/116,p=u>o?u**(1/3):(s*u+16)/116;return[116*f-16,500*(d-f),200*(f-p)]}function me(e){let t=Math.sign(e);return e=Math.abs(e),(e<=.04045?e/12.92:((e+.055)/1.055)**2.4)*t}var he=(e,t,n)=>{e=me(e/255),t=me(t/255),n=me(n/255);let{MtxRGB2XYZ:r,MtxAdaptMa:i,MtxAdaptMaI:a,Xn:o,Yn:s,Zn:c,As:l,Bs:u,Cs:d}=j,f=e*r.m00+t*r.m10+n*r.m20,p=e*r.m01+t*r.m11+n*r.m21,m=e*r.m02+t*r.m12+n*r.m22,h=o*i.m00+s*i.m10+c*i.m20,g=o*i.m01+s*i.m11+c*i.m21,_=o*i.m02+s*i.m12+c*i.m22,v=f*i.m00+p*i.m10+m*i.m20,y=f*i.m01+p*i.m11+m*i.m21,b=f*i.m02+p*i.m12+m*i.m22;return v*=h/l,y*=g/u,b*=_/d,f=v*a.m00+y*a.m10+b*a.m20,p=v*a.m01+y*a.m11+b*a.m21,m=v*a.m02+y*a.m12+b*a.m22,[f,p,m]};O.prototype.lab=function(){return fe(this._rgb)},Object.assign(k,{lab:(...e)=>new O(...e,`lab`),getLabWhitePoint:ce,setLabWhitePoint:M}),D.format.lab=N,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`lab`),h(e)===`array`&&e.length===3)return`lab`}}),O.prototype.darken=function(e=1){let t=this,n=t.lab();return n[0]-=j.Kn*e,new O(n,`lab`).alpha(t.alpha(),!0)},O.prototype.brighten=function(e=1){return this.darken(-e)},O.prototype.darker=O.prototype.darken,O.prototype.brighter=O.prototype.brighten,O.prototype.get=function(e){let[t,n]=e.split(`.`),r=this[t]();if(n){let e=t.indexOf(n)-(t.substr(0,2)===`ok`?2:0);if(e>-1)return r[e];throw Error(`unknown channel ${n} in mode ${t}`)}else return r};var{pow:ge}=Math,_e=1e-7,ve=20;O.prototype.luminance=function(e,t=`rgb`){if(e!==void 0&&h(e)===`number`){if(e===0)return new O([0,0,0,this._rgb[3]],`rgb`);if(e===1)return new O([255,255,255,this._rgb[3]],`rgb`);let n=this.luminance(),r=ve,i=(n,a)=>{let o=n.interpolate(a,.5,t),s=o.luminance();return Math.abs(e-s)<_e||!r--?o:s>e?i(n,o):i(o,a)};return new O([...(n>e?i(new O([0,0,0]),this):i(this,new O([255,255,255]))).rgb(),this._rgb[3]])}return ye(...this._rgb.slice(0,3))};var ye=(e,t,n)=>(e=be(e),t=be(t),n=be(n),.2126*e+.7152*t+.0722*n),be=e=>(e/=255,e<=.03928?e/12.92:ge((e+.055)/1.055,2.4)),P={},F=(e,t,n=.5,...r)=>{let i=r[0]||`lrgb`;if(!P[i]&&!r.length&&(i=Object.keys(P)[0]),!P[i])throw Error(`interpolation mode ${i} is not defined`);return h(e)!==`object`&&(e=new O(e)),h(t)!==`object`&&(t=new O(t)),P[i](e,t,n).alpha(e.alpha()+n*(t.alpha()-e.alpha()))};O.prototype.mix=O.prototype.interpolate=function(e,t=.5,...n){return F(this,e,t,...n)},O.prototype.premultiply=function(e=!1){let t=this._rgb,n=t[3];return e?(this._rgb=[t[0]*n,t[1]*n,t[2]*n,n],this):new O([t[0]*n,t[1]*n,t[2]*n,n],`rgb`)};var{sin:xe,cos:Se}=Math,Ce=(...e)=>{let[t,n,r]=g(e,`lch`);return isNaN(r)&&(r=0),r*=T,[t,Se(r)*n,xe(r)*n]},we=(...e)=>{e=g(e,`lch`);let[t,n,r]=e,[i,a,o]=Ce(t,n,r),[s,c,l]=N(i,a,o);return[s,c,l,e.length>3?e[3]:1]},Te=(...e)=>we(...E(g(e,`hcl`))),{sqrt:Ee,atan2:De,round:Oe}=Math,ke=(...e)=>{let[t,n,r]=g(e,`lab`),i=Ee(n*n+r*r),a=(De(r,n)*ee+360)%360;return Oe(i*1e4)===0&&(a=NaN),[t,i,a]},Ae=(...e)=>{let[t,n,r,...i]=g(e,`rgb`),[a,o,s]=fe(t,n,r),[c,l,u]=ke(a,o,s);return[c,l,u,...i.length>0&&i[0]<1?[i[0]]:[]]};O.prototype.lch=function(){return Ae(this._rgb)},O.prototype.hcl=function(){return E(Ae(this._rgb))},Object.assign(k,{lch:(...e)=>new O(...e,`lch`),hcl:(...e)=>new O(...e,`hcl`)}),D.format.lch=we,D.format.hcl=Te,[`lch`,`hcl`].forEach(e=>D.autodetect.push({p:2,test:(...t)=>{if(t=g(t,e),h(t)===`array`&&t.length===3)return e}})),O.prototype.saturate=function(e=1){let t=this,n=t.lch();return n[1]+=j.Kn*e,n[1]<0&&(n[1]=0),new O(n,`lch`).alpha(t.alpha(),!0)},O.prototype.desaturate=function(e=1){return this.saturate(-e)},O.prototype.set=function(e,t,n=!1){let[r,i]=e.split(`.`),a=this[r]();if(i){let e=r.indexOf(i)-(r.substr(0,2)===`ok`?2:0);if(e>-1){if(h(t)==`string`)switch(t.charAt(0)){case`+`:a[e]+=+t;break;case`-`:a[e]+=+t;break;case`*`:a[e]*=+t.substr(1);break;case`/`:a[e]/=+t.substr(1);break;default:a[e]=+t}else if(h(t)===`number`)a[e]=t;else throw Error(`unsupported value for Color.set`);let i=new O(a,r);return n?(this._rgb=i._rgb,this):i}throw Error(`unknown channel ${i} in mode ${r}`)}else return a},O.prototype.tint=function(e=.5,...t){return F(this,`white`,e,...t)},O.prototype.shade=function(e=.5,...t){return F(this,`black`,e,...t)},P.rgb=(e,t,n)=>{let r=e._rgb,i=t._rgb;return new O(r[0]+n*(i[0]-r[0]),r[1]+n*(i[1]-r[1]),r[2]+n*(i[2]-r[2]),`rgb`)};var{sqrt:je,pow:Me}=Math;P.lrgb=(e,t,n)=>{let[r,i,a]=e._rgb,[o,s,c]=t._rgb;return new O(je(Me(r,2)*(1-n)+Me(o,2)*n),je(Me(i,2)*(1-n)+Me(s,2)*n),je(Me(a,2)*(1-n)+Me(c,2)*n),`rgb`)},P.lab=(e,t,n)=>{let r=e.lab(),i=t.lab();return new O(r[0]+n*(i[0]-r[0]),r[1]+n*(i[1]-r[1]),r[2]+n*(i[2]-r[2]),`lab`)};var Ne=(e,t,n,r)=>{let i,a;r===`hsl`?(i=e.hsl(),a=t.hsl()):r===`hsv`?(i=e.hsv(),a=t.hsv()):r===`hcg`?(i=e.hcg(),a=t.hcg()):r===`hsi`?(i=e.hsi(),a=t.hsi()):r===`lch`||r===`hcl`?(r=`hcl`,i=e.hcl(),a=t.hcl()):r===`oklch`&&(i=e.oklch().reverse(),a=t.oklch().reverse());let o,s,c,l,u,d;(r.substr(0,1)===`h`||r===`oklch`)&&([o,c,u]=i,[s,l,d]=a);let f,p,m,h;return!isNaN(o)&&!isNaN(s)?(h=s>o&&s-o>180?s-(o+360):s<o&&o-s>180?s+360-o:s-o,p=o+n*h):isNaN(o)?isNaN(s)?p=NaN:(p=s,(u==1||u==0)&&r!=`hsv`&&(f=l)):(p=o,(d==1||d==0)&&r!=`hsv`&&(f=c)),f===void 0&&(f=c+n*(l-c)),m=u+n*(d-u),r===`oklch`?new O([m,f,p],r):new O([p,f,m],r)},Pe=(e,t,n)=>Ne(e,t,n,`lch`);P.lch=Pe,P.hcl=Pe;var Fe=e=>{if(h(e)==`number`&&e>=0&&e<=16777215)return[e>>16,e>>8&255,e&255,1];throw Error(`unknown num color: `+e)},Ie=(...e)=>{let[t,n,r]=g(e,`rgb`);return(t<<16)+(n<<8)+r};O.prototype.num=function(){return Ie(this._rgb)},Object.assign(k,{num:(...e)=>new O(...e,`num`)}),D.format.num=Fe,D.autodetect.push({p:5,test:(...e)=>{if(e.length===1&&h(e[0])===`number`&&e[0]>=0&&e[0]<=16777215)return`num`}}),P.num=(e,t,n)=>{let r=e.num();return new O(r+n*(t.num()-r),`num`)};var{floor:Le}=Math,Re=(...e)=>{e=g(e,`hcg`);let[t,n,r]=e,i,a,o;r*=255;let s=n*255;if(n===0)i=a=o=r;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;let e=Le(t),c=t-e,l=r*(1-n),u=l+s*(1-c),d=l+s*c,f=l+s;switch(e){case 0:[i,a,o]=[f,d,l];break;case 1:[i,a,o]=[u,f,l];break;case 2:[i,a,o]=[l,f,d];break;case 3:[i,a,o]=[l,u,f];break;case 4:[i,a,o]=[d,l,f];break;case 5:[i,a,o]=[f,l,u];break}}return[i,a,o,e.length>3?e[3]:1]},ze=(...e)=>{let[t,n,r]=g(e,`rgb`),i=y(t,n,r),a=b(t,n,r),o=a-i,s=o*100/255,c=i/(255-o)*100,l;return o===0?l=NaN:(t===a&&(l=(n-r)/o),n===a&&(l=2+(r-t)/o),r===a&&(l=4+(t-n)/o),l*=60,l<0&&(l+=360)),[l,s,c]};O.prototype.hcg=function(){return ze(this._rgb)},k.hcg=(...e)=>new O(...e,`hcg`),D.format.hcg=Re,D.autodetect.push({p:1,test:(...e)=>{if(e=g(e,`hcg`),h(e)===`array`&&e.length===3)return`hcg`}}),P.hcg=(e,t,n)=>Ne(e,t,n,`hcg`);var{cos:Be}=Math,Ve=(...e)=>{e=g(e,`hsi`);let[t,n,r]=e,i,a,o;return isNaN(t)&&(t=0),isNaN(n)&&(n=0),t>360&&(t-=360),t<0&&(t+=360),t/=360,t<1/3?(o=(1-n)/3,i=(1+n*Be(C*t)/Be(w-C*t))/3,a=1-(o+i)):t<2/3?(t-=1/3,i=(1-n)/3,a=(1+n*Be(C*t)/Be(w-C*t))/3,o=1-(i+a)):(t-=2/3,a=(1-n)/3,o=(1+n*Be(C*t)/Be(w-C*t))/3,i=1-(a+o)),i=f(r*i*3),a=f(r*a*3),o=f(r*o*3),[i*255,a*255,o*255,e.length>3?e[3]:1]},{min:He,sqrt:Ue,acos:We}=Math,Ge=(...e)=>{let[t,n,r]=g(e,`rgb`);t/=255,n/=255,r/=255;let i,a=He(t,n,r),o=(t+n+r)/3,s=o>0?1-a/o:0;return s===0?i=NaN:(i=(t-n+(t-r))/2,i/=Ue((t-n)*(t-n)+(t-r)*(n-r)),i=We(i),r>n&&(i=C-i),i/=C),[i*360,s,o]};O.prototype.hsi=function(){return Ge(this._rgb)},k.hsi=(...e)=>new O(...e,`hsi`),D.format.hsi=Ve,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`hsi`),h(e)===`array`&&e.length===3)return`hsi`}}),P.hsi=(e,t,n)=>Ne(e,t,n,`hsi`);var Ke=(...e)=>{e=g(e,`hsl`);let[t,n,r]=e,i,a,o;if(n===0)i=a=o=r*255;else{let e=[0,0,0],s=[0,0,0],c=r<.5?r*(1+n):r+n-r*n,l=2*r-c,u=t/360;e[0]=u+1/3,e[1]=u,e[2]=u-1/3;for(let t=0;t<3;t++)e[t]<0&&(e[t]+=1),e[t]>1&&--e[t],6*e[t]<1?s[t]=l+(c-l)*6*e[t]:2*e[t]<1?s[t]=c:3*e[t]<2?s[t]=l+(c-l)*(2/3-e[t])*6:s[t]=l;[i,a,o]=[s[0]*255,s[1]*255,s[2]*255]}return e.length>3?[i,a,o,e[3]]:[i,a,o,1]},qe=(...e)=>{e=g(e,`rgba`);let[t,n,r]=e;t/=255,n/=255,r/=255;let i=y(t,n,r),a=b(t,n,r),o=(a+i)/2,s,c;return a===i?(s=0,c=NaN):s=o<.5?(a-i)/(a+i):(a-i)/(2-a-i),t==a?c=(n-r)/(a-i):n==a?c=2+(r-t)/(a-i):r==a&&(c=4+(t-n)/(a-i)),c*=60,c<0&&(c+=360),e.length>3&&e[3]!==void 0?[c,s,o,e[3]]:[c,s,o]};O.prototype.hsl=function(){return qe(this._rgb)},k.hsl=(...e)=>new O(...e,`hsl`),D.format.hsl=Ke,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`hsl`),h(e)===`array`&&e.length===3)return`hsl`}}),P.hsl=(e,t,n)=>Ne(e,t,n,`hsl`);var{floor:Je}=Math,Ye=(...e)=>{e=g(e,`hsv`);let[t,n,r]=e,i,a,o;if(r*=255,n===0)i=a=o=r;else{t===360&&(t=0),t>360&&(t-=360),t<0&&(t+=360),t/=60;let e=Je(t),s=t-e,c=r*(1-n),l=r*(1-n*s),u=r*(1-n*(1-s));switch(e){case 0:[i,a,o]=[r,u,c];break;case 1:[i,a,o]=[l,r,c];break;case 2:[i,a,o]=[c,r,u];break;case 3:[i,a,o]=[c,l,r];break;case 4:[i,a,o]=[u,c,r];break;case 5:[i,a,o]=[r,c,l];break}}return[i,a,o,e.length>3?e[3]:1]},{min:Xe,max:Ze}=Math,Qe=(...e)=>{e=g(e,`rgb`);let[t,n,r]=e,i=Xe(t,n,r),a=Ze(t,n,r),o=a-i,s,c,l;return l=a/255,a===0?(s=NaN,c=0):(c=o/a,t===a&&(s=(n-r)/o),n===a&&(s=2+(r-t)/o),r===a&&(s=4+(t-n)/o),s*=60,s<0&&(s+=360)),[s,c,l]};O.prototype.hsv=function(){return Qe(this._rgb)},k.hsv=(...e)=>new O(...e,`hsv`),D.format.hsv=Ye,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`hsv`),h(e)===`array`&&e.length===3)return`hsv`}}),P.hsv=(e,t,n)=>Ne(e,t,n,`hsv`);function $e(e,t){let n=e.length;Array.isArray(e[0])||(e=[e]),Array.isArray(t[0])||(t=t.map(e=>[e]));let r=t[0].length,i=t[0].map((e,n)=>t.map(e=>e[n])),a=e.map(e=>i.map(t=>Array.isArray(e)?e.reduce((e,n,r)=>e+n*(t[r]||0),0):t.reduce((t,n)=>t+n*e,0)));return n===1&&(a=a[0]),r===1?a.map(e=>e[0]):a}var et=(...e)=>{e=g(e,`lab`);let[t,n,r,...i]=e,[a,o,s]=tt([t,n,r]),[c,l,u]=de(a,o,s);return[c,l,u,...i.length>0&&i[0]<1?[i[0]]:[]]};function tt(e){return $e([[1.2268798758459243,-.5578149944602171,.2813910456659647],[-.0405757452148008,1.112286803280317,-.0717110580655164],[-.0763729366746601,-.4214933324022432,1.5869240198367816]],$e([[1,.3963377773761749,.2158037573099136],[1,-.1055613458156586,-.0638541728258133],[1,-.0894841775298119,-1.2914855480194092]],e).map(e=>e**3))}var nt=(...e)=>{let[t,n,r,...i]=g(e,`rgb`);return[...rt(he(t,n,r)),...i.length>0&&i[0]<1?[i[0]]:[]]};function rt(e){return $e([[.210454268309314,.7936177747023054,-.0040720430116193],[1.9779985324311684,-2.42859224204858,.450593709617411],[.0259040424655478,.7827717124575296,-.8086757549230774]],$e([[.819022437996703,.3619062600528904,-.1288737815209879],[.0329836539323885,.9292868615863434,.0361446663506424],[.0481771893596242,.2642395317527308,.6335478284694309]],e).map(e=>Math.cbrt(e)))}O.prototype.oklab=function(){return nt(this._rgb)},Object.assign(k,{oklab:(...e)=>new O(...e,`oklab`)}),D.format.oklab=et,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`oklab`),h(e)===`array`&&e.length===3)return`oklab`}}),P.oklab=(e,t,n)=>{let r=e.oklab(),i=t.oklab();return new O(r[0]+n*(i[0]-r[0]),r[1]+n*(i[1]-r[1]),r[2]+n*(i[2]-r[2]),`oklab`)},P.oklch=(e,t,n)=>Ne(e,t,n,`oklch`);var{pow:it,sqrt:at,PI:ot,cos:st,sin:ct,atan2:lt}=Math,ut=(e,t=`lrgb`,n=null)=>{let r=e.length;n||=Array.from(Array(r)).map(()=>1);let i=r/n.reduce(function(e,t){return e+t});if(n.forEach((e,t)=>{n[t]*=i}),e=e.map(e=>new O(e)),t===`lrgb`)return dt(e,n);let a=e.shift(),o=a.get(t),s=[],c=0,l=0;for(let e=0;e<o.length;e++)if(o[e]=(o[e]||0)*n[0],s.push(isNaN(o[e])?0:n[0]),t.charAt(e)===`h`&&!isNaN(o[e])){let t=o[e]/180*ot;c+=st(t)*n[0],l+=ct(t)*n[0]}let u=a.alpha()*n[0];e.forEach((e,r)=>{let i=e.get(t);u+=e.alpha()*n[r+1];for(let e=0;e<o.length;e++)if(!isNaN(i[e]))if(s[e]+=n[r+1],t.charAt(e)===`h`){let t=i[e]/180*ot;c+=st(t)*n[r+1],l+=ct(t)*n[r+1]}else o[e]+=i[e]*n[r+1]});for(let e=0;e<o.length;e++)if(t.charAt(e)===`h`){let t=lt(l/s[e],c/s[e])/ot*180;for(;t<0;)t+=360;for(;t>=360;)t-=360;o[e]=t}else o[e]=o[e]/s[e];return u/=r,new O(o,t).alpha(u>.99999?1:u,!0)},dt=(e,t)=>{let n=e.length,r=[0,0,0,0];for(let i=0;i<e.length;i++){let a=e[i],o=t[i]/n,s=a._rgb;r[0]+=it(s[0],2)*o,r[1]+=it(s[1],2)*o,r[2]+=it(s[2],2)*o,r[3]+=s[3]*o}return r[0]=at(r[0]),r[1]=at(r[1]),r[2]=at(r[2]),r[3]>.9999999&&(r[3]=1),new O(p(r))},{pow:ft}=Math;function pt(e){let t=`rgb`,n=k(`#ccc`),r=0,i=[0,1],a=[0,1],o=[],s=[0,0],c=!1,l=[],u=!1,d=0,p=1,m=!1,g={},_=!0,v=1,y=function(e){if(e||=[`#fff`,`#000`],e&&h(e)===`string`&&k.brewer&&k.brewer[e.toLowerCase()]&&(e=k.brewer[e.toLowerCase()]),h(e)===`array`){e.length===1&&(e=[e[0],e[0]]),e=e.slice(0);for(let t=0;t<e.length;t++)e[t]=k(e[t]);o.length=0;for(let t=0;t<e.length;t++)o.push(t/(e.length-1))}return w(),l=e},b=function(e){if(c!=null){let t=c.length-1,n=0;for(;n<t&&e>=c[n];)n++;return n-1}return 0},x=e=>e,S=e=>e,C=function(e,r){let i,a;if(r??=!1,isNaN(e)||e===null)return n;a=r?e:c&&c.length>2?b(e)/(c.length-2):p===d?1:(e-d)/(p-d),a=S(a),r||(a=x(a)),v!==1&&(a=ft(a,v)),a=s[0]+a*(1-s[0]-s[1]),a=f(a,0,1);let u=Math.floor(a*1e4);if(_&&g[u])i=g[u];else{if(h(l)===`array`)for(let e=0;e<o.length;e++){let n=o[e];if(a<=n){i=l[e];break}if(a>=n&&e===o.length-1){i=l[e];break}if(a>n&&a<o[e+1]){a=(a-n)/(o[e+1]-n),i=k.interpolate(l[e],l[e+1],a,t);break}}else h(l)===`function`&&(i=l(a));_&&(g[u]=i)}return i};var w=()=>g={};y(e);let T=function(e){let t=k(C(e));return u&&t[u]?t[u]():t};return T.classes=function(e){if(e!=null){if(h(e)===`array`)c=e,i=[e[0],e[e.length-1]];else{let t=k.analyze(i);c=e===0?[t.min,t.max]:k.limits(t,`e`,e)}return T}return c},T.domain=function(e){if(!arguments.length)return a;a=e.slice(0),d=e[0],p=e[e.length-1],o=[];let t=l.length;if(e.length===t&&d!==p)for(let t of Array.from(e))o.push((t-d)/(p-d));else{for(let e=0;e<t;e++)o.push(e/(t-1));if(e.length>2){let t=e.map((t,n)=>n/(e.length-1)),n=e.map(e=>(e-d)/(p-d));n.every((e,n)=>t[n]===e)||(S=e=>{if(e<=0||e>=1)return e;let r=0;for(;e>=n[r+1];)r++;let i=(e-n[r])/(n[r+1]-n[r]);return t[r]+i*(t[r+1]-t[r])})}}return i=[d,p],T},T.mode=function(e){return arguments.length?(t=e,w(),T):t},T.range=function(e,t){return y(e,t),T},T.out=function(e){return u=e,T},T.spread=function(e){return arguments.length?(r=e,T):r},T.correctLightness=function(e){return e??=!0,m=e,w(),x=m?function(e){let t=C(0,!0).lab()[0],n=C(1,!0).lab()[0],r=t>n,i=C(e,!0).lab()[0],a=t+(n-t)*e,o=i-a,s=0,c=1,l=20;for(;Math.abs(o)>.01&&l-->0;)(function(){return r&&(o*=-1),o<0?(s=e,e+=(c-e)*.5):(c=e,e+=(s-e)*.5),i=C(e,!0).lab()[0],o=i-a})();return e}:e=>e,T},T.padding=function(e){return e==null?s:(h(e)===`number`&&(e=[e,e]),s=e,T)},T.colors=function(t,n){arguments.length<2&&(n=`hex`);let r=[];if(arguments.length===0)r=l.slice(0);else if(t===1)r=[T(.5)];else if(t>1){let e=i[0],n=i[1]-e;r=mt(0,t,!1).map(r=>T(e+r/(t-1)*n))}else{e=[];let t=[];if(c&&c.length>2)for(let e=1,n=c.length,r=1<=n;r?e<n:e>n;r?e++:e--)t.push((c[e-1]+c[e])*.5);else t=i;r=t.map(e=>T(e))}return k[n]&&(r=r.map(e=>e[n]())),r},T.cache=function(e){return e==null?_:(_=e,T)},T.gamma=function(e){return e==null?v:(v=e,T)},T.nodata=function(e){return e==null?n:(n=k(e),T)},T}function mt(e,t,n){let r=[],i=e<t,a=n?i?t+1:t-1:t;for(let t=e;i?t<a:t>a;i?t++:t--)r.push(t);return r}var ht=function(e){let t=[1,1];for(let n=1;n<e;n++){let e=[1];for(let n=1;n<=t.length;n++)e[n]=(t[n]||0)+t[n-1];t=e}return t},gt=function(e){let t,n,r,i;if(e=e.map(e=>new O(e)),e.length===2)[n,r]=e.map(e=>e.lab()),t=function(e){return new O([0,1,2].map(t=>n[t]+e*(r[t]-n[t])),`lab`)};else if(e.length===3)[n,r,i]=e.map(e=>e.lab()),t=function(e){return new O([0,1,2].map(t=>(1-e)*(1-e)*n[t]+2*(1-e)*e*r[t]+e*e*i[t]),`lab`)};else if(e.length===4){let a;[n,r,i,a]=e.map(e=>e.lab()),t=function(e){return new O([0,1,2].map(t=>(1-e)*(1-e)*(1-e)*n[t]+3*(1-e)*(1-e)*e*r[t]+3*(1-e)*e*e*i[t]+e*e*e*a[t]),`lab`)}}else if(e.length>=5){let n,r,i;n=e.map(e=>e.lab()),i=e.length-1,r=ht(i),t=function(e){let t=1-e;return new O([0,1,2].map(a=>n.reduce((n,o,s)=>n+r[s]*t**(i-s)*e**s*o[a],0)),`lab`)}}else throw RangeError(`No point in running bezier with only one color.`);return t},_t=e=>{let t=gt(e);return t.scale=()=>pt(t),t},{round:vt}=Math;O.prototype.rgb=function(e=!0){return e===!1?this._rgb.slice(0,3):this._rgb.slice(0,3).map(vt)},O.prototype.rgba=function(e=!0){return this._rgb.slice(0,4).map((t,n)=>n<3?e===!1?t:vt(t):t)},Object.assign(k,{rgb:(...e)=>new O(...e,`rgb`)}),D.format.rgb=(...e)=>{let t=g(e,`rgba`);return t[3]===void 0&&(t[3]=1),t},D.autodetect.push({p:3,test:(...e)=>{if(e=g(e,`rgba`),h(e)===`array`&&(e.length===3||e.length===4&&h(e[3])==`number`&&e[3]>=0&&e[3]<=1))return`rgb`}});var I=(e,t,n)=>{if(!I[n])throw Error(`unknown blend mode `+n);return I[n](e,t)},L=e=>(t,n)=>{let r=k(n).rgb(),i=k(t).rgb();return k.rgb(e(r,i))},R=e=>(t,n)=>{let r=[];return r[0]=e(t[0],n[0]),r[1]=e(t[1],n[1]),r[2]=e(t[2],n[2]),r};I.normal=L(R(e=>e)),I.multiply=L(R((e,t)=>e*t/255)),I.screen=L(R((e,t)=>255*(1-(1-e/255)*(1-t/255)))),I.overlay=L(R((e,t)=>t<128?2*e*t/255:255*(1-2*(1-e/255)*(1-t/255)))),I.darken=L(R((e,t)=>e>t?t:e)),I.lighten=L(R((e,t)=>e>t?e:t)),I.dodge=L(R((e,t)=>e===255?255:(e=t/255*255/(1-e/255),e>255?255:e))),I.burn=L(R((e,t)=>255*(1-(1-t/255)/(e/255))));var{pow:yt,sin:bt,cos:xt}=Math;function St(e=300,t=-1.5,n=1,r=1,i=[0,1]){let a=0,o;h(i)===`array`?o=i[1]-i[0]:(o=0,i=[i,i]);let s=function(s){let c=C*((e+120)/360+t*s),l=yt(i[0]+o*s,r),u=(a===0?n:n[0]+s*a)*l*(1-l)/2,d=xt(c),f=bt(c),m=l+u*(-.14861*d+1.78277*f),h=l+u*(-.29227*d-.90649*f),g=l+1.97294*d*u;return k(p([m*255,h*255,g*255,1]))};return s.start=function(t){return t==null?e:(e=t,s)},s.rotations=function(e){return e==null?t:(t=e,s)},s.gamma=function(e){return e==null?r:(r=e,s)},s.hue=function(e){return e==null?n:(n=e,h(n)===`array`?(a=n[1]-n[0],a===0&&(n=n[1])):a=0,s)},s.lightness=function(e){return e==null?i:(h(e)===`array`?(i=e,o=e[1]-e[0]):(i=[e,e],o=0),s)},s.scale=()=>k.scale(s),s.hue(n),s}var Ct=`0123456789abcdef`,{floor:wt,random:Tt}=Math,Et=(e=Tt)=>{let t=`#`;for(let n=0;n<6;n++)t+=Ct.charAt(wt(e()*16));return new O(t,`hex`)},{log:Dt,pow:Ot,floor:kt,abs:At}=Math;function jt(e,t=null){let n={min:Number.MAX_VALUE,max:Number.MAX_VALUE*-1,sum:0,values:[],count:0};return h(e)===`object`&&(e=Object.values(e)),e.forEach(e=>{t&&h(e)===`object`&&(e=e[t]),e!=null&&!isNaN(e)&&(n.values.push(e),n.sum+=e,e<n.min&&(n.min=e),e>n.max&&(n.max=e),n.count+=1)}),n.domain=[n.min,n.max],n.limits=(e,t)=>Mt(n,e,t),n}function Mt(e,t=`equal`,n=7){h(e)==`array`&&(e=jt(e));let{min:r,max:i}=e,a=e.values.sort((e,t)=>e-t);if(n===1)return[r,i];let o=[];if(t.substr(0,1)===`c`&&(o.push(r),o.push(i)),t.substr(0,1)===`e`){o.push(r);for(let e=1;e<n;e++)o.push(r+e/n*(i-r));o.push(i)}else if(t.substr(0,1)===`l`){if(r<=0)throw Error(`Logarithmic scales are only possible for values > 0`);let e=Math.LOG10E*Dt(r),t=Math.LOG10E*Dt(i);o.push(r);for(let r=1;r<n;r++)o.push(Ot(10,e+r/n*(t-e)));o.push(i)}else if(t.substr(0,1)===`q`){o.push(r);for(let e=1;e<n;e++){let t=(a.length-1)*e/n,r=kt(t);if(r===t)o.push(a[r]);else{let e=t-r;o.push(a[r]*(1-e)+a[r+1]*e)}}o.push(i)}else if(t.substr(0,1)===`k`){let e,t=a.length,s=Array(t),c=Array(n),l=!0,u=0,d=null;d=[],d.push(r);for(let e=1;e<n;e++)d.push(r+e/n*(i-r));for(d.push(i);l;){for(let e=0;e<n;e++)c[e]=0;for(let e=0;e<t;e++){let t=a[e],r=Number.MAX_VALUE,i;for(let a=0;a<n;a++){let n=At(d[a]-t);n<r&&(r=n,i=a),c[i]++,s[e]=i}}let r=Array(n);for(let e=0;e<n;e++)r[e]=null;for(let n=0;n<t;n++)e=s[n],r[e]===null?r[e]=a[n]:r[e]+=a[n];for(let e=0;e<n;e++)r[e]*=1/c[e];l=!1;for(let e=0;e<n;e++)if(r[e]!==d[e]){l=!0;break}d=r,u++,u>200&&(l=!1)}let f={};for(let e=0;e<n;e++)f[e]=[];for(let n=0;n<t;n++)e=s[n],f[e].push(a[n]);let p=[];for(let e=0;e<n;e++)p.push(f[e][0]),p.push(f[e][f[e].length-1]);p=p.sort((e,t)=>e-t),o.push(p[0]);for(let e=1;e<p.length;e+=2){let t=p[e];!isNaN(t)&&o.indexOf(t)===-1&&o.push(t)}}return o}var Nt=(e,t)=>{e=new O(e),t=new O(t);let n=e.luminance(),r=t.luminance();return n>r?(n+.05)/(r+.05):(r+.05)/(n+.05)},Pt=.027,Ft=5e-4,It=.1,Lt=1.14,Rt=.022,zt=1.414,Bt=(e,t)=>{e=new O(e),t=new O(t),e.alpha()<1&&(e=F(t,e,e.alpha(),`rgb`));let n=Vt(...e.rgb()),r=Vt(...t.rgb()),i=n>=Rt?n:n+(Rt-n)**+zt,a=r>=Rt?r:r+(Rt-r)**+zt,o=a**.56-i**.57,s=a**.65-i**.62,c=Math.abs(a-i)<Ft?0:i<a?o*Lt:s*Lt;return(Math.abs(c)<It?0:c>0?c-Pt:c+Pt)*100};function Vt(e,t,n){return .2126729*(e/255)**2.4+.7151522*(t/255)**2.4+.072175*(n/255)**2.4}var{sqrt:z,pow:B,min:Ht,max:Ut,atan2:Wt,abs:Gt,cos:Kt,sin:qt,exp:Jt,PI:Yt}=Math;function Xt(e,t,n=1,r=1,i=1){var a=function(e){return 360*e/(2*Yt)},o=function(e){return 2*Yt*e/360};e=new O(e),t=new O(t);let[s,c,l]=Array.from(e.lab()),[u,d,f]=Array.from(t.lab()),p=(s+u)/2,m=(z(B(c,2)+B(l,2))+z(B(d,2)+B(f,2)))/2,h=.5*(1-z(B(m,7)/(B(m,7)+B(25,7)))),g=c*(1+h),_=d*(1+h),v=z(B(g,2)+B(l,2)),y=z(B(_,2)+B(f,2)),b=(v+y)/2,x=a(Wt(l,g)),S=a(Wt(f,_)),C=x>=0?x:x+360,w=S>=0?S:S+360,T=Gt(C-w)>180?(C+w+360)/2:(C+w)/2,ee=1-.17*Kt(o(T-30))+.24*Kt(o(2*T))+.32*Kt(o(3*T+6))-.2*Kt(o(4*T-63)),E=w-C;E=Gt(E)<=180?E:w<=C?E+360:E-360,E=2*z(v*y)*qt(o(E)/2);let D=u-s,te=y-v,k=1+.015*B(p-50,2)/z(20+B(p-50,2)),A=1+.045*b,ne=1+.015*b*ee,re=30*Jt(-B((T-275)/25,2)),ie=-(2*z(B(b,7)/(B(b,7)+B(25,7))))*qt(2*o(re));return Ut(0,Ht(100,z(B(D/(n*k),2)+B(te/(r*A),2)+B(E/(i*ne),2)+ie*(te/(r*A))*(E/(i*ne)))))}function Zt(e,t,n=`lab`){e=new O(e),t=new O(t);let r=e.get(n),i=t.get(n),a=0;for(let e in r){let t=(r[e]||0)-(i[e]||0);a+=t*t}return Math.sqrt(a)}var Qt=(...e)=>{try{return new O(...e),!0}catch{return!1}},$t={cool(){return pt([k.hsl(180,1,.9),k.hsl(250,.7,.4)])},hot(){return pt([`#000`,`#f00`,`#ff0`,`#fff`],[0,.25,.75,1]).mode(`rgb`)}},en={OrRd:[`#fff7ec`,`#fee8c8`,`#fdd49e`,`#fdbb84`,`#fc8d59`,`#ef6548`,`#d7301f`,`#b30000`,`#7f0000`],PuBu:[`#fff7fb`,`#ece7f2`,`#d0d1e6`,`#a6bddb`,`#74a9cf`,`#3690c0`,`#0570b0`,`#045a8d`,`#023858`],BuPu:[`#f7fcfd`,`#e0ecf4`,`#bfd3e6`,`#9ebcda`,`#8c96c6`,`#8c6bb1`,`#88419d`,`#810f7c`,`#4d004b`],Oranges:[`#fff5eb`,`#fee6ce`,`#fdd0a2`,`#fdae6b`,`#fd8d3c`,`#f16913`,`#d94801`,`#a63603`,`#7f2704`],BuGn:[`#f7fcfd`,`#e5f5f9`,`#ccece6`,`#99d8c9`,`#66c2a4`,`#41ae76`,`#238b45`,`#006d2c`,`#00441b`],YlOrBr:[`#ffffe5`,`#fff7bc`,`#fee391`,`#fec44f`,`#fe9929`,`#ec7014`,`#cc4c02`,`#993404`,`#662506`],YlGn:[`#ffffe5`,`#f7fcb9`,`#d9f0a3`,`#addd8e`,`#78c679`,`#41ab5d`,`#238443`,`#006837`,`#004529`],Reds:[`#fff5f0`,`#fee0d2`,`#fcbba1`,`#fc9272`,`#fb6a4a`,`#ef3b2c`,`#cb181d`,`#a50f15`,`#67000d`],RdPu:[`#fff7f3`,`#fde0dd`,`#fcc5c0`,`#fa9fb5`,`#f768a1`,`#dd3497`,`#ae017e`,`#7a0177`,`#49006a`],Greens:[`#f7fcf5`,`#e5f5e0`,`#c7e9c0`,`#a1d99b`,`#74c476`,`#41ab5d`,`#238b45`,`#006d2c`,`#00441b`],YlGnBu:[`#ffffd9`,`#edf8b1`,`#c7e9b4`,`#7fcdbb`,`#41b6c4`,`#1d91c0`,`#225ea8`,`#253494`,`#081d58`],Purples:[`#fcfbfd`,`#efedf5`,`#dadaeb`,`#bcbddc`,`#9e9ac8`,`#807dba`,`#6a51a3`,`#54278f`,`#3f007d`],GnBu:[`#f7fcf0`,`#e0f3db`,`#ccebc5`,`#a8ddb5`,`#7bccc4`,`#4eb3d3`,`#2b8cbe`,`#0868ac`,`#084081`],Greys:[`#ffffff`,`#f0f0f0`,`#d9d9d9`,`#bdbdbd`,`#969696`,`#737373`,`#525252`,`#252525`,`#000000`],YlOrRd:[`#ffffcc`,`#ffeda0`,`#fed976`,`#feb24c`,`#fd8d3c`,`#fc4e2a`,`#e31a1c`,`#bd0026`,`#800026`],PuRd:[`#f7f4f9`,`#e7e1ef`,`#d4b9da`,`#c994c7`,`#df65b0`,`#e7298a`,`#ce1256`,`#980043`,`#67001f`],Blues:[`#f7fbff`,`#deebf7`,`#c6dbef`,`#9ecae1`,`#6baed6`,`#4292c6`,`#2171b5`,`#08519c`,`#08306b`],PuBuGn:[`#fff7fb`,`#ece2f0`,`#d0d1e6`,`#a6bddb`,`#67a9cf`,`#3690c0`,`#02818a`,`#016c59`,`#014636`],Viridis:[`#440154`,`#482777`,`#3f4a8a`,`#31678e`,`#26838f`,`#1f9d8a`,`#6cce5a`,`#b6de2b`,`#fee825`],Spectral:[`#9e0142`,`#d53e4f`,`#f46d43`,`#fdae61`,`#fee08b`,`#ffffbf`,`#e6f598`,`#abdda4`,`#66c2a5`,`#3288bd`,`#5e4fa2`],RdYlGn:[`#a50026`,`#d73027`,`#f46d43`,`#fdae61`,`#fee08b`,`#ffffbf`,`#d9ef8b`,`#a6d96a`,`#66bd63`,`#1a9850`,`#006837`],RdBu:[`#67001f`,`#b2182b`,`#d6604d`,`#f4a582`,`#fddbc7`,`#f7f7f7`,`#d1e5f0`,`#92c5de`,`#4393c3`,`#2166ac`,`#053061`],PiYG:[`#8e0152`,`#c51b7d`,`#de77ae`,`#f1b6da`,`#fde0ef`,`#f7f7f7`,`#e6f5d0`,`#b8e186`,`#7fbc41`,`#4d9221`,`#276419`],PRGn:[`#40004b`,`#762a83`,`#9970ab`,`#c2a5cf`,`#e7d4e8`,`#f7f7f7`,`#d9f0d3`,`#a6dba0`,`#5aae61`,`#1b7837`,`#00441b`],RdYlBu:[`#a50026`,`#d73027`,`#f46d43`,`#fdae61`,`#fee090`,`#ffffbf`,`#e0f3f8`,`#abd9e9`,`#74add1`,`#4575b4`,`#313695`],BrBG:[`#543005`,`#8c510a`,`#bf812d`,`#dfc27d`,`#f6e8c3`,`#f5f5f5`,`#c7eae5`,`#80cdc1`,`#35978f`,`#01665e`,`#003c30`],RdGy:[`#67001f`,`#b2182b`,`#d6604d`,`#f4a582`,`#fddbc7`,`#ffffff`,`#e0e0e0`,`#bababa`,`#878787`,`#4d4d4d`,`#1a1a1a`],PuOr:[`#7f3b08`,`#b35806`,`#e08214`,`#fdb863`,`#fee0b6`,`#f7f7f7`,`#d8daeb`,`#b2abd2`,`#8073ac`,`#542788`,`#2d004b`],Set2:[`#66c2a5`,`#fc8d62`,`#8da0cb`,`#e78ac3`,`#a6d854`,`#ffd92f`,`#e5c494`,`#b3b3b3`],Accent:[`#7fc97f`,`#beaed4`,`#fdc086`,`#ffff99`,`#386cb0`,`#f0027f`,`#bf5b17`,`#666666`],Set1:[`#e41a1c`,`#377eb8`,`#4daf4a`,`#984ea3`,`#ff7f00`,`#ffff33`,`#a65628`,`#f781bf`,`#999999`],Set3:[`#8dd3c7`,`#ffffb3`,`#bebada`,`#fb8072`,`#80b1d3`,`#fdb462`,`#b3de69`,`#fccde5`,`#d9d9d9`,`#bc80bd`,`#ccebc5`,`#ffed6f`],Dark2:[`#1b9e77`,`#d95f02`,`#7570b3`,`#e7298a`,`#66a61e`,`#e6ab02`,`#a6761d`,`#666666`],Paired:[`#a6cee3`,`#1f78b4`,`#b2df8a`,`#33a02c`,`#fb9a99`,`#e31a1c`,`#fdbf6f`,`#ff7f00`,`#cab2d6`,`#6a3d9a`,`#ffff99`,`#b15928`],Pastel2:[`#b3e2cd`,`#fdcdac`,`#cbd5e8`,`#f4cae4`,`#e6f5c9`,`#fff2ae`,`#f1e2cc`,`#cccccc`],Pastel1:[`#fbb4ae`,`#b3cde3`,`#ccebc5`,`#decbe4`,`#fed9a6`,`#ffffcc`,`#e5d8bd`,`#fddaec`,`#f2f2f2`]},tn=Object.keys(en),nn=new Map(tn.map(e=>[e.toLowerCase(),e])),rn=typeof Proxy==`function`?new Proxy(en,{get(e,t){let n=t.toLowerCase();if(nn.has(n))return e[nn.get(n)]},getOwnPropertyNames(){return Object.getOwnPropertyNames(tn)}}):en,an=(...e)=>{e=g(e,`cmyk`);let[t,n,r,i]=e,a=e.length>4?e[4]:1;return i===1?[0,0,0,a]:[t>=1?0:255*(1-t)*(1-i),n>=1?0:255*(1-n)*(1-i),r>=1?0:255*(1-r)*(1-i),a]},{max:on}=Math,sn=(...e)=>{let[t,n,r]=g(e,`rgb`);t/=255,n/=255,r/=255;let i=1-on(t,on(n,r)),a=i<1?1/(1-i):0;return[(1-t-i)*a,(1-n-i)*a,(1-r-i)*a,i]};O.prototype.cmyk=function(){return sn(this._rgb)},Object.assign(k,{cmyk:(...e)=>new O(...e,`cmyk`)}),D.format.cmyk=an,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`cmyk`),h(e)===`array`&&e.length===4)return`cmyk`}});var cn=(...e)=>{let t=g(e,`hsla`),n=_(e)||`lsa`;return t[0]=x(t[0]||0)+`deg`,t[1]=x(t[1]*100)+`%`,t[2]=x(t[2]*100)+`%`,n===`hsla`||t.length>3&&t[3]<1?(t[3]=`/ `+(t.length>3?t[3]:1),n=`hsla`):t.length=3,`${n.substr(0,3)}(${t.join(` `)})`},ln=(...e)=>{let t=g(e,`lab`),n=_(e)||`lab`;return t[0]=x(t[0])+`%`,t[1]=x(t[1]),t[2]=x(t[2]),n===`laba`||t.length>3&&t[3]<1?t[3]=`/ `+(t.length>3?t[3]:1):t.length=3,`lab(${t.join(` `)})`},un=(...e)=>{let t=g(e,`lch`),n=_(e)||`lab`;return t[0]=x(t[0])+`%`,t[1]=x(t[1]),t[2]=isNaN(t[2])?`none`:x(t[2])+`deg`,n===`lcha`||t.length>3&&t[3]<1?t[3]=`/ `+(t.length>3?t[3]:1):t.length=3,`lch(${t.join(` `)})`},dn=(...e)=>{let t=g(e,`lab`);return t[0]=x(t[0]*100)+`%`,t[1]=S(t[1]),t[2]=S(t[2]),t.length>3&&t[3]<1?t[3]=`/ `+(t.length>3?t[3]:1):t.length=3,`oklab(${t.join(` `)})`},fn=(...e)=>{let[t,n,r,...i]=g(e,`rgb`),[a,o,s]=nt(t,n,r),[c,l,u]=ke(a,o,s);return[c,l,u,...i.length>0&&i[0]<1?[i[0]]:[]]},pn=(...e)=>{let t=g(e,`lch`);return t[0]=x(t[0]*100)+`%`,t[1]=S(t[1]),t[2]=isNaN(t[2])?`none`:x(t[2])+`deg`,t.length>3&&t[3]<1?t[3]=`/ `+(t.length>3?t[3]:1):t.length=3,`oklch(${t.join(` `)})`},{round:mn}=Math,hn=(...e)=>{let t=g(e,`rgba`),n=_(e)||`rgb`;if(n.substr(0,3)===`hsl`)return cn(qe(t),n);if(n.substr(0,3)===`lab`){let e=ce();M(`d50`);let r=ln(fe(t),n);return M(e),r}if(n.substr(0,3)===`lch`){let e=ce();M(`d50`);let r=un(Ae(t),n);return M(e),r}return n.substr(0,5)===`oklab`?dn(nt(t)):n.substr(0,5)===`oklch`?pn(fn(t)):(t[0]=mn(t[0]),t[1]=mn(t[1]),t[2]=mn(t[2]),(n===`rgba`||t.length>3&&t[3]<1)&&(t[3]=`/ `+(t.length>3?t[3]:1),n=`rgba`),`${n.substr(0,3)}(${t.slice(0,n===`rgb`?3:4).join(` `)})`)},gn=(...e)=>{e=g(e,`lch`);let[t,n,r,...i]=e,[a,o,s]=Ce(t,n,r),[c,l,u]=et(a,o,s);return[c,l,u,...i.length>0&&i[0]<1?[i[0]]:[]]},V=`((?:-?\\d+)|(?:-?\\d+(?:\\.\\d+)?)%|none)`,H=`((?:-?(?:\\d+(?:\\.\\d*)?|\\.\\d+)%?)|none)`,_n=`((?:-?(?:\\d+(?:\\.\\d*)?|\\.\\d+)%)|none)`,U=`\\s*`,vn=`\\s+`,yn=`\\s*,\\s*`,bn=`((?:-?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(?:deg)?)|none)`,xn=`\\s*(?:\\/\\s*((?:[01]|[01]?\\.\\d+)|\\d+(?:\\.\\d+)?%))?`,Sn=RegExp(`^rgba?\\(`+U+[V,V,V].join(vn)+xn+`\\)$`),Cn=RegExp(`^rgb\\(`+U+[V,V,V].join(yn)+U+`\\)$`),wn=RegExp(`^rgba\\(`+U+[V,V,V,H].join(yn)+U+`\\)$`),Tn=RegExp(`^hsla?\\(`+U+[bn,_n,_n].join(vn)+xn+`\\)$`),En=RegExp(`^hsl?\\(`+U+[bn,_n,_n].join(yn)+U+`\\)$`),Dn=/^hsla\(\s*(-?\d+(?:\.\d+)?),\s*(-?\d+(?:\.\d+)?)%\s*,\s*(-?\d+(?:\.\d+)?)%\s*,\s*([01]|[01]?\.\d+)\)$/,On=RegExp(`^lab\\(`+U+[H,H,H].join(vn)+xn+`\\)$`),kn=RegExp(`^lch\\(`+U+[H,H,bn].join(vn)+xn+`\\)$`),An=RegExp(`^oklab\\(`+U+[H,H,H].join(vn)+xn+`\\)$`),jn=RegExp(`^oklch\\(`+U+[H,H,bn].join(vn)+xn+`\\)$`),{round:Mn}=Math,Nn=e=>e.map((e,t)=>t<=2?f(Mn(e),0,255):e),W=(e,t=0,n=100,r=!1)=>(typeof e==`string`&&e.endsWith(`%`)&&(e=parseFloat(e.substring(0,e.length-1))/100,e=r?t+(e+1)*.5*(n-t):t+e*(n-t)),+e),G=(e,t)=>e===`none`?t:e,Pn=e=>{if(e=e.toLowerCase().trim(),e===`transparent`)return[0,0,0,0];let t;if(D.format.named)try{return D.format.named(e)}catch{}if((t=e.match(Sn))||(t=e.match(Cn))){let e=t.slice(1,4);for(let t=0;t<3;t++)e[t]=+W(G(e[t],0),0,255);e=Nn(e);let n=t[4]===void 0?1:+W(t[4],0,1);return e[3]=n,e}if(t=e.match(wn)){let e=t.slice(1,5);for(let t=0;t<4;t++)e[t]=+W(e[t],0,255);return e}if((t=e.match(Tn))||(t=e.match(En))){let e=t.slice(1,4);e[0]=+G(e[0].replace(`deg`,``),0),e[1]=W(G(e[1],0),0,100)*.01,e[2]=W(G(e[2],0),0,100)*.01;let n=Nn(Ke(e));return n[3]=t[4]===void 0?1:+W(t[4],0,1),n}if(t=e.match(Dn)){let e=t.slice(1,4);e[1]*=.01,e[2]*=.01;let n=Ke(e);for(let e=0;e<3;e++)n[e]=Mn(n[e]);return n[3]=+t[4],n}if(t=e.match(On)){let e=t.slice(1,4);e[0]=W(G(e[0],0),0,100),e[1]=W(G(e[1],0),-125,125,!0),e[2]=W(G(e[2],0),-125,125,!0);let n=ce();M(`d50`);let r=Nn(N(e));return M(n),r[3]=t[4]===void 0?1:+W(t[4],0,1),r}if(t=e.match(kn)){let e=t.slice(1,4);e[0]=W(e[0],0,100),e[1]=W(G(e[1],0),0,150,!1),e[2]=+G(e[2].replace(`deg`,``),0);let n=ce();M(`d50`);let r=Nn(we(e));return M(n),r[3]=t[4]===void 0?1:+W(t[4],0,1),r}if(t=e.match(An)){let e=t.slice(1,4);e[0]=W(G(e[0],0),0,1),e[1]=W(G(e[1],0),-.4,.4,!0),e[2]=W(G(e[2],0),-.4,.4,!0);let n=Nn(et(e));return n[3]=t[4]===void 0?1:+W(t[4],0,1),n}if(t=e.match(jn)){let e=t.slice(1,4);e[0]=W(G(e[0],0),0,1),e[1]=W(G(e[1],0),0,.4,!1),e[2]=+G(e[2].replace(`deg`,``),0);let n=Nn(gn(e));return n[3]=t[4]===void 0?1:+W(t[4],0,1),n}};Pn.test=e=>Sn.test(e)||Tn.test(e)||On.test(e)||kn.test(e)||An.test(e)||jn.test(e)||Cn.test(e)||wn.test(e)||En.test(e)||Dn.test(e)||e===`transparent`,O.prototype.css=function(e){return hn(this._rgb,e)},k.css=(...e)=>new O(...e,`css`),D.format.css=Pn,D.autodetect.push({p:5,test:(e,...t)=>{if(!t.length&&h(e)===`string`&&Pn.test(e))return`css`}}),D.format.gl=(...e)=>{let t=g(e,`rgba`);return t[0]*=255,t[1]*=255,t[2]*=255,t},k.gl=(...e)=>new O(...e,`gl`),O.prototype.gl=function(){let e=this._rgb;return[e[0]/255,e[1]/255,e[2]/255,e[3]]},O.prototype.hex=function(e){return oe(this._rgb,e)},k.hex=(...e)=>new O(...e,`hex`),D.format.hex=ie,D.autodetect.push({p:4,test:(e,...t)=>{if(!t.length&&h(e)===`string`&&[3,4,5,6,7,8,9].indexOf(e.length)>=0)return`hex`}});var{log:Fn}=Math,In=e=>{let t=e/100,n,r,i;return t<66?(n=255,r=t<6?0:-155.25485562709179-.44596950469579133*(r=t-2)+104.49216199393888*Fn(r),i=t<20?0:-254.76935184120902+.8274096064007395*(i=t-10)+115.67994401066147*Fn(i)):(n=351.97690566805693+.114206453784165*(n=t-55)-40.25366309332127*Fn(n),r=325.4494125711974+.07943456536662342*(r=t-50)-28.0852963507957*Fn(r),i=255),[n,r,i,1]},{round:Ln}=Math,Rn=(...e)=>{let t=g(e,`rgb`),n=t[0],r=t[2],i=1e3,a=4e4,o;for(;a-i>.4;){o=(a+i)*.5;let e=In(o);e[2]/e[0]>=r/n?a=o:i=o}return Ln(o)};O.prototype.temp=O.prototype.kelvin=O.prototype.temperature=function(){return Rn(this._rgb)};var zn=(...e)=>new O(...e,`temp`);Object.assign(k,{temp:zn,kelvin:zn,temperature:zn}),D.format.temp=D.format.kelvin=D.format.temperature=In,O.prototype.oklch=function(){return fn(this._rgb)},Object.assign(k,{oklch:(...e)=>new O(...e,`oklch`)}),D.format.oklch=gn,D.autodetect.push({p:2,test:(...e)=>{if(e=g(e,`oklch`),h(e)===`array`&&e.length===3)return`oklch`}}),Object.assign(k,{analyze:jt,average:ut,bezier:_t,blend:I,brewer:rn,Color:O,colors:A,contrast:Nt,contrastAPCA:Bt,cubehelix:St,deltaE:Xt,distance:Zt,input:D,interpolate:F,limits:Mt,mix:F,random:Et,scale:pt,scales:$t,valid:Qt});var K=k,q=class e{constructor(){this.hex=`#000000`,this.rgb_r=0,this.rgb_g=0,this.rgb_b=0,this.xyz_x=0,this.xyz_y=0,this.xyz_z=0,this.luv_l=0,this.luv_u=0,this.luv_v=0,this.lch_l=0,this.lch_c=0,this.lch_h=0,this.hsluv_h=0,this.hsluv_s=0,this.hsluv_l=0,this.hpluv_h=0,this.hpluv_p=0,this.hpluv_l=0,this.r0s=0,this.r0i=0,this.r1s=0,this.r1i=0,this.g0s=0,this.g0i=0,this.g1s=0,this.g1i=0,this.b0s=0,this.b0i=0,this.b1s=0,this.b1i=0}static fromLinear(e){return e<=.0031308?12.92*e:1.055*e**(1/2.4)-.055}static toLinear(e){return e>.04045?((e+.055)/1.055)**2.4:e/12.92}static yToL(t){return t<=e.epsilon?t/e.refY*e.kappa:116*(t/e.refY)**(1/3)-16}static lToY(t){return t<=8?e.refY*t/e.kappa:e.refY*((t+16)/116)**3}static rgbChannelToHex(t){let n=Math.round(t*255),r=n%16,i=(n-r)/16|0;return e.hexChars.charAt(i)+e.hexChars.charAt(r)}static hexToRgbChannel(t,n){let r=e.hexChars.indexOf(t.charAt(n)),i=e.hexChars.indexOf(t.charAt(n+1));return(r*16+i)/255}static distanceFromOriginAngle(e,t,n){let r=t/(Math.sin(n)-e*Math.cos(n));return r<0?1/0:r}static distanceFromOrigin(e,t){return Math.abs(t)/Math.sqrt(e**2+1)}static min6(e,t,n,r,i,a){return Math.min(e,Math.min(t,Math.min(n,Math.min(r,Math.min(i,a)))))}rgbToHex(){this.hex=`#`,this.hex+=e.rgbChannelToHex(this.rgb_r),this.hex+=e.rgbChannelToHex(this.rgb_g),this.hex+=e.rgbChannelToHex(this.rgb_b)}hexToRgb(){this.hex=this.hex.toLowerCase(),this.rgb_r=e.hexToRgbChannel(this.hex,1),this.rgb_g=e.hexToRgbChannel(this.hex,3),this.rgb_b=e.hexToRgbChannel(this.hex,5)}xyzToRgb(){this.rgb_r=e.fromLinear(e.m_r0*this.xyz_x+e.m_r1*this.xyz_y+e.m_r2*this.xyz_z),this.rgb_g=e.fromLinear(e.m_g0*this.xyz_x+e.m_g1*this.xyz_y+e.m_g2*this.xyz_z),this.rgb_b=e.fromLinear(e.m_b0*this.xyz_x+e.m_b1*this.xyz_y+e.m_b2*this.xyz_z)}rgbToXyz(){let t=e.toLinear(this.rgb_r),n=e.toLinear(this.rgb_g),r=e.toLinear(this.rgb_b);this.xyz_x=.41239079926595*t+.35758433938387*n+.18048078840183*r,this.xyz_y=.21263900587151*t+.71516867876775*n+.072192315360733*r,this.xyz_z=.019330818715591*t+.11919477979462*n+.95053215224966*r}xyzToLuv(){let t=this.xyz_x+15*this.xyz_y+3*this.xyz_z,n=4*this.xyz_x,r=9*this.xyz_y;t===0?(n=NaN,r=NaN):(n/=t,r/=t),this.luv_l=e.yToL(this.xyz_y),this.luv_l===0?(this.luv_u=0,this.luv_v=0):(this.luv_u=13*this.luv_l*(n-e.refU),this.luv_v=13*this.luv_l*(r-e.refV))}luvToXyz(){if(this.luv_l===0){this.xyz_x=0,this.xyz_y=0,this.xyz_z=0;return}let t=this.luv_u/(13*this.luv_l)+e.refU,n=this.luv_v/(13*this.luv_l)+e.refV;this.xyz_y=e.lToY(this.luv_l),this.xyz_x=0-9*this.xyz_y*t/((t-4)*n-t*n),this.xyz_z=(9*this.xyz_y-15*n*this.xyz_y-n*this.xyz_x)/(3*n)}luvToLch(){if(this.lch_l=this.luv_l,this.lch_c=Math.sqrt(this.luv_u*this.luv_u+this.luv_v*this.luv_v),this.lch_c<1e-8)this.lch_h=0;else{let e=Math.atan2(this.luv_v,this.luv_u);this.lch_h=e*180/Math.PI,this.lch_h<0&&(this.lch_h=360+this.lch_h)}}lchToLuv(){let e=this.lch_h/180*Math.PI;this.luv_l=this.lch_l,this.luv_u=Math.cos(e)*this.lch_c,this.luv_v=Math.sin(e)*this.lch_c}calculateBoundingLines(t){let n=(t+16)**3/1560896,r=n>e.epsilon?n:t/e.kappa,i=r*(284517*e.m_r0-94839*e.m_r2),a=r*(838422*e.m_r2+769860*e.m_r1+731718*e.m_r0),o=r*(632260*e.m_r2-126452*e.m_r1),s=r*(284517*e.m_g0-94839*e.m_g2),c=r*(838422*e.m_g2+769860*e.m_g1+731718*e.m_g0),l=r*(632260*e.m_g2-126452*e.m_g1),u=r*(284517*e.m_b0-94839*e.m_b2),d=r*(838422*e.m_b2+769860*e.m_b1+731718*e.m_b0),f=r*(632260*e.m_b2-126452*e.m_b1);this.r0s=i/o,this.r0i=a*t/o,this.r1s=i/(o+126452),this.r1i=(a-769860)*t/(o+126452),this.g0s=s/l,this.g0i=c*t/l,this.g1s=s/(l+126452),this.g1i=(c-769860)*t/(l+126452),this.b0s=u/f,this.b0i=d*t/f,this.b1s=u/(f+126452),this.b1i=(d-769860)*t/(f+126452)}calcMaxChromaHpluv(){let t=e.distanceFromOrigin(this.r0s,this.r0i),n=e.distanceFromOrigin(this.r1s,this.r1i),r=e.distanceFromOrigin(this.g0s,this.g0i),i=e.distanceFromOrigin(this.g1s,this.g1i),a=e.distanceFromOrigin(this.b0s,this.b0i),o=e.distanceFromOrigin(this.b1s,this.b1i);return e.min6(t,n,r,i,a,o)}calcMaxChromaHsluv(t){let n=t/360*Math.PI*2,r=e.distanceFromOriginAngle(this.r0s,this.r0i,n),i=e.distanceFromOriginAngle(this.r1s,this.r1i,n),a=e.distanceFromOriginAngle(this.g0s,this.g0i,n),o=e.distanceFromOriginAngle(this.g1s,this.g1i,n),s=e.distanceFromOriginAngle(this.b0s,this.b0i,n),c=e.distanceFromOriginAngle(this.b1s,this.b1i,n);return e.min6(r,i,a,o,s,c)}hsluvToLch(){if(this.hsluv_l>99.9999999)this.lch_l=100,this.lch_c=0;else if(this.hsluv_l<1e-8)this.lch_l=0,this.lch_c=0;else{this.lch_l=this.hsluv_l,this.calculateBoundingLines(this.hsluv_l);let e=this.calcMaxChromaHsluv(this.hsluv_h);this.lch_c=e/100*this.hsluv_s}this.lch_h=this.hsluv_h}lchToHsluv(){if(this.lch_l>99.9999999)this.hsluv_s=0,this.hsluv_l=100;else if(this.lch_l<1e-8)this.hsluv_s=0,this.hsluv_l=0;else{this.calculateBoundingLines(this.lch_l);let e=this.calcMaxChromaHsluv(this.lch_h);this.hsluv_s=this.lch_c/e*100,this.hsluv_l=this.lch_l}this.hsluv_h=this.lch_h}hpluvToLch(){if(this.hpluv_l>99.9999999)this.lch_l=100,this.lch_c=0;else if(this.hpluv_l<1e-8)this.lch_l=0,this.lch_c=0;else{this.lch_l=this.hpluv_l,this.calculateBoundingLines(this.hpluv_l);let e=this.calcMaxChromaHpluv();this.lch_c=e/100*this.hpluv_p}this.lch_h=this.hpluv_h}lchToHpluv(){if(this.lch_l>99.9999999)this.hpluv_p=0,this.hpluv_l=100;else if(this.lch_l<1e-8)this.hpluv_p=0,this.hpluv_l=0;else{this.calculateBoundingLines(this.lch_l);let e=this.calcMaxChromaHpluv();this.hpluv_p=this.lch_c/e*100,this.hpluv_l=this.lch_l}this.hpluv_h=this.lch_h}hsluvToRgb(){this.hsluvToLch(),this.lchToLuv(),this.luvToXyz(),this.xyzToRgb()}hpluvToRgb(){this.hpluvToLch(),this.lchToLuv(),this.luvToXyz(),this.xyzToRgb()}hsluvToHex(){this.hsluvToRgb(),this.rgbToHex()}hpluvToHex(){this.hpluvToRgb(),this.rgbToHex()}rgbToHsluv(){this.rgbToXyz(),this.xyzToLuv(),this.luvToLch(),this.lchToHpluv(),this.lchToHsluv()}rgbToHpluv(){this.rgbToXyz(),this.xyzToLuv(),this.luvToLch(),this.lchToHpluv(),this.lchToHpluv()}hexToHsluv(){this.hexToRgb(),this.rgbToHsluv()}hexToHpluv(){this.hexToRgb(),this.rgbToHpluv()}};q.hexChars=`0123456789abcdef`,q.refY=1,q.refU=.19783000664283,q.refV=.46831999493879,q.kappa=903.2962962,q.epsilon=.0088564516,q.m_r0=3.240969941904521,q.m_r1=-1.537383177570093,q.m_r2=-.498610760293,q.m_g0=-.96924363628087,q.m_g1=1.87596750150772,q.m_g2=.041555057407175,q.m_b0=.055630079696993,q.m_b1=-.20397695888897,q.m_b2=1.056971514242878;var Bn=s(((e,t)=>{function n(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.exports=n})),Vn=s(((e,t)=>{var n=Bn(),r,i;function a(){for(var e in i=[`toString`,`toLocaleString`,`valueOf`,`hasOwnProperty`,`isPrototypeOf`,`propertyIsEnumerable`,`constructor`],r=!0,{toString:null})r=!1}function o(e,t,o){var c,l=0;for(c in r??a(),e)if(s(t,e,c,o)===!1)break;if(r)for(var u=e.constructor,d=!!u&&e===u.prototype;(c=i[l++])&&!((c!==`constructor`||!d&&n(e,c))&&e[c]!==Object.prototype[c]&&s(t,e,c,o)===!1););}function s(e,t,n,r){return e.call(r,t[n],n,t)}t.exports=o})),Hn=s(((e,t)=>{var n=Vn();function r(e){var t=[];return n(e,function(e,n){typeof e==`function`&&t.push(n)}),t.sort()}t.exports=r})),Un=s(((e,t)=>{function n(e,t,n){var r=e.length;t=t==null?0:t<0?Math.max(r+t,0):Math.min(t,r),n=n==null?r:n<0?Math.max(r+n,0):Math.min(n,r);for(var i=[];t<n;)i.push(e[t++]);return i}t.exports=n})),Wn=s(((e,t)=>{var n=Un();function r(e,t,r){var i=n(arguments,2);return function(){return e.apply(t,i.concat(n(arguments)))}}t.exports=r})),Gn=s(((e,t)=>{function n(e,t,n){if(e!=null)for(var r=-1,i=e.length;++r<i&&t.call(n,e[r],r,e)!==!1;);}t.exports=n})),Kn=s(((e,t)=>{var n=Hn(),r=Wn(),i=Gn(),a=Un();function o(e,t){i(arguments.length>1?a(arguments,1):n(e),function(t){e[t]=r(e[t],e)})}t.exports=o})),J=s(((e,t)=>{var n=Bn(),r=Vn();function i(e,t,i){r(e,function(r,a){if(n(e,a))return t.call(i,e[a],a,e)})}t.exports=i})),qn=s(((e,t)=>{function n(e){return e}t.exports=n})),Jn=s(((e,t)=>{function n(e){return function(t){return t[e]}}t.exports=n})),Yn=s(((e,t)=>{var n=/^\[object (.*)\]$/,r=Object.prototype.toString,i;function a(e){return e===null?`Null`:e===i?`Undefined`:n.exec(r.call(e))[1]}t.exports=a})),Xn=s(((e,t)=>{var n=Yn();function r(e,t){return n(e)===t}t.exports=r})),Zn=s(((e,t)=>{var n=Xn();t.exports=Array.isArray||function(e){return n(e,`Array`)}})),Qn=s(((e,t)=>{var n=J(),r=Zn();function i(e,t){for(var n=-1,r=e.length;++n<r;)if(s(e[n],t))return!0;return!1}function a(e,t){for(var n=-1,r=t.length;++n<r;)if(!i(e,t[n]))return!1;return!0}function o(e,t){var r=!0;return n(t,function(t,n){if(!s(e[n],t))return r=!1}),r}function s(e,t){return e&&typeof e==`object`?r(e)&&r(t)?a(e,t):o(e,t):e===t}t.exports=s})),Y=s(((e,t)=>{var n=qn(),r=Jn(),i=Qn();function a(e,t){if(e==null)return n;switch(typeof e){case`function`:return t===void 0?e:function(n,r,i){return e.call(t,n,r,i)};case`object`:return function(t){return i(t,e)};case`string`:case`number`:return r(e)}}t.exports=a})),$n=s(((e,t)=>{var n=J(),r=Y();function i(e,t,i){t=r(t,i);var a=!1;return n(e,function(n,r){if(t(n,r,e))return a=!0,!1}),a}t.exports=i})),er=s(((e,t)=>{var n=$n();function r(e,t){return n(e,function(e){return e===t})}t.exports=r})),tr=s(((e,t)=>{function n(e){return!!e&&typeof e==`object`&&e.constructor===Object}t.exports=n})),nr=s(((e,t)=>{var n=J(),r=tr();function i(e,t){for(var a=0,o=arguments.length,s;++a<o;)s=arguments[a],s&&n(s,function(t,n){var a=e[n];a==null?e[n]=t:r(a)&&r(t)&&i(a,t)});return e}t.exports=i})),rr=s(((e,t)=>{var n=J(),r=tr();function i(e,t){for(var r=0,i=arguments.length,o;++r<i;)o=arguments[r],o&&n(o,a,e);return e}function a(e,t){var n=this[t];r(e)&&r(n)?i(n,e):this[t]=e}t.exports=i})),ir=s(((e,t)=>{var n=J(),r=Y();function i(e,t,i){t=r(t,i);var a=!0;return n(e,function(n,r){if(!t(n,r,e))return a=!1,!1}),a}t.exports=i})),ar=s(((e,t)=>{var n=Xn();function r(e){return n(e,`Object`)}t.exports=r})),or=s(((e,t)=>{function n(e,t){return e===t?e!==0||1/e==1/t:e!==e&&t!==t}t.exports=n})),sr=s(((e,t)=>{var n=Bn(),r=ir(),i=ar(),a=or();function o(e){return function(t,r){return n(this,r)&&e(t,this[r])}}function s(e,t){return n(this,t)}function c(e,t,n){return n||=a,!i(e)||!i(t)?n(e,t):r(e,o(n),t)&&r(t,s,e)}t.exports=c})),cr=s(((e,t)=>{var n=Gn(),r=Un(),i=J();function a(e,t){return n(r(arguments,1),function(t){i(t,function(t,n){e[n]??(e[n]=t)})}),e}t.exports=a})),lr=s(((e,t)=>{var n=J(),r=Y();function i(e,t,i){t=r(t,i);var a={};return n(e,function(e,n,r){t(e,n,r)&&(a[n]=e)}),a}t.exports=i})),ur=s(((e,t)=>{var n=$n(),r=Y();function i(e,t,i){t=r(t,i);var a;return n(e,function(e,n,r){if(t(e,n,r))return a=e,!0}),a}t.exports=i})),dr=s(((e,t)=>{var n=J(),r=tr();function i(e,t,a,o){return n(e,function(e,n){var s=a?a+`.`+n:n;o!==0&&r(e)?i(e,t,s,o-1):t[s]=e}),t}function a(e,t){return e==null?{}:(t??=-1,i(e,{},``,t))}t.exports=a})),fr=s(((e,t)=>{function n(e){switch(typeof e){case`string`:case`number`:case`boolean`:return!0}return e==null}t.exports=n})),pr=s(((e,t)=>{fr();function n(e,t){for(var n=t.split(`.`),r=n.pop();t=n.shift();)if(e=e[t],e==null)return;return e[r]}t.exports=n})),mr=s(((e,t)=>{var n=pr(),r;function i(e,t){return n(e,t)!==r}t.exports=i})),hr=s(((e,t)=>{var n=J();t.exports=Object.keys||function(e){var t=[];return n(e,function(e,n){t.push(n)}),t}})),gr=s(((e,t)=>{var n=J(),r=Y();function i(e,t,i){t=r(t,i);var a={};return n(e,function(e,n,r){a[n]=t(e,n,r)}),a}t.exports=i})),_r=s(((e,t)=>{var n=J();function r(e,t){var r=!0;return n(t,function(t,n){if(e[n]!==t)return r=!1}),r}t.exports=r})),vr=s(((e,t)=>{var n=Y();function r(e,t,r){if(e==null||!e.length)return 1/0;if(e.length&&!t)return Math.max.apply(Math,e);t=n(t,r);for(var i,a=-1/0,o,s,c=-1,l=e.length;++c<l;)o=e[c],s=t(o,c,e),s>a&&(a=s,i=o);return i}t.exports=r})),yr=s(((e,t)=>{var n=J();function r(e){var t=[];return n(e,function(e,n){t.push(e)}),t}t.exports=r})),br=s(((e,t)=>{var n=vr(),r=yr();function i(e,t){return n(r(e),t)}t.exports=i})),xr=s(((e,t)=>{var n=J();function r(e,t){for(var r=0,a=arguments.length,o;++r<a;)o=arguments[r],o!=null&&n(o,i,e);return e}function i(e,t){this[t]=e}t.exports=r})),Sr=s(((e,t)=>{var n=Yn(),r=tr(),i=xr();function a(e){switch(n(e)){case`Object`:return o(e);case`Array`:return l(e);case`RegExp`:return s(e);case`Date`:return c(e);default:return e}}function o(e){return r(e)?i({},e):e}function s(e){var t=``;return t+=e.multiline?`m`:``,t+=e.global?`g`:``,t+=e.ignoreCase?`i`:``,new RegExp(e.source,t)}function c(e){return new Date(+e)}function l(e){return e.slice()}t.exports=a})),Cr=s(((e,t)=>{var n=Sr(),r=J(),i=Yn(),a=tr();function o(e,t){switch(i(e)){case`Object`:return s(e,t);case`Array`:return c(e,t);default:return n(e)}}function s(e,t){if(a(e)){var n={};return r(e,function(e,n){this[n]=o(e,t)},n),n}else if(t)return t(e);else return e}function c(e,t){for(var n=[],r=-1,i=e.length;++r<i;)n[r]=o(e[r],t);return n}t.exports=o})),wr=s(((e,t)=>{var n=Bn(),r=Cr(),i=ar();function a(){for(var e=1,t,o,s,c=r(arguments[0]);s=arguments[e++];)for(t in s)n(s,t)&&(o=s[t],i(o)&&i(c[t])?c[t]=a(c[t],o):c[t]=r(o));return c}t.exports=a})),Tr=s(((e,t)=>{var n=Y();function r(e,t,r){if(e==null||!e.length)return-1/0;if(e.length&&!t)return Math.min.apply(Math,e);t=n(t,r);for(var i,a=1/0,o,s,c=-1,l=e.length;++c<l;)o=e[c],s=t(o,c,e),s<a&&(a=s,i=o);return i}t.exports=r})),Er=s(((e,t)=>{var n=Tr(),r=yr();function i(e,t){return n(r(e),t)}t.exports=i})),Dr=s(((e,t)=>{var n=Gn();function r(e,t){return t&&n(t.split(`.`),function(t){e[t]||(e[t]={}),e=e[t]}),e}t.exports=r})),Or=s(((e,t)=>{function n(e,t,n){if(n||=0,e==null)return-1;for(var r=e.length,i=n<0?r+n:n;i<r;){if(e[i]===t)return i;i++}return-1}t.exports=n})),kr=s(((e,t)=>{var n=Or();function r(e,t){return n(e,t)!==-1}t.exports=r})),Ar=s(((e,t)=>{var n=Un(),r=kr();function i(e,t){var i=typeof arguments[1]==`string`?n(arguments,1):arguments[1],a={};for(var o in e)e.hasOwnProperty(o)&&!r(i,o)&&(a[o]=e[o]);return a}t.exports=i})),jr=s(((e,t)=>{var n=Un();function r(e,t){for(var r=typeof arguments[1]==`string`?n(arguments,1):arguments[1],i={},a=0,o;o=r[a++];)i[o]=e[o];return i}t.exports=r})),Mr=s(((e,t)=>{var n=gr(),r=Jn();function i(e,t){return n(e,r(t))}t.exports=i})),Nr=s(((e,t)=>{var n=J();function r(e){var t=0;return n(e,function(){t++}),t}t.exports=r})),Pr=s(((e,t)=>{var n=J(),r=Nr();function i(e,t,i,a){var o=arguments.length>2;if(!r(e)&&!o)throw Error(`reduce of empty object with no initial value`);return n(e,function(e,n,r){o?i=t.call(a,i,e,n,r):(i=e,o=!0)}),i}t.exports=i})),Fr=s(((e,t)=>{var n=lr(),r=Y();function i(e,t,i){return t=r(t,i),n(e,function(e,n,r){return!t(e,n,r)},i)}t.exports=i})),Ir=s(((e,t)=>{var n=Xn();function r(e){return n(e,`Function`)}t.exports=r})),Lr=s(((e,t)=>{var n=Ir();function r(e,t){var r=e[t];if(r!==void 0)return n(r)?r.call(e):r}t.exports=r})),Rr=s(((e,t)=>{var n=Dr();function r(e,t,r){var i=/^(.+)\.(.+)$/.exec(t);i?n(e,i[1])[i[2]]=r:e[t]=r}t.exports=r})),zr=s(((e,t)=>{var n=mr();function r(e,t){if(n(e,t)){for(var r=t.split(`.`),i=r.pop();t=r.shift();)e=e[t];return delete e[i]}else return!0}t.exports=r})),Br=s(((e,t)=>{t.exports={bindAll:Kn(),contains:er(),deepFillIn:nr(),deepMatches:Qn(),deepMixIn:rr(),equals:sr(),every:ir(),fillIn:cr(),filter:lr(),find:ur(),flatten:dr(),forIn:Vn(),forOwn:J(),functions:Hn(),get:pr(),has:mr(),hasOwn:Bn(),keys:hr(),map:gr(),matches:_r(),max:br(),merge:wr(),min:Er(),mixIn:xr(),namespace:Dr(),omit:Ar(),pick:jr(),pluck:Mr(),reduce:Pr(),reject:Fr(),result:Lr(),set:Rr(),size:Nr(),some:$n(),unset:zr(),values:yr()}})),Vr=s(((e,t)=>{Object.defineProperty(e,"__esModule",{value:!0}),e.default=(0,Br().map)({A:{x:.44758,y:.40745},C:{x:.31006,y:.31616},D50:{x:.34567,y:.35851},D65:{x:.31272,y:.32903},D55:{x:.33243,y:.34744},D75:{x:.29903,y:.31488}},function(e){return[100*(e.x/e.y),100,100*(1-e.x-e.y)/e.y]}),t.exports=e.default})),Hr=s(((e,t)=>{Object.defineProperty(e,"__esModule",{value:!0});var n=Math,r=n.pow,i=n.sign,a=n.abs,o={decode:function(e){return e<=.04045?e/12.92:r((e+.055)/1.055,2.4)},encode:function(e){return e<=.0031308?12.92*e:1.055*r(e,1/2.4)-.055}},s={encode:function(e){return e<.001953125?16*e:r(e,1/1.8)},decode:function(e){return e<16*.001953125?e/16:r(e,1.8)}};function c(e){return{decode:function(t){return i(t)*r(a(t),e)},encode:function(t){return i(t)*r(a(t),1/e)}}}e.default={sRGB:{r:{x:.64,y:.33},g:{x:.3,y:.6},b:{x:.15,y:.06},gamma:o},"Adobe RGB":{r:{x:.64,y:.33},g:{x:.21,y:.71},b:{x:.15,y:.06},gamma:c(2.2)},"Wide Gamut RGB":{r:{x:.7347,y:.2653},g:{x:.1152,y:.8264},b:{x:.1566,y:.0177},gamma:c(563/256)},"ProPhoto RGB":{r:{x:.7347,y:.2653},g:{x:.1596,y:.8404},b:{x:.0366,y:1e-4},gamma:s}},t.exports=e.default})),Ur=s((e=>{Object.defineProperty(e,"__esModule",{value:!0});function t(e){return[[e[0][0],e[1][0],e[2][0]],[e[0][1],e[1][1],e[2][1]],[e[0][2],e[1][2],e[2][2]]]}function n(e){return e[0][0]*(e[2][2]*e[1][1]-e[2][1]*e[1][2])+e[1][0]*(e[2][1]*e[0][2]-e[2][2]*e[0][1])+e[2][0]*(e[1][2]*e[0][1]-e[1][1]*e[0][2])}function r(e){var t=1/n(e);return[[(e[2][2]*e[1][1]-e[2][1]*e[1][2])*t,(e[2][1]*e[0][2]-e[2][2]*e[0][1])*t,(e[1][2]*e[0][1]-e[1][1]*e[0][2])*t],[(e[2][0]*e[1][2]-e[2][2]*e[1][0])*t,(e[2][2]*e[0][0]-e[2][0]*e[0][2])*t,(e[1][0]*e[0][2]-e[1][2]*e[0][0])*t],[(e[2][1]*e[1][0]-e[2][0]*e[1][1])*t,(e[2][0]*e[0][1]-e[2][1]*e[0][0])*t,(e[1][1]*e[0][0]-e[1][0]*e[0][1])*t]]}function i(e,t){return[e[0][0]*t[0]+e[0][1]*t[1]+e[0][2]*t[2],e[1][0]*t[0]+e[1][1]*t[1]+e[1][2]*t[2],e[2][0]*t[0]+e[2][1]*t[1]+e[2][2]*t[2]]}function a(e,t){return[[e[0][0]*t[0],e[0][1]*t[1],e[0][2]*t[2]],[e[1][0]*t[0],e[1][1]*t[1],e[1][2]*t[2]],[e[2][0]*t[0],e[2][1]*t[1],e[2][2]*t[2]]]}function o(e,t){return[[e[0][0]*t[0][0]+e[0][1]*t[1][0]+e[0][2]*t[2][0],e[0][0]*t[0][1]+e[0][1]*t[1][1]+e[0][2]*t[2][1],e[0][0]*t[0][2]+e[0][1]*t[1][2]+e[0][2]*t[2][2]],[e[1][0]*t[0][0]+e[1][1]*t[1][0]+e[1][2]*t[2][0],e[1][0]*t[0][1]+e[1][1]*t[1][1]+e[1][2]*t[2][1],e[1][0]*t[0][2]+e[1][1]*t[1][2]+e[1][2]*t[2][2]],[e[2][0]*t[0][0]+e[2][1]*t[1][0]+e[2][2]*t[2][0],e[2][0]*t[0][1]+e[2][1]*t[1][1]+e[2][2]*t[2][1],e[2][0]*t[0][2]+e[2][1]*t[1][2]+e[2][2]*t[2][2]]]}e.transpose=t,e.determinant=n,e.inverse=r,e.multiply=i,e.scalar=a,e.product=o})),Wr=s((e=>{Object.defineProperty(e,"__esModule",{value:!0});var t=Math.PI;function n(e){for(var n=e*180/t;n<0;)n+=360;for(;n>360;)n-=360;return n}function r(e){for(var n=t*e/180;n<0;)n+=2*t;for(;n>2*t;)n-=2*t;return n}e.fromRadian=n,e.toRadian=r})),Gr=s((e=>{Object.defineProperty(e,"__esModule",{value:!0});var t=Math.round;function n(e){return e[0]==`#`&&(e=e.slice(1)),e.length<6&&(e=e.split(``).map(function(e){return e+e}).join(``)),e.match(/../g).map(function(e){return parseInt(e,16)/255})}function r(e){return`#`+e.map(function(e){return e=t(255*e).toString(16),e.length<2&&(e=`0`+e),e}).join(``)}e.fromHex=n,e.toHex=r})),Kr=s(((e,t)=>{Object.defineProperty(e,"__esModule",{value:!0});var n=o(Ur()),r=a(Vr()),i=a(Hr());function a(e){return e&&e.__esModule?e:{default:e}}function o(e){if(e&&e.__esModule)return e;var t={};if(e!=null)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}function s(){var e=arguments.length<=0||arguments[0]===void 0?i.default.sRGB:arguments[0],t=arguments.length<=1||arguments[1]===void 0?r.default.D65:arguments[1],a=[e.r,e.g,e.b],o=n.transpose(a.map(function(e){return[e.x/e.y,1,(1-e.x-e.y)/e.y]})),s=e.gamma,c=n.multiply(n.inverse(o),t),l=n.scalar(o,c),u=n.inverse(l);return{fromRgb:function(e){return n.multiply(l,e.map(s.decode))},toRgb:function(e){return n.multiply(u,e).map(s.encode)}}}e.default=s,t.exports=e.default})),qr=s(((e,t)=>{t.exports={illuminant:Vr(),workspace:Hr(),matrix:Ur(),degree:Wr(),rgb:Gr(),xyz:Kr()}})),Jr=s((e=>{Object.defineProperty(e,"__esModule",{value:!0}),e.cfs=e.distance=e.lerp=e.corLerp=void 0;var t=Br();function n(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function r(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}else return Array.from(e)}var i=Math,a=i.abs,o=i.pow,s=i.sqrt,c={h:360,H:400};function l(e,t,n,r){var i=c[r];return i&&a(e-t)>i/2&&(e>t?t+=i:e+=i),((1-n)*e+n*t)%(i||1/0)}function u(e,t,n){var r={};for(var i in e)r[i]=l(e[i],t[i],n,i);return r}function d(e,t){var n=0;for(var r in e)n+=o(e[r]-t[r],2);return s(n)}function f(e){return t.merge.apply(void 0,r(e.split(``).map(function(e){return n({},e,!0)})))}e.corLerp=l,e.lerp=u,e.distance=d,e.cfs=f})),Yr=s(((e,t)=>{var n=function(){function e(e,t){var n=[],r=!0,i=!1,a=void 0;try{for(var o=e[Symbol.iterator](),s;!(r=(s=o.next()).done)&&(n.push(s.value),!(t&&n.length===t));r=!0);}catch(e){i=!0,a=e}finally{try{!r&&o.return&&o.return()}finally{if(i)throw a}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw TypeError(`Invalid attempt to destructure non-iterable instance`)}}();Object.defineProperty(e,"__esModule",{value:!0});var r=qr(),i=Jr();function a(e,t){var a=arguments.length<=2||arguments[2]===void 0?1e-6:arguments[2],o=-a,s=1+a,c=Math,l=c.min,u=c.max,d=n([`000`,`fff`].map(function(n){return t.fromXyz(e.fromRgb(r.rgb.fromHex(n)))}),2),f=d[0],p=d[1];function m(n){var r=e.toRgb(t.toXyz(n));return[r.map(function(e){return e>=o&&e<=s}).reduce(function(e,t){return e&&t},!0),r]}function h(e,t){for(var r=arguments.length<=2||arguments[2]===void 0?.001:arguments[2];(0,i.distance)(e,t)>r;){var a=(0,i.lerp)(e,t,.5);n(m(a),1)[0]?e=a:t=a}return e}function g(e){return(0,i.lerp)(f,p,e)}function _(e){return e.map(function(e){return u(o,l(s,e))})}return{contains:m,limit:h,spine:g,crop:_}}e.default=a,t.exports=e.default})),Xr=s((e=>{var t=function(){function e(e,t){var n=[],r=!0,i=!1,a=void 0;try{for(var o=e[Symbol.iterator](),s;!(r=(s=o.next()).done)&&(n.push(s.value),!(t&&n.length===t));r=!0);}catch(e){i=!0,a=e}finally{try{!r&&o.return&&o.return()}finally{if(i)throw a}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw TypeError(`Invalid attempt to destructure non-iterable instance`)}}();Object.defineProperty(e,"__esModule",{value:!0}),e.toNotation=e.fromNotation=e.toHue=e.fromHue=void 0;var n=Jr(),r=Math.floor,i=[{s:`R`,h:20.14,e:.8,H:0},{s:`Y`,h:90,e:.7,H:100},{s:`G`,h:164.25,e:1,H:200},{s:`B`,h:237.53,e:1.2,H:300},{s:`R`,h:380.14,e:.8,H:400}],a=i.map(function(e){return e.s}).slice(0,-1).join(``);function o(e){e<i[0].h&&(e+=360);for(var t=0;i[t+1].h<e;)t++;var n=(e-i[t].h)/i[t].e,r=(i[t+1].h-e)/i[t+1].e;return i[t].H+100*n/(n+r)}function s(e){var n=r(e/100),a=e%100,o=t(i.slice(n,n+2),2),s=o[0],c=s.e,l=s.h,u=o[1],d=u.e,f=u.h;return(a*(d*l-c*f)-100*l*d)/(a*(d-c)-100*d)}var c={O:`RY`,S:`YG`,T:`G25B`,C:`GB`,A:`B25G`,V:`B25R`,M:`BR`,P:`R25B`};function l(e){var r=t(e.match(/^([a-z])(?:(.+)?([a-z]))?$/i),4),i=r[1],o=r[2],s=r[3];s===void 0&&(s=i),o===void 0&&(o=`50`);var u=t([i,s].map(function(e){e=e.toUpperCase();var t=c[e];return t?l(t):100*a.indexOf(e)}),2);return i=u[0],s=u[1],o=parseFloat(o)/100,(0,n.corLerp)(i,s,o,`H`)}function u(e){var t=r(e/100),n=(t+1)%a.length,i=e-t*100;if(i>50){var o=[n,t];t=o[0],n=o[1],i=100-i}return i<1?a[t]:a[t]+i.toFixed()+a[n]}e.fromHue=o,e.toHue=s,e.fromNotation=l,e.toNotation=u})),Zr=s(((e,t)=>{var n=function(){function e(e,t){var n=[],r=!0,i=!1,a=void 0;try{for(var o=e[Symbol.iterator](),s;!(r=(s=o.next()).done)&&(n.push(s.value),!(t&&n.length===t));r=!0);}catch(e){i=!0,a=e}finally{try{!r&&o.return&&o.return()}finally{if(i)throw a}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw TypeError(`Invalid attempt to destructure non-iterable instance`)}}();Object.defineProperty(e,"__esModule",{value:!0});var r=qr(),i=s(Xr()),a=Jr(),o=Br();function s(e){if(e&&e.__esModule)return e;var t={};if(e!=null)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);return t.default=e,t}var c=Math,l=c.pow,u=c.sqrt,d=c.exp,f=c.abs,p=c.sign,m=Math,h=m.sin,g=m.cos,_=m.atan2,v={average:{F:1,c:.69,N_c:1},dim:{F:.9,c:.59,N_c:.9},dark:{F:.8,c:.535,N_c:.8}},y=[[.7328,.4296,-.1624],[-.7036,1.6975,.0061],[.003,.0136,.9834]],b=[[.38971,.68898,-.07868],[-.22981,1.1834,.04641],[0,0,1]],x=y,S=r.matrix.inverse(y),C=r.matrix.product(b,r.matrix.inverse(y)),w=r.matrix.product(y,r.matrix.inverse(b)),T={whitePoint:r.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:`average`,discounting:!1},ee=(0,a.cfs)(`QJMCshH`),E=(0,a.cfs)(`JCh`);function D(){var e=arguments.length<=0||arguments[0]===void 0?{}:arguments[0],t=arguments.length<=1||arguments[1]===void 0?ee:arguments[1];e=(0,o.merge)(T,e);var a=e.whitePoint,s=e.adaptingLuminance,c=e.backgroundLuminance,m=v[e.surroundType],b=m.F,D=m.c,O=m.N_c,te=a[1],k=1/(5*s+1),A=.2*l(k,4)*5*s+.1*l(1-l(k,4),2)*l(5*s,1/3),ne=c/te,re=.725*l(1/ne,.2),ie=re,ae=1.48+u(ne),oe=e.discounting?1:b*(1-1/3.6*d(-(s+42)/92)),j=n(r.matrix.multiply(y,a).map(function(e){return oe*te/e+1-oe}),3),se=j[0],M=j[1],ce=j[2],N=pe(de(le(a)));function le(e){var t=n(r.matrix.multiply(x,e),3),i=t[0],a=t[1],o=t[2];return[se*i,M*a,ce*o]}function ue(e){var t=n(e,3),i=t[0],a=t[1],o=t[2];return r.matrix.multiply(S,[i/se,a/M,o/ce])}function de(e){return r.matrix.multiply(C,e).map(function(e){var t=l(A*f(e)/100,.42);return p(e)*400*t/(27.13+t)+.1})}function fe(e){return r.matrix.multiply(w,e.map(function(e){var t=e-.1;return p(t)*100/A*l(27.13*f(t)/(400-f(t)),1/.42)}))}function pe(e){var t=n(e,3),r=t[0],i=t[1],a=t[2];return(r*2+i+a/20-.305)*re}function me(e){return 4/D*u(e/100)*(N+4)*l(A,.25)}function he(e){return 6.25*l(D*e/((N+4)*l(A,.25)),2)}function ge(e){return e*l(A,.25)}function _e(e,t){return l(e/100,2)*t/l(A,.25)}function ve(e){return e/l(A,.25)}function ye(e,t){return 100*u(e/t)}function be(e,t){var n=t.Q,r=t.J,a=t.M,o=t.C,s=t.s,c=t.h,l=t.H,u={};return e.J&&(u.J=isNaN(r)?he(n):r),e.C&&(isNaN(o)?isNaN(a)?(n=isNaN(n)?me(r):n,u.C=_e(s,n)):u.C=ve(a):u.C=t.C),e.h&&(u.h=isNaN(c)?i.toHue(l):c),e.Q&&(u.Q=isNaN(n)?me(r):n),e.M&&(u.M=isNaN(a)?ge(o):a),e.s&&(isNaN(s)?(n=isNaN(n)?me(r):n,a=isNaN(a)?ge(o):a,u.s=ye(a,n)):u.s=s),e.H&&(u.H=isNaN(l)?i.fromHue(c):l),u}function P(e){var i=de(le(e)),a=n(i,3),o=a[0],s=a[1],c=a[2],d=o-s*12/11+c/11,f=(o+s-2*c)/9,p=_(f,d),m=r.degree.fromRadian(p),h=1/4*(g(p+2)+3.8),v=100*l(pe(i)/N,D*ae);return be(t,{J:v,C:l(5e4/13*O*ie*h*u(d*d+f*f)/(o+s+21/20*c),.9)*u(v/100)*l(1.64-l(.29,ne),.73),h:m})}function F(e){var t=be(E,e),n=t.J,i=t.C,a=t.h,o=r.degree.toRadian(a),s=l(i/(u(n/100)*l(1.64-l(.29,ne),.73)),10/9),c=1/4*(g(o+2)+3.8),d=N*l(n/100,1/D/ae),p=5e4/13*O*ie*c/s,m=d/re+.305,_=m*61/20*460/1403,v=61/20*220/1403,y=21/20*6300/1403-27/1403,b=h(o),x=g(o),S,C;return s===0||isNaN(s)?S=C=0:f(b)>=f(x)?(C=_/(p/b+v*x/b+y),S=C*x/b):(S=_/(p/x+v+y*b/x),C=S*b/x),ue(fe([20/61*m+451/1403*S+288/1403*C,20/61*m-891/1403*S-261/1403*C,20/61*m-220/1403*S-6300/1403*C]))}return{fromXyz:P,toXyz:F,fillOut:be}}e.default=D,t.exports=e.default})),Qr=s(((e,t)=>{Object.defineProperty(e,"__esModule",{value:!0});var n=qr(),r=Math,i=r.sqrt,a=r.pow,o=r.exp,s=r.log,c=r.cos,l=r.sin,u=r.atan2,d={LCD:{K_L:.77,c_1:.007,c_2:.0053},SCD:{K_L:1.24,c_1:.007,c_2:.0363},UCS:{K_L:1,c_1:.007,c_2:.0228}};function f(){var e=d[arguments.length<=0||arguments[0]===void 0?`UCS`:arguments[0]],t=e.K_L,r=e.c_1,f=e.c_2;function p(e){var t=e.J,i=e.M,a=e.h,o=n.degree.toRadian(a),u=(1+100*r)*t/(1+r*t),d=1/f*s(1+f*i);return{J_p:u,a_p:d*c(o),b_p:d*l(o)}}function m(e){var t=e.J_p,s=e.a_p,c=e.b_p,l=-t/(r*t-100*r-1),d=(o(f*i(a(s,2)+a(c,2)))-1)/f,p=u(c,s);return{J:l,M:d,h:n.degree.fromRadian(p)}}function h(e,n){return i(a((e.J_p-n.J_p)/t,2)+a(e.a_p-n.a_p,2)+a(e.b_p-n.b_p,2))}return{fromCam:p,toCam:m,distance:h}}e.default=f,t.exports=e.default})),$r=s(((e,t)=>{var n=Jr(),r=Yr(),i=Zr(),a=Qr(),o=Xr();t.exports={gamut:r,cfs:n.cfs,lerp:n.lerp,cam:i,ucs:a,hq:o}})),ei=l(qr(),1),ti=l($r(),1);function ni(e){let t=new q;return t.rgb_r=e[0],t.rgb_g=e[1],t.rgb_b=e[2],t.rgbToHsluv(),[t.hsluv_h,t.hsluv_s,t.hsluv_l]}function ri(e){let t=new q;return t.hsluv_h=e[0],t.hsluv_s=e[1],t.hsluv_l=e[2],t.hsluvToRgb(),[t.rgb_r,t.rgb_g,t.rgb_b]}var ii=ti.default.cam({whitePoint:ei.default.illuminant.D65,adaptingLuminance:40,backgroundLuminance:20,surroundType:`average`,discounting:!1},ti.default.cfs(`JCh`)),ai=ei.default.xyz(ei.default.workspace.sRGB,ei.default.illuminant.D65),oi=e=>ai.toRgb(ii.toXyz({J:e[0],C:e[1],h:e[2]})),si=e=>{let t=ii.fromXyz(ai.fromRgb(e));return[t.J,t.C,t.h]},[ci,li]=(()=>{let e={k_l:1,c1:.007,c2:.0228},t=Math.PI,n=64/t/5,r=1/(5*n+1),i=.2*r**4*(5*n)+.1*(1-r**4)**2*(5*n)**(1/3);return[n=>{let[r,a,o]=n,s=a*i**.25,c=(1+100*e.c1)*r/(1+e.c1*r);c/=e.k_l;let l=1/e.c2*Math.log(1+e.c2*s),u=l*Math.cos(t/180*o),d=l*Math.sin(t/180*o);return[c,u,d]},n=>{let[r,a,o]=n,s=Math.sqrt(a*a+o*o),c=(Math.exp(s*e.c2)-1)/e.c2,l=(180/t*Math.atan2(o,a)+360)%360,u=c/i**.25;return[r/(1+e.c1*(100-r)),u,l]}]})(),ui=e=>oi(li(e)),di=e=>ci(si(e)),fi=console;fi.color=(e,t=``)=>{let n=K(e).luminance();fi.log(`%c${e} ${t}`,`background-color: ${e};padding: 5px; border-radius: 5px; color: ${n>.5?`#000`:`#fff`}`)},fi.ramp=(e,t=1)=>{fi.log(`%c `,`font-size: 1px;line-height: 16px;background: ${K.getCSSGradient(e,t)};padding: 0 0 0 200px; border-radius: 2px;`)};var pi=(e,t,n,r,i,a,o=.1)=>{if(e===n||t===r)return!0;let s=(r-t)/(n-e),c=(a+i/s-t+s*e)/(s+1/s),l=a+i/s-c/s;return(i-c)**2+(a-l)**2<o**2},mi=(e,t,n,r)=>{let i=(t[0]+n[0])/2,a=e(i);return pi(...t,...n,i,a,r)?null:[i,a]},hi=(e,t,n,r=.1)=>{let i=(n-t)/10,a=[];for(let r=t;r<n;r+=i)a.push([r,e(r)]);a.push([n,e(n)]);for(let t=0;t<a.length-1;t++){let n=mi(e,a[t],a[t+1],r);n&&(a.splice(t+1,0,n),t--)}for(let e=0;e<a.length-2;e++)pi(...a[e],...a[e+2],...a[e+1],r)&&(a.splice(e+1,1),e--);return a},gi=(e,t=4)=>Math.round(e*10**t)/10**t,_i=(e,t=1,n=90,r=.005)=>{let i=hi(t=>e(t).gl()[0],0,t,r),a=hi(t=>e(t).gl()[1],0,t,r),o=hi(t=>e(t).gl()[2],0,t,r);return`linear-gradient(${n}deg, ${Array.from(new Set([...i.map(e=>gi(e[0])),...a.map(e=>gi(e[0])),...o.map(e=>gi(e[0]))].sort((e,t)=>e-t))).map(t=>`${e(t).hex()} ${gi(t*100)}%`).join()});`},vi=e=>{e.Color.prototype.jch=function(){return si(this._rgb.slice(0,3).map(e=>e/255))},e.jch=(...t)=>new e.Color(...oi(t).map(e=>Math.floor(e*255)),`rgb`),e.Color.prototype.jab=function(){return di(this._rgb.slice(0,3).map(e=>e/255))},e.jab=(...t)=>new e.Color(...ui(t).map(e=>Math.floor(e*255)),`rgb`),e.Color.prototype.hsluv=function(){return ni(this._rgb.slice(0,3).map(e=>e/255))},e.hsluv=(...t)=>new e.Color(...ri(t).map(e=>Math.floor(e*255)),`rgb`);let t=e.interpolate,n={jch:si,jab:di,hsluv:ni},r=(e,t,n)=>(Math.abs(e-t)>360/2&&(e>t?t+=360:e+=360),((1-n)*e+n*t)%360);e.interpolate=(i,a,o=.5,s=`lrgb`)=>{if(n[s]){typeof i!=`object`&&(i=new e.Color(i)),typeof a!=`object`&&(a=new e.Color(a));let t=n[s](i.gl()),c=n[s](a.gl()),l=Number.isNaN(i.hsl()[0]),u=Number.isNaN(a.hsl()[0]),d,f,p;switch(s){case`hsluv`:t[1]<1e-10&&(t[0]=c[0]),t[1]===0&&(t[1]=c[1]),c[1]<1e-10&&(c[0]=t[0]),c[1]===0&&(c[1]=t[1]),d=r(t[0],c[0],o),f=t[1]+(c[1]-t[1])*o,p=t[2]+(c[2]-t[2])*o;break;case`jch`:l&&(t[2]=c[2]),u&&(c[2]=t[2]),d=t[0]+(c[0]-t[0])*o,f=t[1]+(c[1]-t[1])*o,p=r(t[2],c[2],o);break;default:d=t[0]+(c[0]-t[0])*o,f=t[1]+(c[1]-t[1])*o,p=t[2]+(c[2]-t[2])*o}return e[s](d,f,p).alpha(i.alpha()+o*(a.alpha()-i.alpha()))}return t(i,a,o,s)},e.getCSSGradient=_i},X={mainTRC:2.4,get mainTRCencode(){return 1/this.mainTRC},sRco:.2126729,sGco:.7151522,sBco:.072175,normBG:.56,normTXT:.57,revTXT:.62,revBG:.65,blkThrs:.022,blkClmp:1.414,scaleBoW:1.14,scaleWoB:1.14,loBoWoffset:.027,loWoBoffset:.027,deltaYmin:5e-4,loClip:.1,mFactor:1.9468554433171,get mFactInv(){return 1/this.mFactor},mOffsetIn:.0387393816571401,mExpAdj:.283343396420869,get mExp(){return this.mExpAdj/this.blkClmp},mOffsetOut:.312865795870758};function yi(e,t,n=-1){let r=[0,1.1];if(isNaN(e)||isNaN(t)||Math.min(e,t)<r[0]||Math.max(e,t)>r[1])return 0;let i=0,a=0,o=`BoW`;return e=e>X.blkThrs?e:e+(X.blkThrs-e)**+X.blkClmp,t=t>X.blkThrs?t:t+(X.blkThrs-t)**+X.blkClmp,Math.abs(t-e)<X.deltaYmin?0:(t>e?(i=(t**+X.normBG-e**+X.normTXT)*X.scaleBoW,a=i<X.loClip?0:i-X.loBoWoffset):(o=`WoB`,i=(t**+X.revBG-e**+X.revTXT)*X.scaleWoB,a=i>-X.loClip?0:i+X.loWoBoffset),n<0?a*100:n==0?Math.round(Math.abs(a)*100)+`<sub>`+o+`</sub>`:Number.isInteger(n)?(a*100).toFixed(n):0)}function bi(e=[0,0,0]){function t(e){return(e/255)**X.mainTRC}return X.sRco*t(e[0])+X.sGco*t(e[1])+X.sBco*t(e[2])}var xi=(e,t,n,r,i,a,o,s,c)=>{let l=1-c,u=l*l,d=u*l,f=c*c*c;return{x:d*e+u*3*c*n+l*3*c*c*i+f*o,y:d*t+u*3*c*r+l*3*c*c*a+f*s}},Si=(e,t)=>{let n=[],r={x:+e[0],y:+e[1]};for(let i=0,a=e.length;a-2*!t>i;i+=2){let o=[{x:+e[i-2],y:+e[i-1]},{x:+e[i],y:+e[i+1]},{x:+e[i+2],y:+e[i+3]},{x:+e[i+4],y:+e[i+5]}];t?i?a-4===i?o[3]={x:+e[0],y:+e[1]}:a-2===i&&(o[2]={x:+e[0],y:+e[1]},o[3]={x:+e[2],y:+e[3]}):o[0]={x:+e[a-2],y:+e[a-1]}:a-4===i?o[3]=o[2]:i||(o[0]={x:+e[i],y:+e[i+1]}),n.push([r.x,r.y,(-o[0].x+6*o[1].x+o[2].x)/6,(-o[0].y+6*o[1].y+o[2].y)/6,(o[1].x+6*o[2].x-o[3].x)/6,(o[1].y+6*o[2].y-o[3].y)/6,o[2].x,o[2].y]),r=o[2]}return n},Ci=(e,t,n,r,i,a,o,s)=>{let c=e,l=t,u=0;for(let d=1;d<5;d++){let{x:f,y:p}=xi(e,t,n,r,i,a,o,s,d/5);u+=Math.hypot(f-c,p-l),c=f,l=p}return u+=Math.hypot(o-c,s-l),u},wi=(e,t,n,r,i,a,o,s)=>{let c=Math.floor(Ci(e,t,n,r,i,a,o,s)*.75),l=[],u=0;for(let d=0;d<=c;d++){let f=xi(e,t,n,r,i,a,o,s,d/c),p=Math.round(f.x);if(l[p]=f.y,p-u>1){let e=l[u],t=l[p];for(let n=u+1;n<p;n++)l[n]=e+(t-e)/(p-u)*(n-u)}u=p}return e=>l[Math.round(e)]||null},Ti={CAM02:`jab`,CAM02p:`jch`,HEX:`hex`,HSL:`hsl`,HSLuv:`hsluv`,HSV:`hsv`,LAB:`lab`,LCH:`lch`,RGB:`rgb`,OKLAB:`oklab`,OKLCH:`oklch`};function Z(e,t=0){let n=10**t;return Math.round(e*n)/n}function Ei(e,t){let n;return n=e>1?(e-1)*t+1:e<-1?(e+1)*t-1:1,Z(n,2)}function Di(e){return K(String(e)).jch()}function Oi(e){return K(String(e)).hsluv()}function ki(e,t,n){let r=[[],[],[]];if(e.forEach((e,n)=>r.forEach((r,i)=>r.push(t[n],e[i]))),n===`hcl`){let e=r[1];for(let t=1;t<e.length;t+=2)Number.isNaN(e[t])&&(e[t]=0)}r.forEach(e=>{let t=[];for(let n=1;n<e.length;n+=2)if(Number.isNaN(e[n]))t.push(n);else{t.forEach(t=>{e[t]=e[n]}),t.length=0;break}if(t.length){let n=K(`#ccc`).jch()[2];t.forEach(t=>{e[t]=n})}t.length=0;for(let n=e.length-1;n>0;n-=2)if(Number.isNaN(e[n]))t.push(n);else{t.forEach(t=>{e[t]=e[n]});break}for(let t=1;t<e.length;t+=2)Number.isNaN(e[t])&&(e.splice(t-1,2),t-=2);if(n in{hcl:1,hsl:1,hsluv:1,hsv:1,jch:1}){let t=e[1],n=0;for(let r=3;r<e.length;r+=2){let i=e[r]+n,a=Math.abs(t-i),o=Math.abs(t-(i+360)),s=Math.abs(t-(i-360));o<a&&o<s&&(n+=360),s<a&&s<o&&(n-=360),e[r]+=n,t=e[r]}}});let i=r.map(e=>Si(e).map(e=>wi(...e)));return e=>{let t=i.map(t=>{for(let n=0;n<t.length;n++){let r=t[n](e);if(r!=null)return r}return null});return n===`jch`&&t[1]<0&&(t[1]=0),K[n](...t).hex()}}function Ai(e=1,t=[0,1],n=[0,1]){let r=(n[1]-n[0])/(t[1]**e-t[0]**e),i=n[0]-r*t[0]**e;return t=>r*t**e+i}function ji({swatches:e,colorKeys:t,colorspace:n,colorSpace:r=n??`LAB`,shift:i=1,fullScale:a=!0,smooth:o=!1,distributeLightness:s=`linear`,sortColor:c=!0,asFun:l=!1}={}){n!==void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead.");let u=Ti[r];if(!u)throw Error(`Colorspace “${r}” not supported`);if(!t)throw Error(`Colorkeys missing: returned “${t}”`);let d;if(a)d=t.map(t=>e-e*(K(t).jch()[0]/100)).sort((e,t)=>e-t).concat(e),d.unshift(0);else{let n=t.map(e=>K(e).jch()[0]/100),r=Math.min(...n),i=Math.max(...n);d=n.map(t=>t===0||isNaN((t-r)/(i-r))?0:e-(t-r)/(i-r)*e).sort((e,t)=>e-t)}let f=Ai(i,[1,e],[1,e]);if(f=d.map(e=>Math.max(0,f(e))),d=f,s===`polynomial`){let t=e=>Math.sqrt(Math.sqrt((e**2.25+e**4)/2));d=f.map(t=>t/e).map(n=>t(n)*e)}let p=t.map((e,t)=>({colorKeys:Di(e),index:t})).sort((e,t)=>t.colorKeys[0]-e.colorKeys[0]).map(e=>t[e.index]),m=[],h;if(a){let e=u===`lch`?K.lch(...K(`#fff`).lch()):`#ffffff`,t=u===`lch`?K.lch(...K(`#000`).lch()):`#000000`;m=[e,...p,t]}else m=c?p:t;let g;if(o){let t=m;if(m=m.map(e=>K(String(e))[u]()),u===`hcl`&&m.forEach(e=>{e[1]=Number.isNaN(e[1])?0:e[1]}),u===`jch`)for(let e=0;e<t.length;e++){let n=K(t[e]).hcl();Number.isNaN(n[0])&&(m[e][2]=NaN)}h=ki(m,d,u),g=Array(e).fill().map((e,t)=>h(t))}else h=K.scale(m.map(e=>typeof e==`object`&&e.constructor===K.Color?e:String(e))).domain(d).mode(u);return l?h:(!o||o===!1?h.colors(e):g).filter(e=>e!=null)}function Mi(e,t){let n=[],r={};return Object.keys(e).forEach(n=>{r[e[n][t]]=e[n]}),Object.keys(r).forEach(e=>n.push(r[e])),n}function Ni(e){return Number.isNaN(e)?0:e}function Pi(e,t,n=!1){if(!e)throw Error(`Cannot convert color value of “${e}”`);if(!Ti[t])throw Error(`Cannot convert to colorspace “${t}”`);let r=Ti[t],i=K(String(e))[r]();if(t===`HSL`&&i.pop(),t===`HEX`){if(n){let t=K(String(e)).rgb();return{r:t[0],g:t[1],b:t[2]}}return i}let a={},o=i.map(Ni);o=o.map((e,t)=>{let i=Z(e),o=t;r===`hsluv`&&(o+=2);let s=r.charAt(o);return r===`jch`&&s===`c`&&(s=`C`),a[s===`j`?`J`:s]=i,r in{lab:1,lch:1,jab:1,jch:1}?n||(s===`l`||s===`j`)&&(i+=`%`):r!==`hsluv`&&(s===`s`||s===`l`||s===`v`)&&(a[s]=Z(e,2),n||(i=Z(e*100),i+=`%`)),i});let s=`${r}(${o.join(`, `)})`;return n?a:s}function Fi(e,t,n){let r=[e,t,n].map(e=>(e/=255,e<=.03928?e/12.92:((e+.055)/1.055)**2.4));return r[0]*.2126+r[1]*.7152+r[2]*.0722}function Ii(e,t,n,r=`wcag2`){if(n===void 0){let e=K.rgb(...t).hsluv()[2];n=Z(e/100,2)}if(r===`wcag2`){let r=Fi(e[0],e[1],e[2]),i=Fi(t[0],t[1],t[2]),a=(r+.05)/(i+.05),o=(i+.05)/(r+.05);return n<.5?a>=1?a:-o:a<1?o:a===1?a:-a}else if(r===`wcag3`)return n<.5?yi(bi(e),bi(t))*-1:yi(bi(e),bi(t));else throw Error(`Contrast calculation method ${r} unsupported; use 'wcag2' or 'wcag3'`)}function Li(e,t){if(!e)throw Error(`Array undefined`);if(!Array.isArray(e))throw Error(`Passed object is not an array`);let n=t===`wcag2`?0:1;return Math.min(...e.filter(e=>e>=n))}function Ri(e,t){if(!e)throw Error(`Ratios undefined`);e=e.sort((e,t)=>e-t);let n=Li(e,t),r=e.indexOf(n),i=[],a=e.slice(0,r),o=e.slice(r,e.length);for(let e=0;e<a.length;e++){let t=1/(a.length+1)*100*(e+1);i.push(Z(t))}for(let e=0;e<o.length;e++)i.push((e+1)*100);return i.sort((e,t)=>e-t),i}var zi=(e,t,n,r,i)=>{let a=3e3,o=ji({swatches:a,colorKeys:e._modifiedKeys,colorspace:e._colorspace,shift:1,smooth:e._smooth,asFun:!0}),s={},c=e=>{if(s[e])return s[e];let r=Ii(K(o(e)).rgb(),t,n,i);return s[e]=r,r},l=e=>{let t=c(0)<c(a)?1:-1;e+=.005*Math.sign(e);let n=a/2,r=n,i=c(r),o=100;for(;Math.abs(i-e)>.01&&o;)o--,n/=2,i<e?r+=n*t:r-=n*t,i=c(r);return Z(r,3)},u=[];return r.forEach(e=>u.push(o(l(+e)))),u},Q=class{constructor({name:e,colorKeys:t,colorspace:n,colorSpace:r=n??`RGB`,ratios:i,smooth:a=!1,output:o=`HEX`,saturation:s=100}){if(n!==void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this._name=e,this._colorKeys=t,this._modifiedKeys=t,this._colorspace=r,this._ratios=i,this._smooth=a,this._output=o,this._saturation=s,!this._name)throw Error(`Color missing name`);if(!this._colorKeys)throw Error(`Color Keys are undefined`);if(!Ti[this._colorspace])throw Error(`Colorspace “${r}” not supported`);if(!Ti[this._output])throw Error(`Output “${this._output}” not supported`);for(let e=0;e<this._colorKeys.length;e++)if(!K.valid(this._colorKeys[e]))throw Error(`Invalid Color Key “${this._colorKeys[e]}”`);this._colorScale=null}set colorKeys(e){this._colorKeys=e,this._updateColorSaturation()}get colorKeys(){return this._colorKeys}set saturation(e){this._saturation=e,this._updateColorSaturation()}get saturation(){return this._saturation}set colorSpace(e){this._colorspace=e,this._generateColorScale()}get colorSpace(){return this._colorspace}set colorspace(e){console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this.colorSpace=e}get colorspace(){return console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),this.colorSpace}set ratios(e){this._ratios=e}get ratios(){return this._ratios}set name(e){this._name=e}get name(){return this._name}set smooth(e){e===!0||e===`true`?this._smooth=e:this._smooth=!1,this._generateColorScale()}get smooth(){return this._smooth}set output(e){this._output=e,this._colorScale=null}get output(){return this._output}get colorScale(){return this._colorScale||this._generateColorScale(),this._colorScale}_updateColorSaturation(){let e=[];this._colorKeys.forEach(t=>{let n=K(`${t}`).oklch(),r=n[1]*(this._saturation/100),i=K.oklch(n[0],r,n[2]),a=K.rgb(i).hex();e.push(a)}),this._modifiedKeys=e,this._generateColorScale()}_generateColorScale(){this._colorScale=ji({swatches:3e3,colorKeys:this._modifiedKeys,colorSpace:this._colorspace,shift:1,smooth:this._smooth,asFun:!0})}},Bi=class extends Q{get backgroundColorScale(){return this._backgroundColorScale||this._generateColorScale(),this._backgroundColorScale}_generateColorScale(){Q.prototype._generateColorScale.call(this);let e=ji({swatches:1e3,colorKeys:this._colorKeys,colorspace:this._colorspace,shift:1,smooth:this._smooth});e.push(...this.colorKeys);let t=Mi(e.map((e,t)=>({value:Math.round(Oi(e)[2]),index:t})),`value`).map(t=>e[t.index]);return t.length>=101&&(t.length=100,t.push(`#ffffff`)),this._backgroundColorScale=t.map(e=>Pi(e,this._output)),this._backgroundColorScale}},Vi=class{constructor({colors:e,backgroundColor:t,lightness:n,contrast:r=1,saturation:i=100,output:a=`HEX`,formula:o=`wcag2`}){if(this._output=a,this._colors=e,this._lightness=n,this._saturation=i,this._formula=o,this._setBackgroundColor(t),this._setBackgroundColorValue(),this._contrast=r,!this._colors)throw Error(`No colors are defined`);if(!this._backgroundColor)throw Error(`Background color is undefined`);if(e.forEach(e=>{if(!e.ratios)throw Error(`Color ${e.name}'s ratios are undefined`)}),!Ti[this._output])throw Error(`Output “${a}” not supported`);this._saturation<100&&this._updateColorSaturation(this._saturation),this._findContrastColors(),this._findContrastColorPairs(),this._findContrastColorValues()}set formula(e){this._formula=e,this._findContrastColors()}get formula(){return this._formula}set contrast(e){this._contrast=e,this._findContrastColors()}get contrast(){return this._contrast}set lightness(e){this._lightness=e,this._setBackgroundColor(this._backgroundColor),this._findContrastColors()}get lightness(){return this._lightness}set saturation(e){this._saturation=e,this._updateColorSaturation(e),this._findContrastColors()}get saturation(){return this._saturation}set backgroundColor(e){this._setBackgroundColor(e),this._findContrastColors()}get backgroundColorValue(){return this._backgroundColorValue}get backgroundColor(){return this._backgroundColor}set colors(e){this._colors=e,this._findContrastColors()}get colors(){return this._colors}set addColor(e){this._colors.push(e),this._findContrastColors()}set removeColor(e){let t=this._colors.filter(t=>t.name!==e.name);this._colors=t,this._findContrastColors()}set updateColor(e){if(Array.isArray(e))for(let t=0;t<e.length;t++){let n=this._colors.filter(n=>n.name===e[t].color);n=n[0];let r=this._colors.indexOf(n),i=this._colors.filter(n=>n.name!==e[t].color);e[t].name&&(n.name=e[t].name),e[t].colorKeys&&(n.colorKeys=e[t].colorKeys),e[t].ratios&&(n.ratios=e[t].ratios),(e[t].colorSpace!==void 0||e[t].colorspace!==void 0)&&(e[t].colorspace!==void 0&&e[t].colorSpace===void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),n.colorSpace=e[t].colorSpace??e[t].colorspace),e[t].smooth&&(n.smooth=e[t].smooth),n._generateColorScale(),i.splice(r,0,n),this._colors=i}else{let t=this._colors.filter(t=>t.name===e.color);t=t[0];let n=this._colors.indexOf(t),r=this._colors.filter(t=>t.name!==e.color);e.name&&(t.name=e.name),e.colorKeys&&(t.colorKeys=e.colorKeys),e.ratios&&(t.ratios=e.ratios),(e.colorSpace!==void 0||e.colorspace!==void 0)&&(e.colorspace!==void 0&&e.colorSpace===void 0&&console.warn("Leonardo: `colorspace` is deprecated. Use `colorSpace` instead."),t.colorSpace=e.colorSpace??e.colorspace),e.smooth&&(t.smooth=e.smooth),t._generateColorScale(),r.splice(n,0,t),this._colors=r}this._findContrastColors()}set output(e){this._output=e,this._colors.forEach(e=>{e.output=this._output}),this._backgroundColor.output=this._output,this._findContrastColors()}get output(){return this._output}get contrastColors(){return this._contrastColors}get contrastColorPairs(){return this._contrastColorPairs}get contrastColorValues(){return this._contrastColorValues}_setBackgroundColor(e){if(typeof e==`string`){let t=new Bi({name:`background`,colorKeys:[e],output:`RGB`}),n=Z(K(String(e)).hsluv()[2]);this._backgroundColor=t,this._lightness=n,this._backgroundColorValue=t[this._lightness]}else{e.output=`RGB`;let t=e.backgroundColorScale[this._lightness];this._backgroundColor=e,this._backgroundColorValue=t}}_setBackgroundColorValue(){this._backgroundColorValue=this._backgroundColor.backgroundColorScale[this._lightness]}_updateColorSaturation(e){this._colors.map(t=>{t.saturation=e})}_findContrastColors(){let e=K(String(this._backgroundColorValue)).rgb(),t=this._lightness/100,n={background:Pi(this._backgroundColorValue,this._output)},r=[],i=[],a={...n};return r.push(n),this._colors.map(n=>{if(n.ratios!==void 0){let o,s=[],c={name:n.name,values:s},l;Array.isArray(n.ratios)?l=n.ratios:Array.isArray(n.ratios)||(o=Object.keys(n.ratios),l=Object.values(n.ratios)),l=l.map(e=>Ei(+e,this._contrast));let u=zi(n,e,t,l,this._formula).map(e=>Pi(e,this._output));for(let e=0;e<u.length;e++){let t;if(o)t=o[e];else{let r=Ri(n.ratios,this._formula)[e];t=n.name.concat(r).replace(/\s+/g,``)}let r={name:t,contrast:l[e],value:u[e]};s.push(r),a[t]=u[e],i.push(u[e])}r.push(c)}return null}),this._contrastColorValues=i,this._contrastColorPairs=a,this._contrastColors=r,this._contrastColors}_findContrastColorPairs(){return this._contrastColorPairs}_findContrastColorValues(){return this._contrastColorValues}};vi(K);function Hi(e){return+`${Math.ceil(`${e}e+2`)}e-2`}var Ui=e=>{let t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return[Number.parseInt(t[1],16),Number.parseInt(t[2],16),Number.parseInt(t[3],16)]},Wi=(e,t,n)=>{let r=e/255,i=t/255,a=n/255,o=Math.min(r,i,a),s=Math.max(r,i,a),c=s-o,l=0,u=0,d=0;return l=c===0?0:s===r?(i-a)/c%6:s===i?(a-r)/c+2:(r-i)/c+4,l=Math.round(l*60),l<0&&(l+=360),d=(s+o)/2,u=c===0?0:c/(1-Math.abs(2*d-1)),u=+(u*100).toFixed(1),d=+(d*100).toFixed(1),[l,u,Math.round(d)]},Gi=(e,t,n,r)=>{let i=n/100,a=t*Math.min(i,1-i)/100,o=t=>{let n=(t+e/30)%12,r=i-a*Math.max(Math.min(n-3,9-n,1),-1);return Math.round(255*r).toString(16).padStart(2,`0`).toUpperCase()};return`#${o(0)}${o(8)}${o(4)}${Math.round(((e,t,n)=>Math.min(Math.max(e,t),n))(r,0,1)*255).toString(16).padStart(2,`0`).toUpperCase()}`},Ki=(e,t,n=1)=>{let r=Ui(e),i=Ui(t===`white`?`#FFFFFF`:t===`black`?`#000000`:t),a=r.map((e,t)=>[(e-i[t])/(255-i[t]),(e-i[t])/(0-i[t])]),o=Hi(Math.max(...a.flat().filter(e=>/^-?\d+\.?\d*$/.test(e)))),s=r.map((e,t)=>Math.round((e-i[t]+i[t]*o)/o));if(s.includes(NaN)){let e=Wi(r[0],r[1],r[2]);return{h:e[0],s:Math.round(e[1]*n),l:e[2],a:1}}let c=Wi(s[0],s[1],s[2]);return{h:c[0],s:Math.round(c[1]*n),l:c[2],a:o}},qi={backgroundColor:`gray`,colorSpace:`OKLCH`,colorSmoothing:!1,formula:`wcag2`,output:`HEX`,colors:{gray:[$(215,20,90),$(215,8,50),$(215,6,25)],red:[$(358,100,58),$(350,100,30)],orange:[$(32,100,48),$(12,100,30)],yellow:[$(50,100,50),$(25,100,20)],lime:[$(100,68,50),$(115,86,25)],green:[$(163,87,42),$(168,100,25)],cyan:[$(185,80,45),$(200,98,35)],blue:[$(212,98,46),$(222,95,25)],purple:[$(258,94,64),$(265,100,35)],fuchsia:[$(295,56,50),$(285,80,25)],pink:[$(334,90,50),$(330,91,25)]},themes:{light:{ratios:[1.03,1.06,1.12,1.25,1.5,1.75,2.25,3.5,5.25,6.5,8,10.5,13.75,16.75],contrast:1,lightness:100,saturation:100},dark:{ratios:[1.03,1.06,1.12,1.25,1.5,1.75,2.25,3.5,5.25,6.5,8,10.5,13.75,16],contrast:1,lightness:6,saturation:97},lightHc:{ratios:[1.06,1.12,1.25,1.37,1.75,2.25,3.25,4.75,8.87,10,11.75,13.25,16,17],contrast:1,lightness:100,saturation:100},darkHc:{ratios:[1.06,1.12,1.25,1.37,1.75,2.25,3.25,4.75,8.87,10,11.75,13.25,16,17],contrast:1,lightness:6,saturation:97}}};function $(e,t,n){return K.hsl(e,t/100,n/100).hex()}function Ji(e,t){let n=e.colorSpace,r=e.colorSmoothing,i=e.themes[t].ratios,a=new Bi({name:`gray`,colorKeys:e.colors.gray,colorspace:n,ratios:i,smooth:r}),o=new Q({name:`blue`,colorKeys:e.colors.blue,colorspace:n,ratios:i,smooth:r}),s=new Q({name:`cyan`,colorKeys:e.colors.cyan,colorspace:n,ratios:i,smooth:r}),c=new Q({name:`fuchsia`,colorKeys:e.colors.fuchsia,colorspace:n,ratios:i,smooth:r}),l=new Q({name:`green`,colorKeys:e.colors.green,colorspace:n,ratios:i,smooth:r}),u=new Q({name:`lime`,colorKeys:e.colors.lime,colorspace:n,ratios:i,smooth:r}),d=new Q({name:`orange`,colorKeys:e.colors.orange,colorspace:n,ratios:i,smooth:r}),f=new Q({name:`pink`,colorKeys:e.colors.pink,colorspace:n,ratios:i,smooth:r}),p=new Q({name:`purple`,colorKeys:e.colors.purple,colorspace:n,ratios:i,smooth:r}),m={gray:a,red:new Q({name:`red`,colorKeys:e.colors.red,colorspace:n,ratios:i,smooth:r}),orange:d,yellow:new Q({name:`yellow`,colorKeys:e.colors.yellow,colorspace:n,ratios:i,smooth:r}),lime:u,green:l,cyan:s,blue:o,purple:p,fuchsia:c,pink:f};return e.colors.custom&&(m.custom=new Q({name:`custom`,colorKeys:e.colors.custom,colorspace:n,ratios:i,smooth:r})),new Vi({colors:Object.values(m),backgroundColor:m[e.backgroundColor],contrast:e.themes[t].contrast,lightness:e.themes[t].lightness,saturation:e.themes[t].saturation,output:e.output,formula:e.formula}).contrastColors}function Yi(e){let t={};for(let n of Object.keys(e.themes))t[n]=Ji(e,n);return t}function Xi(e){qi.colors.custom=[e];let t=Yi(qi);return Object.fromEntries(Object.entries(t).map(([e,t])=>{let n=t.find(e=>e&&e.name===`custom`),r=Object.fromEntries(n.values.map(({name:e,value:t})=>[e,t]));for(let[e,n]of Object.entries(r)){let i=Ki(n,t[0].background);r[`alpha${e.charAt(0).toUpperCase()+e.slice(1)}`]=Gi(i.h,i.s,i.l,i.a)}return[e,r]}))}return e.generateCustomColors=Xi,e.generateThemesJson=Yi,e.hslToHex=$,e.leonardoConfig=qi,e})({});
\ No newline at end of file
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/CompoundIconsPreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/CompoundIconsPreview.kt
index 236e3627f4..7b1219a9f9 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/CompoundIconsPreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/CompoundIconsPreview.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -62,7 +63,7 @@ internal fun IconsCompoundPreviewRtl() = ElementTheme {
 
 @Preview(widthDp = 730, heightDp = 1920)
 @Composable
-internal fun IconsCompoundPreviewDark() = ElementTheme(darkTheme = true) {
+internal fun IconsCompoundPreviewDark() = ElementTheme(theme = Theme.Dark) {
     IconsCompoundPreview()
 }
 
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/SemanticColorsPreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/SemanticColorsPreview.kt
index ff7970c0f4..6b1e77676c 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/previews/SemanticColorsPreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/previews/SemanticColorsPreview.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.compound.tokens.generated.compoundColorsHcDark
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
@@ -65,7 +66,7 @@ internal fun CompoundSemanticColorsLightHc() = ElementTheme(
 
 @Preview(heightDp = 2000)
 @Composable
-internal fun CompoundSemanticColorsDark() = ElementTheme(darkTheme = true) {
+internal fun CompoundSemanticColorsDark() = ElementTheme(theme = Theme.Dark) {
     Surface {
         Column(
             modifier = Modifier.padding(16.dp),
@@ -85,7 +86,7 @@ internal fun CompoundSemanticColorsDark() = ElementTheme(darkTheme = true) {
 @Preview(heightDp = 2000)
 @Composable
 internal fun CompoundSemanticColorsDarkHc() = ElementTheme(
-    darkTheme = true,
+    theme = Theme.Dark,
     compoundDark = compoundColorsHcDark,
 ) {
     Surface {
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/AvatarColors.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/AvatarColors.kt
index 763f422a00..8d3e495332 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/AvatarColors.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/AvatarColors.kt
@@ -65,7 +65,7 @@ internal fun AvatarColorsPreviewLight() {
 @Preview
 @Composable
 internal fun AvatarColorsPreviewDark() {
-    ElementTheme(darkTheme = true) {
+    ElementTheme(theme = Theme.Dark) {
         val chunks = avatarColors().chunked(4)
         Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
             for (chunk in chunks) {
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ElementTheme.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ElementTheme.kt
index bb2ae2b62e..ff9fe2a959 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ElementTheme.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ElementTheme.kt
@@ -16,7 +16,11 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalRippleConfiguration
+import androidx.compose.material3.LocalRippleThemeConfiguration
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RippleConfiguration
+import androidx.compose.material3.RippleThemeConfiguration
 import androidx.compose.material3.Typography
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
@@ -28,11 +32,14 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.annotations.CoreColorToken
 import io.element.android.compound.tokens.compoundTypography
 import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.compound.tokens.generated.TypographyTokens
 import io.element.android.compound.tokens.generated.compoundColorsDark
 import io.element.android.compound.tokens.generated.compoundColorsLight
+import io.element.android.compound.tokens.generated.internal.DarkColorTokens
 
 /**
  * Inspired from https://medium.com/@lucasyujideveloper/54cbcbde1ace
@@ -77,10 +84,10 @@ internal val LocalCompoundColors = staticCompositionLocalOf { compoundColorsLigh
 /**
  * Sets up the theme for the application, or a part of it.
  *
- * @param darkTheme whether to use the dark theme or not. If `true`, the dark theme will be used.
+ * @param theme the [Theme] to use. Defaults to [Theme.Dark] or [Theme.Light] based on the system setting.
  * @param applySystemBarsUpdate whether to update the system bars color scheme or not when the theme changes. It's `true` by default.
  * This is specially useful when you want to apply an alternate theme to a part of the app but don't want it to affect the system bars.
- * @param lightStatusBar whether to use a light status bar color scheme or not. By default, it's the opposite of [darkTheme].
+ * @param lightStatusBar whether to use a light status bar color scheme or not. By default, it's `true` for light themes and `false` for dark ones.
  * @param dynamicColor whether to enable MaterialYou or not. It's `false` by default.
  * @param compoundLight the [SemanticColors] to use in light theme.
  * @param compoundDark the [SemanticColors] to use in dark theme.
@@ -89,11 +96,12 @@ internal val LocalCompoundColors = staticCompositionLocalOf { compoundColorsLigh
  * @param typography the Material 3 [Typography] tokens to use. It'll use [compoundTypography] by default.
  * @param content the content to apply the theme to.
  */
+@OptIn(CoreColorToken::class)
 @Composable
 fun ElementTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
+    theme: Theme = if (isSystemInDarkTheme()) Theme.Dark else Theme.Light,
     applySystemBarsUpdate: Boolean = true,
-    lightStatusBar: Boolean = !darkTheme,
+    lightStatusBar: Boolean = !theme.isDark(),
     // true to enable MaterialYou
     dynamicColor: Boolean = false,
     compoundLight: SemanticColors = compoundColorsLight,
@@ -103,8 +111,16 @@ fun ElementTheme(
     typography: Typography = compoundTypography,
     content: @Composable () -> Unit,
 ) {
+    val darkTheme = theme.isDark()
     val currentCompoundColor = when {
-        darkTheme -> compoundDark
+        darkTheme -> if (theme == Theme.Black) {
+            compoundDark.copy(
+                bgCanvasDefault = Color.Black,
+                separatorSecondary = DarkColorTokens.colorGray400,
+            )
+        } else {
+            compoundDark
+        }
         else -> compoundLight
     }
 
@@ -113,7 +129,11 @@ fun ElementTheme(
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
-        darkTheme -> materialColorsDark
+        darkTheme -> if (theme == Theme.Black) {
+            currentCompoundColor.toMaterialColorScheme()
+        } else {
+            materialColorsDark
+        }
         else -> materialColorsLight
     }
 
@@ -130,7 +150,7 @@ fun ElementTheme(
 
     if (applySystemBarsUpdate) {
         val activity = LocalActivity.current as? ComponentActivity
-        LaunchedEffect(statusBarColorScheme, darkTheme, lightStatusBar) {
+        LaunchedEffect(statusBarColorScheme, theme, lightStatusBar) {
             activity?.enableEdgeToEdge(
                 // For Status bar use the background color of the app
                 statusBarStyle = SystemBarStyle.auto(
@@ -150,6 +170,26 @@ fun ElementTheme(
     CompositionLocalProvider(
         LocalCompoundColors provides currentCompoundColor,
         LocalContentColor provides colorScheme.onSurface,
+        // Configure the keyboard focus style: Draw a blue inset ring around the focused component.
+        // Ref: https://www.figma.com/design/hlbsmSekQorGRN1t2R9JEy/Accessibility-checks?node-id=271-42066
+        // By default, a semi-transparent black overlay is used
+        LocalRippleThemeConfiguration provides RippleThemeConfiguration(
+            RippleThemeConfiguration.Focus.InsetRing(
+                outerStrokeInset = 0.dp,
+                outerStrokeWidth = 2.dp,
+                innerStrokeInset = 0.dp,
+                innerStrokeWidth = 0.dp,
+            )
+        ),
+        // Configure the keyboard focus color.
+        // By default, ColorScheme.secondary is used
+        LocalRippleConfiguration provides
+            RippleConfiguration(
+                focus = RippleConfiguration.Focus.InsetRing(
+                    outerStrokeColor = ElementTheme.colors.borderFocused,
+                    innerStrokeColor = Color.Transparent,
+                )
+            ),
     ) {
         MaterialTheme(
             colorScheme = colorScheme,
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ForcedDarkElementTheme.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ForcedDarkElementTheme.kt
index 272245f199..8f9d2bdf0c 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ForcedDarkElementTheme.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/ForcedDarkElementTheme.kt
@@ -51,7 +51,7 @@ fun ForcedDarkElementTheme(
         }
     }
     ElementTheme(
-        darkTheme = true,
+        theme = Theme.Dark,
         compoundLight = colors.light,
         compoundDark = colors.dark,
         lightStatusBar = lightStatusBar,
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialTextPreview.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialTextPreview.kt
index 792c7fbabf..27e874c141 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialTextPreview.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialTextPreview.kt
@@ -36,11 +36,15 @@ internal fun MaterialTextPreview() = Row(
 ) {
     MaterialPreview(
         modifier = Modifier.weight(1f),
-        darkTheme = false,
+        theme = Theme.Light,
     )
     MaterialPreview(
         modifier = Modifier.weight(1f),
-        darkTheme = true,
+        theme = Theme.Dark,
+    )
+    MaterialPreview(
+        modifier = Modifier.weight(1f),
+        theme = Theme.Black,
     )
 }
 
@@ -52,7 +56,7 @@ private data class Model(
 
 @Composable
 private fun MaterialPreview(
-    darkTheme: Boolean,
+    theme: Theme,
     modifier: Modifier = Modifier,
 ) = Column(modifier = modifier) {
     Text(
@@ -60,13 +64,13 @@ private fun MaterialPreview(
             .fillMaxWidth()
             .padding(8.dp),
         textAlign = TextAlign.Center,
-        text = if (darkTheme) "Dark" else "Light",
+        text = theme.name,
         color = Color.Black,
         fontSize = 18.sp,
         fontWeight = FontWeight.Bold,
     )
     ElementTheme(
-        darkTheme = darkTheme,
+        theme = theme,
     ) {
         Column(
             modifier = Modifier.fillMaxSize()
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialThemeColors.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialThemeColors.kt
index c2a923e926..c283780295 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialThemeColors.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/MaterialThemeColors.kt
@@ -50,7 +50,7 @@ internal fun ColorsSchemeLightHcPreview() = ElementTheme(
 @Preview(heightDp = 1200)
 @Composable
 internal fun ColorsSchemeDarkPreview() = ElementTheme(
-    darkTheme = true,
+    theme = Theme.Dark,
 ) {
     ColorsSchemePreview(
         Color.White,
@@ -62,7 +62,7 @@ internal fun ColorsSchemeDarkPreview() = ElementTheme(
 @Preview(heightDp = 1200)
 @Composable
 internal fun ColorsSchemeDarkHcPreview() = ElementTheme(
-    darkTheme = true,
+    theme = Theme.Dark,
     compoundDark = compoundColorsHcDark,
 ) {
     ColorsSchemePreview(
@@ -71,3 +71,15 @@ internal fun ColorsSchemeDarkHcPreview() = ElementTheme(
         ElementTheme.materialColors,
     )
 }
+
+@Preview(heightDp = 1200)
+@Composable
+internal fun ColorsSchemeBlackPreview() = ElementTheme(
+    theme = Theme.Black
+) {
+    ColorsSchemePreview(
+        Color.White,
+        Color.Black,
+        ElementTheme.materialColors,
+    )
+}
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/Theme.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/Theme.kt
index 131b14430c..bf5932da59 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/theme/Theme.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/theme/Theme.kt
@@ -16,21 +16,26 @@ import kotlinx.coroutines.flow.map
 enum class Theme {
     System,
     Dark,
+    Black,
     Light,
 }
 
+private fun Theme.coerceBlackTheme(allowBlackTheme: Boolean): Theme {
+    return if (this == Theme.Black && !allowBlackTheme) Theme.Dark else this
+}
+
 @Composable
 fun Theme.isDark(): Boolean {
     return when (this) {
         Theme.System -> isSystemInDarkTheme()
-        Theme.Dark -> true
+        Theme.Dark, Theme.Black -> true
         Theme.Light -> false
     }
 }
 
-fun Flow<String?>.mapToTheme(): Flow<Theme> = map {
+fun Flow<String?>.mapToTheme(allowBlackTheme: Boolean): Flow<Theme> = map {
     when (it) {
         null -> Theme.System
         else -> Theme.valueOf(it)
-    }
+    }.coerceBlackTheme(allowBlackTheme)
 }
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt
index c5ac159b5a..d8f81dbbbb 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt
@@ -130,6 +130,9 @@ object CompoundIcons {
     @Composable fun Collapse(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_collapse)
     }
+    @Composable fun CollapseAll(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_collapse_all)
+    }
     @Composable fun Company(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_company)
     }
@@ -142,6 +145,9 @@ object CompoundIcons {
     @Composable fun Copy(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_copy)
     }
+    @Composable fun Crop(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_crop)
+    }
     @Composable fun DarkMode(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_dark_mode)
     }
@@ -202,6 +208,9 @@ object CompoundIcons {
     @Composable fun Expand(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_expand)
     }
+    @Composable fun ExpandAll(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_expand_all)
+    }
     @Composable fun Explore(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_explore)
     }
@@ -229,6 +238,12 @@ object CompoundIcons {
     @Composable fun Filter(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_filter)
     }
+    @Composable fun FlipHorizontal(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_flip_horizontal)
+    }
+    @Composable fun FlipVertical(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_flip_vertical)
+    }
     @Composable fun Folder(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_folder)
     }
@@ -499,6 +514,12 @@ object CompoundIcons {
     @Composable fun RotateRight(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_rotate_right)
     }
+    @Composable fun Save(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_save)
+    }
+    @Composable fun SaveSolid(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_save_solid)
+    }
     @Composable fun Search(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_search)
     }
@@ -610,6 +631,9 @@ object CompoundIcons {
     @Composable fun Unpin(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_unpin)
     }
+    @Composable fun Unsave(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_unsave)
+    }
     @Composable fun User(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_user)
     }
@@ -738,10 +762,12 @@ object CompoundIcons {
         CloudSolid(),
         Code(),
         Collapse(),
+        CollapseAll(),
         Company(),
         Compose(),
         Computer(),
         Copy(),
+        Crop(),
         DarkMode(),
         Delete(),
         DevicePasskey(),
@@ -762,6 +788,7 @@ object CompoundIcons {
         ErrorSolid(),
         ExitFullScreen(),
         Expand(),
+        ExpandAll(),
         Explore(),
         ExportArchive(),
         Extensions(),
@@ -771,6 +798,8 @@ object CompoundIcons {
         FileError(),
         Files(),
         Filter(),
+        FlipHorizontal(),
+        FlipVertical(),
         Folder(),
         Forward(),
         FullScreen(),
@@ -861,6 +890,8 @@ object CompoundIcons {
         Room(),
         RotateLeft(),
         RotateRight(),
+        Save(),
+        SaveSolid(),
         Search(),
         Section(),
         Send(),
@@ -898,6 +929,7 @@ object CompoundIcons {
         Unknown(),
         UnknownSolid(),
         Unpin(),
+        Unsave(),
         User(),
         UserAdd(),
         UserAddSolid(),
@@ -967,10 +999,12 @@ object CompoundIcons {
         R.drawable.ic_compound_cloud_solid,
         R.drawable.ic_compound_code,
         R.drawable.ic_compound_collapse,
+        R.drawable.ic_compound_collapse_all,
         R.drawable.ic_compound_company,
         R.drawable.ic_compound_compose,
         R.drawable.ic_compound_computer,
         R.drawable.ic_compound_copy,
+        R.drawable.ic_compound_crop,
         R.drawable.ic_compound_dark_mode,
         R.drawable.ic_compound_delete,
         R.drawable.ic_compound_device_passkey,
@@ -991,6 +1025,7 @@ object CompoundIcons {
         R.drawable.ic_compound_error_solid,
         R.drawable.ic_compound_exit_full_screen,
         R.drawable.ic_compound_expand,
+        R.drawable.ic_compound_expand_all,
         R.drawable.ic_compound_explore,
         R.drawable.ic_compound_export_archive,
         R.drawable.ic_compound_extensions,
@@ -1000,6 +1035,8 @@ object CompoundIcons {
         R.drawable.ic_compound_file_error,
         R.drawable.ic_compound_files,
         R.drawable.ic_compound_filter,
+        R.drawable.ic_compound_flip_horizontal,
+        R.drawable.ic_compound_flip_vertical,
         R.drawable.ic_compound_folder,
         R.drawable.ic_compound_forward,
         R.drawable.ic_compound_full_screen,
@@ -1090,6 +1127,8 @@ object CompoundIcons {
         R.drawable.ic_compound_room,
         R.drawable.ic_compound_rotate_left,
         R.drawable.ic_compound_rotate_right,
+        R.drawable.ic_compound_save,
+        R.drawable.ic_compound_save_solid,
         R.drawable.ic_compound_search,
         R.drawable.ic_compound_section,
         R.drawable.ic_compound_send,
@@ -1127,6 +1166,7 @@ object CompoundIcons {
         R.drawable.ic_compound_unknown,
         R.drawable.ic_compound_unknown_solid,
         R.drawable.ic_compound_unpin,
+        R.drawable.ic_compound_unsave,
         R.drawable.ic_compound_user,
         R.drawable.ic_compound_user_add,
         R.drawable.ic_compound_user_add_solid,
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt
index 1e3c97d179..339179bbb2 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColors.kt
@@ -29,6 +29,8 @@ data class SemanticColors(
     val bgAccentRest: Color,
     /** Background colour for accent or brand actions. State: Selected */
     val bgAccentSelected: Color,
+    /** Accent colour, subtle shade for Text buttons Hover/press */
+    val bgAccentSubtle: Color,
     /** Background colour for primary actions. State: Disabled. */
     val bgActionPrimaryDisabled: Color,
     /** Background colour for primary actions. State: Hover. */
@@ -83,14 +85,24 @@ data class SemanticColors(
     val bgDecorative6: Color,
     /** Subtle background colour for informational elements. State: Rest. */
     val bgInfoSubtle: Color,
-    /** Medium contrast surfaces. Elevation: Default (Level 2). */
+    /** Medium contrast surfaces. Elevation: Default (Level 3). */
     val bgSubtlePrimary: Color,
-    /** Low contrast surfaces. Elevation: Default (Level 1). */
+    /** Low contrast surfaces. Elevation: Default (Level 2). */
     val bgSubtleSecondary: Color,
     /** Lower contrast surfaces. Elevation: Level 0. */
     val bgSubtleSecondaryLevel0: Color,
+    /** Lowest contrast surfaces. Elevation: Default (Level 1). */
+    val bgSubtleTertiary: Color,
+    /** Hovered Background for success states */
+    val bgSuccessHovered: Color,
+    /** Pressed Background for success states */
+    val bgSuccessPressed: Color,
+    /** Default Background for success states */
+    val bgSuccessRest: Color,
     /** Subtle background colour for success state elements. State: Rest. */
     val bgSuccessSubtle: Color,
+    /** Accent borders for containers */
+    val borderAccentPrimary: Color,
     /** accent border intended for keylines on message highlights */
     val borderAccentSubtle: Color,
     /** High-contrast border for critical state. State: Hover. */
@@ -111,6 +123,8 @@ data class SemanticColors(
     val borderInteractivePrimary: Color,
     /** ⚠️ Lowest contrast for non-accessible interactive element borders, <3:1. Only use for non-essential borders. Do not rely exclusively on them. State: Rest. */
     val borderInteractiveSecondary: Color,
+    /** Border success state */
+    val borderSuccessPrimary: Color,
     /** Subtle border colour for success state elements. */
     val borderSuccessSubtle: Color,
     /** Background gradient stop for super and send buttons */
@@ -171,10 +185,18 @@ data class SemanticColors(
     val iconTertiary: Color,
     /** Translucent version of tertiary icon. Refer to it for intended use. */
     val iconTertiaryAlpha: Color,
+    /** Warning icon */
+    val iconWarningPrimary: Color,
+    /** Used to separate core sections of the UI as well as containers */
+    val separatorPrimary: Color,
+    /** Secondary shade for separating sections of components or list items */
+    val separatorSecondary: Color,
     /** Accent text colour for plain actions. */
     val textActionAccent: Color,
     /** Default text colour for plain actions. */
     val textActionPrimary: Color,
+    /** Text label success state */
+    val textActionSuccess: Color,
     /** Badge accent text colour */
     val textBadgeAccent: Color,
     /** Badge info text colour */
@@ -207,6 +229,8 @@ data class SemanticColors(
     val textSecondary: Color,
     /** Accent text colour for success state elements. */
     val textSuccessPrimary: Color,
+    /** Warning text */
+    val textWarningPrimary: Color,
     /** True for light theme, false for dark theme. */
     val isLight: Boolean,
 )
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt
index adeed8d5a3..4f2ee4c93f 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDark.kt
@@ -27,6 +27,7 @@ val compoundColorsDark = SemanticColors(
     bgAccentPressed = DarkColorTokens.colorGreen1100,
     bgAccentRest = DarkColorTokens.colorGreen900,
     bgAccentSelected = DarkColorTokens.colorAlphaGreen300,
+    bgAccentSubtle = DarkColorTokens.colorGreen200,
     bgActionPrimaryDisabled = DarkColorTokens.colorGray700,
     bgActionPrimaryHovered = DarkColorTokens.colorGray1200,
     bgActionPrimaryPressed = DarkColorTokens.colorGray1100,
@@ -60,7 +61,12 @@ val compoundColorsDark = SemanticColors(
     bgSubtlePrimary = DarkColorTokens.colorGray400,
     bgSubtleSecondary = DarkColorTokens.colorGray300,
     bgSubtleSecondaryLevel0 = DarkColorTokens.colorThemeBg,
+    bgSubtleTertiary = DarkColorTokens.colorGray100,
+    bgSuccessHovered = DarkColorTokens.colorGreen1000,
+    bgSuccessPressed = DarkColorTokens.colorGreen1100,
+    bgSuccessRest = DarkColorTokens.colorGreen900,
     bgSuccessSubtle = DarkColorTokens.colorGreen200,
+    borderAccentPrimary = DarkColorTokens.colorGreen900,
     borderAccentSubtle = DarkColorTokens.colorGreen700,
     borderCriticalHovered = DarkColorTokens.colorRed1000,
     borderCriticalPrimary = DarkColorTokens.colorRed900,
@@ -71,6 +77,7 @@ val compoundColorsDark = SemanticColors(
     borderInteractiveHovered = DarkColorTokens.colorGray1100,
     borderInteractivePrimary = DarkColorTokens.colorGray800,
     borderInteractiveSecondary = DarkColorTokens.colorGray600,
+    borderSuccessPrimary = DarkColorTokens.colorGreen900,
     borderSuccessSubtle = DarkColorTokens.colorGreen500,
     gradientActionStop1 = DarkColorTokens.colorGreen1100,
     gradientActionStop2 = DarkColorTokens.colorGreen900,
@@ -101,8 +108,12 @@ val compoundColorsDark = SemanticColors(
     iconSuccessPrimary = DarkColorTokens.colorGreen900,
     iconTertiary = DarkColorTokens.colorGray800,
     iconTertiaryAlpha = DarkColorTokens.colorAlphaGray800,
+    iconWarningPrimary = DarkColorTokens.colorOrange900,
+    separatorPrimary = DarkColorTokens.colorGray400,
+    separatorSecondary = DarkColorTokens.colorGray300,
     textActionAccent = DarkColorTokens.colorGreen900,
     textActionPrimary = DarkColorTokens.colorGray1400,
+    textActionSuccess = DarkColorTokens.colorGreen900,
     textBadgeAccent = DarkColorTokens.colorGreen1100,
     textBadgeInfo = DarkColorTokens.colorBlue1100,
     textCriticalPrimary = DarkColorTokens.colorRed900,
@@ -119,5 +130,6 @@ val compoundColorsDark = SemanticColors(
     textPrimary = DarkColorTokens.colorGray1400,
     textSecondary = DarkColorTokens.colorGray900,
     textSuccessPrimary = DarkColorTokens.colorGreen900,
+    textWarningPrimary = DarkColorTokens.colorOrange900,
     isLight = false,
 )
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt
index 9bab04f833..21c5ccb482 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsDarkHc.kt
@@ -27,6 +27,7 @@ val compoundColorsHcDark = SemanticColors(
     bgAccentPressed = DarkHcColorTokens.colorGreen1100,
     bgAccentRest = DarkHcColorTokens.colorGreen900,
     bgAccentSelected = DarkHcColorTokens.colorAlphaGreen300,
+    bgAccentSubtle = DarkHcColorTokens.colorGreen200,
     bgActionPrimaryDisabled = DarkHcColorTokens.colorGray700,
     bgActionPrimaryHovered = DarkHcColorTokens.colorGray1200,
     bgActionPrimaryPressed = DarkHcColorTokens.colorGray1100,
@@ -60,7 +61,12 @@ val compoundColorsHcDark = SemanticColors(
     bgSubtlePrimary = DarkHcColorTokens.colorGray400,
     bgSubtleSecondary = DarkHcColorTokens.colorGray300,
     bgSubtleSecondaryLevel0 = DarkHcColorTokens.colorThemeBg,
+    bgSubtleTertiary = DarkHcColorTokens.colorGray100,
+    bgSuccessHovered = DarkHcColorTokens.colorGreen1000,
+    bgSuccessPressed = DarkHcColorTokens.colorGreen1100,
+    bgSuccessRest = DarkHcColorTokens.colorGreen900,
     bgSuccessSubtle = DarkHcColorTokens.colorGreen200,
+    borderAccentPrimary = DarkHcColorTokens.colorGreen900,
     borderAccentSubtle = DarkHcColorTokens.colorGreen700,
     borderCriticalHovered = DarkHcColorTokens.colorRed1000,
     borderCriticalPrimary = DarkHcColorTokens.colorRed900,
@@ -71,6 +77,7 @@ val compoundColorsHcDark = SemanticColors(
     borderInteractiveHovered = DarkHcColorTokens.colorGray1100,
     borderInteractivePrimary = DarkHcColorTokens.colorGray800,
     borderInteractiveSecondary = DarkHcColorTokens.colorGray600,
+    borderSuccessPrimary = DarkHcColorTokens.colorGreen900,
     borderSuccessSubtle = DarkHcColorTokens.colorGreen500,
     gradientActionStop1 = DarkHcColorTokens.colorGreen1100,
     gradientActionStop2 = DarkHcColorTokens.colorGreen900,
@@ -101,8 +108,12 @@ val compoundColorsHcDark = SemanticColors(
     iconSuccessPrimary = DarkHcColorTokens.colorGreen900,
     iconTertiary = DarkHcColorTokens.colorGray800,
     iconTertiaryAlpha = DarkHcColorTokens.colorAlphaGray800,
+    iconWarningPrimary = DarkHcColorTokens.colorOrange900,
+    separatorPrimary = DarkHcColorTokens.colorGray400,
+    separatorSecondary = DarkHcColorTokens.colorGray300,
     textActionAccent = DarkHcColorTokens.colorGreen900,
     textActionPrimary = DarkHcColorTokens.colorGray1400,
+    textActionSuccess = DarkHcColorTokens.colorGreen900,
     textBadgeAccent = DarkHcColorTokens.colorGreen1100,
     textBadgeInfo = DarkHcColorTokens.colorBlue1100,
     textCriticalPrimary = DarkHcColorTokens.colorRed900,
@@ -119,5 +130,6 @@ val compoundColorsHcDark = SemanticColors(
     textPrimary = DarkHcColorTokens.colorGray1400,
     textSecondary = DarkHcColorTokens.colorGray900,
     textSuccessPrimary = DarkHcColorTokens.colorGreen900,
+    textWarningPrimary = DarkHcColorTokens.colorOrange900,
     isLight = false,
 )
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt
index 033efc63ef..17fa8d0875 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLight.kt
@@ -27,6 +27,7 @@ val compoundColorsLight = SemanticColors(
     bgAccentPressed = LightColorTokens.colorGreen1100,
     bgAccentRest = LightColorTokens.colorGreen900,
     bgAccentSelected = LightColorTokens.colorAlphaGreen300,
+    bgAccentSubtle = LightColorTokens.colorGreen200,
     bgActionPrimaryDisabled = LightColorTokens.colorGray700,
     bgActionPrimaryHovered = LightColorTokens.colorGray1200,
     bgActionPrimaryPressed = LightColorTokens.colorGray1100,
@@ -60,7 +61,12 @@ val compoundColorsLight = SemanticColors(
     bgSubtlePrimary = LightColorTokens.colorGray400,
     bgSubtleSecondary = LightColorTokens.colorGray300,
     bgSubtleSecondaryLevel0 = LightColorTokens.colorGray300,
+    bgSubtleTertiary = LightColorTokens.colorGray100,
+    bgSuccessHovered = LightColorTokens.colorGreen1000,
+    bgSuccessPressed = LightColorTokens.colorGreen1100,
+    bgSuccessRest = LightColorTokens.colorGreen900,
     bgSuccessSubtle = LightColorTokens.colorGreen200,
+    borderAccentPrimary = LightColorTokens.colorGreen900,
     borderAccentSubtle = LightColorTokens.colorGreen700,
     borderCriticalHovered = LightColorTokens.colorRed1000,
     borderCriticalPrimary = LightColorTokens.colorRed900,
@@ -71,6 +77,7 @@ val compoundColorsLight = SemanticColors(
     borderInteractiveHovered = LightColorTokens.colorGray1100,
     borderInteractivePrimary = LightColorTokens.colorGray800,
     borderInteractiveSecondary = LightColorTokens.colorGray600,
+    borderSuccessPrimary = LightColorTokens.colorGreen900,
     borderSuccessSubtle = LightColorTokens.colorGreen500,
     gradientActionStop1 = LightColorTokens.colorGreen500,
     gradientActionStop2 = LightColorTokens.colorGreen700,
@@ -101,8 +108,12 @@ val compoundColorsLight = SemanticColors(
     iconSuccessPrimary = LightColorTokens.colorGreen900,
     iconTertiary = LightColorTokens.colorGray800,
     iconTertiaryAlpha = LightColorTokens.colorAlphaGray800,
+    iconWarningPrimary = LightColorTokens.colorOrange900,
+    separatorPrimary = LightColorTokens.colorGray400,
+    separatorSecondary = LightColorTokens.colorGray300,
     textActionAccent = LightColorTokens.colorGreen900,
     textActionPrimary = LightColorTokens.colorGray1400,
+    textActionSuccess = LightColorTokens.colorGreen900,
     textBadgeAccent = LightColorTokens.colorGreen1100,
     textBadgeInfo = LightColorTokens.colorBlue1100,
     textCriticalPrimary = LightColorTokens.colorRed900,
@@ -119,5 +130,6 @@ val compoundColorsLight = SemanticColors(
     textPrimary = LightColorTokens.colorGray1400,
     textSecondary = LightColorTokens.colorGray900,
     textSuccessPrimary = LightColorTokens.colorGreen900,
+    textWarningPrimary = LightColorTokens.colorOrange900,
     isLight = true,
 )
diff --git a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt
index c1f677d156..1f8ddc2f85 100644
--- a/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt
+++ b/libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/SemanticColorsLightHc.kt
@@ -27,6 +27,7 @@ val compoundColorsHcLight = SemanticColors(
     bgAccentPressed = LightHcColorTokens.colorGreen1100,
     bgAccentRest = LightHcColorTokens.colorGreen900,
     bgAccentSelected = LightHcColorTokens.colorAlphaGreen300,
+    bgAccentSubtle = LightHcColorTokens.colorGreen200,
     bgActionPrimaryDisabled = LightHcColorTokens.colorGray700,
     bgActionPrimaryHovered = LightHcColorTokens.colorGray1200,
     bgActionPrimaryPressed = LightHcColorTokens.colorGray1100,
@@ -60,7 +61,12 @@ val compoundColorsHcLight = SemanticColors(
     bgSubtlePrimary = LightHcColorTokens.colorGray400,
     bgSubtleSecondary = LightHcColorTokens.colorGray300,
     bgSubtleSecondaryLevel0 = LightHcColorTokens.colorGray300,
+    bgSubtleTertiary = LightHcColorTokens.colorGray100,
+    bgSuccessHovered = LightHcColorTokens.colorGreen1000,
+    bgSuccessPressed = LightHcColorTokens.colorGreen1100,
+    bgSuccessRest = LightHcColorTokens.colorGreen900,
     bgSuccessSubtle = LightHcColorTokens.colorGreen200,
+    borderAccentPrimary = LightHcColorTokens.colorGreen900,
     borderAccentSubtle = LightHcColorTokens.colorGreen700,
     borderCriticalHovered = LightHcColorTokens.colorRed1000,
     borderCriticalPrimary = LightHcColorTokens.colorRed900,
@@ -71,6 +77,7 @@ val compoundColorsHcLight = SemanticColors(
     borderInteractiveHovered = LightHcColorTokens.colorGray1100,
     borderInteractivePrimary = LightHcColorTokens.colorGray800,
     borderInteractiveSecondary = LightHcColorTokens.colorGray600,
+    borderSuccessPrimary = LightHcColorTokens.colorGreen900,
     borderSuccessSubtle = LightHcColorTokens.colorGreen500,
     gradientActionStop1 = LightHcColorTokens.colorGreen500,
     gradientActionStop2 = LightHcColorTokens.colorGreen700,
@@ -101,8 +108,12 @@ val compoundColorsHcLight = SemanticColors(
     iconSuccessPrimary = LightHcColorTokens.colorGreen900,
     iconTertiary = LightHcColorTokens.colorGray800,
     iconTertiaryAlpha = LightHcColorTokens.colorAlphaGray800,
+    iconWarningPrimary = LightHcColorTokens.colorOrange900,
+    separatorPrimary = LightHcColorTokens.colorGray400,
+    separatorSecondary = LightHcColorTokens.colorGray300,
     textActionAccent = LightHcColorTokens.colorGreen900,
     textActionPrimary = LightHcColorTokens.colorGray1400,
+    textActionSuccess = LightHcColorTokens.colorGreen900,
     textBadgeAccent = LightHcColorTokens.colorGreen1100,
     textBadgeInfo = LightHcColorTokens.colorBlue1100,
     textCriticalPrimary = LightHcColorTokens.colorRed900,
@@ -119,5 +130,6 @@ val compoundColorsHcLight = SemanticColors(
     textPrimary = LightHcColorTokens.colorGray1400,
     textSecondary = LightHcColorTokens.colorGray900,
     textSuccessPrimary = LightHcColorTokens.colorGreen900,
+    textWarningPrimary = LightHcColorTokens.colorOrange900,
     isLight = true,
 )
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_collapse_all.xml b/libraries/compound/src/main/res/drawable/ic_compound_collapse_all.xml
new file mode 100644
index 0000000000..7257b7d2c3
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_collapse_all.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,16.975 l-3.9,3.9a0.95,0.95 0,0 1,-0.7 0.275,0.95 0.95,0 0,1 -0.7,-0.275 0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7l3.875,-3.875q0.575,-0.575 1.425,-0.575t1.425,0.575l3.875,3.875a0.95,0.95 0,0 1,0.275 0.7,0.95 0.95,0 0,1 -0.275,0.7 0.95,0.95 0,0 1,-0.7 0.275,0.95 0.95,0 0,1 -0.7,-0.275zM12,7.175 L15.9,3.275A0.95,0.95 0,0 1,16.6 3q0.425,0 0.7,0.275a0.95,0.95 0,0 1,0.275 0.7,0.95 0.95,0 0,1 -0.275,0.7L13.425,8.55q-0.575,0.575 -1.425,0.575t-1.425,-0.575L6.7,4.675a0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7A0.95,0.95 0,0 1,7.4 3q0.425,0 0.7,0.275z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_crop.xml b/libraries/compound/src/main/res/drawable/ic_compound_crop.xml
new file mode 100644
index 0000000000..c82f5cb686
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_crop.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,4a1,1 0,0 0,-1 1v2H3a1,1 0,1 0,0 2h2v8a3,3 0,0 0,3 3h8v2a1,1 0,0 0,2 0v-2h2a1,1 0,1 0,0 -2h-2v-8a3,3 0,0 0,-3 -3H7V5a1,1 0,0 0,-1 -1m9,5a1,1 0,0 1,1 1v8H8a1,1 0,0 1,-1 -1V9z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15.707,0.293a1,1 0,0 0,-1.414 0l-2,2a1,1 0,0 0,0 1.414l2,2a1,1 0,1 0,1.414 -1.414l-0.275,-0.276A6,6 0,0 1,21 10a1,1 0,1 0,2 0,8 8,0 0,0 -7.596,-7.99l0.303,-0.303a1,1 0,0 0,0 -1.414"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_expand_all.xml b/libraries/compound/src/main/res/drawable/ic_compound_expand_all.xml
new file mode 100644
index 0000000000..fcef02880b
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_expand_all.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,19.2 l3.9,-3.9a0.95,0.95 0,0 1,0.7 -0.275q0.425,0 0.7,0.275a0.95,0.95 0,0 1,0.275 0.7,0.95 0.95,0 0,1 -0.275,0.7l-3.875,3.875q-0.575,0.575 -1.425,0.575t-1.425,-0.575L6.7,16.7a0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7a0.95,0.95 0,0 1,0.7 -0.275q0.425,0 0.7,0.275zM12,4.95 L8.1,8.85a0.95,0.95 0,0 1,-0.7 0.275,0.95 0.95,0 0,1 -0.7,-0.275 0.95,0.95 0,0 1,-0.275 -0.7q0,-0.425 0.275,-0.7l3.875,-3.875Q11.15,3 12,3t1.425,0.575L17.3,7.45a0.95,0.95 0,0 1,0.275 0.7,0.95 0.95,0 0,1 -0.275,0.7 0.95,0.95 0,0 1,-0.7 0.275,0.95 0.95,0 0,1 -0.7,-0.275z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_flip_horizontal.xml b/libraries/compound/src/main/res/drawable/ic_compound_flip_horizontal.xml
new file mode 100644
index 0000000000..90a3a98f44
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_flip_horizontal.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2a1,1 0,0 1,1 1v18a1,1 0,1 1,-2 0L11,3a1,1 0,0 1,1 -1M2,8a1,1 0,0 1,1.6 -0.8l5.334,4a1,1 0,0 1,0 1.6l-5.334,4A1,1 0,0 1,2 16zM20.4,7.2A1,1 0,0 1,22 8v8a1,1 0,0 1,-1.6 0.8l-5.334,-4a1,1 0,0 1,0 -1.6z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_flip_vertical.xml b/libraries/compound/src/main/res/drawable/ic_compound_flip_vertical.xml
new file mode 100644
index 0000000000..430e5eb3fa
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_flip_vertical.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.2,15.066a1,1 0,0 1,1.6 0l4,5.334A1,1 0,0 1,16 22L8,22a1,1 0,0 1,-0.8 -1.6zM21,11a1,1 0,1 1,0 2L3,13a1,1 0,1 1,0 -2zM16,2a1,1 0,0 1,0.8 1.6l-4,5.334a1,1 0,0 1,-1.6 0L7.2,3.6A1,1 0,0 1,8 2z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_save.xml b/libraries/compound/src/main/res/drawable/ic_compound_save.xml
new file mode 100644
index 0000000000..3bedcc272d
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_save.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.837,17.869a4,4 0,0 1,4.326 0L18,20.336V4H6v16.336zM20,20.336c0,1.582 -1.751,2.538 -3.082,1.682l-3.836,-2.466a2,2 0,0 0,-2.164 0l-3.836,2.466 -0.126,0.076C5.643,22.814 4,21.869 4,20.336V4a2,2 0,0 1,2 -2h12a2,2 0,0 1,2 2z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_save_solid.xml b/libraries/compound/src/main/res/drawable/ic_compound_save_solid.xml
new file mode 100644
index 0000000000..5d453834c7
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_save_solid.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,2H6a2,2 0,0 0,-2 2v16.336c0,1.583 1.75,2.538 3.082,1.683l3.836,-2.467a2,2 0,0 1,2.164 0l3.836,2.467c1.331,0.855 3.082,-0.1 3.082,-1.683V4a2,2 0,0 0,-2 -2"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/main/res/drawable/ic_compound_unsave.xml b/libraries/compound/src/main/res/drawable/ic_compound_unsave.xml
new file mode 100644
index 0000000000..0dfddcfe46
--- /dev/null
+++ b/libraries/compound/src/main/res/drawable/ic_compound_unsave.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.503,2.083a1,1 0,0 1,1.414 0l17,17a1,1 0,1 1,-1.414 1.414L20,19.994v0.342c0,1.582 -1.75,2.538 -3.082,1.683l-3.836,-2.467a2,2 0,0 0,-2.164 0l-3.836,2.467 -0.126,0.075C5.643,22.814 4,21.869 4,20.336V3.994l-0.497,-0.497a1,1 0,0 1,0 -1.414M6,20.336l3.837,-2.467a4,4 0,0 1,4.326 0L18,20.336v-2.342l-12,-12z"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18,2a2,2 0,0 1,2 2v10.35l-2,-2V4H9.65l-2,-2z"
+      android:fillColor="#FF000000"/>
+</vector>
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/AvatarColorsTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/AvatarColorsTest.kt
index 01c3e787cf..895247f12f 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/AvatarColorsTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/AvatarColorsTest.kt
@@ -8,19 +8,17 @@
 
 package io.element.android.compound.screenshot
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.AvatarColorsPreviewDark
 import io.element.android.compound.theme.AvatarColorsPreviewLight
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class AvatarColorsTest {
+class AvatarColorsTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundIconTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundIconTest.kt
index 6e15233013..97926fc291 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundIconTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundIconTest.kt
@@ -11,7 +11,6 @@ package io.element.android.compound.screenshot
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.IconsCompoundPreviewDark
 import io.element.android.compound.previews.IconsCompoundPreviewLight
@@ -19,16 +18,16 @@ import io.element.android.compound.previews.IconsCompoundPreviewRtl
 import io.element.android.compound.previews.IconsPreview
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.collections.immutable.toImmutableList
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class CompoundIconTest {
+class CompoundIconTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "w1024dp-h2048dp")
     fun screenshots() {
@@ -56,7 +55,7 @@ class CompoundIconTest {
             val content: List<@Composable ColumnScope.() -> Unit> = CompoundIcons.all.map {
                 @Composable { Icon(imageVector = it, contentDescription = null) }
             }
-            ElementTheme(darkTheme = true) {
+            ElementTheme(theme = Theme.Dark) {
                 IconsPreview(
                     title = "Compound Vector Icons",
                     content = content.toImmutableList()
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundTypographyTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundTypographyTest.kt
index c4822f680e..ec27acd836 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundTypographyTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/CompoundTypographyTest.kt
@@ -8,18 +8,16 @@
 
 package io.element.android.compound.screenshot
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.CompoundTypographyPreview
 import io.element.android.compound.screenshot.utils.screenshotFile
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class CompoundTypographyTest {
+class CompoundTypographyTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "h2048dp-xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/ForcedDarkElementThemeTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/ForcedDarkElementThemeTest.kt
index 74e6f3010d..5f858b8622 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/ForcedDarkElementThemeTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/ForcedDarkElementThemeTest.kt
@@ -18,20 +18,18 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.theme.ForcedDarkElementTheme
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class ForcedDarkElementThemeTest {
+class ForcedDarkElementThemeTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/LegacyColorsTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/LegacyColorsTest.kt
index deb27c6519..c0c3d11555 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/LegacyColorsTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/LegacyColorsTest.kt
@@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.ColorPreview
 import io.element.android.compound.screenshot.utils.screenshotFile
@@ -26,14 +25,13 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.theme.LinkColor
 import io.element.android.compound.theme.SnackBarLabelColorDark
 import io.element.android.compound.theme.SnackBarLabelColorLight
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class LegacyColorsTest {
+class LegacyColorsTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialColorSchemeTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialColorSchemeTest.kt
index 282ca0e69a..2e1368ff54 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialColorSchemeTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialColorSchemeTest.kt
@@ -18,7 +18,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.ColorsSchemeDarkHcPreview
@@ -26,14 +25,13 @@ import io.element.android.compound.theme.ColorsSchemeDarkPreview
 import io.element.android.compound.theme.ColorsSchemeLightHcPreview
 import io.element.android.compound.theme.ColorsSchemeLightPreview
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class MaterialColorSchemeTest {
+class MaterialColorSchemeTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "h2048dp-xhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTextTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTextTest.kt
index 2aaeed43a5..4d21e77aed 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTextTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTextTest.kt
@@ -8,18 +8,16 @@
 
 package io.element.android.compound.screenshot
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.MaterialTextPreview
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class MaterialTextTest {
+class MaterialTextTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "w480dp-h1200dp-xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTypographyTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTypographyTest.kt
index 3d8256e2af..3c07ff48f5 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTypographyTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialTypographyTest.kt
@@ -8,18 +8,16 @@
 
 package io.element.android.compound.screenshot
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.TypographyPreview
 import io.element.android.compound.screenshot.utils.screenshotFile
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class MaterialTypographyTest {
+class MaterialTypographyTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "h2048dp-xxhdpi")
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialYouThemeTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialYouThemeTest.kt
index 2fe3167199..2f1abc55f5 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialYouThemeTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/MaterialYouThemeTest.kt
@@ -19,19 +19,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.ColorsSchemePreview
 import io.element.android.compound.screenshot.utils.screenshotFile
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class MaterialYouThemeTest {
+class MaterialYouThemeTest : RobolectricTest() {
     @Test
     @Config(sdk = [35], qualifiers = "h2048dp-xhdpi")
     fun screenshots() {
@@ -51,7 +50,7 @@ class MaterialYouThemeTest {
             }
         }
         captureRoboImage(file = screenshotFile("MaterialYou Theme - Dark.png")) {
-            ElementTheme(dynamicColor = true, darkTheme = true) {
+            ElementTheme(dynamicColor = true, theme = Theme.Dark) {
                 Surface {
                     Column(
                         modifier = Modifier.padding(16.dp),
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/SemanticColorsTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/SemanticColorsTest.kt
index f36d0d2ee5..95e34fb3d9 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/SemanticColorsTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/screenshot/SemanticColorsTest.kt
@@ -8,21 +8,19 @@
 
 package io.element.android.compound.screenshot
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.captureRoboImage
 import io.element.android.compound.previews.CompoundSemanticColorsDark
 import io.element.android.compound.previews.CompoundSemanticColorsDarkHc
 import io.element.android.compound.previews.CompoundSemanticColorsLight
 import io.element.android.compound.previews.CompoundSemanticColorsLightHc
 import io.element.android.compound.screenshot.utils.screenshotFile
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.GraphicsMode
 
-@RunWith(AndroidJUnit4::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
-class SemanticColorsTest {
+class SemanticColorsTest : RobolectricTest() {
     @Config(sdk = [35], qualifiers = "h2000dp-xhdpi")
     @Test
     fun screenshots() {
diff --git a/libraries/compound/src/test/kotlin/io/element/android/compound/theme/ThemeTest.kt b/libraries/compound/src/test/kotlin/io/element/android/compound/theme/ThemeTest.kt
index 8fd7c5f041..3f43cfea67 100644
--- a/libraries/compound/src/test/kotlin/io/element/android/compound/theme/ThemeTest.kt
+++ b/libraries/compound/src/test/kotlin/io/element/android/compound/theme/ThemeTest.kt
@@ -15,6 +15,7 @@ import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -72,4 +73,14 @@ class ThemeTest {
             assertThat(awaitItem()).isTrue()
         }
     }
+
+    @Test
+    fun `mapToTheme falls back to dark when black theme is disabled`() = runTest {
+        flowOf(Theme.Black.name)
+            .mapToTheme(allowBlackTheme = false)
+            .test {
+                assertThat(awaitItem()).isEqualTo(Theme.Dark)
+                awaitComplete()
+            }
+    }
 }
diff --git a/libraries/cryptography/api/build.gradle.kts b/libraries/cryptography/api/build.gradle.kts
index 9ce26419d8..74fc5f6ecc 100644
--- a/libraries/cryptography/api/build.gradle.kts
+++ b/libraries/cryptography/api/build.gradle.kts
@@ -13,3 +13,7 @@ plugins {
 android {
     namespace = "io.element.android.libraries.cryptography.api"
 }
+
+dependencies {
+    implementation(libs.coroutines.core)
+}
diff --git a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/SecretKeyRepository.kt b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/SecretKeyRepository.kt
index ba6c10dbe0..b210664d9f 100644
--- a/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/SecretKeyRepository.kt
+++ b/libraries/cryptography/api/src/main/kotlin/io/element/android/libraries/cryptography/api/SecretKeyRepository.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.cryptography.api
 
+import kotlinx.coroutines.flow.Flow
 import javax.crypto.SecretKey
 
 /**
@@ -15,16 +16,18 @@ import javax.crypto.SecretKey
  * Implementation should be able to store the generated key securely.
  */
 interface SecretKeyRepository {
+    fun hasKey(alias: String): Flow<Boolean>
+
     /**
      * Get or create a secret key for a given alias.
      * @param alias the alias to use
      * @param requiresUserAuthentication true if the key should be protected by user authentication
      */
-    fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey
+    suspend fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey
 
     /**
      * Delete the secret key for a given alias.
      * @param alias the alias to use
      */
-    fun deleteKey(alias: String)
+    suspend fun deleteKey(alias: String)
 }
diff --git a/libraries/cryptography/impl/build.gradle.kts b/libraries/cryptography/impl/build.gradle.kts
index 454432de6f..3a1f55126e 100644
--- a/libraries/cryptography/impl/build.gradle.kts
+++ b/libraries/cryptography/impl/build.gradle.kts
@@ -21,6 +21,7 @@ setupDependencyInjection()
 
 dependencies {
     implementation(projects.libraries.di)
+    implementation(libs.coroutines.core)
     api(projects.libraries.cryptography.api)
 
     testCommonDependencies(libs)
diff --git a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/KeyStoreSecretKeyRepository.kt b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/KeyStoreSecretKeyRepository.kt
index 46572ef047..bcd38695c4 100644
--- a/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/KeyStoreSecretKeyRepository.kt
+++ b/libraries/cryptography/impl/src/main/kotlin/io/element/android/libraries/cryptography/impl/KeyStoreSecretKeyRepository.kt
@@ -13,11 +13,16 @@ import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.cryptography.api.AESEncryptionSpecs
 import io.element.android.libraries.cryptography.api.SecretKeyRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import timber.log.Timber
 import java.security.KeyStore
 import java.security.KeyStoreException
+import java.util.concurrent.ConcurrentHashMap
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
 
@@ -25,13 +30,23 @@ import javax.crypto.SecretKey
  * Default implementation of [SecretKeyRepository] that uses the Android Keystore to store the keys.
  * The generated key uses AES algorithm, with a key size of 128 bits, and the GCM block mode.
  */
+@SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)
 class KeyStoreSecretKeyRepository(
     private val keyStore: KeyStore,
 ) : SecretKeyRepository {
+    private val hasKeyMap = ConcurrentHashMap<String, MutableStateFlow<Boolean>>()
+
+    @Suppress("RunCatchingNotAllowed")
+    override fun hasKey(alias: String): Flow<Boolean> {
+        return hasKeyMap.getOrPut(alias) {
+            MutableStateFlow(runCatching { keyStore.containsAlias(alias) }.getOrDefault(false))
+        }.asStateFlow()
+    }
+
     // False positive lint issue
     @SuppressLint("WrongConstant")
-    override fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey {
+    override suspend fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey {
         val secretKeyEntry = (keyStore.getEntry(alias, null) as? KeyStore.SecretKeyEntry)
             ?.secretKey
         return if (secretKeyEntry == null) {
@@ -46,15 +61,22 @@ class KeyStoreSecretKeyRepository(
                 .setUserAuthenticationRequired(requiresUserAuthentication)
                 .build()
             generator.init(keyGenSpec)
-            generator.generateKey()
+            generator.generateKey().also {
+                hasKeyMap.getOrPut(alias) {
+                    MutableStateFlow(true)
+                }.emit(true)
+            }
         } else {
             secretKeyEntry
         }
     }
 
-    override fun deleteKey(alias: String) {
+    override suspend fun deleteKey(alias: String) {
         try {
             keyStore.deleteEntry(alias)
+            hasKeyMap.getOrPut(alias) {
+                MutableStateFlow(false)
+            }.emit(false)
         } catch (e: KeyStoreException) {
             Timber.e(e)
         }
diff --git a/libraries/cryptography/test/build.gradle.kts b/libraries/cryptography/test/build.gradle.kts
index eaa621d53a..5cf04a9754 100644
--- a/libraries/cryptography/test/build.gradle.kts
+++ b/libraries/cryptography/test/build.gradle.kts
@@ -16,4 +16,5 @@ android {
 
 dependencies {
     api(projects.libraries.cryptography.api)
+    implementation(libs.coroutines.core)
 }
diff --git a/libraries/cryptography/test/src/main/kotlin/io/element/android/libraries/cryptography/test/SimpleSecretKeyRepository.kt b/libraries/cryptography/test/src/main/kotlin/io/element/android/libraries/cryptography/test/SimpleSecretKeyRepository.kt
index 0e301553ea..507325f45b 100644
--- a/libraries/cryptography/test/src/main/kotlin/io/element/android/libraries/cryptography/test/SimpleSecretKeyRepository.kt
+++ b/libraries/cryptography/test/src/main/kotlin/io/element/android/libraries/cryptography/test/SimpleSecretKeyRepository.kt
@@ -10,20 +10,39 @@ package io.element.android.libraries.cryptography.test
 
 import io.element.android.libraries.cryptography.api.AESEncryptionSpecs
 import io.element.android.libraries.cryptography.api.SecretKeyRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.util.concurrent.ConcurrentHashMap
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
 
 class SimpleSecretKeyRepository : SecretKeyRepository {
     private var secretKeyForAlias = HashMap<String, SecretKey>()
 
-    override fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey {
+    private val hasKeyMap = ConcurrentHashMap<String, MutableStateFlow<Boolean>>()
+
+    override fun hasKey(alias: String): Flow<Boolean> {
+        return hasKeyMap.getOrPut(alias) {
+            MutableStateFlow(false)
+        }.asStateFlow()
+    }
+
+    override suspend fun getOrCreateKey(alias: String, requiresUserAuthentication: Boolean): SecretKey {
         return secretKeyForAlias.getOrPut(alias) {
-            generateKey()
+            generateKey().also {
+                hasKeyMap.getOrPut(alias) {
+                    MutableStateFlow(true)
+                }.emit(true)
+            }
         }
     }
 
-    override fun deleteKey(alias: String) {
+    override suspend fun deleteKey(alias: String) {
         secretKeyForAlias.remove(alias)
+        hasKeyMap.getOrPut(alias) {
+            MutableStateFlow(false)
+        }.emit(false)
     }
 
     private fun generateKey(): SecretKey {
diff --git a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt
index 3cd004f8a8..07e55410d1 100644
--- a/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt
+++ b/libraries/dateformatter/impl/src/main/kotlin/io/element/android/libraries/dateformatter/impl/previews/PreviewStringProvider.kt
@@ -27,4 +27,9 @@ class PreviewStringProvider(
     override fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {
         return resources.getQuantityString(resId, quantity, *formatArgs)
     }
+
+    override fun getSimpleQuantityString(resIdForOne: Int, resIdForOthers: Int, quantity: Int, vararg formatArgs: Any?): String {
+        val resId = if (quantity == 1) resIdForOne else resIdForOthers
+        return resources.getString(resId, *formatArgs)
+    }
 }
diff --git a/libraries/dateformatter/impl/src/main/res/values-ca/translations.xml b/libraries/dateformatter/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..491793c728
--- /dev/null
+++ b/libraries/dateformatter/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="common_date_date_at_time">"%1$s a les %2$s"</string>
+  <string name="common_date_this_month">"Aquest mes"</string>
+</resources>
diff --git a/libraries/dateformatter/impl/src/main/res/values-ja/translations.xml b/libraries/dateformatter/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..d044992377
--- /dev/null
+++ b/libraries/dateformatter/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="common_date_date_at_time">"%1$s %2$s"</string>
+  <string name="common_date_this_month">"今月"</string>
+</resources>
diff --git a/libraries/dateformatter/impl/src/main/res/values-vi/translations.xml b/libraries/dateformatter/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..b846434e9e
--- /dev/null
+++ b/libraries/dateformatter/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="common_date_date_at_time">"%1$s lúc %2$s"</string>
+  <string name="common_date_this_month">"Tháng này"</string>
+</resources>
diff --git a/libraries/dateformatter/impl/src/main/res/values-zh/translations.xml b/libraries/dateformatter/impl/src/main/res/values-zh/translations.xml
index 9fab311a1d..d1ee550b73 100644
--- a/libraries/dateformatter/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/dateformatter/impl/src/main/res/values-zh/translations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="common_date_date_at_time">"%1$s在 %2$s"</string>
+  <string name="common_date_date_at_time">"于 %1$s %2$s"</string>
   <string name="common_date_this_month">"本月"</string>
 </resources>
diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt
index b4800729d5..dfea6adc46 100644
--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt
+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterFrTest.kt
@@ -9,17 +9,15 @@
 package io.element.android.libraries.dateformatter.impl
 
 import android.os.Build
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import kotlin.time.Instant
 
-@RunWith(AndroidJUnit4::class)
 @Config(qualifiers = "fr", sdk = [Build.VERSION_CODES.TIRAMISU])
-class DefaultDateFormatterFrTest {
+class DefaultDateFormatterFrTest : RobolectricTest() {
     @Test
     fun `test null`() {
         val now = "1980-04-06T18:35:24.00Z"
diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt
index 94b6fe983e..f761d833ab 100644
--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt
+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDateFormatterTest.kt
@@ -9,17 +9,15 @@
 package io.element.android.libraries.dateformatter.impl
 
 import android.os.Build
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import kotlin.time.Instant
 
-@RunWith(AndroidJUnit4::class)
 @Config(qualifiers = "en", sdk = [Build.VERSION_CODES.TIRAMISU])
-class DefaultDateFormatterTest {
+class DefaultDateFormatterTest : RobolectricTest() {
     @Test
     fun `test null`() {
         val now = "1980-04-06T18:35:24.00Z"
diff --git a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDurationFormatterTest.kt b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDurationFormatterTest.kt
index 3fee5dbb0d..6b6fbbb2c1 100644
--- a/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDurationFormatterTest.kt
+++ b/libraries/dateformatter/impl/src/test/kotlin/io/element/android/libraries/dateformatter/impl/DefaultDurationFormatterTest.kt
@@ -8,10 +8,9 @@
 package io.element.android.libraries.dateformatter.impl
 
 import android.os.Build
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 import java.util.Locale
 import kotlin.time.Duration.Companion.hours
@@ -19,9 +18,8 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-@RunWith(AndroidJUnit4::class)
 @Config(qualifiers = "en", sdk = [Build.VERSION_CODES.TIRAMISU])
-class DefaultDurationFormatterTest {
+class DefaultDurationFormatterTest : RobolectricTest() {
     private fun createDurationFormatter(): DefaultDurationFormatter {
         return DefaultDurationFormatter(
             localeChangeObserver = {},
diff --git a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParserTest.kt b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParserTest.kt
index 7f563ddd7f..a6502aabf1 100644
--- a/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParserTest.kt
+++ b/libraries/deeplink/impl/src/test/kotlin/io/element/android/libraries/deeplink/impl/DefaultDeeplinkParserTest.kt
@@ -21,12 +21,10 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.tests.testutils.assertThrowsInDebug
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultDeeplinkParserTest {
+class DefaultDeeplinkParserTest : RobolectricTest() {
     companion object {
         const val A_URI =
             "elementx://open/@alice:server.org"
diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts
index bdb9a32e89..c159659fb0 100644
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
+    implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
index a051fd4c80..3bbd3c12a7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
@@ -18,6 +18,7 @@ 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.text.TextStyle
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.unit.dp
@@ -37,13 +38,18 @@ private const val MAX_COUNT_STRING = "+$MAX_COUNT"
  * @param count The number to display. If the number is greater than [MAX_COUNT], the counter will display [MAX_COUNT_STRING].
  * If the number is less than 1, the counter will not be displayed.
  * @param modifier The modifier to apply to this layout.
+ * @param containerColor The background color of the counter. When null, uses [isCritical] to pick a default.
+ * @param contentColor The text color inside the counter. When null, uses [textOnSolidPrimary].
  * @param textStyle The style to apply to the text inside the counter.
  * @param isCritical If true, the counter will use a critical color scheme, otherwise it will use an accent color scheme.
+ * Only used when [containerColor] is null.
  */
 @Composable
 fun CounterAtom(
     count: Int,
     modifier: Modifier = Modifier,
+    containerColor: Color? = null,
+    contentColor: Color? = null,
     textStyle: TextStyle = CounterAtomDefaults.textStyle,
     isCritical: Boolean = false,
 ) {
@@ -65,7 +71,7 @@ fun CounterAtom(
             .size(squareSize.toDp() + 1.dp)
             .clip(CircleShape)
             .background(
-                if (isCritical) {
+                containerColor ?: if (isCritical) {
                     ElementTheme.colors.iconCriticalPrimary
                 } else {
                     ElementTheme.colors.iconAccentPrimary
@@ -76,7 +82,7 @@ fun CounterAtom(
             modifier = Modifier.align(Alignment.Center),
             text = countAsText,
             style = textStyle,
-            color = ElementTheme.colors.textOnSolidPrimary,
+            color = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
         )
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
index d2db3aec8e..bdf039edb8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
@@ -8,8 +8,11 @@
 
 package io.element.android.libraries.designsystem.atomic.atoms
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
@@ -29,19 +32,36 @@ import io.element.android.libraries.designsystem.theme.unreadIndicator
 fun UnreadIndicatorAtom(
     modifier: Modifier = Modifier,
     size: Dp = 12.dp,
+    count: Long? = null,
     color: Color = ElementTheme.colors.unreadIndicator,
     isVisible: Boolean = true,
     contentDescription: String? = null,
+    border: BorderStroke? = null,
 ) {
-    Box(
-        modifier = modifier
-            .semantics {
-                contentDescription?.let { this.contentDescription = it }
-            }
-            .size(size)
-            .clip(CircleShape)
-            .background(if (isVisible) color else Color.Transparent)
-    )
+    when {
+        !isVisible -> Spacer(modifier = modifier.size(size))
+        count != null && count >= 1 -> CounterAtom(
+            count = count.toInt(),
+            modifier = modifier
+                .semantics {
+                    contentDescription?.let { this.contentDescription = it }
+                }
+                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
+            containerColor = color,
+            contentColor = ElementTheme.colors.bgCanvasDefault,
+            textStyle = ElementTheme.typography.fontBodySmMedium,
+        )
+        else -> Box(
+            modifier = modifier
+                .semantics {
+                    contentDescription?.let { this.contentDescription = it }
+                }
+                .size(size)
+                .clip(CircleShape)
+                .background(color)
+                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
+        )
+    }
 }
 
 @PreviewsDayNight
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt
index 16f4a40993..26ee9927b9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/MatrixBadgeRowMolecule.kt
@@ -25,7 +25,7 @@ fun MatrixBadgeRowMolecule(
 ) {
     FlowRow(
         modifier = modifier
-            .padding(start = 16.dp, end = 16.dp, top = 8.dp),
+            .padding(start = 16.dp, end = 16.dp),
         horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/NumberedListOrganism.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/NumberedListOrganism.kt
index df841dad9b..03a5258b78 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/NumberedListOrganism.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/NumberedListOrganism.kt
@@ -9,8 +9,7 @@
 package io.element.android.libraries.designsystem.atomic.organisms
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.AnnotatedString
@@ -23,11 +22,11 @@ fun NumberedListOrganism(
     items: ImmutableList<AnnotatedString>,
     modifier: Modifier = Modifier,
 ) {
-    LazyColumn(
+    Column(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(24.dp),
     ) {
-        itemsIndexed(items) { index, item ->
+        for ((index, item) in items.withIndex()) {
             NumberedListMolecule(index = index + 1, text = item)
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
index b62f634ece..a29e1b743c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
@@ -71,7 +71,7 @@ fun FlowStepPage(
         },
         header = {
             IconTitleSubtitleMolecule(
-                modifier = Modifier.padding(bottom = 16.dp),
+                modifier = Modifier.padding(bottom = 16.dp, start = 8.dp, end = 8.dp),
                 title = title,
                 subTitle = subTitle,
                 iconStyle = iconStyle,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterLayout.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterLayout.kt
new file mode 100644
index 0000000000..af707ec251
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterLayout.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.atomic.pages
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.unit.Constraints
+import kotlin.math.max
+
+/**
+ * A layout with a [header], a [footer] and a [content] composables.
+ * The component can be scrollable or not, which will modify which layout is used internally to arrange the UI.
+ * In both cases, the [content] will use all the available space between the [header] and the [footer].
+ * The [footer] is always visible, the [header] and the [content] can be scrolled if [isScrollable] is true.
+ *
+ * @param header the header composable.
+ * @param footer the footer composable.
+ * @param isScrollable if the content should be scrollable.
+ * @param contentInsetsPadding padding values to apply to the content. This is useful to handle system insets.
+ * @param modifier Compose modifier.
+ * @param content the main content composable.
+ */
+@Suppress("ContentSlotReused")
+@Composable
+fun HeaderFooterLayout(
+    header: @Composable () -> Unit,
+    footer: @Composable () -> Unit,
+    isScrollable: Boolean,
+    contentInsetsPadding: PaddingValues,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit,
+) {
+    Column(modifier = modifier) {
+        if (isScrollable) {
+            // This is a hack to make the content at least 1px high, otherwise the layout will crash
+            var newHeight by remember { mutableIntStateOf(1) }
+            Box(
+                modifier = Modifier
+                    .padding(contentInsetsPadding)
+                    .weight(1f, fill = true)
+                    .onSizeChanged {
+                        newHeight = it.height
+                    }
+            ) {
+                Layout(
+                    content = {
+                        header()
+                        content()
+                    },
+                    modifier = Modifier.verticalScroll(rememberScrollState()),
+                    measurePolicy = { measurables, constraints ->
+                        val actualConstraints = constraints.copy(minWidth = 0, minHeight = 0, maxHeight = newHeight)
+                        val headerPlaceable = measurables.firstOrNull()?.measure(actualConstraints)
+
+                        val contentPlaceable = if (headerPlaceable != null && measurables.size > 1) {
+                            val availableContentHeight = max(1, actualConstraints.maxHeight - headerPlaceable.height)
+                            val contentConstraints = actualConstraints.copy(minHeight = availableContentHeight, maxHeight = Constraints.Infinity)
+                            measurables[1].measure(contentConstraints)
+                        } else {
+                            null
+                        }
+
+                        val headerHeight = headerPlaceable?.height ?: 0
+                        val contentHeight = contentPlaceable?.height ?: 0
+                        layout(actualConstraints.maxWidth, headerHeight + contentHeight) {
+                            var yPosition = 0
+
+                            headerPlaceable?.let {
+                                it.placeRelative(0, yPosition)
+                                yPosition += it.height
+                            }
+
+                            contentPlaceable?.placeRelative(0, yPosition)
+                        }
+                    }
+                )
+            }
+        } else {
+            Box(Modifier.padding(contentInsetsPadding)) {
+                header()
+            }
+            Box(Modifier.weight(1f, fill = true)) {
+                content()
+            }
+        }
+
+        footer()
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt
index f09dc895e9..5ca601baae 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt
@@ -9,19 +9,14 @@
 package io.element.android.libraries.designsystem.atomic.pages
 
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -82,48 +77,27 @@ fun HeaderFooterPage(
         Box {
             background()
 
-            // Render in a Column
-            Column(
+            HeaderFooterLayout(
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(paddingValues = contentPadding)
                     .consumeWindowInsets(insetsPadding)
                     .imePadding(),
-            ) {
-                // Content
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .run {
-                            if (isScrollable) {
-                                verticalScroll(rememberScrollState())
-                                    // Make sure the scrollable content takes the full available height
-                                    .height(IntrinsicSize.Max)
-                            } else {
-                                Modifier
-                            }
-                        }
-                        // Apply insets here so if the content is scrollable it can get below the top app bar if needed
-                        .padding(contentInsetsPadding)
-                        .weight(1f, fill = true),
-                ) {
-                    // Header
-                    header()
-                    Box {
-                        content()
+                isScrollable = isScrollable,
+                contentInsetsPadding = contentInsetsPadding,
+                header = header,
+                content = content,
+                footer = {
+                    Box(
+                        modifier = Modifier
+                            .padding(start = 16.dp, end = 16.dp, top = 16.dp)
+                            .fillMaxWidth()
+                            .padding(footerInsetsPadding)
+                    ) {
+                        footer()
                     }
-                }
-
-                // Footer
-                Box(
-                    modifier = Modifier
-                        .padding(start = 16.dp, end = 16.dp, top = 16.dp)
-                        .fillMaxWidth()
-                        .padding(footerInsetsPadding)
-                ) {
-                    footer()
-                }
-            }
+                },
+            )
         }
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/SunsetPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/SunsetPage.kt
index c2ee9800db..0ff1533ea0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/SunsetPage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/SunsetPage.kt
@@ -31,6 +31,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.annotations.CoreColorToken
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.compound.tokens.generated.internal.DarkColorTokens
 import io.element.android.compound.tokens.generated.internal.LightColorTokens
 import io.element.android.libraries.designsystem.R
@@ -50,7 +51,7 @@ fun SunsetPage(
 ) {
     ElementTheme(
         // Always use the opposite value of the current theme
-        darkTheme = ElementTheme.isLightTheme,
+        theme = if (ElementTheme.isLightTheme) Theme.Dark else Theme.Light,
         applySystemBarsUpdate = false,
     ) {
         Box(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Announcement.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Announcement.kt
index dcd3f8fa21..037c37e3a8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Announcement.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Announcement.kt
@@ -24,6 +24,8 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -148,7 +150,11 @@ private fun TitleAndDescription(
                 text = title,
                 style = ElementTheme.typography.fontBodyLgMedium,
                 color = titleColor,
-                modifier = Modifier.weight(1f),
+                modifier = Modifier
+                    .weight(1f)
+                    .semantics {
+                        heading()
+                    },
             )
             if (trailingContent != null) {
                 Spacer(Modifier.width(12.dp))
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/EqualWidthColumn.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/EqualWidthColumn.kt
index 14fd284067..576ab07532 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/EqualWidthColumn.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/EqualWidthColumn.kt
@@ -29,21 +29,32 @@ fun EqualWidthColumn(
 ) {
     SubcomposeLayout(modifier = modifier) { constraints ->
         val measurables = subcompose(0, content).map { it.measure(constraints) }
-        val maxWidth = measurables.maxOf { it.width }
-        val newConstraints = constraints.copy(minWidth = maxWidth)
-        val newMeasurables = if (measurables.all { it.width == maxWidth }) {
-            // Skip re-measuring if all children have the same width
-            measurables
+        if (measurables.isEmpty()) {
+            // No children, so just return a layout with 0 width and height
+            layout(0, 0) {}
+        } else if (measurables.size == 1) {
+            // No need to re-measure if there's only one child
+            val measurable = measurables.first()
+            layout(measurable.width, measurable.height) {
+                measurable.placeRelative(0, 0)
+            }
         } else {
-            // Re-measure with the largest width as the minWidth to have all children constrained to the same width
-            subcompose(1, content).map { it.measure(newConstraints) }
-        }
-        val totalHeight = (newMeasurables.sumOf { it.height } + spacing.toPx() * (newMeasurables.size - 1)).roundToInt()
-        layout(maxWidth, totalHeight) {
-            var yPosition = 0
-            newMeasurables.forEach { measurable ->
-                measurable.placeRelative(0, yPosition)
-                yPosition += measurable.height + spacing.roundToPx()
+            val maxWidth = measurables.maxOf { it.width }
+            val newConstraints = constraints.copy(minWidth = maxWidth)
+            val newMeasurables = if (measurables.all { it.width == maxWidth }) {
+                // Skip re-measuring if all children have the same width
+                measurables
+            } else {
+                // Re-measure with the largest width as the minWidth to have all children constrained to the same width
+                subcompose(1, content).map { it.measure(newConstraints) }
+            }
+            val totalHeight = (newMeasurables.sumOf { it.height } + spacing.toPx() * (newMeasurables.size - 1)).roundToInt()
+            layout(maxWidth, totalHeight) {
+                var yPosition = 0
+                newMeasurables.forEach { measurable ->
+                    measurable.placeRelative(0, yPosition)
+                    yPosition += measurable.height + spacing.roundToPx()
+                }
             }
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayout.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayout.kt
index 85307823f6..f70ed3b344 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayout.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ExpandableBottomSheetLayout.kt
@@ -16,7 +16,10 @@ import android.widget.EditText
 import androidx.appcompat.app.ActionBar.LayoutParams
 import androidx.compose.animation.core.Animatable
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectVerticalDragGestures
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.awaitVerticalPointerSlopOrCancellation
+import androidx.compose.foundation.gestures.verticalDrag
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
@@ -41,10 +44,14 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.input.pointer.PointerInputChange
+import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.positionChange
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
@@ -94,7 +101,7 @@ fun ExpandableBottomSheetLayout(
                 .run {
                     if (isSwipeGestureEnabled) {
                         pointerInput(maxBottomSheetContentHeight) {
-                            detectVerticalDragGestures(
+                            customDetectVerticalDragGestures(
                                 onVerticalDrag = { _, dragAmount ->
                                     val calculatedHeight = max(minBottomContentHeightPx, currentBottomContentHeightPx - dragAmount.roundToInt())
                                     val newHeight = min(calculatedMaxBottomContentHeightPx, calculatedHeight)
@@ -120,7 +127,11 @@ fun ExpandableBottomSheetLayout(
 
                                         animatable.animateTo(destination)
                                     }
-                                }
+                                },
+                                canScroll = {
+                                    // We only consider we can scroll in the contents if the min size matches the max size so it's maximized
+                                    minBottomContentHeightPx == calculatedMaxBottomContentHeightPx
+                                },
                             )
                         }
                     } else {
@@ -189,6 +200,45 @@ fun ExpandableBottomSheetLayout(
     )
 }
 
+// The original detectVerticalDragGestures doesn't allow us to conditionally consume the initial slop event that triggers the drag,
+// which is necessary in our case to allow inner scrollables to work when the sheet is not fully expanded, so we need to re-implement it here
+private suspend fun PointerInputScope.customDetectVerticalDragGestures(
+    onDragStart: (Offset) -> Unit = {},
+    onDragEnd: () -> Unit = {},
+    onDragCancel: () -> Unit = {},
+    canScroll: () -> Boolean = { false },
+    onVerticalDrag: (change: PointerInputChange, dragAmount: Float) -> Unit,
+) {
+    awaitEachGesture {
+        val down = awaitFirstDown(requireUnconsumed = false)
+        var overSlop = 0f
+        val drag =
+            awaitVerticalPointerSlopOrCancellation(down.id, down.type) { change, over ->
+                // Consuming this event is what triggers the dragging instead of the inner content scrolling
+                // We should only consume it if we can't scroll in the inner content so we drag the bottom sheet instead, otherwise we let it pass through
+                // This is the only change compared to the original detectVerticalDragGestures implementation
+                if (!canScroll()) {
+                    change.consume()
+                }
+                overSlop = over
+            }
+        if (drag != null) {
+            onDragStart.invoke(drag.position)
+            onVerticalDrag.invoke(drag, overSlop)
+            if (
+                verticalDrag(drag.id) {
+                    onVerticalDrag(it, it.positionChange().y)
+                    it.consume()
+                }
+            ) {
+                onDragEnd()
+            } else {
+                onDragCancel()
+            }
+        }
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 @Suppress("UnusedPrivateMember")
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LocationPin.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LocationPin.kt
index af8e29d518..4940f2f965 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LocationPin.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/LocationPin.kt
@@ -32,9 +32,13 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.createBitmap
+import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.withSave
 import coil3.Image
 import coil3.ImageLoader
@@ -50,6 +54,8 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 
 private val PIN_WIDTH = 42.dp
 private val PIN_HEIGHT = PIN_WIDTH * 1.2f
@@ -99,21 +105,33 @@ fun LocationPin(
 fun rememberLocationPinBitmap(variant: PinVariant): ImageBitmap? {
     val context = LocalContext.current
     val density = LocalDensity.current
-    val imageLoader = SingletonImageLoader.get(context)
     val colors = pinColors(variant)
     val cacheKey = rememberCacheKey(variant)
-    return produceState<ImageBitmap?>(initialValue = null, cacheKey) {
-        val memoryCacheKey = MemoryCache.Key(cacheKey)
-        val cached = imageLoader.memoryCache?.get(memoryCacheKey)
-        if (cached != null) {
-            value = cached.image.toBitmap().asImageBitmap()
-        } else {
-            val dimensions = PinDimensions(density)
-            val bitmap = LocationPinRenderer.renderPin(variant, colors, dimensions, context, imageLoader)
-            imageLoader.memoryCache?.set(memoryCacheKey, MemoryCache.Value(bitmap.asImage()))
-            value = bitmap.asImageBitmap()
-        }
-    }.value
+    val resources = LocalResources.current
+
+    return if (LocalInspectionMode.current) {
+        // In preview mode, skip async loading and return a simple placeholder image instead to avoid using ImageLoader
+        val dimensions = PinDimensions(density)
+        val avatarImage = ResourcesCompat.getDrawable(resources, CommonDrawables.sample_avatar, context.theme)?.toBitmap()?.asImage()
+        LocationPinRenderer.renderPin(variant, colors, dimensions, avatarImage).asImageBitmap()
+    } else {
+        produceState<ImageBitmap?>(initialValue = null, cacheKey) {
+            val imageLoader = SingletonImageLoader.get(context)
+            val memoryCacheKey = MemoryCache.Key(cacheKey)
+            val cached = imageLoader.memoryCache?.get(memoryCacheKey)
+            if (cached != null) {
+                value = cached.image.toBitmap().asImageBitmap()
+            } else {
+                val dimensions = PinDimensions(density)
+                val bitmap = with(LocationPinRenderer) {
+                    val avatarImage = loadAvatarImage(variant, context, imageLoader)
+                    renderPin(variant, colors, dimensions, avatarImage)
+                }
+                imageLoader.memoryCache?.set(memoryCacheKey, MemoryCache.Value(bitmap.asImage()))
+                value = bitmap.asImageBitmap()
+            }
+        }.value
+    }
 }
 
 @Composable
@@ -208,19 +226,17 @@ private object LocationPinRenderer {
     /**
      * Renders a pin variant to bitmap. Suspending for async avatar loading.
      */
-    suspend fun renderPin(
+    fun renderPin(
         variant: PinVariant,
         colors: PinColors,
         dimensions: PinDimensions,
-        context: Context,
-        imageLoader: ImageLoader,
+        avatarImage: Image?,
     ): Bitmap {
         val bitmap = createBitmap(dimensions.pinWidth.toInt(), dimensions.pinHeight.toInt())
         val canvas = Canvas(bitmap)
         canvas.drawPinShape(colors.fill, colors.stroke, dimensions)
         when (variant) {
             is PinVariant.UserLocation -> {
-                val avatarImage = loadAvatarImage(variant.avatarData, context, imageLoader)
                 canvas.drawAvatar(
                     avatarImage = avatarImage,
                     avatarData = variant.avatarData,
@@ -284,11 +300,15 @@ private object LocationPinRenderer {
         return path
     }
 
-    private suspend fun loadAvatarImage(
-        avatarData: AvatarData,
+    suspend fun loadAvatarImage(
+        variant: PinVariant,
         context: Context,
         imageLoader: ImageLoader,
     ): Image? {
+        val avatarData = when (variant) {
+            is PinVariant.UserLocation -> variant.avatarData
+            else -> return null
+        }
         val request = ImageRequest.Builder(context)
             .data(avatarData)
             // Disable hardware rendering for Canvas
@@ -376,7 +396,7 @@ private object LocationPinRenderer {
 internal fun LocationPinPreview() = ElementPreview {
     val sampleAvatarData = AvatarData(
         id = "@alice:matrix.org",
-        name = "Alice",
+        name = USER_NAME_ALICE,
         url = null,
         size = AvatarSize.SelectedUser
     )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/SimpleModalBottomSheet.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/SimpleModalBottomSheet.kt
index 34d119508a..284d583de8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/SimpleModalBottomSheet.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/SimpleModalBottomSheet.kt
@@ -14,8 +14,11 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
@@ -37,12 +40,17 @@ fun SimpleModalBottomSheet(
     ModalBottomSheet(
         onDismissRequest = onDismiss,
         modifier = modifier,
-        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+        sheetState = rememberBottomSheetState(
+            initialValue = SheetValue.Hidden,
+            enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+        ),
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(16.dp),
+                .padding(16.dp)
+                .verticalScroll(rememberScrollState()),
         ) {
             Text(
                 title,
@@ -57,7 +65,7 @@ fun SimpleModalBottomSheet(
 
 @PreviewsDayNight
 @Composable
-internal fun SimpleModalBottomSheetPreview() = ElementPreview {
+internal fun SimpleModalBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
     SimpleModalBottomSheet(title = "A title", onDismiss = {}) {
         Text(
             text = LoremIpsum(20).values.first(),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataProvider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataProvider.kt
index 870ffe44a9..53ef5593ed 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataProvider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarDataProvider.kt
@@ -8,10 +8,12 @@
 
 package io.element.android.libraries.designsystem.components.avatar
 
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+
 fun anAvatarData(
-    // Let's the id not start with a 'a'.
+    // Let the id not start with a 'a'.
     id: String = "@id_of_alice:server.org",
-    name: String? = "Alice",
+    name: String? = USER_NAME_ALICE,
     url: String? = null,
     size: AvatarSize = AvatarSize.RoomListItem,
 ) = AvatarData(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
index 53d5a7c281..eb27780073 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarSize.kt
@@ -13,16 +13,18 @@ import androidx.compose.ui.unit.dp
 
 enum class AvatarSize(val dp: Dp) {
     CurrentUserTopBar(32.dp),
+    CurrentRoomTopBar(32.dp),
 
     IncomingCall(140.dp),
     RoomDetailsHeader(96.dp),
     RoomListItem(52.dp),
+    ThreadsListItem(52.dp),
 
     SpaceListItem(52.dp),
 
     RoomSelectRoomListItem(36.dp),
 
-    UserPreference(56.dp),
+    UserPreference(52.dp),
 
     UserHeader(96.dp),
     UserListItem(36.dp),
@@ -63,7 +65,7 @@ enum class AvatarSize(val dp: Dp) {
     KnockRequestItem(52.dp),
     KnockRequestBanner(32.dp),
 
-    MediaSender(32.dp),
+    MediaSender(52.dp),
 
     DmCreationConfirmation(64.dp),
 
@@ -77,5 +79,6 @@ enum class AvatarSize(val dp: Dp) {
     LeaveSpaceRoom(32.dp),
     SelectParentSpace(32.dp),
     AccountItem(32.dp),
-    LocationPin(32.dp)
+    LocationPin(32.dp),
+    ActiveCallItem(20.dp)
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/BitmapAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/BitmapAvatar.kt
new file mode 100644
index 0000000000..f25174b7b0
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/BitmapAvatar.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.components.avatar
+
+import android.graphics.Bitmap
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import coil3.compose.AsyncImagePainter
+import coil3.compose.SubcomposeAsyncImage
+import coil3.compose.SubcomposeAsyncImageContent
+import io.element.android.libraries.designsystem.components.avatar.internal.InitialLetterAvatar
+import timber.log.Timber
+
+// For user avatar only.
+@Composable
+fun BitmapAvatar(
+    avatarData: AvatarData,
+    bitmap: Bitmap?,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    val avatarShape = AvatarType.User.avatarShape()
+    when {
+        bitmap == null -> InitialLetterAvatar(
+            avatarData = avatarData,
+            avatarShape = avatarShape,
+            forcedAvatarSize = null,
+            modifier = modifier,
+            contentDescription = contentDescription,
+        )
+        else -> {
+            val size = avatarData.size.dp
+            SubcomposeAsyncImage(
+                model = bitmap,
+                contentDescription = contentDescription,
+                contentScale = ContentScale.Crop,
+                modifier = modifier
+                    .size(size)
+                    .clip(avatarShape)
+            ) {
+                val collectedState by painter.state.collectAsState()
+                when (val state = collectedState) {
+                    is AsyncImagePainter.State.Success -> SubcomposeAsyncImageContent()
+                    is AsyncImagePainter.State.Error -> {
+                        SideEffect {
+                            Timber.e(
+                                state.result.throwable,
+                                "Error loading avatar $state\n${state.result}"
+                            )
+                        }
+                        InitialLetterAvatar(
+                            avatarData = avatarData,
+                            avatarShape = avatarShape,
+                            forcedAvatarSize = null,
+                            contentDescription = contentDescription,
+                        )
+                    }
+                    else -> InitialLetterAvatar(
+                        avatarData = avatarData,
+                        avatarShape = avatarShape,
+                        forcedAvatarSize = null,
+                        contentDescription = contentDescription,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt
deleted file mode 100644
index c5b870507b..0000000000
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/DmAvatars.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.designsystem.components.avatar
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.BlendMode
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.CompositingStrategy
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.LayoutDirection
-import io.element.android.libraries.designsystem.preview.ElementThemedPreview
-import io.element.android.libraries.designsystem.preview.PreviewGroup
-import io.element.android.libraries.designsystem.text.toPx
-import io.element.android.libraries.testtags.TestTags
-import io.element.android.libraries.testtags.testTag
-import io.element.android.libraries.ui.strings.CommonStrings
-
-/** Ratio between the box size (120 on Figma) and the avatar size (75 on Figma). */
-private const val SIZE_RATIO = 1.6f
-
-/**
- * https://www.figma.com/design/A2pAEvTEpJZBiOPUlcMnKi/Settings-%2B-Room-Details-(new)?node-id=1787-56333
- */
-@Composable
-fun DmAvatars(
-    userAvatarData: AvatarData,
-    otherUserAvatarData: AvatarData,
-    openAvatarPreview: (url: String) -> Unit,
-    openOtherAvatarPreview: (url: String) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val boxSize = userAvatarData.size.dp * SIZE_RATIO
-    val boxSizePx = boxSize.toPx()
-    val otherAvatarRadius = otherUserAvatarData.size.dp.toPx() / 2
-    val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-    Box(
-        modifier = modifier.size(boxSize),
-    ) {
-        // Draw user avatar and cut top end corner
-        Avatar(
-            avatarData = userAvatarData,
-            avatarType = AvatarType.User,
-            contentDescription = stringResource(CommonStrings.a11y_your_avatar),
-            modifier = Modifier
-                .align(Alignment.BottomStart)
-                .graphicsLayer {
-                    compositingStrategy = CompositingStrategy.Offscreen
-                }
-                .drawWithContent {
-                    drawContent()
-                    val xOffset = if (isRtl) {
-                        size.width - boxSizePx + otherAvatarRadius
-                    } else {
-                        boxSizePx - otherAvatarRadius
-                    }
-                    drawCircle(
-                        color = Color.Black,
-                        center = Offset(
-                            x = xOffset,
-                            y = size.height - (boxSizePx - otherAvatarRadius),
-                        ),
-                        radius = otherAvatarRadius / 0.9f,
-                        blendMode = BlendMode.Clear,
-                    )
-                }
-                .clip(CircleShape)
-                .clickable(
-                    enabled = userAvatarData.url != null,
-                    onClickLabel = stringResource(CommonStrings.action_view),
-                ) {
-                    userAvatarData.url?.let { openAvatarPreview(it) }
-                }
-        )
-        // Draw other user avatar
-        Avatar(
-            avatarData = otherUserAvatarData,
-            avatarType = AvatarType.User,
-            contentDescription = stringResource(CommonStrings.a11y_other_user_avatar),
-            modifier = Modifier
-                .align(Alignment.TopEnd)
-                .clip(CircleShape)
-                .clickable(
-                    enabled = otherUserAvatarData.url != null,
-                    onClickLabel = stringResource(CommonStrings.action_view),
-                ) {
-                    otherUserAvatarData.url?.let { openOtherAvatarPreview(it) }
-                }
-                .testTag(TestTags.memberDetailAvatar)
-        )
-    }
-}
-
-@Preview(group = PreviewGroup.Avatars)
-@Composable
-internal fun DmAvatarsPreview() = ElementThemedPreview {
-    val size = AvatarSize.DmCluster
-    DmAvatars(
-        userAvatarData = anAvatarData(
-            id = "Alice",
-            name = "Alice",
-            size = size,
-        ),
-        otherUserAvatarData = anAvatarData(
-            id = "Bob",
-            name = "Bob",
-            size = size,
-        ),
-        openAvatarPreview = {},
-        openOtherAvatarPreview = {},
-    )
-}
-
-@Preview(group = PreviewGroup.Avatars)
-@Composable
-internal fun DmAvatarsRtlPreview() {
-    CompositionLocalProvider(
-        LocalLayoutDirection provides LayoutDirection.Rtl,
-    ) {
-        DmAvatarsPreview()
-    }
-}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/AvatarListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/AvatarListItem.kt
index c6a85e9b85..c8f8b02b0f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/AvatarListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/AvatarListItem.kt
@@ -45,7 +45,7 @@ fun AvatarListItem(
 ) {
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(headline) },
+        content = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
         leadingContent = ListItemContent.Custom { _ ->
             Avatar(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
index 4775b91720..701e1b7eaf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
@@ -28,7 +28,7 @@ fun CheckboxListItem(
 ) {
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(headline) },
+        content = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
         leadingContent = ListItemContent.Checkbox(
             checked = checked,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
index f314f17008..cdd0811aec 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
@@ -68,7 +68,7 @@ fun MultipleSelectionListItem(
 
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(text = headline) },
+        content = { Text(text = headline) },
         supportingContent = decoratedSupportedText,
         leadingContent = leadingContent,
         trailingContent = trailingContent,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
index 70fb91e2e6..dc690294eb 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
@@ -28,7 +28,7 @@ fun RadioButtonListItem(
 ) {
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(headline) },
+        content = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
         leadingContent = ListItemContent.RadioButton(
             selected = selected,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
index e07cda5e77..d9ce794938 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
@@ -67,7 +67,7 @@ fun SingleSelectionListItem(
 
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(text = headline) },
+        content = { Text(text = headline) },
         supportingContent = decoratedSupportedText,
         leadingContent = leadingContent,
         trailingContent = trailingContent,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
index c5016bc5bc..f99b971b26 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
@@ -27,7 +27,7 @@ fun SwitchListItem(
 ) {
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(headline) },
+        content = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
         leadingContent = leadingContent,
         trailingContent = ListItemContent.Switch(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
index 6b4a8e1e0c..ff93bc9fa4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
@@ -45,7 +45,7 @@ fun PreferenceCheckbox(
             iconResourceId = iconResourceId,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
-        headlineContent = {
+        content = {
             Text(
                 style = ElementTheme.typography.fontBodyLgRegular,
                 text = title,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt
index 5fcbcab475..1072dd41d5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt
@@ -66,7 +66,7 @@ fun <T : DropdownOption> PreferenceDropdown(
             iconResourceId = iconResourceId,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
-        headlineContent = {
+        content = {
             Text(
                 style = ElementTheme.typography.fontBodyLgRegular,
                 modifier = Modifier.fillMaxWidth(),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
index 24477b4339..61dff418b1 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
@@ -10,13 +10,11 @@ package io.element.android.libraries.designsystem.components.preferences
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.plus
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -34,6 +32,8 @@ import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 
 @Composable
 fun PreferencePage(
@@ -46,9 +46,8 @@ fun PreferencePage(
     Scaffold(
         modifier = modifier
             .fillMaxSize()
-            .systemBarsPadding()
             .imePadding(),
-        contentWindowInsets = WindowInsets.statusBars,
+        contentWindowInsets = scaffoldScrollableContentInsets,
         topBar = {
             PreferenceTopAppBar(
                 title = title,
@@ -56,12 +55,12 @@ fun PreferencePage(
             )
         },
         snackbarHost = snackbarHost,
-        content = {
+        content = { contentPadding ->
             Column(
                 modifier = Modifier
-                    .padding(it)
-                    .consumeWindowInsets(it)
                     .verticalScroll(state = rememberScrollState())
+                    .padding(contentPadding + lazyColumnContentPadding)
+                    .consumeWindowInsets(contentPadding + lazyColumnContentPadding)
             ) {
                 content()
             }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceRow.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceRow.kt
index efc36544b9..9762ca6c18 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceRow.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceRow.kt
@@ -30,7 +30,7 @@ fun PreferenceRow(
 ) {
     ListItem(
         modifier = modifier,
-        headlineContent = {
+        content = {
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 verticalAlignment = Alignment.CenterVertically,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt
index 671eb5bf3f..5ff97ef37f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSlide.kt
@@ -46,7 +46,7 @@ fun PreferenceSlide(
             iconResourceId = iconResourceId,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
-        headlineContent = {
+        content = {
             Column {
                 Text(
                     style = ElementTheme.typography.fontBodyLgRegular,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt
index 4545dbdf3e..bf4b76ba81 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceSwitch.kt
@@ -44,7 +44,7 @@ fun PreferenceSwitch(
             iconResourceId = iconResourceId,
             showIconAreaIfNoIcon = showIconAreaIfNoIcon,
         ),
-        headlineContent = {
+        content = {
             Text(
                 style = ElementTheme.typography.fontBodyLgRegular,
                 text = title,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
index c67b4c857f..ad65ac4d8c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
@@ -42,7 +42,7 @@ fun PreferenceTextField(
 
     ListItem(
         modifier = modifier,
-        headlineContent = { Text(headline) },
+        content = { Text(headline) },
         supportingContent = valueToDisplay?.let { @Composable { Text(it) } },
         trailingContent = trailingContent,
         style = style,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualList.kt
similarity index 71%
rename from libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt
rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualList.kt
index f52ee2512f..0b5e63dcbe 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualList.kt
@@ -6,25 +6,19 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.designsystem.atomic.organisms
+package io.element.android.libraries.designsystem.components.visuallist
 
-import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.size
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.designsystem.atomic.molecules.InfoListItemMolecule
-import io.element.android.libraries.designsystem.atomic.molecules.InfoListItemPosition
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
@@ -32,14 +26,17 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
+/**
+ * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2001-140
+ */
 @Composable
-fun InfoListOrganism(
-    items: ImmutableList<InfoListItem>,
+fun VisualList(
+    items: ImmutableList<VisualListItemData>,
     modifier: Modifier = Modifier,
     backgroundColor: Color = ElementTheme.colors.bgSubtleSecondary,
-    iconTint: Color = LocalContentColor.current,
+    iconTint: Color = ElementTheme.colors.iconSecondary,
     iconSize: Dp = 20.dp,
-    textStyle: TextStyle = LocalTextStyle.current,
+    textStyle: TextStyle = ElementTheme.typography.fontBodyMdMedium,
     textColor: Color = ElementTheme.colors.textPrimary,
     verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(4.dp),
 ) {
@@ -49,12 +46,12 @@ fun InfoListOrganism(
     ) {
         for ((index, item) in items.withIndex()) {
             val position = when {
-                items.size == 1 -> InfoListItemPosition.Single
-                index == 0 -> InfoListItemPosition.Top
-                index == items.size - 1 -> InfoListItemPosition.Bottom
-                else -> InfoListItemPosition.Middle
+                items.size == 1 -> VisualListItemPosition.Single
+                index == 0 -> VisualListItemPosition.Top
+                index == items.size - 1 -> VisualListItemPosition.Bottom
+                else -> VisualListItemPosition.Middle
             }
-            InfoListItemMolecule(
+            VisualListItem(
                 message = {
                     if (item.message is AnnotatedString) {
                         Text(
@@ -96,22 +93,15 @@ fun InfoListOrganism(
     }
 }
 
-data class InfoListItem(
-    val message: CharSequence,
-    @DrawableRes val iconId: Int? = null,
-    val iconVector: ImageVector? = null,
-    val iconComposable: @Composable () -> Unit = {},
-)
-
 @PreviewsDayNight
 @Composable
-internal fun InfoListOrganismPreview() = ElementPreview {
+internal fun VisualListPreview() = ElementPreview {
     val items = persistentListOf(
-        InfoListItem(message = "A top item"),
-        InfoListItem(message = "A middle item"),
-        InfoListItem(message = "A bottom item"),
+        VisualListItemData(message = "A top item"),
+        VisualListItemData(message = "A middle item"),
+        VisualListItemData(message = "A bottom item"),
     )
-    InfoListOrganism(
+    VisualList(
         items = items,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItem.kt
similarity index 74%
rename from libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt
rename to libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItem.kt
index 46d8029c89..276fb1522e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItem.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.designsystem.atomic.molecules
+package io.element.android.libraries.designsystem.components.visuallist
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -27,10 +27,13 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 
+/**
+ * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2001-159
+ */
 @Composable
-fun InfoListItemMolecule(
+fun VisualListItem(
     message: @Composable () -> Unit,
-    position: InfoListItemPosition,
+    position: VisualListItemPosition,
     backgroundColor: Color,
     modifier: Modifier = Modifier,
     icon: @Composable () -> Unit = {},
@@ -38,10 +41,10 @@ fun InfoListItemMolecule(
     val radius = 14.dp
     val backgroundShape = remember(position) {
         when (position) {
-            InfoListItemPosition.Single -> RoundedCornerShape(radius)
-            InfoListItemPosition.Top -> RoundedCornerShape(topStart = radius, topEnd = radius)
-            InfoListItemPosition.Middle -> RoundedCornerShape(0.dp)
-            InfoListItemPosition.Bottom -> RoundedCornerShape(bottomStart = radius, bottomEnd = radius)
+            VisualListItemPosition.Single -> RoundedCornerShape(radius)
+            VisualListItemPosition.Top -> RoundedCornerShape(topStart = radius, topEnd = radius)
+            VisualListItemPosition.Middle -> RoundedCornerShape(0.dp)
+            VisualListItemPosition.Bottom -> RoundedCornerShape(bottomStart = radius, bottomEnd = radius)
         }
     }
     Row(
@@ -61,42 +64,42 @@ fun InfoListItemMolecule(
 
 @PreviewsDayNight
 @Composable
-internal fun InfoListItemMoleculePreview() {
+internal fun VisualListItemPreview() {
     ElementPreview {
         val color = ElementTheme.colors.bgSubtleSecondary
         Column(
             modifier = Modifier.padding(10.dp),
             verticalArrangement = Arrangement.spacedBy(8.dp),
         ) {
-            InfoListItemMolecule(
+            VisualListItem(
                 message = { Text("A single item") },
                 icon = { Icon(imageVector = CompoundIcons.InfoSolid(), contentDescription = null) },
-                position = InfoListItemPosition.Single,
+                position = VisualListItemPosition.Single,
                 backgroundColor = color,
             )
-            InfoListItemMolecule(
+            VisualListItem(
                 message = { Text("A top item") },
                 icon = { Icon(imageVector = CompoundIcons.InfoSolid(), contentDescription = null) },
-                position = InfoListItemPosition.Top,
+                position = VisualListItemPosition.Top,
                 backgroundColor = color,
             )
-            InfoListItemMolecule(
+            VisualListItem(
                 message = { Text("A middle item") },
                 icon = { Icon(imageVector = CompoundIcons.InfoSolid(), contentDescription = null) },
-                position = InfoListItemPosition.Middle,
+                position = VisualListItemPosition.Middle,
                 backgroundColor = color,
             )
-            InfoListItemMolecule(
+            VisualListItem(
                 message = { Text("A bottom item") },
                 icon = { Icon(imageVector = CompoundIcons.InfoSolid(), contentDescription = null) },
-                position = InfoListItemPosition.Bottom,
+                position = VisualListItemPosition.Bottom,
                 backgroundColor = color,
             )
         }
     }
 }
 
-enum class InfoListItemPosition {
+enum class VisualListItemPosition {
     Top,
     Middle,
     Bottom,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItemData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItemData.kt
new file mode 100644
index 0000000000..ace971ac61
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/visuallist/VisualListItemData.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.components.visuallist
+
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+
+data class VisualListItemData(
+    val message: CharSequence,
+    @DrawableRes val iconId: Int? = null,
+    val iconVector: ImageVector? = null,
+    val iconComposable: @Composable () -> Unit = {},
+)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/BringIntoViewOnImeVisible.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/BringIntoViewOnImeVisible.kt
new file mode 100644
index 0000000000..90dd40c891
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/BringIntoViewOnImeVisible.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.modifiers
+
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.isImeVisible
+import androidx.compose.foundation.relocation.BringIntoViewRequester
+import androidx.compose.foundation.relocation.bringIntoViewRequester
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import kotlinx.coroutines.delay
+import kotlin.time.Duration.Companion.milliseconds
+
+/**
+ * Keeps a focused field visible above the keyboard. Intended for a field — or a group that wraps
+ * one — inside a scrollable container: the content is never clipped by a pinned footer, but the IME
+ * is shown only after focus arrives, so we re-request bringIntoView once it is visible to scroll the
+ * content back into the reduced viewport.
+ *
+ * Tracks focus via `hasFocus` rather than `isFocused`, so it also works when applied to a wrapper
+ * whose child — rather than the wrapper itself — takes focus.
+ */
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun Modifier.bringIntoViewOnImeVisible(): Modifier {
+    val bringIntoViewRequester = remember { BringIntoViewRequester() }
+    var hasFocus by remember { mutableStateOf(false) }
+    val isImeVisible = WindowInsets.isImeVisible
+    LaunchedEffect(isImeVisible, hasFocus) {
+        if (isImeVisible && hasFocus) {
+            // Delay to ensure the keyboard is fully shown before scrolling the content into view.
+            delay(100.milliseconds)
+            bringIntoViewRequester.bringIntoView()
+        }
+    }
+    return this
+        .bringIntoViewRequester(bringIntoViewRequester)
+        .onFocusChanged { hasFocus = it.hasFocus }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreview.kt
index b0ef41e154..693b3f5b79 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreview.kt
@@ -10,8 +10,13 @@ package io.element.android.libraries.designsystem.preview
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.movableContentOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.res.ResourcesCompat
 import coil3.annotation.ExperimentalCoilApi
@@ -19,6 +24,7 @@ import coil3.asImage
 import coil3.compose.AsyncImagePreviewHandler
 import coil3.compose.LocalAsyncImagePreviewHandler
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.theme.Theme
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 
@@ -26,8 +32,9 @@ import io.element.android.libraries.designsystem.utils.CommonDrawables
 @Composable
 @Suppress("ModifierMissing")
 fun ElementPreview(
-    darkTheme: Boolean = isSystemInDarkTheme(),
+    theme: Theme = if (isSystemInDarkTheme()) Theme.Dark else Theme.Light,
     showBackground: Boolean = true,
+    fillMaxSize: Boolean = false,
     @DrawableRes
     drawableFallbackForImages: Int = CommonDrawables.sample_background,
     content: @Composable () -> Unit
@@ -38,12 +45,22 @@ fun ElementPreview(
             ResourcesCompat.getDrawable(context.resources, drawableFallbackForImages, null)!!.asImage()
         }
     ) {
-        ElementTheme(darkTheme = darkTheme) {
+        ElementTheme(theme = theme) {
+            val movableContent = remember { movableContentOf { content() } }
             if (showBackground) {
                 // If we have a proper contentColor applied we need a Surface instead of a Box
-                Surface(content = content)
+                Surface(
+                    modifier = if (fillMaxSize) Modifier.fillMaxSize() else Modifier,
+                    content = movableContent,
+                )
             } else {
-                content()
+                if (fillMaxSize) {
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        movableContent()
+                    }
+                } else {
+                    movableContent()
+                }
             }
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewBlack.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewBlack.kt
new file mode 100644
index 0000000000..c10b4272e2
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewBlack.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.preview
+
+import androidx.compose.runtime.Composable
+import io.element.android.compound.theme.Theme
+
+@Composable
+fun ElementPreviewBlack(
+    showBackground: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    ElementPreview(
+        theme = Theme.Black,
+        showBackground = showBackground,
+        content = content
+    )
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewDark.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewDark.kt
index c054b318f3..4f6898ff2b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewDark.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewDark.kt
@@ -8,16 +8,22 @@
 
 package io.element.android.libraries.designsystem.preview
 
+import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
+import io.element.android.compound.theme.Theme
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 
 @Composable
 fun ElementPreviewDark(
     showBackground: Boolean = true,
-    content: @Composable () -> Unit
+    @DrawableRes
+    drawableFallbackForImages: Int = CommonDrawables.sample_background,
+    content: @Composable () -> Unit,
 ) {
     ElementPreview(
-        darkTheme = true,
+        theme = Theme.Dark,
         showBackground = showBackground,
-        content = content
+        drawableFallbackForImages = drawableFallbackForImages,
+        content = content,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewLight.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewLight.kt
index 1c2bdf3cef..b52af233d8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewLight.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementPreviewLight.kt
@@ -8,16 +8,22 @@
 
 package io.element.android.libraries.designsystem.preview
 
+import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
+import io.element.android.compound.theme.Theme
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 
 @Composable
 fun ElementPreviewLight(
     showBackground: Boolean = true,
-    content: @Composable () -> Unit
+    @DrawableRes
+    drawableFallbackForImages: Int = CommonDrawables.sample_background,
+    content: @Composable () -> Unit,
 ) {
     ElementPreview(
-        darkTheme = false,
+        theme = Theme.Light,
         showBackground = showBackground,
-        content = content
+        drawableFallbackForImages = drawableFallbackForImages,
+        content = content,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementThemedPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementThemedPreview.kt
index 7b29757843..a0bd489f8c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementThemedPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/ElementThemedPreview.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.Theme
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 
 @Composable
@@ -40,14 +41,14 @@ fun ElementThemedPreview(
         if (vertical) {
             Column {
                 ElementPreview(
-                    darkTheme = false,
+                    theme = Theme.Light,
                     showBackground = showBackground,
                     drawableFallbackForImages = drawableFallbackForImages,
                     content = content,
                 )
                 Spacer(modifier = Modifier.height(4.dp))
                 ElementPreview(
-                    darkTheme = true,
+                    theme = Theme.Dark,
                     showBackground = showBackground,
                     drawableFallbackForImages = drawableFallbackForImages,
                     content = content
@@ -56,14 +57,14 @@ fun ElementThemedPreview(
         } else {
             Row {
                 ElementPreview(
-                    darkTheme = false,
+                    theme = Theme.Light,
                     showBackground = showBackground,
                     drawableFallbackForImages = drawableFallbackForImages,
                     content = content,
                 )
                 Spacer(modifier = Modifier.width(4.dp))
                 ElementPreview(
-                    darkTheme = true,
+                    theme = Theme.Dark,
                     showBackground = showBackground,
                     drawableFallbackForImages = drawableFallbackForImages,
                     content = content
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewData.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewData.kt
new file mode 100644
index 0000000000..66a6043634
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewData.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.preview
+
+const val USER_NAME_ALICE = "Alice"
+const val USER_NAME_BOB = "Bob"
+const val USER_NAME_CHARLIE = "Charlie"
+const val USER_NAME_CAROL = "Carol"
+const val USER_NAME_DAVID = "David"
+const val USER_NAME_EVE = "Eve"
+const val USER_NAME_JOHN_DOE = "John Doe"
+const val USER_NAME_JUSTIN = "Justin"
+const val USER_NAME_MALLORY = "Mallory"
+const val USER_NAME_SENDER = "Sender"
+const val USER_NAME_SUSIE = "Susie"
+const val USER_NAME_VICTOR = "Victor"
+const val USER_NAME_WALTER = "Walter"
+
+const val ROOM_NAME = "Room name"
+const val SPACE_NAME = "Space name"
+
+const val LAST_MESSAGE = "Last message"
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewWithLargeHeight.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewWithLargeHeight.kt
index 163ee21590..8d745ec0e7 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewWithLargeHeight.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewWithLargeHeight.kt
@@ -16,3 +16,6 @@ import androidx.compose.ui.tooling.preview.Preview
  */
 @Preview(heightDp = 1000)
 annotation class PreviewWithLargeHeight
+
+@Preview(heightDp = 1600)
+annotation class PreviewWithExtraLargeHeight
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt
index 7e687e9b89..8d03cfb7a5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt
@@ -11,12 +11,10 @@ package io.element.android.libraries.designsystem.preview
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SheetState
 import androidx.compose.material3.SheetValue
-import androidx.compose.runtime.Composable
 
 @OptIn(ExperimentalMaterial3Api::class)
-@Composable
 fun sheetStateForPreview() = SheetState(
-    skipPartiallyExpanded = true,
+    enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
     positionalThreshold = { 0.5f },
     velocityThreshold = { 400f },
     initialValue = SheetValue.Expanded,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
index 06827fb218..80ef3b9b26 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
@@ -53,11 +53,6 @@ val SemanticColors.messageFromOtherBackground
 val SemanticColors.progressIndicatorTrackColor
     get() = if (isLight) LightColorTokens.colorAlphaGray500 else DarkColorTokens.colorAlphaGray500
 
-// This color is not present in Semantic color, so put hard-coded value for now
-@OptIn(CoreColorToken::class)
-val SemanticColors.bgSubtleTertiary
-    get() = if (isLight) LightColorTokens.colorGray100 else DarkColorTokens.colorGray100
-
 // Temporary color, which is not in the token right now
 val SemanticColors.temporaryColorBgSpecial
     get() = if (isLight) Color(0xFFE4E8F0) else Color(0xFF3A4048)
@@ -75,6 +70,9 @@ val SemanticColors.pinnedMessageBannerIndicator
 val SemanticColors.pinnedMessageBannerBorder
     get() = if (isLight) LightColorTokens.colorAlphaGray400 else DarkColorTokens.colorAlphaGray400
 
+val SemanticColors.floatingDateBadgeBackground
+    get() = if (isLight) bgCanvasDefault else bgSubtlePrimary
+
 @PreviewsDayNight
 @Composable
 internal fun ColorAliasesPreview() = ElementPreview {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
index 7aa0ab79b9..0c2fdff0ab 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementThemeApp.kt
@@ -18,11 +18,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.theme.Theme
-import io.element.android.compound.theme.isDark
 import io.element.android.compound.theme.mapToTheme
 import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 
 val LocalBuildMeta = staticCompositionLocalOf {
@@ -54,21 +55,24 @@ val LocalBuildMeta = staticCompositionLocalOf {
 @Composable
 fun ElementThemeApp(
     appPreferencesStore: AppPreferencesStore,
+    featureFlagService: FeatureFlagService,
     compoundLight: SemanticColors,
     compoundDark: SemanticColors,
     buildMeta: BuildMeta,
     content: @Composable () -> Unit,
 ) {
-    val theme by remember {
-        appPreferencesStore.getThemeFlow().mapToTheme()
-    }
-        .collectAsState(initial = Theme.System)
+    val isBlackThemeAllowed by remember {
+        featureFlagService.isFeatureEnabledFlow(FeatureFlags.AllowBlackTheme)
+    }.collectAsState(initial = false)
+    val theme by remember(isBlackThemeAllowed) {
+        appPreferencesStore.getThemeFlow().mapToTheme(allowBlackTheme = isBlackThemeAllowed)
+    }.collectAsState(initial = Theme.System)
     LaunchedEffect(theme) {
         AppCompatDelegate.setDefaultNightMode(
             when (theme) {
                 Theme.System -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
                 Theme.Light -> AppCompatDelegate.MODE_NIGHT_NO
-                Theme.Dark -> AppCompatDelegate.MODE_NIGHT_YES
+                Theme.Dark, Theme.Black -> AppCompatDelegate.MODE_NIGHT_YES
             }
         )
     }
@@ -76,7 +80,7 @@ fun ElementThemeApp(
         LocalBuildMeta provides buildMeta,
     ) {
         ElementTheme(
-            darkTheme = theme.isDark(),
+            theme = theme,
             content = content,
             compoundLight = compoundLight,
             compoundDark = compoundDark,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
index db0aa39002..299744cebf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
@@ -28,13 +28,15 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalRippleThemeConfiguration
+import androidx.compose.material3.RippleThemeConfiguration
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -181,11 +183,8 @@ private fun ButtonInternal(
         ButtonSize.LargeLowPadding -> PaddingValues(horizontal = lowHorizontalPaddingValue, vertical = 13.dp)
     }
 
-    val shape = when (style) {
-        ButtonStyle.Filled,
-        ButtonStyle.Outlined -> RoundedCornerShape(percent = 50)
-        ButtonStyle.Text -> RectangleShape
-    }
+    // Apply the same shape to all buttons, so that the focus ring is consistent across styles.
+    val shape = RoundedCornerShape(percent = 50)
 
     val border = when (style) {
         ButtonStyle.Filled -> null
@@ -202,48 +201,66 @@ private fun ButtonInternal(
         ButtonStyle.Text -> null
     }
 
-    androidx.compose.material3.Button(
-        onClick = {
-            if (!showProgress) {
-                onClick()
-            }
-        },
-        modifier = modifier.heightIn(min = minHeight),
-        enabled = enabled,
-        shape = shape,
-        colors = colors,
-        elevation = null,
-        border = border,
-        contentPadding = contentPadding,
-        interactionSource = remember { MutableInteractionSource() },
+    // Reduce outerStrokeInset on Filled buttons so that it's displayed around the button
+    val outerStrokeInset = when (style) {
+        ButtonStyle.Filled -> (-4).dp
+        ButtonStyle.Outlined,
+        ButtonStyle.Text -> 0.dp
+    }
+
+    CompositionLocalProvider(
+        LocalRippleThemeConfiguration provides RippleThemeConfiguration(
+            RippleThemeConfiguration.Focus.InsetRing(
+                outerStrokeInset = outerStrokeInset,
+                outerStrokeWidth = 2.dp,
+                innerStrokeInset = 0.dp,
+                innerStrokeWidth = 0.dp,
+            )
+        ),
     ) {
-        when {
-            showProgress -> {
-                CircularProgressIndicator(
-                    modifier = Modifier
-                        .progressSemantics()
-                        .size(20.dp),
-                    color = LocalContentColor.current,
-                    strokeWidth = 2.dp,
-                )
-                Spacer(modifier = Modifier.width(8.dp))
-            }
-            leadingIcon != null -> {
-                Icon(
-                    painter = leadingIcon.getPainter(),
-                    contentDescription = null,
-                    tint = LocalContentColor.current,
-                    modifier = Modifier.size(20.dp),
-                )
-                Spacer(modifier = Modifier.width(8.dp))
+        androidx.compose.material3.Button(
+            onClick = {
+                if (!showProgress) {
+                    onClick()
+                }
+            },
+            modifier = modifier.heightIn(min = minHeight),
+            enabled = enabled,
+            shape = shape,
+            colors = colors,
+            elevation = null,
+            border = border,
+            contentPadding = contentPadding,
+            interactionSource = remember { MutableInteractionSource() },
+        ) {
+            when {
+                showProgress -> {
+                    CircularProgressIndicator(
+                        modifier = Modifier
+                            .progressSemantics()
+                            .size(20.dp),
+                        color = LocalContentColor.current,
+                        strokeWidth = 2.dp,
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                }
+                leadingIcon != null -> {
+                    Icon(
+                        painter = leadingIcon.getPainter(),
+                        contentDescription = null,
+                        tint = LocalContentColor.current,
+                        modifier = Modifier.size(20.dp),
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                }
             }
+            Text(
+                text = text,
+                style = ElementTheme.typography.fontBodyLgMedium,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
         }
-        Text(
-            text = text,
-            style = ElementTheme.typography.fontBodyLgMedium,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
     }
 }
 
@@ -294,7 +311,7 @@ internal enum class ButtonStyle {
 
     @Composable
     fun getColors(destructive: Boolean): ButtonColors = when (this) {
-        Filled -> ButtonDefaults.buttonColors(
+        Filled -> ButtonDefaults.filledTonalButtonColors(
             containerColor = getPrimaryColor(destructive),
             contentColor = ElementTheme.materialColors.onPrimary,
             disabledContainerColor = if (destructive) {
@@ -304,13 +321,13 @@ internal enum class ButtonStyle {
             },
             disabledContentColor = ElementTheme.colors.textOnSolidPrimary
         )
-        Outlined -> ButtonDefaults.buttonColors(
+        Outlined -> ButtonDefaults.outlinedButtonColors(
             containerColor = Color.Transparent,
             contentColor = getPrimaryColor(destructive),
             disabledContainerColor = Color.Transparent,
             disabledContentColor = getDisabledContentColor(destructive),
         )
-        Text -> ButtonDefaults.buttonColors(
+        Text -> ButtonDefaults.textButtonColors(
             containerColor = Color.Transparent,
             contentColor = if (destructive) {
                 ElementTheme.colors.textCriticalPrimary
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalDivider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalDivider.kt
index b4c7eddf31..0a3d717b09 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalDivider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalDivider.kt
@@ -10,7 +10,6 @@ package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.DividerDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -18,6 +17,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 
@@ -25,7 +25,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
 fun HorizontalDivider(
     modifier: Modifier = Modifier,
     thickness: Dp = ElementDividerDefaults.thickness,
-    color: Color = DividerDefaults.color,
+    color: Color = ElementDividerDefaults.color,
 ) {
     androidx.compose.material3.HorizontalDivider(
         modifier = modifier,
@@ -35,7 +35,9 @@ fun HorizontalDivider(
 }
 
 object ElementDividerDefaults {
-    val thickness = 0.5.dp
+    val thickness = 1.dp
+    val color
+        @Composable get() = ElementTheme.colors.separatorSecondary
 }
 
 @Preview(group = PreviewGroup.Dividers)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
index bbc97301dd..c4aeb4582f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
@@ -35,20 +35,19 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
 
 /**
  * A List Item component to be used in lists and menus with simple layouts, matching the Material 3 guidelines.
- * @param headlineContent The main content of the list item, usually a text.
  * @param modifier The modifier to be applied to the list item.
- * @param supportingContent The content to be displayed below the headline content.
- * @param leadingContent The content to be displayed before the headline content.
- * @param trailingContent The content to be displayed after the headline content.
+ * @param supportingContent The content to be displayed below the content.
+ * @param leadingContent The content to be displayed before the content.
+ * @param trailingContent The content to be displayed after the content.
  * @param style The style to use for the list item. This may change the color and text styles of the contents. [ListItemStyle.Default] is used by default.
- * @param enabled Whether the list item is enabled. When disabled, will change the color of the headline content and the leading content to use disabled tokens.
+ * @param enabled Whether the list item is enabled. When disabled, will change the color of the content and the leading content to use disabled tokens.
  * @param alwaysClickable Whether the list item should always be clickable, even when disabled.
  * @param onClick The callback to be called when the list item is clicked.
+ * @param content The main content of the list item, usually a text.
  */
 @Suppress("LongParameterList")
 @Composable
 fun ListItem(
-    headlineContent: @Composable () -> Unit,
     modifier: Modifier = Modifier,
     supportingContent: @Composable (() -> Unit)? = null,
     leadingContent: ListItemContent? = null,
@@ -57,19 +56,19 @@ fun ListItem(
     enabled: Boolean = true,
     alwaysClickable: Boolean = false,
     onClick: (() -> Unit)? = null,
+    content: @Composable () -> Unit,
 ) {
     val colors = ListItemDefaults.colors(
         containerColor = Color.Transparent,
-        headlineColor = style.headlineColor(),
+        headlineColor = style.contentColor(),
         leadingIconColor = style.leadingIconColor(),
         trailingIconColor = style.trailingIconColor(),
         supportingColor = style.supportingTextColor(),
-        disabledHeadlineColor = ListItemDefaultColors.headlineDisabled,
+        disabledHeadlineColor = ListItemDefaultColors.contentDisabled,
         disabledLeadingIconColor = ListItemDefaultColors.iconDisabled,
         disabledTrailingIconColor = ListItemDefaultColors.iconDisabled,
     )
     ListItem(
-        headlineContent = headlineContent,
         modifier = modifier,
         supportingContent = supportingContent,
         leadingContent = leadingContent,
@@ -78,25 +77,25 @@ fun ListItem(
         enabled = enabled,
         alwaysClickable = alwaysClickable,
         onClick = onClick,
+        content = content,
     )
 }
 
 /**
  * A List Item component to be used in lists and menus with simple layouts, matching the Material 3 guidelines.
- * @param headlineContent The main content of the list item, usually a text.
  * @param colors The colors to use for the list item. You can use [ListItemDefaults.colors] to create this.
  * @param modifier The modifier to be applied to the list item.
- * @param supportingContent The content to be displayed below the headline content.
- * @param leadingContent The content to be displayed before the headline content.
- * @param trailingContent The content to be displayed after the headline content.
- * @param enabled Whether the list item is enabled. When disabled, will change the color of the headline content and the leading content to use disabled tokens.
+ * @param supportingContent The content to be displayed below the content.
+ * @param leadingContent The content to be displayed before the content.
+ * @param trailingContent The content to be displayed after the content.
+ * @param enabled Whether the list item is enabled. When disabled, will change the color of the content and the leading content to use disabled tokens.
  * @param alwaysClickable Whether the list item should always be clickable, even when disabled.
  * @param onClick The callback to be called when the list item is clicked.
+ * @param content The main content of the list item, usually a text.
  */
 @Suppress("LongParameterList")
 @Composable
 fun ListItem(
-    headlineContent: @Composable () -> Unit,
     colors: ListItemColors,
     modifier: Modifier = Modifier,
     supportingContent: @Composable (() -> Unit)? = null,
@@ -105,53 +104,53 @@ fun ListItem(
     enabled: Boolean = true,
     alwaysClickable: Boolean = false,
     onClick: (() -> Unit)? = null,
+    content: @Composable () -> Unit,
 ) {
     // We cannot just pass the disabled colors, they must be set manually: https://issuetracker.google.com/issues/280480132
-    val headlineColor = if (enabled) colors.contentColor else colors.disabledContentColor
+    val contentColor = if (enabled) colors.contentColor else colors.disabledContentColor
     val supportingColor = if (enabled) colors.supportingContentColor else colors.disabledContentColor.copy(alpha = 0.80f)
     val leadingContentColor = if (enabled) colors.leadingContentColor else colors.disabledLeadingContentColor
     val trailingContentColor = if (enabled) colors.trailingContentColor else colors.disabledTrailingContentColor
 
-    val decoratedHeadlineContent: @Composable () -> Unit = {
+    val decoratedContent: @Composable () -> Unit = {
         CompositionLocalProvider(
             LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular,
-            LocalContentColor provides headlineColor,
+            LocalContentColor provides contentColor,
         ) {
-            headlineContent()
+            content()
         }
     }
-    val decoratedSupportingContent: (@Composable () -> Unit)? = supportingContent?.let { content ->
+    val decoratedSupportingContent: (@Composable () -> Unit)? = supportingContent?.let { safeContent ->
         {
             CompositionLocalProvider(
                 LocalTextStyle provides ElementTheme.typography.fontBodyMdRegular,
                 LocalContentColor provides supportingColor,
             ) {
-                content()
+                safeContent()
             }
         }
     }
-    val decoratedLeadingContent: (@Composable () -> Unit)? = leadingContent?.let { content ->
+    val decoratedLeadingContent: (@Composable () -> Unit)? = leadingContent?.let { safeContent ->
         {
             CompositionLocalProvider(
                 LocalContentColor provides leadingContentColor,
             ) {
-                content.View(isItemEnabled = enabled)
+                safeContent.View(isItemEnabled = enabled)
             }
         }
     }
-    val decoratedTrailingContent: (@Composable () -> Unit)? = trailingContent?.let { content ->
+    val decoratedTrailingContent: (@Composable () -> Unit)? = trailingContent?.let { safeContent ->
         {
             CompositionLocalProvider(
                 LocalTextStyle provides ElementTheme.typography.fontBodyMdRegular,
                 LocalContentColor provides trailingContentColor,
             ) {
-                content.View(isItemEnabled = enabled)
+                safeContent.View(isItemEnabled = enabled)
             }
         }
     }
 
     androidx.compose.material3.ListItem(
-        headlineContent = decoratedHeadlineContent,
         modifier = if (onClick != null) {
             Modifier
                 .clickable(enabled = enabled || alwaysClickable, onClick = onClick)
@@ -169,8 +168,8 @@ fun ListItem(
         leadingContent = decoratedLeadingContent,
         trailingContent = decoratedTrailingContent,
         colors = colors,
-        tonalElevation = 0.dp,
-        shadowElevation = 0.dp,
+        elevation = ListItemDefaults.elevation(elevation = 0.dp),
+        content = decoratedContent,
     )
 }
 
@@ -223,8 +222,8 @@ sealed interface ListItemStyle {
     data object Destructive : ListItemStyle
 
     @Composable
-    fun headlineColor() = when (this) {
-        Default, Primary -> ListItemDefaultColors.headline
+    fun contentColor() = when (this) {
+        Default, Primary -> ListItemDefaultColors.content
         Destructive -> ElementTheme.colors.textCriticalPrimary
     }
 
@@ -251,8 +250,8 @@ sealed interface ListItemStyle {
 }
 
 object ListItemDefaultColors {
-    val headline: Color @Composable get() = ElementTheme.colors.textPrimary
-    val headlineDisabled: Color @Composable get() = ElementTheme.colors.textDisabled
+    val content: Color @Composable get() = ElementTheme.colors.textPrimary
+    val contentDisabled: Color @Composable get() = ElementTheme.colors.textDisabled
     val supportingText: Color @Composable get() = ElementTheme.materialColors.onSurfaceVariant
     val leadingIcon: Color @Composable get() = ElementTheme.colors.iconSecondary
     val trailingIcon: Color @Composable get() = ElementTheme.colors.iconPrimary
@@ -260,11 +259,11 @@ object ListItemDefaultColors {
 
     val colors: ListItemColors
         @Composable get() = ListItemDefaults.colors(
-            headlineColor = headline,
+            headlineColor = content,
             supportingColor = supportingText,
             leadingIconColor = leadingIcon,
             trailingIconColor = trailingIcon,
-            disabledHeadlineColor = headlineDisabled,
+            disabledHeadlineColor = contentDisabled,
             disabledLeadingIconColor = iconDisabled,
             disabledTrailingIconColor = iconDisabled,
         )
@@ -523,7 +522,7 @@ private object PreviewItems {
     ) {
         EnabledDisabledElementThemedPreview {
             ListItem(
-                headlineContent = headline(),
+                content = content(),
                 supportingContent = text(),
                 leadingContent = leadingContent,
                 trailingContent = trailingContent,
@@ -543,7 +542,7 @@ private object PreviewItems {
     ) {
         EnabledDisabledElementThemedPreview {
             ListItem(
-                headlineContent = headline(),
+                content = content(),
                 supportingContent = textSingleLine(),
                 leadingContent = leadingContent,
                 trailingContent = trailingContent,
@@ -563,7 +562,7 @@ private object PreviewItems {
     ) {
         EnabledDisabledElementThemedPreview {
             ListItem(
-                headlineContent = headline(),
+                content = content(),
                 leadingContent = leadingContent,
                 trailingContent = trailingContent,
                 enabled = it,
@@ -574,7 +573,7 @@ private object PreviewItems {
     }
 
     @Composable
-    fun headline() = @Composable {
+    fun content() = @Composable {
         Text("List item")
     }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSectionHeader.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSectionHeader.kt
index 403ed6da97..3a86d72e7d 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSectionHeader.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSectionHeader.kt
@@ -17,6 +17,8 @@ import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
@@ -48,6 +50,9 @@ fun ListSectionHeader(
             verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             Text(
+                modifier = Modifier.semantics {
+                    heading()
+                },
                 text = title,
                 style = ElementTheme.typography.fontBodyLgMedium,
                 color = ElementTheme.colors.textPrimary,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
index 4be53ddb39..b4f374cf4a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
@@ -134,7 +134,7 @@ internal fun ListSupportingTextNoPaddingPreview() {
 internal fun ListSupportingTextDefaultPaddingPreview() {
     ElementThemedPreview {
         Column {
-            ListItem(headlineContent = { Text("A title") })
+            ListItem(content = { Text("A title") })
             ListSupportingText(
                 text = "Supporting line text lorem ipsum dolor sit amet, consectetur. Read more",
                 contentPadding = ListSupportingTextDefaults.Padding.Default,
@@ -149,7 +149,7 @@ internal fun ListSupportingTextSmallPaddingPreview() {
     ElementThemedPreview {
         Column {
             ListItem(
-                headlineContent = { Text("A title") },
+                content = { Text("A title") },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ShareAndroid()))
             )
             ListSupportingText(
@@ -165,7 +165,7 @@ internal fun ListSupportingTextSmallPaddingPreview() {
 internal fun ListSupportingTextLargePaddingPreview() {
     ElementThemedPreview {
         Column {
-            ListItem(headlineContent = { Text("A title") }, leadingContent = ListItemContent.Switch(checked = true))
+            ListItem(content = { Text("A title") }, leadingContent = ListItemContent.Switch(checked = true))
             ListSupportingText(
                 text = "Supporting line text lorem ipsum dolor sit amet, consectetur. Read more",
                 contentPadding = ListSupportingTextDefaults.Padding.LargeLeadingContent,
@@ -179,7 +179,7 @@ internal fun ListSupportingTextLargePaddingPreview() {
 internal fun ListSupportingTextCustomPaddingPreview() {
     ElementThemedPreview {
         Column {
-            ListItem(headlineContent = { Text("A title") })
+            ListItem(content = { Text("A title") })
             ListSupportingText(
                 text = "Supporting line text lorem ipsum dolor sit amet, consectetur. Read more",
                 contentPadding = ListSupportingTextDefaults.Padding.Custom(24.dp),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt
index 2c577ec6b7..6cb49a6218 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt
@@ -10,17 +10,23 @@ package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SheetState
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.contentColorFor
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.movableContentOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -42,12 +48,19 @@ import io.element.android.libraries.designsystem.preview.sheetStateForPreview
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
+/**
+ * For parameter [scrollable], set it to true if the content of the sheet does not already contain a scrollable component, such as a LazyColumn,
+ * to avoid nested scroll issues. In this case, the content will be wrapped in a Column with verticalScroll.
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ModalBottomSheet(
     onDismissRequest: () -> Unit,
+    scrollable: Boolean,
     modifier: Modifier = Modifier,
-    sheetState: SheetState = rememberModalBottomSheetState(),
+    sheetState: SheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+    ),
     shape: Shape = BottomSheetDefaults.ExpandedShape,
     containerColor: Color = MaterialTheme.colorScheme.surface,
     contentColor: Color = contentColorFor(containerColor),
@@ -79,8 +92,18 @@ fun ModalBottomSheet(
         scrimColor = scrimColor,
         dragHandle = dragHandle,
         contentWindowInsets = contentWindowInsets,
-        content = content,
-    )
+    ) {
+        val movableContent = remember { movableContentOf { content() } }
+        if (scrollable) {
+            Column(
+                modifier = Modifier.verticalScroll(rememberScrollState()),
+            ) {
+                movableContent()
+            }
+        } else {
+            movableContent()
+        }
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -91,13 +114,11 @@ fun SheetState.hide(coroutineScope: CoroutineScope, then: suspend () -> Unit) {
     }
 }
 
-// This preview and its screenshots are blank, see: https://issuetracker.google.com/issues/283843380
 @Preview(group = PreviewGroup.BottomSheets)
 @Composable
 internal fun ModalBottomSheetLightPreview() =
     ElementPreviewLight { ContentToPreview() }
 
-// This preview and its screenshots are blank, see: https://issuetracker.google.com/issues/283843380
 @Preview(group = PreviewGroup.BottomSheets)
 @Composable
 internal fun ModalBottomSheetDarkPreview() =
@@ -112,6 +133,7 @@ private fun ContentToPreview() {
     ) {
         ModalBottomSheet(
             onDismissRequest = {},
+            scrollable = false,
         ) {
             Text(
                 text = "Sheet Content",
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/PasswordVisibilityToggle.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/PasswordVisibilityToggle.kt
new file mode 100644
index 0000000000..9154ec6292
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/PasswordVisibilityToggle.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.theme.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * Show/hide toggle for a password [TextField], intended for its `trailingIcon` slot.
+ * Shared so every password field reveals plaintext the same way and announces the
+ * same accessibility labels.
+ */
+@Composable
+fun PasswordVisibilityToggle(
+    visible: Boolean,
+    onToggle: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier.clickable(onClick = onToggle)) {
+        Icon(
+            imageVector = if (visible) CompoundIcons.VisibilityOn() else CompoundIcons.VisibilityOff(),
+            contentDescription = stringResource(
+                if (visible) CommonStrings.a11y_hide_password else CommonStrings.a11y_show_password
+            ),
+        )
+    }
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt
index 2e19fecced..28a62a2c36 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchBar.kt
@@ -59,7 +59,7 @@ fun <T> SearchBar(
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     showBackButton: Boolean = true,
-    resultState: SearchBarResultState<T> = SearchBarResultState.Initial(),
+    resultState: SearchBarResultState<T> = SearchBarResultState.Initial,
     shape: Shape = SearchBarDefaults.inputFieldShape,
     tonalElevation: Dp = SearchBarDefaults.TonalElevation,
     windowInsets: WindowInsets = SearchBarDefaults.windowInsets,
@@ -134,7 +134,7 @@ fun <T> SearchBar(
                     resultHandler(resultState.results)
                 }
 
-                is SearchBarResultState.NoResultsFound<T> -> {
+                is SearchBarResultState.NoResultsFound -> {
                     // No results found, show a message
                     Spacer(Modifier.size(80.dp))
 
@@ -200,12 +200,12 @@ object ElementSearchBarDefaults {
 }
 
 @Immutable
-sealed interface SearchBarResultState<in T> {
+sealed interface SearchBarResultState<out T> {
     /** No search results are available yet (e.g. because the user hasn't entered a search term). */
-    class Initial<T> : SearchBarResultState<T>
+    data object Initial : SearchBarResultState<Nothing>
 
     /** The search has completed, but no results were found. */
-    class NoResultsFound<T> : SearchBarResultState<T>
+    data object NoResultsFound : SearchBarResultState<Nothing>
 
     /** The search has completed, and some matching users were found. */
     data class Results<T>(val results: T) : SearchBarResultState<T>
@@ -249,7 +249,7 @@ internal fun SearchBarActiveWithNoResultsPreview() = ElementThemedPreview {
     ContentToPreview(
         initialQuery = "search term",
         active = true,
-        resultState = SearchBarResultState.NoResultsFound<String>(),
+        resultState = SearchBarResultState.NoResultsFound,
     )
 }
 
@@ -293,7 +293,7 @@ private fun ContentToPreview(
     initialQuery: String = "",
     active: Boolean = false,
     showBackButton: Boolean = true,
-    resultState: SearchBarResultState<String> = SearchBarResultState.Initial(),
+    resultState: SearchBarResultState<String> = SearchBarResultState.Initial,
     contentPrefix: @Composable ColumnScope.() -> Unit = {},
     contentSuffix: @Composable ColumnScope.() -> Unit = {},
     resultHandler: @Composable ColumnScope.(String) -> Unit = {},
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
index d677a89577..8b318ecf4a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/SearchField.kt
@@ -139,7 +139,7 @@ private fun SearchFieldContainer(
         border = BorderStroke(
             width = 1.dp,
             color = if (isFocused) {
-                ElementTheme.colors.borderInteractiveHovered
+                ElementTheme.colors.borderFocused
             } else {
                 ElementTheme.colors.borderInteractiveSecondary
             }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt
index 5e0a81ba03..36d0255b08 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt
@@ -24,6 +24,11 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.input.InputTransformation
+import androidx.compose.foundation.text.input.KeyboardActionHandler
+import androidx.compose.foundation.text.input.TextFieldDecorator
+import androidx.compose.foundation.text.input.TextFieldLineLimits
+import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -161,6 +166,55 @@ fun TextField(
     }
 }
 
+@Composable
+fun TextField(
+    state: TextFieldState,
+    modifier: Modifier = Modifier,
+    label: String? = null,
+    supportingText: String? = null,
+    placeholder: String? = null,
+    leadingIcon: @Composable (() -> Unit)? = null,
+    trailingIcon: @Composable (() -> Unit)? = null,
+    validity: TextFieldValidity = TextFieldValidity.None,
+    enabled: Boolean = true,
+    readOnly: Boolean = false,
+    inputTransformation: InputTransformation? = null,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    onKeyboardAction: KeyboardActionHandler? = null,
+    lineLimits: TextFieldLineLimits = TextFieldLineLimits.Default,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    val isFocused by interactionSource.collectIsFocusedAsState()
+    BasicTextField(
+        state = state,
+        modifier = modifier,
+        textStyle = textFieldStyle(enabled),
+        interactionSource = interactionSource,
+        enabled = enabled,
+        readOnly = readOnly,
+        inputTransformation = inputTransformation,
+        cursorBrush = SolidColor(ElementTheme.colors.textPrimary),
+        keyboardOptions = keyboardOptions,
+        onKeyboardAction = onKeyboardAction,
+        lineLimits = lineLimits,
+        decorator = TextFieldDecorator { innerTextField ->
+            DecorationBox(
+                label = label,
+                readOnly = readOnly,
+                enabled = enabled,
+                isFocused = isFocused,
+                validity = validity,
+                leadingIcon = leadingIcon,
+                placeholder = placeholder,
+                isTextEmpty = state.text.isEmpty(),
+                innerTextField = innerTextField,
+                trailingIcon = trailingIcon,
+                supportingText = supportingText,
+            )
+        }
+    )
+}
+
 @Composable
 private fun DecorationBox(
     label: String?,
@@ -239,8 +293,8 @@ private fun TextFieldContainer(
                 width = if (isFocused) 2.dp else 1.dp,
                 color = when {
                     !enabled -> ElementTheme.colors.borderDisabled
+                    isFocused -> ElementTheme.colors.borderFocused
                     isError -> ElementTheme.colors.borderCriticalPrimary
-                    isFocused -> ElementTheme.colors.borderInteractiveHovered
                     else -> ElementTheme.colors.borderInteractiveSecondary
                 }
             )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Insets.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Insets.kt
new file mode 100644
index 0000000000..69160c902e
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/Insets.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.utils
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+
+/**
+ * Content insets meant to be used for [Column] or [LazyColumn] components that are used as the main content of a screen,
+ * to avoid overlapping with navigation bars, IME or cut-out display parts, but ignoring the status bar.
+ *
+ * Counterpart of [scaffoldScrollableContentInsets] for [Column] or [LazyColumn] components.
+ */
+val lazyColumnContentPadding @Composable
+    get() = WindowInsets.safeDrawing
+        .only(WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom)
+        .asPaddingValues()
+
+/**
+ * Content insets meant to be used for [Scaffold] components that contain some content that is scrollable like [Column] or [LazyColumn],
+ * and this content should handle its own content padding. The insets will only apply the top padding to avoid overlapping with the status bar,
+ * while ignoring navigation bars, IME or cut-out display parts.
+ *
+ * Counterpart of [lazyColumnContentPadding] for [Scaffold] components.
+ */
+val scaffoldScrollableContentInsets @Composable
+    get() = WindowInsets.safeDrawing
+        .only(WindowInsetsSides.Top)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowSizeClassUtils.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowSizeClassUtils.kt
new file mode 100644
index 0000000000..ba0752e8a2
--- /dev/null
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/WindowSizeClassUtils.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.designsystem.utils
+
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.material3.windowsizeclass.WindowHeightSizeClass
+import androidx.compose.runtime.Composable
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+@Composable
+fun hasCompactHeightWindowSize(): Boolean {
+    return currentWindowAdaptiveInfo().windowSizeClass.heightSizeClass == WindowHeightSizeClass.Compact
+}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt
index 56bb070228..566c92d5cf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcher.kt
@@ -18,39 +18,35 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import io.element.android.libraries.designsystem.theme.components.Snackbar
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 
 /**
  * A global dispatcher of [SnackbarMessage] to be displayed in [Snackbar] via a [SnackbarHostState].
+ *
+ * The current head of the queue is exposed as a [MutableStateFlow] so that every collector — including
+ * hosts that subscribe *after* a message was posted (e.g. a screen recomposing as a flow pops back to
+ * it) — observes the current message. An earlier mutex-gated implementation delivered each message to
+ * whichever single collector happened to be parked on the lock, which could starve the host that was
+ * actually on screen, dropping the snackbar.
  */
 class SnackbarDispatcher {
-    private val queueMutex = Mutex()
     private val snackBarMessageQueue = ArrayDeque<SnackbarMessage>()
-    val snackbarMessage: Flow<SnackbarMessage?> = flow {
-        while (currentCoroutineContext().isActive) {
-            queueMutex.lock()
-            emit(snackBarMessageQueue.firstOrNull())
-        }
-    }
+    private val currentMessage = MutableStateFlow<SnackbarMessage?>(null)
 
+    val snackbarMessage: Flow<SnackbarMessage?> = currentMessage.asStateFlow()
+
+    @Synchronized
     fun post(message: SnackbarMessage) {
-        if (snackBarMessageQueue.isEmpty()) {
-            snackBarMessageQueue.add(message)
-            if (queueMutex.isLocked) queueMutex.unlock()
-        } else {
-            snackBarMessageQueue.add(message)
-        }
+        snackBarMessageQueue.add(message)
+        currentMessage.value = snackBarMessageQueue.firstOrNull()
     }
 
+    @Synchronized
     fun clear() {
-        if (snackBarMessageQueue.isNotEmpty()) {
-            snackBarMessageQueue.removeFirstOrNull()
-            if (queueMutex.isLocked) queueMutex.unlock()
-        }
+        snackBarMessageQueue.removeFirstOrNull()
+        currentMessage.value = snackBarMessageQueue.firstOrNull()
     }
 }
 
diff --git a/libraries/designsystem/src/main/res/drawable-night/sample_map.png b/libraries/designsystem/src/main/res/drawable-night/sample_map.png
new file mode 100644
index 0000000000..7c58760c15
Binary files /dev/null and b/libraries/designsystem/src/main/res/drawable-night/sample_map.png differ
diff --git a/libraries/designsystem/src/main/res/drawable/sample_map.png b/libraries/designsystem/src/main/res/drawable/sample_map.png
new file mode 100644
index 0000000000..9bda2e15f2
Binary files /dev/null and b/libraries/designsystem/src/main/res/drawable/sample_map.png differ
diff --git a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTest.kt b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTest.kt
index 91c32b1da0..fe17aa0b6c 100644
--- a/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTest.kt
+++ b/libraries/designsystem/src/test/kotlin/io/element/android/libraries/designsystem/utils/snackbar/SnackbarDispatcherTest.kt
@@ -54,6 +54,27 @@ class SnackbarDispatcherTest {
         }
     }
 
+    @Test
+    fun `a host that subscribes after a message is posted still receives it`() = runTest {
+        val snackbarDispatcher = SnackbarDispatcher()
+        val message = SnackbarMessage(0)
+        // A first host is already collecting (mirrors a background screen still subscribed).
+        snackbarDispatcher.snackbarMessage.test {
+            assertThat(awaitItem()).isNull()
+            snackbarDispatcher.post(message)
+            assertThat(awaitItem()).isEqualTo(message)
+
+            // A second host subscribes only afterwards — e.g. the screen a flow pops back to once the
+            // message has already been posted. It must observe the current message rather than being
+            // starved waiting for the next post (regression: an earlier mutex-gated implementation
+            // delivered each post to a single parked collector, dropping the snackbar for any host
+            // that subscribed later).
+            snackbarDispatcher.snackbarMessage.test {
+                assertThat(awaitItem()).isEqualTo(message)
+            }
+        }
+    }
+
     @Test
     fun `given 2 message emissions, the next message is displayed only after a call to clear`() = runTest {
         val snackbarDispatcher = SnackbarDispatcher()
diff --git a/libraries/recentemojis/api/build.gradle.kts b/libraries/emoji/api/build.gradle.kts
similarity index 60%
rename from libraries/recentemojis/api/build.gradle.kts
rename to libraries/emoji/api/build.gradle.kts
index 2fc74c03c7..48143d9512 100644
--- a/libraries/recentemojis/api/build.gradle.kts
+++ b/libraries/emoji/api/build.gradle.kts
@@ -1,17 +1,16 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
 plugins {
-    id("io.element.android-library")
+    id("io.element.android-compose-library")
 }
 
 android {
-    namespace = "io.element.android.libraries.recentemojis.api"
+    namespace = "io.element.android.libraries.emoji.api"
 }
 
 dependencies {
@@ -19,5 +18,5 @@ dependencies {
     implementation(projects.libraries.matrix.api)
 
     implementation(libs.kotlinx.collections.immutable)
-    implementation(libs.matrix.emojibase.bindings)
+    api(libs.matrix.emojibase.bindings)
 }
diff --git a/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerPresenter.kt b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerPresenter.kt
new file mode 100644
index 0000000000..a20b53a480
--- /dev/null
+++ b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerPresenter.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.api.picker
+
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
+
+fun interface EmojiPickerPresenter : Presenter<EmojiPickerState> {
+    fun interface Factory {
+        fun create(getRecentEmojis: GetRecentEmojis): EmojiPickerPresenter
+    }
+}
diff --git a/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerRenderer.kt b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerRenderer.kt
new file mode 100644
index 0000000000..b3784b3c42
--- /dev/null
+++ b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerRenderer.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.api.picker
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.Modifier
+import io.element.android.emojibasebindings.Emoji
+import kotlinx.collections.immutable.ImmutableSet
+
+@Immutable
+interface EmojiPickerRenderer {
+    /**
+     * @param state opaque state produced by [EmojiPickerPresenter.present].
+     * @param onSelectEmoji invoked when the user taps an emoji (including a skin-tone variant).
+     * @param selectedEmojis emojis to visually mark as already selected.
+     * @param modifier layout modifier for the picker container.
+     * @param contentDescription accessibility label for each emoji cell.
+     */
+    @Composable
+    fun Render(
+        state: EmojiPickerState,
+        onSelectEmoji: (Emoji) -> Unit,
+        selectedEmojis: ImmutableSet<String>,
+        modifier: Modifier = Modifier,
+        contentDescription: @Composable (Emoji, Boolean) -> String = { emoji, _ -> emoji.unicode },
+    )
+}
+
+object NoOpEmojiPickerRenderer : EmojiPickerRenderer {
+    @Composable
+    override fun Render(
+        state: EmojiPickerState,
+        onSelectEmoji: (Emoji) -> Unit,
+        selectedEmojis: ImmutableSet<String>,
+        modifier: Modifier,
+        contentDescription: @Composable (Emoji, Boolean) -> String,
+    ) = Unit
+}
diff --git a/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerState.kt b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerState.kt
new file mode 100644
index 0000000000..a5c820e648
--- /dev/null
+++ b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/picker/EmojiPickerState.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.api.picker
+
+/**
+ * Opaque state produced by an [EmojiPickerPresenter] and consumed by an [EmojiPickerRenderer].
+ */
+interface EmojiPickerState {
+    /**
+     * `true` once the picker has finished loading its data and is safe to display.
+     * Callers should typically defer showing the picker (or its container, e.g. a bottom sheet)
+     * until this flips to `true` to avoid flashing an empty picker.
+     */
+    val isReady: Boolean
+}
diff --git a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/AddRecentEmoji.kt
similarity index 84%
rename from libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt
rename to libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/AddRecentEmoji.kt
index 5b50823f77..5865568511 100644
--- a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/AddRecentEmoji.kt
+++ b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/AddRecentEmoji.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.api
+package io.element.android.libraries.emoji.api.recentemojis
 
 fun interface AddRecentEmoji {
     suspend operator fun invoke(emoji: String): Result<Unit>
diff --git a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/GetRecentEmojis.kt
similarity index 52%
rename from libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt
rename to libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/GetRecentEmojis.kt
index 6517512f44..cf6015d799 100644
--- a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/GetRecentEmojis.kt
+++ b/libraries/emoji/api/src/main/kotlin/io/element/android/libraries/emoji/api/recentemojis/GetRecentEmojis.kt
@@ -6,9 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.api
+package io.element.android.libraries.emoji.api.recentemojis
 
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 
 /**
  * Returns the list of recently used emojis for reactions.
@@ -16,3 +17,11 @@ import kotlinx.collections.immutable.ImmutableList
 fun interface GetRecentEmojis {
     suspend operator fun invoke(): Result<ImmutableList<String>>
 }
+
+/**
+ * A [GetRecentEmojis] that never returns any recent emojis. Handy for pickers that don't want
+ * a "Recent" tab (e.g. the user-status picker).
+ */
+object EmptyGetRecentEmojis : GetRecentEmojis {
+    override suspend fun invoke(): Result<ImmutableList<String>> = Result.success(persistentListOf())
+}
diff --git a/libraries/emoji/impl/build.gradle.kts b/libraries/emoji/impl/build.gradle.kts
new file mode 100644
index 0000000000..1cb274e6c0
--- /dev/null
+++ b/libraries/emoji/impl/build.gradle.kts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.emoji.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.libraries.emoji.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.uiStrings)
+
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.matrix.emojibase.bindings)
+
+    testImplementation(projects.libraries.matrix.test)
+    testCommonDependencies(libs)
+}
diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt
new file mode 100644
index 0000000000..0e3187e196
--- /dev/null
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl
+
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.emojibasebindings.EmojibaseDatasource
+import io.element.android.emojibasebindings.EmojibaseStore
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.di.annotations.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.async
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DefaultEmojibaseProvider(
+    @ApplicationContext private val context: Context,
+    dispatchers: CoroutineDispatchers,
+    @AppCoroutineScope appScope: CoroutineScope,
+) : EmojibaseProvider {
+    private val deferred = appScope.async(dispatchers.io, start = CoroutineStart.LAZY) {
+        EmojibaseDatasource().load(context)
+    }
+
+    override suspend fun getStore(): EmojibaseStore = deferred.await()
+}
diff --git a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/EmojibaseProvider.kt
similarity index 59%
rename from libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/EmojibaseProvider.kt
index 9d6e41eb55..ddd18f8861 100644
--- a/libraries/recentemojis/api/src/main/kotlin/io/element/android/libraries/recentemojis/api/EmojibaseProvider.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/EmojibaseProvider.kt
@@ -1,15 +1,14 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.api
+package io.element.android.libraries.emoji.impl
 
 import io.element.android.emojibasebindings.EmojibaseStore
 
 interface EmojibaseProvider {
-    val emojibaseStore: EmojibaseStore
+    suspend fun getStore(): EmojibaseStore
 }
diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerPresenter.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerPresenter.kt
new file mode 100644
index 0000000000..d87f531e15
--- /dev/null
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerPresenter.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.picker
+
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalInspectionMode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.designsystem.theme.components.IconSource
+import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.picker.EmojiPickerPresenter
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
+import io.element.android.libraries.emoji.impl.EmojibaseProvider
+import io.element.android.libraries.emoji.impl.R
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+import kotlin.time.Duration.Companion.milliseconds
+
+@AssistedInject
+class DefaultEmojiPickerPresenter(
+    private val emojibaseProvider: EmojibaseProvider,
+    @Assisted private val getRecentEmojis: GetRecentEmojis,
+    private val coroutineDispatchers: CoroutineDispatchers,
+) : EmojiPickerPresenter {
+    @AssistedFactory
+    @ContributesBinding(SessionScope::class)
+    interface Factory : EmojiPickerPresenter.Factory {
+        override fun create(getRecentEmojis: GetRecentEmojis): DefaultEmojiPickerPresenter
+    }
+
+    @Composable
+    override fun present(): EmojiPickerState {
+        val queryState = rememberTextFieldState()
+        var isSearchActive by remember { mutableStateOf(false) }
+        var emojiResults by remember { mutableStateOf<SearchBarResultState<ImmutableList<Emoji>>>(SearchBarResultState.Initial) }
+
+        val data by produceState(EmojiPickerData.Empty) {
+            val storeDeferred = async { emojibaseProvider.getStore() }
+            val recentsDeferred = async { getRecentEmojis().getOrNull() ?: persistentListOf() }
+            val store = storeDeferred.await()
+            val recentEmojiUnicodes = recentsDeferred.await()
+            value = withContext(coroutineDispatchers.computation) {
+                val baseCategories = store.categories.map { (category, emojis) ->
+                    EmojiCategory(
+                        titleId = category.title,
+                        icon = IconSource.Vector(category.icon),
+                        emojis = emojis,
+                    )
+                }
+                val recentEmojis = recentEmojiUnicodes
+                    .mapNotNull { unicode -> store.allEmojis.find { it.unicode == unicode } }
+                    .toImmutableList()
+                val categories = if (recentEmojis.isEmpty()) {
+                    baseCategories.toImmutableList()
+                } else {
+                    val recentCategory = EmojiCategory(
+                        titleId = R.string.emoji_picker_category_recent,
+                        icon = IconSource.Resource(io.element.android.compound.R.drawable.ic_compound_history),
+                        emojis = recentEmojis,
+                    )
+                    (listOf(recentCategory) + baseCategories).toImmutableList()
+                }
+                EmojiPickerData(
+                    categories = categories,
+                    allEmojis = store.allEmojis,
+                )
+            }
+        }
+
+        val searchQuery = queryState.text.toString()
+        LaunchedEffect(searchQuery, data) {
+            if (searchQuery.isEmpty() || data.allEmojis.isEmpty()) {
+                emojiResults = SearchBarResultState.Initial
+                return@LaunchedEffect
+            }
+            delay(100.milliseconds)
+            val lowercaseQuery = searchQuery.lowercase()
+            val results = withContext(coroutineDispatchers.computation) {
+                data.allEmojis
+                    .asSequence()
+                    .filter { emoji ->
+                        emoji.tags.orEmpty().any { it.contains(lowercaseQuery) } ||
+                            emoji.shortcodes.any { it.contains(lowercaseQuery) }
+                    }
+                    .take(60)
+                    .toImmutableList()
+            }
+            emojiResults = SearchBarResultState.Results(results)
+        }
+
+        val isInPreview = LocalInspectionMode.current
+        fun handleEvent(event: EmojiPickerEvent) {
+            when (event) {
+                is EmojiPickerEvent.ToggleSearchActive -> if (!isInPreview) {
+                    isSearchActive = event.isActive
+                }
+            }
+        }
+
+        return DefaultEmojiPickerState(
+            categories = data.categories,
+            searchQuery = queryState,
+            isSearchActive = isSearchActive,
+            searchResults = emojiResults,
+            eventSink = ::handleEvent,
+        )
+    }
+}
+
+private data class EmojiPickerData(
+    val categories: ImmutableList<EmojiCategory>,
+    val allEmojis: ImmutableList<Emoji>,
+) {
+    companion object {
+        val Empty = EmojiPickerData(persistentListOf(), persistentListOf())
+    }
+}
diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt
new file mode 100644
index 0000000000..f77f7a0d76
--- /dev/null
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.picker
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+import kotlinx.collections.immutable.ImmutableSet
+
+@ContributesBinding(SessionScope::class)
+class DefaultEmojiPickerRenderer : EmojiPickerRenderer {
+    @Composable
+    override fun Render(
+        state: EmojiPickerState,
+        onSelectEmoji: (Emoji) -> Unit,
+        selectedEmojis: ImmutableSet<String>,
+        modifier: Modifier,
+        contentDescription: @Composable (Emoji, Boolean) -> String,
+    ) {
+        if (state is DefaultEmojiPickerState) {
+            EmojiPickerView(
+                state = state,
+                onSelectEmoji = onSelectEmoji,
+                selectedEmojis = selectedEmojis,
+                contentDescription = contentDescription,
+                modifier = modifier,
+            )
+        } else {
+            error("Unsupported state type: ${state::class.java}")
+        }
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerState.kt
similarity index 72%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerState.kt
index c1d306dece..8b3835724b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerState.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
+package io.element.android.libraries.emoji.impl.picker
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.text.input.TextFieldState
@@ -14,23 +14,21 @@ import androidx.compose.runtime.Immutable
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
 import kotlinx.collections.immutable.ImmutableList
 
-// Emoji is unstable (because from an external library?), so we annotate with @Immutable
 @Immutable
-data class EmojiPickerState(
+internal data class DefaultEmojiPickerState(
     val categories: ImmutableList<EmojiCategory>,
-    val allEmojis: ImmutableList<Emoji>,
     val searchQuery: TextFieldState,
     val isSearchActive: Boolean,
     val searchResults: SearchBarResultState<ImmutableList<Emoji>>,
     val eventSink: (EmojiPickerEvent) -> Unit,
-)
+) : EmojiPickerState {
+    override val isReady = categories.isNotEmpty()
+}
 
-/**
- * Represents a category of emojis with a title id, icon, and the list of associated emojis.
- */
-data class EmojiCategory(
+internal data class EmojiCategory(
     @StringRes val titleId: Int,
     val icon: IconSource,
     val emojis: ImmutableList<Emoji>,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerStateProvider.kt
similarity index 57%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerStateProvider.kt
index 958b3849f5..964e0f3b78 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerStateProvider.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerStateProvider.kt
@@ -6,29 +6,26 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
+package io.element.android.libraries.emoji.impl.picker
 
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.emojibasebindings.EmojibaseCategory
-import io.element.android.features.messages.impl.R
-import io.element.android.features.messages.impl.timeline.components.customreaction.icon
-import io.element.android.features.messages.impl.timeline.components.customreaction.title
-import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
-class EmojiPickerStateProvider : PreviewParameterProvider<EmojiPickerState> {
-    override val values: Sequence<EmojiPickerState>
+internal class DefaultEmojiPickerStateProvider : PreviewParameterProvider<DefaultEmojiPickerState> {
+    override val values: Sequence<DefaultEmojiPickerState>
         get() = sequenceOf(
-            anEmojiPickerState(),
-            anEmojiPickerState(isSearchActive = true),
-            anEmojiPickerState(isSearchActive = true, searchQuery = "smile"),
-            anEmojiPickerState(
+            aDefaultEmojiPickerState(),
+            aDefaultEmojiPickerState(isSearchActive = true),
+            aDefaultEmojiPickerState(isSearchActive = true, searchQuery = "smile"),
+            aDefaultEmojiPickerState(
                 isSearchActive = true,
                 searchQuery = "smile",
                 searchResults = SearchBarResultState.Results(emojiList())
@@ -36,12 +33,6 @@ class EmojiPickerStateProvider : PreviewParameterProvider<EmojiPickerState> {
         )
 }
 
-private fun recentEmojisCategory() = EmojiCategory(
-    titleId = R.string.emoji_picker_category_recent,
-    icon = IconSource.Resource(CompoundDrawables.ic_compound_history),
-    emojis = emojiList(),
-)
-
 private fun emojiList(): ImmutableList<Emoji> = persistentListOf(
     Emoji(
         "0x00",
@@ -56,29 +47,46 @@ private fun emojiList(): ImmutableList<Emoji> = persistentListOf(
         "crying face",
         persistentListOf("crying"),
         persistentListOf("smile, crying"),
-        "\uD83E\uDD72",
+        "🥲",
         null
     )
 )
 
-internal fun anEmojiPickerState(
-    categories: ImmutableList<EmojiCategory> = (listOf(recentEmojisCategory()) + EmojibaseCategory.entries.map {
+internal fun aDefaultEmojiPickerState(
+    categories: ImmutableList<EmojiCategory> = EmojibaseCategory.entries.map {
         EmojiCategory(
             titleId = it.title,
             icon = IconSource.Vector(it.icon),
             emojis = emojiList(),
         )
-    }).toImmutableList(),
-    allEmojis: ImmutableList<Emoji> = categories.flatMap { it.emojis }.toImmutableList(),
+    }.toImmutableList(),
     searchQuery: String = "",
     isSearchActive: Boolean = false,
-    searchResults: SearchBarResultState<ImmutableList<Emoji>> = SearchBarResultState.Initial(),
+    searchResults: SearchBarResultState<ImmutableList<Emoji>> = SearchBarResultState.Initial,
     eventSink: (EmojiPickerEvent) -> Unit = {},
-) = EmojiPickerState(
+) = DefaultEmojiPickerState(
     categories = categories,
-    allEmojis = allEmojis,
     searchQuery = TextFieldState(initialText = searchQuery),
     isSearchActive = isSearchActive,
     searchResults = searchResults,
     eventSink = eventSink,
 )
+
+/**
+ * Public helper for external tests that need an [EmojiPickerState] instance the impl's
+ * [DefaultEmojiPickerRenderer] will accept. The no-arg overload returns a ready state
+ * (see [EmojiPickerState.isReady]); use the [emojis] overload to inject specific categories.
+ */
+fun anEmojiPickerState(): EmojiPickerState = aDefaultEmojiPickerState()
+
+fun anEmojiPickerState(
+    emojis: Map<EmojibaseCategory, ImmutableList<Emoji>>,
+): EmojiPickerState = aDefaultEmojiPickerState(
+    categories = emojis.map { (category, list) ->
+        EmojiCategory(
+            titleId = category.title,
+            icon = IconSource.Vector(category.icon),
+            emojis = list,
+        )
+    }.toImmutableList(),
+)
diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt
new file mode 100644
index 0000000000..930b42c789
--- /dev/null
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.picker
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.indication
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.PressInteraction
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.ripple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.Fill
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onPlaced
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.layout.positionInParent
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Popup
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Text
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+
+@Composable
+internal fun EmojiItem(
+    item: Emoji,
+    isSelected: Boolean,
+    onSelectEmoji: (Emoji) -> Unit,
+    onLongPress: (Emoji) -> Unit,
+    onDismissSkinPicker: () -> Unit,
+    skinPickerEmoji: Emoji?,
+    selectedSkinUnicodes: ImmutableSet<String>,
+    hasSelectedSkin: Boolean,
+    modifier: Modifier = Modifier,
+    emojiSize: TextUnit = 20.sp,
+    contentDescription: @Composable (emoji: Emoji, isSelected: Boolean) -> String = { emoji, _ -> emoji.unicode },
+) {
+    val backgroundColor = when {
+        isSelected -> ElementTheme.colors.bgActionPrimaryRest
+        hasSelectedSkin -> ElementTheme.colors.bgActionTertiarySelected
+        else -> Color.Transparent
+    }
+    val density = LocalDensity.current
+    var itemSize by remember { mutableStateOf(IntSize.Zero) }
+    var itemOffsetPercent by remember { mutableFloatStateOf(0f) }
+    var hoveredIndex by remember { mutableIntStateOf(-1) }
+    var dismissed by remember { mutableStateOf(false) }
+    val interactionSource = remember { MutableInteractionSource() }
+    val description = contentDescription(item, isSelected)
+    val hasSkinTones = !item.skins.isNullOrEmpty()
+    Box(
+        modifier = modifier
+            .onPlaced { coordinates ->
+                val position = coordinates.positionInParent()
+                val parentBounds = coordinates.parentLayoutCoordinates?.size ?: return@onPlaced
+                // Calculate the offset of the item inside its parent as a percentage, to be able to set the initial offset
+                // for the selection inside the skin tone picker relative to its size.
+                itemOffsetPercent = if (parentBounds.width > 0) {
+                    position.x / parentBounds.width
+                } else {
+                    0f
+                }
+            }
+            .sizeIn(minWidth = 40.dp, minHeight = 40.dp)
+            .onSizeChanged { itemSize = it }
+            .background(backgroundColor, CircleShape)
+            .indication(interactionSource, ripple())
+            .pointerInput(item) {
+                // Always detect long press and tap gestures
+                detectTapGestures(
+                    onPress = { pressOffset ->
+                        val press = PressInteraction.Press(pressOffset)
+                        interactionSource.emit(press)
+                        if (tryAwaitRelease()) {
+                            interactionSource.emit(PressInteraction.Release(press))
+                            if (hasSkinTones) {
+                                onSelectEmoji(item)
+                            }
+                        } else {
+                            interactionSource.emit(PressInteraction.Cancel(press))
+                        }
+                    },
+                    onTap = { onSelectEmoji(item) },
+                )
+            }
+            .then(
+                // Only detect drag after long press for those items which have a skin tone picker
+                if (hasSkinTones) {
+                    Modifier.pointerInput(item) {
+                        val slotWidthPx = with(density) { SkinToneSlotSize.toPx() }
+                        val spacingPx = with(density) { SkinToneSlotSpacing.toPx() }
+                        val paddingPx = with(density) { SkinTonePadding.toPx() }
+                        var startOffset = Offset.Zero
+                        detectDragGesturesAfterLongPress(
+                            onDragStart = { position ->
+                                startOffset = position
+                                dismissed = false
+                                onLongPress(item)
+                                hoveredIndex = -1
+                            },
+                            onDrag = { change, _ ->
+                                if (!dismissed) {
+                                    change.consume()
+                                    // It's a valid drag event if it's within ~2 items height above, so, on top of the current one or the skin tone selector,
+                                    // or 1 item below, which should be far enough to not be triggered by mistake
+                                    val isValidDrag = if (change.position.y < startOffset.y) {
+                                        startOffset.y - change.position.y <= itemSize.height * 2f
+                                    } else {
+                                        change.position.y - startOffset.y <= itemSize.height
+                                    }
+                                    if (!isValidDrag) {
+                                        dismissed = true
+                                        hoveredIndex = -1
+                                        onDismissSkinPicker()
+                                    } else {
+                                        val skinItemsCount = item.skins!!.size
+                                        // Original + variants
+                                        val totalSlots = 1 + skinItemsCount
+                                        // Calculate the whole size of the skin tone picker
+                                        val pickerWidthPx = 2 * paddingPx + totalSlots * slotWidthPx + (totalSlots - 1) * spacingPx
+                                        // Calculate the initial offset inside the picker, given the relative position of the item inside its parent
+                                        val initialOffset = pickerWidthPx * itemOffsetPercent
+                                        val xInPicker = initialOffset + change.position.x
+
+                                        // If it's a valid offset, calculate the hovered index, otherwise, set it to -1 to indicate that no item is hovered
+                                        val index = if (xInPicker in 0f..pickerWidthPx) {
+                                            (xInPicker / slotWidthPx).toInt().coerceIn(0, totalSlots - 1)
+                                        } else {
+                                            -1
+                                        }
+                                        hoveredIndex = index
+                                    }
+                                }
+                            },
+                            onDragEnd = {
+                                if (!dismissed) {
+                                    val idx = hoveredIndex
+                                    val skinCount = item.skins?.size ?: 0
+                                    if (idx in 0..skinCount) {
+                                        if (idx == 0) {
+                                            onSelectEmoji(item)
+                                        } else {
+                                            val skin = item.skins?.getOrNull(idx - 1)
+                                            if (skin != null) {
+                                                onSelectEmoji(item.copy(unicode = skin.unicode))
+                                            }
+                                        }
+                                    } else if (idx < 0) {
+                                        onSelectEmoji(item)
+                                    }
+                                }
+                                dismissed = false
+                                hoveredIndex = -1
+                                onDismissSkinPicker()
+                            },
+                            onDragCancel = {
+                                dismissed = false
+                                hoveredIndex = -1
+                            },
+                        )
+                    }
+                } else {
+                    Modifier
+                }
+            )
+            .clearAndSetSemantics {
+                this.contentDescription = description
+            },
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = item.unicode,
+            style = LocalTextStyle.current.copy(fontSize = emojiSize),
+        )
+        if (hasSkinTones) {
+            val pickerIndicatorColor = ElementTheme.colors.borderInteractivePrimary
+            Canvas(
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .size(8.dp),
+            ) {
+                val path = Path().apply {
+                    moveTo(size.width, size.height)
+                    lineTo(size.width, 0f)
+                    lineTo(0f, size.height)
+                    close()
+                }
+                drawPath(path, color = pickerIndicatorColor, style = Fill)
+            }
+        }
+
+        if (skinPickerEmoji == item) {
+            val pickerHeight = SkinTonePadding * 2 + SkinToneSlotSize
+            val popupOffsetPx = with(density) { -pickerHeight.roundToPx() }
+            Popup(
+                onDismissRequest = { onDismissSkinPicker() },
+                alignment = Alignment.BottomCenter,
+                offset = IntOffset(0, popupOffsetPx),
+            ) {
+                SkinTonePicker(
+                    emoji = item,
+                    onSelect = { selectedEmoji ->
+                        onSelectEmoji(selectedEmoji)
+                        onDismissSkinPicker()
+                    },
+                    hoveredIndex = hoveredIndex,
+                    selectedUnicodes = selectedSkinUnicodes,
+                )
+            }
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun EmojiItemPreview() = ElementPreview {
+    Row(
+        modifier = Modifier.padding(4.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        for (isSelected in listOf(false, true)) {
+            for (skinList in listOf(persistentListOf(), aSkinList())) {
+                val hasSelectedSkinValues = if (skinList.isNotEmpty()) listOf(false, true) else listOf(false)
+                for (hasSelectedSkin in hasSelectedSkinValues) {
+                    EmojiItem(
+                        item = Emoji(
+                            hexcode = "",
+                            label = "",
+                            tags = null,
+                            shortcodes = persistentListOf(),
+                            unicode = "👍",
+                            skins = skinList,
+                        ),
+                        isSelected = isSelected,
+                        onSelectEmoji = {},
+                        hasSelectedSkin = hasSelectedSkin,
+                        onLongPress = {},
+                        onDismissSkinPicker = {},
+                        skinPickerEmoji = null,
+                        selectedSkinUnicodes = persistentSetOf(),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun EmojiItemWithPopupPreview() = ElementPreview {
+    Row(
+        modifier = Modifier
+            .padding(top = 100.dp, bottom = 4.dp, start = 200.dp, end = 200.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        val item = Emoji(
+            hexcode = "",
+            label = "",
+            tags = null,
+            shortcodes = persistentListOf(),
+            unicode = "👍",
+            skins = aSkinList(),
+        )
+        EmojiItem(
+            item = item,
+            isSelected = false,
+            onSelectEmoji = {},
+            hasSelectedSkin = false,
+            onLongPress = {},
+            onDismissSkinPicker = {},
+            skinPickerEmoji = item,
+            selectedSkinUnicodes = persistentSetOf("👍🏾"),
+        )
+    }
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvent.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerEvent.kt
similarity index 71%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvent.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerEvent.kt
index 6ea5eea0f6..57cbf8e08b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerEvent.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerEvent.kt
@@ -6,8 +6,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
+package io.element.android.libraries.emoji.impl.picker
 
-sealed interface EmojiPickerEvent {
+internal sealed interface EmojiPickerEvent {
     data class ToggleSearchActive(val isActive: Boolean) : EmojiPickerEvent
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerView.kt
similarity index 74%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerView.kt
index 0575341d3d..94eaea1595 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPicker.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerView.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.timeline.components.customreaction.picker
+package io.element.android.libraries.emoji.impl.picker
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -25,20 +25,23 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SecondaryTabRow
 import androidx.compose.material3.Tab
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.emojibasebindings.Emoji
-import io.element.android.features.messages.impl.timeline.components.customreaction.EmojiItem
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toSp
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.SearchBar
-import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.emoji.impl.R
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
@@ -46,14 +49,17 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun EmojiPicker(
+internal fun EmojiPickerView(
+    state: DefaultEmojiPickerState,
     onSelectEmoji: (Emoji) -> Unit,
-    state: EmojiPickerState,
     selectedEmojis: ImmutableSet<String>,
     modifier: Modifier = Modifier,
+    contentDescription: @Composable (emoji: Emoji, isSelected: Boolean) -> String = { emoji, _ -> emoji.unicode },
 ) {
     val coroutineScope = rememberCoroutineScope()
     val pagerState = rememberPagerState(pageCount = { state.categories.size })
+    var skinPickerEmoji by remember { mutableStateOf<Emoji?>(null) }
+
     Column(modifier) {
         SearchBar(
             modifier = Modifier.padding(bottom = 10.dp),
@@ -62,12 +68,17 @@ fun EmojiPicker(
             active = state.isSearchActive,
             onActiveChange = { state.eventSink(EmojiPickerEvent.ToggleSearchActive(it)) },
             windowInsets = WindowInsets(0, 0, 0, 0),
-            placeHolderTitle = stringResource(CommonStrings.emoji_picker_search_placeholder),
+            placeHolderTitle = stringResource(R.string.emoji_picker_search_placeholder),
         ) { emojis ->
             EmojiResults(
                 emojis = emojis,
                 isEmojiSelected = { selectedEmojis.contains(it.unicode) },
                 onSelectEmoji = onSelectEmoji,
+                onLongPress = { skinPickerEmoji = it },
+                skinPickerEmoji = skinPickerEmoji,
+                onDismissSkinPicker = { skinPickerEmoji = null },
+                selectedEmojis = selectedEmojis,
+                contentDescription = contentDescription,
             )
         }
 
@@ -106,6 +117,11 @@ fun EmojiPicker(
                     emojis = emojis,
                     isEmojiSelected = { selectedEmojis.contains(it.unicode) },
                     onSelectEmoji = onSelectEmoji,
+                    onLongPress = { skinPickerEmoji = it },
+                    skinPickerEmoji = skinPickerEmoji,
+                    onDismissSkinPicker = { skinPickerEmoji = null },
+                    selectedEmojis = selectedEmojis,
+                    contentDescription = contentDescription,
                 )
             }
         }
@@ -117,6 +133,11 @@ private fun EmojiResults(
     emojis: ImmutableList<Emoji>,
     isEmojiSelected: (Emoji) -> Boolean,
     onSelectEmoji: (Emoji) -> Unit,
+    onLongPress: (Emoji) -> Unit,
+    skinPickerEmoji: Emoji?,
+    onDismissSkinPicker: () -> Unit,
+    selectedEmojis: ImmutableSet<String>,
+    contentDescription: @Composable (emoji: Emoji, isSelected: Boolean) -> String,
 ) {
     LazyVerticalGrid(
         modifier = Modifier.fillMaxSize(),
@@ -131,7 +152,13 @@ private fun EmojiResults(
                 item = item,
                 isSelected = isEmojiSelected(item),
                 onSelectEmoji = onSelectEmoji,
+                onLongPress = onLongPress,
+                skinPickerEmoji = skinPickerEmoji,
+                onDismissSkinPicker = onDismissSkinPicker,
                 emojiSize = 32.dp.toSp(),
+                selectedSkinUnicodes = selectedEmojis,
+                hasSelectedSkin = item.skins?.any { skin -> skin.unicode in selectedEmojis } == true,
+                contentDescription = contentDescription,
             )
         }
     }
@@ -139,10 +166,10 @@ private fun EmojiResults(
 
 @PreviewsDayNight
 @Composable
-internal fun EmojiPickerPreview(@PreviewParameter(EmojiPickerStateProvider::class) state: EmojiPickerState) = ElementPreview {
-    EmojiPicker(
-        onSelectEmoji = {},
+internal fun EmojiPickerViewPreview(@PreviewParameter(DefaultEmojiPickerStateProvider::class) state: DefaultEmojiPickerState) = ElementPreview {
+    EmojiPickerView(
         state = state,
+        onSelectEmoji = {},
         selectedEmojis = persistentSetOf("😀", "😄", "😃"),
         modifier = Modifier.fillMaxWidth(),
     )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojibaseExtensions.kt
similarity index 91%
rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojibaseExtensions.kt
index 0f967cc41d..c6b428a13d 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojibaseExtensions.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.messages.impl.timeline.components.customreaction
+package io.element.android.libraries.emoji.impl.picker
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
@@ -20,10 +20,10 @@ import androidx.compose.material.icons.outlined.EmojiSymbols
 import androidx.compose.material.icons.outlined.EmojiTransportation
 import androidx.compose.ui.graphics.vector.ImageVector
 import io.element.android.emojibasebindings.EmojibaseCategory
-import io.element.android.features.messages.impl.R
+import io.element.android.libraries.emoji.impl.R
 
 @get:StringRes
-val EmojibaseCategory.title: Int
+internal val EmojibaseCategory.title: Int
     get() = when (this) {
         EmojibaseCategory.People -> R.string.emoji_picker_category_people
         EmojibaseCategory.Nature -> R.string.emoji_picker_category_nature
@@ -35,7 +35,7 @@ val EmojibaseCategory.title: Int
         EmojibaseCategory.Flags -> R.string.emoji_picker_category_flags
     }
 
-val EmojibaseCategory.icon: ImageVector
+internal val EmojibaseCategory.icon: ImageVector
     get() = when (this) {
         EmojibaseCategory.People -> Icons.Outlined.EmojiPeople
         EmojibaseCategory.Nature -> Icons.Outlined.EmojiNature
diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/SkinTonePicker.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/SkinTonePicker.kt
new file mode 100644
index 0000000000..6d2618873a
--- /dev/null
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/SkinTonePicker.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.picker
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LocalTextStyle
+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.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.emojibasebindings.EmojiSkin
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.text.toSp
+import io.element.android.libraries.designsystem.theme.components.Surface
+import io.element.android.libraries.designsystem.theme.components.Text
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+
+internal val SkinToneSlotSize = 48.dp
+internal val SkinToneSlotSpacing = 2.dp
+internal val SkinTonePadding = 4.dp
+
+@Composable
+internal fun SkinTonePicker(
+    emoji: Emoji,
+    hoveredIndex: Int,
+    selectedUnicodes: ImmutableSet<String>,
+    onSelect: (Emoji) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val skins = emoji.skins.orEmpty()
+    val emojiSize = 32.dp.toSp()
+
+    Surface(
+        modifier = modifier,
+        shape = RoundedCornerShape(12.dp),
+        color = ElementTheme.colors.bgCanvasDefault,
+        tonalElevation = 4.dp,
+    ) {
+        Row(
+            modifier = Modifier.padding(SkinTonePadding),
+            horizontalArrangement = Arrangement.spacedBy(SkinToneSlotSpacing),
+        ) {
+            SkinToneSlot(
+                unicode = emoji.unicode,
+                emojiSize = emojiSize,
+                isHovered = hoveredIndex == 0,
+                isSelected = emoji.unicode in selectedUnicodes,
+                onClick = { onSelect(emoji) },
+            )
+            skins.forEachIndexed { index, skin ->
+                SkinToneSlot(
+                    unicode = skin.unicode,
+                    emojiSize = emojiSize,
+                    isHovered = hoveredIndex == index + 1,
+                    isSelected = skin.unicode in selectedUnicodes,
+                    onClick = { onSelect(emoji.copy(unicode = skin.unicode)) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun SkinToneSlot(
+    unicode: String,
+    emojiSize: TextUnit,
+    isHovered: Boolean,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+) {
+    val background = when {
+        isSelected && isHovered -> ElementTheme.colors.bgActionPrimaryPressed
+        isSelected -> ElementTheme.colors.bgActionPrimaryRest
+        isHovered -> ElementTheme.colors.bgActionPrimaryHovered
+        else -> Color.Transparent
+    }
+    Box(
+        modifier = Modifier
+            .size(SkinToneSlotSize)
+            .clip(CircleShape)
+            .background(background, CircleShape)
+            .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = unicode,
+            style = LocalTextStyle.current.copy(fontSize = emojiSize),
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun SkinTonePickerPreview() = ElementPreview {
+    SkinTonePicker(
+        emoji = Emoji(
+            hexcode = "1F44D",
+            label = "thumbs up",
+            tags = null,
+            shortcodes = persistentListOf("+1", "thumbsup"),
+            unicode = "👍",
+            skins = aSkinList(),
+        ),
+        hoveredIndex = -1,
+        selectedUnicodes = persistentSetOf(),
+        onSelect = {},
+    )
+}
+
+internal fun aSkinList() = persistentListOf(
+    EmojiSkin("1F44D-1F3FB", "thumbs up: light skin tone", "👍🏻"),
+    EmojiSkin("1F44D-1F3FC", "thumbs up: medium-light skin tone", "👍🏼"),
+    EmojiSkin("1F44D-1F3FD", "thumbs up: medium skin tone", "👍🏽"),
+    EmojiSkin("1F44D-1F3FE", "thumbs up: medium-dark skin tone", "👍🏾"),
+    EmojiSkin("1F44D-1F3FF", "thumbs up: dark skin tone", "👍🏿"),
+)
diff --git a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultAddRecentEmoji.kt
similarity index 86%
rename from libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultAddRecentEmoji.kt
index 4444d7e01a..cc9da75fd8 100644
--- a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultAddRecentEmoji.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultAddRecentEmoji.kt
@@ -6,13 +6,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.impl
+package io.element.android.libraries.emoji.impl.recentemojis
 
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.recentemojis.AddRecentEmoji
 import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.recentemojis.api.AddRecentEmoji
 import kotlinx.coroutines.withContext
 
 @ContributesBinding(SessionScope::class)
diff --git a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojis.kt
similarity index 83%
rename from libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt
rename to libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojis.kt
index 9c5ed178dd..412332e984 100644
--- a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojis.kt
+++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojis.kt
@@ -6,14 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.impl
+package io.element.android.libraries.emoji.impl.recentemojis
 
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
+import io.element.android.libraries.emoji.impl.EmojibaseProvider
 import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.recentemojis.api.EmojibaseProvider
-import io.element.android.libraries.recentemojis.api.GetRecentEmojis
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.withContext
@@ -25,7 +25,7 @@ class DefaultGetRecentEmojis(
     private val emojibaseProvider: EmojibaseProvider,
 ) : GetRecentEmojis {
     override suspend operator fun invoke(): Result<ImmutableList<String>> = withContext(dispatchers.io) {
-        val allEmojis = emojibaseProvider.emojibaseStore.allEmojis
+        val allEmojis = emojibaseProvider.getStore().allEmojis
         client.getRecentEmojis()
             .map { emojis ->
                 // Remove any possible duplicates
diff --git a/libraries/emoji/impl/src/main/res/values-be/translations.xml b/libraries/emoji/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..6b07d89e30
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-be/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Актыўнасці"</string>
+  <string name="emoji_picker_category_flags">"Сцягі"</string>
+  <string name="emoji_picker_category_foods">"Ежа &amp; Напоі"</string>
+  <string name="emoji_picker_category_nature">"Жывёлы &amp; Прырода"</string>
+  <string name="emoji_picker_category_objects">"Аб\'екты"</string>
+  <string name="emoji_picker_category_people">"Усмешкі &amp; Удзельнікі"</string>
+  <string name="emoji_picker_category_places">"Падарожжы &amp; Месцы"</string>
+  <string name="emoji_picker_category_symbols">"Сімвалы"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-bg/translations.xml b/libraries/emoji/impl/src/main/res/values-bg/translations.xml
new file mode 100644
index 0000000000..465b88d91f
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-bg/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Дейности"</string>
+  <string name="emoji_picker_category_flags">"Знамена"</string>
+  <string name="emoji_picker_category_foods">"Храна &amp; Напитки"</string>
+  <string name="emoji_picker_category_nature">"Животни &amp; Природа"</string>
+  <string name="emoji_picker_category_objects">"Обекти"</string>
+  <string name="emoji_picker_category_people">"Усмивки &amp; Хора"</string>
+  <string name="emoji_picker_category_places">"Пътуване &amp; Места"</string>
+  <string name="emoji_picker_category_symbols">"Символи"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ca/translations.xml b/libraries/emoji/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..eec4847ec4
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activitats"</string>
+  <string name="emoji_picker_category_flags">"Banderes"</string>
+  <string name="emoji_picker_category_foods">"Menjar &amp; begudes"</string>
+  <string name="emoji_picker_category_nature">"Animals i naturalesa"</string>
+  <string name="emoji_picker_category_objects">"Objectes"</string>
+  <string name="emoji_picker_category_people">"Cares i persones"</string>
+  <string name="emoji_picker_category_places">"Viatges i llocs"</string>
+  <string name="emoji_picker_category_recent">"Emoticones recents"</string>
+  <string name="emoji_picker_category_symbols">"Símbols"</string>
+  <string name="emoji_picker_search_placeholder">"Cerca emoticones"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-cs/translations.xml b/libraries/emoji/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..899a4ab0da
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-cs/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivity"</string>
+  <string name="emoji_picker_category_flags">"Vlajky"</string>
+  <string name="emoji_picker_category_foods">"Jídlo a nápoje"</string>
+  <string name="emoji_picker_category_nature">"Zvířata a příroda"</string>
+  <string name="emoji_picker_category_objects">"Předměty"</string>
+  <string name="emoji_picker_category_people">"Smajlíci a lidé"</string>
+  <string name="emoji_picker_category_places">"Cestování a místa"</string>
+  <string name="emoji_picker_category_recent">"Nedávné emotikony"</string>
+  <string name="emoji_picker_category_symbols">"Symboly"</string>
+  <string name="emoji_picker_search_placeholder">"Hledat emotikony"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-cy/translations.xml b/libraries/emoji/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..d2dc0d1f3c
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-cy/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Gweithgareddau"</string>
+  <string name="emoji_picker_category_flags">"Baneri"</string>
+  <string name="emoji_picker_category_foods">"Bwyd a Diod"</string>
+  <string name="emoji_picker_category_nature">"Anifeiliaid a Natur"</string>
+  <string name="emoji_picker_category_objects">"Gwrthrychau"</string>
+  <string name="emoji_picker_category_people">"Wynebau Hapus a Phobl"</string>
+  <string name="emoji_picker_category_places">"Teithio a Llefydd"</string>
+  <string name="emoji_picker_category_recent">"Emojis diweddar"</string>
+  <string name="emoji_picker_category_symbols">"Symbolau"</string>
+  <string name="emoji_picker_search_placeholder">"Chwilio emojis"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-da/translations.xml b/libraries/emoji/impl/src/main/res/values-da/translations.xml
new file mode 100644
index 0000000000..ae0e860608
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-da/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
+  <string name="emoji_picker_category_flags">"Flag"</string>
+  <string name="emoji_picker_category_foods">"Mad og drikke"</string>
+  <string name="emoji_picker_category_nature">"Dyr og natur"</string>
+  <string name="emoji_picker_category_objects">"Objekter"</string>
+  <string name="emoji_picker_category_people">"Smileys og personer"</string>
+  <string name="emoji_picker_category_places">"Rejser og steder"</string>
+  <string name="emoji_picker_category_recent">"Seneste emojis"</string>
+  <string name="emoji_picker_category_symbols">"Symboler"</string>
+  <string name="emoji_picker_search_placeholder">"Søg emojis"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-de/translations.xml b/libraries/emoji/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..874769c469
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-de/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivitäten"</string>
+  <string name="emoji_picker_category_flags">"Flaggen"</string>
+  <string name="emoji_picker_category_foods">"Essen &amp; Trinken"</string>
+  <string name="emoji_picker_category_nature">"Tiere &amp; Natur"</string>
+  <string name="emoji_picker_category_objects">"Objekte"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; Menschen"</string>
+  <string name="emoji_picker_category_places">"Reisen &amp; Orte"</string>
+  <string name="emoji_picker_category_recent">"Zuletzt verwendete Emojis"</string>
+  <string name="emoji_picker_category_symbols">"Symbole"</string>
+  <string name="emoji_picker_search_placeholder">"Emojis suchen"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-el/translations.xml b/libraries/emoji/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..c61f78e1da
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-el/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Δραστηριότητες"</string>
+  <string name="emoji_picker_category_flags">"Σημαίες"</string>
+  <string name="emoji_picker_category_foods">"Φαγητό &amp; Ποτό"</string>
+  <string name="emoji_picker_category_nature">"Ζώα &amp; Φύση"</string>
+  <string name="emoji_picker_category_objects">"Αντικείμενα"</string>
+  <string name="emoji_picker_category_people">"Φατσούλες &amp; Άνθρωποι"</string>
+  <string name="emoji_picker_category_places">"Ταξίδια &amp; Μέρη"</string>
+  <string name="emoji_picker_category_recent">"Πρόσφατα emoji"</string>
+  <string name="emoji_picker_category_symbols">"Σύμβολα"</string>
+  <string name="emoji_picker_search_placeholder">"Αναζήτηση emoji"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-es/translations.xml b/libraries/emoji/impl/src/main/res/values-es/translations.xml
new file mode 100644
index 0000000000..7a694296b2
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-es/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Actividades"</string>
+  <string name="emoji_picker_category_flags">"Banderas"</string>
+  <string name="emoji_picker_category_foods">"Comida y bebida"</string>
+  <string name="emoji_picker_category_nature">"Animales y naturaleza"</string>
+  <string name="emoji_picker_category_objects">"Objetos"</string>
+  <string name="emoji_picker_category_people">"Emojis y personas"</string>
+  <string name="emoji_picker_category_places">"Viajes y lugares"</string>
+  <string name="emoji_picker_category_symbols">"Símbolos"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-et/translations.xml b/libraries/emoji/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..881a342c8d
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Tegevused"</string>
+  <string name="emoji_picker_category_flags">"Lipud"</string>
+  <string name="emoji_picker_category_foods">"Toit ja jook"</string>
+  <string name="emoji_picker_category_nature">"Loomad ja loodus"</string>
+  <string name="emoji_picker_category_objects">"Esemed"</string>
+  <string name="emoji_picker_category_people">"Emotikonid ja inimesed"</string>
+  <string name="emoji_picker_category_places">"Reisimine ja kohad"</string>
+  <string name="emoji_picker_category_recent">"Hiljutised emojid"</string>
+  <string name="emoji_picker_category_symbols">"Sümbolid"</string>
+  <string name="emoji_picker_search_placeholder">"Otsi emojisid"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-eu/translations.xml b/libraries/emoji/impl/src/main/res/values-eu/translations.xml
new file mode 100644
index 0000000000..a5cce4e187
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-eu/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Jarduerak"</string>
+  <string name="emoji_picker_category_flags">"Banderak"</string>
+  <string name="emoji_picker_category_foods">"Jana eta edana"</string>
+  <string name="emoji_picker_category_nature">"Animaliak eta natura"</string>
+  <string name="emoji_picker_category_objects">"Objektuak"</string>
+  <string name="emoji_picker_category_people">"Irribartxoak eta jendea"</string>
+  <string name="emoji_picker_category_places">"Bidaiak eta tokiak"</string>
+  <string name="emoji_picker_category_symbols">"Ikurrak"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-fa/translations.xml b/libraries/emoji/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..7c19e79b30
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-fa/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"فعّالیت‌ها"</string>
+  <string name="emoji_picker_category_flags">"پرچم‌ها"</string>
+  <string name="emoji_picker_category_foods">"غذا و نوشیدنی"</string>
+  <string name="emoji_picker_category_nature">"حیوانات و طبعیت"</string>
+  <string name="emoji_picker_category_objects">"اشیا"</string>
+  <string name="emoji_picker_category_people">"شکلک‌ها و افراد"</string>
+  <string name="emoji_picker_category_places">"سفر و مکان‌ها"</string>
+  <string name="emoji_picker_category_recent">"شکلک‌های اخیر"</string>
+  <string name="emoji_picker_category_symbols">"نمادها"</string>
+  <string name="emoji_picker_search_placeholder">"حست‌وجوی شکلک‌ها"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-fi/translations.xml b/libraries/emoji/impl/src/main/res/values-fi/translations.xml
new file mode 100644
index 0000000000..d41d0a8af1
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-fi/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktiviteetit"</string>
+  <string name="emoji_picker_category_flags">"Liput"</string>
+  <string name="emoji_picker_category_foods">"Ruoka ja juoma"</string>
+  <string name="emoji_picker_category_nature">"Eläimet ja luonto"</string>
+  <string name="emoji_picker_category_objects">"Esineet"</string>
+  <string name="emoji_picker_category_people">"Hymiöt ja ihmiset"</string>
+  <string name="emoji_picker_category_places">"Matkustaminen ja paikat"</string>
+  <string name="emoji_picker_category_recent">"Viimeaikaiset emojit"</string>
+  <string name="emoji_picker_category_symbols">"Symbolit"</string>
+  <string name="emoji_picker_search_placeholder">"Etsi emojeja"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-fr/translations.xml b/libraries/emoji/impl/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..856b5a1064
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-fr/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activités"</string>
+  <string name="emoji_picker_category_flags">"Drapeaux"</string>
+  <string name="emoji_picker_category_foods">"Nourriture et boissons"</string>
+  <string name="emoji_picker_category_nature">"Animaux et nature"</string>
+  <string name="emoji_picker_category_objects">"Objets"</string>
+  <string name="emoji_picker_category_people">"Émoticônes et personnes"</string>
+  <string name="emoji_picker_category_places">"Voyages &amp; lieux"</string>
+  <string name="emoji_picker_category_recent">"Emojis récents"</string>
+  <string name="emoji_picker_category_symbols">"Symboles"</string>
+  <string name="emoji_picker_search_placeholder">"Chercher des emojis"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-hr/translations.xml b/libraries/emoji/impl/src/main/res/values-hr/translations.xml
new file mode 100644
index 0000000000..db677e5362
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-hr/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivnosti"</string>
+  <string name="emoji_picker_category_flags">"Zastave"</string>
+  <string name="emoji_picker_category_foods">"Hrana i piće"</string>
+  <string name="emoji_picker_category_nature">"Životinje i priroda"</string>
+  <string name="emoji_picker_category_objects">"Objekti"</string>
+  <string name="emoji_picker_category_people">"Emotikoni i osobe"</string>
+  <string name="emoji_picker_category_places">"Putovanja i mjesta"</string>
+  <string name="emoji_picker_category_recent">"Nedavni emotikoni"</string>
+  <string name="emoji_picker_category_symbols">"Simboli"</string>
+  <string name="emoji_picker_search_placeholder">"Pretraživanje emotikona"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-hu/translations.xml b/libraries/emoji/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..a6542d118a
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-hu/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Tevékenységek"</string>
+  <string name="emoji_picker_category_flags">"Zászlók"</string>
+  <string name="emoji_picker_category_foods">"Étel és ital"</string>
+  <string name="emoji_picker_category_nature">"Állatok és természet"</string>
+  <string name="emoji_picker_category_objects">"Tárgyak"</string>
+  <string name="emoji_picker_category_people">"Mosolyok és emberek"</string>
+  <string name="emoji_picker_category_places">"Utazás és helyek"</string>
+  <string name="emoji_picker_category_recent">"Legutóbbi emodzsik"</string>
+  <string name="emoji_picker_category_symbols">"Szimbólumok"</string>
+  <string name="emoji_picker_search_placeholder">"Emodzsik keresése"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-in/translations.xml b/libraries/emoji/impl/src/main/res/values-in/translations.xml
new file mode 100644
index 0000000000..20ff1aa10a
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-in/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivitas"</string>
+  <string name="emoji_picker_category_flags">"Bendera"</string>
+  <string name="emoji_picker_category_foods">"Makanan &amp; Minuman"</string>
+  <string name="emoji_picker_category_nature">"Hewan &amp; Alam"</string>
+  <string name="emoji_picker_category_objects">"Objek"</string>
+  <string name="emoji_picker_category_people">"Senyuman &amp; Orang"</string>
+  <string name="emoji_picker_category_places">"Wisata &amp; Tempat"</string>
+  <string name="emoji_picker_category_recent">"Emojis Sebelumnya"</string>
+  <string name="emoji_picker_category_symbols">"Simbol"</string>
+  <string name="emoji_picker_search_placeholder">"Cari emoji"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-it/translations.xml b/libraries/emoji/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..dbfb9ac6f4
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-it/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Attività"</string>
+  <string name="emoji_picker_category_flags">"Bandiere"</string>
+  <string name="emoji_picker_category_foods">"Cibi &amp; Bevande"</string>
+  <string name="emoji_picker_category_nature">"Animali &amp; Natura"</string>
+  <string name="emoji_picker_category_objects">"Oggetti"</string>
+  <string name="emoji_picker_category_people">"Faccine &amp; Persone"</string>
+  <string name="emoji_picker_category_places">"Viaggi &amp; Luoghi"</string>
+  <string name="emoji_picker_category_recent">"Emoji recenti"</string>
+  <string name="emoji_picker_category_symbols">"Simboli"</string>
+  <string name="emoji_picker_search_placeholder">"Cerca emoji"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ja/translations.xml b/libraries/emoji/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..273422bd11
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"アクティビティ"</string>
+  <string name="emoji_picker_category_flags">"旗"</string>
+  <string name="emoji_picker_category_foods">"食べ物"</string>
+  <string name="emoji_picker_category_nature">"動物・自然"</string>
+  <string name="emoji_picker_category_objects">"物"</string>
+  <string name="emoji_picker_category_people">"顔・人"</string>
+  <string name="emoji_picker_category_places">"旅・場所"</string>
+  <string name="emoji_picker_category_recent">"最近使用"</string>
+  <string name="emoji_picker_category_symbols">"記号"</string>
+  <string name="emoji_picker_search_placeholder">"絵文字を検索"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ka/translations.xml b/libraries/emoji/impl/src/main/res/values-ka/translations.xml
new file mode 100644
index 0000000000..0cfa48d863
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ka/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"აქტივობები"</string>
+  <string name="emoji_picker_category_flags">"დროშები"</string>
+  <string name="emoji_picker_category_foods">"Საჭმელ-სასმელი"</string>
+  <string name="emoji_picker_category_nature">"ცხოველები &amp; ბუნება"</string>
+  <string name="emoji_picker_category_objects">"ობიექტები"</string>
+  <string name="emoji_picker_category_people">"ღიმილები &amp; ხალხი"</string>
+  <string name="emoji_picker_category_places">"მოგზაურობა და ადგილები"</string>
+  <string name="emoji_picker_category_symbols">"სიმბოლოები"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ko/translations.xml b/libraries/emoji/impl/src/main/res/values-ko/translations.xml
new file mode 100644
index 0000000000..7ab40e73ed
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ko/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"활동"</string>
+  <string name="emoji_picker_category_flags">"깃발"</string>
+  <string name="emoji_picker_category_foods">"음식 &amp; 음료"</string>
+  <string name="emoji_picker_category_nature">"동물 &amp; 자연"</string>
+  <string name="emoji_picker_category_objects">"사물"</string>
+  <string name="emoji_picker_category_people">"표정 &amp; 사람"</string>
+  <string name="emoji_picker_category_places">"여행 &amp; 장소"</string>
+  <string name="emoji_picker_category_recent">"최근 이모지"</string>
+  <string name="emoji_picker_category_symbols">"상징"</string>
+  <string name="emoji_picker_search_placeholder">"이모지 검색"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-lt/translations.xml b/libraries/emoji/impl/src/main/res/values-lt/translations.xml
new file mode 100644
index 0000000000..3affbd9124
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-lt/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Veikla"</string>
+  <string name="emoji_picker_category_flags">"Vėliavos"</string>
+  <string name="emoji_picker_category_foods">"Maistas ir Gėrimai"</string>
+  <string name="emoji_picker_category_nature">"Gyvūnai ir Gamta"</string>
+  <string name="emoji_picker_category_objects">"Objektai"</string>
+  <string name="emoji_picker_category_people">"Šypsenėlės ir Žmonės"</string>
+  <string name="emoji_picker_category_places">"Kelionės ir Vietovės"</string>
+  <string name="emoji_picker_category_symbols">"Simboliai"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-nb/translations.xml b/libraries/emoji/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..dd7ddd8cd2
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-nb/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
+  <string name="emoji_picker_category_flags">"Flagg"</string>
+  <string name="emoji_picker_category_foods">"Mat og drikke"</string>
+  <string name="emoji_picker_category_nature">"Dyr og natur"</string>
+  <string name="emoji_picker_category_objects">"Gjenstander"</string>
+  <string name="emoji_picker_category_people">"Smilefjes og mennesker"</string>
+  <string name="emoji_picker_category_places">"Reising og steder"</string>
+  <string name="emoji_picker_category_recent">"Nylige emojier"</string>
+  <string name="emoji_picker_category_symbols">"Symboler"</string>
+  <string name="emoji_picker_search_placeholder">"Søk etter emojier"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-nl/translations.xml b/libraries/emoji/impl/src/main/res/values-nl/translations.xml
new file mode 100644
index 0000000000..bd4f28f420
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-nl/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activiteiten"</string>
+  <string name="emoji_picker_category_flags">"Vlaggen"</string>
+  <string name="emoji_picker_category_foods">"Eten &amp; Drinken"</string>
+  <string name="emoji_picker_category_nature">"Dieren &amp; Natuur"</string>
+  <string name="emoji_picker_category_objects">"Voorwerpen"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; Mensen"</string>
+  <string name="emoji_picker_category_places">"Reizen &amp; Locaties"</string>
+  <string name="emoji_picker_category_symbols">"Symbolen"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-pl/translations.xml b/libraries/emoji/impl/src/main/res/values-pl/translations.xml
new file mode 100644
index 0000000000..c59f2c6b54
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-pl/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktywności"</string>
+  <string name="emoji_picker_category_flags">"Flagi"</string>
+  <string name="emoji_picker_category_foods">"Jedzenie i napoje"</string>
+  <string name="emoji_picker_category_nature">"Zwierzęta i natura"</string>
+  <string name="emoji_picker_category_objects">"Obiekty"</string>
+  <string name="emoji_picker_category_people">"Buźki i osoby"</string>
+  <string name="emoji_picker_category_places">"Podróż i miejsca"</string>
+  <string name="emoji_picker_category_recent">"Ostatnie emoji"</string>
+  <string name="emoji_picker_category_symbols">"Symbole"</string>
+  <string name="emoji_picker_search_placeholder">"Wyszukaj emoji"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-pt-rBR/translations.xml b/libraries/emoji/impl/src/main/res/values-pt-rBR/translations.xml
new file mode 100644
index 0000000000..aa0c06f602
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-pt-rBR/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Atividades"</string>
+  <string name="emoji_picker_category_flags">"Bandeiras"</string>
+  <string name="emoji_picker_category_foods">"Comida &amp; Bebida"</string>
+  <string name="emoji_picker_category_nature">"Animais &amp; Natureza"</string>
+  <string name="emoji_picker_category_objects">"Objetos"</string>
+  <string name="emoji_picker_category_people">"Sorrisos &amp; Pessoas"</string>
+  <string name="emoji_picker_category_places">"Viagens &amp; Lugares"</string>
+  <string name="emoji_picker_category_recent">"Emojis recentes"</string>
+  <string name="emoji_picker_category_symbols">"Símbolos"</string>
+  <string name="emoji_picker_search_placeholder">"Pesquisar emojis"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-pt/translations.xml b/libraries/emoji/impl/src/main/res/values-pt/translations.xml
new file mode 100644
index 0000000000..02ecf31351
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-pt/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Atividades"</string>
+  <string name="emoji_picker_category_flags">"Bandeiras"</string>
+  <string name="emoji_picker_category_foods">"Comidas e Bebidas"</string>
+  <string name="emoji_picker_category_nature">"Animais e Natureza"</string>
+  <string name="emoji_picker_category_objects">"Objetos"</string>
+  <string name="emoji_picker_category_people">"Caras e Pessoas"</string>
+  <string name="emoji_picker_category_places">"Viagens e Lugares"</string>
+  <string name="emoji_picker_category_recent">"Emojis recentes"</string>
+  <string name="emoji_picker_category_symbols">"Símbolos"</string>
+  <string name="emoji_picker_search_placeholder">"Pesquisar emojis"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ro/translations.xml b/libraries/emoji/impl/src/main/res/values-ro/translations.xml
new file mode 100644
index 0000000000..410bcef3bc
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ro/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activități"</string>
+  <string name="emoji_picker_category_flags">"Steaguri"</string>
+  <string name="emoji_picker_category_foods">"Mâncare &amp; Băutură"</string>
+  <string name="emoji_picker_category_nature">"Animale și Natură"</string>
+  <string name="emoji_picker_category_objects">"Obiecte"</string>
+  <string name="emoji_picker_category_people">"Fețe zâmbitoare &amp; Oameni"</string>
+  <string name="emoji_picker_category_places">"Călătorii &amp; Locuri"</string>
+  <string name="emoji_picker_category_recent">"Emoticoane recente"</string>
+  <string name="emoji_picker_category_symbols">"Simboluri"</string>
+  <string name="emoji_picker_search_placeholder">"Căutați emoticoane"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ru/translations.xml b/libraries/emoji/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..2b975ac252
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ru/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Активности"</string>
+  <string name="emoji_picker_category_flags">"Флаги"</string>
+  <string name="emoji_picker_category_foods">"Еда и напитки"</string>
+  <string name="emoji_picker_category_nature">"Животные и природа"</string>
+  <string name="emoji_picker_category_objects">"Объекты"</string>
+  <string name="emoji_picker_category_people">"Эмодзи и люди"</string>
+  <string name="emoji_picker_category_places">"Путешествия и места"</string>
+  <string name="emoji_picker_category_recent">"Недавние эмодзи"</string>
+  <string name="emoji_picker_category_symbols">"Символы"</string>
+  <string name="emoji_picker_search_placeholder">"Поиск эмодзи"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-sk/translations.xml b/libraries/emoji/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..09257c943c
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-sk/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivity"</string>
+  <string name="emoji_picker_category_flags">"Vlajky"</string>
+  <string name="emoji_picker_category_foods">"Jedlo a nápoje"</string>
+  <string name="emoji_picker_category_nature">"Zvieratá a príroda"</string>
+  <string name="emoji_picker_category_objects">"Predmety"</string>
+  <string name="emoji_picker_category_people">"Smajlíky a ľudia"</string>
+  <string name="emoji_picker_category_places">"Cestovanie a miesta"</string>
+  <string name="emoji_picker_category_recent">"Nedávne emotikony"</string>
+  <string name="emoji_picker_category_symbols">"Symboly"</string>
+  <string name="emoji_picker_search_placeholder">"Hľadať emotikony"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-sv/translations.xml b/libraries/emoji/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..8484eb80bb
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-sv/translations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktiviteter"</string>
+  <string name="emoji_picker_category_flags">"Flaggor"</string>
+  <string name="emoji_picker_category_foods">"Mat &amp; dryck"</string>
+  <string name="emoji_picker_category_nature">"Djur &amp; natur"</string>
+  <string name="emoji_picker_category_objects">"Föremål"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; personer"</string>
+  <string name="emoji_picker_category_places">"Resor &amp; platser"</string>
+  <string name="emoji_picker_category_symbols">"Symboler"</string>
+  <string name="emoji_picker_search_placeholder">"Sök emojier"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-tr/translations.xml b/libraries/emoji/impl/src/main/res/values-tr/translations.xml
new file mode 100644
index 0000000000..f27e7d29eb
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-tr/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktiviteler"</string>
+  <string name="emoji_picker_category_flags">"Bayraklar"</string>
+  <string name="emoji_picker_category_foods">"Yiyecek ve İçecek"</string>
+  <string name="emoji_picker_category_nature">"Hayvanlar ve Doğa"</string>
+  <string name="emoji_picker_category_objects">"Nesneler"</string>
+  <string name="emoji_picker_category_people">"İfadeler ve İnsanlar"</string>
+  <string name="emoji_picker_category_places">"Seyahat ve Yerler"</string>
+  <string name="emoji_picker_category_symbols">"Simgeler"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-uk/translations.xml b/libraries/emoji/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..c05a4576bf
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-uk/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Дії"</string>
+  <string name="emoji_picker_category_flags">"Прапори"</string>
+  <string name="emoji_picker_category_foods">"Їжа та напої"</string>
+  <string name="emoji_picker_category_nature">"Тварини та природа"</string>
+  <string name="emoji_picker_category_objects">"Об\'єкти"</string>
+  <string name="emoji_picker_category_people">"Смайлики та люди"</string>
+  <string name="emoji_picker_category_places">"Подорожі та місця"</string>
+  <string name="emoji_picker_category_recent">"Нещодавні емодзі"</string>
+  <string name="emoji_picker_category_symbols">"Символи"</string>
+  <string name="emoji_picker_search_placeholder">"Пошук емоджі"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-ur/translations.xml b/libraries/emoji/impl/src/main/res/values-ur/translations.xml
new file mode 100644
index 0000000000..b1c0848e2b
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-ur/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"سرگرمیاں"</string>
+  <string name="emoji_picker_category_flags">"جھنڈے"</string>
+  <string name="emoji_picker_category_foods">"طعم و مشروب"</string>
+  <string name="emoji_picker_category_nature">"حیوانات و فطرت"</string>
+  <string name="emoji_picker_category_objects">"اشیاء"</string>
+  <string name="emoji_picker_category_people">"مسکراہٹیں و لوگ"</string>
+  <string name="emoji_picker_category_places">"سفر و مقامات"</string>
+  <string name="emoji_picker_category_symbols">"علامتیں"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-uz/translations.xml b/libraries/emoji/impl/src/main/res/values-uz/translations.xml
new file mode 100644
index 0000000000..692c23b0cc
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-uz/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Faoliyatlar"</string>
+  <string name="emoji_picker_category_flags">"Bayroqlar"</string>
+  <string name="emoji_picker_category_foods">"Oziq-ovqat va ichimliklar"</string>
+  <string name="emoji_picker_category_nature">"Hayvonlar va tabiat"</string>
+  <string name="emoji_picker_category_objects">"Ob\'ektlar"</string>
+  <string name="emoji_picker_category_people">"Smayllar va odamlar"</string>
+  <string name="emoji_picker_category_places">"Sayohat va Joylar"</string>
+  <string name="emoji_picker_category_recent">"Oxirgi kulgichlar"</string>
+  <string name="emoji_picker_category_symbols">"Belgilar"</string>
+  <string name="emoji_picker_search_placeholder">"Emojilarni qidiring"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-vi/translations.xml b/libraries/emoji/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..1b8e165600
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Hoạt động"</string>
+  <string name="emoji_picker_category_flags">"Cờ"</string>
+  <string name="emoji_picker_category_foods">"Thực phẩm và đồ uống"</string>
+  <string name="emoji_picker_category_nature">"Động vật và thiên nhiên"</string>
+  <string name="emoji_picker_category_objects">"Đồ vật"</string>
+  <string name="emoji_picker_category_people">"Mặt cười &amp; mọi người"</string>
+  <string name="emoji_picker_category_places">"Du lịch và địa danh"</string>
+  <string name="emoji_picker_category_recent">"Biểu tượng cảm xúc gần đây"</string>
+  <string name="emoji_picker_category_symbols">"Biểu tượng"</string>
+  <string name="emoji_picker_search_placeholder">"Tìm kiếm biểu tượng cảm xúc"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/emoji/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..4461477da5
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"活動"</string>
+  <string name="emoji_picker_category_flags">"旗幟"</string>
+  <string name="emoji_picker_category_foods">"食物與飲料"</string>
+  <string name="emoji_picker_category_nature">"動物與大自然"</string>
+  <string name="emoji_picker_category_objects">"物品"</string>
+  <string name="emoji_picker_category_people">"表情與人物"</string>
+  <string name="emoji_picker_category_places">"旅行與景點"</string>
+  <string name="emoji_picker_category_recent">"最近使用的表情符號"</string>
+  <string name="emoji_picker_category_symbols">"標誌"</string>
+  <string name="emoji_picker_search_placeholder">"搜尋表情符號"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values-zh/translations.xml b/libraries/emoji/impl/src/main/res/values-zh/translations.xml
new file mode 100644
index 0000000000..b4e8c6c859
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values-zh/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"节假日"</string>
+  <string name="emoji_picker_category_flags">"旗帜"</string>
+  <string name="emoji_picker_category_foods">"饮食"</string>
+  <string name="emoji_picker_category_nature">"动物和自然"</string>
+  <string name="emoji_picker_category_objects">"日常物品"</string>
+  <string name="emoji_picker_category_people">"表情和人物"</string>
+  <string name="emoji_picker_category_places">"文旅景点"</string>
+  <string name="emoji_picker_category_recent">"最近的 Emoji"</string>
+  <string name="emoji_picker_category_symbols">"符号"</string>
+  <string name="emoji_picker_search_placeholder">"搜索 Emoji"</string>
+</resources>
diff --git a/libraries/emoji/impl/src/main/res/values/localazy.xml b/libraries/emoji/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..f767a29ecb
--- /dev/null
+++ b/libraries/emoji/impl/src/main/res/values/localazy.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activities"</string>
+  <string name="emoji_picker_category_flags">"Flags"</string>
+  <string name="emoji_picker_category_foods">"Food &amp; Drink"</string>
+  <string name="emoji_picker_category_nature">"Animals &amp; Nature"</string>
+  <string name="emoji_picker_category_objects">"Objects"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; People"</string>
+  <string name="emoji_picker_category_places">"Travel &amp; Places"</string>
+  <string name="emoji_picker_category_recent">"Recent emojis"</string>
+  <string name="emoji_picker_category_symbols">"Symbols"</string>
+  <string name="emoji_picker_search_placeholder">"Search emojis"</string>
+</resources>
diff --git a/libraries/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.kt b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/fixtures/FakeEmojibaseProvider.kt
similarity index 60%
rename from libraries/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.kt
rename to libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/fixtures/FakeEmojibaseProvider.kt
index 4774144707..f01b6a1268 100644
--- a/libraries/recentemojis/test/src/main/kotlin/io/element/android/libraries/recentemojis/test/FakeEmojibaseProvider.kt
+++ b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/fixtures/FakeEmojibaseProvider.kt
@@ -6,18 +6,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.test
+package io.element.android.libraries.emoji.impl.fixtures
 
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.emojibasebindings.EmojibaseCategory
 import io.element.android.emojibasebindings.EmojibaseStore
-import io.element.android.libraries.recentemojis.api.EmojibaseProvider
+import io.element.android.libraries.emoji.impl.EmojibaseProvider
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toPersistentMap
 
-class FakeEmojibaseProvider(
-    val emojis: Map<EmojibaseCategory, ImmutableList<Emoji>> = mapOf(),
+internal class FakeEmojibaseProvider(
+    emojis: Map<EmojibaseCategory, ImmutableList<Emoji>> = mapOf(),
 ) : EmojibaseProvider {
-    override val emojibaseStore: EmojibaseStore
-        get() = EmojibaseStore(emojis.toPersistentMap())
+    private val store = EmojibaseStore(emojis.toPersistentMap())
+    override suspend fun getStore(): EmojibaseStore = store
 }
diff --git a/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerPresenterTest.kt b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerPresenterTest.kt
new file mode 100644
index 0000000000..cf1a68f9d5
--- /dev/null
+++ b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiPickerPresenterTest.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.picker
+
+import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
+import app.cash.turbine.TurbineTestContext
+import com.google.common.truth.Truth.assertThat
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.emojibasebindings.EmojibaseCategory
+import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
+import io.element.android.libraries.emoji.impl.fixtures.FakeEmojibaseProvider
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import io.element.android.tests.testutils.test
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class EmojiPickerPresenterTest : RobolectricTest() {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `updating search query loads new results`() = runTest {
+        createPresenter().test {
+            val initialState = awaitStoreLoaded()
+            assertThat(initialState.searchQuery.text.toString()).isEmpty()
+            assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
+
+            initialState.searchQuery.setTextAndPlaceCursorAtEnd("smile")
+            val stateAfterQuery = awaitItem() as DefaultEmojiPickerState
+            assertThat(stateAfterQuery.searchQuery.text.toString()).isEqualTo("smile")
+
+            val stateWithResults = awaitItem() as DefaultEmojiPickerState
+            assertThat(stateWithResults.searchQuery.text.toString()).isEqualTo("smile")
+            assertThat(stateWithResults.searchResults).isInstanceOf(SearchBarResultState.Results::class.java)
+        }
+    }
+
+    @Test
+    fun `recent emojis are prepended as a category when the source returns any`() = runTest {
+        createPresenter(
+            categories = persistentListOf(emojiCategory(EmojibaseCategory.Activity)),
+            getRecentEmojis = GetRecentEmojis { Result.success(persistentListOf("😊")) },
+        ).test {
+            val state = awaitStoreLoaded()
+            assertThat(state.categories.size).isEqualTo(2)
+        }
+    }
+
+    @Test
+    fun `ToggleSearchActive toggles the search state`() = runTest {
+        createPresenter().test {
+            val initialState = awaitStoreLoaded()
+            assertThat(initialState.isSearchActive).isFalse()
+
+            initialState.eventSink(EmojiPickerEvent.ToggleSearchActive(true))
+            assertThat((awaitItem() as DefaultEmojiPickerState).isSearchActive).isTrue()
+
+            initialState.eventSink(EmojiPickerEvent.ToggleSearchActive(false))
+            assertThat((awaitItem() as DefaultEmojiPickerState).isSearchActive).isFalse()
+        }
+    }
+
+    @Test
+    fun `presenter exposes categories from the emoji store when the recent source is empty`() = runTest {
+        val providedCategories = persistentListOf(
+            emojiCategory(EmojibaseCategory.Activity),
+            emojiCategory(EmojibaseCategory.People),
+        )
+        createPresenter(categories = providedCategories).test {
+            val state = awaitStoreLoaded()
+            assertThat(state.categories.size).isEqualTo(providedCategories.size)
+        }
+    }
+
+    private suspend fun TurbineTestContext<EmojiPickerState>.awaitStoreLoaded(): DefaultEmojiPickerState {
+        var state = awaitItem() as DefaultEmojiPickerState
+        while (state.categories.isEmpty()) {
+            state = awaitItem() as DefaultEmojiPickerState
+        }
+        return state
+    }
+
+    private fun TestScope.createPresenter(
+        categories: ImmutableList<Pair<EmojibaseCategory, ImmutableList<Emoji>>> = persistentListOf(emojiCategory()),
+        getRecentEmojis: GetRecentEmojis = GetRecentEmojis { Result.success(persistentListOf()) },
+    ) = DefaultEmojiPickerPresenter(
+        emojibaseProvider = FakeEmojibaseProvider(emojis = categories.toMap()),
+        getRecentEmojis = getRecentEmojis,
+        coroutineDispatchers = testCoroutineDispatchers(),
+    )
+
+    private fun emojiCategory(
+        category: EmojibaseCategory = EmojibaseCategory.Activity,
+        emojis: ImmutableList<Emoji> = persistentListOf(
+            Emoji("1F3C3", "Smile", persistentListOf("smile"), persistentListOf("smile"), "😊", skins = null)
+        )
+    ) = category to emojis
+}
diff --git a/libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojisTest.kt
similarity index 95%
rename from libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt
rename to libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojisTest.kt
index 722aaee234..822e6e652a 100644
--- a/libraries/recentemojis/impl/src/test/kotlin/io/element/android/libraries/recentemojis/impl/DefaultGetRecentEmojisTest.kt
+++ b/libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojisTest.kt
@@ -6,14 +6,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.recentemojis.impl
+package io.element.android.libraries.emoji.impl.recentemojis
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.emojibasebindings.EmojibaseCategory
 import io.element.android.emojibasebindings.EmojibaseCategory.People
+import io.element.android.libraries.emoji.impl.fixtures.FakeEmojibaseProvider
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.recentemojis.test.FakeEmojibaseProvider
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
diff --git a/libraries/emoji/test/build.gradle.kts b/libraries/emoji/test/build.gradle.kts
new file mode 100644
index 0000000000..3a18a239ad
--- /dev/null
+++ b/libraries/emoji/test/build.gradle.kts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.emoji.test"
+}
+
+dependencies {
+    api(projects.libraries.emoji.api)
+    implementation(projects.libraries.architecture)
+}
diff --git a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt
new file mode 100644
index 0000000000..158cde0e0e
--- /dev/null
+++ b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.test
+
+import io.element.android.libraries.emoji.api.picker.EmojiPickerPresenter
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+
+fun fakeEmojiPickerPresenter(
+    state: EmojiPickerState = FakeEmojiPickerState(isReady = true),
+): EmojiPickerPresenter = EmojiPickerPresenter { state }
+
+fun fakeEmojiPickerPresenterFactory(
+    presenter: EmojiPickerPresenter = fakeEmojiPickerPresenter(),
+): EmojiPickerPresenter.Factory = EmojiPickerPresenter.Factory { presenter }
diff --git a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt
new file mode 100644
index 0000000000..02ca1ae159
--- /dev/null
+++ b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.test
+
+import io.element.android.libraries.emoji.api.picker.EmojiPickerState
+
+/**
+ * Minimal [EmojiPickerState] for use in tests that don't render the picker (typically presenter
+ * tests).
+ */
+data class FakeEmojiPickerState(
+    override val isReady: Boolean,
+) : EmojiPickerState
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/SqlCipherDriverFactory.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/SqlCipherDriverFactory.kt
index e4ac1a949f..84ab2d2a18 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/SqlCipherDriverFactory.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/SqlCipherDriverFactory.kt
@@ -9,30 +9,54 @@
 package io.element.encrypteddb
 
 import android.content.Context
+import androidx.sqlite.db.SupportSQLiteDatabase
 import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
-import io.element.encrypteddb.passphrase.PassphraseProvider
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+import io.element.encrypteddb.passphrase.DatabaseSecretProvider
 import net.zetetic.database.sqlcipher.SupportOpenHelperFactory
 
 /**
  * Creates an encrypted version of the [SqlDriver] using SQLCipher's [SupportOpenHelperFactory].
- * @param passphraseProvider Provides the passphrase needed to use the SQLite database with SQLCipher.
+ * @param databaseSecretProvider Provides the passphrase needed to use the SQLite database with SQLCipher.
  */
 class SqlCipherDriverFactory(
-    private val passphraseProvider: PassphraseProvider,
+    private val databaseSecretProvider: DatabaseSecretProvider,
 ) {
+    companion object {
+        init {
+            System.loadLibrary("sqlcipher")
+        }
+    }
+
     /**
      * Returns a valid [SqlDriver] with SQLCipher support.
      * @param schema The SQLite DB schema.
      * @param name The name of the database to create.
      * @param context Android [Context], used to instantiate the driver.
+     * @param onUpgradeCallback Optional callback to handle database upgrades, which will be called in the [AndroidSqliteDriver.Callback.onUpgrade] method.
      */
-    fun create(schema: SqlSchema<QueryResult.Value<Unit>>, name: String, context: Context): SqlDriver {
-        System.loadLibrary("sqlcipher")
-        val passphrase = passphraseProvider.getPassphrase()
-        val factory = SupportOpenHelperFactory(passphrase)
-        return AndroidSqliteDriver(schema = schema, context = context, name = name, factory = factory)
+    fun create(
+        schema: SqlSchema<QueryResult.Value<Unit>>,
+        name: String,
+        context: Context,
+        onUpgradeCallback: ((driver: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) -> Unit)? = null,
+    ): SqlDriver {
+        val key = when (val secret = databaseSecretProvider.getSecret()) {
+            // For a raw key, we need the blob representation (`x'...'`) as bytes
+            is ClientSecret.RawKey -> secret.formattedAsString().toByteArray()
+            // For a passphrase, we need the bytes for the hex string representation
+            is ClientSecret.Passphrase -> secret.formattedAsString().hexToByteArray()
+        }
+        val factory = SupportOpenHelperFactory(key)
+        return AndroidSqliteDriver(schema = schema, context = context, name = name, factory = factory, callback = object : AndroidSqliteDriver.Callback(
+                schema
+            ) {
+            override fun onUpgrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
+                onUpgradeCallback?.invoke(db, oldVersion, newVersion)
+            }
+        })
     }
 }
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/PassphraseProvider.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/DatabaseSecretProvider.kt
similarity index 51%
rename from libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/PassphraseProvider.kt
rename to libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/DatabaseSecretProvider.kt
index a72dc73596..140a5d8de2 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/PassphraseProvider.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/DatabaseSecretProvider.kt
@@ -8,12 +8,19 @@
 
 package io.element.encrypteddb.passphrase
 
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+
 /**
  * An abstraction to implement secure providers for SQLCipher passphrases.
  */
-interface PassphraseProvider {
+interface DatabaseSecretProvider {
     /**
-     * Returns a passphrase for SQLCipher in [ByteArray] format.
+     * Returns a secret for SQLCipher.
      */
-    fun getPassphrase(): ByteArray
+    fun getSecret(): ClientSecret
+
+    /**
+     * Resets the passphrase, for example by deleting the persisted secret. Returns `true` if the reset was successful, `false` otherwise.
+     */
+    fun reset(): Boolean
 }
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomDatabaseSecretProvider.kt
similarity index 56%
rename from libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt
rename to libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomDatabaseSecretProvider.kt
index fe78a4a8da..246a65da07 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomSecretPassphraseProvider.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/passphrase/RandomDatabaseSecretProvider.kt
@@ -9,35 +9,41 @@
 package io.element.encrypteddb.passphrase
 
 import android.content.Context
+import io.element.android.libraries.androidutils.crypto.ClientSecret
 import io.element.encrypteddb.crypto.EncryptedFile
 import java.io.File
 import java.security.SecureRandom
 
 /**
- * Provides a secure passphrase for SQLCipher by generating a random secret and storing it into an [EncryptedFile].
+ * Provides a secure secret for SQLCipher by generating a random secret and storing it into an [EncryptedFile].
  * @param context Android [Context], used by [EncryptedFile] for cryptographic operations.
  * @param file Destination file where the key will be stored.
- * @param secretSize Length of the generated secret.
+ * @param secretSizeBytes Length of the generated secret.
  */
-class RandomSecretPassphraseProvider(
+class RandomDatabaseSecretProvider(
     private val context: Context,
     private val file: File,
-    private val secretSize: Int = 256,
-) : PassphraseProvider {
-    override fun getPassphrase(): ByteArray {
+    private val secretSizeBytes: Int = 32,
+) : DatabaseSecretProvider {
+    override fun getSecret(): ClientSecret {
         val encryptedFile = EncryptedFile(context, file)
-        return if (!file.exists()) {
+        val bytes = if (!file.exists()) {
             val secret = generateSecret()
             encryptedFile.openFileOutput().use { it.write(secret) }
             secret
         } else {
             encryptedFile.openFileInput().use { it.readBytes() }
         }
+        return ClientSecret.fromRawBytes(bytes)
+    }
+
+    override fun reset(): Boolean {
+        return file.delete()
     }
 
     private fun generateSecret(): ByteArray {
-        val buffer = ByteArray(size = secretSize)
-        SecureRandom().nextBytes(buffer)
-        return buffer
+        // Generate a random secret of the specified size using a secure random generator.
+        return ByteArray(size = secretSizeBytes)
+            .also { SecureRandom().nextBytes(it) }
     }
 }
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/utils/ReplaceDatabaseKey.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/utils/ReplaceDatabaseKey.kt
new file mode 100644
index 0000000000..fafb18794b
--- /dev/null
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/utils/ReplaceDatabaseKey.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.encrypteddb.utils
+
+import androidx.sqlite.db.SupportSQLiteDatabase
+import io.element.encrypteddb.passphrase.RandomDatabaseSecretProvider
+import timber.log.Timber
+
+/**
+ * A utility class to replace the encryption key of an existing SQLCipher database.
+ * This is used during database migrations when we want to change the encryption key.
+ *
+ * @param databaseSecretProvider The provider for generating new secrets.
+ */
+class ReplaceDatabaseKey(
+    private val databaseSecretProvider: RandomDatabaseSecretProvider
+) {
+    fun replaceKey(name: String, database: SupportSQLiteDatabase) {
+        Timber.d("Re-keying database $name")
+        // Reset the passphrase provider to generate a new passphrase
+        databaseSecretProvider.reset()
+
+        // Get the new secret and convert it to the format expected by SQLCipher
+        val newSecret = databaseSecretProvider.getSecret()
+        val key = newSecret.formattedAsString()
+
+        // Use the PRAGMA rekey command to change the encryption key of the database
+        database.query("PRAGMA rekey = \"$key\";").close()
+
+        // Verify that the database can be accessed with the new key by running a simple query
+        val result = database.query("select count(*) from sqlite_master").use { cursor ->
+            if (cursor.moveToNext()) cursor.getLong(0) else -1L
+        }
+        if (result >= 0) {
+            Timber.d("Re-keying database $name completed")
+        } else {
+            Timber.e("Re-keying database $name didn't work as expected.")
+        }
+    }
+}
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt
index 7878245aca..1311c524e4 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatter.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
@@ -77,31 +78,36 @@ class DefaultPinnedMessagesBannerFormatter(
                 messageType.toPlainText(permalinkParser)
             }
             is VideoMessageType -> {
-                messageType.bestDescription.prefixWith(CommonStrings.common_video)
+                messageType.toPlainText(permalinkParser).prefixWith(CommonStrings.common_video)
             }
             is ImageMessageType -> {
-                messageType.bestDescription.prefixWith(CommonStrings.common_image)
+                messageType.toPlainText(permalinkParser).prefixWith(CommonStrings.common_image)
             }
             is StickerMessageType -> {
-                messageType.bestDescription.prefixWith(CommonStrings.common_sticker)
+                messageType.toPlainText(permalinkParser).prefixWith(CommonStrings.common_sticker)
             }
             is LocationMessageType -> {
                 messageType.body.prefixWith(CommonStrings.common_shared_location)
             }
             is FileMessageType -> {
-                messageType.bestDescription.prefixWith(CommonStrings.common_file)
+                messageType.toPlainText(permalinkParser).prefixWith(CommonStrings.common_file)
             }
             is AudioMessageType -> {
-                messageType.bestDescription.prefixWith(CommonStrings.common_audio)
+                messageType.toPlainText(permalinkParser).prefixWith(CommonStrings.common_audio)
             }
             is VoiceMessageType -> {
-                // In this case, do not use bestDescription, because the filename is useless, only use the caption if available.
-                messageType.caption?.prefixWith(sp.getString(CommonStrings.common_voice_message))
+                messageType
+                    .toPlainText(permalinkParser, "")
+                    .takeIf { it.isNotEmpty() }
+                    ?.prefixWith(sp.getString(CommonStrings.common_voice_message))
                     ?: sp.getString(CommonStrings.common_voice_message)
             }
             is OtherMessageType -> {
                 messageType.body
             }
+            is GalleryMessageType -> {
+                messageType.body.prefixWith(CommonStrings.common_gallery)
+            }
             is NoticeMessageType -> {
                 messageType.body
             }
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
index 68dd4cd332..1c5cd72977 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
@@ -54,6 +55,7 @@ class DefaultRoomLatestEventFormatter(
     private val roomMembershipContentFormatter: RoomMembershipContentFormatter,
     private val profileChangeContentFormatter: ProfileChangeContentFormatter,
     private val stateContentFormatter: StateContentFormatter,
+    private val rtcNotificationContentFormatter: RtcNotificationContentFormatter,
     private val permalinkParser: PermalinkParser,
 ) : RoomLatestEventFormatter {
     override fun format(
@@ -92,8 +94,8 @@ class DefaultRoomLatestEventFormatter(
                 message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is StickerContent -> {
-                val message = sp.getString(CommonStrings.common_sticker) + " (" + content.bestDescription + ")"
-                message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
+                content.bestDescription.prefixWith(sp.getString(CommonStrings.common_sticker))
+                    .prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is UnableToDecryptContent -> {
                 val message = sp.getString(CommonStrings.common_waiting_for_decryption_key)
@@ -109,19 +111,19 @@ class DefaultRoomLatestEventFormatter(
                 stateContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing, RenderingMode.RoomList)
             }
             is PollContent -> {
-                val message = sp.getString(CommonStrings.common_poll_summary, content.question)
-                message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
+                content.question.prefixWith(sp.getString(CommonStrings.common_poll_summary_prefix))
+                    .prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is FailedToParseMessageLikeContent, is FailedToParseStateContent, is UnknownContent -> {
                 val message = sp.getString(CommonStrings.common_unsupported_event)
                 message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is LiveLocationContent -> {
-                val message = sp.getString(CommonStrings.common_shared_location)
+                val message = sp.getString(CommonStrings.common_shared_live_location)
                 message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is LegacyCallInviteContent -> sp.getString(CommonStrings.common_unsupported_call)
-            is CallNotifyContent -> sp.getString(CommonStrings.common_call_started)
+            is CallNotifyContent -> rtcNotificationContentFormatter.format(content, isDmRoom)
         }?.take(DEFAULT_SAFE_LENGTH)
     }
 
@@ -139,31 +141,36 @@ class DefaultRoomLatestEventFormatter(
                 messageType.toPlainText(permalinkParser)
             }
             is VideoMessageType -> {
-                messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_video))
+                messageType.toPlainText(permalinkParser).prefixWith(sp.getString(CommonStrings.common_video))
             }
             is ImageMessageType -> {
-                messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_image))
+                messageType.toPlainText(permalinkParser).prefixWith(sp.getString(CommonStrings.common_image))
             }
             is StickerMessageType -> {
-                messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_sticker))
+                messageType.toPlainText(permalinkParser).prefixWith(sp.getString(CommonStrings.common_sticker))
             }
             is LocationMessageType -> {
                 sp.getString(CommonStrings.common_shared_location)
             }
             is FileMessageType -> {
-                messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_file))
+                messageType.toPlainText(permalinkParser).prefixWith(sp.getString(CommonStrings.common_file))
             }
             is AudioMessageType -> {
-                messageType.bestDescription.prefixWith(sp.getString(CommonStrings.common_audio))
+                messageType.toPlainText(permalinkParser).prefixWith(sp.getString(CommonStrings.common_audio))
             }
             is VoiceMessageType -> {
-                // In this case, do not use bestDescription, because the filename is useless, only use the caption if available.
-                messageType.caption?.prefixWith(sp.getString(CommonStrings.common_voice_message))
+                messageType
+                    .toPlainText(permalinkParser, "")
+                    .takeIf { it.isNotEmpty() }
+                    ?.prefixWith(sp.getString(CommonStrings.common_voice_message))
                     ?: sp.getString(CommonStrings.common_voice_message)
             }
             is OtherMessageType -> {
                 messageType.body
             }
+            is GalleryMessageType -> {
+                messageType.body.prefixWith(sp.getString(CommonStrings.common_gallery))
+            }
             is NoticeMessageType -> {
                 messageType.body
             }
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/PrefixWith.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/PrefixWith.kt
index 51fdccf256..1a04893e07 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/PrefixWith.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/PrefixWith.kt
@@ -20,6 +20,10 @@ internal fun CharSequence.prefixWith(prefix: String): AnnotatedString {
             append(prefix)
         }
         append(": ")
-        append(this@prefixWith)
+        if (this@prefixWith is AnnotatedString) {
+            append(this@prefixWith)
+        } else {
+            append(this@prefixWith.toString())
+        }
     }
 }
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatter.kt
new file mode 100644
index 0000000000..ab3fb9433d
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatter.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.eventformatter.impl
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.services.toolbox.api.strings.StringProvider
+
+@Inject
+class RtcNotificationContentFormatter(
+    private val matrixClient: MatrixClient,
+    private val sp: StringProvider,
+) {
+    fun format(
+        content: CallNotifyContent,
+        isDm: Boolean,
+    ): CharSequence {
+        return if (isDm) {
+            val isDeclined = content.declinedBy.isNotEmpty()
+            val isDeclinedByMe = content.declinedBy.any { matrixClient.isMe(it) }
+            if (isDeclinedByMe) {
+                sp.getString(CommonStrings.common_call_you_declined)
+            } else if (isDeclined) {
+                sp.getString(CommonStrings.common_call_declined)
+            } else {
+                sp.getString(CommonStrings.common_call_started)
+            }
+        } else {
+            sp.getString(CommonStrings.common_call_started)
+        }
+    }
+}
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
index f9d38fd8a7..5abfa89ef0 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/StateContentFormatter.kt
@@ -118,15 +118,6 @@ class StateContentFormatter(
                     "PolicyRuleUser"
                 }
             }
-            OtherState.RoomAliases -> when (renderingMode) {
-                RenderingMode.RoomList -> {
-                    Timber.v("Filtering timeline item for room state change: $content")
-                    null
-                }
-                RenderingMode.Timeline -> {
-                    "RoomAliases"
-                }
-            }
             OtherState.RoomCanonicalAlias -> when (renderingMode) {
                 RenderingMode.RoomList -> {
                     Timber.v("Filtering timeline item for room state change: $content")
diff --git a/libraries/eventformatter/impl/src/main/res/values-ca/translations.xml b/libraries/eventformatter/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..2caa14e8a3
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="state_event_avatar_changed_too">"(la foto també ha canviat)"</string>
+  <string name="state_event_avatar_url_changed">"%1$s ha canviat la seva foto"</string>
+  <string name="state_event_avatar_url_changed_by_you">"Has canviat la teva foto"</string>
+  <string name="state_event_demoted_to_member">"%1$s ha baixat a membre"</string>
+  <string name="state_event_demoted_to_moderator">"%1$s ha baixat a moderador/a"</string>
+  <string name="state_event_display_name_changed_from">"%1$s han canviat el seu nom de visualització de %2$s a %3$s"</string>
+  <string name="state_event_display_name_changed_from_by_you">"Has canviat el teu nom de visualització de %1$s a %2$s"</string>
+  <string name="state_event_display_name_removed">"%1$s ha eliminat el seu nom de visualització (era %2$s)"</string>
+  <string name="state_event_display_name_removed_by_you">"Has eliminat el teu nom de visualització (era %1$s)"</string>
+  <string name="state_event_display_name_set">"%1$s ha definit el seu nom de visualització a %2$s"</string>
+  <string name="state_event_display_name_set_by_you">"Has definit el teu nom de visualització a %1$s"</string>
+  <string name="state_event_promoted_to_administrator">"%1$s ha ascendit a administrador/a"</string>
+  <string name="state_event_promoted_to_moderator">"%1$s ha ascendit a moderador/a"</string>
+  <string name="state_event_room_avatar_changed">"%1$s ha canviat la foto de la sala"</string>
+  <string name="state_event_room_avatar_changed_by_you">"Has canviat la foto de la sala"</string>
+  <string name="state_event_room_avatar_removed">"%1$s ha eliminat la foto de la sala"</string>
+  <string name="state_event_room_avatar_removed_by_you">"Has eliminat la foto de la sala"</string>
+  <string name="state_event_room_ban">"%1$s ha bandejat %2$s"</string>
+  <string name="state_event_room_ban_by_you">"Has bandejat %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Has bandejat %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s ha bandejat %2$s: %3$s"</string>
+  <string name="state_event_room_created">"%1$s ha creat la sala"</string>
+  <string name="state_event_room_created_by_you">"Has creat la sala"</string>
+  <string name="state_event_room_invite">"%1$s a convidat a %2$s"</string>
+  <string name="state_event_room_invite_accepted">"%1$s ha acceptat la invitació"</string>
+  <string name="state_event_room_invite_accepted_by_you">"Has acceptat la invitació"</string>
+  <string name="state_event_room_invite_by_you">"Has convidat a %1$s"</string>
+  <string name="state_event_room_invite_you">"%1$s t\'ha convidat"</string>
+  <string name="state_event_room_join">"%1$s s\'ha unit a la sala"</string>
+  <string name="state_event_room_join_by_you">"T\'has unit a la sala"</string>
+  <string name="state_event_room_knock">"%1$s ha sol·licitat unir-se"</string>
+  <string name="state_event_room_knock_accepted">"%1$s ha concedit l\'accés a %2$s"</string>
+  <string name="state_event_room_knock_accepted_by_you">"Has permès %1$s unir-se"</string>
+  <string name="state_event_room_knock_by_you">"Has sol·licitat unir-te"</string>
+  <string name="state_event_room_knock_denied">"%1$s ha rebutjat la sol·licitud d\'unió a %2$s"</string>
+  <string name="state_event_room_knock_denied_by_you">"Has rebutjat la sol·licitud d\'unió a %1$s"</string>
+  <string name="state_event_room_knock_denied_you">"%1$s ha rebutjat la teva sol·licitud d\'unió"</string>
+  <string name="state_event_room_knock_retracted">"%1$s ja no es vol unir"</string>
+  <string name="state_event_room_knock_retracted_by_you">"Has cancel·lat la sol·licitud per unir-te"</string>
+  <string name="state_event_room_leave">"%1$s ha sortit de la sala"</string>
+  <string name="state_event_room_leave_by_you">"Has sortit de la sala"</string>
+  <string name="state_event_room_name_changed">"%1$s ha canviat el nom de la sala a: %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"Has canviat el nom de la sala a: %1$s"</string>
+  <string name="state_event_room_name_removed">"%1$s ha eliminat el nom de la sala"</string>
+  <string name="state_event_room_name_removed_by_you">"Has eliminat el nom de la sala"</string>
+  <string name="state_event_room_none">"%1$s no ha fet canvis"</string>
+  <string name="state_event_room_none_by_you">"No s\'han fet canvis"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s ha canviat els missatges fixats"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"Has canviat els missatges fixats"</string>
+  <string name="state_event_room_pinned_events_pinned">"%1$s ha fixat un missatge"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"Has fixat un missatge"</string>
+  <string name="state_event_room_pinned_events_unpinned">"%1$s ha deixat de fixar un missatge"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"Has deixat de fixar un missatge"</string>
+  <string name="state_event_room_reject">"%1$s ha rebutjat la invitació"</string>
+  <string name="state_event_room_reject_by_you">"Has rebutjat la invitació"</string>
+  <string name="state_event_room_remove">"%1$s ha eliminat %2$s"</string>
+  <string name="state_event_room_remove_by_you">"Has eliminat %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Has eliminat %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s ha eliminat %2$s: %3$s"</string>
+  <string name="state_event_room_third_party_invite">"%1$s ha convidat a %2$s a la sala"</string>
+  <string name="state_event_room_third_party_invite_by_you">"Has convidat a %1$s a la sala"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s ha rebutjat la invitació a la sala de %2$s"</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"Has rebutjat la invitació a la sala de %1$s"</string>
+  <string name="state_event_room_topic_changed">"%1$s ha canviat el tema a: %2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"Has canviat el tema a: %1$s"</string>
+  <string name="state_event_room_topic_removed">"%1$s ha eliminat el tema de la sala"</string>
+  <string name="state_event_room_topic_removed_by_you">"Has eliminat el tema de la sala"</string>
+  <string name="state_event_room_unban">"%1$s ha readmès %2$s"</string>
+  <string name="state_event_room_unban_by_you">"Has readmès %1$s"</string>
+  <string name="state_event_room_unknown_membership_change">"%1$s ha fet un canvi desconegut al seu tipus d\'usuari"</string>
+</resources>
diff --git a/libraries/eventformatter/impl/src/main/res/values-ja/translations.xml b/libraries/eventformatter/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..4dba7e3303
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="state_event_avatar_changed_too">"(アバターも変更)"</string>
+  <string name="state_event_avatar_url_changed">"%1$s がアバターを変更"</string>
+  <string name="state_event_avatar_url_changed_by_you">"あなたがアバターを変更"</string>
+  <string name="state_event_demoted_to_member">"%1$s がメンバーに降格"</string>
+  <string name="state_event_demoted_to_moderator">"%1$s がモデレーターに降格"</string>
+  <string name="state_event_display_name_changed_from">"%1$sが表示名を変更: %2$s &gt; %3$s"</string>
+  <string name="state_event_display_name_changed_from_by_you">"あなたが表示名を変更: %1$s &gt; %2$s"</string>
+  <string name="state_event_display_name_removed">"%1$sが表示名を削除 (%2$s)"</string>
+  <string name="state_event_display_name_removed_by_you">"表示名を削除 (%1$s)"</string>
+  <string name="state_event_display_name_set">"%1$sが表示名を設定: %2$s"</string>
+  <string name="state_event_display_name_set_by_you">"あなたが表示名を設定: %1$s"</string>
+  <string name="state_event_promoted_to_administrator">"%1$s が管理者に昇格"</string>
+  <string name="state_event_promoted_to_moderator">"%1$s がモデレーターに昇格"</string>
+  <string name="state_event_room_avatar_changed">"%1$sがルームアバターを変更"</string>
+  <string name="state_event_room_avatar_changed_by_you">"あなたがルームアバターを変更"</string>
+  <string name="state_event_room_avatar_removed">"%1$sがルームアバターを削除"</string>
+  <string name="state_event_room_avatar_removed_by_you">"あなたがルームアバターを削除"</string>
+  <string name="state_event_room_ban">"%1$s が %2$s を追放"</string>
+  <string name="state_event_room_ban_by_you">"あなたが %1$s を追放"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"あなたが %1$s を追放: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s が %2$s を追放: %3$s"</string>
+  <string name="state_event_room_created">"%1$s がルームを作成"</string>
+  <string name="state_event_room_created_by_you">"あなたがルームを作成"</string>
+  <string name="state_event_room_invite">"%1$s が %2$s を招待"</string>
+  <string name="state_event_room_invite_accepted">"%1$s が招待を受諾"</string>
+  <string name="state_event_room_invite_accepted_by_you">"あなたが招待を受諾"</string>
+  <string name="state_event_room_invite_by_you">"あなたが %1$s を招待"</string>
+  <string name="state_event_room_invite_you">"%1$s があなたを招待"</string>
+  <string name="state_event_room_join">"%1$s がルームに参加"</string>
+  <string name="state_event_room_join_by_you">"あなたがルームに参加"</string>
+  <string name="state_event_room_knock">"%1$s が参加をリクエスト"</string>
+  <string name="state_event_room_knock_accepted">"%1$s が %2$s の参加を許可"</string>
+  <string name="state_event_room_knock_accepted_by_you">"あなたが %1$s の参加を許可"</string>
+  <string name="state_event_room_knock_by_you">"あなたが参加をリクエスト"</string>
+  <string name="state_event_room_knock_denied">"%1$s が %2$s の参加リクエストを拒否"</string>
+  <string name="state_event_room_knock_denied_by_you">"あなたが %1$s の参加リクエストを拒否"</string>
+  <string name="state_event_room_knock_denied_you">"%1$s があなたの参加リクエストを拒否"</string>
+  <string name="state_event_room_knock_retracted">"%1$s が参加リクエストを取り消し"</string>
+  <string name="state_event_room_knock_retracted_by_you">"あなたが参加リクエストを取り消し"</string>
+  <string name="state_event_room_leave">"%1$s がルームを退出"</string>
+  <string name="state_event_room_leave_by_you">"あなたがルームを退出"</string>
+  <string name="state_event_room_name_changed">"%1$s がルーム名を変更: %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"あなたがルーム名を変更: %1$s"</string>
+  <string name="state_event_room_name_removed">"%1$s がルーム名を削除"</string>
+  <string name="state_event_room_name_removed_by_you">"あなたがルーム名を削除"</string>
+  <string name="state_event_room_none">"%1$s による変更はありません"</string>
+  <string name="state_event_room_none_by_you">"あなたによる変更はありません"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s がピン留めメッセージを変更"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"あなたがピン留めメッセージを変更しました"</string>
+  <string name="state_event_room_pinned_events_pinned">"%1$s がメッセージをピン留め"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"あなたがメッセージをピン留め"</string>
+  <string name="state_event_room_pinned_events_unpinned">"%1$s がメッセージのピン留めを解除"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"あなたがメッセージのピン留めを解除"</string>
+  <string name="state_event_room_reject">"%1$s が招待を拒否"</string>
+  <string name="state_event_room_reject_by_you">"あなたが招待を拒否"</string>
+  <string name="state_event_room_remove">"%1$s が %2$s を削除"</string>
+  <string name="state_event_room_remove_by_you">"あなたが %1$s を削除"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"あなたが%1$s を削除: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s が %2$s を削除: %3$s"</string>
+  <string name="state_event_room_third_party_invite">"%1$s が %2$s をルームに招待"</string>
+  <string name="state_event_room_third_party_invite_by_you">"あなたが %1$s をルームに招待"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s が %2$s へのルームの招待を取り消し"</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"あなたが %1$s へのルームの招待を取り消し"</string>
+  <string name="state_event_room_topic_changed">"%1$s がトピックを変更: %2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"あなたがトピックを変更: %1$s"</string>
+  <string name="state_event_room_topic_removed">"%1$s がルームのトピックを削除"</string>
+  <string name="state_event_room_topic_removed_by_you">"あなたがルームのトピックを削除"</string>
+  <string name="state_event_room_unban">"%1$s が %2$s の追放を解除"</string>
+  <string name="state_event_room_unban_by_you">"あなたが %1$s の追放を解除"</string>
+  <string name="state_event_room_unknown_membership_change">"%1$s がメンバーシップに未知の変更を追加"</string>
+</resources>
diff --git a/libraries/eventformatter/impl/src/main/res/values-lt/translations.xml b/libraries/eventformatter/impl/src/main/res/values-lt/translations.xml
index 9fb1486d59..9a632b8f5a 100644
--- a/libraries/eventformatter/impl/src/main/res/values-lt/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-lt/translations.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="state_event_avatar_changed_too">"(taip pat buvo pakeistas ir avataras)"</string>
-  <string name="state_event_avatar_url_changed">"%1$s pakeitė savo avatarą"</string>
-  <string name="state_event_avatar_url_changed_by_you">"Jūs pakeitėte savo avatarą"</string>
+  <string name="state_event_avatar_url_changed">"%1$s pakeitė savo pseudoportretą"</string>
+  <string name="state_event_avatar_url_changed_by_you">"Jūs pakeitėte savo pseudoportretą"</string>
   <string name="state_event_display_name_changed_from">"%1$s pakeitė savo slapyvardį iš %2$s į %3$s"</string>
   <string name="state_event_display_name_changed_from_by_you">"Jūs pakeitėte savo slapyvardį iš %1$s į %2$s"</string>
   <string name="state_event_display_name_removed">"%1$s pašalino savo slapyvardį (jis buvo %2$s)"</string>
   <string name="state_event_display_name_removed_by_you">"Jūs pašalinote savo slapyvardį (jis buvo %1$s)"</string>
-  <string name="state_event_display_name_set">"%1$s pakeitė savo slapyvardį į %2$s"</string>
+  <string name="state_event_display_name_set">"%1$s nustatė savo rodomą vardą į %2$s"</string>
   <string name="state_event_display_name_set_by_you">"Jūs nustatėte savo slapyvardį į %1$s"</string>
   <string name="state_event_room_avatar_changed">"%1$s pakeitė kambario avatarą"</string>
   <string name="state_event_room_avatar_changed_by_you">"Jūs pakeitėte kambario avatarą"</string>
@@ -21,7 +21,7 @@
   <string name="state_event_room_invite_accepted">"%1$s priėmė kvietimą"</string>
   <string name="state_event_room_invite_accepted_by_you">"Priėmėte kvietimą"</string>
   <string name="state_event_room_invite_by_you">"Jūs pakvietėte %1$s"</string>
-  <string name="state_event_room_invite_you">"%1$s pakvietė Jus"</string>
+  <string name="state_event_room_invite_you">"%1$s pakvietė jus"</string>
   <string name="state_event_room_join">"%1$s prisijungė prie kambario"</string>
   <string name="state_event_room_join_by_you">"Jūs prisijungėte prie kambario"</string>
   <string name="state_event_room_knock">"%1$s prašo prisijungti"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml b/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
index e45227ad62..94e1015375 100644
--- a/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
@@ -29,7 +29,7 @@
   <string name="state_event_room_invite_by_you">"Zaprosiłeś %1$s"</string>
   <string name="state_event_room_invite_you">"%1$s zaprosił Cię"</string>
   <string name="state_event_room_join">"%1$s dołączył do pokoju"</string>
-  <string name="state_event_room_join_by_you">"Dołączyłeś(aś) do pokoju"</string>
+  <string name="state_event_room_join_by_you">"Dołączyłeś do pokoju"</string>
   <string name="state_event_room_knock">"%1$s prosi o możliwość dołączenia"</string>
   <string name="state_event_room_knock_accepted">"%1$s zezwolił %2$s na dołączenie"</string>
   <string name="state_event_room_knock_accepted_by_you">"Zezwoliłeś %1$s na dołączenie"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml b/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
index e14813bb69..196e6ec3e1 100644
--- a/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
@@ -27,7 +27,7 @@
   <string name="state_event_room_invite_accepted">"%1$s принял(а) приглашение"</string>
   <string name="state_event_room_invite_accepted_by_you">"Вы приняли приглашение"</string>
   <string name="state_event_room_invite_by_you">"Вы пригласили %1$s"</string>
-  <string name="state_event_room_invite_you">"%1$s пригласил(а) вас"</string>
+  <string name="state_event_room_invite_you">"%1$s пригласил(а) Вас"</string>
   <string name="state_event_room_join">"%1$s присоединился(ась)"</string>
   <string name="state_event_room_join_by_you">"Вы присоединились к комнате"</string>
   <string name="state_event_room_knock">"%1$s хочет присоединиться"</string>
@@ -47,8 +47,8 @@
   <string name="state_event_room_name_removed_by_you">"Вы удалили название"</string>
   <string name="state_event_room_none">"%1$s не внес(ла) изменений"</string>
   <string name="state_event_room_none_by_you">"Вы не внесли изменений"</string>
-  <string name="state_event_room_pinned_events_changed">"%1$s изменил(а) закрепленные сообщения"</string>
-  <string name="state_event_room_pinned_events_changed_by_you">"Вы изменили закрепленные сообщения"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s изменил(а) закреплённые сообщения"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"Вы изменили закреплённые сообщения"</string>
   <string name="state_event_room_pinned_events_pinned">"%1$s закрепил(а) сообщение"</string>
   <string name="state_event_room_pinned_events_pinned_by_you">"Вы закрепили сообщение"</string>
   <string name="state_event_room_pinned_events_unpinned">"%1$s открепил(а) сообщение"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-vi/translations.xml b/libraries/eventformatter/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..7598ba0cb9
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="state_event_avatar_changed_too">"(ảnh hồ sơ cũng được thay)"</string>
+  <string name="state_event_avatar_url_changed">"%1$s đổi ảnh hồ sơ"</string>
+  <string name="state_event_avatar_url_changed_by_you">"Bạn đổi ảnh hồ sơ"</string>
+  <string name="state_event_demoted_to_member">"%1$s bị giáng cấp xuống thành thành viên"</string>
+  <string name="state_event_demoted_to_moderator">"%1$s bị giáng chức xuống làm người điều hành"</string>
+  <string name="state_event_display_name_changed_from">"%1$s đổi tên hiển thị từ %2$s sang %3$s"</string>
+  <string name="state_event_display_name_changed_from_by_you">"Bạn đổi tên hiển thị từ %1$s sang %2$s"</string>
+  <string name="state_event_display_name_removed">"%1$s xoá tên hiển thị (trước kia là %2$s)"</string>
+  <string name="state_event_display_name_removed_by_you">"Bạn xoá tên hiển thị (trước kia là %1$s)"</string>
+  <string name="state_event_display_name_set">"%1$s đặt tên hiển thị thành %2$s"</string>
+  <string name="state_event_display_name_set_by_you">"Bạn đặt tên hiển thị thành %1$s"</string>
+  <string name="state_event_promoted_to_administrator">"%1$s đã được thăng chức lên quản trị viên"</string>
+  <string name="state_event_promoted_to_moderator">"%1$s đã được thăng chức lên làm người điều hành"</string>
+  <string name="state_event_room_avatar_changed">"%1$s đổi ảnh phòng"</string>
+  <string name="state_event_room_avatar_changed_by_you">"Bạn đổi ảnh phòng"</string>
+  <string name="state_event_room_avatar_removed">"%1$s đã xóa ảnh đại diện của phòng."</string>
+  <string name="state_event_room_avatar_removed_by_you">"Bạn đã xóa hình đại diện của phòng trò chuyện"</string>
+  <string name="state_event_room_ban">"%1$s cấm %2$s vào phòng"</string>
+  <string name="state_event_room_ban_by_you">"Bạn cấm %1$s vào phòng"</string>
+  <string name="state_event_room_created">"%1$s tạo phòng này"</string>
+  <string name="state_event_room_created_by_you">"Bạn tạo phòng này"</string>
+  <string name="state_event_room_invite">"%1$s mời %2$s"</string>
+  <string name="state_event_room_invite_accepted">"%1$s đã chấp nhận lời mời"</string>
+  <string name="state_event_room_invite_accepted_by_you">"Bạn đã chấp nhận lời mời"</string>
+  <string name="state_event_room_invite_by_you">"Bạn mời %1$s"</string>
+  <string name="state_event_room_invite_you">"%1$s mời bạn"</string>
+  <string name="state_event_room_join">"%1$s vào phòng"</string>
+  <string name="state_event_room_join_by_you">"Bạn vào phòng"</string>
+  <string name="state_event_room_knock">"%1$s đang yêu cầu tham gia"</string>
+  <string name="state_event_room_knock_accepted">"%1$s được cấp quyền truy cập vào %2$s"</string>
+  <string name="state_event_room_knock_accepted_by_you">"Bạn đã cho phép %1$s tham gia"</string>
+  <string name="state_event_room_knock_by_you">"Bạn đã yêu cầu tham gia"</string>
+  <string name="state_event_room_knock_denied">"%1$s đã từ chối yêu cầu tham gia của %2$s"</string>
+  <string name="state_event_room_knock_denied_by_you">"Bạn đã từ chối yêu cầu tham gia của %1$s"</string>
+  <string name="state_event_room_knock_denied_you">"%1$s đã từ chối yêu cầu tham gia của bạn"</string>
+  <string name="state_event_room_knock_retracted">"%1$s không còn mong muốn tham gia"</string>
+  <string name="state_event_room_knock_retracted_by_you">"Bạn đã hủy yêu cầu tham gia"</string>
+  <string name="state_event_room_leave">"%1$s rời phòng"</string>
+  <string name="state_event_room_leave_by_you">"Bạn rời phòng"</string>
+  <string name="state_event_room_name_changed">"%1$s đổi tên phòng thành %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"Bạn đổi tên phòng thành %1$s"</string>
+  <string name="state_event_room_name_removed">"%1$s xóa tên phòng"</string>
+  <string name="state_event_room_name_removed_by_you">"Bạn xóa tên phòng"</string>
+  <string name="state_event_room_none">"%1$s không có thay đổi nào"</string>
+  <string name="state_event_room_none_by_you">"Bạn chưa thực hiện thay đổi nào"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"Bạn đã thay đổi tin nhắn được ghim"</string>
+  <string name="state_event_room_reject">"%1$s từ chối lời mời"</string>
+  <string name="state_event_room_reject_by_you">"Bạn từ chối lời mời"</string>
+  <string name="state_event_room_remove">"%1$s cho %2$s cút khỏi phòng"</string>
+  <string name="state_event_room_remove_by_you">"Bạn cho %1$s cút khỏi phòng"</string>
+  <string name="state_event_room_third_party_invite">"%1$s đã gửi lời mời đến %2$s để tham gia phòng trò chuyện"</string>
+  <string name="state_event_room_third_party_invite_by_you">"Bạn đã gửi lời mời đến %1$s để tham gia phòng trò chuyện"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s đã thu hồi lời mời tham gia phòng trò chuyện của %2$s "</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"Bạn đã thu hồi lời mời tham gia phòng trò chuyện của %1$s "</string>
+  <string name="state_event_room_topic_changed">"%1$s đổi chủ đề sang: %2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"Bạn đổi chủ đề sang: %1$s"</string>
+  <string name="state_event_room_topic_removed">"%1$s đã xóa chủ đề phòng"</string>
+  <string name="state_event_room_topic_removed_by_you">"Bạn đã xóa chủ đề của phòng."</string>
+  <string name="state_event_room_unban">"%1$s hủy lệnh cấm với %2$s"</string>
+  <string name="state_event_room_unban_by_you">"Bạn hủy lệnh cấm với %1$s"</string>
+  <string name="state_event_room_unknown_membership_change">"%1$s đã thực hiện một thay đổi không xác định đối với tư cách thành viên của họ"</string>
+</resources>
diff --git a/libraries/eventformatter/impl/src/main/res/values-zh/translations.xml b/libraries/eventformatter/impl/src/main/res/values-zh/translations.xml
index 9776510d6f..f7e5d7d7f2 100644
--- a/libraries/eventformatter/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-zh/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="state_event_avatar_changed_too">"(头像也更改了）"</string>
+  <string name="state_event_avatar_changed_too">"（头像也已更换）"</string>
   <string name="state_event_avatar_url_changed">"%1$s 更换了头像"</string>
   <string name="state_event_avatar_url_changed_by_you">"你更换了头像"</string>
   <string name="state_event_demoted_to_member">"%1$s 降级为成员"</string>
@@ -13,61 +13,61 @@
   <string name="state_event_display_name_set_by_you">"你将显示名称设置为 %1$s"</string>
   <string name="state_event_promoted_to_administrator">"%1$s 晋升为管理员"</string>
   <string name="state_event_promoted_to_moderator">"%1$s 晋升为协管员"</string>
-  <string name="state_event_room_avatar_changed">"%1$s 更换了聊天室头像"</string>
-  <string name="state_event_room_avatar_changed_by_you">"你更换了聊天室头像"</string>
-  <string name="state_event_room_avatar_removed">"%1$s 移除了聊天室头像"</string>
-  <string name="state_event_room_avatar_removed_by_you">"你移除了聊天室头像"</string>
-  <string name="state_event_room_ban">"%1$s 封禁了 %2$s"</string>
-  <string name="state_event_room_ban_by_you">"你封禁了 %1$s"</string>
-  <string name="state_event_room_ban_by_you_with_reason">"你封禁了%1$s：%2$s"</string>
-  <string name="state_event_room_ban_with_reason">"%1$s封禁了%2$s：%3$s"</string>
-  <string name="state_event_room_created">"%1$s 创建了聊天室"</string>
-  <string name="state_event_room_created_by_you">"你创建了聊天室"</string>
+  <string name="state_event_room_avatar_changed">"%1$s 更换了房间头像"</string>
+  <string name="state_event_room_avatar_changed_by_you">"你更换了房间头像"</string>
+  <string name="state_event_room_avatar_removed">"%1$s 移除了房间头像"</string>
+  <string name="state_event_room_avatar_removed_by_you">"你移除了房间头像"</string>
+  <string name="state_event_room_ban">"%1$s 已封禁 %2$s"</string>
+  <string name="state_event_room_ban_by_you">"你已封禁 %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"你已封禁 %1$s：%2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s 已封禁 %2$s：%3$s"</string>
+  <string name="state_event_room_created">"%1$s 创建了房间"</string>
+  <string name="state_event_room_created_by_you">"你创建了房间"</string>
   <string name="state_event_room_invite">"%1$s 邀请了 %2$s"</string>
   <string name="state_event_room_invite_accepted">"%1$s 接受了邀请"</string>
   <string name="state_event_room_invite_accepted_by_you">"你接受了邀请"</string>
   <string name="state_event_room_invite_by_you">"你邀请了 %1$s"</string>
   <string name="state_event_room_invite_you">"%1$s 邀请了你"</string>
-  <string name="state_event_room_join">"%1$s 加入了聊天室"</string>
-  <string name="state_event_room_join_by_you">"你加入了聊天室"</string>
-  <string name="state_event_room_knock">"%1$s 请求加入"</string>
-  <string name="state_event_room_knock_accepted">"%1$s 允许 %2$s 加入"</string>
-  <string name="state_event_room_knock_accepted_by_you">"您已允许 %1$s 加入"</string>
-  <string name="state_event_room_knock_by_you">"你已请求加入"</string>
-  <string name="state_event_room_knock_denied">"%1$s 拒绝了 %2$s 的加入请求"</string>
-  <string name="state_event_room_knock_denied_by_you">"你拒绝了 %1$s 的加入请求"</string>
-  <string name="state_event_room_knock_denied_you">"%1$s 拒绝了你的加入请求"</string>
+  <string name="state_event_room_join">"%1$s 加入了房间"</string>
+  <string name="state_event_room_join_by_you">"你加入了房间"</string>
+  <string name="state_event_room_knock">"%1$s 申请加入"</string>
+  <string name="state_event_room_knock_accepted">"%1$s 已允许 %2$s 加入"</string>
+  <string name="state_event_room_knock_accepted_by_you">"你已允许 %1$s 加入"</string>
+  <string name="state_event_room_knock_by_you">"你已申请加入"</string>
+  <string name="state_event_room_knock_denied">"%1$s 拒绝了 %2$s 的加入申请"</string>
+  <string name="state_event_room_knock_denied_by_you">"你拒绝了 %1$s 的加入申请"</string>
+  <string name="state_event_room_knock_denied_you">"%1$s 拒绝了你的加入申请"</string>
   <string name="state_event_room_knock_retracted">"%1$s 已不再想加入"</string>
   <string name="state_event_room_knock_retracted_by_you">"你取消了加入申请"</string>
-  <string name="state_event_room_leave">"%1$s 离开了聊天室"</string>
-  <string name="state_event_room_leave_by_you">"你离开了聊天室"</string>
-  <string name="state_event_room_name_changed">"%1$s 将聊天室名称改为 %2$s"</string>
-  <string name="state_event_room_name_changed_by_you">"你把聊天室名称改为 %1$s"</string>
-  <string name="state_event_room_name_removed">"%1$s 移除了聊天室名称"</string>
-  <string name="state_event_room_name_removed_by_you">"你移除了聊天室名称"</string>
-  <string name="state_event_room_none">"%1$s 没有任何更改"</string>
-  <string name="state_event_room_none_by_you">"您未进行任何更改"</string>
-  <string name="state_event_room_pinned_events_changed">"%1$s 更改了置顶消息"</string>
-  <string name="state_event_room_pinned_events_changed_by_you">"您更改了置顶消息"</string>
-  <string name="state_event_room_pinned_events_pinned">"%1$s 置顶了一条消息"</string>
-  <string name="state_event_room_pinned_events_pinned_by_you">"您置顶了一条消息"</string>
-  <string name="state_event_room_pinned_events_unpinned">"%1$s 取消置顶了一条消息"</string>
-  <string name="state_event_room_pinned_events_unpinned_by_you">"您取消置顶了一条消息"</string>
+  <string name="state_event_room_leave">"%1$s 离开了房间"</string>
+  <string name="state_event_room_leave_by_you">"你离开了房间"</string>
+  <string name="state_event_room_name_changed">"%1$s 将房间名称更改为 %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"你将房间名称更改为 %1$s"</string>
+  <string name="state_event_room_name_removed">"%1$s 移除了房间名称"</string>
+  <string name="state_event_room_name_removed_by_you">"你移除了房间名称"</string>
+  <string name="state_event_room_none">"%1$s 未产生任何更改"</string>
+  <string name="state_event_room_none_by_you">"你未产生任何更改"</string>
+  <string name="state_event_room_pinned_events_changed">"%1$s 更改了已置顶的消息"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"你更改了已置顶的消息"</string>
+  <string name="state_event_room_pinned_events_pinned">"%1$s 置顶了 1 个消息"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"你已置顶了 1 个消息"</string>
+  <string name="state_event_room_pinned_events_unpinned">"%1$s 取消置顶了 1 个消息"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"你取消置顶了 1 个消息"</string>
   <string name="state_event_room_reject">"%1$s 拒绝了邀请"</string>
   <string name="state_event_room_reject_by_you">"你拒绝了邀请"</string>
-  <string name="state_event_room_remove">"%1$s 移除了 %2$s"</string>
+  <string name="state_event_room_remove">"%1$s 已移除 %2$s"</string>
   <string name="state_event_room_remove_by_you">"你移除了 %1$s"</string>
-  <string name="state_event_room_remove_by_you_with_reason">"您已删除%1$s ：%2$s"</string>
-  <string name="state_event_room_remove_with_reason">"%1$s已移除%2$s：%3$s"</string>
-  <string name="state_event_room_third_party_invite">"%1$s 向 %2$s 发送了加入聊天室的邀请"</string>
-  <string name="state_event_room_third_party_invite_by_you">"你邀请 %1$s 加入聊天室"</string>
-  <string name="state_event_room_third_party_revoked_invite">"%1$s 撤销了 %2$s 加入聊天室的邀请"</string>
-  <string name="state_event_room_third_party_revoked_invite_by_you">"你撤销了 %1$s 加入聊天室的邀请"</string>
-  <string name="state_event_room_topic_changed">"%1$s 将主题改为：%2$s"</string>
-  <string name="state_event_room_topic_changed_by_you">"你将主题改为：%1$s"</string>
-  <string name="state_event_room_topic_removed">"%1$s 移除了聊天室主题"</string>
-  <string name="state_event_room_topic_removed_by_you">"你移除了聊天室主题"</string>
-  <string name="state_event_room_unban">"%1$s 解禁了 %2$s"</string>
-  <string name="state_event_room_unban_by_you">"你解禁了 %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"你移除了 %1$s：%2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s 移除了 %2$s：%3$s"</string>
+  <string name="state_event_room_third_party_invite">"%1$s 向 %2$s 发送了加入房间的邀请"</string>
+  <string name="state_event_room_third_party_invite_by_you">"你邀请 %1$s 加入房间"</string>
+  <string name="state_event_room_third_party_revoked_invite">"%1$s 撤消了 %2$s 加入房间的邀请"</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"你撤消了 %1$s 加入房间的邀请"</string>
+  <string name="state_event_room_topic_changed">"%1$s 将主题更改为：%2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"你将主题更改为：%1$s"</string>
+  <string name="state_event_room_topic_removed">"%1$s 移除了房间主题"</string>
+  <string name="state_event_room_topic_removed_by_you">"你移除了房间主题"</string>
+  <string name="state_event_room_unban">"%1$s 已解封 %2$s"</string>
+  <string name="state_event_room_unban_by_you">"你已解封 %1$s"</string>
   <string name="state_event_room_unknown_membership_change">"%1$s 对其成员资格进行了未知更改"</string>
 </resources>
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
index e91bed409e..198da2bf7d 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
@@ -22,6 +22,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventTimeline
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
@@ -50,16 +51,14 @@ import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class DefaultPinnedMessagesBannerFormatterTest {
+class DefaultPinnedMessagesBannerFormatterTest : RobolectricTest() {
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
     private lateinit var formatter: DefaultPinnedMessagesBannerFormatter
@@ -143,6 +142,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
             AudioMessageType(body, null, null, MediaSource("url"), null),
             VoiceMessageType(body, null, null, MediaSource("url"), null, null),
             ImageMessageType(body, null, null, MediaSource("url"), null),
+            GalleryMessageType(body, null, emptyList()),
             StickerMessageType(body, null, null, MediaSource("url"), null),
             FileMessageType(body, null, null, MediaSource("url"), null),
             LocationMessageType(body, "geo:1,2", null, null),
@@ -165,6 +165,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
                 is VideoMessageType,
                 is AudioMessageType,
                 is ImageMessageType,
+                is GalleryMessageType,
                 is StickerMessageType,
                 is FileMessageType,
                 is LocationMessageType -> AnnotatedString::class.java
@@ -183,6 +184,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
                 is AudioMessageType -> "Audio: Shared body"
                 is VoiceMessageType -> "Voice message"
                 is ImageMessageType -> "Image: Shared body"
+                is GalleryMessageType -> "Gallery: Shared body"
                 is StickerMessageType -> "Sticker: Shared body"
                 is FileMessageType -> "File: Shared body"
                 is LocationMessageType -> "Shared location: Shared body"
@@ -601,7 +603,6 @@ class DefaultPinnedMessagesBannerFormatterTest {
             OtherState.PolicyRuleRoom,
             OtherState.PolicyRuleServer,
             OtherState.PolicyRuleUser,
-            OtherState.RoomAliases,
             OtherState.RoomCanonicalAlias,
             OtherState.RoomGuestAccess,
             OtherState.RoomHistoryVisibility,
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
index 2345af8a33..791a363f77 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatterTest.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.eventformatter.impl
 
 import android.content.Context
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.font.FontWeight
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
 import io.element.android.libraries.matrix.api.core.UserId
@@ -22,6 +23,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
@@ -50,16 +52,14 @@ import io.element.android.libraries.matrix.test.timeline.aProfileDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class DefaultRoomLatestEventFormatterTest {
+class DefaultRoomLatestEventFormatterTest : RobolectricTest() {
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
     private lateinit var formatter: DefaultRoomLatestEventFormatter
@@ -74,7 +74,8 @@ class DefaultRoomLatestEventFormatterTest {
             roomMembershipContentFormatter = RoomMembershipContentFormatter(fakeMatrixClient, stringProvider),
             profileChangeContentFormatter = ProfileChangeContentFormatter(stringProvider),
             stateContentFormatter = StateContentFormatter(stringProvider),
-            permalinkParser = FakePermalinkParser(),
+            rtcNotificationContentFormatter = RtcNotificationContentFormatter(fakeMatrixClient, stringProvider),
+            permalinkParser = FakePermalinkParser()
         )
     }
 
@@ -102,7 +103,14 @@ class DefaultRoomLatestEventFormatterTest {
         val info = ImageInfo(null, null, null, null, null, null, null)
         val message = createLatestEvent(false, null, aStickerContent(body, info, aMediaSource(url = "url")))
         val result = formatter.format(message, false)
-        val expectedBody = someoneElseId.value + ": Sticker (a sticker body)"
+        val expectedBody = someoneElseId.value + ": Sticker: a sticker body"
+        // Check we have formatting
+        assertThat(result is AnnotatedString).isTrue()
+        // And there is a bold span for the 'Sticker' part
+        val boldSpanStyle = (result as AnnotatedString).spanStyles.lastOrNull { it.item.fontWeight == FontWeight.Bold }
+        assertThat(boldSpanStyle).isNotNull()
+        val spanStart = someoneElseId.value.length + 2
+        assertThat(boldSpanStyle!!.start..boldSpanStyle.end).isEqualTo(spanStart..spanStart + 7)
         assertThat(result.toString()).isEqualTo(expectedBody)
     }
 
@@ -188,6 +196,7 @@ class DefaultRoomLatestEventFormatterTest {
             AudioMessageType(body, null, null, MediaSource("url"), null),
             VoiceMessageType(body, null, null, MediaSource("url"), null, null),
             ImageMessageType(body, null, null, MediaSource("url"), null),
+            GalleryMessageType(body, null, emptyList()),
             StickerMessageType(body, null, null, MediaSource("url"), null),
             FileMessageType(body, null, null, MediaSource("url"), null),
             LocationMessageType(body, "geo:1,2", null, null),
@@ -220,6 +229,7 @@ class DefaultRoomLatestEventFormatterTest {
                 is AudioMessageType -> "Audio: Shared body"
                 is VoiceMessageType -> "Voice message"
                 is ImageMessageType -> "Image: Shared body"
+                is GalleryMessageType -> "Gallery: Shared body"
                 is StickerMessageType -> "Sticker: Shared body"
                 is FileMessageType -> "File: Shared body"
                 is LocationMessageType -> "Shared location"
@@ -240,6 +250,7 @@ class DefaultRoomLatestEventFormatterTest {
                 is TextMessageType -> false
                 is NoticeMessageType -> false
                 is OtherMessageType -> false
+                is GalleryMessageType -> true
             }
             if (shouldCreateAnnotatedString) {
                 assertWithMessage("$type doesn't produce an AnnotatedString")
@@ -257,6 +268,7 @@ class DefaultRoomLatestEventFormatterTest {
                 is AudioMessageType -> "$expectedPrefix: Audio: Shared body"
                 is VoiceMessageType -> "$expectedPrefix: Voice message"
                 is ImageMessageType -> "$expectedPrefix: Image: Shared body"
+                is GalleryMessageType -> "$expectedPrefix: Gallery: Shared body"
                 is StickerMessageType -> "$expectedPrefix: Sticker: Shared body"
                 is FileMessageType -> "$expectedPrefix: File: Shared body"
                 is LocationMessageType -> "$expectedPrefix: Shared location"
@@ -277,6 +289,7 @@ class DefaultRoomLatestEventFormatterTest {
                 is TextMessageType -> true
                 is NoticeMessageType -> true
                 is OtherMessageType -> true
+                is GalleryMessageType -> true
             }
             if (shouldCreateAnnotatedString) {
                 assertWithMessage("$type doesn't produce an AnnotatedString")
@@ -746,7 +759,6 @@ class DefaultRoomLatestEventFormatterTest {
             OtherState.PolicyRuleRoom,
             OtherState.PolicyRuleServer,
             OtherState.PolicyRuleUser,
-            OtherState.RoomAliases,
             OtherState.RoomCanonicalAlias,
             OtherState.RoomGuestAccess,
             OtherState.RoomHistoryVisibility,
@@ -909,10 +921,18 @@ class DefaultRoomLatestEventFormatterTest {
         val pollContent = aPollContent()
 
         val mineContentEvent = createLatestEvent(sentByYou = true, senderDisplayName = "Alice", content = pollContent)
-        assertThat(formatter.format(mineContentEvent, true)).isEqualTo("Poll: Do you like polls?")
+        assertThat(formatter.format(mineContentEvent, true).toString()).isEqualTo("Poll: Do you like polls?")
 
         val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
-        assertThat(formatter.format(contentEvent, true)).isEqualTo("Poll: Do you like polls?")
+        assertThat(formatter.format(contentEvent, true).toString()).isEqualTo("Poll: Do you like polls?")
+
+        val result = formatter.format(contentEvent, true)
+        // Check we have formatting
+        assertThat(result is AnnotatedString).isTrue()
+        // And there is a bold span for the 'Poll' part
+        val boldSpanStyle = (result as AnnotatedString).spanStyles.lastOrNull { it.item.fontWeight == FontWeight.Bold }
+        assertThat(boldSpanStyle).isNotNull()
+        assertThat(boldSpanStyle!!.start..boldSpanStyle.end).isEqualTo(0..4)
     }
 
     @Test
@@ -925,6 +945,15 @@ class DefaultRoomLatestEventFormatterTest {
 
         val contentEvent = createLatestEvent(sentByYou = false, senderDisplayName = "Bob", content = pollContent)
         assertThat(formatter.format(contentEvent, false).toString()).isEqualTo("Bob: Poll: Do you like polls?")
+
+        val result = formatter.format(contentEvent, false)
+        // Check we have formatting
+        assertThat(result is AnnotatedString).isTrue()
+        // And there is a bold span for the 'Poll' part
+        val boldSpanStyle = (result as AnnotatedString).spanStyles.lastOrNull { it.item.fontWeight == FontWeight.Bold }
+        assertThat(boldSpanStyle).isNotNull()
+        val spanStart = "Bob".length + 2
+        assertThat(boldSpanStyle!!.start..boldSpanStyle.end).isEqualTo(spanStart..spanStart + 4)
     }
 
     // endregion
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatterTest.kt
new file mode 100644
index 0000000000..9a79f78413
--- /dev/null
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/RtcNotificationContentFormatterTest.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.eventformatter.impl
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
+import io.element.android.libraries.matrix.test.A_USER_ID_2
+import io.element.android.libraries.matrix.test.A_USER_ID_3
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Before
+import org.junit.Test
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+
+@Suppress("LargeClass")
+class RtcNotificationContentFormatterTest : RobolectricTest() {
+    private lateinit var context: Context
+    private lateinit var fakeMatrixClient: FakeMatrixClient
+    private lateinit var formatter: RtcNotificationContentFormatter
+
+    @Before
+    fun setup() {
+        context = RuntimeEnvironment.getApplication() as Context
+        fakeMatrixClient = FakeMatrixClient()
+        val stringProvider = AndroidStringProvider(context.resources)
+        formatter = RtcNotificationContentFormatter(
+            fakeMatrixClient,
+            stringProvider
+        )
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `Should not display declined info in rooms`() {
+        val result = formatter.format(
+            CallNotifyContent(
+                callIntent = CallIntent.VIDEO,
+                declinedBy = listOf(A_USER_ID_2, A_USER_ID_3),
+                activeMembers = emptyList(),
+                isJoined = false,
+                callStartTsMillis = 0
+            ),
+            false
+        )
+        val expected = "Call started"
+        assertThat(result.toString()).isEqualTo(expected)
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `Declined by me variant`() {
+        val result = formatter.format(
+            CallNotifyContent(
+                CallIntent.VIDEO,
+                declinedBy = listOf(fakeMatrixClient.sessionId),
+                activeMembers = listOf(A_USER_ID_2),
+                isJoined = false,
+                callStartTsMillis = 0
+            ),
+            true
+        )
+        val expected = "You declined a call"
+        assertThat(result.toString()).isEqualTo(expected)
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `Declined by other variant`() {
+        val result = formatter.format(
+            CallNotifyContent(
+                CallIntent.VIDEO,
+                declinedBy = listOf(A_USER_ID_2),
+                activeMembers = listOf(fakeMatrixClient.sessionId),
+                isJoined = true,
+                callStartTsMillis = 0
+            ),
+            true
+        )
+        val expected = "Call declined"
+        assertThat(result.toString()).isEqualTo(expected)
+    }
+
+    @Test
+    @Config(qualifiers = "en")
+    fun `Call started in DM`() {
+        val result = formatter.format(
+            CallNotifyContent(
+                CallIntent.AUDIO,
+                declinedBy = listOf(),
+                activeMembers = emptyList(),
+                isJoined = false,
+                callStartTsMillis = 0
+            ),
+            true
+        )
+        val expected = "Call started"
+        assertThat(result.toString()).isEqualTo(expected)
+    }
+}
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 6cd9dec60c..79b63f4455 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -22,13 +22,6 @@ enum class FeatureFlags(
     override val isFinished: Boolean,
     override val isInLabs: Boolean = false,
 ) : Feature {
-    RoomDirectorySearch(
-        key = "feature.roomdirectorysearch",
-        title = "Room directory search",
-        description = "Allow user to search for public rooms in their homeserver",
-        defaultValue = { false },
-        isFinished = false,
-    ),
     ShowBlockedUsersDetails(
         key = "feature.showBlockedUsersDetails",
         title = "Show blocked users details",
@@ -52,17 +45,6 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    EnableKeyShareOnInvite(
-        key = "feature.enableKeyShareOnInvite",
-        title = "Share encrypted history with new members",
-        description = "When inviting a user to an encrypted room that has history visibility set to \"shared\"," +
-            " share encrypted history with that user, and accept encrypted history when you are invited to such a room." +
-            "\nRequires an app restart to take effect." +
-            "\n\nWARNING: this feature is EXPERIMENTAL and not all security precautions are implemented." +
-            " Do not enable on production accounts.",
-        defaultValue = { false },
-        isFinished = false,
-    ),
     Knock(
         key = "feature.knock",
         title = "Ask to join",
@@ -70,27 +52,6 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    CreateSpaces(
-        key = "feature.createSpaces",
-        title = "Create spaces",
-        description = "Allow creating spaces.",
-        defaultValue = { true },
-        isFinished = false,
-    ),
-    SpaceSettings(
-        key = "feature.spaceSettings",
-        title = "Space settings",
-        description = "Allow managing space settings such as details, permissions and privacy.",
-        defaultValue = { true },
-        isFinished = false,
-    ),
-    RoomListSpaceFilters(
-        key = "feature.roomListSpaceFilters",
-        title = "Room list space filters",
-        description = "Allow filtering the room list by space.",
-        defaultValue = { true },
-        isFinished = false,
-    ),
     PrintLogsToLogcat(
         key = "feature.print_logs_to_logcat",
         title = "Print logs to logcat",
@@ -125,14 +86,6 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    SyncNotificationsWithWorkManager(
-        key = "feature.sync_notifications_with_workmanager",
-        title = "Sync notifications with WorkManager",
-        description = "Use WorkManager to schedule notification sync tasks when a push is received." +
-            " This should improve reliability and battery usage.",
-        defaultValue = { true },
-        isFinished = false,
-    ),
     QrCodeLogin(
         key = "feature.qr_code_login",
         title = "QR Code Login",
@@ -140,26 +93,77 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
-    SignInWithClassic(
-        key = "feature.signin_with_classic",
-        title = "Sign in with Element Classic",
-        description = "Allow the application to sign in to the current Element Classic account.",
-        defaultValue = { false },
-        isFinished = false,
-    ),
-    LiveLocationSharing(
-        key = "feature.liveLocationSharing",
-        title = "Live location sharing",
-        description = "Allow sharing live location in rooms.",
+    AllowBlackTheme(
+        key = "feature.allow_black_theme",
+        title = "Black theme",
+        description = "Allow selecting the black appearance theme for battery saving on OLED.",
         defaultValue = { false },
         isFinished = false,
     ),
     ValidateNetworkWhenSchedulingNotificationFetching(
         key = "feature.validate_network_when_scheduling_notification_fetching",
-        title = "validate internet connectivity when scheduling notification fetching",
+        title = "Validate internet connectivity when scheduling notification fetching",
         description = "Only fetch events for push notifications when the device has internet connectivity. " +
             "Enabling this can be problematic in air-gapped environments.",
         defaultValue = { true },
         isFinished = false,
     ),
+    JumpToUnread(
+        key = "feature.jump_to_unread",
+        title = "Jump to unread messages",
+        description = "Show a button to jump to the read marker, plus a count badge on the scroll-to-bottom button " +
+            "when new messages arrive while scrolled away.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    SlashCommand(
+        key = "feature.slash_command",
+        title = "Parse slash commands in the message composer",
+        description = "Allow parsing slash commands in the message composer and perform action.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    RoomThreadList(
+        key = "feature.room_thread_list",
+        title = "Add a list of threads in a room",
+        description = "Add a new screen with a list of threads in a room.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    AutomaticBackPagination(
+        key = "feature.automatic_back_pagination",
+        title = "Automatic back pagination of rooms",
+        description = "Allow the app to automatically back paginate in rooms to pre-fetch older messages in background." +
+            "\nRequires an app restart to take effect.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    UnreadIndicatorCount(
+        key = "feature.unread_indicator_count",
+        title = "Unread indicator count",
+        description = "Show the number of unread messages on the unread indicator in the room list.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    SendGalleryMessages(
+        key = "feature.send_gallery_messages",
+        title = "Send gallery messages",
+        description = "Allow sending multiple media items in a single message.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    UserStatus(
+        key = "feature.user_status",
+        title = "User status",
+        description = "Allow users to set a status (e.g. In a meeting, Away) visible to their contacts.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
+    MessageSearch(
+        key = "feature.message_search",
+        title = "Message search",
+        description = "Index messages locally so they can be searched. Only messages received while enabled are indexed.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
 }
diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index 1c70006cc8..d0790a6905 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -24,6 +24,11 @@ android {
     }
 
     defaultConfig {
+        buildConfigField(
+            name = "OAUTH_CLIENT_URI_PATH",
+            type = "String",
+            value = BuildTimeConfig.OAUTH_CLIENT_URL_PATH?.let { "\"$it\"" } ?: "null",
+        )
         buildConfigFieldStr(
             name = "CLIENT_URI",
             value = BuildTimeConfig.URL_WEBSITE ?: "https://element.io"
@@ -44,14 +49,12 @@ android {
 }
 
 dependencies {
-    implementation(projects.libraries.di)
-    implementation(projects.libraries.androidutils)
-    implementation(projects.libraries.core)
-    implementation(projects.services.analytics.api)
-    implementation(libs.serialization.json)
-    api(projects.libraries.sessionStorage.api)
     implementation(libs.coroutines.core)
-    api(projects.libraries.architecture)
+    implementation(libs.serialization.json)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.sessionStorage.api)
+    implementation(projects.services.analytics.api)
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/HomeserverCapabilitiesProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/HomeserverCapabilitiesProvider.kt
new file mode 100644
index 0000000000..e914656f5f
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/HomeserverCapabilitiesProvider.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api
+
+/**
+ * Provides information about the capabilities of the homeserver.
+ *
+ * Spec: https://spec.matrix.org/latest/client-server-api/#capabilities-negotiation
+ */
+interface HomeserverCapabilitiesProvider {
+    /**
+     * Manually refresh the capabilities of the homeserver performing a network request.
+     */
+    suspend fun refresh(): Result<Unit>
+
+    /**
+     * Indicates whether the homeserver allows the user to change their display name.
+     */
+    suspend fun canChangeDisplayName(): Result<Boolean>
+
+    /**
+     * Indicates whether the homeserver allows the user to change their avatar URL.
+     */
+    suspend fun canChangeAvatarUrl(): Result<Boolean>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
index 773dbaaa07..0dd8821a4f 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
@@ -26,7 +26,8 @@ import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -34,14 +35,18 @@ import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
+import io.element.android.libraries.matrix.api.room.location.BeaconInfoUpdate
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.api.search.MessageSearchService
 import io.element.android.libraries.matrix.api.spaces.SpaceService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.api.user.UserStatus
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CoroutineScope
@@ -52,6 +57,10 @@ import java.util.Optional
 interface MatrixClient {
     val sessionId: SessionId
     val deviceId: DeviceId
+
+    /** Base URL of the homeserver this client is connected to. */
+    val homeserverUrl: String
+    val sessionPaths: SessionPaths
     val userProfile: StateFlow<MatrixUser>
     val roomListService: RoomListService
     val spaceService: SpaceService
@@ -62,11 +71,17 @@ interface MatrixClient {
     val notificationSettingsService: NotificationSettingsService
     val encryptionService: EncryptionService
     val roomDirectoryService: RoomDirectoryService
+
+    /** Whether this live client was built with a message search index attached. */
+    val isMessageSearchAvailable: Boolean
+    val messageSearchService: MessageSearchService
     val mediaPreviewService: MediaPreviewService
     val matrixMediaLoader: MatrixMediaLoader
     val sessionCoroutineScope: CoroutineScope
     val ignoredUsersFlow: StateFlow<ImmutableList<UserId>>
     val roomMembershipObserver: RoomMembershipObserver
+    val ownBeaconInfoUpdates: Flow<BeaconInfoUpdate>
+    val contentScanner: ContentScanner?
     suspend fun getJoinedRoom(roomId: RoomId): JoinedRoom?
     suspend fun getRoom(roomId: RoomId): BaseRoom?
     suspend fun findDM(userId: UserId): Result<RoomId?>
@@ -74,12 +89,16 @@ interface MatrixClient {
     suspend fun ignoreUser(userId: UserId): Result<Unit>
     suspend fun unignoreUser(userId: UserId): Result<Unit>
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>
-    suspend fun createDM(userId: UserId): Result<RoomId>
+    suspend fun createDM(userId: UserId, isEncrypted: Boolean): Result<RoomId>
     suspend fun getProfile(userId: UserId): Result<MatrixUser>
     suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults>
     suspend fun setDisplayName(displayName: String): Result<Unit>
     suspend fun uploadAvatar(mimeType: String, data: ByteArray): Result<Unit>
     suspend fun removeAvatar(): Result<Unit>
+    suspend fun setUserStatus(status: UserStatus): Result<Unit>
+
+    /** Clears both m.status and m.call profile fields (maps to DELETE on the profile endpoint per MSC4426). */
+    suspend fun clearUserStatus(): Result<Unit>
     suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?>
     suspend fun joinRoomByIdOrAlias(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomInfo?>
     suspend fun knockRoom(roomIdOrAlias: RoomIdOrAlias, message: String, serverNames: List<String>): Result<RoomInfo?>
@@ -199,6 +218,12 @@ interface MatrixClient {
      */
     suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result<Unit>
 
+    /**
+     * Mark all joined rooms as read by sending public, private and fully-read receipts
+     * on each room's latest event. Per-room errors are logged and skipped by the SDK.
+     */
+    suspend fun markAllRoomsAsRead(): Result<Unit>
+
     /**
      * Check if linking a new device using QrCode is supported by the server.
      */
@@ -219,10 +244,17 @@ interface MatrixClient {
      */
     suspend fun performDatabaseVacuum(): Result<Unit>
 
+    /**
+     * Returns the URL of the map style configured on the server, if any.
+     */
+    suspend fun getMapStyleUrl(): Result<String?>
+
     /**
      * Resets the cached client `well-known` config by the SDK.
      */
     suspend fun resetWellKnownConfig(): Result<Unit>
+
+    fun homeserverCapabilities(): HomeserverCapabilitiesProvider
 }
 
 /**
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/GetDatabaseSizesUseCase.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/GetDatabaseSizesUseCase.kt
index ab11374116..fde02fb2c6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/GetDatabaseSizesUseCase.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/GetDatabaseSizesUseCase.kt
@@ -10,5 +10,5 @@ package io.element.android.libraries.matrix.api.analytics
 import io.element.android.libraries.matrix.api.core.SessionId
 
 fun interface GetDatabaseSizesUseCase {
-    suspend operator fun invoke(sessionId: SessionId): Result<SdkStoreSizes>
+    operator fun invoke(sessionId: SessionId): Result<SdkStoreSizes>
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
index ac3b0c8e3a..f515ce8c32 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
@@ -19,7 +19,7 @@ fun BaseRoom.toAnalyticsViewRoom(
     val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
 
     return ViewRoom(
-        isDM = info().isDirect,
+        isDM = info().isDm,
         isSpace = info().isSpace,
         trigger = trigger,
         activeSpace = activeSpace,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
index c50ec09609..d5fd6a734a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
@@ -16,6 +16,6 @@ sealed class AuthenticationException(message: String?) : Exception(message) {
     class InvalidServerName(message: String?) : AuthenticationException(message)
     class SlidingSyncVersion(message: String?) : AuthenticationException(message)
     class ServerUnreachable(message: String?) : AuthenticationException(message)
-    class Oidc(message: String?) : AuthenticationException(message)
+    class OAuth(message: String?) : AuthenticationException(message)
     class Generic(message: String?) : AuthenticationException(message)
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ConfirmingLoginWithElementClassic.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/ElementClassicSession.kt
similarity index 56%
rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ConfirmingLoginWithElementClassic.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/ElementClassicSession.kt
index 5fae0afdd5..d094019db2 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/classic/ConfirmingLoginWithElementClassic.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/ElementClassicSession.kt
@@ -5,11 +5,14 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.login.impl.screens.onboarding.classic
+package io.element.android.libraries.matrix.api.auth
 
-import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.UserId
 
-class ConfirmingLoginWithElementClassic(
+data class ElementClassicSession(
     val userId: UserId,
-) : AsyncAction.Confirming
+    val homeserverUrl: String?,
+    val secrets: String?,
+    val roomKeysVersion: String?,
+    val doesContainBackupKey: Boolean,
+)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixAuthenticationService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixAuthenticationService.kt
index 1c574ad467..04d1d13593 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixAuthenticationService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixAuthenticationService.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 
 interface MatrixAuthenticationService {
     /**
@@ -36,26 +37,40 @@ interface MatrixAuthenticationService {
     suspend fun importCreatedSession(externalSession: ExternalSession): Result<SessionId>
 
     /*
-     * OIDC part.
+     * OAuth part.
      */
 
     /**
-     * Get the Oidc url to display to the user.
+     * Get the OAuth url to display to the user.
      */
-    suspend fun getOidcUrl(
-        prompt: OidcPrompt,
+    suspend fun getOAuthUrl(
+        prompt: OAuthPrompt,
         loginHint: String?,
-    ): Result<OidcDetails>
+    ): Result<OAuthDetails>
 
     /**
-     * Cancel Oidc login sequence.
+     * Cancel OAuth login sequence.
      */
-    suspend fun cancelOidcLogin(): Result<Unit>
+    suspend fun cancelOAuthLogin(): Result<Unit>
 
     /**
-     * Attempt to login using the [callbackUrl] provided by the Oidc page.
+     * Set the existing data about Element Classic session, if any.
      */
-    suspend fun loginWithOidc(callbackUrl: String): Result<SessionId>
+    fun setElementClassicSession(session: ElementClassicSession?)
+
+    /**
+     * Check if the provided secrets from Element Classic session contain a key backup.
+     */
+    fun doSecretsContainBackupKey(
+        userId: UserId,
+        secrets: String,
+        backupInfo: String,
+    ): Boolean
+
+    /**
+     * Attempt to log in using the [callbackUrl] provided by the OAuth page.
+     */
+    suspend fun loginWithOAuth(callbackUrl: String): Result<SessionId>
 
     suspend fun loginWithQrCode(qrCodeData: MatrixQrCodeLoginData, progress: (QrCodeLoginStep) -> Unit): Result<SessionId>
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetails.kt
index aa5ed9a41d..8dcb5c4a48 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetails.kt
@@ -11,7 +11,7 @@ package io.element.android.libraries.matrix.api.auth
 data class MatrixHomeServerDetails(
     val url: String,
     val supportsPasswordLogin: Boolean,
-    val supportsOidcLogin: Boolean,
+    val supportsOAuthLogin: Boolean,
 ) {
-    val isSupported = supportsPasswordLogin || supportsOidcLogin
+    val isSupported = supportsPasswordLogin || supportsOAuthLogin
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthConfig.kt
similarity index 76%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthConfig.kt
index ee8b7ec50e..3256d0545c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthConfig.kt
@@ -10,8 +10,11 @@ package io.element.android.libraries.matrix.api.auth
 
 import io.element.android.libraries.matrix.api.BuildConfig
 
-object OidcConfig {
-    const val CLIENT_URI = BuildConfig.CLIENT_URI
+object OAuthConfig {
+    val CLIENT_URI = BuildConfig.OAUTH_CLIENT_URI_PATH?.let {
+        // Concatenate the base URI and the path, ensuring there is exactly one '/' between them
+        "${BuildConfig.CLIENT_URI.trimEnd('/')}/${it.trimStart('/')}"
+    } ?: BuildConfig.CLIENT_URI
 
     // Note: host must match with the host of CLIENT_URI
     const val LOGO_URI = BuildConfig.LOGO_URI
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthDetails.kt
similarity index 94%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcDetails.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthDetails.kt
index c4fb87e3c2..d504f891ee 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthDetails.kt
@@ -12,6 +12,6 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class OidcDetails(
+data class OAuthDetails(
     val url: String,
 ) : Parcelable
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcPrompt.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthPrompt.kt
similarity index 81%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcPrompt.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthPrompt.kt
index 8ddad9f52e..45b4e18533 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcPrompt.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthPrompt.kt
@@ -8,12 +8,12 @@
 
 package io.element.android.libraries.matrix.api.auth
 
-sealed interface OidcPrompt {
+sealed interface OAuthPrompt {
     /**
      * The Authorization Server should prompt the End-User for
      * reauthentication.
      */
-    data object Login : OidcPrompt
+    data object Login : OAuthPrompt
 
     /**
      * The Authorization Server should prompt the End-User to create a user
@@ -21,10 +21,10 @@ sealed interface OidcPrompt {
      *
      * Defined in [Initiating User Registration via OpenID Connect](https://openid.net/specs/openid-connect-prompt-create-1_0.html).
      */
-    data object Create : OidcPrompt
+    data object Create : OAuthPrompt
 
     /**
      * An unknown value.
      */
-    data class Unknown(val value: String) : OidcPrompt
+    data class Unknown(val value: String) : OAuthPrompt
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthRedirectUrlProvider.kt
similarity index 89%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthRedirectUrlProvider.kt
index ad4d862474..669d47501d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OAuthRedirectUrlProvider.kt
@@ -8,6 +8,6 @@
 
 package io.element.android.libraries.matrix.api.auth
 
-interface OidcRedirectUrlProvider {
+interface OAuthRedirectUrlProvider {
     fun provide(): String
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
index a3b567fa46..11c646650e 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
@@ -15,11 +15,13 @@ sealed class QrLoginException : Exception() {
     data object Expired : QrLoginException()
     data object NotFound : QrLoginException()
     data object LinkingNotSupported : QrLoginException()
-    data object OidcMetadataInvalid : QrLoginException()
+    data object OAuthMetadataInvalid : QrLoginException()
     data object SlidingSyncNotAvailable : QrLoginException()
     data object OtherDeviceNotSignedIn : QrLoginException()
     data object CheckCodeAlreadySent : QrLoginException()
     data object CheckCodeCannotBeSent : QrLoginException()
+    data object ContinuationAlreadySent : QrLoginException()
+    data object ContinuationCannotBeSent : QrLoginException()
     data object UnsupportedQrCodeType : QrLoginException()
     data object Unknown : QrLoginException()
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomIdOrAlias.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomIdOrAlias.kt
index 4ac480e064..462ec0535c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomIdOrAlias.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomIdOrAlias.kt
@@ -27,6 +27,16 @@ sealed interface RoomIdOrAlias : Parcelable {
             is Id -> roomId.value
             is Alias -> roomAlias.value
         }
+
+    companion object {
+        fun from(id: String): RoomIdOrAlias? {
+            return when {
+                MatrixPatterns.isRoomId(id) -> Id(RoomId(id))
+                MatrixPatterns.isRoomAlias(id) -> Alias(RoomAlias(id))
+                else -> null
+            }
+        }
+    }
 }
 
 fun RoomId.toRoomIdOrAlias() = RoomIdOrAlias.Id(this)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
index aefad517dc..f82cdc1969 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt
@@ -24,9 +24,15 @@ interface EncryptionService {
     suspend fun enableBackups(): Result<Unit>
 
     /**
-     * Enable recovery. Observe enableProgressStateFlow to get progress and recovery key.
+     * Enable recovery and return the SDK-generated recovery key on success.
+     * Observe [enableRecoveryProgressStateFlow] for in-progress UI updates.
+     *
+     * @param waitForBackupsToUpload when true, suspends until existing room keys finish uploading.
+     * @param passphrase optional user-supplied passphrase. When set, the SDK derives the
+     *   secret-storage key from it instead of a random base58 key; the passphrase can later be
+     *   passed to [recover], and the returned base58 key should not be surfaced to the user.
      */
-    suspend fun enableRecovery(waitForBackupsToUpload: Boolean): Result<Unit>
+    suspend fun enableRecovery(waitForBackupsToUpload: Boolean, passphrase: String? = null): Result<String>
 
     /**
      * Change the recovery and return the new recovery key.
@@ -112,19 +118,19 @@ interface IdentityPasswordResetHandle : IdentityResetHandle {
 }
 
 /**
- * A handle to reset the user's identity with an OIDC login type.
+ * A handle to reset the user's identity with an OAuth login type.
  */
-interface IdentityOidcResetHandle : IdentityResetHandle {
+interface IdentityOAuthResetHandle : IdentityResetHandle {
     /**
      * The URL to open in a webview/custom tab to reset the identity.
      */
     val url: String
 
     /**
-     * Reset the identity using the OIDC flow.
+     * Reset the identity using the OAuth flow.
      *
      * This method will block the coroutine it's running on and keep polling indefinitely until either the coroutine is cancelled, the [cancel] method is
      * called, or the identity is reset.
      */
-    suspend fun resetOidc(): Result<Unit>
+    suspend fun resetOAuth(): Result<Unit>
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/PasswordStrengthEstimator.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/PasswordStrengthEstimator.kt
new file mode 100644
index 0000000000..62322781d5
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/PasswordStrengthEstimator.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.encryption
+
+/**
+ * Estimates the strength of a password or passphrase using the zxcvbn algorithm,
+ * as exposed by the Rust SDK. Backed by pattern matching (dictionary words,
+ * keyboard walks, repeats, dates, l33t speak, …) rather than naive per-character
+ * entropy, so it agrees with the iOS client for cross-platform parity.
+ *
+ * App-scoped: obtain an instance via dependency injection rather than constructing one.
+ */
+interface PasswordStrengthEstimator {
+    /**
+     * Estimate the strength of [password].
+     *
+     * @param password the password or passphrase to evaluate.
+     * @param userInputs optional context (e.g. user ID, display name, email) that the
+     *   estimator penalises when it appears inside the password, so personal information
+     *   does not inflate the score.
+     */
+    fun estimate(password: String, userInputs: List<String> = emptyList()): PasswordStrengthEstimate
+}
+
+/**
+ * The result of a [PasswordStrengthEstimator.estimate] call.
+ */
+data class PasswordStrengthEstimate(
+    /** Overall ranking, from [PasswordStrengthRanking.VeryWeak] to [PasswordStrengthRanking.VeryStrong]. */
+    val ranking: PasswordStrengthRanking,
+    /**
+     * `log10` of the estimated number of guesses needed to crack the password. Grows without an
+     * upper bound and is independent of any threshold configuration.
+     */
+    val score: Double,
+    /**
+     * [score] normalized to `0.0..1.0` against the estimator's `VeryStrong` threshold
+     * (`score / veryStrong`), suitable for driving a strength meter. Scores above the `VeryStrong`
+     * threshold can exceed `1.0`, so clamp before use.
+     */
+    val normalScore: Double,
+)
+
+/**
+ * A ranking of estimated password strength. Derived by the SDK from [PasswordStrengthEstimate.score]
+ * against a fixed set of thresholds tuned for modern hardware.
+ */
+enum class PasswordStrengthRanking {
+    VeryWeak,
+    Weak,
+    Fair,
+    Strong,
+    VeryStrong,
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ClientException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ClientException.kt
index 52b1577bf0..3a1f0825f4 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ClientException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ClientException.kt
@@ -15,9 +15,13 @@ sealed class ClientException(message: String, val details: String?, cause: Throw
         details = details,
         cause = cause
     )
+    class ContentScanner(message: String, val reason: ContentScannerErrorReason) : ClientException(message, null, null)
     class Other(message: String, cause: Throwable? = null) : ClientException(message, null, cause)
 }
 
 fun ClientException.isNetworkError(): Boolean {
     return this is ClientException.Generic && message?.contains("error sending request for url", ignoreCase = true) == true
 }
+
+fun Throwable.isNetworkError(): Boolean =
+    (this as? ClientException)?.isNetworkError() == true
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ContentScannerErrorReason.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ContentScannerErrorReason.kt
new file mode 100644
index 0000000000..5c32b3989b
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/exception/ContentScannerErrorReason.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.exception
+
+enum class ContentScannerErrorReason {
+    MCS_MALFORMED_JSON,
+    MCS_MEDIA_FAILED_TO_DECRYPT,
+    M_MISSING_TOKEN,
+    M_UNKNOWN_TOKEN,
+    M_NOT_FOUND,
+    MCS_MEDIA_NOT_CLEAN,
+    MCS_MIME_TYPE_FORBIDDEN,
+    MCS_BAD_DECRYPTION,
+    M_UNKNOWN,
+    MCS_MEDIA_REQUEST_FAILED;
+
+    companion object;
+
+    fun isDangerous(): Boolean = when (this) {
+        MCS_MEDIA_NOT_CLEAN, MCS_MIME_TYPE_FORBIDDEN -> true
+        else -> false
+    }
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt
index 0c261cdd1a..eb2d49b5b0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/linknewdevice/LinkMobileHandler.kt
@@ -16,8 +16,12 @@ interface LinkMobileHandler {
 
 sealed interface LinkMobileStep {
     data object Uninitialized : LinkMobileStep
+
+    // Internal application step, for the UI
+    data object CreatingQrCode : LinkMobileStep
     data object Starting : LinkMobileStep
     data class QrReady(val data: String) : LinkMobileStep
+    data object QrRotating : LinkMobileStep
     data class WaitingForAuth(val verificationUri: String) : LinkMobileStep
     data class QrScanned(val checkCodeSender: CheckCodeSender) : LinkMobileStep
     data class Error(val errorType: ErrorType) : LinkMobileStep
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/GalleryItemInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/GalleryItemInfo.kt
new file mode 100644
index 0000000000..484e701dbc
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/media/GalleryItemInfo.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.media
+
+import java.io.File
+
+sealed interface GalleryItemInfo {
+    val file: File
+
+    data class Image(
+        override val file: File,
+        val imageInfo: ImageInfo,
+        val thumbnailFile: File?,
+    ) : GalleryItemInfo
+
+    data class Video(
+        override val file: File,
+        val videoInfo: VideoInfo,
+        val thumbnailFile: File?,
+    ) : GalleryItemInfo
+
+    data class Audio(
+        override val file: File,
+        val audioInfo: AudioInfo,
+    ) : GalleryItemInfo
+
+    data class MediaFile(
+        override val file: File,
+        val fileInfo: FileInfo,
+    ) : GalleryItemInfo
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt
index 306ab8354b..09ceaa4712 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt
@@ -17,3 +17,18 @@ interface MxcTools {
      */
     fun mxcUri2FilePath(mxcUri: String): String?
 }
+
+/**
+ * "mxc" scheme, including "://". So "mxc://".
+ */
+const val MATRIX_CONTENT_URI_SCHEME = "mxc://"
+
+/**
+ * Return true if the String starts with "mxc://".
+ */
+fun String.isMxcUrl() = startsWith(MATRIX_CONTENT_URI_SCHEME)
+
+/**
+ * Remove the "mxc://" prefix. No op if the String is not a Mxc URL.
+ */
+fun String.removeMxcPrefix() = removePrefix(MATRIX_CONTENT_URI_SCHEME)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt
index 5dce175237..96ef7044f6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt
@@ -89,13 +89,14 @@ sealed interface NotificationContent {
             val senderId: UserId,
             val question: String,
         ) : MessageLike
+
+        data object Beacon : MessageLike
     }
 
     sealed interface StateEvent : NotificationContent {
         data object PolicyRuleRoom : StateEvent
         data object PolicyRuleServer : StateEvent
         data object PolicyRuleUser : StateEvent
-        data object RoomAliases : StateEvent
         data object RoomAvatar : StateEvent
         data object RoomCanonicalAlias : StateEvent
         data object RoomCreate : StateEvent
@@ -117,6 +118,7 @@ sealed interface NotificationContent {
         data class RoomTopic(val topic: String) : StateEvent
         data object SpaceChild : StateEvent
         data object SpaceParent : StateEvent
+        data class BeaconInfo(val senderId: UserId) : StateEvent
     }
 
     data class Invite(
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
index 4d8ce8afb4..7ae1ca4886 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
@@ -21,7 +21,7 @@ interface NotificationSettingsService {
     val notificationSettingsChangeFlow: SharedFlow<Unit>
     suspend fun getRoomNotificationSettings(roomId: RoomId, isEncrypted: Boolean, isOneToOne: Boolean): Result<RoomNotificationSettings>
     suspend fun getDefaultRoomNotificationMode(isEncrypted: Boolean, isOneToOne: Boolean): Result<RoomNotificationMode>
-    suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isOneToOne: Boolean): Result<Unit>
+    suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isDM: Boolean): Result<Unit>
     suspend fun setRoomNotificationMode(roomId: RoomId, mode: RoomNotificationMode): Result<Unit>
     suspend fun restoreDefaultRoomNotificationMode(roomId: RoomId): Result<Unit>
     suspend fun muteRoom(roomId: RoomId): Result<Unit>
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oauth/AccountManagementAction.kt
similarity index 91%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oauth/AccountManagementAction.kt
index e1c7764e58..6dd0f6e53c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oidc/AccountManagementAction.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/oauth/AccountManagementAction.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.matrix.api.oidc
+package io.element.android.libraries.matrix.api.oauth
 
 import io.element.android.libraries.matrix.api.core.DeviceId
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/paths/SessionPaths.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/paths/SessionPaths.kt
new file mode 100644
index 0000000000..d481316f9d
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/paths/SessionPaths.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.paths
+
+import java.io.File
+
+data class SessionPaths(
+    val fileDirectory: File,
+    val cacheDirectory: File,
+) {
+    fun deleteRecursively() {
+        fileDirectory.deleteRecursively()
+        cacheDirectory.deleteRecursively()
+    }
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/SetHttpPusherData.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/SetHttpPusherData.kt
index 8a557f4b70..97a3cabd20 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/SetHttpPusherData.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/pusher/SetHttpPusherData.kt
@@ -17,4 +17,5 @@ data class SetHttpPusherData(
     val profileTag: String?,
     val lang: String,
     val defaultPayload: String,
+    val append: Boolean,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt
index 589f88e9fd..d49343f998 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt
@@ -61,13 +61,12 @@ interface BaseRoom : Closeable {
      */
     fun info(): RoomInfo = roomInfoFlow.value
 
-    fun predecessorRoom(): PredecessorRoom?
-
     /**
-     * A one-to-one is a room with exactly 2 members.
-     * See [the Matrix spec](https://spec.matrix.org/latest/client-server-api/#default-underride-rules).
+     * Returns whether the [BaseRoom] is a DM, with an updated state from the latest [RoomInfo].
      */
-    val isOneToOne: Boolean get() = info().activeMembersCount == 2L
+    fun isDm() = roomInfoFlow.value.isDm
+
+    fun predecessorRoom(): PredecessorRoom?
 
     /**
      * Try to load the room members and update the membersFlow.
@@ -158,11 +157,6 @@ interface BaseRoom : Closeable {
      */
     suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit>
 
-    /**
-     * Clear the event cache storage for the current room.
-     */
-    suspend fun clearEventCacheStorage(): Result<Unit>
-
     /**
      * Get the permalink for the room.
      */
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt
index 808f37c7c9..6d8325427b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt
@@ -20,6 +20,7 @@ import io.element.android.libraries.matrix.api.room.knock.KnockRequest
 import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
+import io.element.android.libraries.matrix.api.room.threads.ThreadsListService
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
@@ -44,6 +45,8 @@ interface JoinedRoom : BaseRoom {
      */
     val liveTimeline: Timeline
 
+    val threadsListService: ThreadsListService
+
     /**
      * Create a new timeline.
      * @param createTimelineParams contains parameters about how to filter the timeline. Will also configure the date separators.
@@ -193,9 +196,9 @@ interface JoinedRoom : BaseRoom {
     /**
      * Start sharing live location in this room.
      * @param durationMillis How long to share location (in milliseconds).
-     * @return Result indicating success or failure.
+     * @return Result containing the [EventId] of the beacon state event on success or an error on failure.
      */
-    suspend fun startLiveLocationShare(durationMillis: Long): Result<Unit>
+    suspend fun startLiveLocationShare(durationMillis: Long): Result<EventId>
 
     /**
      * Stop sharing live location in this room.
@@ -209,4 +212,11 @@ interface JoinedRoom : BaseRoom {
      * @return Result indicating success or failure.
      */
     suspend fun sendLiveLocation(geoUri: String): Result<Unit>
+
+    /**
+     * Sets the display name of the current user within this room.
+     * This is different from the global setDisplayName which updates
+     * the user's display name across all of their rooms.
+     */
+    suspend fun setOwnMemberDisplayName(displayName: String): Result<Unit>
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
index 5247e402a6..e590976cab 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
@@ -29,6 +29,7 @@ data class RoomInfo(
     val avatarUrl: String?,
     val isPublic: Boolean?,
     val isDirect: Boolean,
+    val isDm: Boolean,
     val isEncrypted: Boolean?,
     val joinRule: JoinRule?,
     val isSpace: Boolean,
@@ -78,6 +79,7 @@ data class RoomInfo(
     val privilegedCreatorRole: Boolean,
     val isLowPriority: Boolean,
     val activeCallIntentConsensus: CallIntentConsensus,
+    val fullyReadEventId: EventId?,
 ) {
     val aliases: List<RoomAlias>
         get() = listOfNotNull(canonicalAlias) + alternativeAliases
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt
deleted file mode 100644
index f33319e2ee..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.api.room
-
-import kotlinx.coroutines.flow.first
-
-/**
- * Returns whether the room with the provided info is a DM.
- * A DM is a room with at most 2 active members (one of them may have left).
- *
- * @param isDirect true if the room is direct
- * @param activeMembersCount the number of active members in the room (joined or invited)
- */
-fun isDm(isDirect: Boolean, activeMembersCount: Int): Boolean {
-    return isDirect && activeMembersCount <= 2
-}
-
-/**
- * Returns whether the [BaseRoom] is a DM, with an updated state from the latest [RoomInfo].
- */
-suspend fun BaseRoom.isDm() = roomInfoFlow.first().isDm
-
-/**
- * Returns whether the [RoomInfo] is from a DM.
- */
-val RoomInfo.isDm get() = isDm(isDirect, activeMembersCount.toInt())
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt
index 0b3d7071c8..1874986d70 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.matrix.api.room
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class RoomMember(
@@ -22,6 +23,8 @@ data class RoomMember(
     val isIgnored: Boolean,
     val role: Role,
     val membershipChangeReason: String?,
+    val isServiceMember: Boolean,
+    val displayedStatus: DisplayedStatus?,
 ) {
     /**
      * Role of the RoomMember, based on its [powerLevel].
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
index 1c35fab7d0..2c93fa94f0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
@@ -40,5 +40,5 @@ fun RoomMembersState.activeRoomMembers(): List<RoomMember> {
 fun RoomMembersState.getDirectRoomMember(roomInfo: RoomInfo, sessionId: SessionId): RoomMember? {
     return roomMembers()
         ?.takeIf { roomInfo.isDm }
-        ?.find { it.userId != sessionId && it.membership.isActive() }
+        ?.find { !it.isServiceMember && it.userId != sessionId && it.membership.isActive() }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StartDM.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StartDM.kt
index 057c5838e5..59a6aaa2fe 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StartDM.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StartDM.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 suspend fun MatrixClient.startDM(
     userId: UserId,
     createIfDmDoesNotExist: Boolean,
+    isEncryped: Boolean,
 ): StartDMResult {
     return findDM(userId)
         .fold(
@@ -25,7 +26,7 @@ suspend fun MatrixClient.startDM(
                 if (existingDM != null) {
                     StartDMResult.Success(existingDM, isNew = false)
                 } else if (createIfDmDoesNotExist) {
-                    createDM(userId).fold(
+                    createDM(userId, isEncryped).fold(
                         { StartDMResult.Success(it, isNew = true) },
                         { StartDMResult.Failure(it) }
                     )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
index 41d64afff1..7bfc5dc6bb 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
@@ -13,7 +13,6 @@ sealed interface StateEventType {
     data object PolicyRuleServer : StateEventType
     data object PolicyRuleUser : StateEventType
     data object CallMember : StateEventType
-    data object RoomAliases : StateEventType
     data object RoomAvatar : StateEventType
     data object RoomCanonicalAlias : StateEventType
     data object RoomCreate : StateEventType
@@ -35,6 +34,7 @@ sealed interface StateEventType {
     data object MemberHints : StateEventType
     data object RoomImagePack : StateEventType
     data object RoomLanguage : StateEventType
+    data object RoomPolicy : StateEventType
 
     data class Custom(val type: String) : StateEventType
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconId.kt
new file mode 100644
index 0000000000..358dcd98d1
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconId.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.location
+
+import io.element.android.libraries.matrix.api.core.EventId
+
+typealias BeaconId = EventId
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconInfoUpdate.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconInfoUpdate.kt
new file mode 100644
index 0000000000..0b7e9b0f44
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/BeaconInfoUpdate.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.location
+
+import io.element.android.libraries.matrix.api.core.RoomId
+
+data class BeaconInfoUpdate(
+    val roomId: RoomId,
+    val beaconId: BeaconId,
+    val isLive: Boolean,
+)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationException.kt
new file mode 100644
index 0000000000..9b53603042
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationException.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.location
+
+sealed class LiveLocationException(message: String?) : Exception(message) {
+    class NotLive : LiveLocationException("The beacon event has expired.")
+    class Network : LiveLocationException("Network error")
+    class Other(val exception: Exception) : LiveLocationException(exception.message)
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationShare.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationShare.kt
index 7e841639bd..4d8bc4638a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationShare.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/location/LiveLocationShare.kt
@@ -15,10 +15,21 @@ import io.element.android.libraries.matrix.api.core.UserId
 data class LiveLocationShare(
     /** The user who is sharing their location. */
     val userId: UserId,
-    /** The last known geo URI (e.g., "geo:51.5074,-0.1278"). */
-    val lastGeoUri: String,
-    /** The timestamp of the last location update. */
-    val lastTimestamp: Long,
-    /** Whether the live location share is still active. */
-    val isLive: Boolean,
+    /** The last known location if any. */
+    val lastLocation: LastLocation?,
+    /** The timestamp when location sharing started, in milliseconds.*/
+    val startTimestamp: Long,
+    /** The timestamp when location sharing ends, in milliseconds. */
+    val endTimestamp: Long,
+    /** The event id from the beacon info. */
+    val beaconId: BeaconId
+)
+
+data class LastLocation(
+    /** The last known geo URI (e.g., "geo:51.5074,-0.1278"). */
+    val geoUri: String,
+    /** The timestamp of the last location update. */
+    val timestamp: Long,
+    /** The asset of the last location update. */
+    val assetType: AssetType,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevelsValues.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevelsValues.kt
index e8f88ed86d..6606465389 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevelsValues.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevelsValues.kt
@@ -19,4 +19,6 @@ data class RoomPowerLevelsValues(
     val roomAvatar: Long,
     val roomTopic: Long,
     val spaceChild: Long,
+    val beacon: Long,
+    val beaconInfo: Long,
 )
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
index 6db326c854..3441a4be3a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
@@ -12,7 +12,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.coroutines.flow.Flow
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListItem.kt
new file mode 100644
index 0000000000..8282caafd1
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListItem.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.threads
+
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.core.toThreadId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+
+@Immutable
+data class ThreadListItem(
+    val rootEvent: ThreadListItemEvent,
+    val latestEvent: ThreadListItemEvent?,
+    val numberOfReplies: Long,
+) {
+    val threadId = rootEvent.eventId.toThreadId()
+}
+
+@Immutable
+data class ThreadListItemEvent(
+    val eventId: EventId,
+    val senderId: UserId,
+    val senderProfile: ProfileDetails,
+    val isOwn: Boolean,
+    val content: EventContent?,
+    val timestamp: Long,
+)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListPaginationStatus.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListPaginationStatus.kt
new file mode 100644
index 0000000000..0716ca7c11
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadListPaginationStatus.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.threads
+
+sealed interface ThreadListPaginationStatus {
+    data class Idle(
+        val hasMoreToLoad: Boolean,
+    ) : ThreadListPaginationStatus
+
+    data object Loading : ThreadListPaginationStatus
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadsListService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadsListService.kt
new file mode 100644
index 0000000000..7f819c540c
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/threads/ThreadsListService.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.room.threads
+
+import kotlinx.coroutines.flow.Flow
+
+interface ThreadsListService {
+    fun subscribeToItemUpdates(): Flow<List<ThreadListItem>>
+    fun subscribeToPaginationUpdates(): Flow<ThreadListPaginationStatus>
+    suspend fun paginate(): Result<Unit>
+    suspend fun reset(): Result<Unit>
+    fun destroy()
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
index aca093eab6..10ca376105 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
@@ -21,5 +21,5 @@ data class RoomSummary(
         is LatestEventValue.Remote -> latestEvent.timestamp
         is LatestEventValue.RoomInvite -> latestEvent.timestamp
     }
-    val isOneToOne get() = info.activeMembersCount == 2L
+    val isDm = info.isDm
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScanner.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScanner.kt
new file mode 100644
index 0000000000..e2c4839c4d
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScanner.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.scanner
+
+import io.element.android.libraries.matrix.api.media.MediaSource
+
+/**
+ * Component used to manually scan media content for potential security risks.
+ *
+ * While the Matrix SDK automatically scans media content we load if a content scanner instance is provided, this interface allows for scanning
+ * some media sources in advance without actually loading their contents, which can be useful for pre-fetching scenarios.
+ */
+interface ContentScanner {
+    /**
+     * Manually scans the given [mediaSource] for potential security risks.
+     *
+     * @param mediaSource The media source to scan.
+     * @return A [Result] containing a [Boolean] indicating whether the content is safe (true) or potentially unsafe (false).
+     * If the scan fails, the [Result] will contain an exception.
+     */
+    suspend fun scan(mediaSource: MediaSource): Result<Boolean>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScannerUrlProvider.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScannerUrlProvider.kt
new file mode 100644
index 0000000000..600866f586
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/scanner/ContentScannerUrlProvider.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.scanner
+
+/**
+ * Provides the URL of the content scanner service for a given homeserver, if any is set up.
+ */
+fun interface ContentScannerUrlProvider {
+    /**
+     * Returns the URL of the content scanner service for the given [homeserver], or `null` if no content scanner is set up.
+     */
+    suspend fun getContentScannerUrl(homeserver: String): Result<String?>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearch.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearch.kt
new file mode 100644
index 0000000000..002be8c7f8
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearch.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.search
+
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.flow.StateFlow
+
+/**
+ * A single, stateful message search cursor: one query at a time, with paginated results.
+ *
+ * Obtain an instance via [MessageSearchService.createMessageSearch]. The instance is tied to the
+ * [kotlinx.coroutines.CoroutineScope] it was created with; cancelling that scope releases the
+ * underlying SDK resources, so there is no `close()` to call.
+ */
+interface MessageSearch {
+    /**
+     * The current result set for the active query, in the order supplied by the SDK.
+     */
+    val results: StateFlow<ImmutableList<MessageSearchResult>>
+
+    /**
+     * Whether a page is currently loading, and whether the end has been reached.
+     */
+    val paginationState: StateFlow<MessageSearchPaginationState>
+
+    /**
+     * Set (or update) the search query. Clears the current results, restarts pagination from
+     * scratch and loads the first page. Call [paginate] to load any further pages.
+     */
+    suspend fun setQuery(query: String): Result<Unit>
+
+    /**
+     * Load the next page of results. No-ops if a page is already loading or the end was reached.
+     */
+    suspend fun paginate(): Result<Unit>
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchPaginationState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchPaginationState.kt
new file mode 100644
index 0000000000..c55b8cd80b
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchPaginationState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.search
+
+/**
+ * Whether the search is currently loading a page of results.
+ */
+sealed interface MessageSearchPaginationState {
+    /**
+     * Not currently paginating. [endReached] is true once every source has been
+     * exhausted for the current query.
+     */
+    data class Idle(val endReached: Boolean) : MessageSearchPaginationState
+
+    /**
+     * A page of results is currently being loaded.
+     */
+    data object Loading : MessageSearchPaginationState
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchResult.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchResult.kt
new file mode 100644
index 0000000000..c4ae315c32
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchResult.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.search
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+
+/**
+ * A single message matching a search query, with its content and sender resolved.
+ */
+data class MessageSearchResult(
+    val roomId: RoomId,
+    val eventId: EventId,
+    val senderId: UserId,
+    val senderProfile: ProfileDetails,
+    val content: EventContent,
+    /** Origin server timestamp, in milliseconds since the epoch. */
+    val timestamp: Long,
+)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchService.kt
new file mode 100644
index 0000000000..3e20b163f2
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/search/MessageSearchService.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.search
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.CoroutineScope
+
+interface MessageSearchService {
+    /**
+     * Create a new, independent search cursor.
+     *
+     * The underlying SDK service is stateful (one query at a time), so create one per search
+     * screen — never one per keystroke, and never a shared singleton.
+     *
+     * @param scope the lifetime of the search session. The returned [MessageSearch] observes and
+     * emits results on this scope, and the underlying SDK service is closed once the scope
+     * completes, so there is nothing to release by hand. Pass the scope of the screen that owns the
+     * search, not a longer-lived one.
+     * @param roomId when null, the search is session-wide and results from every room the user is
+     * in are exposed; when non-null, only results from that room are. Note that the SDK searches
+     * and ranks across every room regardless, so this is a client-side filter, not a pushdown: a
+     * room with few matches may need several [MessageSearch.paginate] calls before any of its
+     * results surface.
+     */
+    fun createMessageSearch(scope: CoroutineScope, roomId: RoomId? = null): MessageSearch
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
index 6a72577760..e22b0a5c9c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
@@ -38,6 +38,7 @@ data class SpaceRoom(
      */
     val via: ImmutableList<String>,
     val isDirect: Boolean?,
+    val isDm: Boolean?,
 ) {
     val isSpace = roomType == RoomType.Space
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MsgType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MsgType.kt
new file mode 100644
index 0000000000..b8d3933663
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MsgType.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.timeline
+
+enum class MsgType {
+    MSG_TYPE_TEXT,
+    MSG_TYPE_EMOTE,
+
+    // For future support
+    MSG_TYPE_SNOW,
+
+    // For future support
+    MSG_TYPE_CONFETTI,
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
index 500d9f3191..8cb933205b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
@@ -69,6 +70,8 @@ interface Timeline : AutoCloseable {
         body: String,
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
+        msgType: MsgType = MsgType.MSG_TYPE_TEXT,
+        asPlainText: Boolean = false,
     ): Result<Unit>
 
     suspend fun editMessage(
@@ -90,6 +93,7 @@ interface Timeline : AutoCloseable {
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
         fromNotification: Boolean = false,
+        msgType: MsgType = MsgType.MSG_TYPE_TEXT,
     ): Result<Unit>
 
     suspend fun sendImage(
@@ -154,6 +158,13 @@ interface Timeline : AutoCloseable {
         inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler>
 
+    suspend fun sendGallery(
+        items: List<GalleryItemInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<MediaUploadHandler>
+
     suspend fun redactEvent(eventOrTransactionId: EventOrTransactionId, reason: String?): Result<Unit>
 
     suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Boolean>
@@ -213,6 +224,13 @@ interface Timeline : AutoCloseable {
 
     suspend fun loadReplyDetails(eventId: EventId): InReplyTo
 
+    /**
+     * Returns true if [eventId] is currently loaded in this timeline's window, even if the display
+     * layer does not render it (e.g. filtered or state events). This distinguishes "in the window
+     * but not displayed" from "genuinely outside the loaded window".
+     */
+    suspend fun isEventLoaded(eventId: EventId): Boolean
+
     /**
      * Adds a new pinned event by sending an updated `m.room.pinned_events`
      * event containing the new event id.
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
index 95d4327c07..c2d388ecb0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.poll.PollAnswer
 import io.element.android.libraries.matrix.api.poll.PollKind
 import io.element.android.libraries.matrix.api.room.location.AssetType
@@ -105,16 +106,55 @@ data class FailedToParseStateContent(
 ) : EventContent
 
 data class LiveLocationContent(
-    val body: String,
     val isLive: Boolean,
     val description: String?,
+    val startTimestamp: Long,
     val timeout: Long,
     val assetType: AssetType?,
     val locations: List<LiveLocationInfo>,
-) : EventContent
+) : EventContent {
+    val endTimestamp = startTimestamp + timeout
+}
 
 data object LegacyCallInviteContent : EventContent
 
-data object CallNotifyContent : EventContent
+data class CallNotifyContent(
+    val callIntent: CallIntent,
+    val declinedBy: List<UserId>,
+    val activeMembers: List<UserId>,
+    val isJoined: Boolean,
+    val callStartTsMillis: Long?,
+) : EventContent
 
 data object UnknownContent : EventContent
+
+fun EventContent.isMediaContent(): Boolean {
+    return when (this) {
+        is MessageContent -> type is MessageTypeWithAttachment || type is GalleryMessageType
+        is StickerContent -> true
+        else -> false
+    }
+}
+
+fun EventContent.mediaSources(): List<MediaSource> {
+    return when (this) {
+        is MessageContent -> mediaSources()
+        is StickerContent -> listOfNotNull(source, info.thumbnailSource)
+        else -> emptyList()
+    }
+}
+
+fun MessageContent.mediaSources(): List<MediaSource> {
+    return when (val messageType = type) {
+        is MessageTypeWithAttachment -> when (messageType) {
+            is ImageMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
+            is VideoMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
+            is AudioMessageType -> listOf(messageType.source)
+            is VoiceMessageType -> listOf(messageType.source)
+            is FileMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
+            else -> emptyList()
+        }
+        is GalleryMessageType -> messageType.items.flatMap { it.mediaSources() }
+        else -> emptyList()
+    }
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
index 0cc5ca0ff7..2f61b8f58a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/MessageType.kt
@@ -102,6 +102,29 @@ data class TextMessageType(
     val formatted: FormattedBody?
 ) : MessageType
 
+data class GalleryMessageType(
+    val body: String,
+    val formatted: FormattedBody?,
+    val items: List<GalleryItemType>,
+) : MessageType
+
+@Immutable
+sealed interface GalleryItemType {
+    data class Image(val content: ImageMessageType) : GalleryItemType
+    data class Audio(val content: AudioMessageType) : GalleryItemType
+    data class Video(val content: VideoMessageType) : GalleryItemType
+    data class File(val content: FileMessageType) : GalleryItemType
+    data class Other(val itemType: String, val body: String) : GalleryItemType
+
+    fun mediaSources(): List<MediaSource> = when (this) {
+        is Image -> listOfNotNull(content.source, content.info?.thumbnailSource)
+        is Audio -> listOf(content.source)
+        is Video -> listOfNotNull(content.source, content.info?.thumbnailSource)
+        is File -> listOfNotNull(content.source, content.info?.thumbnailSource)
+        is Other -> emptyList()
+    }
+}
+
 data class OtherMessageType(
     val msgType: String,
     val body: String,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
index ed3f53169f..8b4a7eaa13 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt
@@ -16,7 +16,6 @@ sealed interface OtherState {
     data object PolicyRuleRoom : OtherState
     data object PolicyRuleServer : OtherState
     data object PolicyRuleUser : OtherState
-    data object RoomAliases : OtherState
     data class RoomAvatar(val url: String?) : OtherState
     data object RoomCanonicalAlias : OtherState
     data object RoomCreate : OtherState
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
index 6393a27bb2..73b0478d63 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.matrix.api.timeline.item.event
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 
 @Immutable
 sealed interface ProfileDetails {
@@ -20,7 +21,8 @@ sealed interface ProfileDetails {
     data class Ready(
         val displayName: String?,
         val displayNameAmbiguous: Boolean,
-        val avatarUrl: String?
+        val avatarUrl: String?,
+        val displayedStatus: DisplayedStatus?,
     ) : ProfileDetails
 
     data class Error(
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/DisplayedStatus.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/DisplayedStatus.kt
new file mode 100644
index 0000000000..581658ff28
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/DisplayedStatus.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.user
+
+import android.os.Parcelable
+import androidx.compose.runtime.Immutable
+import kotlinx.parcelize.Parcelize
+
+@Immutable
+sealed interface DisplayedStatus : Parcelable {
+    /** Status set manually by the user via m.status. */
+    @Parcelize
+    data class UserSet(val status: UserStatus) : DisplayedStatus
+
+    /** Status set automatically when the user is in a call via m.call. */
+    @Parcelize
+    data class InCall(
+        /** Unix timestamp in seconds when the call was joined (from m.call.call_joined_ts). */
+        val callJoinedTs: Long,
+    ) : DisplayedStatus
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixUser.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixUser.kt
index 53cefa3694..7a8ec739a5 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixUser.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/MatrixUser.kt
@@ -17,4 +17,6 @@ data class MatrixUser(
     val userId: UserId,
     val displayName: String? = null,
     val avatarUrl: String? = null,
+    val displayedStatus: DisplayedStatus? = null,
+    val rawStatus: UserStatus? = null,
 ) : Parcelable
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/UserStatus.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/UserStatus.kt
new file mode 100644
index 0000000000..1576940b6f
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/UserStatus.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.user
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class UserStatus(
+    val emoji: String,
+    val text: String,
+) : Parcelable
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt
index 4d2e786038..38a00d833d 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/verification/SessionVerificationService.kt
@@ -33,7 +33,7 @@ interface SessionVerificationService {
     /**
      * Request verification of the current session.
      */
-    suspend fun requestCurrentSessionVerification()
+    suspend fun requestDeviceVerification()
 
     /**
      * Request verification of the user with the given [userId].
@@ -56,9 +56,9 @@ interface SessionVerificationService {
     suspend fun declineVerification()
 
     /**
-     * Starts the verification of the unverified session from another device.
+     * Transition the current verification request into a SAS verification flow.
      */
-    suspend fun startVerification()
+    suspend fun startSasVerification()
 
     /**
      * Returns the verification service state to the initial step.
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetailsTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetailsTest.kt
index d4b360ef53..9babb7a738 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetailsTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/MatrixHomeServerDetailsTest.kt
@@ -16,7 +16,7 @@ class MatrixHomeServerDetailsTest {
     @Test
     fun `if homeserver supports oidc, then it is supported`() {
         val sut = aMatrixHomeServerDetails(
-            supportsOidcLogin = true,
+            supportsOAuthLogin = true,
             supportsPasswordLogin = false,
         )
         assertThat(sut.isSupported).isTrue()
@@ -25,7 +25,7 @@ class MatrixHomeServerDetailsTest {
     @Test
     fun `if homeserver supports password, then it is supported`() {
         val sut = aMatrixHomeServerDetails(
-            supportsOidcLogin = false,
+            supportsOAuthLogin = false,
             supportsPasswordLogin = true,
         )
         assertThat(sut.isSupported).isTrue()
@@ -34,7 +34,7 @@ class MatrixHomeServerDetailsTest {
     @Test
     fun `if homeserver supports both, then it is supported`() {
         val sut = aMatrixHomeServerDetails(
-            supportsOidcLogin = true,
+            supportsOAuthLogin = true,
             supportsPasswordLogin = true,
         )
         assertThat(sut.isSupported).isTrue()
@@ -43,7 +43,7 @@ class MatrixHomeServerDetailsTest {
     @Test
     fun `if homeserver supports none, then it is not supported`() {
         val sut = aMatrixHomeServerDetails(
-            supportsOidcLogin = false,
+            supportsOAuthLogin = false,
             supportsPasswordLogin = false,
         )
         assertThat(sut.isSupported).isFalse()
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/UserIdTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/UserIdTest.kt
new file mode 100644
index 0000000000..eb97ce0d8c
--- /dev/null
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/core/UserIdTest.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.core
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class UserIdTest {
+    @Test
+    fun `valid user id`() {
+        val userId = UserId("@alice:example.org")
+        assertThat(userId.extractedDisplayName).isEqualTo("alice")
+        assertThat(userId.domainName).isEqualTo("example.org")
+    }
+}
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheckTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheckTest.kt
deleted file mode 100644
index 1461d28fd9..0000000000
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheckTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.api.room
-
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-
-class RoomIsDmCheckTest {
-    @Test
-    fun `a room is a DM only if it has at most 2 members and is direct`() {
-        val isDirect = true
-        val activeMembersCount = 2
-
-        val isDm = isDm(isDirect, activeMembersCount)
-
-        assertThat(isDm).isTrue()
-    }
-
-    @Test
-    fun `a room can be a DM if it has also a single active user`() {
-        val isDirect = true
-        val activeMembersCount = 1
-
-        val isDm = isDm(isDirect, activeMembersCount)
-
-        assertThat(isDm).isTrue()
-    }
-
-    @Test
-    fun `a room is not a DM if it's not direct`() {
-        val isDirect = false
-        val activeMembersCount = 2
-
-        val isDm = isDm(isDirect, activeMembersCount)
-
-        assertThat(isDm).isFalse()
-    }
-
-    @Test
-    fun `a room is not a DM if it has more than 2 active users`() {
-        val isDirect = true
-        val activeMembersCount = 3
-
-        val isDm = isDm(isDirect, activeMembersCount)
-
-        assertThat(isDm).isFalse()
-    }
-}
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
index ffb59ba7d1..8021abd9c9 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt
@@ -38,6 +38,7 @@ class ProfileTimelineDetailsTest {
                 displayName = null,
                 displayNameAmbiguous = false,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo(A_USER_ID)
     }
@@ -49,6 +50,7 @@ class ProfileTimelineDetailsTest {
                 displayName = "Alice",
                 displayNameAmbiguous = false,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo("Alice")
     }
@@ -60,6 +62,7 @@ class ProfileTimelineDetailsTest {
                 displayName = "Alice",
                 displayNameAmbiguous = true,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo("Alice ($A_USER_ID)")
     }
diff --git a/libraries/matrix/impl/build.gradle.kts b/libraries/matrix/impl/build.gradle.kts
index eae96b5cd9..2499b720e3 100644
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@@ -28,25 +28,29 @@ dependencies {
     } else {
         debugImplementation(libs.matrix.sdk)
     }
-    implementation(files("libs/rustls-platform-verifier-android.aar"))
+    implementation(projects.libraries.rustlsTls)
 
     implementation(projects.appconfig)
+    implementation(projects.features.enterprise.api)
     implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.di)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.network)
     implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.workmanager.api)
     implementation(projects.services.analytics.api)
     implementation(projects.services.toolbox.api)
     api(projects.libraries.matrix.api)
     implementation(projects.libraries.core)
-    implementation("net.java.dev.jna:jna:5.18.1@aar")
+    implementation(variantOf(libs.jna) { artifactType("aar") })
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.serialization.json)
     implementation(libs.kotlinx.collections.immutable)
 
     testCommonDependencies(libs)
+    testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.preferences.test)
diff --git a/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar b/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar
deleted file mode 100644
index 8acc8b5fe0..0000000000
Binary files a/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar and /dev/null differ
diff --git a/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar.version b/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar.version
deleted file mode 100644
index a9cd6c6052..0000000000
--- a/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar.version
+++ /dev/null
@@ -1 +0,0 @@
-Updated rustls-platform-verifier-android.aar using `rustls-platform-verifier-0.1.1.aar`
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegate.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegate.kt
index 690995ba77..a5c69bf831 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegate.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegate.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.libraries.matrix.impl
 
-import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.matrix.impl.core.SdkBackgroundTaskError
 import io.element.android.libraries.matrix.impl.mapper.toSessionData
@@ -19,6 +19,7 @@ import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import org.matrix.rustcomponents.sdk.ClientDelegate
 import org.matrix.rustcomponents.sdk.ClientSessionDelegate
 import org.matrix.rustcomponents.sdk.Session
@@ -41,14 +42,10 @@ class RustClientSessionDelegate(
     private val sessionStore: SessionStore,
     private val appCoroutineScope: CoroutineScope,
     private val analyticsService: AnalyticsService,
-    coroutineDispatchers: CoroutineDispatchers,
 ) : ClientSessionDelegate, ClientDelegate {
     // Used to ensure several calls to `didReceiveAuthError` don't trigger multiple logouts
     private val isLoggingOut = AtomicBoolean(false)
 
-    // To make sure only one coroutine affecting the token persistence can run at a time
-    private val updateTokensDispatcher = coroutineDispatchers.io.limitedParallelism(1)
-
     // This Client needs to be set up as soon as possible so `didReceiveAuthError` can work properly.
     private var client: WeakReference<RustMatrixClient> = WeakReference(null)
 
@@ -66,11 +63,24 @@ class RustClientSessionDelegate(
         this.client.clear()
     }
 
+    // This always runs on a background thread, so we *can* do blocking calls here, although we should avoid doing heavy work
     override fun saveSessionInKeychain(session: Session) {
-        appCoroutineScope.launch(updateTokensDispatcher) {
-            val existingData = sessionStore.getSession(session.userId) ?: return@launch
+        Timber.tag(loggerTag.value).i("Saving new session info for user ${session.userId} after a token refresh")
+        runCatchingExceptions {
+            val existingData = runBlocking { sessionStore.getSession(session.userId) } ?: return
+
+            if (existingData.accessToken == session.accessToken) {
+                Timber.tag(loggerTag.value).e("Access token is the same as the one already stored, this should not happen after a token refresh!")
+                return
+            }
+
+            if (existingData.refreshToken == session.refreshToken) {
+                Timber.tag(loggerTag.value).e("Refresh token is the same as the one already stored, this should not happen after a token refresh!")
+                return
+            }
+
             val (anonymizedAccessToken, anonymizedRefreshToken) = session.anonymizedTokens()
-            Timber.tag(loggerTag.value).d(
+            Timber.tag(loggerTag.value).i(
                 "Saving new session data with token: access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'. " +
                     "Was token valid: ${existingData.isTokenValid}"
             )
@@ -80,28 +90,27 @@ class RustClientSessionDelegate(
                 passphrase = existingData.passphrase,
                 sessionPaths = existingData.getSessionPaths(),
             )
-            sessionStore.updateData(newData)
-            Timber.tag(loggerTag.value).d("Saved new session data with access token: '$anonymizedAccessToken'.")
-        }.invokeOnCompletion {
-            if (it != null) {
-                Timber.tag(loggerTag.value).e(it, "Failed to save new session data.")
-            }
+            runBlocking { sessionStore.updateData(newData) }
+            Timber.tag(loggerTag.value).i("Saved new session data.")
+        }.onFailure {
+            Timber.tag(loggerTag.value).e(it, "Failed to save new session data.")
         }
     }
 
+    // This always runs on a background thread, so we *can* do blocking calls here, although we should avoid doing heavy work
     override fun didReceiveAuthError(isSoftLogout: Boolean) {
-        Timber.tag(loggerTag.value).w("didReceiveAuthError(isSoftLogout=$isSoftLogout)")
-        if (isLoggingOut.getAndSet(true).not()) {
-            Timber.tag(loggerTag.value).v("didReceiveAuthError -> do the cleanup")
-            // TODO handle isSoftLogout parameter.
-            appCoroutineScope.launch(updateTokensDispatcher) {
+        runCatchingExceptions {
+            Timber.tag(loggerTag.value).w("didReceiveAuthError(isSoftLogout=$isSoftLogout)")
+            if (isLoggingOut.getAndSet(true).not()) {
+                Timber.tag(loggerTag.value).v("didReceiveAuthError -> do the cleanup")
+                // TODO handle isSoftLogout parameter.
                 val currentClient = client.get()
                 if (currentClient == null) {
                     Timber.tag(loggerTag.value).w("didReceiveAuthError -> no client, exiting")
                     isLoggingOut.set(false)
-                    return@launch
+                    return
                 }
-                val existingData = sessionStore.getSession(currentClient.sessionId.value)
+                val existingData = runBlocking { sessionStore.getSession(currentClient.sessionId.value) }
                 val (anonymizedAccessToken, anonymizedRefreshToken) = existingData.anonymizedTokens()
                 Timber.tag(loggerTag.value).d(
                     "Removing session data with access token '$anonymizedAccessToken' " +
@@ -110,19 +119,17 @@ class RustClientSessionDelegate(
                 if (existingData != null) {
                     // Set isTokenValid to false
                     val newData = existingData.copy(isTokenValid = false)
-                    sessionStore.updateData(newData)
+                    runBlocking { sessionStore.updateData(newData) }
                     Timber.tag(loggerTag.value).d("Invalidated session data with access token: '$anonymizedAccessToken'.")
                 } else {
                     Timber.tag(loggerTag.value).d("No session data found.")
                 }
-                currentClient.logout(userInitiated = false, ignoreSdkError = true)
-            }.invokeOnCompletion {
-                if (it != null) {
-                    Timber.tag(loggerTag.value).e(it, "Failed to remove session data.")
-                }
+                appCoroutineScope.launch { currentClient.logout(userInitiated = false, ignoreSdkError = true) }
+            } else {
+                Timber.tag(loggerTag.value).v("didReceiveAuthError -> already cleaning up")
             }
-        } else {
-            Timber.tag(loggerTag.value).v("didReceiveAuthError -> already cleaning up")
+        }.onFailure {
+            Timber.tag(loggerTag.value).e(it, "Failed to remove session data.")
         }
     }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProvider.kt
new file mode 100644
index 0000000000..d82e389aa7
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProvider.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
+import org.matrix.rustcomponents.sdk.HomeserverCapabilities
+
+class RustHomeserverCapabilitiesProvider(
+    private val homeserverCapabilities: HomeserverCapabilities,
+) : HomeserverCapabilitiesProvider {
+    override suspend fun refresh(): Result<Unit> = runCatchingExceptions {
+        homeserverCapabilities.refresh()
+    }
+
+    override suspend fun canChangeDisplayName(): Result<Boolean> = runCatchingExceptions {
+        homeserverCapabilities.canChangeDisplayname()
+    }
+
+    override suspend fun canChangeAvatarUrl(): Result<Boolean> = runCatchingExceptions {
+        homeserverCapabilities.canChangeAvatar()
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 1c87e73ba2..88b1f05909 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -17,6 +17,7 @@ import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.analytics.SdkStoreSizes
 import io.element.android.libraries.matrix.api.core.DeviceId
@@ -30,7 +31,8 @@ import io.element.android.libraries.matrix.api.createroom.RoomPreset
 import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopHandler
 import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileHandler
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -43,11 +45,14 @@ import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibilit
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
 import io.element.android.libraries.matrix.api.spaces.SpaceService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.api.user.UserStatus
 import io.element.android.libraries.matrix.impl.encryption.RustEncryptionService
 import io.element.android.libraries.matrix.impl.exception.mapClientException
 import io.element.android.libraries.matrix.impl.linknewdevice.RustLinkDesktopHandler
@@ -58,7 +63,7 @@ import io.element.android.libraries.matrix.impl.media.RustMediaLoader
 import io.element.android.libraries.matrix.impl.media.RustMediaPreviewService
 import io.element.android.libraries.matrix.impl.notification.RustNotificationService
 import io.element.android.libraries.matrix.impl.notificationsettings.RustNotificationSettingsService
-import io.element.android.libraries.matrix.impl.oidc.toRustAction
+import io.element.android.libraries.matrix.impl.oauth.toRustAction
 import io.element.android.libraries.matrix.impl.pushers.RustPushersService
 import io.element.android.libraries.matrix.impl.room.GetRoomResult
 import io.element.android.libraries.matrix.impl.room.NotJoinedRustRoom
@@ -69,17 +74,18 @@ import io.element.android.libraries.matrix.impl.room.RustRoomFactory
 import io.element.android.libraries.matrix.impl.room.TimelineEventFilterFactory
 import io.element.android.libraries.matrix.impl.room.history.map
 import io.element.android.libraries.matrix.impl.room.join.map
+import io.element.android.libraries.matrix.impl.room.location.map
 import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
 import io.element.android.libraries.matrix.impl.roomdirectory.RustRoomDirectoryService
 import io.element.android.libraries.matrix.impl.roomdirectory.map
 import io.element.android.libraries.matrix.impl.roomlist.RoomListFactory
 import io.element.android.libraries.matrix.impl.roomlist.RustRoomListService
 import io.element.android.libraries.matrix.impl.roomlist.roomOrNull
+import io.element.android.libraries.matrix.impl.search.RustMessageSearchService
 import io.element.android.libraries.matrix.impl.spaces.RustSpaceService
 import io.element.android.libraries.matrix.impl.sync.RustSyncService
 import io.element.android.libraries.matrix.impl.sync.map
 import io.element.android.libraries.matrix.impl.usersearch.UserSearchResultMapper
-import io.element.android.libraries.matrix.impl.util.SessionPathsProvider
 import io.element.android.libraries.matrix.impl.util.cancelAndDestroy
 import io.element.android.libraries.matrix.impl.util.mxCallbackFlow
 import io.element.android.libraries.matrix.impl.verification.RustSessionVerificationService
@@ -112,6 +118,8 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import org.matrix.rustcomponents.sdk.AuthData
 import org.matrix.rustcomponents.sdk.AuthDataPasswordDetails
+import org.matrix.rustcomponents.sdk.BeaconInfoListener
+import org.matrix.rustcomponents.sdk.BeaconInfoUpdate
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientException
 import org.matrix.rustcomponents.sdk.IgnoredUsersListener
@@ -132,7 +140,9 @@ import org.matrix.rustcomponents.sdk.CreateRoomParameters as RustCreateRoomParam
 import org.matrix.rustcomponents.sdk.RoomPreset as RustRoomPreset
 import org.matrix.rustcomponents.sdk.SyncService as ClientSyncService
 
+@Suppress("LargeClass")
 class RustMatrixClient(
+    override val sessionPaths: SessionPaths,
     private val innerClient: Client,
     private val sessionStore: SessionStore,
     private val sessionDelegate: RustClientSessionDelegate,
@@ -145,9 +155,12 @@ class RustMatrixClient(
     private val featureFlagService: FeatureFlagService,
     private val analyticsService: AnalyticsService,
     private val workManagerScheduler: WorkManagerScheduler,
+    override val contentScanner: ContentScanner?,
+    override val isMessageSearchAvailable: Boolean,
 ) : MatrixClient {
     override val sessionId: UserId = UserId(innerClient.userId())
     override val deviceId: DeviceId = DeviceId(innerClient.deviceId())
+    override val homeserverUrl: String = innerClient.homeserver()
     override val sessionCoroutineScope = appCoroutineScope.childScope(dispatchers.main, "Session-$sessionId")
     private val sessionDispatcher = dispatchers.io.limitedParallelism(64)
 
@@ -183,7 +196,10 @@ class RustMatrixClient(
         sessionDispatcher = sessionDispatcher,
     )
 
-    private val sessionPathsProvider = SessionPathsProvider(sessionStore)
+    override val messageSearchService = RustMessageSearchService(
+        client = innerClient,
+        sessionDispatcher = sessionDispatcher,
+    )
 
     private val roomSyncSubscriber: RoomSyncSubscriber = RoomSyncSubscriber(innerRoomListService, dispatchers)
 
@@ -206,6 +222,15 @@ class RustMatrixClient(
         analyticsService = analyticsService,
     )
 
+    override val ownBeaconInfoUpdates = mxCallbackFlow {
+        val listener = object : BeaconInfoListener {
+            override fun onUpdate(update: BeaconInfoUpdate) {
+                trySend(update.map())
+            }
+        }
+        innerClient.subscribeToOwnBeaconInfoUpdates(listener)
+    }
+
     override val sessionVerificationService = RustSessionVerificationService(
         client = innerClient,
         isSyncServiceReady = syncService.syncState.map { it == SyncState.Running },
@@ -246,6 +271,8 @@ class RustMatrixClient(
 
     private var clientDelegateTaskHandle: TaskHandle? = innerClient.setDelegate(sessionDelegate)
 
+    @Volatile private var localUserStatus: UserStatus? = null
+
     private val _userProfile: MutableStateFlow<MatrixUser> = MutableStateFlow(
         MatrixUser(
             userId = sessionId,
@@ -410,10 +437,10 @@ class RustMatrixClient(
         }
     }
 
-    override suspend fun createDM(userId: UserId): Result<RoomId> {
+    override suspend fun createDM(userId: UserId, isEncrypted: Boolean): Result<RoomId> {
         val createRoomParams = CreateRoomParameters(
             name = null,
-            isEncrypted = true,
+            isEncrypted = isEncrypted,
             isDirect = true,
             visibility = RoomVisibility.Private,
             preset = RoomPreset.TRUSTED_PRIVATE_CHAT,
@@ -431,7 +458,12 @@ class RustMatrixClient(
 
     override suspend fun getUserProfile(): Result<MatrixUser> = getProfile(sessionId)
         .onSuccess { matrixUser ->
-            _userProfile.emit(matrixUser)
+            _userProfile.emit(
+                matrixUser.copy(
+                    rawStatus = localUserStatus,
+                    displayedStatus = localUserStatus?.let { DisplayedStatus.UserSet(it) },
+                )
+            )
             // Also update our session storage
             sessionStore.updateUserProfile(
                 sessionId = sessionId.value,
@@ -462,6 +494,28 @@ class RustMatrixClient(
             runCatchingExceptions { innerClient.removeAvatar() }
         }
 
+    override suspend fun setUserStatus(status: UserStatus): Result<Unit> = withContext(sessionDispatcher) {
+        localUserStatus = status
+        _userProfile.emit(
+            _userProfile.value.copy(
+                rawStatus = status,
+                displayedStatus = DisplayedStatus.UserSet(status),
+            )
+        )
+        Result.success(Unit)
+    }
+
+    override suspend fun clearUserStatus(): Result<Unit> = withContext(sessionDispatcher) {
+        localUserStatus = null
+        _userProfile.emit(
+            _userProfile.value.copy(
+                rawStatus = null,
+                displayedStatus = null,
+            )
+        )
+        Result.success(Unit)
+    }
+
     override suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?> = withContext(sessionDispatcher) {
         runCatchingExceptions {
             innerClient.joinRoomById(roomId.value).destroy()
@@ -788,6 +842,12 @@ class RustMatrixClient(
         }
     }
 
+    override suspend fun markAllRoomsAsRead(): Result<Unit> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerClient.markAllRoomsAsRead()
+        }
+    }
+
     override suspend fun performDatabaseVacuum(): Result<Unit> = withContext(sessionDispatcher) {
         runCatchingExceptions {
             Timber.d("Performing database vacuuming for session $sessionId...")
@@ -795,6 +855,12 @@ class RustMatrixClient(
         }
     }
 
+    override suspend fun getMapStyleUrl(): Result<String?> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerClient.tileServer()?.mapStyleUrl
+        }
+    }
+
     override suspend fun resetWellKnownConfig(): Result<Unit> {
         return runCatchingExceptions {
             Timber.d("Resetting well-known config for session $sessionId")
@@ -805,26 +871,29 @@ class RustMatrixClient(
     private suspend fun getCacheSize(
         includeCryptoDb: Boolean = false,
     ): Long = withContext(sessionDispatcher) {
-        val sessionDirectory = sessionPathsProvider.provides(sessionId) ?: return@withContext 0L
-        val cacheSize = sessionDirectory.cacheDirectory.getSizeOfFiles()
+        val cacheSize = sessionPaths.cacheDirectory.getSizeOfFiles()
         if (includeCryptoDb) {
-            cacheSize + sessionDirectory.fileDirectory.getSizeOfFiles()
+            cacheSize + sessionPaths.fileDirectory.getSizeOfFiles()
         } else {
             cacheSize + listOf(
                 "matrix-sdk-state.sqlite3",
                 "matrix-sdk-state.sqlite3-shm",
                 "matrix-sdk-state.sqlite3-wal",
             ).map { fileName ->
-                File(sessionDirectory.fileDirectory, fileName)
+                File(sessionPaths.fileDirectory, fileName)
             }.sumOf { file ->
                 file.length()
-            }
+            } +
+                // The message search index. Like the state database above it lives in the file
+                // directory and so survives a cache clear, but it can grow without bound and must
+                // not be invisible in the storage figures. Returns 0 when the index is disabled.
+                File(sessionPaths.fileDirectory, SEARCH_INDEX_DIRECTORY).getSizeOfFiles()
         }
     }
 
     private suspend fun deleteSessionDirectory() = withContext(sessionDispatcher) {
         // Delete all the files for this session
-        sessionPathsProvider.provides(sessionId)?.deleteRecursively()
+        sessionPaths.deleteRecursively()
     }
 
     private fun scheduleDatabaseVacuum() {
@@ -835,6 +904,10 @@ class RustMatrixClient(
         val request = PerformDatabaseVacuumRequestBuilder(sessionId)
         sessionCoroutineScope.launch { workManagerScheduler.submit(request) }
     }
+
+    override fun homeserverCapabilities(): HomeserverCapabilitiesProvider {
+        return RustHomeserverCapabilitiesProvider(innerClient.homeserverCapabilities())
+    }
 }
 
 private fun defaultRoomCreationPowerLevels(isPublic: Boolean, isSpace: Boolean) = PowerLevels(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
index f83efd2736..de2c5c0141 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.matrix.impl
 
 import dev.zacsweers.metro.Inject
+import io.element.android.libraries.androidutils.crypto.ClientSecret
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.data.ByteUnit
 import io.element.android.libraries.core.data.megaBytes
@@ -16,12 +17,14 @@ import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.paths.SessionPaths
+import io.element.android.libraries.matrix.api.scanner.ContentScannerUrlProvider
 import io.element.android.libraries.matrix.impl.analytics.UtdTracker
-import io.element.android.libraries.matrix.impl.certificates.UserCertificatesProvider
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
 import io.element.android.libraries.matrix.impl.paths.getSessionPaths
 import io.element.android.libraries.matrix.impl.proxy.ProxyProvider
 import io.element.android.libraries.matrix.impl.room.TimelineEventFilterFactory
+import io.element.android.libraries.matrix.impl.scanner.RustContentScanner
 import io.element.android.libraries.matrix.impl.storage.SqliteStoreBuilderProvider
 import io.element.android.libraries.matrix.impl.util.anonymizedTokens
 import io.element.android.libraries.network.useragent.UserAgentProvider
@@ -34,6 +37,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientBuilder
+import org.matrix.rustcomponents.sdk.ContentScanner
 import org.matrix.rustcomponents.sdk.CrossProcessLockConfig
 import org.matrix.rustcomponents.sdk.RequestConfig
 import org.matrix.rustcomponents.sdk.Session
@@ -41,6 +45,7 @@ import org.matrix.rustcomponents.sdk.SlidingSyncVersion
 import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
+import uniffi.matrix_sdk_base.DmRoomDefinition
 import uniffi.matrix_sdk_base.MediaRetentionPolicy
 import uniffi.matrix_sdk_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
@@ -58,7 +63,6 @@ class RustMatrixClientFactory(
     private val sessionStore: SessionStore,
     private val userAgentProvider: UserAgentProvider,
     private val proxyProvider: ProxyProvider,
-    private val userCertificatesProvider: UserCertificatesProvider,
     private val clock: SystemClock,
     private val analyticsService: AnalyticsService,
     private val featureFlagService: FeatureFlagService,
@@ -66,19 +70,34 @@ class RustMatrixClientFactory(
     private val clientBuilderProvider: ClientBuilderProvider,
     private val sqliteStoreBuilderProvider: SqliteStoreBuilderProvider,
     private val workManagerScheduler: WorkManagerScheduler,
+    private val contentScannerUrlProvider: ContentScannerUrlProvider,
 ) {
     private val sessionDelegate = RustClientSessionDelegate(
         sessionStore = sessionStore,
         appCoroutineScope = appCoroutineScope,
         analyticsService = analyticsService,
-        coroutineDispatchers = coroutineDispatchers
     )
 
     suspend fun create(sessionData: SessionData): RustMatrixClient = withContext(coroutineDispatchers.io) {
+        // This secret is called 'passphrase' for historical reasons, but it can be a raw key or an actual passphrase
+        val clientSecret = sessionData.passphrase?.let(ClientSecret::fromString)
+        val sessionPaths = sessionData.getSessionPaths()
+        val isMessageSearchAvailable = featureFlagService.isFeatureEnabled(FeatureFlags.MessageSearch)
+        val indexDirectory = File(sessionPaths.fileDirectory, SEARCH_INDEX_DIRECTORY)
+
+        if (!isMessageSearchAvailable && indexDirectory.exists()) {
+            // With search off, events reach the event cache unindexed and the index can never
+            // catch up on them. Delete it so the next enable rebuilds it from a state where
+            // coverage can actually be guaranteed, instead of resuming a silently stale index.
+            Timber.tag("RustMatrixClient").i("Message search is disabled, deleting the stale search index")
+            indexDirectory.deleteRecursively()
+        }
+
         val client = getBaseClientBuilder(
-            sessionPaths = sessionData.getSessionPaths(),
-            passphrase = sessionData.passphrase,
+            sessionPaths = sessionPaths,
+            clientSecret = clientSecret,
             slidingSyncType = ClientBuilderSlidingSync.Restored,
+            isMessageSearchAvailable = isMessageSearchAvailable,
         )
             .homeserverUrl(sessionData.homeserverUrl)
             .username(sessionData.userId)
@@ -99,20 +118,47 @@ class RustMatrixClientFactory(
 
         client.restoreSession(sessionData.toSession())
 
-        create(client)
+        create(client, sessionData, isMessageSearchAvailable)
     }
 
-    suspend fun create(client: Client): RustMatrixClient {
+    suspend fun create(
+        client: Client,
+        sessionData: SessionData,
+        isMessageSearchAvailable: Boolean,
+    ): RustMatrixClient {
         val (anonymizedAccessToken, anonymizedRefreshToken) = client.session().anonymizedTokens()
 
+        // Must be called before creating the sync service, timelines etc.
+        if (featureFlagService.isFeatureEnabled(FeatureFlags.AutomaticBackPagination)) {
+            client.enableAutomaticBackpagination()
+        }
+
         client.setUtdDelegate(UtdTracker(analyticsService))
 
+        val domainName = UserId(client.userId()).domainName
+        // If a content scanner URL is available for the homeserver, create a RustContentScanner and set it on the client.
+        // This allows the SDK to use the content scanner for automatic media scanning.
+        // If no content scanner URL is available, the contentScanner will be null.
+        val contentScanner = domainName?.let {
+            contentScannerUrlProvider.getContentScannerUrl(domainName)
+                .getOrNull()
+                ?.let { contentScannerUrl ->
+                    val contentScanner = ContentScanner(contentScannerUrl)
+                    client.setContentScanner(contentScanner)
+                    RustContentScanner(
+                        client = client,
+                        rustScanner = contentScanner,
+                    )
+                }
+        }
+
         val syncService = client.syncService()
             .withSharePos(true)
             .withOfflineMode()
             .finish()
 
         return RustMatrixClient(
+            sessionPaths = sessionData.getSessionPaths(),
             innerClient = client,
             sessionStore = sessionStore,
             appCoroutineScope = appCoroutineScope,
@@ -125,25 +171,27 @@ class RustMatrixClientFactory(
             featureFlagService = featureFlagService,
             analyticsService = analyticsService,
             workManagerScheduler = workManagerScheduler,
+            contentScanner = contentScanner,
+            isMessageSearchAvailable = isMessageSearchAvailable,
         ).also {
-            Timber.tag(it.toString()).d("Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'")
+            Timber.tag("RustMatrixClient").i("Creating Client with access token '$anonymizedAccessToken' and refresh token '$anonymizedRefreshToken'")
         }
     }
 
     internal suspend fun getBaseClientBuilder(
         sessionPaths: SessionPaths,
-        passphrase: String?,
+        clientSecret: ClientSecret?,
         slidingSyncType: ClientBuilderSlidingSync,
+        isMessageSearchAvailable: Boolean,
     ): ClientBuilder {
         return clientBuilderProvider.provide()
             .run {
                 sqliteStoreBuilderProvider.provide(sessionPaths)
-                    .passphrase(passphrase)
+                    .secret(clientSecret)
                     .setupClientBuilder(this)
             }
             .setSessionDelegate(sessionDelegate)
             .userAgent(userAgentProvider.provide())
-            .addRootCertificates(userCertificatesProvider.provides())
             .autoEnableBackups(true)
             .autoEnableCrossSigning(true)
             .roomKeyRecipientStrategy(
@@ -162,8 +210,21 @@ class RustMatrixClientFactory(
                     }
                 )
             )
-            .enableShareHistoryOnInvite(featureFlagService.isFeatureEnabled(FeatureFlags.EnableKeyShareOnInvite))
+            .enableShareHistoryOnInvite(true)
             .threadsEnabled(featureFlagService.isFeatureEnabled(FeatureFlags.Threads), threadSubscriptions = false)
+            .run {
+                if (isMessageSearchAvailable) {
+                    // The index is encrypted at rest with the same secret the SDK's SQLite stores
+                    // use, or left unencrypted for sessions without one, matching those stores.
+                    withSearchIndexStore(
+                        path = File(sessionPaths.fileDirectory, SEARCH_INDEX_DIRECTORY).absolutePath,
+                        password = clientSecret?.formattedAsString(),
+                    )
+                } else {
+                    this
+                }
+            }
+            .dmRoomDefinition(DmRoomDefinition.TWO_MEMBERS)
             .requestConfig(
                 RequestConfig(
                     timeout = 30_000uL,
@@ -191,6 +252,12 @@ class RustMatrixClientFactory(
     }
 }
 
+/**
+ * Directory holding the local message search index, under the session's file directory.
+ * Not the cache directory: the index is not disposable, and a cache wipe should not destroy it.
+ */
+internal const val SEARCH_INDEX_DIRECTORY = "search-index"
+
 sealed interface ClientBuilderSlidingSync {
     // The proxy will be supplied when restoring the Session.
     data object Restored : ClientBuilderSlidingSync
@@ -209,5 +276,5 @@ fun SessionData.toSession() = Session(
     deviceId = deviceId,
     homeserverUrl = homeserverUrl,
     slidingSyncVersion = SlidingSyncVersion.NATIVE,
-    oidcData = oidcData,
+    oauthData = oAuthData,
 )
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/DefaultGetDatabaseSizesUseCase.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/DefaultGetDatabaseSizesUseCase.kt
index 8973483132..8dba525788 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/DefaultGetDatabaseSizesUseCase.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/DefaultGetDatabaseSizesUseCase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
@@ -9,19 +9,53 @@ package io.element.android.libraries.matrix.impl.analytics
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.data.bytes
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.analytics.GetDatabaseSizesUseCase
 import io.element.android.libraries.matrix.api.analytics.SdkStoreSizes
 import io.element.android.libraries.matrix.api.core.SessionId
+import java.io.File
+import kotlin.math.max
 
+/**
+ * An implementation of [GetDatabaseSizesUseCase] that manually calculates the database sizes by checking the file system.
+ * This is not as accurate as the SDK's internal method, but is used as a fallback for Sentry's non-suspendable hook where
+ * calling the SDK's suspendable method blocks the main thread and causes ANRs.
+ */
 @ContributesBinding(AppScope::class)
 class DefaultGetDatabaseSizesUseCase(
     private val clientProvider: Lazy<MatrixClientProvider>,
 ) : GetDatabaseSizesUseCase {
-    override suspend fun invoke(sessionId: SessionId): Result<SdkStoreSizes> {
+    override fun invoke(sessionId: SessionId): Result<SdkStoreSizes> {
         val client = clientProvider.value.getOrNull(sessionId)
             ?: return Result.failure(IllegalArgumentException("No MatrixClient for session $sessionId"))
 
-        return client.getDatabaseSizes()
+        val fileDir = client.sessionPaths.fileDirectory
+        val cacheDir = client.sessionPaths.cacheDirectory
+
+        val cryptoSize = getDatabaseSize(fileDir, "matrix-sdk-crypto")
+        val stateSize = getDatabaseSize(fileDir, "matrix-sdk-state")
+
+        val eventCacheSize = getDatabaseSize(cacheDir, "matrix-sdk-event-cache")
+        val mediaCacheSize = getDatabaseSize(cacheDir, "matrix-sdk-media")
+
+        return Result.success(SdkStoreSizes(
+            stateStore = stateSize.bytes,
+            cryptoStore = cryptoSize.bytes,
+            eventCacheStore = eventCacheSize.bytes,
+            mediaStore = mediaCacheSize.bytes,
+        ))
+    }
+
+    private fun getDatabaseSize(baseDirectory: File, databaseFileName: String): Long {
+        // Check the sizes of both the main database file and the -wal file, and return the max of the two:
+        // The -wal file can contain additional data not yet merged into the main file, becoming larger than it.
+        val databaseFile = File(baseDirectory, "$databaseFileName.sqlite3")
+        val walFile = File(baseDirectory, "$databaseFileName.sqlite3-wal")
+
+        val databaseSize = if (databaseFile.exists()) databaseFile.length() else 0L
+        val walSize = if (walFile.exists()) walFile.length() else 0L
+
+        return max(databaseSize, walSize)
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
index 263ce15bd3..8a0a246c22 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
@@ -11,7 +11,6 @@ package io.element.android.libraries.matrix.impl.analytics
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
-import io.element.android.libraries.matrix.api.room.isDm
 import kotlinx.coroutines.flow.first
 
 private fun Long.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
index ebe0c5e4e8..fac5227f6a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.impl.auth
 
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.matrix.rustcomponents.sdk.ClientBuildException
-import org.matrix.rustcomponents.sdk.OidcException
+import org.matrix.rustcomponents.sdk.OAuthException
 
 fun Throwable.mapAuthenticationException(): AuthenticationException {
     return when (this) {
@@ -28,13 +28,14 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
             }
             is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
             is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
+            is ClientBuildException.InvalidRawKey -> AuthenticationException.Generic(message)
         }
-        is OidcException -> when (this) {
-            is OidcException.Generic -> AuthenticationException.Oidc(message)
-            is OidcException.CallbackUrlInvalid -> AuthenticationException.Oidc(message)
-            is OidcException.Cancelled -> AuthenticationException.Oidc(message)
-            is OidcException.MetadataInvalid -> AuthenticationException.Oidc(message)
-            is OidcException.NotSupported -> AuthenticationException.Oidc(message)
+        is OAuthException -> when (this) {
+            is OAuthException.Generic -> AuthenticationException.OAuth(message)
+            is OAuthException.CallbackUrlInvalid -> AuthenticationException.OAuth(message)
+            is OAuthException.Cancelled -> AuthenticationException.OAuth(message)
+            is OAuthException.MetadataInvalid -> AuthenticationException.OAuth(message)
+            is OAuthException.NotSupported -> AuthenticationException.OAuth(message)
         }
         else -> AuthenticationException.Generic(message)
     }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetails.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetails.kt
index acf96d69d4..810b8d8e0d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetails.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetails.kt
@@ -15,6 +15,6 @@ fun HomeserverLoginDetails.map(): MatrixHomeServerDetails = use {
     MatrixHomeServerDetails(
         url = url(),
         supportsPasswordLogin = supportsPasswordLogin(),
-        supportsOidcLogin = supportsOidcLogin(),
+        supportsOAuthLogin = supportsOauthLogin(),
     )
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProvider.kt
new file mode 100644
index 0000000000..d80dea2e7f
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProvider.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.auth
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.matrix.api.auth.OAuthConfig
+import io.element.android.libraries.matrix.api.auth.OAuthRedirectUrlProvider
+import org.matrix.rustcomponents.sdk.OAuthConfiguration
+
+@Inject
+class OAuthConfigurationProvider(
+    private val buildMeta: BuildMeta,
+    private val oAuthRedirectUrlProvider: OAuthRedirectUrlProvider,
+) {
+    fun get(): OAuthConfiguration = OAuthConfiguration(
+        clientName = buildMeta.applicationName,
+        redirectUri = oAuthRedirectUrlProvider.provide(),
+        clientUri = OAuthConfig.CLIENT_URI,
+        logoUri = OAuthConfig.LOGO_URI,
+        tosUri = OAuthConfig.TOS_URI,
+        policyUri = OAuthConfig.POLICY_URI,
+        staticRegistrations = OAuthConfig.STATIC_REGISTRATIONS,
+    )
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
deleted file mode 100644
index 6f9dd67b12..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.auth
-
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.matrix.api.auth.OidcConfig
-import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
-import org.matrix.rustcomponents.sdk.OidcConfiguration
-
-@Inject
-class OidcConfigurationProvider(
-    private val buildMeta: BuildMeta,
-    private val oidcRedirectUrlProvider: OidcRedirectUrlProvider,
-) {
-    fun get(): OidcConfiguration = OidcConfiguration(
-        clientName = buildMeta.applicationName,
-        redirectUri = oidcRedirectUrlProvider.provide(),
-        clientUri = OidcConfig.CLIENT_URI,
-        logoUri = OidcConfig.LOGO_URI,
-        tosUri = OidcConfig.TOS_URI,
-        policyUri = OidcConfig.POLICY_URI,
-        staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
-    )
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcPrompt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcPrompt.kt
index e21d8d94c6..e97ddbee84 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcPrompt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcPrompt.kt
@@ -8,13 +8,13 @@
 
 package io.element.android.libraries.matrix.impl.auth
 
-import io.element.android.libraries.matrix.api.auth.OidcPrompt
-import org.matrix.rustcomponents.sdk.OidcPrompt as RustOidcPrompt
+import io.element.android.libraries.matrix.api.auth.OAuthPrompt
+import org.matrix.rustcomponents.sdk.OAuthPrompt as RustOAuthPrompt
 
-internal fun OidcPrompt.toRustPrompt(): RustOidcPrompt {
+internal fun OAuthPrompt.toRustPrompt(): RustOAuthPrompt {
     return when (this) {
-        OidcPrompt.Login -> RustOidcPrompt.Unknown("consent")
-        OidcPrompt.Create -> RustOidcPrompt.Create
-        is OidcPrompt.Unknown -> RustOidcPrompt.Unknown(value)
+        OAuthPrompt.Login -> RustOAuthPrompt.Unknown("consent")
+        OAuthPrompt.Create -> RustOAuthPrompt.Create
+        is OAuthPrompt.Unknown -> RustOAuthPrompt.Unknown(value)
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeServerLoginCompatibilityChecker.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeServerLoginCompatibilityChecker.kt
index 0603fddec4..42cbd14cb3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeServerLoginCompatibilityChecker.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeServerLoginCompatibilityChecker.kt
@@ -13,26 +13,23 @@ import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.auth.HomeServerLoginCompatibilityChecker
 import io.element.android.libraries.matrix.impl.ClientBuilderProvider
-import io.element.android.libraries.matrix.impl.certificates.UserCertificatesProvider
 import timber.log.Timber
 
 @ContributesBinding(AppScope::class)
 class RustHomeServerLoginCompatibilityChecker(
     private val clientBuilderProvider: ClientBuilderProvider,
-    private val userCertificatesProvider: UserCertificatesProvider,
     ) : HomeServerLoginCompatibilityChecker {
     override suspend fun check(url: String): Result<Boolean> = runCatchingExceptions {
         clientBuilderProvider.provide()
             .inMemoryStore()
             .serverNameOrHomeserverUrl(url)
-            .addRootCertificates(userCertificatesProvider.provides())
             .build()
             .use {
                 it.homeserverLoginDetails()
             }
             .use {
-                Timber.d("Homeserver $url | OIDC: ${it.supportsOidcLogin()} | Password: ${it.supportsPasswordLogin()} | SSO: ${it.supportsSsoLogin()}")
-                it.supportsOidcLogin() || it.supportsPasswordLogin()
+                Timber.d("Homeserver $url | OAuth: ${it.supportsOauthLogin()} | Password: ${it.supportsPasswordLogin()} | SSO: ${it.supportsSsoLogin()}")
+                it.supportsOauthLogin() || it.supportsPasswordLogin()
             }
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
index 7cd9fbedf5..dd9f73c381 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
@@ -11,20 +11,27 @@ package io.element.android.libraries.matrix.impl.auth
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.libraries.androidutils.crypto.ClientSecret
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
+import io.element.android.libraries.matrix.api.auth.ElementClassicSession
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
-import io.element.android.libraries.matrix.api.auth.OidcDetails
-import io.element.android.libraries.matrix.api.auth.OidcPrompt
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.matrix.api.auth.OAuthPrompt
 import io.element.android.libraries.matrix.api.auth.SessionRestorationException
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 import io.element.android.libraries.matrix.impl.ClientBuilderSlidingSync
 import io.element.android.libraries.matrix.impl.RustMatrixClientFactory
@@ -32,9 +39,8 @@ import io.element.android.libraries.matrix.impl.auth.qrlogin.QrErrorMapper
 import io.element.android.libraries.matrix.impl.auth.qrlogin.SdkQrCodeLoginData
 import io.element.android.libraries.matrix.impl.auth.qrlogin.toStep
 import io.element.android.libraries.matrix.impl.exception.mapClientException
-import io.element.android.libraries.matrix.impl.keys.PassphraseGenerator
+import io.element.android.libraries.matrix.impl.keys.SecretGenerator
 import io.element.android.libraries.matrix.impl.mapper.toSessionData
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
 import io.element.android.libraries.matrix.impl.paths.SessionPathsFactory
 import io.element.android.libraries.matrix.impl.toSession
 import io.element.android.libraries.sessionstorage.api.LoginType
@@ -50,6 +56,7 @@ import org.matrix.rustcomponents.sdk.QrCodeData
 import org.matrix.rustcomponents.sdk.QrCodeDecodeException
 import org.matrix.rustcomponents.sdk.QrLoginProgress
 import org.matrix.rustcomponents.sdk.QrLoginProgressListener
+import org.matrix.rustcomponents.sdk.SecretsBundleWithUserId
 import timber.log.Timber
 import uniffi.matrix_sdk.OAuthAuthorizationData
 import kotlin.time.Duration.Companion.seconds
@@ -61,12 +68,17 @@ class RustMatrixAuthenticationService(
     private val coroutineDispatchers: CoroutineDispatchers,
     private val sessionStore: SessionStore,
     private val rustMatrixClientFactory: RustMatrixClientFactory,
-    private val passphraseGenerator: PassphraseGenerator,
-    private val oidcConfigurationProvider: OidcConfigurationProvider,
+    private val secretGenerator: SecretGenerator,
+    private val oAuthConfigurationProvider: OAuthConfigurationProvider,
+    private val enterpriseService: EnterpriseService,
+    private val featureFlagService: FeatureFlagService,
 ) : MatrixAuthenticationService {
+    // Any existing Element Classic session that we want to try to import secrets from during login.
+    private var elementClassicSession: ElementClassicSession? = null
+
     // Passphrase which will be used for new sessions. Existing sessions will use the passphrase
     // stored in the SessionData.
-    private val pendingPassphrase = getDatabasePassphrase()
+    private val pendingKey by lazy { getDatabaseKey() }
 
     // Need to keep a copy of the current session path to eventually delete it.
     // Ideally it would be possible to get the sessionPath from the Client to avoid doing this.
@@ -107,12 +119,9 @@ class RustMatrixAuthenticationService(
         }
     }
 
-    private fun getDatabasePassphrase(): String? {
-        val passphrase = passphraseGenerator.generatePassphrase()
-        if (passphrase != null) {
-            Timber.w("New sessions will be encrypted with a passphrase")
-        }
-        return passphrase
+    private fun getDatabaseKey(): ClientSecret {
+        Timber.d("New sessions will be encrypted with a raw key")
+        return secretGenerator.generateKey()
     }
 
     override suspend fun setHomeserver(homeserver: String): Result<MatrixHomeServerDetails> =
@@ -138,17 +147,23 @@ class RustMatrixAuthenticationService(
             runCatchingExceptions {
                 val client = currentClient ?: error("You need to call `setHomeserver()` first")
                 val currentSessionPaths = sessionPaths ?: error("You need to call `setHomeserver()` first")
-                client.login(username, password, "Element X Android", null)
+                client.login(
+                    username = username,
+                    password = password,
+                    initialDeviceName = "Element X Android",
+                    deviceId = null,
+                )
                 // Ensure that the user is not already logged in with the same account
                 ensureNotAlreadyLoggedIn(client)
+                tryToImportSecretForElementClassicSession(client)
                 val sessionData = client.session()
                     .toSessionData(
                         isTokenValid = true,
                         loginType = LoginType.PASSWORD,
-                        passphrase = pendingPassphrase,
+                        passphrase = pendingKey.formattedAsString(),
                         sessionPaths = currentSessionPaths,
                     )
-                val matrixClient = rustMatrixClientFactory.create(client)
+                val matrixClient = rustMatrixClientFactory.create(client, sessionData, isMessageSearchAvailable())
                 newMatrixClientObservers.forEach { it.invoke(matrixClient) }
                 sessionStore.addSession(sessionData)
 
@@ -162,6 +177,53 @@ class RustMatrixAuthenticationService(
             }
         }
 
+    private suspend fun tryToImportSecretForElementClassicSession(client: Client) {
+        elementClassicSession
+            ?.takeIf {
+                // Note: the SDK will also do this check
+                it.userId.value == client.userId()
+            }
+            ?.let {
+                val secrets = it.secrets
+                val roomKeysVersion = it.roomKeysVersion
+                if (secrets == null || roomKeysVersion == null) {
+                    Timber.d("No secrets or roomKeysVersion found for Element Classic session ${it.userId}, skipping import")
+                } else {
+                    Timber.d("Trying to import secrets for Element Classic session ${it.userId}")
+                    runCatchingExceptions {
+                        SecretsBundleWithUserId.fromStr(
+                            userId = it.userId.value,
+                            bundle = secrets,
+                            backupInfo = roomKeysVersion,
+                        ).use { secretsBundle ->
+                            client.encryption().importSecretsBundle(secretsBundle)
+                        }
+                    }.onFailure { failure ->
+                        Timber.e(failure, "Failed to import secrets for Element Classic session ${it.userId}")
+                    }
+                }
+            }
+    }
+
+    override fun doSecretsContainBackupKey(
+        userId: UserId,
+        secrets: String,
+        backupInfo: String,
+    ): Boolean {
+        return try {
+            SecretsBundleWithUserId.fromStr(
+                userId = userId.value,
+                bundle = secrets,
+                backupInfo = backupInfo,
+            ).use { secretsBundle ->
+                secretsBundle.containsBackupKey()
+            }
+        } catch (failure: Exception) {
+            Timber.e(failure, "Failed to parse secrets for Element Classic session $userId")
+            false
+        }
+    }
+
     override suspend fun importCreatedSession(externalSession: ExternalSession): Result<SessionId> =
         withContext(coroutineDispatchers.io) {
             runCatchingExceptions {
@@ -170,13 +232,13 @@ class RustMatrixAuthenticationService(
                 val sessionData = externalSession.toSessionData(
                     isTokenValid = true,
                     loginType = LoginType.PASSWORD,
-                    passphrase = pendingPassphrase,
+                    passphrase = pendingKey.formattedAsString(),
                     sessionPaths = currentSessionPaths,
                 )
 
                 // We restore the client using the just retrieved session data
                 client.restoreSession(sessionData.toSession())
-                val matrixClient = rustMatrixClientFactory.create(client)
+                val matrixClient = rustMatrixClientFactory.create(client, sessionData, isMessageSearchAvailable())
 
                 // We wait for the verification state to be known
                 matrixClient.waitForKnownVerificationState()
@@ -194,15 +256,15 @@ class RustMatrixAuthenticationService(
 
     private var pendingOAuthAuthorizationData: OAuthAuthorizationData? = null
 
-    override suspend fun getOidcUrl(
-        prompt: OidcPrompt,
+    override suspend fun getOAuthUrl(
+        prompt: OAuthPrompt,
         loginHint: String?,
-    ): Result<OidcDetails> {
+    ): Result<OAuthDetails> {
         return withContext(coroutineDispatchers.io) {
             runCatchingExceptions {
                 val client = currentClient ?: error("You need to call `setHomeserver()` first")
-                val oAuthAuthorizationData = client.urlForOidc(
-                    oidcConfiguration = oidcConfigurationProvider.get(),
+                val oAuthAuthorizationData = client.urlForOauth(
+                    oauthConfiguration = oAuthConfigurationProvider.get(),
                     prompt = prompt.toRustPrompt(),
                     loginHint = loginHint,
                     // If we want to restore a previous session for which we have encryption keys, we can pass the deviceId here. At the moment, we don't
@@ -210,52 +272,63 @@ class RustMatrixAuthenticationService(
                     additionalScopes = emptyList(),
                 )
                 val url = oAuthAuthorizationData.loginUrl()
+                    .let {
+                        enterpriseService.tweakMasUrl(
+                            url = it,
+                            homeserver = client.server() ?: client.homeserver(),
+                        )
+                    }
                 pendingOAuthAuthorizationData = oAuthAuthorizationData
-                OidcDetails(url)
+                OAuthDetails(url)
             }.mapFailure { failure ->
-                Timber.e(failure, "Failed to get OIDC URL")
+                Timber.e(failure, "Failed to get OAuth URL")
                 failure.mapAuthenticationException()
             }
         }
     }
 
-    override suspend fun cancelOidcLogin(): Result<Unit> {
+    override suspend fun cancelOAuthLogin(): Result<Unit> {
         return withContext(coroutineDispatchers.io) {
             runCatchingExceptions {
                 pendingOAuthAuthorizationData?.use {
-                    currentClient?.abortOidcAuth(it)
+                    currentClient?.abortOauthAuth(it)
                 }
                 pendingOAuthAuthorizationData = null
             }.mapFailure { failure ->
-                Timber.e(failure, "Failed to cancel OIDC login")
+                Timber.e(failure, "Failed to cancel OAuth login")
                 failure.mapAuthenticationException()
             }
         }
     }
 
+    override fun setElementClassicSession(session: ElementClassicSession?) {
+        elementClassicSession = session
+    }
+
     /**
-     * callbackUrl should be the uriRedirect from OidcClientMetadata (with all the parameters).
+     * callbackUrl should be the `url` from `OAuthAction` (with all the parameters).
      */
-    override suspend fun loginWithOidc(callbackUrl: String): Result<SessionId> {
+    override suspend fun loginWithOAuth(callbackUrl: String): Result<SessionId> {
         return withContext(coroutineDispatchers.io) {
             runCatchingExceptions {
                 val client = currentClient ?: error("You need to call `setHomeserver()` first")
                 val currentSessionPaths = sessionPaths ?: error("You need to call `setHomeserver()` first")
-                client.loginWithOidcCallback(callbackUrl)
-
+                client.loginWithOauthCallback(
+                    callbackUrl = callbackUrl,
+                )
                 // Free the pending data since we won't use it to abort the flow anymore
                 pendingOAuthAuthorizationData?.close()
                 pendingOAuthAuthorizationData = null
-
                 // Ensure that the user is not already logged in with the same account
                 ensureNotAlreadyLoggedIn(client)
+                tryToImportSecretForElementClassicSession(client)
                 val sessionData = client.session().toSessionData(
                     isTokenValid = true,
                     loginType = LoginType.OIDC,
-                    passphrase = pendingPassphrase,
+                    passphrase = pendingKey.formattedAsString(),
                     sessionPaths = currentSessionPaths,
                 )
-                val matrixClient = rustMatrixClientFactory.create(client)
+                val matrixClient = rustMatrixClientFactory.create(client, sessionData, isMessageSearchAvailable())
                 matrixClient.waitForKnownVerificationState()
 
                 newMatrixClientObservers.forEach { it.invoke(matrixClient) }
@@ -266,7 +339,7 @@ class RustMatrixAuthenticationService(
 
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
-                Timber.e(failure, "Failed to login with OIDC")
+                Timber.e(failure, "Failed to login with OAuth")
                 failure.mapAuthenticationException()
             }
         }
@@ -291,7 +364,7 @@ class RustMatrixAuthenticationService(
         withContext(coroutineDispatchers.io) {
             val sdkQrCodeLoginData = (qrCodeData as SdkQrCodeLoginData).rustQrCodeData
             val emptySessionPaths = rotateSessionPath()
-            val oidcConfiguration = oidcConfigurationProvider.get()
+            val oAuthConfiguration = oAuthConfigurationProvider.get()
             val progressListener = object : QrLoginProgressListener {
                 override fun onUpdate(state: QrLoginProgress) {
                     Timber.d("QR Code login progress: $state")
@@ -304,7 +377,7 @@ class RustMatrixAuthenticationService(
                     qrCodeData = sdkQrCodeLoginData,
                 )
                 client.newLoginWithQrCodeHandler(
-                    oidcConfiguration = oidcConfiguration,
+                    oauthConfiguration = oAuthConfiguration,
                 ).use {
                     it.scan(
                         qrCodeData = qrCodeData.rustQrCodeData,
@@ -317,10 +390,10 @@ class RustMatrixAuthenticationService(
                     .toSessionData(
                         isTokenValid = true,
                         loginType = LoginType.QR,
-                        passphrase = pendingPassphrase,
+                        passphrase = pendingKey.formattedAsString(),
                         sessionPaths = emptySessionPaths,
                     )
-                val matrixClient = rustMatrixClientFactory.create(client)
+                val matrixClient = rustMatrixClientFactory.create(client, sessionData, isMessageSearchAvailable())
                 newMatrixClientObservers.forEach { it.invoke(matrixClient) }
                 sessionStore.addSession(sessionData)
 
@@ -350,8 +423,9 @@ class RustMatrixAuthenticationService(
         return rustMatrixClientFactory
             .getBaseClientBuilder(
                 sessionPaths = sessionPaths,
-                passphrase = pendingPassphrase,
+                clientSecret = pendingKey,
                 slidingSyncType = ClientBuilderSlidingSync.Discovered,
+                isMessageSearchAvailable = isMessageSearchAvailable(),
             )
             .config()
             .build()
@@ -362,13 +436,31 @@ class RustMatrixAuthenticationService(
         qrCodeData: QrCodeData,
     ): Client {
         Timber.d("Creating client for QR Code login with simplified sliding sync")
+        // The 2025 version of MSC4108 provides baseUrl; the 2024 version has null baseUrl and uses
+        // serverName instead, which can be null or malformed. We only enforce presence/non-blankness
+        // here and rely on serverNameOrHomeserverUrl()/the Rust builder layer to validate structure.
+        val baseUrlOrServerName = qrCodeData.baseUrl() ?: qrCodeData.serverName()
+
+        if (baseUrlOrServerName == null) {
+            // With the 2024 version of MSC4108 we treat the absence of serverName as meaning that
+            // the other device is not signed in.
+            Timber.e("The QR code is from a device that is not yet signed in")
+            throw HumanQrLoginException.OtherDeviceNotSignedIn()
+        }
+
+        if (baseUrlOrServerName.isBlank()) {
+            Timber.e("The QR code contains an empty base URL or server name, which is invalid")
+            throw HumanQrLoginException.Unknown()
+        }
+
         return rustMatrixClientFactory
             .getBaseClientBuilder(
                 sessionPaths = sessionPaths,
-                passphrase = pendingPassphrase,
+                clientSecret = pendingKey,
                 slidingSyncType = ClientBuilderSlidingSync.Discovered,
+                isMessageSearchAvailable = isMessageSearchAvailable(),
             )
-            .serverNameOrHomeserverUrl(qrCodeData.serverName()!!)
+            .serverNameOrHomeserverUrl(baseUrlOrServerName)
             .build()
     }
 
@@ -377,6 +469,9 @@ class RustMatrixAuthenticationService(
         currentClient = null
     }
 
+    private suspend fun isMessageSearchAvailable(): Boolean =
+        featureFlagService.isFeatureEnabled(FeatureFlags.MessageSearch)
+
     private suspend fun MatrixClient.waitForKnownVerificationState() {
         withTimeoutOrNull(10.seconds) {
             Timber.d("Waiting for a known verification status...")
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
index ae56cb10fa..ed00db82e4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapper.kt
@@ -42,10 +42,12 @@ object QrErrorMapper {
         is RustHumanQrLoginException.OtherDeviceNotSignedIn -> QrLoginException.OtherDeviceNotSignedIn
         is RustHumanQrLoginException.LinkingNotSupported -> QrLoginException.LinkingNotSupported
         is RustHumanQrLoginException.Unknown -> QrLoginException.Unknown
-        is RustHumanQrLoginException.OidcMetadataInvalid -> QrLoginException.OidcMetadataInvalid
+        is RustHumanQrLoginException.OAuthMetadataInvalid -> QrLoginException.OAuthMetadataInvalid
         is RustHumanQrLoginException.SlidingSyncNotAvailable -> QrLoginException.SlidingSyncNotAvailable
         is RustHumanQrLoginException.CheckCodeAlreadySent -> QrLoginException.CheckCodeAlreadySent
         is RustHumanQrLoginException.CheckCodeCannotBeSent -> QrLoginException.CheckCodeCannotBeSent
+        is RustHumanQrLoginException.ContinuationAlreadySent -> QrLoginException.ContinuationAlreadySent
+        is RustHumanQrLoginException.ContinuationCannotBeSent -> QrLoginException.ContinuationCannotBeSent
         is RustHumanQrLoginException.UnsupportedQrCodeType -> QrLoginException.UnsupportedQrCodeType
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt
deleted file mode 100644
index 39be03ce5b..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.certificates
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import timber.log.Timber
-import java.security.KeyStore
-import java.security.KeyStoreException
-
-@ContributesBinding(AppScope::class)
-class DefaultUserCertificatesProvider : UserCertificatesProvider {
-    /**
-     * Get additional user-installed certificates from the `AndroidCAStore` `Keystore`.
-     *
-     * The Rust HTTP client doesn't include user-installed certificates in its internal certificate
-     * store. This means that whatever the user installs will be ignored.
-     *
-     * While most users don't need user-installed certificates some special deployments or debugging
-     * setups using a proxy might want to use them.
-     *
-     * @return A list of byte arrays where each byte array is a single user-installed certificate
-     *         in encoded form.
-     */
-    override fun provides(): List<ByteArray> {
-        // At least for API 34 the `AndroidCAStore` `Keystore` type contained user certificates as well.
-        // I have not found this to be documented anywhere.
-        val keyStore: KeyStore = try {
-            KeyStore.getInstance("AndroidCAStore")
-        } catch (e: KeyStoreException) {
-            Timber.w(e, "Failed to get AndroidCAStore keystore")
-            return emptyList()
-        }
-        val aliases = try {
-            keyStore.load(null)
-            keyStore.aliases()
-        } catch (e: Exception) {
-            Timber.w(e, "Failed to load and get aliases AndroidCAStore keystore")
-            return emptyList()
-        }
-        return aliases.toList()
-            .filter { alias ->
-                // The certificate alias always contains the prefix `system` or
-                // `user` and the MD5 subject hash separated by a colon.
-                //
-                // The subject hash can be calculated using openssl as such:
-                //     openssl x509 -subject_hash_old -noout -in mycert.cer
-                //
-                // Again, I have not found this to be documented somewhere.
-                alias.startsWith("user")
-            }
-            .mapNotNull { alias ->
-                try {
-                    keyStore.getEntry(alias, null)
-                } catch (e: Exception) {
-                    Timber.w(e, "Failed to get entry for alias $alias")
-                    null
-                }
-            }
-            .filterIsInstance<KeyStore.TrustedCertificateEntry>()
-            .map { trustedCertificateEntry ->
-                trustedCertificateEntry.trustedCertificate.encoded
-            }
-            .also {
-                // Let's at least log the number of user-installed certificates we found,
-                // since the alias isn't particularly useful nor does the issuer seem to
-                // be easily available.
-                Timber.i("Found ${it.size} additional user-provided certificates.")
-            }
-    }
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/SessionMatrixModule.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/SessionMatrixModule.kt
index 6ca7d27a8f..e88dc382e8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/SessionMatrixModule.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/SessionMatrixModule.kt
@@ -13,7 +13,9 @@ import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.Provides
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.DeviceId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
@@ -22,6 +24,7 @@ import io.element.android.libraries.matrix.api.notificationsettings.Notification
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
 import io.element.android.libraries.matrix.api.spaces.SpaceService
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
@@ -35,6 +38,11 @@ object SessionMatrixModule {
         return matrixClient.sessionId
     }
 
+    @Provides
+    fun providesDeviceId(matrixClient: MatrixClient): DeviceId {
+        return matrixClient.deviceId
+    }
+
     @Provides
     fun providesSessionVerificationService(matrixClient: MatrixClient): SessionVerificationService {
         return matrixClient.sessionVerificationService
@@ -90,4 +98,14 @@ object SessionMatrixModule {
     fun providesSpaceService(matrixClient: MatrixClient): SpaceService {
         return matrixClient.spaceService
     }
+
+    @Provides
+    fun providesHomeserverCapabilitiesProvider(matrixClient: MatrixClient): HomeserverCapabilitiesProvider {
+        return matrixClient.homeserverCapabilities()
+    }
+
+    @Provides
+    fun providesContentScanner(matrixClient: MatrixClient): ContentScanner? {
+        return matrixClient.contentScanner
+    }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
index f67b7cb7e1..74f235f9f8 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
@@ -131,19 +131,28 @@ class RustEncryptionService(
 
     override suspend fun enableRecovery(
         waitForBackupsToUpload: Boolean,
-    ): Result<Unit> = withContext(dispatchers.io) {
+        passphrase: String?,
+    ): Result<String> = withContext(dispatchers.io) {
         runCatchingExceptions {
-            service.enableRecovery(
+            // The key arrives as the suspend return value (like resetRecoveryKey), avoiding a
+            // flow/return-value race; the listener only feeds sub-progress.
+            enableRecoveryProgressStateFlow.value = EnableRecoveryProgress.Starting
+            val key = service.enableRecovery(
                 waitForBackupsToUpload = waitForBackupsToUpload,
                 progressListener = object : EnableRecoveryProgressListener {
                     override fun onUpdate(status: RustEnableRecoveryProgress) {
                         enableRecoveryProgressStateFlow.value = enableRecoveryProgressMapper.map(status)
                     }
                 },
-                passphrase = null,
+                passphrase = passphrase,
             )
-                // enableRecovery returns the encryption key, but we read it from the state flow
-                .let { }
+            // Pin Done explicitly so observers get a coherent terminal value. For the passphrase
+            // path the user never sees the SDK base58 key, so keep it out of this session-scoped
+            // (in-memory) flow entirely; the caller still receives it as the return value and is
+            // responsible for scrubbing it. The auto-generated path must retain the key here since
+            // that is how it is surfaced to the user.
+            enableRecoveryProgressStateFlow.value = EnableRecoveryProgress.Done(if (passphrase != null) "" else key)
+            key
         }.mapFailure {
             it.mapRecoveryException()
         }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt
index 4813ec1cc3..7ee9c7d0b3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustIdentityResetHandle.kt
@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.impl.encryption
 
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle
+import io.element.android.libraries.matrix.api.encryption.IdentityOAuthResetHandle
 import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle
 import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle
 import org.matrix.rustcomponents.sdk.AuthData
@@ -25,7 +25,7 @@ object RustIdentityResetHandleFactory {
         return runCatchingExceptions {
             identityResetHandle?.let {
                 when (val authType = identityResetHandle.authType()) {
-                    is CrossSigningResetAuthType.Oidc -> RustOidcIdentityResetHandle(identityResetHandle, authType.info.approvalUrl)
+                    is CrossSigningResetAuthType.OAuth -> RustIdentityOAuthResetHandle(identityResetHandle, authType.info.approvalUrl)
                     // User interactive authentication (user + password)
                     CrossSigningResetAuthType.Uiaa -> RustPasswordIdentityResetHandle(userId, identityResetHandle)
                 }
@@ -47,11 +47,11 @@ class RustPasswordIdentityResetHandle(
     }
 }
 
-class RustOidcIdentityResetHandle(
+class RustIdentityOAuthResetHandle(
     private val identityResetHandle: org.matrix.rustcomponents.sdk.IdentityResetHandle,
     override val url: String,
-) : IdentityOidcResetHandle {
-    override suspend fun resetOidc(): Result<Unit> {
+) : IdentityOAuthResetHandle {
+    override suspend fun resetOAuth(): Result<Unit> {
         return runCatchingExceptions { identityResetHandle.reset(null) }
     }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimator.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimator.kt
new file mode 100644
index 0000000000..13cba9d759
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimator.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.encryption
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthEstimate
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthEstimator
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthRanking
+import org.matrix.rustcomponents.sdk.PasswordStrengthEstimate as SdkPasswordStrengthEstimate
+import org.matrix.rustcomponents.sdk.PasswordStrengthEstimator as SdkPasswordStrengthEstimator
+import org.matrix.rustcomponents.sdk.PasswordStrengthRanking as SdkPasswordStrengthRanking
+
+@ContributesBinding(AppScope::class)
+class RustPasswordStrengthEstimator : PasswordStrengthEstimator {
+    // The SDK ranking is derived from caller-supplied thresholds. We use the "modern hardware (2025)"
+    // preset so Android and iOS rank passphrases identically. The zxcvbn estimator holds no per-password
+    // state, so a single app-scoped instance is reused for every keystroke rather than reconstructed.
+    private val estimator by lazy { SdkPasswordStrengthEstimator.withModernDefaults2025() }
+
+    override fun estimate(password: String, userInputs: List<String>): PasswordStrengthEstimate {
+        return estimator.estimate(password, userInputs).toApiModel()
+    }
+}
+
+internal fun SdkPasswordStrengthEstimate.toApiModel() = PasswordStrengthEstimate(
+    ranking = ranking.toApiModel(),
+    score = score,
+    normalScore = normalScore,
+)
+
+internal fun SdkPasswordStrengthRanking.toApiModel() = when (this) {
+    SdkPasswordStrengthRanking.VERY_WEAK -> PasswordStrengthRanking.VeryWeak
+    SdkPasswordStrengthRanking.WEAK -> PasswordStrengthRanking.Weak
+    SdkPasswordStrengthRanking.FAIR -> PasswordStrengthRanking.Fair
+    SdkPasswordStrengthRanking.STRONG -> PasswordStrengthRanking.Strong
+    SdkPasswordStrengthRanking.VERY_STRONG -> PasswordStrengthRanking.VeryStrong
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
index eefa6d4986..27d799f67b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ClientException.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.matrix.impl.exception
 
 import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.api.exception.ContentScannerErrorReason
 import org.matrix.rustcomponents.sdk.ClientException as RustClientException
 
 fun Throwable.mapClientException(): ClientException {
@@ -23,6 +24,10 @@ fun Throwable.mapClientException(): ClientException {
                     details = details,
                     cause = this,
                 )
+                is RustClientException.ContentScanner -> ClientException.ContentScanner(
+                    message = message,
+                    reason = ContentScannerErrorReason.fromRust(reason),
+                )
             }
         }
         else -> ClientException.Other(message ?: "Unknown error", this)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ContentScannerErrorReason.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ContentScannerErrorReason.kt
new file mode 100644
index 0000000000..085a570278
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/exception/ContentScannerErrorReason.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.exception
+
+import io.element.android.libraries.matrix.api.exception.ContentScannerErrorReason
+import uniffi.matrix_sdk_contentscanner.ErrorReason
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_BAD_DECRYPTION
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_MALFORMED_JSON
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_MEDIA_FAILED_TO_DECRYPT
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_MEDIA_NOT_CLEAN
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_MEDIA_REQUEST_FAILED
+import uniffi.matrix_sdk_contentscanner.ErrorReason.MCS_MIME_TYPE_FORBIDDEN
+import uniffi.matrix_sdk_contentscanner.ErrorReason.M_MISSING_TOKEN
+import uniffi.matrix_sdk_contentscanner.ErrorReason.M_NOT_FOUND
+import uniffi.matrix_sdk_contentscanner.ErrorReason.M_UNKNOWN
+import uniffi.matrix_sdk_contentscanner.ErrorReason.M_UNKNOWN_TOKEN
+
+fun ContentScannerErrorReason.Companion.fromRust(reason: ErrorReason) = when (reason) {
+    M_UNKNOWN -> ContentScannerErrorReason.M_UNKNOWN
+    M_MISSING_TOKEN -> ContentScannerErrorReason.M_MISSING_TOKEN
+    M_UNKNOWN_TOKEN -> ContentScannerErrorReason.M_UNKNOWN_TOKEN
+    MCS_MALFORMED_JSON -> ContentScannerErrorReason.MCS_MALFORMED_JSON
+    MCS_MEDIA_FAILED_TO_DECRYPT -> ContentScannerErrorReason.MCS_MEDIA_FAILED_TO_DECRYPT
+    M_NOT_FOUND -> ContentScannerErrorReason.M_NOT_FOUND
+    MCS_MEDIA_NOT_CLEAN -> ContentScannerErrorReason.MCS_MEDIA_NOT_CLEAN
+    MCS_MIME_TYPE_FORBIDDEN -> ContentScannerErrorReason.MCS_MIME_TYPE_FORBIDDEN
+    MCS_BAD_DECRYPTION -> ContentScannerErrorReason.MCS_BAD_DECRYPTION
+    MCS_MEDIA_REQUEST_FAILED -> ContentScannerErrorReason.MCS_MEDIA_REQUEST_FAILED
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGenerator.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGenerator.kt
deleted file mode 100644
index d13ff7779e..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGenerator.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.keys
-
-import android.util.Base64
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import java.security.SecureRandom
-
-private const val SECRET_SIZE = 256
-
-@ContributesBinding(AppScope::class)
-class DefaultPassphraseGenerator : PassphraseGenerator {
-    override fun generatePassphrase(): String? {
-        val key = ByteArray(size = SECRET_SIZE)
-        SecureRandom().nextBytes(key)
-        return Base64.encodeToString(key, Base64.NO_PADDING or Base64.NO_WRAP)
-    }
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGenerator.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGenerator.kt
new file mode 100644
index 0000000000..bad4ecb169
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGenerator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.keys
+
+import android.util.Base64
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+import java.security.SecureRandom
+
+@ContributesBinding(AppScope::class)
+class DefaultSecretGenerator : SecretGenerator {
+    override fun generatePassphrase(size: Int): ClientSecret.Passphrase? {
+        val key = ByteArray(size = size)
+        SecureRandom().nextBytes(key)
+        return ClientSecret.Passphrase(Base64.encodeToString(key, Base64.NO_PADDING or Base64.NO_WRAP))
+    }
+
+    override fun generateKey(size: Int): ClientSecret.RawKey {
+        val key = ByteArray(size = size)
+        SecureRandom().nextBytes(key)
+        return ClientSecret.RawKey(key)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/PassphraseGenerator.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/PassphraseGenerator.kt
deleted file mode 100644
index e0f925fa28..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/PassphraseGenerator.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.keys
-
-interface PassphraseGenerator {
-    /**
-     * Generate a passphrase to encrypt the databases of a session.
-     * Return null to not encrypt the databases.
-     */
-    fun generatePassphrase(): String?
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/SecretGenerator.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/SecretGenerator.kt
new file mode 100644
index 0000000000..6dfade9b7c
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/SecretGenerator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.keys
+
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+
+private const val PASSPHRASE_SIZE = 256
+private const val KEY_SIZE = 32
+
+interface SecretGenerator {
+    /**
+     * Generate a passphrase to encrypt the databases.
+     * @param size the size of the passphrase in bytes, before encoding. The default value is 256 bytes.
+     * @return either a random passphrase or `null` to not encrypt the databases.
+     */
+    fun generatePassphrase(size: Int = PASSPHRASE_SIZE): ClientSecret.Passphrase?
+
+    /**
+     * Generate a key to encrypt the databases.
+     * @param size the size of the key in bytes. The default value is 32 bytes.
+     * @return a random key.
+     */
+    fun generateKey(size: Int = KEY_SIZE): ClientSecret.RawKey
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandler.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandler.kt
index 211bdc3d4e..83e657eb07 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandler.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandler.kt
@@ -54,6 +54,8 @@ class RustLinkDesktopHandler(
                     }
                 }
             )
+            // We emit Done in case the progress listener was deallocated before scan() sent the Done
+            _linkDesktopStep.emit(LinkDesktopStep.Done)
         } catch (e: QrCodeDecodeException) {
             Timber.tag(tag.value).w(e, "Invalid QR code scanned")
             _linkDesktopStep.emit(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
index 0189987d96..a44a8d5943 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandler.kt
@@ -49,6 +49,21 @@ class RustLinkMobileHandler(
                     }
                 }
             )
+            // We emit Done in case the progress listener was deallocated before generate() sent the Done
+            _linkMobileStep.emit(LinkMobileStep.Done)
+        } catch (e: HumanQrGrantLoginException.Expired) {
+            // Note: the SDK does not return this error, but is returning `.NotFound` instead when the QR code expires. We catch both just in case.
+            Timber.tag(tag.value).w(e, "QR code has expired")
+            _linkMobileStep.emit(LinkMobileStep.QrRotating)
+        } catch (e: HumanQrGrantLoginException.NotFound) {
+            Timber.tag(tag.value).w(e, "Error during QR login grant")
+            // Catch timeout here?
+            if (_linkMobileStep.value is LinkMobileStep.QrReady) {
+                Timber.tag(tag.value).d("Emit QrRotating due to HumanQrGrantLoginException.NotFound")
+                _linkMobileStep.emit(LinkMobileStep.QrRotating)
+            } else {
+                _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
+            }
         } catch (e: HumanQrGrantLoginException) {
             Timber.tag(tag.value).w(e, "Error during QR login grant")
             _linkMobileStep.emit(LinkMobileStep.Error(e.map()))
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/Session.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/Session.kt
index 3199ebf71a..b5964f1a2e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/Session.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/mapper/Session.kt
@@ -9,7 +9,7 @@
 package io.element.android.libraries.matrix.impl.mapper
 
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.sessionstorage.api.LoginType
 import io.element.android.libraries.sessionstorage.api.SessionData
 import org.matrix.rustcomponents.sdk.Session
@@ -27,7 +27,7 @@ internal fun Session.toSessionData(
     accessToken = accessToken,
     refreshToken = refreshToken,
     homeserverUrl = homeserverUrl ?: this.homeserverUrl,
-    oidcData = oidcData,
+    oAuthData = oauthData,
     loginTimestamp = Date(),
     isTokenValid = isTokenValid,
     loginType = loginType,
@@ -52,7 +52,7 @@ internal fun ExternalSession.toSessionData(
     accessToken = accessToken,
     refreshToken = refreshToken,
     homeserverUrl = homeserverUrl,
-    oidcData = null,
+    oAuthData = null,
     loginTimestamp = Date(),
     isTokenValid = isTokenValid,
     loginType = loginType,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryItemInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryItemInfoMapper.kt
new file mode 100644
index 0000000000..6e90ea3d62
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryItemInfoMapper.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.media
+
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
+import org.matrix.rustcomponents.sdk.GalleryItemInfo as RustGalleryItemInfo
+import org.matrix.rustcomponents.sdk.UploadSource as RustUploadSource
+
+fun GalleryItemInfo.map(): RustGalleryItemInfo = when (this) {
+    is GalleryItemInfo.Image -> {
+        RustGalleryItemInfo.Image(
+            imageInfo = imageInfo.map(),
+            source = RustUploadSource.File(file.path),
+            caption = null,
+            formattedCaption = null,
+            thumbnailSource = thumbnailFile?.path?.let(RustUploadSource::File),
+        )
+    }
+    is GalleryItemInfo.Video -> {
+        RustGalleryItemInfo.Video(
+            videoInfo = videoInfo.map(),
+            source = RustUploadSource.File(file.path),
+            caption = null,
+            formattedCaption = null,
+            thumbnailSource = thumbnailFile?.path?.let(RustUploadSource::File),
+        )
+    }
+    is GalleryItemInfo.Audio -> {
+        RustGalleryItemInfo.Audio(
+            audioInfo = audioInfo.map(),
+            source = RustUploadSource.File(file.path),
+            caption = null,
+            formattedCaption = null,
+        )
+    }
+    is GalleryItemInfo.MediaFile -> {
+        RustGalleryItemInfo.File(
+            fileInfo = fileInfo.map(),
+            source = RustUploadSource.File(file.path),
+            caption = null,
+            formattedCaption = null,
+        )
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryMediaUploadHandlerImpl.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryMediaUploadHandlerImpl.kt
new file mode 100644
index 0000000000..5bb01cdb56
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/GalleryMediaUploadHandlerImpl.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.media
+
+import io.element.android.libraries.androidutils.file.safeDelete
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.media.MediaUploadHandler
+import org.matrix.rustcomponents.sdk.SendGalleryJoinHandle
+import java.io.File
+
+class GalleryMediaUploadHandlerImpl(
+    private val filesToUpload: List<File>,
+    private val sendGalleryJoinHandle: SendGalleryJoinHandle,
+) : MediaUploadHandler {
+    override suspend fun await(): Result<Unit> =
+        runCatchingExceptions {
+            sendGalleryJoinHandle.join()
+        }
+            .also { cleanUpFiles() }
+
+    override fun cancel() {
+        sendGalleryJoinHandle.cancel()
+        cleanUpFiles()
+    }
+
+    private fun cleanUpFiles() {
+        filesToUpload.forEach { file -> file.safeDelete() }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt
index 81946980e3..d1401d2624 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/media/RustMediaLoader.kt
@@ -9,11 +9,13 @@
 package io.element.android.libraries.matrix.impl.media
 
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaFile
 import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.impl.exception.mapClientException
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.use
@@ -37,7 +39,7 @@ class RustMediaLoader(
                 source.toRustMediaSource().use { source ->
                     innerClient.getMediaContent(source)
                 }
-            }
+            }.mapFailure { it.mapClientException() }
         }
 
     override suspend fun loadMediaThumbnail(
@@ -54,7 +56,7 @@ class RustMediaLoader(
                         height = height.toULong()
                     )
                 }
-            }
+            }.mapFailure { it.mapClientException() }
         }
 
     override suspend fun downloadMediaFile(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt
index f1996dd942..bfb49d6ceb 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/NotificationMapper.kt
@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.notification.NotificationData
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import org.matrix.rustcomponents.sdk.NotificationEvent
@@ -37,10 +36,6 @@ class NotificationMapper(
     ): Result<NotificationData> {
         return runCatchingExceptions {
             notificationItem.use { item ->
-                val isDm = isDm(
-                    isDirect = item.roomInfo.isDirect,
-                    activeMembersCount = item.roomInfo.joinedMembersCount.toInt(),
-                )
                 val timestamp = item.timestamp() ?: clock.epochMillis()
                 NotificationData(
                     sessionId = sessionId,
@@ -50,10 +45,10 @@ class NotificationMapper(
                     senderAvatarUrl = item.senderInfo.avatarUrl,
                     senderDisplayName = item.senderInfo.displayName,
                     senderIsNameAmbiguous = item.senderInfo.isNameAmbiguous,
-                    roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { isDm },
+                    roomAvatarUrl = item.roomInfo.avatarUrl ?: item.senderInfo.avatarUrl.takeIf { item.roomInfo.isDm },
                     roomDisplayName = item.roomInfo.displayName,
                     isDirect = item.roomInfo.isDirect,
-                    isDm = isDm,
+                    isDm = item.roomInfo.isDm,
                     isSpace = item.roomInfo.isSpace,
                     isEncrypted = item.roomInfo.isEncrypted.orFalse(),
                     isNoisy = item.isNoisy.orFalse(),
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
index 96c4bdf3c4..83b4aa7570 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt
@@ -40,16 +40,15 @@ class TimelineEventToNotificationContentMapper {
 private fun TimelineEventContent.toContent(senderId: UserId): NotificationContent {
     return when (this) {
         is TimelineEventContent.MessageLike -> content.toContent(senderId)
-        is TimelineEventContent.State -> content.toContent()
+        is TimelineEventContent.State -> content.toContent(senderId)
     }
 }
 
-private fun StateEventContent.toContent(): NotificationContent.StateEvent {
+private fun StateEventContent.toContent(senderId: UserId): NotificationContent.StateEvent {
     return when (this) {
         StateEventContent.PolicyRuleRoom -> NotificationContent.StateEvent.PolicyRuleRoom
         StateEventContent.PolicyRuleServer -> NotificationContent.StateEvent.PolicyRuleServer
         StateEventContent.PolicyRuleUser -> NotificationContent.StateEvent.PolicyRuleUser
-        StateEventContent.RoomAliases -> NotificationContent.StateEvent.RoomAliases
         StateEventContent.RoomAvatar -> NotificationContent.StateEvent.RoomAvatar
         StateEventContent.RoomCanonicalAlias -> NotificationContent.StateEvent.RoomCanonicalAlias
         StateEventContent.RoomCreate -> NotificationContent.StateEvent.RoomCreate
@@ -72,6 +71,7 @@ private fun StateEventContent.toContent(): NotificationContent.StateEvent {
         is StateEventContent.RoomTopic -> NotificationContent.StateEvent.RoomTopic(topic)
         StateEventContent.SpaceChild -> NotificationContent.StateEvent.SpaceChild
         StateEventContent.SpaceParent -> NotificationContent.StateEvent.SpaceParent
+        StateEventContent.BeaconInfo -> NotificationContent.StateEvent.BeaconInfo(senderId)
     }
 }
 
@@ -98,7 +98,10 @@ private fun MessageLikeEventContent.toContent(senderId: UserId): NotificationCon
             is MessageLikeEventContent.ReactionContent -> NotificationContent.MessageLike.ReactionContent(relatedEventId)
             MessageLikeEventContent.RoomEncrypted -> NotificationContent.MessageLike.RoomEncrypted
             is MessageLikeEventContent.RoomMessage -> {
-                NotificationContent.MessageLike.RoomMessage(senderId, EventMessageMapper().mapMessageType(messageType))
+                NotificationContent.MessageLike.RoomMessage(
+                    senderId,
+                    EventMessageMapper().mapMessageType(messageType)
+                )
             }
             is MessageLikeEventContent.RoomRedaction -> NotificationContent.MessageLike.RoomRedaction(
                 redactedEventId = redactedEventId?.let(::EventId),
@@ -106,6 +109,7 @@ private fun MessageLikeEventContent.toContent(senderId: UserId): NotificationCon
             )
             MessageLikeEventContent.Sticker -> NotificationContent.MessageLike.Sticker
             is MessageLikeEventContent.Poll -> NotificationContent.MessageLike.Poll(senderId, question)
+            MessageLikeEventContent.Beacon -> NotificationContent.MessageLike.Beacon
         }
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
index 7da0f14d14..6a88e5051b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notificationsettings/RustNotificationSettingsService.kt
@@ -62,11 +62,11 @@ class RustNotificationSettingsService(
     override suspend fun setDefaultRoomNotificationMode(
         isEncrypted: Boolean,
         mode: RoomNotificationMode,
-        isOneToOne: Boolean
+        isDM: Boolean
     ): Result<Unit> = withContext(dispatchers.io) {
         runCatchingExceptions {
             try {
-                notificationSettings.await().setDefaultRoomNotificationMode(isEncrypted, isOneToOne, mode.let(RoomNotificationSettingsMapper::mapMode))
+                notificationSettings.await().setDefaultRoomNotificationMode(isEncrypted, isDM, mode.let(RoomNotificationSettingsMapper::mapMode))
             } catch (exception: NotificationSettingsException.RuleNotFound) {
                 // `setDefaultRoomNotificationMode` updates multiple rules including unstable rules (e.g. the polls push rules defined in the MSC3930)
                 // since production home servers may not have these rules yet, we drop the RuleNotFound error
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementAction.kt
similarity index 86%
rename from libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt
rename to libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementAction.kt
index f86c57543a..974ae08923 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementAction.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementAction.kt
@@ -6,9 +6,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.matrix.impl.oidc
+package io.element.android.libraries.matrix.impl.oauth
 
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
 import org.matrix.rustcomponents.sdk.AccountManagementAction as RustAccountManagementAction
 
 fun AccountManagementAction.toRustAction(): RustAccountManagementAction {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPaths.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPaths.kt
index 1888cd0f88..8a2403f772 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPaths.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPaths.kt
@@ -8,19 +8,10 @@
 
 package io.element.android.libraries.matrix.impl.paths
 
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.sessionstorage.api.SessionData
 import java.io.File
 
-data class SessionPaths(
-    val fileDirectory: File,
-    val cacheDirectory: File,
-) {
-    fun deleteRecursively() {
-        fileDirectory.deleteRecursively()
-        cacheDirectory.deleteRecursively()
-    }
-}
-
 internal fun SessionData.getSessionPaths(): SessionPaths {
     return SessionPaths(
         fileDirectory = File(sessionPath),
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPathsFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPathsFactory.kt
index d2e519fa9e..f40c134209 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPathsFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/paths/SessionPathsFactory.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.matrix.impl.paths
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.BaseDirectory
 import io.element.android.libraries.di.CacheDirectory
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import java.io.File
 import java.util.UUID
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt
index 860993d4bc..2e2a36c449 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersService.kt
@@ -44,7 +44,8 @@ class RustPushersService(
                     appDisplayName = setHttpPusherData.appDisplayName,
                     deviceDisplayName = setHttpPusherData.deviceDisplayName,
                     profileTag = setHttpPusherData.profileTag,
-                    lang = setHttpPusherData.lang
+                    lang = setHttpPusherData.lang,
+                    append = setHttpPusherData.append,
                 )
             }
                 .mapFailure { it.mapClientException() }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
index 644c5aefc2..68fcf6287c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.matrix.impl.room
 
+import io.element.android.appconfig.TimelineConfig
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.coroutine.childScope
 import io.element.android.libraries.core.extensions.mapFailure
@@ -34,6 +35,7 @@ import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.room.roomNotificationSettings
+import io.element.android.libraries.matrix.api.room.threads.ThreadsListService
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
@@ -43,10 +45,14 @@ import io.element.android.libraries.matrix.impl.mapper.map
 import io.element.android.libraries.matrix.impl.room.history.map
 import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.libraries.matrix.impl.room.knock.RustKnockRequest
+import io.element.android.libraries.matrix.impl.room.location.liveLocationSharesFlow
 import io.element.android.libraries.matrix.impl.room.location.map
+import io.element.android.libraries.matrix.impl.room.location.timedByExpiry
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
+import io.element.android.libraries.matrix.impl.room.threads.RustThreadsListService
 import io.element.android.libraries.matrix.impl.roomdirectory.map
 import io.element.android.libraries.matrix.impl.timeline.RustTimeline
+import io.element.android.libraries.matrix.impl.timeline.item.event.TimelineEventContentMapper
 import io.element.android.libraries.matrix.impl.util.MessageEventContent
 import io.element.android.libraries.matrix.impl.util.mxCallbackFlow
 import io.element.android.libraries.matrix.impl.widget.RustWidgetDriver
@@ -68,7 +74,7 @@ import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
 import org.matrix.rustcomponents.sdk.KnockRequestsListener
-import org.matrix.rustcomponents.sdk.LiveLocationShareListener
+import org.matrix.rustcomponents.sdk.LiveLocationException
 import org.matrix.rustcomponents.sdk.RoomMessageEventMessageType
 import org.matrix.rustcomponents.sdk.RoomSendQueueUpdate
 import org.matrix.rustcomponents.sdk.SendQueueListener
@@ -147,6 +153,12 @@ class JoinedRustRoom(
 
     override val liveTimeline = liveInnerTimeline.map(mode = Timeline.Mode.Live)
 
+    override val threadsListService: ThreadsListService = RustThreadsListService(
+        inner = innerRoom.threadListService(),
+        contentMapper = TimelineEventContentMapper(),
+        roomCoroutineScope = roomCoroutineScope,
+    )
+
     override val syncUpdateFlow = flow {
         var counter = 0L
         liveTimeline.onSyncedEventReceived.collect {
@@ -207,11 +219,18 @@ class JoinedRustRoom(
                     RoomMessageEventMessageType.IMAGE,
                     RoomMessageEventMessageType.VIDEO,
                     RoomMessageEventMessageType.AUDIO,
+                    RoomMessageEventMessageType.GALLERY,
                 )
             )
             is CreateTimelineParams.Focused,
             CreateTimelineParams.PinnedOnly,
-            is CreateTimelineParams.Threaded -> TimelineFilter.All
+            is CreateTimelineParams.Threaded -> {
+                RustTimelineEventFilterFactory().create(
+                    joinRule = roomInfoFlow.value.joinRule,
+                    isEncrypted = roomInfoFlow.value.isEncrypted,
+                    excludedStateTypes = TimelineConfig.excludedEvents,
+                )?.let(TimelineFilter::EventFilter) ?: TimelineFilter.All
+            }
         }
 
         val internalIdPrefix = when (createTimelineParams) {
@@ -337,7 +356,7 @@ class JoinedRustRoom(
         roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Pending(prevRoomNotificationSettings = currentRoomNotificationSettings)
         runCatchingExceptions {
             val isEncrypted = roomInfoFlow.value.isEncrypted ?: getUpdatedIsEncrypted().getOrThrow()
-            notificationSettingsService.getRoomNotificationSettings(roomId, isEncrypted, isOneToOne).getOrThrow()
+            notificationSettingsService.getRoomNotificationSettings(roomId = roomId, isEncrypted = isEncrypted, isOneToOne = isDm()).getOrThrow()
         }.map {
             roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Ready(it)
         }.onFailure {
@@ -410,6 +429,8 @@ class JoinedRustRoom(
                 roomAvatar = roomPowerLevelsValues.roomAvatar,
                 roomTopic = roomPowerLevelsValues.roomTopic,
                 spaceChild = roomPowerLevelsValues.spaceChild,
+                beacon = roomPowerLevelsValues.beacon,
+                beaconInfo = roomPowerLevelsValues.beaconInfo,
             )
             innerRoom.applyPowerLevelChanges(changes)
         }
@@ -504,30 +525,40 @@ class JoinedRustRoom(
     }
 
     override fun subscribeToLiveLocationShares(): Flow<List<LiveLocationShare>> {
-        return mxCallbackFlow {
-            innerRoom.subscribeToLiveLocationShares(object : LiveLocationShareListener {
-                override fun call(liveLocationShares: List<org.matrix.rustcomponents.sdk.LiveLocationShare>) {
-                    trySend(liveLocationShares.map { it.map() })
-                }
-            })
-        }
+        return innerRoom.liveLocationSharesFlow().timedByExpiry(systemClock::epochMillis)
     }
 
-    override suspend fun startLiveLocationShare(durationMillis: Long): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun startLiveLocationShare(durationMillis: Long): Result<EventId> = withContext(roomDispatcher) {
         runCatchingExceptions {
             innerRoom.startLiveLocationShare(durationMillis.toULong())
-        }
+        }.map(::EventId)
     }
 
     override suspend fun stopLiveLocationShare(): Result<Unit> = withContext(roomDispatcher) {
         runCatchingExceptions {
             innerRoom.stopLiveLocationShare()
+        }.mapFailure { throwable ->
+            when (throwable) {
+                is LiveLocationException -> throwable.map()
+                else -> throwable
+            }
         }
     }
 
     override suspend fun sendLiveLocation(geoUri: String): Result<Unit> = withContext(roomDispatcher) {
         runCatchingExceptions {
             innerRoom.sendLiveLocation(geoUri)
+        }.mapFailure { throwable ->
+            when (throwable) {
+                is LiveLocationException -> throwable.map()
+                else -> throwable
+            }
+        }
+    }
+
+    override suspend fun setOwnMemberDisplayName(displayName: String): Result<Unit> = withContext(roomDispatcher) {
+        runCatchingExceptions {
+            innerRoom.setOwnMemberDisplayName(displayName)
         }
     }
 
@@ -535,7 +566,8 @@ class JoinedRustRoom(
 
     override fun destroy() {
         baseRoom.destroy()
-        liveInnerTimeline.destroy()
+        liveTimeline.close()
+        threadsListService.destroy()
         Timber.d("Room $roomId destroyed")
     }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
index 47b37b7923..bb1460863f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt
@@ -9,7 +9,8 @@
 package io.element.android.libraries.matrix.impl.room
 
 import io.element.android.libraries.matrix.api.room.MessageEventType
-import org.matrix.rustcomponents.sdk.MessageLikeEventType
+import uniffi.ruma_events.MessageLikeEventType
+import uniffi.ruma_events.messageLikeEventTypeFromString
 
 fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.Audio -> MessageLikeEventType.Audio
@@ -51,7 +52,7 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.UnstablePollStart -> MessageLikeEventType.UnstablePollStart
     MessageEventType.Video -> MessageLikeEventType.Video
     MessageEventType.Voice -> MessageLikeEventType.Voice
-    is MessageEventType.Other -> MessageLikeEventType.Other(type)
+    is MessageEventType.Other -> messageLikeEventTypeFromString(type)
 }
 
 fun MessageLikeEventType.map(): MessageEventType = when (this) {
@@ -94,5 +95,5 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
     MessageLikeEventType.RtcDecline -> MessageEventType.RtcDecline
     MessageLikeEventType.Video -> MessageEventType.Video
     MessageLikeEventType.Voice -> MessageEventType.Voice
-    is MessageLikeEventType.Other -> MessageEventType.Other(v1)
+    is MessageLikeEventType.Custom -> MessageEventType.Other(type = toString())
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
index e000c2f916..39cde68c31 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomContentForwarder.kt
@@ -49,7 +49,7 @@ class RoomContentForwarder(
         val content = (messageLikeContent.kind as? MsgLikeKind.Message)?.content
             ?: throw ForwardEventException(toRoomIds)
 
-        val targetRooms = toRoomIds.mapNotNull { roomId -> roomListService.roomOrNull(roomId.value) }
+        val targetRooms = toRoomIds.toSet().mapNotNull { roomId -> roomListService.roomOrNull(roomId.value) }
         val failedForwardingTo = mutableSetOf<RoomId>()
         targetRooms.parallelMap { room ->
             room.use { targetRoom ->
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExt.kt
index 668cfc46df..4c8da1aca7 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExt.kt
@@ -18,7 +18,7 @@ import org.matrix.rustcomponents.sdk.RoomInfo
  */
 fun RoomInfo.elementHeroes(): List<MatrixUser> {
     return heroes
-        .takeIf { isDirect && activeMembersCount.toLong() == 2L }
+        .takeIf { isDm }
         ?.takeIf { it.size == 1 }
         ?.map { it.map() }
         .orEmpty()
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
index deca0f8ee6..a972b3c130 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
@@ -43,6 +43,7 @@ class RoomInfoMapper {
             avatarUrl = it.avatarUrl,
             isPublic = it.isPublic,
             isDirect = it.isDirect,
+            isDm = it.isDm,
             isEncrypted = when (it.encryptionState) {
                 EncryptionState.ENCRYPTED -> true
                 EncryptionState.NOT_ENCRYPTED -> false
@@ -76,6 +77,7 @@ class RoomInfoMapper {
             privilegedCreatorRole = it.privilegedCreatorsRole,
             isLowPriority = it.isLowPriority,
             activeCallIntentConsensus = it.activeRoomCallConsensusIntent.map(),
+            fullyReadEventId = it.fullyReadEventId?.let(::EventId)
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
index e73bed084e..7c5cd10658 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
@@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPermissions
 import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsValues
 import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom
@@ -119,7 +118,7 @@ class RustBaseRoom(
                 innerRoom.membersNoSync().use { members ->
                     members.nextChunk(members.len())
                         ?.map(RoomMemberMapper::map)
-                        ?.firstOrNull { roomMember -> roomMember.userId != sessionId && roomMember.membership.isActive() }
+                        ?.firstOrNull { roomMember -> !roomMember.isServiceMember && roomMember.userId != sessionId && roomMember.membership.isActive() }
                 }
             } else {
                 null
@@ -201,12 +200,6 @@ class RustBaseRoom(
         }
     }
 
-    override suspend fun clearEventCacheStorage(): Result<Unit> = withContext(roomDispatcher) {
-        runCatchingExceptions {
-            innerRoom.clearEventCacheStorage()
-        }
-    }
-
     override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> = withContext(roomDispatcher) {
         runCatchingExceptions {
             innerRoom.setIsFavourite(isFavorite, null)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
index a3af54863c..b5f9c3ee80 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -21,11 +21,11 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.awaitLoaded
+import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
 import io.element.android.libraries.matrix.impl.roomlist.roomOrNull
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
-import io.element.android.services.analytics.api.inBridgeSdkSpan
 import io.element.android.services.analytics.api.recordTransaction
 import io.element.android.services.analyticsproviders.api.recordChildTransaction
 import io.element.android.services.toolbox.api.systemclock.SystemClock
@@ -42,6 +42,7 @@ import org.matrix.rustcomponents.sdk.TimelineConfiguration
 import org.matrix.rustcomponents.sdk.TimelineFilter
 import org.matrix.rustcomponents.sdk.TimelineFocus
 import timber.log.Timber
+import uniffi.matrix_sdk_base.EncryptionState
 import uniffi.matrix_sdk_ui.TimelineReadReceiptTracking
 import java.util.concurrent.atomic.AtomicBoolean
 import org.matrix.rustcomponents.sdk.RoomListService as InnerRoomListService
@@ -67,12 +68,6 @@ class RustRoomFactory(
     private val mutex = Mutex()
     private val isDestroyed: AtomicBoolean = AtomicBoolean(false)
 
-    private val eventFilters = TimelineConfig.excludedEvents
-        .takeIf { it.isNotEmpty() }
-        ?.let { listStateEventType ->
-            timelineEventFilterFactory.create(listStateEventType)
-        }
-
     suspend fun destroy() {
         withContext(NonCancellable + dispatcher) {
             mutex.withLock {
@@ -128,19 +123,27 @@ class RustRoomFactory(
                     val timeline = transaction.recordChildTransaction(
                         operation = "sdkRoom.timelineWithConfiguration",
                         description = "Get timeline from the SDK",
-                    ) { timelineTransaction ->
-                        analyticsService.inBridgeSdkSpan(parentTraceId = timelineTransaction.traceId()) {
-                            sdkRoom.timelineWithConfiguration(
-                                TimelineConfiguration(
-                                    focus = TimelineFocus.Live(hideThreadedEvents = hideThreadedEvents),
-                                    filter = eventFilters?.let(TimelineFilter::EventFilter) ?: TimelineFilter.All,
-                                    internalIdPrefix = "live",
-                                    dateDividerMode = DateDividerMode.DAILY,
-                                    trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS,
-                                    reportUtds = true,
-                                )
-                            )
+                    ) {
+                        val isEncrypted = when (roomInfo.encryptionState) {
+                            EncryptionState.ENCRYPTED -> true
+                            EncryptionState.NOT_ENCRYPTED -> false
+                            EncryptionState.UNKNOWN -> null
                         }
+                        val timelineFilter = timelineEventFilterFactory.create(
+                            joinRule = roomInfo.joinRule?.map(),
+                            isEncrypted = isEncrypted,
+                            excludedStateTypes = TimelineConfig.excludedEvents,
+                        )
+                        sdkRoom.timelineWithConfiguration(
+                            TimelineConfiguration(
+                                focus = TimelineFocus.Live(hideThreadedEvents = hideThreadedEvents),
+                                filter = timelineFilter?.let(TimelineFilter::EventFilter) ?: TimelineFilter.All,
+                                internalIdPrefix = "live",
+                                dateDividerMode = DateDividerMode.DAILY,
+                                trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS,
+                                reportUtds = true,
+                            )
+                        )
                     }
 
                     GetRoomResult.Joined(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
index 76fea0beef..13a040525e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
@@ -9,14 +9,14 @@
 package io.element.android.libraries.matrix.impl.room
 
 import io.element.android.libraries.matrix.api.room.StateEventType
-import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
+import uniffi.ruma_events.stateEventTypeFromString
+import uniffi.ruma_events.StateEventType as RustStateEventType
 
 fun StateEventType.map(): RustStateEventType = when (this) {
     StateEventType.PolicyRuleRoom -> RustStateEventType.PolicyRuleRoom
     StateEventType.PolicyRuleServer -> RustStateEventType.PolicyRuleServer
     StateEventType.PolicyRuleUser -> RustStateEventType.PolicyRuleUser
     StateEventType.CallMember -> RustStateEventType.CallMember
-    StateEventType.RoomAliases -> RustStateEventType.RoomAliases
     StateEventType.RoomAvatar -> RustStateEventType.RoomAvatar
     StateEventType.RoomCanonicalAlias -> RustStateEventType.RoomCanonicalAlias
     StateEventType.RoomCreate -> RustStateEventType.RoomCreate
@@ -24,7 +24,7 @@ fun StateEventType.map(): RustStateEventType = when (this) {
     StateEventType.RoomGuestAccess -> RustStateEventType.RoomGuestAccess
     StateEventType.RoomHistoryVisibility -> RustStateEventType.RoomHistoryVisibility
     StateEventType.RoomJoinRules -> RustStateEventType.RoomJoinRules
-    StateEventType.RoomMemberEvent -> RustStateEventType.RoomMemberEvent
+    StateEventType.RoomMemberEvent -> RustStateEventType.RoomMember
     StateEventType.RoomName -> RustStateEventType.RoomName
     StateEventType.RoomPinnedEvents -> RustStateEventType.RoomPinnedEvents
     StateEventType.RoomPowerLevels -> RustStateEventType.RoomPowerLevels
@@ -38,7 +38,8 @@ fun StateEventType.map(): RustStateEventType = when (this) {
     StateEventType.MemberHints -> RustStateEventType.MemberHints
     StateEventType.RoomImagePack -> RustStateEventType.RoomImagePack
     StateEventType.RoomLanguage -> RustStateEventType.RoomLanguage
-    is StateEventType.Custom -> RustStateEventType.Custom(type)
+    StateEventType.RoomPolicy -> RustStateEventType.RoomPolicy
+    is StateEventType.Custom -> stateEventTypeFromString(type)
 }
 
 fun RustStateEventType.map(): StateEventType = when (this) {
@@ -46,7 +47,6 @@ fun RustStateEventType.map(): StateEventType = when (this) {
     RustStateEventType.PolicyRuleServer -> StateEventType.PolicyRuleServer
     RustStateEventType.PolicyRuleUser -> StateEventType.PolicyRuleUser
     RustStateEventType.CallMember -> StateEventType.CallMember
-    RustStateEventType.RoomAliases -> StateEventType.RoomAliases
     RustStateEventType.RoomAvatar -> StateEventType.RoomAvatar
     RustStateEventType.RoomCanonicalAlias -> StateEventType.RoomCanonicalAlias
     RustStateEventType.RoomCreate -> StateEventType.RoomCreate
@@ -54,7 +54,7 @@ fun RustStateEventType.map(): StateEventType = when (this) {
     RustStateEventType.RoomGuestAccess -> StateEventType.RoomGuestAccess
     RustStateEventType.RoomHistoryVisibility -> StateEventType.RoomHistoryVisibility
     RustStateEventType.RoomJoinRules -> StateEventType.RoomJoinRules
-    RustStateEventType.RoomMemberEvent -> StateEventType.RoomMemberEvent
+    RustStateEventType.RoomMember -> StateEventType.RoomMemberEvent
     RustStateEventType.RoomName -> StateEventType.RoomName
     RustStateEventType.RoomPinnedEvents -> StateEventType.RoomPinnedEvents
     RustStateEventType.RoomPowerLevels -> StateEventType.RoomPowerLevels
@@ -68,5 +68,6 @@ fun RustStateEventType.map(): StateEventType = when (this) {
     RustStateEventType.MemberHints -> StateEventType.MemberHints
     RustStateEventType.RoomImagePack -> StateEventType.RoomImagePack
     RustStateEventType.RoomLanguage -> StateEventType.RoomLanguage
-    is RustStateEventType.Custom -> StateEventType.Custom(value)
+    RustStateEventType.RoomPolicy -> StateEventType.RoomPolicy
+    is RustStateEventType.Custom -> StateEventType.Custom(this.toString())
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
index b4735fdaf3..a966acaa2b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
@@ -11,20 +11,45 @@ package io.element.android.libraries.matrix.impl.room
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.join.JoinRule
+import org.matrix.rustcomponents.sdk.FilterTimelineEventCondition
 import org.matrix.rustcomponents.sdk.FilterTimelineEventType
 import org.matrix.rustcomponents.sdk.TimelineEventFilter
+import uniffi.matrix_sdk_ui.MembershipChangeFilter
 
 interface TimelineEventFilterFactory {
-    fun create(listStateEventType: List<StateEventType>): TimelineEventFilter
+    fun create(
+        joinRule: JoinRule?,
+        isEncrypted: Boolean?,
+        excludedStateTypes: List<StateEventType>
+    ): TimelineEventFilter?
 }
 
 @ContributesBinding(AppScope::class)
 class RustTimelineEventFilterFactory : TimelineEventFilterFactory {
-    override fun create(listStateEventType: List<StateEventType>): TimelineEventFilter {
-        return TimelineEventFilter.excludeEventTypes(
-            listStateEventType.map { stateEventType ->
-                FilterTimelineEventType.State(stateEventType.map())
-            }
-        )
+    override fun create(
+        joinRule: JoinRule?,
+        isEncrypted: Boolean?,
+        excludedStateTypes: List<StateEventType>
+    ): TimelineEventFilter? {
+        val excludedEventTypes = excludedStateTypes.map {
+            FilterTimelineEventCondition.EventType(FilterTimelineEventType.State(it.map()))
+        }
+        // If the room is publicly joinable and not encrypted, we also want to exclude membership changes and profile changes,
+        // as they will pollute the timelines since they're quite common and not add much value.
+        val excludedMembershipChanges = if (joinRule !is JoinRule.Invite && isEncrypted == false) {
+            listOf(
+                FilterTimelineEventCondition.MembershipChange(MembershipChangeFilter.JOIN),
+                FilterTimelineEventCondition.MembershipChange(MembershipChangeFilter.LEAVE),
+                FilterTimelineEventCondition.ProfileChange,
+            )
+        } else {
+            emptyList()
+        }
+        return if (excludedEventTypes.isNotEmpty() || excludedMembershipChanges.isNotEmpty()) {
+            TimelineEventFilter.exclude(excludedEventTypes + excludedMembershipChanges)
+        } else {
+            null
+        }
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/BeaconInfoUpdates.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/BeaconInfoUpdates.kt
new file mode 100644
index 0000000000..44be305c02
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/BeaconInfoUpdates.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.location
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.location.BeaconInfoUpdate
+import org.matrix.rustcomponents.sdk.BeaconInfoUpdate as RustBeaconInfoUpdate
+
+fun RustBeaconInfoUpdate.map(): BeaconInfoUpdate {
+    return BeaconInfoUpdate(
+        roomId = RoomId(roomId),
+        beaconId = EventId(eventId),
+        isLive = live
+    )
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationException.kt
new file mode 100644
index 0000000000..b10f5cd41c
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationException.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.location
+
+import io.element.android.libraries.matrix.api.room.location.LiveLocationException
+import org.matrix.rustcomponents.sdk.LiveLocationException as RustLiveLocationException
+
+fun RustLiveLocationException.map(): LiveLocationException {
+    return when (this) {
+        is RustLiveLocationException.Network -> LiveLocationException.Network()
+        is RustLiveLocationException.NotLive -> LiveLocationException.NotLive()
+        else -> LiveLocationException.Other(this)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationShareMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationShareMapper.kt
deleted file mode 100644
index 3b80c1c61f..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationShareMapper.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.room.location
-
-import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
-import org.matrix.rustcomponents.sdk.LiveLocationShare as RustLiveLocationShare
-
-fun RustLiveLocationShare.map(): LiveLocationShare {
-    return LiveLocationShare(
-        userId = UserId(userId),
-        lastGeoUri = lastLocation.location.geoUri,
-        lastTimestamp = lastLocation.ts.toLong(),
-        isLive = isLive,
-    )
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt
new file mode 100644
index 0000000000..8e8181539f
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.location
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.location.LastLocation
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+import io.element.android.libraries.matrix.impl.util.cancelAndDestroy
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.buffer
+import kotlinx.coroutines.flow.callbackFlow
+import org.matrix.rustcomponents.sdk.LiveLocationShareUpdate
+import org.matrix.rustcomponents.sdk.LiveLocationsListener
+import org.matrix.rustcomponents.sdk.RoomInterface
+import org.matrix.rustcomponents.sdk.LiveLocationShare as RustLiveLocationShare
+
+fun RoomInterface.liveLocationSharesFlow(): Flow<List<LiveLocationShare>> {
+    fun MutableList<LiveLocationShare>.applyUpdate(update: LiveLocationShareUpdate) {
+        when (update) {
+            is LiveLocationShareUpdate.Append -> addAll(update.values.map { it.into() })
+            is LiveLocationShareUpdate.Clear -> clear()
+            is LiveLocationShareUpdate.Insert -> add(update.index.toInt(), update.value.into())
+            is LiveLocationShareUpdate.PopBack -> if (isNotEmpty()) removeAt(lastIndex)
+            is LiveLocationShareUpdate.PopFront -> if (isNotEmpty()) removeAt(0)
+            is LiveLocationShareUpdate.PushBack -> add(update.value.into())
+            is LiveLocationShareUpdate.PushFront -> add(0, update.value.into())
+            is LiveLocationShareUpdate.Remove -> removeAt(update.index.toInt())
+            is LiveLocationShareUpdate.Reset -> {
+                clear()
+                addAll(update.values.map { it.into() })
+            }
+            is LiveLocationShareUpdate.Set -> set(update.index.toInt(), update.value.into())
+            is LiveLocationShareUpdate.Truncate -> subList(update.length.toInt(), size).clear()
+        }
+    }
+    return callbackFlow {
+        val observer = liveLocationsObserver()
+        val shares: MutableList<LiveLocationShare> = ArrayList()
+        val taskHandle = observer.subscribe(object : LiveLocationsListener {
+            override fun onUpdate(updates: List<LiveLocationShareUpdate>) {
+                for (update in updates) {
+                    shares.applyUpdate(update)
+                }
+                trySend(shares)
+            }
+        })
+        awaitClose {
+            taskHandle.cancelAndDestroy()
+            observer.destroy()
+        }
+    }.buffer(Channel.UNLIMITED)
+}
+
+private fun RustLiveLocationShare.into(): LiveLocationShare {
+    return LiveLocationShare(
+        beaconId = EventId(beaconId),
+        userId = UserId(userId),
+        lastLocation = lastLocation?.let {
+            LastLocation(
+                geoUri = it.location.geoUri,
+                timestamp = it.ts.toLong(),
+                assetType = it.location.asset.into(),
+            )
+        },
+        startTimestamp = startTs.toLong(),
+        endTimestamp = (startTs + timeout).toLong(),
+    )
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt
new file mode 100644
index 0000000000..9bfddf280f
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.location
+
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.launch
+
+/**
+ * Makes sure to filter and emit live location based on the endTimestamp.
+ */
+internal fun Flow<List<LiveLocationShare>>.timedByExpiry(
+    currentTimeMillis: () -> Long = System::currentTimeMillis,
+): Flow<List<LiveLocationShare>> = channelFlow {
+    var timerJob: Job? = null
+
+    fun List<LiveLocationShare>.nextExpiryAfter(timestamp: Long): Long? {
+        return this
+            .asSequence()
+            .map { it.endTimestamp }
+            .filter { it > timestamp }
+            .minOrNull()
+    }
+
+    fun List<LiveLocationShare>.filterLive(): List<LiveLocationShare> {
+        val currentTimeMillis = currentTimeMillis()
+        return filter { it.endTimestamp > currentTimeMillis }
+    }
+
+    fun reschedule(shares: List<LiveLocationShare>) {
+        timerJob?.cancel()
+        timerJob = launch {
+            val currentTimeMillis = currentTimeMillis()
+            val nextExpiry = shares.nextExpiryAfter(currentTimeMillis) ?: return@launch
+            delay((nextExpiry - currentTimeMillis).coerceAtLeast(0))
+            val liveShares = shares.filterLive()
+            send(liveShares)
+            reschedule(liveShares)
+        }
+    }
+
+    collect { shares ->
+        val liveShares = shares.filterLive()
+        send(liveShares)
+        reschedule(liveShares)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt
index 447fa427a6..b2a530f806 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt
@@ -28,7 +28,10 @@ object RoomMemberMapper {
             powerLevel = powerLevel,
             isIgnored = roomMember.isIgnored,
             role = mapRole(roomMember.suggestedRoleForPowerLevel, powerLevel),
-            membershipChangeReason = roomMember.membershipChangeReason
+            membershipChangeReason = roomMember.membershipChangeReason,
+            isServiceMember = roomMember.isServiceMember,
+            // TODO map this value when available
+            displayedStatus = null,
         )
     }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapper.kt
index 5e2a1c82da..499868795a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapper.kt
@@ -26,6 +26,8 @@ object RoomPowerLevelsValuesMapper {
             roomAvatar = values.roomAvatar,
             roomTopic = values.roomTopic,
             spaceChild = values.spaceChild,
+            beacon = values.beacon,
+            beaconInfo = values.beaconInfo,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListService.kt
new file mode 100644
index 0000000000..a74c5bc378
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListService.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.threads
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItem
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItemEvent
+import io.element.android.libraries.matrix.api.room.threads.ThreadListPaginationStatus
+import io.element.android.libraries.matrix.api.room.threads.ThreadsListService
+import io.element.android.libraries.matrix.impl.timeline.item.event.TimelineEventContentMapper
+import io.element.android.libraries.matrix.impl.timeline.item.event.map
+import io.element.android.libraries.matrix.impl.util.mxCallbackFlow
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.onStart
+import org.matrix.rustcomponents.sdk.ThreadListEntriesListener
+import org.matrix.rustcomponents.sdk.ThreadListPaginationStateListener
+import org.matrix.rustcomponents.sdk.ThreadListUpdate
+import uniffi.matrix_sdk_ui.ThreadListPaginationState
+import org.matrix.rustcomponents.sdk.ThreadListService as InnerThreadListService
+
+class RustThreadsListService(
+    private val inner: InnerThreadListService,
+    private val roomCoroutineScope: CoroutineScope,
+    private val contentMapper: TimelineEventContentMapper = TimelineEventContentMapper(),
+) : ThreadsListService {
+    private var itemSubscriptionJob: Job? = null
+
+    private val items = MutableStateFlow<List<ThreadListItem>>(emptyList())
+
+    override fun subscribeToItemUpdates(): Flow<List<ThreadListItem>> {
+        if (itemSubscriptionJob?.isActive != true) {
+            itemSubscriptionJob = doSubscribeToItemUpdates()
+        }
+
+        return items
+    }
+
+    private fun doSubscribeToItemUpdates(): Job {
+        val updatesFlow = mxCallbackFlow {
+            inner.subscribeToItemsUpdates(object : ThreadListEntriesListener {
+                override fun onUpdate(diff: List<ThreadListUpdate>) {
+                    trySend(diff)
+                }
+            })
+        }
+
+        return updatesFlow
+            .onStart { items.value = inner.items().map { it.map(contentMapper) } }
+            .onEach { diff ->
+                val updated = items.value.toMutableList()
+                updated.apply(diff, contentMapper)
+                items.value = updated
+            }
+            .launchIn(roomCoroutineScope)
+    }
+
+    override fun subscribeToPaginationUpdates(): Flow<ThreadListPaginationStatus> {
+        return mxCallbackFlow {
+            inner.subscribeToPaginationStateUpdates(object : ThreadListPaginationStateListener {
+                override fun onUpdate(state: ThreadListPaginationState) {
+                    trySend(state.map())
+                }
+            }).also {
+                // Send the initial state
+                trySend(inner.paginationState().map())
+            }
+        }
+    }
+
+    override suspend fun paginate(): Result<Unit> = runCatchingExceptions {
+        inner.paginate()
+    }
+
+    override suspend fun reset(): Result<Unit> = runCatchingExceptions {
+        inner.reset()
+    }
+
+    override fun destroy() {
+        itemSubscriptionJob?.cancel()
+        inner.destroy()
+    }
+}
+
+private fun MutableList<ThreadListItem>.apply(
+    diff: List<ThreadListUpdate>,
+    contentMapper: TimelineEventContentMapper
+) {
+    for (diffItem in diff) {
+        when (diffItem) {
+            is ThreadListUpdate.Append -> {
+                val newItems = diffItem.values.map { it.map(contentMapper) }
+                addAll(newItems)
+            }
+            ThreadListUpdate.Clear -> clear()
+            is ThreadListUpdate.Insert -> {
+                add(diffItem.index.toInt(), diffItem.value.map(contentMapper))
+            }
+            ThreadListUpdate.PopBack -> {
+                removeAt(lastIndex)
+            }
+            ThreadListUpdate.PopFront -> {
+                removeAt(0)
+            }
+            is ThreadListUpdate.PushBack -> {
+                add(diffItem.value.map(contentMapper))
+            }
+            is ThreadListUpdate.PushFront -> {
+                add(0, diffItem.value.map(contentMapper))
+            }
+            is ThreadListUpdate.Remove -> {
+                removeAt(diffItem.index.toInt())
+            }
+            is ThreadListUpdate.Reset -> {
+                clear()
+                addAll(diffItem.values.map { it.map(contentMapper) })
+            }
+            is ThreadListUpdate.Set -> {
+                set(diffItem.index.toInt(), diffItem.value.map(contentMapper))
+            }
+            is ThreadListUpdate.Truncate -> {
+                subList(diffItem.length.toInt(), size).clear()
+            }
+        }
+    }
+}
+
+fun org.matrix.rustcomponents.sdk.ThreadListItem.map(contentMapper: TimelineEventContentMapper): ThreadListItem = ThreadListItem(
+    rootEvent = rootEvent.map(contentMapper),
+    latestEvent = latestEvent?.map(contentMapper),
+    numberOfReplies = numReplies.toLong(),
+)
+
+fun org.matrix.rustcomponents.sdk.ThreadListItemEvent.map(contentMapper: TimelineEventContentMapper): ThreadListItemEvent = ThreadListItemEvent(
+    eventId = EventId(eventId),
+    senderId = UserId(sender),
+    isOwn = isOwn,
+    senderProfile = senderProfile.map(),
+    content = content?.let(contentMapper::map),
+    timestamp = timestamp.toLong(),
+)
+
+fun ThreadListPaginationState.map(): ThreadListPaginationStatus = when (this) {
+    is ThreadListPaginationState.Idle -> ThreadListPaginationStatus.Idle(hasMoreToLoad = !endReached)
+    ThreadListPaginationState.Loading -> ThreadListPaginationStatus.Loading
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListEntriesUpdateExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListEntriesUpdateExt.kt
index 27b19ebf19..5d8367bb99 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListEntriesUpdateExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListEntriesUpdateExt.kt
@@ -16,25 +16,25 @@ import org.matrix.rustcomponents.sdk.RoomListEntriesUpdate
 internal fun RoomListEntriesUpdate.describe(): String {
     return when (this) {
         is RoomListEntriesUpdate.Set -> {
-            "Set #$index to '${value.displayName()}'"
+            "Set #$index to '${value.id()}'"
         }
         is RoomListEntriesUpdate.Append -> {
-            "Append ${values.map { "'" + it.displayName() + "'" }}"
+            "Append ${values.map { "'" + it.id() + "'" }}"
         }
         is RoomListEntriesUpdate.PushBack -> {
-            "PushBack '${value.displayName()}'"
+            "PushBack '${value.id()}'"
         }
         is RoomListEntriesUpdate.PushFront -> {
-            "PushFront '${value.displayName()}'"
+            "PushFront '${value.id()}'"
         }
         is RoomListEntriesUpdate.Insert -> {
-            "Insert at #$index: '${value.displayName()}'"
+            "Insert at #$index: '${value.id()}'"
         }
         is RoomListEntriesUpdate.Remove -> {
             "Remove #$index"
         }
         is RoomListEntriesUpdate.Reset -> {
-            "Reset all to ${values.map { "'" + it.displayName() + "'" }}"
+            "Reset all to ${values.map { "'" + it.id() + "'" }}"
         }
         RoomListEntriesUpdate.PopBack -> {
             "PopBack"
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
index 968a768fa2..afdac3db12 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt
@@ -112,6 +112,11 @@ class RoomSummaryListProcessor(
     private suspend fun updateRoomSummaries(updates: List<RoomListEntriesUpdate>, block: suspend MutableList<RoomSummary>.() -> Unit) = withContext(
         coroutineContext
     ) {
+        // Capture the description before applying updates: applyUpdate consumes each Room via
+        // `entry.use { ... }` which destroys it, and the duplicate-detection branch below reads
+        // id() through `describe()`. Without this capture the trackError call crashes before it
+        // can be reported.
+        val updatesDescription = updates.description()
         mutex.withLock {
             val current = roomSummaries.replayCache.lastOrNull()
             val mutableRoomSummaries = current.orEmpty().toMutableList()
@@ -126,7 +131,7 @@ class RoomSummaryListProcessor(
                     analyticsService.trackError(
                         IllegalStateException(
                             "Found duplicates in room summaries after a list update from the SDK: $duplicates. " +
-                                "Updates: ${updates.description()}"
+                                "Updates: $updatesDescription"
                         )
                     )
                 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/DefaultContentScannerUrlProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/DefaultContentScannerUrlProvider.kt
new file mode 100644
index 0000000000..b43dcfb3e8
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/DefaultContentScannerUrlProvider.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.scanner
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.scanner.ContentScannerUrlProvider
+
+/**
+ * Default FOSS implementation of [ContentScannerUrlProvider] that returns `null` for the content scanner URL.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultContentScannerUrlProvider : ContentScannerUrlProvider {
+    override suspend fun getContentScannerUrl(homeserver: String): Result<String?> = Result.success(null)
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScanner.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScanner.kt
new file mode 100644
index 0000000000..c07ca94f26
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScanner.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.scanner
+
+import io.element.android.libraries.core.extensions.mapFailure
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.impl.exception.mapClientException
+import org.matrix.rustcomponents.sdk.Client
+import org.matrix.rustcomponents.sdk.NoHandle
+import org.matrix.rustcomponents.sdk.ContentScanner as RustScanner
+import org.matrix.rustcomponents.sdk.MediaSource as RustMediaSource
+
+class RustContentScanner(
+    private val client: Client,
+    private val rustScanner: RustScanner,
+) : ContentScanner {
+    override suspend fun scan(mediaSource: MediaSource): Result<Boolean> {
+        return runCatchingExceptions {
+            rustScanner.scan(client, mediaSource.toRustMediaSource()).clean
+        }.mapFailure {
+            it.mapClientException()
+        }
+    }
+}
+
+private fun MediaSource.toRustMediaSource(): RustMediaSource {
+    val json = this.json
+    return try {
+        if (json != null) {
+            RustMediaSource.fromJson(json)
+        } else {
+            RustMediaSource.fromUrl(safeUrl)
+        }
+    } catch (e: LinkageError) {
+        // Used for tests, since we can't instantiate an actual `RustMediaSource` because the native library can't be loaded
+        val isTest = runCatchingExceptions { Class.forName("org.junit.Test") }.isSuccess
+        if (isTest) RustMediaSource(NoHandle) else throw e
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultMapper.kt
new file mode 100644
index 0000000000..033d0fc911
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultMapper.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.impl.timeline.item.event.TimelineEventContentMapper
+import io.element.android.libraries.matrix.impl.timeline.item.event.map
+import org.matrix.rustcomponents.sdk.SearchServiceResult
+
+class MessageSearchResultMapper(
+    private val contentMapper: TimelineEventContentMapper = TimelineEventContentMapper(),
+) {
+    /**
+     * Note: [TimelineEventContentMapper.map] consumes (and destroys) the content, so each result
+     * must be mapped exactly once.
+     */
+    fun map(result: SearchServiceResult): MessageSearchResult {
+        // Exhaustive on purpose, with no `else`: a new SDK result kind must fail compilation here
+        // rather than being silently dropped, which would desync our list from the SDK's indices.
+        return when (result) {
+            is SearchServiceResult.Message -> MessageSearchResult(
+                roomId = RoomId(result.roomId),
+                eventId = EventId(result.result.eventId),
+                senderId = UserId(result.result.sender),
+                senderProfile = result.result.senderProfile.map(),
+                content = contentMapper.map(result.result.content),
+                timestamp = result.result.timestamp.toLong(),
+            )
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessor.kt
new file mode 100644
index 0000000000..58c5f6b01c
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessor.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.SearchServiceResultsUpdate
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Applies the SDK's diff stream to a local list of search results.
+ *
+ * The local list is kept strictly index-parallel to the SDK's: every result is mapped, nothing is
+ * filtered or dropped, so the positional updates ([SearchServiceResultsUpdate.Insert],
+ * [SearchServiceResultsUpdate.Set], [SearchServiceResultsUpdate.Remove],
+ * [SearchServiceResultsUpdate.Truncate]) always address the slot the SDK meant. Filtering for
+ * display, if ever needed, belongs at render time — not here.
+ */
+class MessageSearchResultsProcessor(
+    private val results: MutableSharedFlow<List<MessageSearchResult>>,
+    private val coroutineContext: CoroutineContext,
+    private val mapper: MessageSearchResultMapper = MessageSearchResultMapper(),
+) {
+    private val mutex = Mutex()
+
+    suspend fun postUpdates(updates: List<SearchServiceResultsUpdate>) = withContext(coroutineContext) {
+        mutex.withLock {
+            val current = results.replayCache.lastOrNull().orEmpty().toMutableList()
+            updates.forEach { update ->
+                current.applyUpdate(update)
+            }
+            results.emit(current)
+        }
+    }
+
+    private fun MutableList<MessageSearchResult>.applyUpdate(update: SearchServiceResultsUpdate) {
+        // Exhaustive on purpose, with no `else`: a future SDK bump adding a variant must fail
+        // compilation rather than silently dropping updates and corrupting the list.
+        when (update) {
+            is SearchServiceResultsUpdate.Append -> {
+                addAll(update.values.map(mapper::map))
+            }
+            is SearchServiceResultsUpdate.PushBack -> {
+                add(mapper.map(update.value))
+            }
+            is SearchServiceResultsUpdate.PushFront -> {
+                add(0, mapper.map(update.value))
+            }
+            is SearchServiceResultsUpdate.Set -> {
+                this[update.index.toInt()] = mapper.map(update.value)
+            }
+            is SearchServiceResultsUpdate.Insert -> {
+                add(update.index.toInt(), mapper.map(update.value))
+            }
+            is SearchServiceResultsUpdate.Remove -> {
+                removeAt(update.index.toInt())
+            }
+            is SearchServiceResultsUpdate.Truncate -> {
+                subList(update.length.toInt(), size).clear()
+            }
+            is SearchServiceResultsUpdate.Reset -> {
+                clear()
+                addAll(update.values.map(mapper::map))
+            }
+            SearchServiceResultsUpdate.PopBack -> {
+                removeLastOrNull()
+            }
+            SearchServiceResultsUpdate.PopFront -> {
+                removeFirstOrNull()
+            }
+            SearchServiceResultsUpdate.Clear -> {
+                clear()
+            }
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearch.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearch.kt
new file mode 100644
index 0000000000..9116c88cc7
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearch.kt
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.search.MessageSearch
+import io.element.android.libraries.matrix.api.search.MessageSearchPaginationState
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.impl.util.TaskHandleBag
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.job
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.SearchServiceInterface
+import org.matrix.rustcomponents.sdk.SearchServicePaginationStateListener
+import org.matrix.rustcomponents.sdk.SearchServiceResultsListener
+import org.matrix.rustcomponents.sdk.SearchServiceResultsUpdate
+import uniffi.matrix_sdk_ui.SearchServicePaginationState
+
+/**
+ * Wraps the SDK's stateful [SearchServiceInterface] as a single search cursor.
+ *
+ * Lifecycle: the caller's [CoroutineScope] owns this instance. When that scope completes, both
+ * subscription [org.matrix.rustcomponents.sdk.TaskHandle]s are cancelled and [onClose] releases the
+ * underlying service — the handles must be retained until then, or the Rust side drops the
+ * subscription.
+ *
+ * PII: search queries and message bodies are never logged.
+ */
+class RustMessageSearch(
+    private val inner: SearchServiceInterface,
+    private val onClose: () -> Unit,
+    scope: CoroutineScope,
+    private val dispatcher: CoroutineDispatcher,
+    private val roomId: RoomId? = null,
+) : MessageSearch {
+    private val innerResults = MutableStateFlow<List<MessageSearchResult>>(emptyList())
+    private val processor = MessageSearchResultsProcessor(
+        results = innerResults,
+        coroutineContext = dispatcher,
+    )
+    private val taskHandles = TaskHandleBag()
+    private val subscriptionMutex = Mutex()
+    private var subscribedToResults = false
+
+    /**
+     * The SDK listener is not a suspend function, so batches are handed to a single consumer
+     * coroutine. An unlimited channel keeps them strictly in arrival order — applying diffs out of
+     * order would corrupt the list just as surely as dropping them.
+     */
+    private val updates = Channel<List<SearchServiceResultsUpdate>>(Channel.UNLIMITED)
+
+    override val results: StateFlow<ImmutableList<MessageSearchResult>> = innerResults
+        .map { results ->
+            // Room scoping is applied HERE, at the exposure boundary, and nowhere else.
+            // [innerResults] must stay index-parallel to the SDK's own list, because the positional
+            // diffs (Insert/Set/Remove/Truncate) address the SDK's indices. Filtering inside
+            // MessageSearchResultsProcessor instead is precisely the element-x-ios desync bug.
+            when (roomId) {
+                null -> results.toImmutableList()
+                else -> results.filter { it.roomId == roomId }.toImmutableList()
+            }
+        }
+        .stateIn(scope, SharingStarted.Eagerly, persistentListOf())
+
+    private val mutablePaginationState = MutableStateFlow(inner.paginationState().map())
+    override val paginationState: StateFlow<MessageSearchPaginationState> = mutablePaginationState.asStateFlow()
+
+    init {
+        updates.consumeAsFlow()
+            .onEach { processor.postUpdates(it) }
+            .launchIn(scope)
+
+        taskHandles += inner.subscribeToPaginationStateUpdates(
+            object : SearchServicePaginationStateListener {
+                override fun onUpdate(paginationState: SearchServicePaginationState) {
+                    mutablePaginationState.value = paginationState.map()
+                }
+            }
+        )
+
+        scope.coroutineContext.job.invokeOnCompletion {
+            taskHandles.dispose()
+            updates.close()
+            onClose()
+        }
+    }
+
+    override suspend fun setQuery(query: String): Result<Unit> = withContext(dispatcher) {
+        runCatchingExceptions {
+            // Subscribe lazily, so a search screen that is opened but never used costs nothing.
+            subscribeToResultsIfNeeded()
+            // The SDK contract for setQuery is "clears the current results, restarts pagination from
+            // scratch". Whatever endReached we are holding describes the PREVIOUS query — or, on the
+            // very first search, a cursor that was never queried at all and reports endReached=true
+            // because there is nothing to page through yet. Carrying it over makes every search look
+            // finished before it starts, so callers never paginate and an empty result is reported as
+            // a definitive "no results". Reset before handing the query over; the subscription
+            // corrects this the moment the SDK reports its real state.
+            mutablePaginationState.value = MessageSearchPaginationState.Idle(endReached = false)
+            // The SDK parses this with tantivy's strict query parser, where `:` and friends are
+            // syntax rather than text — a pasted URL fails the whole search. Escape so the query is
+            // searched literally. The caller keeps the raw string; only the SDK sees the escaped one.
+            inner.setQuery(query.escapeForTantivy())
+        }
+    }
+
+    override suspend fun paginate(): Result<Unit> = withContext(dispatcher) {
+        runCatchingExceptions {
+            inner.paginate()
+        }
+    }
+
+    private suspend fun subscribeToResultsIfNeeded() {
+        subscriptionMutex.withLock {
+            if (subscribedToResults) return@withLock
+            taskHandles += inner.subscribeToResults(
+                object : SearchServiceResultsListener {
+                    override fun onUpdate(updates: List<SearchServiceResultsUpdate>) {
+                        this@RustMessageSearch.updates.trySend(updates)
+                    }
+                }
+            )
+            subscribedToResults = true
+        }
+    }
+}
+
+internal fun SearchServicePaginationState.map(): MessageSearchPaginationState = when (this) {
+    is SearchServicePaginationState.Idle -> MessageSearchPaginationState.Idle(endReached = endReached)
+    SearchServicePaginationState.Loading -> MessageSearchPaginationState.Loading
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchService.kt
new file mode 100644
index 0000000000..43f22333ac
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchService.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.search.MessageSearch
+import io.element.android.libraries.matrix.api.search.MessageSearchService
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.rustcomponents.sdk.Client
+
+class RustMessageSearchService(
+    private val client: Client,
+    private val sessionDispatcher: CoroutineDispatcher,
+) : MessageSearchService {
+    override fun createMessageSearch(scope: CoroutineScope, roomId: RoomId?): MessageSearch {
+        // Each searchService() call mints a new Rust object, so this instance owns the one it
+        // creates and closes it when the caller's scope completes.
+        val searchService = client.searchService()
+        return RustMessageSearch(
+            inner = searchService,
+            onClose = { searchService.close() },
+            scope = scope,
+            dispatcher = sessionDispatcher,
+            roomId = roomId,
+        )
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaper.kt
new file mode 100644
index 0000000000..e375bdf9f6
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaper.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+/**
+ * Characters that terminate a bare word wherever they appear in it. Escaping them keeps the token a
+ * single literal word. `\` is included so a backslash the user typed cannot escape one of ours, and
+ * `*` is the prefix/all-documents operator rather than a word breaker.
+ */
+private val ESCAPED_ANYWHERE = charArrayOf('\\', '^', '`', ':', '{', '}', '"', '\'', '[', ']', '(', ')', '*')
+
+/**
+ * Characters that are operators only in the first position of a term: `-`/`+` occurrence, `/` regex,
+ * `>`/`<` elastic range, `!` field separator, `~` slop. Inside a word they are ordinary text, so
+ * escaping them there would be over-broad — `C++` and `1/2/2024` must survive untouched.
+ */
+private val ESCAPED_WHEN_LEADING = charArrayOf('-', '+', '/', '>', '<', '!', '~')
+
+/**
+ * Bare-word operators, neutralised so the query stays literal text end to end: `a AND b` searches
+ * for the three words rather than silently switching to a boolean AND. Mid-query these change
+ * meaning rather than failing; only a dangling operator is a syntax error.
+ */
+private val OPERATOR_WORDS = setOf("AND", "OR", "NOT", "IN", "TO")
+
+private val WHITESPACE_REGEX = Regex("\\s+")
+
+private const val ESCAPE_HEADROOM = 8
+
+/**
+ * Escapes a user-typed search string so tantivy's query parser reads it as literal text, and makes
+ * every word of it mandatory.
+ *
+ * **Escaping.** `matrix-sdk-search` hands the query to the **strict** `QueryParser::parse_query` with
+ * `body` as the only default field, so an unescaped `:` sends tantivy looking for a field named
+ * `https` and the whole search fails — pasting a link finds nothing at all. Unbalanced quotes and
+ * brackets, a leading `-`, and elastic ranges like `>5` fail the same way, and the error arrives as
+ * an opaque `ClientError` string we cannot tell apart from an I/O failure.
+ *
+ * Escaping is per token rather than wrapping the whole query in quotes: whitespace stays the term
+ * separator, and only a token that actually contained an operator changes shape. Wrapping instead
+ * would turn `design review notes` into one ordered phrase and quietly break every ordinary search.
+ *
+ * **Conjunction.** tantivy's parser is OR-by-default and the FFI takes a bare string, so
+ * `set_conjunction_by_default()` is unreachable from here — `check the photo` matched every message
+ * containing `the`, and buried the wanted one under hundreds of unrelated hits ranked by relevance.
+ * Prefixing each token with `+` makes it a Must clause, which parses to exactly the query
+ * `set_conjunction_by_default()` would have built.
+ *
+ * The `+` goes on **after** escaping, never before: `+` is escaped in leading position, so prefixing
+ * first would hand the escaper its own operator and produce a literal `\+`. That parses cleanly and
+ * silently restores OR, so it cannot be caught by anything but an assertion on the exact string.
+ *
+ * The costs, stated plainly: deliberate `"phrase"`, `-exclude` and boolean syntax stop working as
+ * operators; and a query is now only as good as its worst word — one typo, or one word the user
+ * misremembers, empties the result set where before it degraded to partial matches.
+ *
+ * Pinned to tantivy 0.26.1 grammar. PII: the query is never logged.
+ */
+internal fun String.escapeForTantivy(): String =
+    split(WHITESPACE_REGEX)
+        .filter { it.isNotEmpty() }
+        .joinToString(separator = " ") { token ->
+            // tantivy's default tokenizer splits on non-alphanumerics, so a token like `:)` or an
+            // emoji indexes no terms at all. Required, such a token could only ever subtract, and a
+            // single emoji beside real words would silently empty the results. Optional, it is
+            // inert — which is what it was before conjunctions too.
+            if (token.any(Char::isLetterOrDigit)) "+${token.escapeToken()}" else token.escapeToken()
+        }
+
+private fun String.escapeToken(): String = buildString(length + ESCAPE_HEADROOM) {
+    if (this@escapeToken in OPERATOR_WORDS) append('\\')
+    this@escapeToken.forEachIndexed { index, char ->
+        // One forward pass: chained replace() calls would re-escape the backslashes they just added.
+        if (char in ESCAPED_ANYWHERE || index == 0 && char in ESCAPED_WHEN_LEADING) {
+            append('\\')
+        }
+        append(char)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
index f83cd648a6..cd729d0df1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
@@ -36,6 +36,7 @@ class SpaceRoomMapper {
             worldReadable = spaceRoom.worldReadable.orFalse(),
             via = spaceRoom.via.toImmutableList(),
             isDirect = spaceRoom.isDirect,
+            isDm = spaceRoom.isDm,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilder.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilder.kt
index 84f124868e..4cfcf1a95e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilder.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilder.kt
@@ -7,14 +7,25 @@
 
 package io.element.android.libraries.matrix.impl.storage
 
+import io.element.android.libraries.androidutils.crypto.ClientSecret
 import io.element.android.libraries.core.data.ByteUnit
 import io.element.android.libraries.core.data.megaBytes
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import org.matrix.rustcomponents.sdk.ClientBuilder
 import org.matrix.rustcomponents.sdk.SqliteStoreBuilder as SdkSqliteStoreBuilder
 
+/**
+ * Abstraction over the SDK's [SdkSqliteStoreBuilder] to allow configuring it with a ClientSecret and to hide the SDK from the rest of the codebase.
+ */
 interface SqliteStoreBuilder {
-    fun passphrase(passphrase: String?): SqliteStoreBuilder
+    /**
+     * Configure the builder with a [ClientSecret], if provided. If the [clientSecret] is null, the databases will not be encrypted.
+     */
+    fun secret(clientSecret: ClientSecret?): SqliteStoreBuilder
+
+    /**
+     * Configure the provided [clientBuilder] with the configured [SdkSqliteStoreBuilder] and return it.
+     */
     fun setupClientBuilder(clientBuilder: ClientBuilder): ClientBuilder
 }
 
@@ -26,8 +37,15 @@ class RustSqliteStoreBuilder(
         cachePath = sessionPaths.cacheDirectory.absolutePath,
     ).journalSizeLimit(25.megaBytes.into(ByteUnit.BYTES).toUInt())
 
-    override fun passphrase(passphrase: String?): SqliteStoreBuilder {
-        inner = inner.passphrase(passphrase)
+    override fun secret(clientSecret: ClientSecret?): SqliteStoreBuilder {
+        when (clientSecret) {
+            null -> Unit
+            is ClientSecret.Passphrase -> inner = inner.passphrase(clientSecret.value)
+            is ClientSecret.RawKey -> {
+                // Ensure the key is 32 bytes long, as required by the SDK
+                inner = inner.key(clientSecret.keyOfSize(32))
+            }
+        }
         return this
     }
 
@@ -35,3 +53,15 @@ class RustSqliteStoreBuilder(
         return clientBuilder.sqliteStore(this.inner)
     }
 }
+
+private fun ClientSecret.RawKey.keyOfSize(size: Int): ByteArray {
+    return if (bytes.size == 32) {
+        bytes
+    } else if (bytes.size < 32) {
+        // If the key is shorter than 32 bytes, pad it with zeros
+        bytes + ByteArray(32 - bytes.size)
+    } else {
+        // Otherwise, take the first 32 bytes of the key
+        bytes.copyOfRange(0, 32)
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilderProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilderProvider.kt
index 29a30f3c56..5d79e72403 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilderProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/storage/SqliteStoreBuilderProvider.kt
@@ -9,7 +9,7 @@ package io.element.android.libraries.matrix.impl.storage
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 
 interface SqliteStoreBuilderProvider {
     fun provide(sessionPaths: SessionPaths): SqliteStoreBuilder
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index 3996155871..bd756bc002 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -12,22 +12,26 @@ import io.element.android.libraries.androidutils.hash.hash
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.poll.PollKind
 import io.element.android.libraries.matrix.api.room.IntentionalMention
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.TimelineException
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
+import io.element.android.libraries.matrix.impl.media.GalleryMediaUploadHandlerImpl
 import io.element.android.libraries.matrix.impl.media.MediaUploadHandlerImpl
 import io.element.android.libraries.matrix.impl.media.map
 import io.element.android.libraries.matrix.impl.poll.toInner
@@ -43,6 +47,7 @@ import io.element.android.libraries.matrix.impl.timeline.postprocessor.TypingNot
 import io.element.android.libraries.matrix.impl.timeline.reply.InReplyToMapper
 import io.element.android.libraries.matrix.impl.util.MessageEventContent
 import io.element.android.services.toolbox.api.systemclock.SystemClock
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -64,6 +69,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.EditedContent
 import org.matrix.rustcomponents.sdk.FormattedBody
+import org.matrix.rustcomponents.sdk.GalleryUploadParameters
 import org.matrix.rustcomponents.sdk.MessageFormat
 import org.matrix.rustcomponents.sdk.PollData
 import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
@@ -81,7 +87,7 @@ private const val PAGINATION_SIZE = 50
 class RustTimeline(
     private val inner: InnerTimeline,
     override val mode: Timeline.Mode,
-    private val systemClock: SystemClock,
+    systemClock: SystemClock,
     private val joinedRoom: JoinedRoom,
     private val coroutineScope: CoroutineScope,
     private val dispatcher: CoroutineDispatcher,
@@ -121,6 +127,13 @@ class RustTimeline(
     private val lastForwardIndicatorsPostProcessor = LastForwardIndicatorsPostProcessor(mode)
     private val typingNotificationPostProcessor = TypingNotificationPostProcessor(mode)
 
+    private data class RoomTimelineInfo(
+        val roomCreators: ImmutableList<UserId>,
+        val isDm: Boolean,
+        val joinRule: JoinRule?,
+        val isEncrypted: Boolean?,
+    )
+
     override val backwardPaginationStatus = MutableStateFlow(
         Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode != Timeline.Mode.PinnedEvents)
     )
@@ -129,6 +142,8 @@ class RustTimeline(
         Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode is Timeline.Mode.FocusedOnEvent)
     )
 
+    private val loggerTag = "Timeline($mode)"
+
     init {
         when (mode) {
             is Timeline.Mode.Live, is Timeline.Mode.FocusedOnEvent -> coroutineScope.fetchMembers()
@@ -176,10 +191,11 @@ class RustTimeline(
     }
 
     private fun updatePaginationStatus(direction: Timeline.PaginationDirection, update: (Timeline.PaginationStatus) -> Timeline.PaginationStatus) {
-        when (direction) {
+        val result = when (direction) {
             Timeline.PaginationDirection.BACKWARDS -> backwardPaginationStatus.getAndUpdate(update)
             Timeline.PaginationDirection.FORWARDS -> forwardPaginationStatus.getAndUpdate(update)
         }
+        Timber.tag(loggerTag).d("updatePaginationStatus $direction: $result")
     }
 
     // Use NonCancellable to avoid breaking the timeline when the coroutine is cancelled.
@@ -194,12 +210,13 @@ class RustTimeline(
                 }
             }.onFailure { error ->
                 if (error is TimelineException.CannotPaginate) {
-                    Timber.d("Can't paginate $direction on room ${joinedRoom.roomId} with paginationStatus: ${backwardPaginationStatus.value}")
+                    Timber.tag(loggerTag).d("Can't paginate $direction on room ${joinedRoom.roomId} with paginationStatus: ${backwardPaginationStatus.value}")
                 } else {
                     updatePaginationStatus(direction) { it.copy(isPaginating = false) }
-                    Timber.e(error, "Error paginating $direction on room ${joinedRoom.roomId}")
+                    Timber.tag(loggerTag).e(error, "Error paginating $direction on room ${joinedRoom.roomId}")
                 }
             }.onSuccess { hasReachedEnd ->
+                Timber.tag(loggerTag).d("Finished paginating $direction on room ${joinedRoom.roomId}, hasReachedEnd: $hasReachedEnd")
                 updatePaginationStatus(direction) { it.copy(isPaginating = false, hasMoreToLoad = !hasReachedEnd) }
             }
         }
@@ -216,14 +233,15 @@ class RustTimeline(
         _timelineItems,
         backwardPaginationStatus,
         forwardPaginationStatus,
-        joinedRoom.roomInfoFlow.map { it.creators to it.isDm }.distinctUntilChanged(),
+        joinedRoom.roomInfoFlow.map { RoomTimelineInfo(it.creators, it.isDm, it.joinRule, it.isEncrypted) }.distinctUntilChanged(),
     ) {
         timelineItems,
         backwardPaginationStatus,
         forwardPaginationStatus,
-        (roomCreators, isDm),
+        roomInfo,
         ->
         withContext(dispatcher) {
+            val (roomCreators, isDm, joinRule, isEncrypted) = roomInfo
             timelineItems
                 .let { items ->
                     roomBeginningPostProcessor.process(
@@ -263,7 +281,7 @@ class RustTimeline(
         try {
             inner.fetchMembers()
         } catch (exception: Exception) {
-            Timber.e(exception, "Error fetching members for room ${joinedRoom.roomId}")
+            Timber.tag(loggerTag).e(exception, "Error fetching members for room ${joinedRoom.roomId}")
         }
     }
 
@@ -271,8 +289,16 @@ class RustTimeline(
         body: String,
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
+        msgType: MsgType,
+        asPlainText: Boolean,
     ): Result<Unit> = withContext(dispatcher) {
-        MessageEventContent.from(body, htmlBody, intentionalMentions).use { content ->
+        MessageEventContent.from(
+            body = body,
+            htmlBody = htmlBody,
+            intentionalMentions = intentionalMentions,
+            msgType = msgType,
+            asPlainText = asPlainText,
+        ).use { content ->
             runCatchingExceptions<Unit> {
                 inner.send(content)
             }
@@ -337,9 +363,15 @@ class RustTimeline(
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
         fromNotification: Boolean,
+        msgType: MsgType,
     ): Result<Unit> = withContext(dispatcher) {
         runCatchingExceptions {
-            val msg = MessageEventContent.from(body, htmlBody, intentionalMentions)
+            val msg = MessageEventContent.from(
+                body = body,
+                htmlBody = htmlBody,
+                intentionalMentions = intentionalMentions,
+                msgType = msgType,
+            )
             inner.sendReply(
                 msg = msg,
                 eventId = repliedToEventId.value,
@@ -355,7 +387,7 @@ class RustTimeline(
         formattedCaption: String?,
         inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> {
-        Timber.d("Sending image ${file.path.hash()}")
+        Timber.tag(loggerTag).d("Sending image ${file.path.hash()}")
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendImage(
                 params = UploadParameters(
@@ -381,7 +413,7 @@ class RustTimeline(
         formattedCaption: String?,
         inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> {
-        Timber.d("Sending video ${file.path.hash()}")
+        Timber.tag(loggerTag).d("Sending video ${file.path.hash()}")
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendVideo(
                 params = UploadParameters(
@@ -406,7 +438,7 @@ class RustTimeline(
         formattedCaption: String?,
         inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> {
-        Timber.d("Sending audio ${file.path.hash()}")
+        Timber.tag(loggerTag).d("Sending audio ${file.path.hash()}")
         return sendAttachment(listOf(file)) {
             inner.sendAudio(
                 params = UploadParameters(
@@ -430,7 +462,7 @@ class RustTimeline(
         formattedCaption: String?,
         inReplyToEventId: EventId?,
     ): Result<MediaUploadHandler> {
-        Timber.d("Sending file ${file.path.hash()}")
+        Timber.tag(loggerTag).d("Sending file ${file.path.hash()}")
         return sendAttachment(listOf(file)) {
             inner.sendFile(
                 params = UploadParameters(
@@ -460,7 +492,7 @@ class RustTimeline(
         runCatchingExceptions {
             roomContentForwarder.forward(fromTimeline = inner, eventId = eventId, toRoomIds = roomIds)
         }.onFailure {
-            Timber.e(it)
+            Timber.tag(loggerTag).e(it)
         }
     }
 
@@ -506,6 +538,42 @@ class RustTimeline(
         }
     }
 
+    override suspend fun sendGallery(
+        items: List<GalleryItemInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<MediaUploadHandler> {
+        Timber.d("Sending gallery with ${items.size} items")
+        val allFiles = items.flatMap { item ->
+            when (item) {
+                is GalleryItemInfo.Image -> listOfNotNull(item.file, item.thumbnailFile)
+                is GalleryItemInfo.Video -> listOfNotNull(item.file, item.thumbnailFile)
+                is GalleryItemInfo.Audio -> listOf(item.file)
+                is GalleryItemInfo.MediaFile -> listOf(item.file)
+            }
+        }
+        return sendGalleryAttachment(allFiles) {
+            inner.sendGallery(
+                params = GalleryUploadParameters(
+                    caption = caption,
+                    formattedCaption = formattedCaption?.let {
+                        FormattedBody(body = it, format = MessageFormat.Html)
+                    },
+                    mentions = null,
+                    inReplyTo = inReplyToEventId?.value,
+                ),
+                itemInfos = items.map { it.map() },
+            )
+        }
+    }
+
+    private fun sendGalleryAttachment(files: List<File>, handle: () -> org.matrix.rustcomponents.sdk.SendGalleryJoinHandle): Result<MediaUploadHandler> {
+        return runCatchingExceptions {
+            GalleryMediaUploadHandlerImpl(files, handle())
+        }
+    }
+
     override suspend fun createPoll(
         question: String,
         answers: List<String>,
@@ -592,6 +660,24 @@ class RustTimeline(
         }
     }
 
+    override suspend fun isEventLoaded(eventId: EventId): Boolean = withContext(dispatcher) {
+        val isInLoadedItems = _timelineItems.replayCache.firstOrNull().orEmpty().any { timelineItem ->
+            timelineItem is MatrixTimelineItem.Event && timelineItem.eventId == eventId
+        }
+        if (isInLoadedItems) {
+            // Displayed events are caught above. The SDK-level list still holds events the display
+            // layer later drops, so this avoids the FFI call for in-window-but-not-rendered events.
+            true
+        } else {
+            // getEventTimelineItemByEventId throws when the event isn't in the loaded window.
+            // EventTimelineItem is a Disposable wrapping a native handle, so release it once we've
+            // confirmed presence — otherwise the handle lingers until the GC cleaner runs.
+            runCatchingExceptions {
+                inner.getEventTimelineItemByEventId(eventId.value).use { /* presence is all we need */ }
+            }.isSuccess
+        }
+    }
+
     override suspend fun pinEvent(eventId: EventId): Result<Boolean> = withContext(dispatcher) {
         runCatchingExceptions {
             inner.pinEvent(eventId = eventId.value)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
index e382bce8db..0811cd741d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapper.kt
@@ -13,6 +13,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
@@ -31,12 +33,10 @@ import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.MsgLikeKind
 import org.matrix.rustcomponents.sdk.use
 import org.matrix.rustcomponents.sdk.FormattedBody as RustFormattedBody
+import org.matrix.rustcomponents.sdk.GalleryItemType as RustGalleryItemType
 import org.matrix.rustcomponents.sdk.MessageFormat as RustMessageFormat
 import org.matrix.rustcomponents.sdk.MessageType as RustMessageType
 
-// https://github.com/Johennes/matrix-spec-proposals/blob/johannes/msgtype-galleries/proposals/4274-inline-media-galleries.md#unstable-prefix
-private const val MSG_TYPE_GALLERY_UNSTABLE = "dm.filament.gallery"
-
 class EventMessageMapper {
     private val inReplyToMapper by lazy { InReplyToMapper(TimelineEventContentMapper()) }
 
@@ -124,8 +124,64 @@ class EventMessageMapper {
             OtherMessageType(type.msgtype, type.body)
         }
         is MessageType.Gallery -> {
-            // TODO expose the GalleryType.
-            OtherMessageType(MSG_TYPE_GALLERY_UNSTABLE, type.content.body)
+            GalleryMessageType(
+                body = type.content.body,
+                formatted = type.content.formatted?.map(),
+                items = type.content.itemtypes.map { mapGalleryItemType(it) },
+            )
+        }
+    }
+
+    private fun mapGalleryItemType(type: RustGalleryItemType): GalleryItemType = when (type) {
+        is RustGalleryItemType.Image -> {
+            GalleryItemType.Image(
+                content = ImageMessageType(
+                    filename = type.content.filename,
+                    caption = type.content.caption,
+                    formattedCaption = type.content.formattedCaption?.map(),
+                    source = type.content.source.map(),
+                    info = type.content.info?.map(),
+                )
+            )
+        }
+        is RustGalleryItemType.Audio -> {
+            GalleryItemType.Audio(
+                content = AudioMessageType(
+                    filename = type.content.filename,
+                    caption = type.content.caption,
+                    formattedCaption = type.content.formattedCaption?.map(),
+                    source = type.content.source.map(),
+                    info = type.content.info?.map(),
+                )
+            )
+        }
+        is RustGalleryItemType.Video -> {
+            GalleryItemType.Video(
+                content = VideoMessageType(
+                    filename = type.content.filename,
+                    caption = type.content.caption,
+                    formattedCaption = type.content.formattedCaption?.map(),
+                    source = type.content.source.map(),
+                    info = type.content.info?.map(),
+                )
+            )
+        }
+        is RustGalleryItemType.File -> {
+            GalleryItemType.File(
+                content = FileMessageType(
+                    filename = type.content.filename,
+                    caption = type.content.caption,
+                    formattedCaption = type.content.formattedCaption?.map(),
+                    source = type.content.source.map(),
+                    info = type.content.info?.map(),
+                )
+            )
+        }
+        is RustGalleryItemType.Other -> {
+            GalleryItemType.Other(
+                itemType = type.itemtype,
+                body = type.body,
+            )
         }
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
index 297b0b31a4..801d5fd146 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventTimelineItemMapper.kt
@@ -74,7 +74,9 @@ fun RustProfileDetails.map(): ProfileDetails {
         is RustProfileDetails.Ready -> ProfileDetails.Ready(
             displayName = displayName,
             displayNameAmbiguous = displayNameAmbiguous,
-            avatarUrl = avatarUrl
+            avatarUrl = avatarUrl,
+            // TODO map this value when available
+            displayedStatus = null,
         )
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
index 2145bd2a7d..98efa505d0 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
@@ -11,6 +11,8 @@ package io.element.android.libraries.matrix.impl.timeline.item.event
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.notification.CallIntent
+import io.element.android.libraries.matrix.api.room.location.LiveLocationInfo
 import io.element.android.libraries.matrix.api.timeline.item.EmbeddedEventInfo
 import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
 import io.element.android.libraries.matrix.api.timeline.item.ThreadSummary
@@ -19,6 +21,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
+import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
@@ -33,8 +36,10 @@ import io.element.android.libraries.matrix.api.timeline.item.event.UtdCause
 import io.element.android.libraries.matrix.impl.media.map
 import io.element.android.libraries.matrix.impl.poll.map
 import io.element.android.libraries.matrix.impl.room.join.map
+import io.element.android.libraries.matrix.impl.room.location.into
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
+import org.matrix.rustcomponents.sdk.BeaconInfo
 import org.matrix.rustcomponents.sdk.EmbeddedEventDetails
 import org.matrix.rustcomponents.sdk.MsgLikeContent
 import org.matrix.rustcomponents.sdk.MsgLikeKind
@@ -108,8 +113,14 @@ class TimelineEventContentMapper(
                             )
                         }
                         is MsgLikeKind.LiveLocation -> {
-                            // Live location messages are a special kind of message that we want to treat as unknown content for now
-                             UnknownContent
+                            LiveLocationContent(
+                                isLive = kind.content.isLive,
+                                startTimestamp = kind.content.ts.toLong(),
+                                description = kind.content.description,
+                                timeout = kind.content.timeoutMs.toLong(),
+                                assetType = kind.content.assetType.into(),
+                                locations = kind.content.locations.map { location -> location.map() }
+                            )
                         }
                         is MsgLikeKind.Other -> UnknownContent
                     }
@@ -137,7 +148,17 @@ class TimelineEventContentMapper(
                     )
                 }
                 is TimelineItemContent.CallInvite -> LegacyCallInviteContent
-                is TimelineItemContent.RtcNotification -> CallNotifyContent
+                is TimelineItemContent.RtcNotification -> CallNotifyContent(
+                    callIntent = if (it.callIntent == "audio") {
+                        CallIntent.AUDIO
+                    } else {
+                        CallIntent.VIDEO
+                    },
+                    declinedBy = it.declinedBy.map(::UserId),
+                    activeMembers = it.activeMembers.map(::UserId),
+                    callStartTsMillis = it.callStartTsMillis?.toLong(),
+                    isJoined = it.isJoined
+                )
             }
         }
     }
@@ -223,7 +244,6 @@ private fun RustOtherState.map(): OtherState {
         RustOtherState.PolicyRuleRoom -> OtherState.PolicyRuleRoom
         RustOtherState.PolicyRuleServer -> OtherState.PolicyRuleServer
         RustOtherState.PolicyRuleUser -> OtherState.PolicyRuleUser
-        RustOtherState.RoomAliases -> OtherState.RoomAliases
         is RustOtherState.RoomAvatar -> OtherState.RoomAvatar(url)
         RustOtherState.RoomCanonicalAlias -> OtherState.RoomCanonicalAlias
         RustOtherState.RoomCreate -> OtherState.RoomCreate
@@ -260,3 +280,11 @@ private fun RustEncryptedMessage.map(): UnableToDecryptContent.Data {
         RustEncryptedMessage.Unknown -> UnableToDecryptContent.Data.Unknown
     }
 }
+
+private fun BeaconInfo.map(): LiveLocationInfo {
+    return LiveLocationInfo(
+        description = description,
+        geoUri = geoUri,
+        timestamp = ts.toLong(),
+    )
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt
index 397280231d..8991d26f9c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 
 /**
  * This timeline post-processor removes the room creation event and the self-join event from the timeline for DMs
- * or add the RoomBeginning item.
+ * or add the RoomBeginning item. For rooms that aren't invite-only and aren't encrypted, it also removes join/leave and profile change events.
  */
 class RoomBeginningPostProcessor(private val mode: Timeline.Mode) {
     fun process(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/MessageEventContent.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/MessageEventContent.kt
index 3e320116c6..f1c0019f17 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/MessageEventContent.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/MessageEventContent.kt
@@ -9,20 +9,54 @@
 package io.element.android.libraries.matrix.impl.util
 
 import io.element.android.libraries.matrix.api.room.IntentionalMention
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.impl.room.map
+import org.matrix.rustcomponents.sdk.MessageContent
+import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.RoomMessageEventContentWithoutRelation
+import org.matrix.rustcomponents.sdk.TextMessageContent
+import org.matrix.rustcomponents.sdk.contentWithoutRelationFromMessage
 import org.matrix.rustcomponents.sdk.messageEventContentFromHtml
+import org.matrix.rustcomponents.sdk.messageEventContentFromHtmlAsEmote
 import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdown
+import org.matrix.rustcomponents.sdk.messageEventContentFromMarkdownAsEmote
 
 /**
  * Creates a [RoomMessageEventContentWithoutRelation] from a body, an html body and a list of mentions.
  */
 object MessageEventContent {
-    fun from(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): RoomMessageEventContentWithoutRelation {
-        return if (htmlBody != null) {
-            messageEventContentFromHtml(body, htmlBody)
-        } else {
-            messageEventContentFromMarkdown(body)
-        }.withMentions(intentionalMentions.map())
+    fun from(
+        body: String,
+        htmlBody: String?,
+        intentionalMentions: List<IntentionalMention>,
+        msgType: MsgType = MsgType.MSG_TYPE_TEXT,
+        asPlainText: Boolean = false,
+    ): RoomMessageEventContentWithoutRelation {
+        return when {
+            asPlainText -> contentWithoutRelationFromMessage(
+                MessageContent(
+                    msgType = MessageType.Text(
+                        TextMessageContent(
+                            body = body,
+                            formatted = null,
+                        )
+                    ),
+                    body = body,
+                    isEdited = false,
+                    mentions = null,
+                )
+            )
+            htmlBody != null -> if (msgType == MsgType.MSG_TYPE_EMOTE) {
+                messageEventContentFromHtmlAsEmote(body, htmlBody)
+            } else {
+                messageEventContentFromHtml(body, htmlBody)
+            }
+            else -> if (msgType == MsgType.MSG_TYPE_EMOTE) {
+                messageEventContentFromMarkdownAsEmote(body)
+            } else {
+                messageEventContentFromMarkdown(body)
+            }
+        }
+            .withMentions(intentionalMentions.map())
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProvider.kt
deleted file mode 100644
index 0030c6e23e..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProvider.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.util
-
-import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
-import io.element.android.libraries.matrix.impl.paths.getSessionPaths
-import io.element.android.libraries.sessionstorage.api.SessionStore
-
-class SessionPathsProvider(
-    private val sessionStore: SessionStore,
-) {
-    suspend fun provides(sessionId: SessionId): SessionPaths? {
-        val sessionData = sessionStore.getSession(sessionId.value) ?: return null
-        return sessionData.getSessionPaths()
-    }
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Token.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Token.kt
index 815e134cf2..f5df21008b 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Token.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/util/Token.kt
@@ -16,7 +16,8 @@ private val sha256 by lazy { MessageDigest.getInstance("SHA-256") }
 
 @OptIn(ExperimentalStdlibApi::class)
 private fun anonymizeToken(token: String): String {
-    return sha256.digest(token.toByteArray()).toHexString()
+    // Only keep the first 32 chars (16 bytes) of the hashed token to avoid displaying too much information.
+    return sha256.digest(token.toByteArray()).toHexString().take(32)
 }
 
 fun SessionData?.anonymizedTokens(): Pair<String?, String?> {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt
index 7fb2935897..b2a13f5f1a 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt
@@ -124,7 +124,7 @@ class RustSessionVerificationService(
         this.listener = listener
     }
 
-    override suspend fun requestCurrentSessionVerification() = tryOrFail {
+    override suspend fun requestDeviceVerification() = tryOrFail {
         ensureEncryptionIsInitialized()
         verificationController.requestDeviceVerification()
         currentVerificationRequest = VerificationRequest.Outgoing.CurrentSession
@@ -146,7 +146,7 @@ class RustSessionVerificationService(
 
     override suspend fun declineVerification() = tryOrFail { verificationController.declineVerification() }
 
-    override suspend fun startVerification() = tryOrFail {
+    override suspend fun startSasVerification() = tryOrFail {
         verificationController.startSasVerification()
     }
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegateTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegateTest.kt
index 6aa3ef0e5b..0036f2f962 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegateTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegateTest.kt
@@ -16,15 +16,11 @@ import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
-import io.element.android.tests.testutils.testCoroutineDispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import uniffi.matrix_sdk_common.BackgroundTaskFailureReason
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class RustClientSessionDelegateTest {
     @Test
     fun `saveSessionInKeychain should update the store`() = runTest {
@@ -43,7 +39,6 @@ class RustClientSessionDelegateTest {
                 refreshToken = "rt",
             )
         )
-        runCurrent()
         val result = sessionStore.getLatestSession()
         assertThat(result!!.accessToken).isEqualTo("at")
         assertThat(result.refreshToken).isEqualTo("rt")
@@ -80,5 +75,4 @@ fun TestScope.aRustClientSessionDelegate(
     sessionStore = sessionStore,
     appCoroutineScope = this,
     analyticsService = analyticsService,
-    coroutineDispatchers = testCoroutineDispatchers(),
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProviderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProviderTest.kt
new file mode 100644
index 0000000000..8d3377d698
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustHomeserverCapabilitiesProviderTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiHomeserverCapabilities
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class RustHomeserverCapabilitiesProviderTest {
+    @Test
+    fun `refresh calls client refresh`() = runTest {
+        val refreshLambda = lambdaRecorder<Unit> {}
+        val provider = createCapabilitiesProvider(
+            capabilities = FakeFfiHomeserverCapabilities(refresh = refreshLambda),
+        )
+        assertThat(provider.refresh().isSuccess).isTrue()
+        refreshLambda.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `refresh fails when client refresh does`() = runTest {
+        val refreshLambda = lambdaRecorder<Unit> { throw IllegalStateException("Failed to refresh capabilities") }
+        val provider = createCapabilitiesProvider(
+            capabilities = FakeFfiHomeserverCapabilities(refresh = refreshLambda),
+        )
+        assertThat(provider.refresh().isFailure).isTrue()
+        refreshLambda.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `canChangeDisplayName returns expected value`() = runTest {
+        val provider = createCapabilitiesProvider(
+            capabilities = FakeFfiHomeserverCapabilities(canChangeDisplayName = { true }),
+        )
+        assertThat(provider.canChangeDisplayName().getOrNull()).isTrue()
+    }
+
+    @Test
+    fun `canChangeAvatarUrl returns expected value`() = runTest {
+        val provider = createCapabilitiesProvider(
+            capabilities = FakeFfiHomeserverCapabilities(canChangeAvatar = { true }),
+        )
+        assertThat(provider.canChangeAvatarUrl().getOrNull()).isTrue()
+    }
+
+    @Test
+    fun `canChangeDisplayName returns failure when client throws`() = runTest {
+        val provider = createCapabilitiesProvider(
+            capabilities = FakeFfiHomeserverCapabilities(canChangeDisplayName = { throw IllegalStateException("Failed to get display name capability") }),
+        )
+        assert(provider.canChangeDisplayName().isFailure)
+    }
+
+    private fun createCapabilitiesProvider(
+        capabilities: FakeFfiHomeserverCapabilities = FakeFfiHomeserverCapabilities(),
+    ) = RustHomeserverCapabilitiesProvider(capabilities)
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactoryTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactoryTest.kt
index 670430e23e..d1536d949e 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactoryTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactoryTest.kt
@@ -11,8 +11,8 @@ package io.element.android.libraries.matrix.impl
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.scanner.ContentScannerUrlProvider
 import io.element.android.libraries.matrix.impl.auth.FakeProxyProvider
-import io.element.android.libraries.matrix.impl.auth.FakeUserCertificatesProvider
 import io.element.android.libraries.matrix.impl.room.FakeTimelineEventFilterFactory
 import io.element.android.libraries.matrix.impl.storage.FakeSqliteStoreBuilderProvider
 import io.element.android.libraries.network.useragent.SimpleUserAgentProvider
@@ -52,13 +52,13 @@ fun TestScope.createRustMatrixClientFactory(
     ),
     clientBuilderProvider: ClientBuilderProvider = FakeClientBuilderProvider(),
     workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(),
+    contentScannerUrlProvider: ContentScannerUrlProvider = { Result.success(null) },
 ) = RustMatrixClientFactory(
     cacheDirectory = cacheDirectory,
     appCoroutineScope = backgroundScope,
     coroutineDispatchers = testCoroutineDispatchers(),
     sessionStore = sessionStore,
     userAgentProvider = SimpleUserAgentProvider(),
-    userCertificatesProvider = FakeUserCertificatesProvider(),
     proxyProvider = FakeProxyProvider(),
     clock = FakeSystemClock(),
     analyticsService = FakeAnalyticsService(),
@@ -67,4 +67,5 @@ fun TestScope.createRustMatrixClientFactory(
     clientBuilderProvider = clientBuilderProvider,
     sqliteStoreBuilderProvider = FakeSqliteStoreBuilderProvider(),
     workManagerScheduler = workManagerScheduler,
+    contentScannerUrlProvider = contentScannerUrlProvider,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
index ed8440fe53..4ea4bb64e3 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientTest.kt
@@ -13,6 +13,7 @@ package io.element.android.libraries.matrix.impl
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.core.data.bytes
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClient
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSyncService
 import io.element.android.libraries.matrix.impl.room.FakeTimelineEventFilterFactory
@@ -21,6 +22,7 @@ import io.element.android.libraries.matrix.test.A_DEVICE_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
+import io.element.android.libraries.matrix.test.scanner.FakeContentScanner
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
@@ -88,6 +90,8 @@ class RustMatrixClientTest {
                         userId = userId,
                         displayName = A_USER_NAME,
                         avatarUrl = AN_AVATAR_URL,
+                        status = null,
+                        call = null,
                     )
                 },
             ),
@@ -128,7 +132,7 @@ class RustMatrixClientTest {
             client = FakeFfiClient(createRoomResult = createRoomLambda)
         )
 
-        client.createDM(A_USER_ID)
+        client.createDM(userId = A_USER_ID, isEncrypted = true)
 
         createRoomLambda.assertions().isCalledOnce()
         assertThat(createParameters?.historyVisibilityOverride).isEqualTo(RoomHistoryVisibility.Invited)
@@ -141,6 +145,7 @@ class RustMatrixClientTest {
         ),
     ) = RustMatrixClient(
         innerClient = client,
+        sessionPaths = SessionPaths(fileDirectory = File("files"), cacheDirectory = File("cache")),
         sessionStore = sessionStore,
         appCoroutineScope = backgroundScope,
         sessionDelegate = aRustClientSessionDelegate(
@@ -154,5 +159,7 @@ class RustMatrixClientTest {
         featureFlagService = FakeFeatureFlagService(),
         analyticsService = FakeAnalyticsService(),
         workManagerScheduler = FakeWorkManagerScheduler(submitLambda = {}),
+        contentScanner = FakeContentScanner(),
+        isMessageSearchAvailable = false,
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
index 68adfe00a2..3c094f3581 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
@@ -43,6 +43,19 @@ class JoinedExtKtTest {
     @Test
     fun `test isDirect parameter mapping`() = runTest {
         assertThat(aRoom(isDirect = true).toAnalyticsJoinedRoom(null))
+            .isEqualTo(
+                JoinedRoom(
+                    isDM = false,
+                    isSpace = false,
+                    roomSize = JoinedRoom.RoomSize.One,
+                    trigger = null
+                )
+            )
+    }
+
+    @Test
+    fun `test isDm parameter mapping`() = runTest {
+        assertThat(aRoom(isDm = true).toAnalyticsJoinedRoom(null))
             .isEqualTo(
                 JoinedRoom(
                     isDM = true,
@@ -80,12 +93,13 @@ class JoinedExtKtTest {
     }
 
     private fun aRoom(
+        isDm: Boolean = false,
         isDirect: Boolean = false,
         isSpace: Boolean = false,
         joinedMemberCount: Long = 0
     ): FakeBaseRoom {
         return FakeBaseRoom().apply {
-            givenRoomInfo(aRoomInfo(isDirect = isDirect, isSpace = isSpace, joinedMembersCount = joinedMemberCount))
+            givenRoomInfo(aRoomInfo(isDm = isDm, isDirect = isDirect, isSpace = isSpace, joinedMembersCount = joinedMemberCount))
         }
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
index 8449d9a6c3..cc5fb4a394 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
@@ -13,7 +13,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.ClientBuildException
-import org.matrix.rustcomponents.sdk.OidcException
+import org.matrix.rustcomponents.sdk.OAuthException
 
 class AuthenticationExceptionMappingTest {
     @Test
@@ -64,17 +64,17 @@ class AuthenticationExceptionMappingTest {
     }
 
     @Test
-    fun `mapping Oidc exceptions map to the Oidc Kotlin`() {
-        assertThat(OidcException.Generic("Generic").mapAuthenticationException())
-            .isException<AuthenticationException.Oidc>("Generic")
-        assertThat(OidcException.CallbackUrlInvalid("CallbackUrlInvalid").mapAuthenticationException())
-            .isException<AuthenticationException.Oidc>("CallbackUrlInvalid")
-        assertThat(OidcException.Cancelled("Cancelled").mapAuthenticationException())
-            .isException<AuthenticationException.Oidc>("Cancelled")
-        assertThat(OidcException.MetadataInvalid("MetadataInvalid").mapAuthenticationException())
-            .isException<AuthenticationException.Oidc>("MetadataInvalid")
-        assertThat(OidcException.NotSupported("NotSupported").mapAuthenticationException())
-            .isException<AuthenticationException.Oidc>("NotSupported")
+    fun `mapping Oidc exceptions map to the OAuth Kotlin`() {
+        assertThat(OAuthException.Generic("Generic").mapAuthenticationException())
+            .isException<AuthenticationException.OAuth>("Generic")
+        assertThat(OAuthException.CallbackUrlInvalid("CallbackUrlInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.OAuth>("CallbackUrlInvalid")
+        assertThat(OAuthException.Cancelled("Cancelled").mapAuthenticationException())
+            .isException<AuthenticationException.OAuth>("Cancelled")
+        assertThat(OAuthException.MetadataInvalid("MetadataInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.OAuth>("MetadataInvalid")
+        assertThat(OAuthException.NotSupported("NotSupported").mapAuthenticationException())
+            .isException<AuthenticationException.OAuth>("NotSupported")
     }
 
     private inline fun <reified T> ThrowableSubject.isException(message: String) {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakePassphraseGenerator.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakePassphraseGenerator.kt
deleted file mode 100644
index a089920422..0000000000
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakePassphraseGenerator.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.auth
-
-import io.element.android.libraries.matrix.impl.keys.PassphraseGenerator
-import io.element.android.libraries.matrix.test.A_PASSPHRASE
-
-class FakePassphraseGenerator(
-    private val passphrase: () -> String? = { A_PASSPHRASE }
-) : PassphraseGenerator {
-    override fun generatePassphrase(): String? = passphrase()
-}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeSecretGenerator.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeSecretGenerator.kt
new file mode 100644
index 0000000000..12c227946a
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeSecretGenerator.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.auth
+
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+import io.element.android.libraries.matrix.impl.keys.SecretGenerator
+import io.element.android.libraries.matrix.test.A_PASSPHRASE
+
+class FakeSecretGenerator(
+    private val passphrase: (Int) -> String? = { A_PASSPHRASE },
+    private val key: (Int) -> ByteArray = { ByteArray(it) { 0 } },
+) : SecretGenerator {
+    override fun generatePassphrase(size: Int): ClientSecret.Passphrase? = passphrase(size)?.let { ClientSecret.Passphrase(it) }
+    override fun generateKey(size: Int): ClientSecret.RawKey = ClientSecret.RawKey(key(size))
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeUserCertificatesProvider.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeUserCertificatesProvider.kt
deleted file mode 100644
index 955af4a23d..0000000000
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/FakeUserCertificatesProvider.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.auth
-
-import io.element.android.libraries.matrix.impl.certificates.UserCertificatesProvider
-
-class FakeUserCertificatesProvider : UserCertificatesProvider {
-    override fun provides(): List<ByteArray> {
-        return emptyList()
-    }
-}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetailsKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetailsKtTest.kt
index a5c7b2dbc8..63f573536c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetailsKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/HomeserverDetailsKtTest.kt
@@ -20,7 +20,7 @@ class HomeserverDetailsKtTest {
         val homeserverLoginDetails = FakeFfiHomeserverLoginDetails(
             url = "https://example.org",
             supportsPasswordLogin = true,
-            supportsOidcLogin = false
+            supportsOAuthLogin = false
         )
 
         // When
@@ -31,7 +31,7 @@ class HomeserverDetailsKtTest {
             MatrixHomeServerDetails(
                 url = "https://example.org",
                 supportsPasswordLogin = true,
-                supportsOidcLogin = false
+                supportsOAuthLogin = false
             )
         )
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProviderTest.kt
similarity index 76%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProviderTest.kt
index 095cf54946..3b54f2d1f3 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OAuthConfigurationProviderTest.kt
@@ -10,18 +10,18 @@ package io.element.android.libraries.matrix.impl.auth
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.auth.FAKE_REDIRECT_URL
-import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
+import io.element.android.libraries.matrix.test.auth.FakeOAuthRedirectUrlProvider
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import org.junit.Test
 
-class OidcConfigurationProviderTest {
+class OAuthConfigurationProviderTest {
     @Test
     fun get() {
-        val result = OidcConfigurationProvider(
+        val result = OAuthConfigurationProvider(
             buildMeta = aBuildMeta(
                 applicationName = "myName",
             ),
-            oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+            oAuthRedirectUrlProvider = FakeOAuthRedirectUrlProvider(),
         ).get()
         assertThat(result.clientName).isEqualTo("myName")
         assertThat(result.redirectUri).isEqualTo(FAKE_REDIRECT_URL)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeserverLoginCompatibilityCheckerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeserverLoginCompatibilityCheckerTest.kt
index 50d1f3723b..862019091b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeserverLoginCompatibilityCheckerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustHomeserverLoginCompatibilityCheckerTest.kt
@@ -18,8 +18,8 @@ import org.junit.Test
 
 class RustHomeserverLoginCompatibilityCheckerTest {
     @Test
-    fun `check - is valid if it supports OIDC login`() = runTest {
-        val sut = createChecker { FakeFfiHomeserverLoginDetails(supportsOidcLogin = true) }
+    fun `check - is valid if it supports OAuth login`() = runTest {
+        val sut = createChecker { FakeFfiHomeserverLoginDetails(supportsOAuthLogin = true) }
         assertThat(sut.check("https://matrix.host.org").getOrNull()).isTrue()
     }
 
@@ -49,6 +49,5 @@ class RustHomeserverLoginCompatibilityCheckerTest {
                 FakeFfiClient(homeserverLoginDetailsResult = result)
             }
         },
-        userCertificatesProvider = FakeUserCertificatesProvider(),
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
index f4ce7b1fdd..f5f3ffd10b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
@@ -9,6 +9,9 @@
 package io.element.android.libraries.matrix.impl.auth
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.impl.ClientBuilderProvider
 import io.element.android.libraries.matrix.impl.FakeClientBuilderProvider
 import io.element.android.libraries.matrix.impl.createRustMatrixClientFactory
@@ -16,7 +19,7 @@ import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClient
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClientBuilder
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiHomeserverLoginDetails
 import io.element.android.libraries.matrix.impl.paths.SessionPathsFactory
-import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
+import io.element.android.libraries.matrix.test.auth.FakeOAuthRedirectUrlProvider
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
@@ -50,6 +53,7 @@ class RustMatrixAuthenticationServiceTest {
     private fun TestScope.createRustMatrixAuthenticationService(
         sessionStore: SessionStore = InMemorySessionStore(),
         clientBuilderProvider: ClientBuilderProvider = FakeClientBuilderProvider(),
+        enterpriseService: EnterpriseService = FakeEnterpriseService(),
     ): RustMatrixAuthenticationService {
         val baseDirectory = File("/base")
         val cacheDirectory = File("/cache")
@@ -63,11 +67,13 @@ class RustMatrixAuthenticationServiceTest {
             coroutineDispatchers = testCoroutineDispatchers(),
             sessionStore = sessionStore,
             rustMatrixClientFactory = rustMatrixClientFactory,
-            passphraseGenerator = FakePassphraseGenerator(),
-            oidcConfigurationProvider = OidcConfigurationProvider(
+            secretGenerator = FakeSecretGenerator(),
+            oAuthConfigurationProvider = OAuthConfigurationProvider(
                 buildMeta = aBuildMeta(),
-                oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+                oAuthRedirectUrlProvider = FakeOAuthRedirectUrlProvider(),
             ),
+            enterpriseService = enterpriseService,
+            featureFlagService = FakeFeatureFlagService(),
         )
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapperTest.kt
index 0ef20c82a6..4de5e55985 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/QrErrorMapperTest.kt
@@ -32,7 +32,7 @@ class QrErrorMapperTest {
         assertThat(QrErrorMapper.map(RustHumanQrLoginException.OtherDeviceNotSignedIn())).isEqualTo(QrLoginException.OtherDeviceNotSignedIn)
         assertThat(QrErrorMapper.map(RustHumanQrLoginException.LinkingNotSupported())).isEqualTo(QrLoginException.LinkingNotSupported)
         assertThat(QrErrorMapper.map(RustHumanQrLoginException.Unknown())).isEqualTo(QrLoginException.Unknown)
-        assertThat(QrErrorMapper.map(RustHumanQrLoginException.OidcMetadataInvalid())).isEqualTo(QrLoginException.OidcMetadataInvalid)
+        assertThat(QrErrorMapper.map(RustHumanQrLoginException.OAuthMetadataInvalid())).isEqualTo(QrLoginException.OAuthMetadataInvalid)
         assertThat(QrErrorMapper.map(RustHumanQrLoginException.SlidingSyncNotAvailable())).isEqualTo(QrLoginException.SlidingSyncNotAvailable)
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimatorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimatorTest.kt
new file mode 100644
index 0000000000..affe8195d9
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/encryption/RustPasswordStrengthEstimatorTest.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.encryption
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthRanking
+import io.element.android.libraries.matrix.test.encryption.FakePasswordStrengthEstimator
+import io.element.android.libraries.matrix.test.encryption.aPasswordStrengthEstimate
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.PasswordStrengthEstimate as SdkPasswordStrengthEstimate
+import org.matrix.rustcomponents.sdk.PasswordStrengthRanking as SdkPasswordStrengthRanking
+
+class RustPasswordStrengthEstimatorTest {
+    @Test
+    fun `each SDK ranking maps to the matching api ranking`() {
+        assertThat(SdkPasswordStrengthRanking.VERY_WEAK.toApiModel()).isEqualTo(PasswordStrengthRanking.VeryWeak)
+        assertThat(SdkPasswordStrengthRanking.WEAK.toApiModel()).isEqualTo(PasswordStrengthRanking.Weak)
+        assertThat(SdkPasswordStrengthRanking.FAIR.toApiModel()).isEqualTo(PasswordStrengthRanking.Fair)
+        assertThat(SdkPasswordStrengthRanking.STRONG.toApiModel()).isEqualTo(PasswordStrengthRanking.Strong)
+        assertThat(SdkPasswordStrengthRanking.VERY_STRONG.toApiModel()).isEqualTo(PasswordStrengthRanking.VeryStrong)
+    }
+
+    @Test
+    fun `an SDK estimate forwards its ranking, score and normalScore to the api model`() {
+        val sdkEstimate = SdkPasswordStrengthEstimate(
+            ranking = SdkPasswordStrengthRanking.FAIR,
+            guesses = 1_000_000uL,
+            score = 6.0,
+            normalScore = 0.35,
+            feedback = null,
+        )
+        assertThat(sdkEstimate.toApiModel()).isEqualTo(
+            aPasswordStrengthEstimate(
+                ranking = PasswordStrengthRanking.Fair,
+                score = 6.0,
+                normalScore = 0.35,
+            )
+        )
+    }
+
+    @Test
+    fun `the fake estimator returns its configured estimate`() {
+        val estimate = aPasswordStrengthEstimate(ranking = PasswordStrengthRanking.Strong)
+        val fake = FakePasswordStrengthEstimator { _, _ -> estimate }
+        assertThat(fake.estimate("hunter2")).isEqualTo(estimate)
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt
index 41823a0fbb..8689de3c9b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItem.kt
@@ -14,10 +14,9 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import org.matrix.rustcomponents.sdk.EventOrTransactionId
 import org.matrix.rustcomponents.sdk.EventSendState
 import org.matrix.rustcomponents.sdk.EventTimelineItem
-import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo
+import org.matrix.rustcomponents.sdk.LazyTimelineItemProvider
 import org.matrix.rustcomponents.sdk.ProfileDetails
 import org.matrix.rustcomponents.sdk.Receipt
-import org.matrix.rustcomponents.sdk.ShieldState
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 import uniffi.matrix_sdk_ui.EventItemOrigin
 
@@ -26,37 +25,35 @@ internal fun aRustEventTimelineItem(
     eventOrTransactionId: EventOrTransactionId = EventOrTransactionId.EventId(AN_EVENT_ID.value),
     sender: String = A_USER_ID.value,
     senderProfile: ProfileDetails = ProfileDetails.Unavailable,
+    forwarder: String? = null,
+    forwarderProfile: ProfileDetails? = null,
     isOwn: Boolean = true,
     isEditable: Boolean = true,
     content: TimelineItemContent = aRustTimelineItemContentMsgLike(),
+    eventTypeRaw: String? = null,
     timestamp: ULong = 0uL,
-    debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
     localSendState: EventSendState? = null,
+    localCreatedAt: ULong? = null,
     readReceipts: Map<String, Receipt> = emptyMap(),
     origin: EventItemOrigin? = EventItemOrigin.SYNC,
     canBeRepliedTo: Boolean = true,
-    shieldsState: ShieldState = ShieldState.None,
-    localCreatedAt: ULong? = null,
-    forwarder: String? = null,
-    forwarderProfile: ProfileDetails? = null,
+    lazyProvider: LazyTimelineItemProvider = FakeFfiLazyTimelineItemProvider(),
 ) = EventTimelineItem(
     isRemote = isRemote,
     eventOrTransactionId = eventOrTransactionId,
     sender = sender,
     senderProfile = senderProfile,
-    timestamp = timestamp,
-    isOwn = isOwn,
-    isEditable = isEditable,
-    canBeRepliedTo = canBeRepliedTo,
-    content = content,
-    localSendState = localSendState,
-    readReceipts = readReceipts,
-    origin = origin,
-    localCreatedAt = localCreatedAt,
-    lazyProvider = FakeFfiLazyTimelineItemProvider(
-        debugInfo = debugInfo,
-        shieldsState = shieldsState,
-    ),
     forwarder = forwarder,
     forwarderProfile = forwarderProfile,
+    isOwn = isOwn,
+    isEditable = isEditable,
+    content = content,
+    eventTypeRaw = eventTypeRaw,
+    timestamp = timestamp,
+    localSendState = localSendState,
+    localCreatedAt = localCreatedAt,
+    readReceipts = readReceipts,
+    origin = origin,
+    canBeRepliedTo = canBeRepliedTo,
+    lazyProvider = lazyProvider,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
index 4db2db7107..63ad77238b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.matrix.impl.fixtures.factories
 
 import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEvent
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_USER_NAME
@@ -66,8 +67,11 @@ internal fun aRustNotificationRoomInfo(
     joinedMembersCount: ULong = 2u,
     isEncrypted: Boolean? = true,
     isDirect: Boolean = false,
+    isDm: Boolean = false,
     joinRule: JoinRule? = null,
     isSpace: Boolean = false,
+    serviceMembers: List<UserId> = emptyList(),
+    activeServiceMemberCount: Int = 0,
 ) = NotificationRoomInfo(
     displayName = displayName,
     avatarUrl = avatarUrl,
@@ -76,8 +80,11 @@ internal fun aRustNotificationRoomInfo(
     joinedMembersCount = joinedMembersCount,
     isEncrypted = isEncrypted,
     isDirect = isDirect,
+    isDm = isDm,
     joinRule = joinRule,
     isSpace = isSpace,
+    serviceMembers = serviceMembers.map { it.value },
+    activeServiceMembersCount = activeServiceMemberCount.toULong(),
 )
 
 internal fun aRustNotificationEventTimeline(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomHero.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomHero.kt
index 6abb08c667..66ee027443 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomHero.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomHero.kt
@@ -11,11 +11,17 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.test.A_USER_ID
 import org.matrix.rustcomponents.sdk.RoomHero
+import org.matrix.rustcomponents.sdk.UserCall
+import org.matrix.rustcomponents.sdk.UserStatus
 
 internal fun aRustRoomHero(
     userId: UserId = A_USER_ID,
+    status: UserStatus? = null,
+    call: UserCall? = null,
 ) = RoomHero(
     userId = userId.value,
     displayName = "displayName",
     avatarUrl = "avatarUrl",
+    status = status,
+    call = call,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt
index 1b0cc12461..cb5e221dc9 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt
@@ -62,6 +62,9 @@ internal fun aRustRoomInfo(
     serviceMembers: List<String> = emptyList(),
     isLowPriority: Boolean = false,
     activeRoomCallConsensusIntent: RtcCallIntentConsensus = RtcCallIntentConsensus.None,
+    activeServiceMembersCount: Int = 0,
+    isDm: Boolean = false,
+    fullyReadEventId: String? = null,
 ) = RoomInfo(
     id = id,
     displayName = displayName,
@@ -101,4 +104,7 @@ internal fun aRustRoomInfo(
     serviceMembers = serviceMembers,
     isLowPriority = isLowPriority,
     activeRoomCallConsensusIntent = activeRoomCallConsensusIntent,
+    activeServiceMembersCount = activeServiceMembersCount.toULong(),
+    isDm = isDm,
+    fullyReadEventId = fullyReadEventId,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt
index 77fa814cca..e4ea392197 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt
@@ -12,6 +12,8 @@ import io.element.android.libraries.matrix.api.core.UserId
 import org.matrix.rustcomponents.sdk.MembershipState
 import org.matrix.rustcomponents.sdk.PowerLevel
 import org.matrix.rustcomponents.sdk.RoomMember
+import org.matrix.rustcomponents.sdk.UserCall
+import org.matrix.rustcomponents.sdk.UserStatus
 import uniffi.matrix_sdk.RoomMemberRole
 
 internal fun aRustRoomMember(
@@ -24,6 +26,9 @@ internal fun aRustRoomMember(
     isIgnored: Boolean = false,
     role: RoomMemberRole = RoomMemberRole.USER,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
+    status: UserStatus? = null,
+    call: UserCall? = null,
 ) = RoomMember(
     userId = userId.value,
     displayName = displayName,
@@ -34,4 +39,7 @@ internal fun aRustRoomMember(
     isIgnored = isIgnored,
     suggestedRoleForPowerLevel = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
+    status = status,
+    call = call,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
index 1c1bbb42e3..28af0093f6 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
@@ -22,6 +22,8 @@ internal fun aRustRoomPowerLevelsValues(
     roomAvatar: Long,
     roomTopic: Long,
     spaceChild: Long,
+    beacon: Long,
+    beaconInfo: Long,
 ) = RoomPowerLevelsValues(
     ban = ban,
     invite = invite,
@@ -33,5 +35,7 @@ internal fun aRustRoomPowerLevelsValues(
     roomName = roomName,
     roomAvatar = roomAvatar,
     roomTopic = roomTopic,
-    spaceChild = spaceChild
+    spaceChild = spaceChild,
+    beacon = beacon,
+    beaconInfo = beaconInfo,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchServiceResult.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchServiceResult.kt
new file mode 100644
index 0000000000..4e31ac89b7
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SearchServiceResult.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.factories
+
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_USER_ID
+import org.matrix.rustcomponents.sdk.MessageSearchResult
+import org.matrix.rustcomponents.sdk.ProfileDetails
+import org.matrix.rustcomponents.sdk.SearchServiceResult
+
+internal fun aRustSearchServiceResult(
+    eventId: String,
+    roomId: String = A_ROOM_ID.value,
+    sender: String = A_USER_ID.value,
+    body: String = "Hello",
+    timestamp: ULong = 0uL,
+) = SearchServiceResult.Message(
+    roomId = roomId,
+    result = MessageSearchResult(
+        eventId = eventId,
+        sender = sender,
+        senderProfile = ProfileDetails.Unavailable,
+        content = aRustTimelineItemContentMsgLike(body = body),
+        timestamp = timestamp,
+    ),
+)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/Session.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/Session.kt
index 4671c457b0..af7f44597c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/Session.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/Session.kt
@@ -24,6 +24,6 @@ internal fun aRustSession(
     userId = A_USER_ID.value,
     deviceId = A_DEVICE_ID.value,
     homeserverUrl = A_HOMESERVER_URL,
-    oidcData = null,
+    oauthData = null,
     slidingSyncVersion = proxy,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt
index 50115055c2..2eb46eddaf 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt
@@ -19,6 +19,7 @@ import org.matrix.rustcomponents.sdk.SpaceRoom
 internal fun aRustSpaceRoom(
     roomId: RoomId = A_ROOM_ID,
     isDirect: Boolean = false,
+    isDm: Boolean = false,
     canonicalAlias: String? = null,
     rawName: String? = null,
     displayName: String = "",
@@ -35,6 +36,7 @@ internal fun aRustSpaceRoom(
 ) = SpaceRoom(
     roomId = roomId.value,
     isDirect = isDirect,
+    isDm = isDm,
     canonicalAlias = canonicalAlias,
     rawName = rawName,
     displayName = displayName,
@@ -48,5 +50,5 @@ internal fun aRustSpaceRoom(
     childrenCount = childrenCount,
     state = state,
     heroes = heroes,
-    via = emptyList()
+    via = emptyList(),
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
index 877f2056e9..96303a257b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
@@ -8,12 +8,26 @@
 
 package io.element.android.libraries.matrix.impl.fixtures.factories
 
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiMediaSource
 import io.element.android.libraries.matrix.test.A_MESSAGE
+import org.matrix.rustcomponents.sdk.AudioInfo
+import org.matrix.rustcomponents.sdk.AudioMessageContent
+import org.matrix.rustcomponents.sdk.FileInfo
+import org.matrix.rustcomponents.sdk.FileMessageContent
 import org.matrix.rustcomponents.sdk.FormattedBody
+import org.matrix.rustcomponents.sdk.GalleryItemType
+import org.matrix.rustcomponents.sdk.GalleryMessageContent
+import org.matrix.rustcomponents.sdk.ImageInfo
+import org.matrix.rustcomponents.sdk.ImageMessageContent
+import org.matrix.rustcomponents.sdk.MediaSource
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
 import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.TextMessageContent
 import org.matrix.rustcomponents.sdk.TimelineEventContent
+import org.matrix.rustcomponents.sdk.UnstableAudioDetailsContent
+import org.matrix.rustcomponents.sdk.UnstableVoiceContent
+import org.matrix.rustcomponents.sdk.VideoInfo
+import org.matrix.rustcomponents.sdk.VideoMessageContent
 
 internal fun aRustTimelineEventContentMessageLike(
     content: MessageLikeEventContent = aRustMessageLikeEventContentRoomMessage(),
@@ -42,3 +56,94 @@ internal fun aRustTextMessageContent(
     body = body,
     formatted = formatted,
 )
+
+internal fun aRustMessageTypeGallery(
+    content: GalleryMessageContent = aRustGalleryMessageContent(),
+) = MessageType.Gallery(content = content)
+
+internal fun aRustGalleryMessageContent(
+    body: String = "A gallery",
+    formatted: FormattedBody? = null,
+    itemTypes: List<GalleryItemType> = listOf(aRustGalleryItemTypeImage()),
+) = GalleryMessageContent(body = body, formatted = formatted, itemtypes = itemTypes)
+
+internal fun aRustGalleryItemTypeImage(
+    content: ImageMessageContent = aRustImageMessageContent(),
+) = GalleryItemType.Image(content = content)
+
+internal fun aRustGalleryItemTypeAudio(
+    content: AudioMessageContent = aRustAudioMessageContent(),
+) = GalleryItemType.Audio(content = content)
+
+internal fun aRustGalleryItemTypeVideo(
+    content: VideoMessageContent = aRustVideoMessageContent(),
+) = GalleryItemType.Video(content = content)
+
+internal fun aRustGalleryItemTypeFile(
+    content: FileMessageContent = aRustFileMessageContent(),
+) = GalleryItemType.File(content = content)
+
+internal fun aRustGalleryItemTypeOther(
+    itemType: String = "m.unknown",
+    body: String = "unknown item",
+) = GalleryItemType.Other(itemtype = itemType, body = body)
+
+internal fun aRustImageMessageContent(
+    filename: String = "image.jpg",
+    caption: String? = null,
+    formattedCaption: FormattedBody? = null,
+    source: MediaSource = FakeFfiMediaSource("mxc://server/image"),
+    info: ImageInfo? = null,
+) = ImageMessageContent(
+    filename = filename,
+    caption = caption,
+    formattedCaption = formattedCaption,
+    source = source,
+    info = info,
+)
+
+internal fun aRustAudioMessageContent(
+    filename: String = "audio.mp3",
+    caption: String? = null,
+    formattedCaption: FormattedBody? = null,
+    source: MediaSource = FakeFfiMediaSource("mxc://server/audio"),
+    info: AudioInfo? = null,
+    audio: UnstableAudioDetailsContent? = null,
+    voice: UnstableVoiceContent? = null,
+) = AudioMessageContent(
+    filename = filename,
+    caption = caption,
+    formattedCaption = formattedCaption,
+    source = source,
+    info = info,
+    audio = audio,
+    voice = voice,
+)
+
+internal fun aRustVideoMessageContent(
+    filename: String = "video.mp4",
+    caption: String? = null,
+    formattedCaption: FormattedBody? = null,
+    source: MediaSource = FakeFfiMediaSource("mxc://server/video"),
+    info: VideoInfo? = null,
+) = VideoMessageContent(
+    filename = filename,
+    caption = caption,
+    formattedCaption = formattedCaption,
+    source = source,
+    info = info,
+)
+
+internal fun aRustFileMessageContent(
+    filename: String = "document.pdf",
+    caption: String? = null,
+    formattedCaption: FormattedBody? = null,
+    source: MediaSource = FakeFfiMediaSource("mxc://server/file"),
+    info: FileInfo? = null,
+) = FileMessageContent(
+    filename = filename,
+    caption = caption,
+    formattedCaption = formattedCaption,
+    source = source,
+    info = info,
+)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UserProfile.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UserProfile.kt
index 8713e08f1c..947e6e7aa1 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UserProfile.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UserProfile.kt
@@ -9,14 +9,20 @@
 package io.element.android.libraries.matrix.impl.fixtures.factories
 
 import io.element.android.libraries.matrix.test.A_USER_ID
+import org.matrix.rustcomponents.sdk.UserCall
 import org.matrix.rustcomponents.sdk.UserProfile
+import org.matrix.rustcomponents.sdk.UserStatus
 
 internal fun aRustUserProfile(
     userId: String = A_USER_ID.value,
     displayName: String = "displayName",
     avatarUrl: String = "avatarUrl",
+    status: UserStatus? = null,
+    call: UserCall? = null,
 ) = UserProfile(
     userId = userId,
     displayName = displayName,
     avatarUrl = avatarUrl,
+    status = status,
+    call = call,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt
index 2aec38fcde..efae379415 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClient.kt
@@ -9,7 +9,9 @@
 package io.element.android.libraries.matrix.impl.fixtures.fakes
 
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSession
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustUserProfile
 import io.element.android.libraries.matrix.test.A_DEVICE_ID
+import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
@@ -17,6 +19,7 @@ import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientDelegate
 import org.matrix.rustcomponents.sdk.CreateRoomParameters
 import org.matrix.rustcomponents.sdk.Encryption
+import org.matrix.rustcomponents.sdk.HomeserverCapabilities
 import org.matrix.rustcomponents.sdk.HomeserverLoginDetails
 import org.matrix.rustcomponents.sdk.IgnoredUsersListener
 import org.matrix.rustcomponents.sdk.NoHandle
@@ -40,20 +43,23 @@ import uniffi.matrix_sdk_base.MediaRetentionPolicy
 class FakeFfiClient(
     private val userId: String = A_USER_ID.value,
     private val deviceId: String = A_DEVICE_ID.value,
+    private val homeserver: String = A_HOMESERVER_URL,
     private val notificationClient: NotificationClient = FakeFfiNotificationClient(),
     private val notificationSettings: NotificationSettings = FakeFfiNotificationSettings(),
     private val encryption: Encryption = FakeFfiEncryption(),
     private val session: Session = aRustSession(),
     private val clearCachesResult: () -> Unit = { lambdaError() },
     private val withUtdHook: (UnableToDecryptDelegate) -> Unit = { lambdaError() },
-    private val getProfileResult: (String) -> UserProfile = { UserProfile(userId = userId, displayName = null, avatarUrl = null) },
+    private val getProfileResult: (String) -> UserProfile = { aRustUserProfile() },
     private val homeserverLoginDetailsResult: () -> HomeserverLoginDetails = { lambdaError() },
     private val getStoreSizesResult: () -> StoreSizes = { lambdaError() },
     private val createRoomResult: (CreateRoomParameters) -> String = { lambdaError() },
+    private val homeserverCapabilities: HomeserverCapabilities = FakeFfiHomeserverCapabilities(),
     private val closeResult: () -> Unit = {},
 ) : Client(NoHandle) {
     override fun userId(): String = userId
     override fun deviceId(): String = deviceId
+    override fun homeserver(): String = homeserver
     override suspend fun notificationClient(processSetup: NotificationProcessSetup) = notificationClient
     override suspend fun getNotificationSettings(): NotificationSettings = notificationSettings
     override fun encryption(): Encryption = encryption
@@ -71,6 +77,7 @@ class FakeFfiClient(
         deviceDisplayName: String,
         profileTag: String?,
         lang: String,
+        append: Boolean,
     ) = Unit
 
     override suspend fun deletePusher(identifiers: PusherIdentifiers) = Unit
@@ -103,5 +110,9 @@ class FakeFfiClient(
         return createRoomResult(request)
     }
 
+    override fun homeserverCapabilities(): HomeserverCapabilities {
+        return homeserverCapabilities
+    }
+
     override fun close() = closeResult()
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
index 59d82487b9..623fe9a8cf 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiClientBuilder.kt
@@ -17,6 +17,7 @@ import org.matrix.rustcomponents.sdk.RequestConfig
 import org.matrix.rustcomponents.sdk.SlidingSyncVersionBuilder
 import org.matrix.rustcomponents.sdk.SqliteStoreBuilder
 import uniffi.matrix_sdk.BackupDownloadStrategy
+import uniffi.matrix_sdk_base.DmRoomDefinition
 import uniffi.matrix_sdk_crypto.CollectStrategy
 import uniffi.matrix_sdk_crypto.DecryptionSettings
 
@@ -47,5 +48,6 @@ class FakeFfiClientBuilder(
     override fun sqliteStore(config: SqliteStoreBuilder): ClientBuilder = this
     override fun inMemoryStore(): ClientBuilder = this
     override fun crossProcessLockConfig(crossProcessLockConfig: CrossProcessLockConfig): ClientBuilder = this
+    override fun dmRoomDefinition(dmRoomDefinition: DmRoomDefinition): ClientBuilder = this
     override suspend fun build() = buildResult()
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiContinuationMessageSender.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiContinuationMessageSender.kt
new file mode 100644
index 0000000000..4f5358658f
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiContinuationMessageSender.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.fakes
+
+import io.element.android.tests.testutils.lambda.lambdaError
+import org.matrix.rustcomponents.sdk.ContinuationMessageSender
+import org.matrix.rustcomponents.sdk.NoHandle
+
+class FakeFfiContinuationMessageSender(
+    private val confirmResult: () -> Unit = { lambdaError() },
+    private val cancelResult: () -> Unit = { lambdaError() },
+) : ContinuationMessageSender(NoHandle) {
+    override suspend fun confirm() {
+        confirmResult()
+    }
+
+    override suspend fun cancel() {
+        cancelResult()
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
index cd0733695b..0899b16325 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiGrantLoginWithQrCodeHandler.kt
@@ -16,8 +16,8 @@ import org.matrix.rustcomponents.sdk.NoHandle
 import org.matrix.rustcomponents.sdk.QrCodeData
 
 class FakeFfiGrantLoginWithQrCodeHandler(
-    private val generateResult: () -> Unit = {},
-    private val scanResult: (QrCodeData) -> Unit = {},
+    private val generateResult: suspend () -> Unit = {},
+    private val scanResult: suspend (QrCodeData) -> Unit = {},
 ) : GrantLoginWithQrCodeHandler(NoHandle) {
     private var generateProgressListener: GrantGeneratedQrLoginProgressListener? = null
     private var scanProgressListener: GrantQrLoginProgressListener? = null
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverCapabilities.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverCapabilities.kt
new file mode 100644
index 0000000000..4c60cbbb49
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverCapabilities.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.fakes
+
+import io.element.android.tests.testutils.lambda.lambdaError
+import org.matrix.rustcomponents.sdk.ExtendedProfileFields
+import org.matrix.rustcomponents.sdk.HomeserverCapabilities
+import org.matrix.rustcomponents.sdk.NoHandle
+
+class FakeFfiHomeserverCapabilities(
+    private val refresh: () -> Unit = { lambdaError() },
+    private val canChangeDisplayName: () -> Boolean = { lambdaError() },
+    private val canChangeAvatar: () -> Boolean = { lambdaError() },
+    private val canChangePassword: () -> Boolean = { lambdaError() },
+    private val canChangeThirdPartyIds: () -> Boolean = { lambdaError() },
+    private val canGetLoginToken: () -> Boolean = { lambdaError() },
+    private val forgetsRoomWhenLeaving: () -> Boolean = { lambdaError() },
+    private val extendedProfileFields: () -> ExtendedProfileFields = { lambdaError() },
+) : HomeserverCapabilities(NoHandle) {
+    override suspend fun refresh() = refresh.invoke()
+    override suspend fun canChangeDisplayname(): Boolean = canChangeDisplayName.invoke()
+    override suspend fun canChangeAvatar(): Boolean = canChangeAvatar.invoke()
+    override suspend fun canChangePassword(): Boolean = canChangePassword.invoke()
+    override suspend fun canChangeThirdpartyIds(): Boolean = canChangeThirdPartyIds.invoke()
+    override suspend fun canGetLoginToken(): Boolean = canGetLoginToken.invoke()
+    override suspend fun forgetsRoomWhenLeaving(): Boolean = forgetsRoomWhenLeaving.invoke()
+    override suspend fun extendedProfileFields(): ExtendedProfileFields = extendedProfileFields.invoke()
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverLoginDetails.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverLoginDetails.kt
index ade3a2328f..5351fbc8df 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverLoginDetails.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiHomeserverLoginDetails.kt
@@ -14,11 +14,11 @@ import org.matrix.rustcomponents.sdk.NoHandle
 class FakeFfiHomeserverLoginDetails(
     private val url: String = "https://example.org",
     private val supportsPasswordLogin: Boolean = false,
-    private val supportsOidcLogin: Boolean = false,
+    private val supportsOAuthLogin: Boolean = false,
     private val supportsSsoLogin: Boolean = false,
 ) : HomeserverLoginDetails(NoHandle) {
     override fun url(): String = url
-    override fun supportsOidcLogin(): Boolean = supportsOidcLogin
+    override fun supportsOauthLogin(): Boolean = supportsOAuthLogin
     override fun supportsPasswordLogin(): Boolean = supportsPasswordLogin
     override fun supportsSsoLogin(): Boolean = supportsSsoLogin
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiMediaSource.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiMediaSource.kt
new file mode 100644
index 0000000000..7dbcb1d762
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiMediaSource.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.fakes
+
+import org.matrix.rustcomponents.sdk.MediaSource
+import org.matrix.rustcomponents.sdk.NoHandle
+
+internal class FakeFfiMediaSource(
+    private val fakeUrl: String = "mxc://server/media",
+) : MediaSource(NoHandle) {
+    override fun url(): String = fakeUrl
+    override fun toJson(): String = """{"url":"$fakeUrl"}"""
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomPowerLevels.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomPowerLevels.kt
index c47c4406b6..985dc935ff 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomPowerLevels.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiRoomPowerLevels.kt
@@ -32,4 +32,6 @@ fun defaultFfiRoomPowerLevelValues() = RoomPowerLevelsValues(
     roomTopic = 50,
     spaceChild = 50,
     usersDefault = 0,
+    beacon = 0,
+    beaconInfo = 0,
 )
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSearchService.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSearchService.kt
new file mode 100644
index 0000000000..e24d4eedd0
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSearchService.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.fakes
+
+import org.matrix.rustcomponents.sdk.NoHandle
+import org.matrix.rustcomponents.sdk.SearchService
+import org.matrix.rustcomponents.sdk.SearchServicePaginationStateListener
+import org.matrix.rustcomponents.sdk.SearchServiceResultsListener
+import org.matrix.rustcomponents.sdk.TaskHandle
+import uniffi.matrix_sdk_ui.SearchServicePaginationState
+
+class FakeFfiSearchService(
+    private val initialPaginationState: SearchServicePaginationState = SearchServicePaginationState.Idle(endReached = false),
+    private val setQueryLambda: (String) -> Unit = {},
+    private val paginateLambda: () -> Unit = {},
+) : SearchService(NoHandle) {
+    var resultsListener: SearchServiceResultsListener? = null
+        private set
+    var paginationStateListener: SearchServicePaginationStateListener? = null
+        private set
+    var subscribeToResultsCallCount = 0
+        private set
+
+    override suspend fun paginate() = paginateLambda()
+
+    override fun paginationState(): SearchServicePaginationState = initialPaginationState
+
+    override suspend fun setQuery(query: String) = setQueryLambda(query)
+
+    override fun subscribeToPaginationStateUpdates(listener: SearchServicePaginationStateListener): TaskHandle {
+        paginationStateListener = listener
+        return FakeFfiTaskHandle()
+    }
+
+    override suspend fun subscribeToResults(listener: SearchServiceResultsListener): TaskHandle {
+        subscribeToResultsCallCount++
+        resultsListener = listener
+        return FakeFfiTaskHandle()
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt
index c0ecc53d4f..56cc5b9a1f 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiSpaceRoomList.kt
@@ -40,7 +40,7 @@ class FakeFfiSpaceRoomList(
         return paginationStateResult()
     }
 
-    override fun rooms(): List<SpaceRoom> {
+    override suspend fun rooms(): List<SpaceRoom> {
         return roomsResult()
     }
 
@@ -53,7 +53,7 @@ class FakeFfiSpaceRoomList(
         spaceRoomListPaginationStateListener?.onUpdate(state)
     }
 
-    override fun subscribeToRoomUpdate(listener: SpaceRoomListEntriesListener): TaskHandle {
+    override suspend fun subscribeToRoomUpdate(listener: SpaceRoomListEntriesListener): TaskHandle {
         spaceRoomListEntriesListener = listener
         return FakeFfiTaskHandle()
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiThreadListService.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiThreadListService.kt
new file mode 100644
index 0000000000..009e6a3348
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeFfiThreadListService.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.fakes
+
+import org.matrix.rustcomponents.sdk.NoHandle
+import org.matrix.rustcomponents.sdk.TaskHandle
+import org.matrix.rustcomponents.sdk.ThreadListEntriesListener
+import org.matrix.rustcomponents.sdk.ThreadListItem
+import org.matrix.rustcomponents.sdk.ThreadListPaginationStateListener
+import org.matrix.rustcomponents.sdk.ThreadListService
+import org.matrix.rustcomponents.sdk.ThreadListUpdate
+import uniffi.matrix_sdk_ui.ThreadListPaginationState
+
+class FakeFfiThreadListService(
+    private val subscribeToItemsUpdates: (ThreadListEntriesListener) -> TaskHandle = { FakeFfiTaskHandle() },
+    private val subscribeToPaginationStateUpdates: (ThreadListPaginationStateListener) -> TaskHandle = { FakeFfiTaskHandle() },
+    private val items: () -> List<ThreadListItem> = { emptyList() },
+    private val paginationState: () -> ThreadListPaginationState = { ThreadListPaginationState.Idle(endReached = false) },
+    private val paginate: suspend () -> Unit = {},
+    private val reset: suspend () -> Unit = {},
+    private val destroy: () -> Unit = {},
+) : ThreadListService(NoHandle) {
+    private var itemsListener: ThreadListEntriesListener? = null
+    private var paginationStateListener: ThreadListPaginationStateListener? = null
+
+    override fun subscribeToItemsUpdates(listener: ThreadListEntriesListener): TaskHandle {
+        itemsListener = listener
+        return subscribeToItemsUpdates.invoke(listener)
+    }
+
+    override fun subscribeToPaginationStateUpdates(listener: ThreadListPaginationStateListener): TaskHandle {
+        paginationStateListener = listener
+        return subscribeToPaginationStateUpdates.invoke(listener)
+    }
+
+    override fun items(): List<ThreadListItem> = items.invoke()
+
+    override fun paginationState(): ThreadListPaginationState = paginationState.invoke()
+
+    override suspend fun paginate() = paginate.invoke()
+
+    override suspend fun reset() = reset.invoke()
+
+    override fun destroy() = destroy.invoke()
+
+    fun emitUpdates(updates: List<ThreadListUpdate>) {
+        itemsListener?.onUpdate(updates)
+    }
+
+    fun emitPaginationState(state: ThreadListPaginationState) {
+        paginationStateListener?.onUpdate(state)
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGeneratorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGeneratorTest.kt
deleted file mode 100644
index 465d920074..0000000000
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGeneratorTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.keys
-
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-@RunWith(RobolectricTestRunner::class)
-class DefaultPassphraseGeneratorTest {
-    @Test
-    fun `check that generated passphrase has the expected length`() {
-        val passphraseGenerator = DefaultPassphraseGenerator()
-        val passphrase = passphraseGenerator.generatePassphrase()
-        assertThat(passphrase!!.length).isEqualTo(342)
-    }
-}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGeneratorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGeneratorTest.kt
new file mode 100644
index 0000000000..b18933fb53
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultSecretGeneratorTest.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.keys
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.crypto.ClientSecret
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import org.junit.Test
+
+class DefaultSecretGeneratorTest : RobolectricTest() {
+    @Test
+    fun `check that generated passphrase has the expected length`() {
+        val secretGenerator = DefaultSecretGenerator()
+        val passphrase = secretGenerator.generatePassphrase(256)
+        assertThat(passphrase).isInstanceOf(ClientSecret.Passphrase::class.java)
+        // Size after Base64 encoding should be 4/3 of the original size, without padding
+        assertThat(passphrase!!.value).hasLength(342)
+    }
+
+    @Test
+    fun `check that generated key has the expected length`() {
+        val secretGenerator = DefaultSecretGenerator()
+        val key = secretGenerator.generateKey(123)
+        assertThat(key).isInstanceOf(ClientSecret.RawKey::class.java)
+        assertThat(key.bytes).hasLength(123)
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
index a180e4d515..c0781972ac 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkDesktopHandlerTest.kt
@@ -13,8 +13,10 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
 import io.element.android.libraries.matrix.api.linknewdevice.LinkDesktopStep
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiContinuationMessageSender
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiGrantLoginWithQrCodeHandler
 import io.element.android.libraries.matrix.test.QR_CODE_DATA
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -29,7 +31,13 @@ import org.matrix.rustcomponents.sdk.QrCodeDecodeException
 class RustLinkDesktopHandlerTest {
     @Test
     fun `handleScannedQrCode function works as expected`() = runTest {
-        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
         val sut = createRustLinkDesktopHandler(
             handler,
         )
@@ -44,7 +52,7 @@ class RustLinkDesktopHandlerTest {
             listOf(
                 GrantQrLoginProgress.Starting to LinkDesktopStep.Starting,
                 GrantQrLoginProgress.SyncingSecrets to LinkDesktopStep.SyncingSecrets,
-                GrantQrLoginProgress.WaitingForAuth("aVerificationUri")
+                GrantQrLoginProgress.WaitingForAuth("aVerificationUri", FakeFfiContinuationMessageSender())
                     to LinkDesktopStep.WaitingForAuth("aVerificationUri"),
                 GrantQrLoginProgress.EstablishingSecureChannel(1.toUByte(), "1")
                     to LinkDesktopStep.EstablishingSecureChannel(1.toUByte(), "1"),
@@ -53,6 +61,36 @@ class RustLinkDesktopHandlerTest {
                 handler.emitScanProgress(progress)
                 assertThat(awaitItem()).isEqualTo(expectedStep)
             }
+            // scan returns, no new event is emitted
+            completable.complete(Unit)
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when scan does not emits the Done state, the code emits it`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            scanResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
+        val sut = createRustLinkDesktopHandler(
+            handler,
+        )
+        sut.linkDesktopStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkDesktopStep.Uninitialized)
+            backgroundScope.launch {
+                sut.handleScannedQrCode(QR_CODE_DATA)
+            }
+            runCurrent()
+            handler.emitScanProgress(GrantQrLoginProgress.Starting)
+            assertThat(awaitItem()).isEqualTo(LinkDesktopStep.Starting)
+            // scan returns, Done event is emitted
+            completable.complete(Unit)
+            assertThat(awaitItem()).isEqualTo(LinkDesktopStep.Done)
         }
     }
 
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
index aa13996e8a..8c0306c8ad 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/linknewdevice/RustLinkMobileHandlerTest.kt
@@ -14,9 +14,11 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.linknewdevice.ErrorType
 import io.element.android.libraries.matrix.api.linknewdevice.LinkMobileStep
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiCheckCodeSender
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiContinuationMessageSender
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiGrantLoginWithQrCodeHandler
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiQrCodeData
 import io.element.android.libraries.matrix.test.QR_CODE_DATA_RECIPROCATE
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -30,7 +32,13 @@ import org.matrix.rustcomponents.sdk.HumanQrGrantLoginException
 class RustLinkMobileHandlerTest {
     @Test
     fun `start function works as expected`() = runTest {
-        val handler = FakeFfiGrantLoginWithQrCodeHandler()
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
         val sut = createRustLinkMobileHandler(
             handler,
         )
@@ -45,7 +53,7 @@ class RustLinkMobileHandlerTest {
             listOf(
                 GrantGeneratedQrLoginProgress.Starting to LinkMobileStep.Starting::class.java,
                 GrantGeneratedQrLoginProgress.SyncingSecrets to LinkMobileStep.SyncingSecrets::class.java,
-                GrantGeneratedQrLoginProgress.WaitingForAuth("aVerificationUri")
+                GrantGeneratedQrLoginProgress.WaitingForAuth("aVerificationUri", FakeFfiContinuationMessageSender())
                     to LinkMobileStep.WaitingForAuth::class.java,
                 GrantGeneratedQrLoginProgress.QrScanned(FakeFfiCheckCodeSender())
                     to LinkMobileStep.QrScanned::class.java,
@@ -56,6 +64,36 @@ class RustLinkMobileHandlerTest {
                 handler.emitGenerateProgress(progress)
                 assertThat(awaitItem()).isInstanceOf(expectedStepClass)
             }
+            // generate returns, no new event is emitted
+            completable.complete(Unit)
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `when generates does not emits the Done state, the code emits it`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                // Ensure that the coroutine is hold
+                completable.await()
+            }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            handler.emitGenerateProgress(GrantGeneratedQrLoginProgress.Starting)
+            assertThat(awaitItem()).isEqualTo(LinkMobileStep.Starting)
+            // generate returns, Done event is emitted
+            completable.complete(Unit)
+            assertThat(awaitItem()).isEqualTo(LinkMobileStep.Done)
         }
     }
 
@@ -81,6 +119,61 @@ class RustLinkMobileHandlerTest {
         }
     }
 
+    @Test
+    fun `when start throws HumanQrGrantLoginException_NotFound when in state QrReady, the handler emits QrRotating step`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                completable.await()
+                throw HumanQrGrantLoginException.NotFound("Timeout")
+            }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            handler.emitGenerateProgress(GrantGeneratedQrLoginProgress.QrReady(FakeFfiQrCodeData(toBytesResult = { QR_CODE_DATA_RECIPROCATE })))
+            val readyState = awaitItem()
+            assertThat(readyState).isInstanceOf(LinkMobileStep.QrReady::class.java)
+            // generate returns, error is emitted
+            completable.complete(Unit)
+            val qrRotatingState = awaitItem()
+            assertThat(qrRotatingState).isEqualTo(LinkMobileStep.QrRotating)
+        }
+    }
+
+    @Test
+    fun `when start throws HumanQrGrantLoginException_Expired, the handler emits QrRotating step`() = runTest {
+        val completable = CompletableDeferred<Unit>()
+        val handler = FakeFfiGrantLoginWithQrCodeHandler(
+            generateResult = {
+                completable.await()
+                throw HumanQrGrantLoginException.Expired("Expired")
+            }
+        )
+        val sut = createRustLinkMobileHandler(
+            handler,
+        )
+        sut.linkMobileStep.test {
+            val initialItem = awaitItem()
+            assertThat(initialItem).isEqualTo(LinkMobileStep.Uninitialized)
+            backgroundScope.launch {
+                sut.start()
+            }
+            runCurrent()
+            // generate returns, error is emitted
+            completable.complete(Unit)
+            val qrRotatingState = awaitItem()
+            assertThat(qrRotatingState).isEqualTo(LinkMobileStep.QrRotating)
+        }
+    }
+
     private fun TestScope.createRustLinkMobileHandler(
         handler: FakeFfiGrantLoginWithQrCodeHandler = FakeFfiGrantLoginWithQrCodeHandler(),
     ) = RustLinkMobileHandler(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
index e5fc8b154f..6042f195f8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
@@ -10,8 +10,8 @@ package io.element.android.libraries.matrix.impl.mapper
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSession
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
 import io.element.android.libraries.matrix.test.A_DEVICE_ID
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL_2
@@ -36,7 +36,7 @@ class SessionKtTest {
         assertThat(result.refreshToken).isEqualTo("refreshToken")
         assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL)
         assertThat(result.isTokenValid).isTrue()
-        assertThat(result.oidcData).isNull()
+        assertThat(result.oAuthData).isNull()
         assertThat(result.loginType).isEqualTo(LoginType.PASSWORD)
         assertThat(result.loginTimestamp).isNotNull()
         assertThat(result.passphrase).isEqualTo(A_SECRET)
@@ -82,7 +82,7 @@ class SessionKtTest {
         assertThat(result.refreshToken).isNull()
         assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL)
         assertThat(result.isTokenValid).isTrue()
-        assertThat(result.oidcData).isNull()
+        assertThat(result.oAuthData).isNull()
         assertThat(result.loginType).isEqualTo(LoginType.PASSWORD)
         assertThat(result.loginTimestamp).isNotNull()
         assertThat(result.passphrase).isEqualTo(A_SECRET)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementActionKtTest.kt
similarity index 90%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementActionKtTest.kt
index 3637ef78cc..1495716e87 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oidc/AccountManagementActionKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/oauth/AccountManagementActionKtTest.kt
@@ -6,10 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.matrix.impl.oidc
+package io.element.android.libraries.matrix.impl.oauth
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
 import io.element.android.libraries.matrix.test.A_DEVICE_ID
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.AccountManagementAction as RustAccountManagementAction
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverterTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverterTest.kt
index dcd2c4594c..97b51c0026 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverterTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverterTest.kt
@@ -10,12 +10,10 @@ package io.element.android.libraries.matrix.impl.permalink
 
 import android.net.Uri
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultMatrixToConverterTest {
+class DefaultMatrixToConverterTest : RobolectricTest() {
     @Test
     fun `converting a matrix-to url does nothing`() {
         val url = Uri.parse("https://matrix.to/#/#element-android:matrix.org")
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersServiceTest.kt
index 61b2965cdd..b58c2985ff 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/pushers/RustPushersServiceTest.kt
@@ -48,6 +48,7 @@ private fun aSetHttpPusherData(
     deviceDisplayName: String = "deviceDisplayName",
     profileTag: String = "profileTag",
     lang: String = "lang",
+    append: Boolean = false,
 ) = SetHttpPusherData(
     pushKey = pushKey,
     appId = appId,
@@ -56,7 +57,8 @@ private fun aSetHttpPusherData(
     appDisplayName = appDisplayName,
     deviceDisplayName = deviceDisplayName,
     profileTag = profileTag,
-    lang = lang
+    lang = lang,
+    append = append,
 )
 
 private fun aUnsetHttpPusherData(
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventFilterFactory.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventFilterFactory.kt
index f35746d8d3..713e04d239 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventFilterFactory.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/FakeTimelineEventFilterFactory.kt
@@ -9,11 +9,12 @@
 package io.element.android.libraries.matrix.impl.room
 
 import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEventFilter
 import org.matrix.rustcomponents.sdk.TimelineEventFilter
 
 class FakeTimelineEventFilterFactory : TimelineEventFilterFactory {
-    override fun create(listStateEventType: List<StateEventType>): TimelineEventFilter {
+    override fun create(joinRule: JoinRule?, isEncrypted: Boolean?, excludedStateTypes: List<StateEventType>): TimelineEventFilter {
         return FakeFfiTimelineEventFilter()
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt
index 654989a393..d36bb80e96 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt
@@ -10,10 +10,12 @@ package io.element.android.libraries.matrix.impl.room
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.room.MessageEventType
+import org.junit.Ignore
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.MessageLikeEventType
+import uniffi.ruma_events.MessageLikeEventType
 
 class MessageEventTypeKtTest {
+    @Ignore("Can't use MessageLikeEventType as that will try accessing the Rust SDK")
     @Test
     fun `map Rust type should result to correct Kotlin type`() {
         assertThat(MessageLikeEventType.CallAnswer.map()).isEqualTo(MessageEventType.CallAnswer)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExtTest.kt
index 86a50c3926..dd91595359 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoExtTest.kt
@@ -20,8 +20,7 @@ class RoomInfoExtTest {
     @Test
     fun `get non empty element Heroes`() {
         val result = aRustRoomInfo(
-            isDirect = true,
-            activeMembersCount = 2uL,
+            isDm = true,
             heroes = listOf(aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEqualTo(
@@ -38,8 +37,7 @@ class RoomInfoExtTest {
     @Test
     fun `too many heroes and element Heroes is empty`() {
         val result = aRustRoomInfo(
-            isDirect = true,
-            activeMembersCount = 2uL,
+            isDm = true,
             heroes = listOf(aRustRoomHero(), aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEmpty()
@@ -48,18 +46,7 @@ class RoomInfoExtTest {
     @Test
     fun `not direct and element Heroes is empty`() {
         val result = aRustRoomInfo(
-            isDirect = false,
-            activeMembersCount = 2uL,
-            heroes = listOf(aRustRoomHero())
-        ).elementHeroes()
-        assertThat(result).isEmpty()
-    }
-
-    @Test
-    fun `too many members and element Heroes is empty`() {
-        val result = aRustRoomInfo(
-            isDirect = true,
-            activeMembersCount = 3uL,
+            isDm = false,
             heroes = listOf(aRustRoomHero())
         ).elementHeroes()
         assertThat(result).isEmpty()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
index ab353bc0f5..dc3b16ca3c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
@@ -86,6 +86,8 @@ class RoomInfoMapperTest {
                     privilegedCreatorsRole = true,
                     isLowPriority = true,
                     activeRoomCallConsensusIntent = RtcCallIntentConsensus.Full(RtcCallIntent.AUDIO),
+                    isDm = true,
+                    fullyReadEventId = AN_EVENT_ID.value,
                 )
             )
         ).isEqualTo(
@@ -136,6 +138,8 @@ class RoomInfoMapperTest {
                 privilegedCreatorRole = true,
                 isLowPriority = true,
                 activeCallIntentConsensus = CallIntentConsensus.Full(CallIntent.AUDIO),
+                isDm = true,
+                fullyReadEventId = AN_EVENT_ID,
             )
         )
     }
@@ -181,6 +185,8 @@ class RoomInfoMapperTest {
                     privilegedCreatorsRole = true,
                     isLowPriority = true,
                     activeRoomCallConsensusIntent = RtcCallIntentConsensus.None,
+                    isDm = false,
+                    fullyReadEventId = AN_EVENT_ID.value,
                 )
             )
         ).isEqualTo(
@@ -225,6 +231,8 @@ class RoomInfoMapperTest {
                 privilegedCreatorRole = true,
                 isLowPriority = true,
                 activeCallIntentConsensus = CallIntentConsensus.None,
+                isDm = false,
+                fullyReadEventId = AN_EVENT_ID,
             )
         )
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt
index 428bb7db7a..621299243e 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt
@@ -10,17 +10,18 @@ package io.element.android.libraries.matrix.impl.room
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.room.StateEventType
+import org.junit.Ignore
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
+import uniffi.ruma_events.StateEventType as RustStateEventType
 
 class StateEventTypeTest {
+    @Ignore("Can't use RustStateEventType as that will try accessing the Rust SDK")
     @Test
     fun `mapping Rust type should work`() {
         assertThat(RustStateEventType.CallMember.map()).isEqualTo(StateEventType.CallMember)
         assertThat(RustStateEventType.PolicyRuleRoom.map()).isEqualTo(StateEventType.PolicyRuleRoom)
         assertThat(RustStateEventType.PolicyRuleServer.map()).isEqualTo(StateEventType.PolicyRuleServer)
         assertThat(RustStateEventType.PolicyRuleUser.map()).isEqualTo(StateEventType.PolicyRuleUser)
-        assertThat(RustStateEventType.RoomAliases.map()).isEqualTo(StateEventType.RoomAliases)
         assertThat(RustStateEventType.RoomAvatar.map()).isEqualTo(StateEventType.RoomAvatar)
         assertThat(RustStateEventType.RoomCanonicalAlias.map()).isEqualTo(StateEventType.RoomCanonicalAlias)
         assertThat(RustStateEventType.RoomCreate.map()).isEqualTo(StateEventType.RoomCreate)
@@ -28,9 +29,10 @@ class StateEventTypeTest {
         assertThat(RustStateEventType.RoomGuestAccess.map()).isEqualTo(StateEventType.RoomGuestAccess)
         assertThat(RustStateEventType.RoomHistoryVisibility.map()).isEqualTo(StateEventType.RoomHistoryVisibility)
         assertThat(RustStateEventType.RoomJoinRules.map()).isEqualTo(StateEventType.RoomJoinRules)
-        assertThat(RustStateEventType.RoomMemberEvent.map()).isEqualTo(StateEventType.RoomMemberEvent)
+        assertThat(RustStateEventType.RoomMember.map()).isEqualTo(StateEventType.RoomMemberEvent)
         assertThat(RustStateEventType.RoomName.map()).isEqualTo(StateEventType.RoomName)
         assertThat(RustStateEventType.RoomPinnedEvents.map()).isEqualTo(StateEventType.RoomPinnedEvents)
+        assertThat(RustStateEventType.RoomPolicy.map()).isEqualTo(StateEventType.RoomPolicy)
         assertThat(RustStateEventType.RoomPowerLevels.map()).isEqualTo(StateEventType.RoomPowerLevels)
         assertThat(RustStateEventType.RoomServerAcl.map()).isEqualTo(StateEventType.RoomServerAcl)
         assertThat(RustStateEventType.RoomThirdPartyInvite.map()).isEqualTo(StateEventType.RoomThirdPartyInvite)
@@ -38,7 +40,8 @@ class StateEventTypeTest {
         assertThat(RustStateEventType.RoomTopic.map()).isEqualTo(StateEventType.RoomTopic)
         assertThat(RustStateEventType.SpaceChild.map()).isEqualTo(StateEventType.SpaceChild)
         assertThat(RustStateEventType.SpaceParent.map()).isEqualTo(StateEventType.SpaceParent)
-        assertThat(RustStateEventType.Custom("foo").map()).isEqualTo(StateEventType.Custom("foo"))
+        // Can't test Custom as it will try calling the Rust code, which is not available in unit tests
+        // assertThat(stateEventTypeFromString("foo").map()).isEqualTo(StateEventType.Custom("foo"))
     }
 
     @Test
@@ -47,7 +50,6 @@ class StateEventTypeTest {
         assertThat(StateEventType.PolicyRuleRoom.map()).isEqualTo(RustStateEventType.PolicyRuleRoom)
         assertThat(StateEventType.PolicyRuleServer.map()).isEqualTo(RustStateEventType.PolicyRuleServer)
         assertThat(StateEventType.PolicyRuleUser.map()).isEqualTo(RustStateEventType.PolicyRuleUser)
-        assertThat(StateEventType.RoomAliases.map()).isEqualTo(RustStateEventType.RoomAliases)
         assertThat(StateEventType.RoomAvatar.map()).isEqualTo(RustStateEventType.RoomAvatar)
         assertThat(StateEventType.RoomCanonicalAlias.map()).isEqualTo(RustStateEventType.RoomCanonicalAlias)
         assertThat(StateEventType.RoomCreate.map()).isEqualTo(RustStateEventType.RoomCreate)
@@ -55,9 +57,10 @@ class StateEventTypeTest {
         assertThat(StateEventType.RoomGuestAccess.map()).isEqualTo(RustStateEventType.RoomGuestAccess)
         assertThat(StateEventType.RoomHistoryVisibility.map()).isEqualTo(RustStateEventType.RoomHistoryVisibility)
         assertThat(StateEventType.RoomJoinRules.map()).isEqualTo(RustStateEventType.RoomJoinRules)
-        assertThat(StateEventType.RoomMemberEvent.map()).isEqualTo(RustStateEventType.RoomMemberEvent)
+        assertThat(StateEventType.RoomMemberEvent.map()).isEqualTo(RustStateEventType.RoomMember)
         assertThat(StateEventType.RoomName.map()).isEqualTo(RustStateEventType.RoomName)
         assertThat(StateEventType.RoomPinnedEvents.map()).isEqualTo(RustStateEventType.RoomPinnedEvents)
+        assertThat(StateEventType.RoomPolicy.map()).isEqualTo(RustStateEventType.RoomPolicy)
         assertThat(StateEventType.RoomPowerLevels.map()).isEqualTo(RustStateEventType.RoomPowerLevels)
         assertThat(StateEventType.RoomServerAcl.map()).isEqualTo(RustStateEventType.RoomServerAcl)
         assertThat(StateEventType.RoomThirdPartyInvite.map()).isEqualTo(RustStateEventType.RoomThirdPartyInvite)
@@ -65,6 +68,7 @@ class StateEventTypeTest {
         assertThat(StateEventType.RoomTopic.map()).isEqualTo(RustStateEventType.RoomTopic)
         assertThat(StateEventType.SpaceChild.map()).isEqualTo(RustStateEventType.SpaceChild)
         assertThat(StateEventType.SpaceParent.map()).isEqualTo(RustStateEventType.SpaceParent)
-        assertThat(StateEventType.Custom("foo").map()).isEqualTo(RustStateEventType.Custom("foo"))
+        // Can't test Custom as it will try calling the Rust code, which is not available in unit tests
+        // assertThat(StateEventType.Custom("foo").map()).isEqualTo(stateEventTypeFromString("foo"))
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt
new file mode 100644
index 0000000000..ba91dae468
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.location
+
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+import io.element.android.libraries.matrix.test.room.location.aLiveLocationShare
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class TimedLiveLocationSharesFlowTest {
+    @Test
+    fun `it keeps emitting shares for subsequent expiries without upstream changes`() = runTest {
+        val shares = listOf(
+            aLiveLocationShare(userId = UserId("@alice:server"), endTimestamp = 1_000),
+            aLiveLocationShare(userId = UserId("@bob:server"), endTimestamp = 2_000),
+            aLiveLocationShare(userId = UserId("@carol:server"), endTimestamp = 3_000),
+        )
+
+        flowOf(shares)
+            .timedByExpiry(currentTimeMillis = { testScheduler.currentTime })
+            .test {
+                assertThat(awaitItem()).isEqualTo(shares)
+
+                advanceTimeBy(1_000)
+                assertThat(awaitItem()).isEqualTo(shares.drop(1))
+
+                advanceTimeBy(999)
+                expectNoEvents()
+
+                advanceTimeBy(1)
+                assertThat(awaitItem()).isEqualTo(shares.drop(2))
+
+                advanceTimeBy(999)
+                expectNoEvents()
+
+                advanceTimeBy(1)
+                assertThat(awaitItem()).isEmpty()
+
+                awaitComplete()
+            }
+    }
+
+    @Test
+    fun `it does not double-emit when a share is already expired on receipt`() = runTest {
+        val shares = listOf(
+            aLiveLocationShare(userId = UserId("@alice:server"), endTimestamp = 500),
+            aLiveLocationShare(userId = UserId("@bob:server"), endTimestamp = 2_000),
+        )
+
+        flowOf(shares)
+            .timedByExpiry(currentTimeMillis = { 1_000 + testScheduler.currentTime })
+            .test {
+                assertThat(awaitItem()).isEqualTo(shares.drop(1))
+                expectNoEvents()
+
+                advanceTimeBy(999)
+                expectNoEvents()
+
+                advanceTimeBy(1)
+                assertThat(awaitItem()).isEmpty()
+
+                awaitComplete()
+            }
+    }
+
+    @Test
+    fun `it reschedules timed emission when upstream shares change`() = runTest {
+        val upstream = MutableSharedFlow<List<LiveLocationShare>>(extraBufferCapacity = 1)
+        val initialShares = listOf(aLiveLocationShare(endTimestamp = 10_000))
+        val updatedShares = listOf(
+            aLiveLocationShare(userId = UserId("@alice:server"), endTimestamp = 10_000),
+            aLiveLocationShare(userId = UserId("@bob:server"), endTimestamp = 6_000),
+        )
+
+        upstream
+            .timedByExpiry(currentTimeMillis = { testScheduler.currentTime })
+            .test {
+                upstream.emit(initialShares)
+                assertThat(awaitItem()).isEqualTo(initialShares)
+
+                advanceTimeBy(5_000)
+                upstream.emit(updatedShares)
+                assertThat(awaitItem()).isEqualTo(updatedShares)
+
+                advanceTimeBy(999)
+                expectNoEvents()
+
+                advanceTimeBy(1)
+                assertThat(awaitItem()).isEqualTo(updatedShares.take(1))
+
+                advanceTimeBy(3_999)
+                expectNoEvents()
+
+                advanceTimeBy(1)
+                assertThat(awaitItem()).isEmpty()
+            }
+    }
+
+    @Test
+    fun `it completes after the last scheduled re-emission when upstream completes`() = runTest {
+        val shares = listOf(aLiveLocationShare(endTimestamp = 1_000))
+        flowOf(shares)
+            .timedByExpiry(currentTimeMillis = { testScheduler.currentTime })
+            .test {
+                assertThat(awaitItem()).isEqualTo(shares)
+
+                advanceTimeBy(1_000)
+                assertThat(awaitItem()).isEmpty()
+
+                awaitComplete()
+            }
+    }
+
+    @Test
+    fun `it completes immediately when upstream emits nothing`() = runTest {
+        emptyFlow<List<LiveLocationShare>>()
+            .timedByExpiry(currentTimeMillis = { testScheduler.currentTime })
+            .test {
+                awaitComplete()
+            }
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapperTest.kt
index f298da8b42..65f2d1e2d5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsValuesMapperTest.kt
@@ -30,6 +30,8 @@ class RoomPowerLevelsValuesMapperTest {
                     roomAvatar = 9,
                     roomTopic = 10,
                     spaceChild = 11,
+                    beacon = 12,
+                    beaconInfo = 13,
                 )
             )
         ).isEqualTo(
@@ -44,6 +46,8 @@ class RoomPowerLevelsValuesMapperTest {
                 roomAvatar = 9,
                 roomTopic = 10,
                 spaceChild = 11,
+                beacon = 12,
+                beaconInfo = 13,
             )
         )
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListServiceTest.kt
new file mode 100644
index 0000000000..0fc9ad0603
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/threads/RustThreadsListServiceTest.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.room.threads
+
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.threads.ThreadListPaginationStatus
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustTimelineItemContentMsgLike
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTaskHandle
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiThreadListService
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_TIMESTAMP
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.ProfileDetails
+import org.matrix.rustcomponents.sdk.TaskHandle
+import org.matrix.rustcomponents.sdk.ThreadListEntriesListener
+import org.matrix.rustcomponents.sdk.ThreadListItem
+import org.matrix.rustcomponents.sdk.ThreadListItemEvent
+import org.matrix.rustcomponents.sdk.ThreadListPaginationStateListener
+import org.matrix.rustcomponents.sdk.ThreadListUpdate
+import uniffi.matrix_sdk_ui.ThreadListPaginationState
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class RustThreadsListServiceTest {
+    @Test
+    fun `subscribing to item updates calls the FFI method and allows retrieving new items`() = runTest {
+        val subscribeToItemsUpdatesRecorder = lambdaRecorder<ThreadListEntriesListener, TaskHandle> { FakeFfiTaskHandle() }
+        val inner = FakeFfiThreadListService(subscribeToItemsUpdates = subscribeToItemsUpdatesRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.subscribeToItemUpdates().test {
+            assertThat(awaitItem()).isEmpty()
+
+            runCurrent()
+            subscribeToItemsUpdatesRecorder.assertions().isCalledOnce()
+
+            inner.emitUpdates(listOf(aRustThreadListUpdate()))
+
+            assertThat(awaitItem()).isNotEmpty()
+        }
+    }
+
+    @Suppress("UnusedFlow")
+    @Test
+    fun `subscribing to item updates twice only calls the FFI method once`() = runTest {
+        val subscribeToItemsUpdatesRecorder = lambdaRecorder<ThreadListEntriesListener, TaskHandle> { FakeFfiTaskHandle() }
+        val inner = FakeFfiThreadListService(subscribeToItemsUpdates = subscribeToItemsUpdatesRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.subscribeToItemUpdates()
+        service.subscribeToItemUpdates()
+
+        runCurrent()
+
+        subscribeToItemsUpdatesRecorder.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `subscribing to pagination updates calls the FFI method and allows retrieving new items`() = runTest {
+        val subscribeToPaginationUpdatesRecorder = lambdaRecorder<ThreadListPaginationStateListener, TaskHandle> { FakeFfiTaskHandle() }
+        val inner = FakeFfiThreadListService(subscribeToPaginationStateUpdates = subscribeToPaginationUpdatesRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.subscribeToPaginationUpdates().test {
+            assertThat(awaitItem()).isEqualTo(ThreadListPaginationStatus.Idle(hasMoreToLoad = true))
+
+            runCurrent()
+            subscribeToPaginationUpdatesRecorder.assertions().isCalledOnce()
+
+            inner.emitPaginationState(ThreadListPaginationState.Loading)
+
+            assertThat(awaitItem()).isEqualTo(ThreadListPaginationStatus.Loading)
+        }
+    }
+
+    @Test
+    fun `paginate calls the FFI method`() = runTest {
+        val paginateRecorder = lambdaRecorder<Unit> {}
+        val inner = FakeFfiThreadListService(paginate = paginateRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.paginate()
+
+        paginateRecorder.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `reset calls the FFI method`() = runTest {
+        val resetRecorder = lambdaRecorder<Unit> {}
+        val inner = FakeFfiThreadListService(reset = resetRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.reset()
+
+        resetRecorder.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `destroy calls the FFI method`() = runTest {
+        val destroyRecorder = lambdaRecorder<Unit> {}
+        val inner = FakeFfiThreadListService(destroy = destroyRecorder)
+        val service = createThreadsListService(inner = inner)
+
+        service.destroy()
+
+        destroyRecorder.assertions().isCalledOnce()
+    }
+
+    private fun TestScope.createThreadsListService(
+        inner: FakeFfiThreadListService = FakeFfiThreadListService(),
+    ) = RustThreadsListService(
+        inner = inner,
+        roomCoroutineScope = backgroundScope,
+    )
+
+    private fun aRustThreadListUpdate() = ThreadListUpdate.Append(
+        values = listOf(
+            ThreadListItem(
+                rootEvent = ThreadListItemEvent(
+                    eventId = AN_EVENT_ID.value,
+                    timestamp = A_TIMESTAMP.toULong(),
+                    sender = A_USER_ID.value,
+                    senderProfile = ProfileDetails.Pending,
+                    isOwn = true,
+                    content = aRustTimelineItemContentMsgLike(),
+                ),
+                numReplies = 0u,
+                latestEvent = null,
+            )
+        ),
+    )
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
index 6fac54b904..d951b3d339 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt
@@ -173,16 +173,68 @@ class RoomSummaryListProcessorTest {
         assertThat(summaries.value[index].roomId).isEqualTo(A_ROOM_ID_3)
     }
 
+    /**
+     * Tracking issue #4182 / #5031: rooms duplicated in the room list.
+     *
+     * If duplicates are present in the upstream summaries flow, the dedupe safety net in
+     * [RoomSummaryListProcessor.updateRoomSummaries] must remove them and report the incident via
+     * [analyticsService.trackError]. Uses an empty update to drive the dedupe path without
+     * passing a Rust Room through the destroy-on-use path.
+     */
+    @Test
+    fun `pre-existing duplicates in summaries are deduped on next update and trackError fires`() = runTest {
+        summaries.value = listOf(
+            aRoomSummary(roomId = A_ROOM_ID),
+            aRoomSummary(roomId = A_ROOM_ID), // simulated SDK-side leak
+            aRoomSummary(roomId = A_ROOM_ID_2),
+        )
+        val analyticsService = FakeAnalyticsService()
+        val processor = createProcessor(analyticsService = analyticsService)
+
+        processor.postUpdate(emptyList())
+
+        assertThat(summaries.value.map { it.roomId }).containsExactly(A_ROOM_ID, A_ROOM_ID_2).inOrder()
+        assertThat(analyticsService.trackedErrors).hasSize(1)
+    }
+
+    /**
+     * Tracking issue #4182 / #5031.
+     *
+     * Insert is the most likely Rust-SDK trigger for a duplicate-room report: it blindly inserts
+     * a new entry at an index without checking whether the roomId already exists. Before the
+     * describe-capture fix, the dedupe branch in [updateRoomSummaries] would call `Room.id()`
+     * on an already-destroyed Room (because [applyUpdate] consumes each value via
+     * `entry.use { ... }`) and crash before [trackError] could be invoked. This test guards the
+     * fix: the Insert is processed, the list is emitted deduplicated, and the tracked error
+     * message carries the human-readable description of the offending update.
+     */
+    @Test
+    fun `Insert that triggers dedupe is reported via trackError without crashing`() = runTest {
+        summaries.value = listOf(aRoomSummary(roomId = A_ROOM_ID))
+        val analyticsService = FakeAnalyticsService()
+        val processor = createProcessor(analyticsService = analyticsService)
+
+        processor.postUpdate(listOf(RoomListEntriesUpdate.Insert(0u, aRustRoom(A_ROOM_ID))))
+
+        assertThat(summaries.value.map { it.roomId }).containsExactly(A_ROOM_ID)
+        assertThat(analyticsService.trackedErrors).hasSize(1)
+        val message = analyticsService.trackedErrors.single().message.orEmpty()
+        assertThat(message).contains("Found duplicates")
+        assertThat(message).contains("Insert at #0")
+    }
+
     private fun aRustRoom(roomId: RoomId = A_ROOM_ID) = FakeFfiRoom(
         roomId = roomId,
         latestEventLambda = { LatestEventValue.None }
     )
 
-    private fun TestScope.createProcessor() = RoomSummaryListProcessor(
+    private fun TestScope.createProcessor(
+        analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    ) = RoomSummaryListProcessor(
         summaries,
         FakeFfiRoomListService(),
         coroutineContext = StandardTestDispatcher(testScheduler),
         roomSummaryFactory = RoomSummaryFactory(),
-        analyticsService = FakeAnalyticsService(),
+        analyticsService = analyticsService,
     )
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/FakeFfiContentScanner.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/FakeFfiContentScanner.kt
new file mode 100644
index 0000000000..a359747198
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/FakeFfiContentScanner.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.scanner
+
+import org.matrix.rustcomponents.sdk.Client
+import org.matrix.rustcomponents.sdk.ContentScanner
+import org.matrix.rustcomponents.sdk.MediaSource
+import org.matrix.rustcomponents.sdk.NoHandle
+import uniffi.matrix_sdk_contentscanner.MediaScanResponse
+
+class FakeFfiContentScanner(
+    private val scan: suspend (client: Client, mediaSource: MediaSource) -> MediaScanResponse = { _, _ ->
+        MediaScanResponse(clean = true, info = "Just peachy")
+    },
+) : ContentScanner(NoHandle) {
+    override suspend fun scan(client: Client, mediaSource: MediaSource): MediaScanResponse {
+        return scan.invoke(client, mediaSource)
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScannerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScannerTest.kt
new file mode 100644
index 0000000000..8a1522c2f2
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/scanner/RustContentScannerTest.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.scanner
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiClient
+import io.element.android.libraries.matrix.test.media.aMediaSource
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import uniffi.matrix_sdk_contentscanner.MediaScanResponse
+
+class RustContentScannerTest {
+    @Test
+    fun `test successful valid scan`() = runTest {
+        val scanner = RustContentScanner(
+            client = FakeFfiClient(),
+            rustScanner = FakeFfiContentScanner(),
+        )
+
+        scanner.scan(aMediaSource()).run {
+            assertThat(isSuccess).isTrue()
+            assertThat(getOrNull()).isTrue()
+        }
+    }
+
+    @Test
+    fun `test successful invalid scan`() = runTest {
+        val scanner = RustContentScanner(
+            client = FakeFfiClient(),
+            rustScanner = FakeFfiContentScanner(scan = { _, _ -> MediaScanResponse(clean = false, info = "Not clean") })
+        )
+
+        scanner.scan(aMediaSource()).run {
+            assertThat(isSuccess).isTrue()
+            assertThat(getOrNull()).isFalse()
+        }
+    }
+
+    @Test
+    fun `test failed scan`() = runTest {
+        val scanner = RustContentScanner(
+            client = FakeFfiClient(),
+            rustScanner = FakeFfiContentScanner(scan = { _, _ -> throw IllegalStateException("BOOM") })
+        )
+
+        scanner.scan(aMediaSource()).run {
+            assertThat(isFailure).isTrue()
+            assertThat(getOrNull()).isNull()
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessorTest.kt
new file mode 100644
index 0000000000..28eabcf3ed
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/MessageSearchResultsProcessorTest.kt
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSearchServiceResult
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.SearchServiceResultsUpdate
+
+class MessageSearchResultsProcessorTest {
+    private val results = MutableStateFlow<List<MessageSearchResult>>(emptyList())
+
+    private fun createProcessor() = MessageSearchResultsProcessor(
+        results = results,
+        coroutineContext = kotlin.coroutines.EmptyCoroutineContext,
+    )
+
+    private fun eventIds() = results.value.map { it.eventId.value }
+
+    @Test
+    fun `Append adds entries at the end of the list`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2")))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$2"))
+    }
+
+    @Test
+    fun `PushBack adds an entry at the end of the list`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.PushBack(aRustSearchServiceResult("\$2"))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$2"))
+    }
+
+    @Test
+    fun `PushFront inserts an entry at the start of the list`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.PushFront(aRustSearchServiceResult("\$0"))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$0", "\$1"))
+    }
+
+    @Test
+    fun `PopBack removes the last entry`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.PopBack))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1"))
+    }
+
+    @Test
+    fun `PopFront removes the first entry`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.PopFront))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$2"))
+    }
+
+    @Test
+    fun `Insert puts an entry at the given index`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$3")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Insert(1u, aRustSearchServiceResult("\$2"))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$2", "\$3"))
+    }
+
+    @Test
+    fun `Set replaces the entry at the given index`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Set(1u, aRustSearchServiceResult("\$9"))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$9"))
+    }
+
+    @Test
+    fun `Remove drops the entry at the given index`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(
+            listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2"), aRustSearchServiceResult("\$3"))))
+        )
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Remove(1u)))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$3"))
+    }
+
+    @Test
+    fun `Truncate keeps only the first N entries`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(
+            listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2"), aRustSearchServiceResult("\$3"))))
+        )
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Truncate(2u)))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$1", "\$2"))
+    }
+
+    @Test
+    fun `Clear empties the list`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Clear))
+
+        assertThat(eventIds()).isEmpty()
+    }
+
+    @Test
+    fun `Reset replaces the whole list`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2")))))
+        processor.postUpdates(listOf(SearchServiceResultsUpdate.Reset(listOf(aRustSearchServiceResult("\$7")))))
+
+        assertThat(eventIds()).isEqualTo(listOf("\$7"))
+    }
+
+    /**
+     * Regression test for the index-desync bug present in the element-x-ios bridge, where positional
+     * updates from the SDK were applied to a list that had already been filtered, so every index
+     * landed in the wrong slot. Our list must stay index-parallel to the SDK's throughout a batch.
+     */
+    @Test
+    fun `positional updates in one batch stay index-parallel with the SDK`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(
+            listOf(
+                SearchServiceResultsUpdate.Append(
+                    listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2"), aRustSearchServiceResult("\$3"))
+                ),
+                SearchServiceResultsUpdate.Insert(1u, aRustSearchServiceResult("\$b")),
+                SearchServiceResultsUpdate.Remove(0u),
+                SearchServiceResultsUpdate.Set(0u, aRustSearchServiceResult("\$z")),
+                SearchServiceResultsUpdate.PushFront(aRustSearchServiceResult("\$a")),
+                SearchServiceResultsUpdate.Truncate(3u),
+            )
+        )
+
+        // Append      -> [1, 2, 3]
+        // Insert(1,b) -> [1, b, 2, 3]
+        // Remove(0)   -> [b, 2, 3]
+        // Set(0,z)    -> [z, 2, 3]
+        // PushFront(a)-> [a, z, 2, 3]
+        // Truncate(3) -> [a, z, 2]
+        assertThat(eventIds()).isEqualTo(listOf("\$a", "\$z", "\$2"))
+    }
+
+    @Test
+    fun `a result carries roomId, sender and timestamp through the mapping`() = runTest {
+        val processor = createProcessor()
+        processor.postUpdates(
+            listOf(
+                SearchServiceResultsUpdate.Append(
+                    listOf(aRustSearchServiceResult(eventId = "\$1", roomId = "!room:server", sender = "@bob:server", timestamp = 1234uL))
+                )
+            )
+        )
+
+        val result = results.value.single()
+        assertThat(result.roomId.value).isEqualTo("!room:server")
+        assertThat(result.senderId.value).isEqualTo("@bob:server")
+        assertThat(result.timestamp).isEqualTo(1234L)
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchTest.kt
new file mode 100644
index 0000000000..693ed1bdc2
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/RustMessageSearchTest.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.libraries.matrix.impl.search
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.search.MessageSearchPaginationState
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSearchServiceResult
+import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiSearchService
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.SearchServiceResultsUpdate
+import uniffi.matrix_sdk_ui.SearchServicePaginationState
+
+class RustMessageSearchTest {
+    @Test
+    fun `paginationState is seeded from the SDK and reflects later updates`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService(initialPaginationState = SearchServicePaginationState.Idle(endReached = true))
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        assertThat(search.paginationState.value).isEqualTo(MessageSearchPaginationState.Idle(endReached = true))
+
+        service.paginationStateListener!!.onUpdate(SearchServicePaginationState.Loading)
+        assertThat(search.paginationState.value).isEqualTo(MessageSearchPaginationState.Loading)
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `setQuery failure surfaces as Result failure without throwing`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService(setQueryLambda = { error("boom") })
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        val result = search.setQuery("hello")
+
+        assertThat(result.isFailure).isTrue()
+        scope.cancel()
+    }
+
+    @Test
+    fun `the query handed to the SDK is escaped and made conjunctive for tantivy`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        var queryReceived: String? = null
+        val service = FakeFfiSearchService(setQueryLambda = { queryReceived = it })
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        // Unescaped, tantivy reads `https` as a field name and fails the entire search. The `+`
+        // makes the term mandatory: without it tantivy is OR-by-default and a multi-word query
+        // matches anything containing any one of its words.
+        search.setQuery("https://github.com/foo")
+
+        assertThat(queryReceived).isEqualTo("+https\\://github.com/foo")
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `paginate failure surfaces as Result failure without throwing`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService(paginateLambda = { error("boom") })
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        val result = search.paginate()
+
+        assertThat(result.isFailure).isTrue()
+        scope.cancel()
+    }
+
+    @Test
+    fun `results are not subscribed to until the first setQuery, and only once`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService()
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        assertThat(service.subscribeToResultsCallCount).isEqualTo(0)
+
+        search.setQuery("hello")
+        assertThat(service.subscribeToResultsCallCount).isEqualTo(1)
+
+        search.setQuery("world")
+        assertThat(service.subscribeToResultsCallCount).isEqualTo(1)
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `updates pushed by the SDK reach the results flow`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService()
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher)
+
+        search.setQuery("hello")
+        service.resultsListener!!.onUpdate(
+            listOf(SearchServiceResultsUpdate.Append(listOf(aRustSearchServiceResult("\$1"), aRustSearchServiceResult("\$2"))))
+        )
+        advanceUntilIdle()
+
+        assertThat(search.results.value.map { it.eventId.value }).isEqualTo(listOf("\$1", "\$2"))
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `a room filter hides other rooms without disturbing SDK indexing`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService()
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher, roomId = A_ROOM_ID)
+
+        search.setQuery("hello")
+        // SDK list: [$1@room1, $2@room2, $3@room1, $4@room2]
+        service.resultsListener!!.onUpdate(
+            listOf(
+                SearchServiceResultsUpdate.Append(
+                    listOf(
+                        aRustSearchServiceResult("\$1", roomId = A_ROOM_ID.value),
+                        aRustSearchServiceResult("\$2", roomId = A_ROOM_ID_2.value),
+                        aRustSearchServiceResult("\$3", roomId = A_ROOM_ID.value),
+                        aRustSearchServiceResult("\$4", roomId = A_ROOM_ID_2.value),
+                    )
+                )
+            )
+        )
+        advanceUntilIdle()
+
+        assertThat(search.results.value.map { it.eventId.value }).isEqualTo(listOf("\$1", "\$3"))
+
+        // Index 2 in the SDK's list is $3. Had the filter been applied inside the processor, the
+        // filtered list would be [$1, $3] and index 2 would be out of bounds — the iOS bug.
+        service.resultsListener!!.onUpdate(
+            listOf(SearchServiceResultsUpdate.Set(index = 2u, value = aRustSearchServiceResult("\$3edited", roomId = A_ROOM_ID.value)))
+        )
+        advanceUntilIdle()
+
+        assertThat(search.results.value.map { it.eventId.value }).isEqualTo(listOf("\$1", "\$3edited"))
+
+        // Removing index 1 ($2, a room we filter out) must not shift anything the user can see.
+        service.resultsListener!!.onUpdate(listOf(SearchServiceResultsUpdate.Remove(index = 1u)))
+        advanceUntilIdle()
+
+        assertThat(search.results.value.map { it.eventId.value }).isEqualTo(listOf("\$1", "\$3edited"))
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `no room filter exposes every room`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        val service = FakeFfiSearchService()
+        val search = RustMessageSearch(inner = service, onClose = {}, scope = scope, dispatcher = dispatcher, roomId = null)
+
+        search.setQuery("hello")
+        service.resultsListener!!.onUpdate(
+            listOf(
+                SearchServiceResultsUpdate.Append(
+                    listOf(
+                        aRustSearchServiceResult("\$1", roomId = A_ROOM_ID.value),
+                        aRustSearchServiceResult("\$2", roomId = A_ROOM_ID_2.value),
+                    )
+                )
+            )
+        )
+        advanceUntilIdle()
+
+        assertThat(search.results.value.map { it.eventId.value }).isEqualTo(listOf("\$1", "\$2"))
+
+        scope.cancel()
+    }
+
+    @Test
+    fun `cancelling the scope closes the underlying service`() = runTest {
+        val dispatcher = StandardTestDispatcher(testScheduler)
+        val scope = CoroutineScope(dispatcher)
+        var closed = false
+        val service = FakeFfiSearchService()
+        RustMessageSearch(inner = service, onClose = { closed = true }, scope = scope, dispatcher = dispatcher)
+
+        assertThat(closed).isFalse()
+
+        scope.cancel()
+        advanceUntilIdle()
+
+        assertThat(closed).isTrue()
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaperTest.kt
new file mode 100644
index 0000000000..dae76ed006
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/search/TantivyQueryEscaperTest.kt
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.search
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+/**
+ * Expectations here were checked against tantivy 0.26.1's own `QueryParser` — the version
+ * `matrix-sdk-search` compiles against — not inferred from the grammar. Each case notes the query it
+ * parses to, because "does not throw" is not the same as "searches for what the user typed".
+ */
+class TantivyQueryEscaperTest {
+    @Test
+    fun `an ordinary multi-word query becomes a conjunction`() {
+        // The headline behaviour. Without the `+`s tantivy is OR-by-default, so searching
+        // `check the photo` returned every message containing `the` — measured on device: a list of
+        // unrelated hits ranked by relevance, with the message actually wanted nowhere in it.
+        // Each `+` is a Must clause, which is what `set_conjunction_by_default()` would produce if
+        // the FFI let us call it.
+        assertThat("design review notes".escapeForTantivy()).isEqualTo("+design +review +notes")
+    }
+
+    @Test
+    fun `a single word query is a conjunction of one`() {
+        assertThat("photo".escapeForTantivy()).isEqualTo("+photo")
+    }
+
+    @Test
+    fun `the plus is prepended after escaping, never before`() {
+        // Load-bearing and silent when wrong: `-` is escaped only in leading position, so prefixing
+        // first would hand the escaper our own `+` to escape and produce `\+\-cats` — a literal
+        // plus, no Must clause, no parse error, and OR behaviour restored without a single failing
+        // assertion anywhere.
+        assertThat("-cats".escapeForTantivy()).isEqualTo("+\\-cats")
+    }
+
+    @Test
+    fun `a pasted URL no longer parses as a field lookup`() {
+        // The bug: unescaped, tantivy resolves `https` as a field name and fails the WHOLE search
+        // with FieldDoesNotExist. Only the colon needs escaping; the slashes are not leading.
+        assertThat("https://github.com/foo".escapeForTantivy()).isEqualTo("+https\\://github.com/foo")
+    }
+
+    @Test
+    fun `a real indexed field name is escaped too`() {
+        // `date` IS in the schema, as a DATE field, so this fails differently and more confusingly:
+        // DateFormatError rather than FieldDoesNotExist. The fix is not only about unknown fields.
+        assertThat("date:2020".escapeForTantivy()).isEqualTo("+date\\:2020")
+    }
+
+    @Test
+    fun `a matrix id is escaped`() {
+        // The second most likely paste after a URL. `@` and `.` are ordinary characters.
+        assertThat("@alice:matrix.org".escapeForTantivy()).isEqualTo("+@alice\\:matrix.org")
+    }
+
+    @Test
+    fun `a colon separated from its field name by a space is still escaped`() {
+        // The grammar allows whitespace between a field name and its colon, so `time: 12` would also
+        // be read as a field access. Per-token escaping defeats the spaced form as well.
+        assertThat("time: 12:30".escapeForTantivy()).isEqualTo("+time\\: +12\\:30")
+    }
+
+    @Test
+    fun `an elastic range operator is escaped`() {
+        // A genuine second failure class the desktop colon-only fix would have missed: unescaped,
+        // `>5` fails with UnsupportedQuery("Range query need to target a specific field.").
+        assertThat(">5".escapeForTantivy()).isEqualTo("+\\>5")
+    }
+
+    @Test
+    fun `quotes are escaped, which deliberately drops phrase search`() {
+        // Documents the cost: a typed phrase search becomes two AND'd terms. Accepted because a
+        // MISbalanced quote is a hard failure and the UI never advertised phrase syntax. Since the
+        // change to conjunctions this is much closer to a phrase search than it used to be — the
+        // words must all be present, only their order and adjacency are lost.
+        assertThat("\"quoted phrase\"".escapeForTantivy()).isEqualTo("+\\\"quoted +phrase\\\"")
+    }
+
+    @Test
+    fun `an unclosed quote no longer fails the search`() {
+        // Why quotes are escaped at all: an odd number of quotes is a syntax error today, and
+        // half-typed quotes happen constantly on a mobile keyboard.
+        assertThat("\"unclosed phrase".escapeForTantivy()).isEqualTo("+\\\"unclosed +phrase")
+    }
+
+    @Test
+    fun `parentheses are escaped`() {
+        // An unbalanced paren is a hard parse failure, and parens are common in ordinary prose.
+        assertThat("(a b)".escapeForTantivy()).isEqualTo("+\\(a +b\\)")
+    }
+
+    @Test
+    fun `a backslash the user typed is doubled`() {
+        // Guards the escaper against itself: without this the user's backslash would escape the one
+        // we appended and shift the whole token. This is why escaping is a single forward pass.
+        assertThat("foo\\bar".escapeForTantivy()).isEqualTo("+foo\\\\bar")
+    }
+
+    @Test
+    fun `a plus is left alone when it is not leading`() {
+        // `+` is only an operator in leading position. Confirms the escaper is not over-broad.
+        assertThat("C++".escapeForTantivy()).isEqualTo("+C++")
+    }
+
+    @Test
+    fun `a date with slashes is left alone`() {
+        // Slashes are only escaped when leading, where they would open a regex literal.
+        assertThat("1/2/2024".escapeForTantivy()).isEqualTo("+1/2/2024")
+    }
+
+    @Test
+    fun `a bare-word boolean operator is neutralised`() {
+        // A uniformity choice rather than purely an error fix: the query is literal text, so
+        // `a AND b` searches for two words instead of silently switching to boolean AND — which is
+        // now what every query does anyway.
+        assertThat("hello NOT".escapeForTantivy()).isEqualTo("+hello +\\NOT")
+    }
+
+    @Test
+    fun `a token with no letters or digits is never made mandatory`() {
+        // tantivy's default tokenizer splits on non-alphanumerics, so `:)` and emoji tokenise to
+        // nothing. As a Must clause a token that indexes no terms can only ever subtract, so an
+        // emoji typed alongside real words would silently empty the result set. Left as a Should
+        // clause it is inert, which is what it was before this change too.
+        assertThat("photo :)".escapeForTantivy()).isEqualTo("+photo \\:\\)")
+        assertThat("fotoğraf 📷".escapeForTantivy()).isEqualTo("+fotoğraf 📷")
+    }
+
+    @Test
+    fun `a punctuation-only query behaves exactly as it did before`() {
+        // The residual cost, recorded honestly: this no longer errors, but it tokenises to nothing
+        // and becomes EmptyQuery — zero results, silently. Better than killing the search, not good.
+        assertThat(":::".escapeForTantivy()).isEqualTo("\\:\\:\\:")
+    }
+
+    @Test
+    fun `a lone star matches nothing instead of everything`() {
+        // A real behaviour delta: `*` alone is AllQuery today and EmptyQuery after this change.
+        // Neither is a sensible search, but the change should be pinned rather than discovered.
+        assertThat("*".escapeForTantivy()).isEqualTo("\\*")
+    }
+
+    @Test
+    fun `non-ascii words are mandatory like any other`() {
+        // The account this was built for is Turkish. Kotlin's isLetterOrDigit is Unicode-aware, so
+        // no accented or non-Latin word is mistaken for punctuation and demoted.
+        assertThat("fotoğrafa bak".escapeForTantivy()).isEqualTo("+fotoğrafa +bak")
+    }
+
+    @Test
+    fun `runs of whitespace collapse and the query is trimmed`() {
+        // Semantically neutral to tantivy — whitespace is only a separator — but it is an
+        // observable change to the string we hand over, so it is pinned.
+        assertThat("   spaced   out  ".escapeForTantivy()).isEqualTo("+spaced +out")
+    }
+
+    @Test
+    fun `an empty query stays empty`() {
+        assertThat("".escapeForTantivy()).isEqualTo("")
+        assertThat("   ".escapeForTantivy()).isEqualTo("")
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilder.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilder.kt
index 2f12587f5a..7eeff7db33 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilder.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilder.kt
@@ -7,10 +7,11 @@
 
 package io.element.android.libraries.matrix.impl.storage
 
+import io.element.android.libraries.androidutils.crypto.ClientSecret
 import org.matrix.rustcomponents.sdk.ClientBuilder
 
 class FakeSqliteStoreBuilder : SqliteStoreBuilder {
-    override fun passphrase(passphrase: String?): SqliteStoreBuilder = this
+    override fun secret(clientSecret: ClientSecret?): SqliteStoreBuilder = this
 
     override fun setupClientBuilder(clientBuilder: ClientBuilder): ClientBuilder {
         return clientBuilder
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilderProvider.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilderProvider.kt
index b196604ca4..af68da7b8a 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilderProvider.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/storage/FakeSqliteStoreBuilderProvider.kt
@@ -7,7 +7,7 @@
 
 package io.element.android.libraries.matrix.impl.storage
 
-import io.element.android.libraries.matrix.impl.paths.SessionPaths
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 
 class FakeSqliteStoreBuilderProvider : SqliteStoreBuilderProvider {
     override fun provide(sessionPaths: SessionPaths): SqliteStoreBuilder {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapperTest.kt
new file mode 100644
index 0000000000..c74f67bfe6
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/EventMessageMapperTest.kt
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.timeline.item.event
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.room.location.AssetType
+import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustAudioMessageContent
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustFileMessageContent
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryItemTypeAudio
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryItemTypeFile
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryItemTypeImage
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryItemTypeOther
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryItemTypeVideo
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustGalleryMessageContent
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustImageMessageContent
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustMessageTypeGallery
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustVideoMessageContent
+import org.junit.Test
+import org.matrix.rustcomponents.sdk.EmoteMessageContent
+import org.matrix.rustcomponents.sdk.LocationContent
+import org.matrix.rustcomponents.sdk.MessageType
+import org.matrix.rustcomponents.sdk.NoticeMessageContent
+import org.matrix.rustcomponents.sdk.TextMessageContent
+import org.matrix.rustcomponents.sdk.UnstableVoiceContent
+import org.matrix.rustcomponents.sdk.AssetType as RustAssetType
+
+class EventMessageMapperTest {
+    private val sut = EventMessageMapper()
+
+    @Test
+    fun `mapMessageType with Text returns TextMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Text(
+                content = TextMessageContent(body = "Hello", formatted = null)
+            )
+        )
+        assertThat(result).isEqualTo(TextMessageType(body = "Hello", formatted = null))
+    }
+
+    @Test
+    fun `mapMessageType with Notice returns NoticeMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Notice(content = NoticeMessageContent(body = "A notice", formatted = null))
+        )
+        assertThat(result).isEqualTo(NoticeMessageType(body = "A notice", formatted = null))
+    }
+
+    @Test
+    fun `mapMessageType with Emote returns EmoteMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Emote(content = EmoteMessageContent(body = "An emote", formatted = null))
+        )
+        assertThat(result).isEqualTo(EmoteMessageType(body = "An emote", formatted = null))
+    }
+
+    @Test
+    fun `mapMessageType with Other returns OtherMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Other(msgtype = "m.custom", body = "custom body")
+        )
+        assertThat(result).isEqualTo(OtherMessageType(msgType = "m.custom", body = "custom body"))
+    }
+
+    @Test
+    fun `mapMessageType with Location returns LocationMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Location(
+                content = LocationContent(
+                    body = "Location body",
+                    geoUri = "geo:51.5,-0.1",
+                    description = "London",
+                    zoomLevel = null,
+                    asset = RustAssetType.PIN,
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            LocationMessageType(
+                body = "Location body",
+                geoUri = "geo:51.5,-0.1",
+                description = "London",
+                assetType = AssetType.PIN,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Audio without voice returns AudioMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Audio(content = aRustAudioMessageContent(filename = "audio.mp3", voice = null))
+        )
+        assertThat(result).isEqualTo(
+            AudioMessageType(
+                filename = "audio.mp3",
+                caption = null,
+                formattedCaption = null,
+                source = MediaSource(url = "mxc://server/audio", json = """{"url":"mxc://server/audio"}"""),
+                info = null,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Audio with voice returns VoiceMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Audio(content = aRustAudioMessageContent(filename = "voice.ogg", voice = UnstableVoiceContent()))
+        )
+        assertThat(result).isEqualTo(
+            VoiceMessageType(
+                filename = "voice.ogg",
+                caption = null,
+                formattedCaption = null,
+                source = MediaSource(url = "mxc://server/audio", json = """{"url":"mxc://server/audio"}"""),
+                info = null,
+                details = null,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with File returns FileMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.File(content = aRustFileMessageContent(filename = "document.pdf"))
+        )
+        assertThat(result).isEqualTo(
+            FileMessageType(
+                filename = "document.pdf",
+                caption = null,
+                formattedCaption = null,
+                source = MediaSource(url = "mxc://server/file", json = """{"url":"mxc://server/file"}"""),
+                info = null,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Image returns ImageMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Image(content = aRustImageMessageContent(filename = "image.jpg"))
+        )
+        assertThat(result).isEqualTo(
+            ImageMessageType(
+                filename = "image.jpg",
+                caption = null,
+                formattedCaption = null,
+                source = MediaSource(url = "mxc://server/image", json = """{"url":"mxc://server/image"}"""),
+                info = null,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Video returns VideoMessageType`() {
+        val result = sut.mapMessageType(
+            MessageType.Video(content = aRustVideoMessageContent(filename = "video.mp4"))
+        )
+        assertThat(result).isEqualTo(
+            VideoMessageType(
+                filename = "video.mp4",
+                caption = null,
+                formattedCaption = null,
+                source = MediaSource(url = "mxc://server/video", json = """{"url":"mxc://server/video"}"""),
+                info = null,
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Gallery with Image item returns GalleryMessageType with Image`() {
+        val result = sut.mapMessageType(
+            aRustMessageTypeGallery(
+                content = aRustGalleryMessageContent(
+                    body = "A gallery",
+                    itemTypes = listOf(aRustGalleryItemTypeImage(aRustImageMessageContent(filename = "image.jpg"))),
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            GalleryMessageType(
+                body = "A gallery",
+                formatted = null,
+                items = listOf(
+                    GalleryItemType.Image(
+                        content = ImageMessageType(
+                            filename = "image.jpg",
+                            caption = null,
+                            formattedCaption = null,
+                            source = MediaSource(url = "mxc://server/image", json = """{"url":"mxc://server/image"}"""),
+                            info = null,
+                        )
+                    )
+                ),
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Gallery with Audio item returns GalleryMessageType with Audio`() {
+        val result = sut.mapMessageType(
+            aRustMessageTypeGallery(
+                content = aRustGalleryMessageContent(
+                    itemTypes = listOf(aRustGalleryItemTypeAudio(aRustAudioMessageContent(filename = "audio.mp3")))
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            GalleryMessageType(
+                body = "A gallery",
+                formatted = null,
+                items = listOf(
+                    GalleryItemType.Audio(
+                        content = AudioMessageType(
+                            filename = "audio.mp3",
+                            caption = null,
+                            formattedCaption = null,
+                            source = MediaSource(url = "mxc://server/audio", json = """{"url":"mxc://server/audio"}"""),
+                            info = null,
+                        )
+                    )
+                ),
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Gallery with Video item returns GalleryMessageType with Video`() {
+        val result = sut.mapMessageType(
+            aRustMessageTypeGallery(
+                content = aRustGalleryMessageContent(
+                    itemTypes = listOf(aRustGalleryItemTypeVideo(aRustVideoMessageContent(filename = "video.mp4")))
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            GalleryMessageType(
+                body = "A gallery",
+                formatted = null,
+                items = listOf(
+                    GalleryItemType.Video(
+                        content = VideoMessageType(
+                            filename = "video.mp4",
+                            caption = null,
+                            formattedCaption = null,
+                            source = MediaSource(url = "mxc://server/video", json = """{"url":"mxc://server/video"}"""),
+                            info = null,
+                        )
+                    )
+                ),
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Gallery with File item returns GalleryMessageType with File`() {
+        val result = sut.mapMessageType(
+            aRustMessageTypeGallery(
+                content = aRustGalleryMessageContent(
+                    itemTypes = listOf(aRustGalleryItemTypeFile(aRustFileMessageContent(filename = "document.pdf")))
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            GalleryMessageType(
+                body = "A gallery",
+                formatted = null,
+                items = listOf(
+                    GalleryItemType.File(
+                        content = FileMessageType(
+                            filename = "document.pdf",
+                            caption = null,
+                            formattedCaption = null,
+                            source = MediaSource(url = "mxc://server/file", json = """{"url":"mxc://server/file"}"""),
+                            info = null,
+                        )
+                    )
+                ),
+            )
+        )
+    }
+
+    @Test
+    fun `mapMessageType with Gallery with Other item returns GalleryMessageType with Other`() {
+        val result = sut.mapMessageType(
+            aRustMessageTypeGallery(
+                content = aRustGalleryMessageContent(
+                    itemTypes = listOf(aRustGalleryItemTypeOther(itemType = "m.custom", body = "custom item"))
+                )
+            )
+        )
+        assertThat(result).isEqualTo(
+            GalleryMessageType(
+                body = "A gallery",
+                formatted = null,
+                items = listOf(
+                    GalleryItemType.Other(itemType = "m.custom", body = "custom item")
+                ),
+            )
+        )
+    }
+}
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
index 50f8637096..cda5a07b8e 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
+import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 
@@ -36,6 +37,14 @@ internal val otherMemberJoinEvent = MatrixTimelineItem.Event(
     uniqueId = UniqueId("m.room.member_other"),
     event = anEventTimelineItem(content = aRoomMembershipContent(userId = A_USER_ID_2, change = MembershipChange.JOINED))
 )
+internal val otherMemberLeaveEvent = MatrixTimelineItem.Event(
+    uniqueId = UniqueId("m.room.member_leave"),
+    event = anEventTimelineItem(content = aRoomMembershipContent(userId = A_USER_ID_2, change = MembershipChange.LEFT))
+)
+internal val profileChangeEvent = MatrixTimelineItem.Event(
+    uniqueId = UniqueId("m.room.member_profile"),
+    event = anEventTimelineItem(content = aProfileChangeMessageContent(displayName = "New Name", prevDisplayName = "Old Name"))
+)
 internal val messageEvent = MatrixTimelineItem.Event(
     uniqueId = UniqueId("m.room.message"),
     event = anEventTimelineItem(content = aMessageContent("hi"))
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessorTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessorTest.kt
index dbeba39973..680422827c 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessorTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessorTest.kt
@@ -96,7 +96,12 @@ class RoomBeginningPostProcessorTest {
             messageEvent,
         )
         val processor = RoomBeginningPostProcessor(Timeline.Mode.Live)
-        val processedItems = processor.process(timelineItems, isDm = true, roomCreator = A_USER_ID, hasMoreToLoadBackwards = false)
+        val processedItems = processor.process(
+            timelineItems,
+            isDm = true,
+            roomCreator = A_USER_ID,
+            hasMoreToLoadBackwards = false
+        )
         assertThat(processedItems).isEqualTo(expected)
     }
 
@@ -107,7 +112,12 @@ class RoomBeginningPostProcessorTest {
             roomCreatorJoinEvent,
         )
         val processor = RoomBeginningPostProcessor(Timeline.Mode.Live)
-        val processedItems = processor.process(timelineItems, isDm = true, roomCreator = A_USER_ID, hasMoreToLoadBackwards = true)
+        val processedItems = processor.process(
+            timelineItems,
+            isDm = true,
+            roomCreator = A_USER_ID,
+            hasMoreToLoadBackwards = true
+        )
         assertThat(processedItems).isEmpty()
     }
 
@@ -117,7 +127,12 @@ class RoomBeginningPostProcessorTest {
             roomCreatorJoinEvent,
         )
         val processor = RoomBeginningPostProcessor(Timeline.Mode.Live)
-        val processedItems = processor.process(timelineItems, isDm = true, roomCreator = A_USER_ID, hasMoreToLoadBackwards = true)
+        val processedItems = processor.process(
+            timelineItems,
+            isDm = true,
+            roomCreator = A_USER_ID,
+            hasMoreToLoadBackwards = true
+        )
         assertThat(processedItems).isEmpty()
     }
 
@@ -128,7 +143,12 @@ class RoomBeginningPostProcessorTest {
             otherMemberJoinEvent,
         )
         val processor = RoomBeginningPostProcessor(Timeline.Mode.Live)
-        val processedItems = processor.process(timelineItems, isDm = true, roomCreator = A_USER_ID, hasMoreToLoadBackwards = true)
+        val processedItems = processor.process(
+            timelineItems,
+            isDm = true,
+            roomCreator = A_USER_ID,
+            hasMoreToLoadBackwards = true
+        )
         assertThat(processedItems).isEqualTo(listOf(otherMemberJoinEvent))
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProviderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProviderTest.kt
deleted file mode 100644
index 8edc95cdc6..0000000000
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProviderTest.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.util
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.test.A_SESSION_ID
-import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
-import io.element.android.libraries.sessionstorage.test.aSessionData
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-
-class SessionPathsProviderTest {
-    @Test
-    fun `if session is not found, provides returns null`() = runTest {
-        val sut = SessionPathsProvider(InMemorySessionStore())
-        val result = sut.provides(A_SESSION_ID)
-        assertThat(result).isNull()
-    }
-
-    @Test
-    fun `if session is found, provides returns the data`() = runTest {
-        val store = InMemorySessionStore(
-            initialList = listOf(
-                aSessionData(
-                    sessionPath = "/a/path/to/a/session",
-                    cachePath = "/a/path/to/a/cache",
-                )
-            )
-        )
-        val sut = SessionPathsProvider(store)
-        val result = sut.provides(A_SESSION_ID)!!
-        assertThat(result.fileDirectory.absolutePath).isEqualTo("/a/path/to/a/session")
-        assertThat(result.cacheDirectory.absolutePath).isEqualTo("/a/path/to/a/cache")
-    }
-}
diff --git a/libraries/matrix/test/build.gradle.kts b/libraries/matrix/test/build.gradle.kts
index ccb1a37a25..ccfa56f1aa 100644
--- a/libraries/matrix/test/build.gradle.kts
+++ b/libraries/matrix/test/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     api(projects.libraries.matrix.api)
     api(libs.coroutines.core)
     implementation(libs.coroutines.test)
-    implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.architecture)
     implementation(projects.services.analytics.api)
     implementation(projects.tests.testutils)
     implementation(libs.kotlinx.collections.immutable)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeHomeserverCapabilitiesProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeHomeserverCapabilitiesProvider.kt
new file mode 100644
index 0000000000..c098388c89
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeHomeserverCapabilitiesProvider.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test
+
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
+
+class FakeHomeserverCapabilitiesProvider(
+    private val refresh: () -> Result<Unit> = { Result.success(Unit) },
+    private val canChangeDisplayName: () -> Result<Boolean> = { Result.success(true) },
+    private val canChangeAvatarUrl: () -> Result<Boolean> = { Result.success(true) },
+) : HomeserverCapabilitiesProvider {
+    override suspend fun refresh(): Result<Unit> = refresh.invoke()
+    override suspend fun canChangeDisplayName(): Result<Boolean> = canChangeDisplayName.invoke()
+    override suspend fun canChangeAvatarUrl(): Result<Boolean> = canChangeAvatarUrl.invoke()
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
index 56527574d7..cdf7cc85cf 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.matrix.test
 
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.analytics.SdkStoreSizes
 import io.element.android.libraries.matrix.api.core.DeviceId
@@ -25,7 +26,8 @@ import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
-import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
+import io.element.android.libraries.matrix.api.oauth.AccountManagementAction
+import io.element.android.libraries.matrix.api.paths.SessionPaths
 import io.element.android.libraries.matrix.api.pusher.PushersService
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom
@@ -33,13 +35,18 @@ import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
+import io.element.android.libraries.matrix.api.room.location.BeaconInfoUpdate
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+import io.element.android.libraries.matrix.api.search.MessageSearchService
 import io.element.android.libraries.matrix.api.spaces.SpaceService
 import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion
 import io.element.android.libraries.matrix.api.sync.SyncService
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.api.user.UserStatus
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
@@ -49,6 +56,7 @@ import io.element.android.libraries.matrix.test.notificationsettings.FakeNotific
 import io.element.android.libraries.matrix.test.pushers.FakePushersService
 import io.element.android.libraries.matrix.test.roomdirectory.FakeRoomDirectoryService
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
+import io.element.android.libraries.matrix.test.search.FakeMessageSearchService
 import io.element.android.libraries.matrix.test.spaces.FakeSpaceService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
@@ -64,11 +72,14 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
+import java.io.File
 import java.util.Optional
 
 class FakeMatrixClient(
     override val sessionId: SessionId = A_SESSION_ID,
+    override val sessionPaths: SessionPaths = SessionPaths(fileDirectory = File("files"), cacheDirectory = File("cache")),
     override val deviceId: DeviceId = A_DEVICE_ID,
+    override val homeserverUrl: String = A_HOMESERVER_URL,
     override val sessionCoroutineScope: CoroutineScope = TestScope(),
     private val userDisplayName: String? = A_USER_NAME,
     private val userAvatarUrl: String? = AN_AVATAR_URL,
@@ -82,8 +93,11 @@ class FakeMatrixClient(
     override val syncService: SyncService = FakeSyncService(),
     override val encryptionService: EncryptionService = FakeEncryptionService(),
     override val roomDirectoryService: RoomDirectoryService = FakeRoomDirectoryService(),
+    override val isMessageSearchAvailable: Boolean = false,
+    override val messageSearchService: MessageSearchService = FakeMessageSearchService(),
     override val mediaPreviewService: MediaPreviewService = FakeMediaPreviewService(),
     override val roomMembershipObserver: RoomMembershipObserver = RoomMembershipObserver(),
+    private val homeserverCapabilitiesProvider: FakeHomeserverCapabilitiesProvider = FakeHomeserverCapabilitiesProvider(),
     private val accountManagementUrlResult: (AccountManagementAction?) -> Result<String?> = { lambdaError() },
     private val resolveRoomAliasResult: (RoomAlias) -> Result<Optional<ResolvedRoomAlias>> = {
         Result.success(
@@ -105,14 +119,18 @@ class FakeMatrixClient(
     private val canReportRoomLambda: () -> Boolean = { false },
     private val isLivekitRtcSupportedLambda: () -> Boolean = { false },
     override val ignoredUsersFlow: StateFlow<ImmutableList<UserId>> = MutableStateFlow(persistentListOf()),
+    override val ownBeaconInfoUpdates: Flow<BeaconInfoUpdate> = emptyFlow(),
     private val getMaxUploadSizeResult: () -> Result<Long> = { lambdaError() },
     private val getJoinedRoomIdsResult: () -> Result<Set<RoomId>> = { Result.success(emptySet()) },
     private val getRecentEmojisLambda: () -> Result<List<String>> = { Result.success(emptyList()) },
     private val addRecentEmojiLambda: (String) -> Result<Unit> = { Result.success(Unit) },
     private val markRoomAsFullyReadResult: (RoomId, EventId) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val markAllRoomsAsReadResult: () -> Result<Unit> = { Result.success(Unit) },
     private val performDatabaseVacuumLambda: () -> Result<Unit> = { lambdaError() },
+    private val getMapStyleUrlResult: () -> Result<String?> = { lambdaError() },
     private val getDatabaseSizesLambda: () -> Result<SdkStoreSizes> = { lambdaError() },
     private val resetWellKnownConfigLambda: () -> Result<Unit> = { lambdaError() },
+    override val contentScanner: ContentScanner? = null,
 ) : MatrixClient {
     var setDisplayNameCalled: Boolean = false
         private set
@@ -120,12 +138,18 @@ class FakeMatrixClient(
         private set
     var removeAvatarCalled: Boolean = false
         private set
+    var setUserStatusCalled: Boolean = false
+        private set
+    var clearUserStatusCalled: Boolean = false
+        private set
+    var setUserStatusResult: Result<Unit> = Result.success(Unit)
+    var clearUserStatusResult: Result<Unit> = Result.success(Unit)
 
     private val _userProfile: MutableStateFlow<MatrixUser> = MutableStateFlow(MatrixUser(sessionId, userDisplayName, userAvatarUrl))
     override val userProfile: StateFlow<MatrixUser> = _userProfile
 
-    private var createRoomResult: Result<RoomId> = Result.success(A_ROOM_ID)
-    private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
+    var createRoomResult: (CreateRoomParameters) -> Result<RoomId> = { Result.success(A_ROOM_ID) }
+    var createDmResult: (UserId, Boolean) -> Result<RoomId> = { _, _ -> Result.success(A_ROOM_ID) }
     private var findDmResult: Result<RoomId?> = Result.success(A_ROOM_ID)
     private val getRoomResults = mutableMapOf<RoomId, BaseRoom>()
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
@@ -173,11 +197,11 @@ class FakeMatrixClient(
     }
 
     override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> = simulateLongTask {
-        return createRoomResult
+        return createRoomResult(createRoomParams)
     }
 
-    override suspend fun createDM(userId: UserId): Result<RoomId> = simulateLongTask {
-        return createDmResult
+    override suspend fun createDM(userId: UserId, isEncrypted: Boolean): Result<RoomId> = simulateLongTask {
+        return createDmResult(userId, isEncrypted)
     }
 
     override suspend fun getProfile(userId: UserId): Result<MatrixUser> {
@@ -242,6 +266,28 @@ class FakeMatrixClient(
         return removeAvatarResult
     }
 
+    override suspend fun setUserStatus(status: UserStatus): Result<Unit> {
+        setUserStatusCalled = true
+        if (setUserStatusResult.isSuccess) {
+            _userProfile.emit(_userProfile.value.copy(
+                rawStatus = status,
+                displayedStatus = DisplayedStatus.UserSet(status),
+            ))
+        }
+        return setUserStatusResult
+    }
+
+    override suspend fun clearUserStatus(): Result<Unit> {
+        clearUserStatusCalled = true
+        if (clearUserStatusResult.isSuccess) {
+            _userProfile.emit(_userProfile.value.copy(
+                rawStatus = null,
+                displayedStatus = null,
+            ))
+        }
+        return clearUserStatusResult
+    }
+
     override suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?> = joinRoomLambda(roomId)
 
     override suspend fun joinRoomByIdOrAlias(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomInfo?> {
@@ -255,11 +301,11 @@ class FakeMatrixClient(
     // Mocks
 
     fun givenCreateRoomResult(result: Result<RoomId>) {
-        createRoomResult = result
+        createRoomResult = { result }
     }
 
     fun givenCreateDmResult(result: Result<RoomId>) {
-        createDmResult = result
+        createDmResult = { _, _ -> result }
     }
 
     fun givenFindDmResult(result: Result<RoomId?>) {
@@ -365,10 +411,18 @@ class FakeMatrixClient(
         return markRoomAsFullyReadResult(roomId, eventId)
     }
 
+    override suspend fun markAllRoomsAsRead(): Result<Unit> {
+        return markAllRoomsAsReadResult()
+    }
+
     override suspend fun performDatabaseVacuum(): Result<Unit> {
         return performDatabaseVacuumLambda()
     }
 
+    override suspend fun getMapStyleUrl(): Result<String?> = simulateLongTask {
+        getMapStyleUrlResult()
+    }
+
     override suspend fun canLinkNewDevice(): Result<Boolean> = simulateLongTask {
         return canLinkNewDeviceResult()
     }
@@ -384,4 +438,8 @@ class FakeMatrixClient(
     override suspend fun resetWellKnownConfig(): Result<Unit> {
         return resetWellKnownConfigLambda()
     }
+
+    override fun homeserverCapabilities(): HomeserverCapabilitiesProvider {
+        return homeserverCapabilitiesProvider
+    }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
index c4acccb55c..3b2fdeafb1 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
@@ -9,14 +9,16 @@
 package io.element.android.libraries.matrix.test.auth
 
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.auth.ElementClassicSession
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.api.auth.MatrixHomeServerDetails
-import io.element.android.libraries.matrix.api.auth.OidcDetails
-import io.element.android.libraries.matrix.api.auth.OidcPrompt
+import io.element.android.libraries.matrix.api.auth.OAuthDetails
+import io.element.android.libraries.matrix.api.auth.OAuthPrompt
 import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
 import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
@@ -24,7 +26,7 @@ import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.simulateLongTask
 
-val A_OIDC_DATA = OidcDetails(url = "a-url")
+val AN_OAUTH_DATA = OAuthDetails(url = "a-url")
 
 class FakeMatrixAuthenticationService(
     var matrixClientResult: ((SessionId) -> Result<MatrixClient>)? = null,
@@ -32,9 +34,11 @@ class FakeMatrixAuthenticationService(
         lambdaRecorder<MatrixQrCodeLoginData, (QrCodeLoginStep) -> Unit, Result<SessionId>> { _, _ -> Result.success(A_SESSION_ID) },
     private val importCreatedSessionLambda: (ExternalSession) -> Result<SessionId> = { lambdaError() },
     private val setHomeserverResult: (String) -> Result<MatrixHomeServerDetails> = { lambdaError() },
+    private val setElementClassicSessionResult: (ElementClassicSession?) -> Unit = { lambdaError() },
+    private val doSecretsContainBackupKeyResult: (UserId, String, String) -> Boolean = { _, _, _ -> lambdaError() },
 ) : MatrixAuthenticationService {
-    private var oidcError: Throwable? = null
-    private var oidcCancelError: Throwable? = null
+    private var oAuthError: Throwable? = null
+    private var oAuthCancelError: Throwable? = null
     private var loginError: Throwable? = null
     private var matrixClient: MatrixClient? = null
     private var onAuthenticationListener: ((MatrixClient) -> Unit)? = null
@@ -66,18 +70,18 @@ class FakeMatrixAuthenticationService(
         return importCreatedSessionLambda(externalSession)
     }
 
-    override suspend fun getOidcUrl(
-        prompt: OidcPrompt,
+    override suspend fun getOAuthUrl(
+        prompt: OAuthPrompt,
         loginHint: String?,
-    ): Result<OidcDetails> = simulateLongTask {
-        oidcError?.let { Result.failure(it) } ?: Result.success(A_OIDC_DATA)
+    ): Result<OAuthDetails> = simulateLongTask {
+        oAuthError?.let { Result.failure(it) } ?: Result.success(AN_OAUTH_DATA)
     }
 
-    override suspend fun cancelOidcLogin(): Result<Unit> {
-        return oidcCancelError?.let { Result.failure(it) } ?: Result.success(Unit)
+    override suspend fun cancelOAuthLogin(): Result<Unit> {
+        return oAuthCancelError?.let { Result.failure(it) } ?: Result.success(Unit)
     }
 
-    override suspend fun loginWithOidc(callbackUrl: String): Result<SessionId> = simulateLongTask {
+    override suspend fun loginWithOAuth(callbackUrl: String): Result<SessionId> = simulateLongTask {
         loginError?.let { Result.failure(it) } ?: run {
             onAuthenticationListener?.invoke(matrixClient ?: FakeMatrixClient())
             Result.success(A_USER_ID)
@@ -93,12 +97,12 @@ class FakeMatrixAuthenticationService(
         onAuthenticationListener = lambda
     }
 
-    fun givenOidcError(throwable: Throwable?) {
-        oidcError = throwable
+    fun givenOAuthError(throwable: Throwable?) {
+        oAuthError = throwable
     }
 
-    fun givenOidcCancelError(throwable: Throwable?) {
-        oidcCancelError = throwable
+    fun givenOAuthCancelError(throwable: Throwable?) {
+        oAuthCancelError = throwable
     }
 
     fun givenLoginError(throwable: Throwable?) {
@@ -108,4 +112,12 @@ class FakeMatrixAuthenticationService(
     fun givenMatrixClient(matrixClient: MatrixClient) {
         this.matrixClient = matrixClient
     }
+
+    override fun setElementClassicSession(session: ElementClassicSession?) {
+        setElementClassicSessionResult(session)
+    }
+
+    override fun doSecretsContainBackupKey(userId: UserId, secrets: String, backupInfo: String): Boolean {
+        return doSecretsContainBackupKeyResult(userId, secrets, backupInfo)
+    }
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOAuthRedirectUrlProvider.kt
similarity index 75%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOAuthRedirectUrlProvider.kt
index 47c9b0951d..fcb28b48ba 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOAuthRedirectUrlProvider.kt
@@ -8,12 +8,12 @@
 
 package io.element.android.libraries.matrix.test.auth
 
-import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
+import io.element.android.libraries.matrix.api.auth.OAuthRedirectUrlProvider
 
 const val FAKE_REDIRECT_URL = "io.element.android:/"
 
-class FakeOidcRedirectUrlProvider(
+class FakeOAuthRedirectUrlProvider(
     private val provideResult: String = FAKE_REDIRECT_URL,
-) : OidcRedirectUrlProvider {
+) : OAuthRedirectUrlProvider {
     override fun provide() = provideResult
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/MatrixHomeServerDetails.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/MatrixHomeServerDetails.kt
index 3b9573bcfc..56fd4de4c3 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/MatrixHomeServerDetails.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/MatrixHomeServerDetails.kt
@@ -14,9 +14,9 @@ import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 fun aMatrixHomeServerDetails(
     url: String = A_HOMESERVER_URL,
     supportsPasswordLogin: Boolean = false,
-    supportsOidcLogin: Boolean = false,
+    supportsOAuthLogin: Boolean = false,
 ) = MatrixHomeServerDetails(
     url = url,
     supportsPasswordLogin = supportsPasswordLogin,
-    supportsOidcLogin = supportsOidcLogin,
+    supportsOAuthLogin = supportsOAuthLogin,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
index 04e3779298..e090319821 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt
@@ -28,7 +28,8 @@ class FakeEncryptionService(
     private val pinUserIdentityResult: (UserId) -> Result<Unit> = { lambdaError() },
     private val withdrawVerificationResult: (UserId) -> Result<Unit> = { lambdaError() },
     private val getUserIdentityResult: (UserId) -> Result<IdentityState?> = { lambdaError() },
-    private val enableRecoveryLambda: (Boolean) -> Result<Unit> = { lambdaError() },
+    private val enableRecoveryLambda: (Boolean, String?) -> Result<String> = { _, _ -> lambdaError() },
+    private val resetRecoveryKeyLambda: () -> Result<String> = { Result.success(FAKE_RECOVERY_KEY) },
 ) : EncryptionService {
     private var disableRecoveryFailure: Exception? = null
     override val backupStateStateFlow: MutableStateFlow<BackupState> = MutableStateFlow(BackupState.UNKNOWN)
@@ -90,11 +91,11 @@ class FakeEncryptionService(
     }
 
     override suspend fun resetRecoveryKey(): Result<String> = simulateLongTask {
-        return Result.success(FAKE_RECOVERY_KEY)
+        return resetRecoveryKeyLambda()
     }
 
-    override suspend fun enableRecovery(waitForBackupsToUpload: Boolean): Result<Unit> = simulateLongTask {
-        return enableRecoveryLambda(waitForBackupsToUpload)
+    override suspend fun enableRecovery(waitForBackupsToUpload: Boolean, passphrase: String?): Result<String> = simulateLongTask {
+        return enableRecoveryLambda(waitForBackupsToUpload, passphrase)
     }
 
     fun givenWaitForBackupUploadSteadyStateFlow(flow: Flow<BackupUploadState>) {
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt
index 06ffeb547c..d65328d7fe 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeIdentityResetHandle.kt
@@ -8,16 +8,16 @@
 
 package io.element.android.libraries.matrix.test.encryption
 
-import io.element.android.libraries.matrix.api.encryption.IdentityOidcResetHandle
+import io.element.android.libraries.matrix.api.encryption.IdentityOAuthResetHandle
 import io.element.android.libraries.matrix.api.encryption.IdentityPasswordResetHandle
 
-class FakeIdentityOidcResetHandle(
+class FakeIdentityOAuthResetHandle(
     override val url: String = "",
-    var resetOidcLambda: () -> Result<Unit> = { error("Not implemented") },
+    var resetOAuthLambda: () -> Result<Unit> = { error("Not implemented") },
     var cancelLambda: () -> Unit = { error("Not implemented") },
-) : IdentityOidcResetHandle {
-    override suspend fun resetOidc(): Result<Unit> {
-        return resetOidcLambda()
+) : IdentityOAuthResetHandle {
+    override suspend fun resetOAuth(): Result<Unit> {
+        return resetOAuthLambda()
     }
 
     override suspend fun cancel() {
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakePasswordStrengthEstimator.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakePasswordStrengthEstimator.kt
new file mode 100644
index 0000000000..b74e021a2e
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakePasswordStrengthEstimator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.encryption
+
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthEstimate
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthEstimator
+import io.element.android.libraries.matrix.api.encryption.PasswordStrengthRanking
+
+class FakePasswordStrengthEstimator(
+    private val estimateResult: (password: String, userInputs: List<String>) -> PasswordStrengthEstimate =
+        { _, _ -> aPasswordStrengthEstimate() },
+) : PasswordStrengthEstimator {
+    override fun estimate(password: String, userInputs: List<String>): PasswordStrengthEstimate =
+        estimateResult(password, userInputs)
+}
+
+fun aPasswordStrengthEstimate(
+    ranking: PasswordStrengthRanking = PasswordStrengthRanking.Strong,
+    score: Double = 18.0,
+    normalScore: Double = 0.7,
+) = PasswordStrengthEstimate(
+    ranking = ranking,
+    score = score,
+    normalScore = normalScore,
+)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/mxc/FakeMxcTools.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/mxc/FakeMxcTools.kt
index c348cd351c..d49a1cc22d 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/mxc/FakeMxcTools.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/mxc/FakeMxcTools.kt
@@ -8,8 +8,12 @@
 package io.element.android.libraries.matrix.test.mxc
 
 import io.element.android.libraries.matrix.api.mxc.MxcTools
-import io.element.android.libraries.matrix.impl.mxc.DefaultMxcTools
+import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeMxcTools(
-    private val delegate: MxcTools = DefaultMxcTools()
-) : MxcTools by delegate
+    private val mxcUri2FilePathResult: (String) -> String? = { lambdaError() }
+) : MxcTools {
+    override fun mxcUri2FilePath(mxcUri: String): String? {
+        return mxcUri2FilePathResult(mxcUri)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt
index 564cd231b2..f7970e7971 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notificationsettings/FakeNotificationSettingsService.kt
@@ -70,12 +70,12 @@ class FakeNotificationSettingsService(
         }
     }
 
-    override suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isOneToOne: Boolean): Result<Unit> {
+    override suspend fun setDefaultRoomNotificationMode(isEncrypted: Boolean, mode: RoomNotificationMode, isDM: Boolean): Result<Unit> {
         val error = setDefaultNotificationModeError
         if (error != null) {
             return Result.failure(error)
         }
-        if (isOneToOne) {
+        if (isDM) {
             if (isEncrypted) {
                 defaultEncryptedOneToOneRoomNotificationMode = mode
             } else {
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
index 4ceddc414c..8f5d626b13 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
@@ -186,10 +186,6 @@ class FakeBaseRoom(
         membersStateFlow.value = state
     }
 
-    override suspend fun clearEventCacheStorage(): Result<Unit> {
-        return Result.success(Unit)
-    }
-
     override suspend fun reportRoom(reason: String?) = reportRoomResult(reason)
 
     override suspend fun declineCall(notificationEventId: EventId): Result<Unit> {
@@ -223,4 +219,6 @@ fun defaultRoomPowerLevelValues() = RoomPowerLevelsValues(
     roomAvatar = 50,
     roomTopic = 50,
     spaceChild = 50,
+    beacon = 0,
+    beaconInfo = 0,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt
index a4580334e4..dd8acacb23 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt
@@ -34,7 +34,9 @@ import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
+import io.element.android.libraries.matrix.test.room.threads.FakeThreadsListService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
@@ -56,6 +58,7 @@ class FakeJoinedRoom(
     override val roomNotificationSettingsStateFlow: StateFlow<RoomNotificationSettingsState> =
         MutableStateFlow(RoomNotificationSettingsState.Unknown),
     override val knockRequestsFlow: Flow<List<KnockRequest>> = MutableStateFlow(emptyList()),
+    override val threadsListService: FakeThreadsListService = FakeThreadsListService(),
     private val roomNotificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
     private var createTimelineResult: (CreateTimelineParams) -> Result<Timeline> = { lambdaError() },
     private val editMessageLambda: (EventId, String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _, _ -> lambdaError() },
@@ -86,9 +89,10 @@ class FakeJoinedRoom(
     private val updateJoinRuleResult: (JoinRule) -> Result<Unit> = { lambdaError() },
     private val setSendQueueEnabledResult: (Boolean) -> Unit = { _: Boolean -> },
     private val liveLocationSharesFlow: Flow<List<LiveLocationShare>> = MutableStateFlow(emptyList()),
-    private val startLiveLocationShareResult: (Long) -> Result<Unit> = { lambdaError() },
+    private val startLiveLocationShareResult: (Long) -> Result<EventId> = { lambdaError() },
     private val stopLiveLocationShareResult: () -> Result<Unit> = { lambdaError() },
     private val sendLiveLocationResult: (String) -> Result<Unit> = { lambdaError() },
+    private val setOwnMemberDisplayNameResult: (String) -> Result<Unit> = { lambdaError() },
 ) : JoinedRoom, BaseRoom by baseRoom {
     private val sendQueueUpdates = MutableSharedFlow<SendQueueUpdate>(extraBufferCapacity = 10)
 
@@ -131,7 +135,11 @@ class FakeJoinedRoom(
     }
 
     override suspend fun updateRoomNotificationSettings(): Result<Unit> = simulateLongTask {
-        val notificationSettings = roomNotificationSettingsService.getRoomNotificationSettings(roomId, info().isEncrypted.orFalse(), isOneToOne).getOrThrow()
+        val notificationSettings = roomNotificationSettingsService.getRoomNotificationSettings(
+            roomId = roomId,
+            isEncrypted = info().isEncrypted.orFalse(),
+            isOneToOne = isDm(),
+        ).getOrThrow()
         (roomNotificationSettingsStateFlow as MutableStateFlow).value = RoomNotificationSettingsState.Ready(notificationSettings)
         return Result.success(Unit)
     }
@@ -236,8 +244,8 @@ class FakeJoinedRoom(
         return liveLocationSharesFlow
     }
 
-    override suspend fun startLiveLocationShare(durationMillis: Long): Result<Unit> = simulateLongTask {
-        startLiveLocationShareResult(durationMillis)
+    override suspend fun startLiveLocationShare(durationMillis: Long): Result<EventId> = simulateLongTask {
+        startLiveLocationShareResult(durationMillis).map { AN_EVENT_ID }
     }
 
     override suspend fun stopLiveLocationShare(): Result<Unit> = simulateLongTask {
@@ -248,6 +256,10 @@ class FakeJoinedRoom(
         sendLiveLocationResult(geoUri)
     }
 
+    override suspend fun setOwnMemberDisplayName(displayName: String): Result<Unit> = simulateLongTask {
+        setOwnMemberDisplayNameResult(displayName)
+    }
+
     private suspend fun simulateSendMediaProgress(progressCallback: ProgressCallback?) {
         progressCallbackValues.forEach { (current, total) ->
             progressCallback?.onProgress(current, total)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
index c7faaba627..3293570eec 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
@@ -71,6 +71,8 @@ fun aRoomInfo(
     privilegedCreatorRole: Boolean = false,
     isLowPriority: Boolean = false,
     activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
+    isDm: Boolean = false,
+    fullyReadEventId: EventId? = null,
 ) = RoomInfo(
     id = id,
     name = name,
@@ -109,4 +111,6 @@ fun aRoomInfo(
     privilegedCreatorRole = privilegedCreatorRole,
     isLowPriority = isLowPriority,
     activeCallIntentConsensus = activeCallIntentConsensus,
+    isDm = isDm,
+    fullyReadEventId = fullyReadEventId,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt
index f6bc0c5ec2..1a19eddba0 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomMemberFixture.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.matrix.test.room
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.collections.immutable.persistentListOf
 
 fun aRoomMember(
@@ -23,6 +24,8 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
+    displayedStatus: DisplayedStatus? = null,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -33,6 +36,8 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
+    displayedStatus = displayedStatus,
 )
 
 fun aRoomMemberList() = persistentListOf(
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
index afe4c88f5a..392aa880c9 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@@ -81,6 +81,7 @@ fun aRoomSummary(
     privilegedCreatorRole: Boolean = false,
     isLowPriority: Boolean = false,
     activeCallIntentConsensus: CallIntentConsensus = CallIntentConsensus.None,
+    fullyReadEventId: EventId? = null,
 ) = RoomSummary(
     info = RoomInfo(
         id = roomId,
@@ -120,6 +121,8 @@ fun aRoomSummary(
         privilegedCreatorRole = privilegedCreatorRole,
         isLowPriority = isLowPriority,
         activeCallIntentConsensus = activeCallIntentConsensus,
+        isDm = false,
+        fullyReadEventId = fullyReadEventId,
     ),
     latestEvent = latestEvent,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/location/LiveLocationFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/location/LiveLocationFixture.kt
new file mode 100644
index 0000000000..23730c8886
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/location/LiveLocationFixture.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.room.location
+
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.location.AssetType
+import io.element.android.libraries.matrix.api.room.location.LastLocation
+import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_USER_ID
+
+fun aLiveLocationShare(
+    beaconId: EventId = AN_EVENT_ID,
+    userId: UserId = A_USER_ID,
+    geoUri: String = "geo:48.8584,2.2945",
+    timestamp: Long = 0L,
+    startTimestamp: Long = 0L,
+    endTimestamp: Long = Long.MAX_VALUE,
+    assetType: AssetType = AssetType.SENDER,
+): LiveLocationShare {
+    return LiveLocationShare(
+        beaconId = beaconId,
+        userId = userId,
+        lastLocation = LastLocation(
+            geoUri = geoUri,
+            timestamp = timestamp,
+            assetType = assetType,
+        ),
+        startTimestamp = startTimestamp,
+        endTimestamp = endTimestamp,
+    )
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/threads/FakeThreadsListService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/threads/FakeThreadsListService.kt
new file mode 100644
index 0000000000..a1e719ffb2
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/threads/FakeThreadsListService.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.room.threads
+
+import io.element.android.libraries.matrix.api.room.threads.ThreadListItem
+import io.element.android.libraries.matrix.api.room.threads.ThreadListPaginationStatus
+import io.element.android.libraries.matrix.api.room.threads.ThreadsListService
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class FakeThreadsListService(
+    private val items: MutableStateFlow<List<ThreadListItem>> = MutableStateFlow(emptyList()),
+    private val paginationStatus: MutableStateFlow<ThreadListPaginationStatus> = MutableStateFlow(ThreadListPaginationStatus.Idle(hasMoreToLoad = true)),
+    private val subscribeToItemUpdates: () -> Flow<List<ThreadListItem>> = { items },
+    private val subscribeToPaginationUpdates: () -> Flow<ThreadListPaginationStatus> = { paginationStatus },
+    private val paginate: suspend () -> Result<Unit> = { Result.success(Unit) },
+    private val reset: suspend () -> Result<Unit> = { Result.success(Unit) },
+    private val destroy: () -> Unit = {},
+) : ThreadsListService {
+    override fun subscribeToItemUpdates(): Flow<List<ThreadListItem>> {
+        return subscribeToItemUpdates.invoke()
+    }
+
+    override fun subscribeToPaginationUpdates(): Flow<ThreadListPaginationStatus> {
+        return subscribeToPaginationUpdates.invoke()
+    }
+
+    override suspend fun paginate(): Result<Unit> {
+        return paginate.invoke()
+    }
+
+    override suspend fun reset(): Result<Unit> {
+        return reset.invoke()
+    }
+
+    override fun destroy() {
+        return destroy.invoke()
+    }
+
+    suspend fun emit(items: List<ThreadListItem>) {
+        this.items.emit(items)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/scanner/FakeContentScanner.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/scanner/FakeContentScanner.kt
new file mode 100644
index 0000000000..a4d9ce72e7
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/scanner/FakeContentScanner.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.scanner
+
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.scanner.ContentScanner
+
+class FakeContentScanner(
+    private val scan: suspend (mediaSource: MediaSource) -> Result<Boolean> = { Result.success(true) },
+) : ContentScanner {
+    override suspend fun scan(mediaSource: MediaSource): Result<Boolean> {
+        return scan.invoke(mediaSource)
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearch.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearch.kt
new file mode 100644
index 0000000000..8cb3bae986
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearch.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.search
+
+import io.element.android.libraries.matrix.api.search.MessageSearch
+import io.element.android.libraries.matrix.api.search.MessageSearchPaginationState
+import io.element.android.libraries.matrix.api.search.MessageSearchResult
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+class FakeMessageSearch(
+    private val setQueryResult: suspend (String) -> Result<Unit> = { Result.success(Unit) },
+    private val paginateResult: suspend () -> Result<Unit> = { Result.success(Unit) },
+    private val controllablePagination: Boolean = false,
+) : MessageSearch {
+    private val mutableResults = MutableStateFlow<ImmutableList<MessageSearchResult>>(persistentListOf())
+    override val results: StateFlow<ImmutableList<MessageSearchResult>> = mutableResults
+
+    private val mutablePaginationState = MutableStateFlow<MessageSearchPaginationState>(
+        MessageSearchPaginationState.Idle(endReached = false)
+    )
+    override val paginationState: StateFlow<MessageSearchPaginationState> = mutablePaginationState
+
+    var lastQuery: String? = null
+        private set
+
+    var setQueryCallCount = 0
+        private set
+
+    var paginateCallCount = 0
+        private set
+
+    var completedPaginateCallCount = 0
+        private set
+
+    var cancelledPaginateCallCount = 0
+        private set
+
+    private var pendingPagination = CompletableDeferred<PaginationCompletion>()
+
+    override suspend fun setQuery(query: String): Result<Unit> {
+        lastQuery = query
+        setQueryCallCount++
+        return setQueryResult(query)
+    }
+
+    override suspend fun paginate(): Result<Unit> {
+        paginateCallCount++
+        if (!controllablePagination) {
+            return paginateResult()
+        }
+
+        mutablePaginationState.value = MessageSearchPaginationState.Loading
+        return try {
+            val completion = pendingPagination.await()
+            completedPaginateCallCount++
+            mutablePaginationState.value = MessageSearchPaginationState.Idle(endReached = completion.endReached)
+            completion.result
+        } catch (exception: CancellationException) {
+            cancelledPaginateCallCount++
+            mutablePaginationState.value = MessageSearchPaginationState.Idle(endReached = false)
+            throw exception
+        } finally {
+            pendingPagination = CompletableDeferred()
+        }
+    }
+
+    fun emitResults(results: ImmutableList<MessageSearchResult>) {
+        mutableResults.value = results
+    }
+
+    fun emitPaginationState(state: MessageSearchPaginationState) {
+        mutablePaginationState.value = state
+    }
+
+    fun completePagination(
+        result: Result<Unit> = Result.success(Unit),
+        endReached: Boolean = false,
+    ) {
+        check(pendingPagination.complete(PaginationCompletion(result, endReached))) {
+            "There is no pending pagination to complete."
+        }
+    }
+
+    private data class PaginationCompletion(
+        val result: Result<Unit>,
+        val endReached: Boolean,
+    )
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearchService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearchService.kt
new file mode 100644
index 0000000000..38d418e30e
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/search/FakeMessageSearchService.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.test.search
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.search.MessageSearch
+import io.element.android.libraries.matrix.api.search.MessageSearchService
+import kotlinx.coroutines.CoroutineScope
+
+class FakeMessageSearchService(
+    private val messageSearch: MessageSearch = FakeMessageSearch(),
+) : MessageSearchService {
+    /** The room the search was scoped to on the last call — null means all rooms. */
+    var lastRoomId: RoomId? = null
+        private set
+
+    var createMessageSearchCallCount = 0
+        private set
+
+    override fun createMessageSearch(scope: CoroutineScope, roomId: RoomId?): MessageSearch {
+        lastRoomId = roomId
+        createMessageSearchCallCount++
+        return messageSearch
+    }
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt
index 4451de6276..d13ac06bd3 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt
@@ -13,6 +13,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
@@ -20,6 +21,7 @@ import io.element.android.libraries.matrix.api.poll.PollKind
 import io.element.android.libraries.matrix.api.room.IntentionalMention
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
@@ -64,7 +66,9 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
-    ) -> Result<Unit> = { _, _, _ ->
+        msgType: MsgType,
+        asPlainText: Boolean,
+    ) -> Result<Unit> = { _, _, _, _, _ ->
         lambdaError()
     }
 
@@ -76,8 +80,10 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
+        msgType: MsgType,
+        asPlainText: Boolean,
     ): Result<Unit> = simulateLongTask {
-        sendMessageLambda(body, htmlBody, intentionalMentions)
+        sendMessageLambda(body, htmlBody, intentionalMentions, msgType, asPlainText)
     }
 
     var redactEventLambda: (eventOrTransactionId: EventOrTransactionId, reason: String?) -> Result<Unit> = { _, _ ->
@@ -134,7 +140,8 @@ class FakeTimeline(
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
         fromNotification: Boolean,
-    ) -> Result<Unit> = { _, _, _, _, _ ->
+        msgType: MsgType,
+    ) -> Result<Unit> = { _, _, _, _, _, _ ->
         lambdaError()
     }
 
@@ -144,12 +151,14 @@ class FakeTimeline(
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
         fromNotification: Boolean,
+        msgType: MsgType,
     ): Result<Unit> = replyMessageLambda(
         repliedToEventId,
         body,
         htmlBody,
         intentionalMentions,
         fromNotification,
+        msgType,
     )
 
     var sendImageLambda: (
@@ -285,6 +294,29 @@ class FakeTimeline(
         )
     }
 
+    var sendGalleryLambda: (
+        items: List<GalleryItemInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ) -> Result<MediaUploadHandler> = { _, _, _, _ ->
+        Result.success(FakeMediaUploadHandler())
+    }
+
+    override suspend fun sendGallery(
+        items: List<GalleryItemInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<MediaUploadHandler> = simulateLongTask {
+        sendGalleryLambda(
+            items,
+            caption,
+            formattedCaption,
+            inReplyToEventId,
+        )
+    }
+
     var sendLocationLambda: (
         body: String,
         geoUri: String,
@@ -428,6 +460,9 @@ class FakeTimeline(
 
     override suspend fun loadReplyDetails(eventId: EventId) = loadReplyDetailsLambda(eventId)
 
+    var isEventLoadedLambda: (eventId: EventId) -> Boolean = { false }
+    override suspend fun isEventLoaded(eventId: EventId): Boolean = isEventLoadedLambda(eventId)
+
     var pinEventLambda: (eventId: EventId) -> Result<Boolean> = { lambdaError() }
     override suspend fun pinEvent(eventId: EventId): Result<Boolean> {
         return pinEventLambda(eventId)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
index 2825e7c5be..b61009a5c6 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/TimelineFixture.kt
@@ -33,6 +33,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.SendHandlePro
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemDebugInfoProvider
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
@@ -84,11 +85,13 @@ fun anEventTimelineItem(
 fun aProfileDetails(
     displayName: String? = A_USER_NAME,
     displayNameAmbiguous: Boolean = false,
-    avatarUrl: String? = null
+    avatarUrl: String? = null,
+    displayedStatus: DisplayedStatus? = null,
 ): ProfileDetails = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
+    displayedStatus = displayedStatus,
 )
 
 fun aProfileChangeMessageContent(
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt
index f4f12a435e..0aeeebf86d 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/verification/FakeSessionVerificationService.kt
@@ -22,12 +22,12 @@ import kotlinx.coroutines.flow.StateFlow
 
 class FakeSessionVerificationService(
     initialSessionVerifiedStatus: SessionVerifiedStatus = SessionVerifiedStatus.Unknown,
-    private val requestCurrentSessionVerificationLambda: () -> Unit = { lambdaError() },
+    private val requestDeviceVerificationLambda: () -> Unit = { lambdaError() },
     private val requestUserVerificationLambda: (UserId) -> Unit = { lambdaError() },
     private val cancelVerificationLambda: () -> Unit = { lambdaError() },
     private val approveVerificationLambda: () -> Unit = { lambdaError() },
     private val declineVerificationLambda: () -> Unit = { lambdaError() },
-    private val startVerificationLambda: () -> Unit = { lambdaError() },
+    private val startSasVerificationLambda: () -> Unit = { lambdaError() },
     private val resetLambda: (Boolean) -> Unit = { lambdaError() },
     private val acknowledgeVerificationRequestLambda: (VerificationRequest.Incoming) -> Unit = { lambdaError() },
     private val acceptVerificationRequestLambda: () -> Unit = { lambdaError() },
@@ -40,31 +40,31 @@ class FakeSessionVerificationService(
     override val sessionVerifiedStatus: StateFlow<SessionVerifiedStatus> = _sessionVerifiedStatus
     override val needsSessionVerification: Flow<Boolean> = _needsSessionVerification
 
-    override suspend fun requestCurrentSessionVerification() {
-        requestCurrentSessionVerificationLambda()
+    override suspend fun requestDeviceVerification() = simulateLongTask {
+        requestDeviceVerificationLambda()
     }
 
-    override suspend fun requestUserVerification(userId: UserId) {
+    override suspend fun requestUserVerification(userId: UserId) = simulateLongTask {
         requestUserVerificationLambda(userId)
     }
 
-    override suspend fun cancelVerification() {
+    override suspend fun cancelVerification() = simulateLongTask {
         cancelVerificationLambda()
     }
 
-    override suspend fun approveVerification() {
+    override suspend fun approveVerification() = simulateLongTask {
         approveVerificationLambda()
     }
 
-    override suspend fun declineVerification() {
+    override suspend fun declineVerification() = simulateLongTask {
         declineVerificationLambda()
     }
 
-    override suspend fun startVerification() {
-        startVerificationLambda()
+    override suspend fun startSasVerification() = simulateLongTask {
+        startSasVerificationLambda()
     }
 
-    override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) {
+    override suspend fun reset(cancelAnyPendingVerificationAttempt: Boolean) = simulateLongTask {
         resetLambda(cancelAnyPendingVerificationAttempt)
     }
 
@@ -75,7 +75,7 @@ class FakeSessionVerificationService(
         this.listener = listener
     }
 
-    override suspend fun acknowledgeVerificationRequest(verificationRequest: VerificationRequest.Incoming) {
+    override suspend fun acknowledgeVerificationRequest(verificationRequest: VerificationRequest.Incoming) = simulateLongTask {
         acknowledgeVerificationRequestLambda(verificationRequest)
     }
 
diff --git a/libraries/matrixmedia/impl/build.gradle.kts b/libraries/matrixmedia/impl/build.gradle.kts
index 82afc2f62c..62799b5eaa 100644
--- a/libraries/matrixmedia/impl/build.gradle.kts
+++ b/libraries/matrixmedia/impl/build.gradle.kts
@@ -19,11 +19,14 @@ android {
 setupDependencyInjection()
 
 dependencies {
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.designsystem)
     implementation(libs.coil.compose)
     implementation(libs.coil.gif)
+    implementation(libs.coil.svg)
     implementation(libs.coil.network.okhttp)
 
     testCommonDependencies(libs, true)
diff --git a/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
index 39f67b41d7..d31b5671eb 100644
--- a/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
@@ -13,6 +13,7 @@ import coil3.decode.ImageSource
 import coil3.fetch.FetchResult
 import coil3.fetch.Fetcher
 import coil3.fetch.SourceFetchResult
+import io.element.android.libraries.matrix.api.exception.isNetworkError
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.media.toFile
@@ -34,7 +35,18 @@ internal class CoilMediaFetcher(
         }
         return when (val kind = mediaData.kind) {
             is MediaRequestData.Kind.Content -> fetchContent(mediaSource)
-            is MediaRequestData.Kind.Thumbnail -> fetchThumbnail(mediaSource, kind)
+            is MediaRequestData.Kind.Thumbnail -> {
+                fetchThumbnail(mediaSource, kind).fold(
+                    onSuccess = { it },
+                    onFailure = { error ->
+                        if (error.isNetworkError()) {
+                            throw error
+                        } else {
+                            fetchContent(mediaSource)
+                        }
+                    }
+                )
+            }
             is MediaRequestData.Kind.File -> fetchFile(mediaSource, kind)
         }
     }
@@ -61,7 +73,7 @@ internal class CoilMediaFetcher(
             .onFailure {
                 Timber.e(it)
             }
-            .getOrNull()
+            .getOrThrow()
     }
 
     private suspend fun fetchContent(mediaSource: MediaSource): FetchResult? {
@@ -71,10 +83,10 @@ internal class CoilMediaFetcher(
             byteArray.asSourceResult()
         }.onFailure {
             Timber.e(it)
-        }.getOrNull()
+        }.getOrThrow()
     }
 
-    private suspend fun fetchThumbnail(mediaSource: MediaSource, kind: MediaRequestData.Kind.Thumbnail): FetchResult? {
+    private suspend fun fetchThumbnail(mediaSource: MediaSource, kind: MediaRequestData.Kind.Thumbnail): Result<FetchResult> {
         return mediaLoader.loadMediaThumbnail(
             source = mediaSource,
             width = kind.width,
@@ -83,7 +95,7 @@ internal class CoilMediaFetcher(
             byteArray.asSourceResult()
         }.onFailure {
             Timber.e(it)
-        }.getOrNull()
+        }
     }
 
     private fun ByteArray.asSourceResult(): SourceFetchResult {
diff --git a/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
index e67e630e97..b414560fc9 100644
--- a/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
+++ b/libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
@@ -14,9 +14,9 @@ import coil3.ImageLoader
 import coil3.gif.AnimatedImageDecoder
 import coil3.gif.GifDecoder
 import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.svg.SvgDecoder
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Provider
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import okhttp3.OkHttpClient
@@ -29,7 +29,7 @@ interface ImageLoaderFactory {
 @ContributesBinding(AppScope::class)
 class DefaultImageLoaderFactory(
     @ApplicationContext private val context: Context,
-    private val okHttpClient: Provider<OkHttpClient>,
+    private val okHttpClient: () -> OkHttpClient,
 ) : ImageLoaderFactory {
     private val okHttpNetworkFetcherFactory = OkHttpNetworkFetcherFactory(
         callFactory = {
@@ -50,6 +50,8 @@ class DefaultImageLoaderFactory(
         return ImageLoader.Builder(context)
             .components {
                 add(okHttpNetworkFetcherFactory)
+                // Add svg support
+                add(SvgDecoder.Factory())
                 // Add gif support
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                     add(AnimatedImageDecoder.Factory())
diff --git a/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt b/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt
index dd9127a4ae..2bb1ddcae4 100644
--- a/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt
+++ b/libraries/matrixmedia/impl/src/test/kotlin/io/element/android/libraries/matrix/ui/media/DefaultImageLoaderHolderTest.kt
@@ -19,13 +19,11 @@ import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObse
 import io.element.android.libraries.sessionstorage.test.observer.NoOpSessionObserver
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultImageLoaderHolderTest {
+class DefaultImageLoaderHolderTest : RobolectricTest() {
     @Test
     fun `get - returns the same ImageLoader for the same client`() {
         val context = InstrumentationRegistry.getInstrumentation().context
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
index 4628833bb4..e3f6478b76 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
@@ -18,7 +18,8 @@ import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.SheetValue
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
@@ -47,8 +48,9 @@ fun AvatarActionBottomSheet(
     modifier: Modifier = Modifier,
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val sheetState = rememberModalBottomSheetState(
-        skipPartiallyExpanded = true
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
     )
 
     BackHandler(enabled = isVisible) {
@@ -67,6 +69,7 @@ fun AvatarActionBottomSheet(
             },
             modifier = modifier,
             sheetState = sheetState,
+            scrollable = false,
         ) {
             AvatarActionBottomSheetContent(
                 actions = actions,
@@ -93,7 +96,7 @@ private fun AvatarActionBottomSheetContent(
         ) { action ->
             ListItem(
                 modifier = Modifier.clickable { onActionClick(action) },
-                headlineContent = {
+                content = {
                     Text(
                         text = stringResource(action.titleResId),
                         style = ElementTheme.typography.fontBodyLgRegular,
@@ -103,7 +106,7 @@ private fun AvatarActionBottomSheetContent(
                 leadingContent = ListItemContent.Icon(IconSource.Resource(action.iconResourceId)),
                 style = when {
                     action.destructive -> ListItemStyle.Destructive
-                    else -> ListItemStyle.Primary
+                    else -> ListItemStyle.Default
                 }
             )
         }
@@ -112,7 +115,7 @@ private fun AvatarActionBottomSheetContent(
 
 @PreviewsDayNight
 @Composable
-internal fun AvatarActionBottomSheetPreview() = ElementPreview {
+internal fun AvatarActionBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
     AvatarActionBottomSheet(
         actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove),
         isVisible = true,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
index e743a2447c..81822a04cc 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarPickerView.kt
@@ -42,6 +42,7 @@ import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
@@ -183,6 +184,7 @@ private fun PickButton(
     }
 }
 
+@Suppress("ModifierClickableOrder")
 @Composable
 private fun BoxScope.OverlayEditButton(
     onClick: () -> Unit,
@@ -196,7 +198,10 @@ private fun BoxScope.OverlayEditButton(
             .clip(CircleShape)
             .clickable(interactionSource = interactionSource, onClick = onClick, indication = null)
             .background(ElementTheme.colors.bgCanvasDefault)
-            .border(BorderStroke(1.dp, ElementTheme.colors.borderInteractiveSecondary), shape = CircleShape),
+            .border(BorderStroke(1.dp, ElementTheme.colors.borderInteractiveSecondary), shape = CircleShape)
+            .clearAndSetSemantics {
+                hideFromAccessibility()
+            },
         contentAlignment = Alignment.Center,
     ) {
         Icon(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUserRow.kt
index 917b03f309..31a8f5c646 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CheckableUserRow.kt
@@ -8,17 +8,18 @@
 
 package io.element.android.libraries.matrix.ui.components
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.selection.toggleable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -39,8 +40,8 @@ fun CheckableUserRow(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .clickable(role = Role.Checkbox, enabled = enabled) {
-                onCheckedChange(!checked)
+            .toggleable(value = checked, role = Role.Checkbox, enabled = enabled) {
+                onCheckedChange(it)
             },
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -50,7 +51,7 @@ fun CheckableUserRow(
                 UserRow(
                     modifier = rowModifier,
                     avatarData = data.avatarData,
-                    name = data.name,
+                    name = AnnotatedString(data.name),
                     subtext = data.subtext,
                     enabled = enabled,
                 )
@@ -65,7 +66,7 @@ fun CheckableUserRow(
             }
         }
         Checkbox(
-            onCheckedChange = onCheckedChange,
+            onCheckedChange = null,
             checked = checked,
             enabled = enabled,
         )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CreateDmConfirmationBottomSheet.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CreateDmConfirmationBottomSheet.kt
index dca173d780..598d7f2ca7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CreateDmConfirmationBottomSheet.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CreateDmConfirmationBottomSheet.kt
@@ -8,23 +8,31 @@
 
 package io.element.android.libraries.matrix.ui.components
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.atomic.molecules.ButtonRowMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
@@ -33,6 +41,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.R
@@ -48,62 +57,126 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun CreateDmConfirmationBottomSheet(
     matrixUser: MatrixUser,
+    isUserIdentityUnknown: Boolean,
     onSendInvite: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val titleContent = if (isUserIdentityUnknown) {
+        stringResource(R.string.screen_bottom_sheet_create_dm_unknown_user_title)
+    } else {
+        stringResource(R.string.screen_bottom_sheet_create_dm_title)
+    }
+    val descriptionContent = if (isUserIdentityUnknown) {
+        stringResource(R.string.screen_bottom_sheet_create_dm_unknown_user_content)
+    } else {
+        stringResource(R.string.screen_bottom_sheet_create_dm_message, matrixUser.getFullName())
+    }
+
     ModalBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismiss,
-        sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+        sheetState = rememberBottomSheetState(
+            initialValue = SheetValue.Hidden,
+            enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+        ),
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 24.dp, bottom = 16.dp, start = 16.dp, end = 16.dp),
+                .padding(top = 24.dp, bottom = 16.dp, start = 16.dp, end = 16.dp)
+                .verticalScroll(rememberScrollState()),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Avatar(
-                avatarData = matrixUser.getAvatarData(AvatarSize.DmCreationConfirmation),
-                avatarType = AvatarType.User,
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            Text(
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_title),
-                style = ElementTheme.typography.fontHeadingMdBold,
-                color = ElementTheme.colors.textPrimary,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            Text(
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_message, matrixUser.getFullName()),
-                style = ElementTheme.typography.fontBodyMdRegular,
-                color = ElementTheme.colors.textSecondary,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(modifier = Modifier.height(40.dp))
-            Button(
-                modifier = Modifier.fillMaxWidth(),
-                onClick = onSendInvite,
-                leadingIcon = IconSource.Vector(CompoundIcons.UserAdd()),
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_confirmation_button_title),
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            TextButton(
-                modifier = Modifier.fillMaxWidth(),
-                onClick = onDismiss,
-                text = stringResource(CommonStrings.action_cancel),
-            )
+            if (isUserIdentityUnknown) {
+                IconTitleSubtitleMolecule(
+                    modifier = Modifier.padding(
+                        bottom = 16.dp,
+                        start = 16.dp,
+                        end = 16.dp,
+                    ),
+                    title = titleContent,
+                    subTitle = descriptionContent,
+                    iconStyle = BigIcon.Style.Default(CompoundIcons.UserAddSolid()),
+                )
+                MatrixUserRow(matrixUser)
+                Spacer(modifier = Modifier.height(32.dp))
+                ButtonRowMolecule(
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                ) {
+                    OutlinedButton(
+                        modifier = Modifier.weight(1f),
+                        text = stringResource(CommonStrings.action_cancel),
+                        onClick = onDismiss
+                    )
+                    Button(
+                        modifier = Modifier.weight(1f),
+                        text = stringResource(CommonStrings.action_continue),
+                        onClick = onSendInvite
+                    )
+                }
+                Spacer(modifier = Modifier.height(32.dp))
+            } else {
+                Avatar(
+                    avatarData = matrixUser.getAvatarData(AvatarSize.DmCreationConfirmation),
+                    avatarType = AvatarType.User,
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(
+                    text = titleContent,
+                    style = ElementTheme.typography.fontHeadingMdBold,
+                    color = ElementTheme.colors.textPrimary,
+                    textAlign = TextAlign.Center,
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = descriptionContent,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    textAlign = TextAlign.Center,
+                )
+                Spacer(modifier = Modifier.height(40.dp))
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onSendInvite,
+                    leadingIcon = IconSource.Vector(CompoundIcons.UserAdd()),
+                    text = stringResource(R.string.screen_bottom_sheet_create_dm_confirmation_button_title),
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                TextButton(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onDismiss,
+                    text = stringResource(CommonStrings.action_cancel),
+                )
+            }
         }
     }
 }
 
 @PreviewsDayNight
 @Composable
-internal fun CreateDmConfirmationBottomSheetPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = ElementPreview {
+internal fun CreateDmConfirmationBottomSheetPreview(
+    @PreviewParameter(
+        CreateDmConfirmationBottomSheetStateProvider::class
+    ) state: CreateDmConfirmationBottomSheetState
+) = ElementPreview(fillMaxSize = true) {
     CreateDmConfirmationBottomSheet(
-        matrixUser = matrixUser,
+        matrixUser = state.matrixUser,
+        isUserIdentityUnknown = state.isUserIdentityUnknown,
         onSendInvite = {},
         onDismiss = {},
     )
 }
+
+data class CreateDmConfirmationBottomSheetState(
+    val matrixUser: MatrixUser,
+    val isUserIdentityUnknown: Boolean,
+)
+
+class CreateDmConfirmationBottomSheetStateProvider : PreviewParameterProvider<CreateDmConfirmationBottomSheetState> {
+    override val values = sequenceOf(
+        CreateDmConfirmationBottomSheetState(matrixUser = aMatrixUser(), isUserIdentityUnknown = false),
+        CreateDmConfirmationBottomSheetState(matrixUser = aMatrixUser(), isUserIdentityUnknown = true),
+    )
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
new file mode 100644
index 0000000000..627b892fc5
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/DisplayNameWithStatus.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.components
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.ui.model.toEmojiText
+
+/**
+ * Component to display side by side a display name and an optional status.
+ */
+@Composable
+fun DisplayNameWithStatus(
+    name: String,
+    status: DisplayedStatus?,
+    style: TextStyle,
+    modifier: Modifier = Modifier,
+    nameColor: Color = Color.Unspecified,
+    nameFontStyle: FontStyle? = null,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = name,
+            modifier = Modifier
+                .weight(1f, fill = false)
+                .clipToBounds(),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            style = style,
+            color = nameColor,
+            fontStyle = nameFontStyle,
+        )
+        if (status != null) {
+            Spacer(Modifier.width(4.dp))
+            Text(
+                text = status.toEmojiText(),
+                style = style,
+                color = ElementTheme.colors.textSecondary,
+            )
+        }
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt
index 13747a1a3d..12fa54add1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/InviteSenderView.kt
@@ -22,6 +22,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.model.InviteSender
@@ -57,10 +58,10 @@ internal fun InviteSenderViewPreview() = ElementPreview {
     InviteSenderView(
         inviteSender = InviteSender(
             userId = UserId("@bob:example.com"),
-            displayName = "Bob",
+            displayName = USER_NAME_BOB,
             avatarData = AvatarData(
                 id = "@bob:example.com",
-                name = "Bob",
+                name = USER_NAME_BOB,
                 url = null,
                 size = AvatarSize.InviteSender,
             ),
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
index 5b44b50ce9..89b0532580 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.matrix.ui.components
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -17,7 +18,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -34,53 +34,34 @@ import io.element.android.libraries.matrix.ui.model.getBestName
 
 @Composable
 fun MatrixUserHeader(
-    matrixUser: MatrixUser?,
-    modifier: Modifier = Modifier,
-    // TODO handle click on this item, to let the user be able to update their profile.
-    // onClick: () -> Unit,
-) {
-    if (matrixUser == null) {
-        MatrixUserHeaderPlaceholder(modifier = modifier)
-    } else {
-        MatrixUserHeaderContent(
-            matrixUser = matrixUser,
-            modifier = modifier,
-            // onClick = onClick
-        )
-    }
-}
-
-@Composable
-private fun MatrixUserHeaderContent(
     matrixUser: MatrixUser,
     modifier: Modifier = Modifier,
-    // onClick: () -> Unit,
 ) {
     Row(
         modifier = modifier
-            // .clickable(onClick = onClick)
             .fillMaxWidth()
-            .padding(horizontal = 16.dp),
-        verticalAlignment = Alignment.CenterVertically
+            .padding(horizontal = 16.dp, vertical = 6.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Avatar(
             modifier = Modifier
-                .padding(vertical = 12.dp),
+                .padding(vertical = 7.dp),
             avatarData = matrixUser.getAvatarData(size = AvatarSize.UserPreference),
             avatarType = AvatarType.User,
         )
-        Spacer(modifier = Modifier.width(16.dp))
+        Spacer(modifier = Modifier.width(13.dp))
         Column(
-            modifier = Modifier.weight(1f)
+            modifier = Modifier
+                .weight(1f)
+                .padding(vertical = 8.dp),
+            verticalArrangement = Arrangement.spacedBy(2.dp)
         ) {
             // Name
-            Text(
-                modifier = Modifier.clipToBounds(),
-                text = matrixUser.getBestName(),
-                maxLines = 1,
-                style = ElementTheme.typography.fontHeadingSmMedium,
-                overflow = TextOverflow.Ellipsis,
-                color = ElementTheme.colors.textPrimary,
+            DisplayNameWithStatus(
+                name = matrixUser.getBestName(),
+                status = matrixUser.displayedStatus,
+                nameColor = ElementTheme.colors.textPrimary,
+                style = ElementTheme.typography.fontHeadingMdRegular,
             )
             // Id
             if (matrixUser.displayName.isNullOrEmpty().not()) {
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeaderPlaceholder.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeaderPlaceholder.kt
deleted file mode 100644
index 08f8a37cc1..0000000000
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeaderPlaceholder.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.ui.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.placeholderBackground
-
-@Composable
-fun MatrixUserHeaderPlaceholder(
-    modifier: Modifier = Modifier,
-) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Box(
-            modifier = Modifier
-                .padding(vertical = 12.dp)
-                .size(AvatarSize.UserPreference.dp)
-                .background(color = ElementTheme.colors.placeholderBackground, shape = CircleShape)
-        )
-        Spacer(modifier = Modifier.width(16.dp))
-        Column(
-            modifier = Modifier.weight(1f)
-        ) {
-            PlaceholderAtom(width = 80.dp, height = 7.dp)
-            Spacer(modifier = Modifier.height(16.dp))
-            PlaceholderAtom(width = 180.dp, height = 6.dp)
-        }
-    }
-}
-
-@PreviewsDayNight
-@Composable
-internal fun MatrixUserHeaderPlaceholderPreview() = ElementPreview {
-    MatrixUserHeaderPlaceholder()
-}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
index 4d5a1cd222..7bc7d00f09 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
@@ -9,7 +9,19 @@
 package io.element.android.libraries.matrix.ui.components
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
+import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
+import io.element.android.libraries.designsystem.preview.USER_NAME_JOHN_DOE
+import io.element.android.libraries.designsystem.preview.USER_NAME_JUSTIN
+import io.element.android.libraries.designsystem.preview.USER_NAME_MALLORY
+import io.element.android.libraries.designsystem.preview.USER_NAME_SUSIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_VICTOR
+import io.element.android.libraries.designsystem.preview.USER_NAME_WALTER
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 open class MatrixUserProvider : PreviewParameterProvider<MatrixUser> {
@@ -17,45 +29,39 @@ open class MatrixUserProvider : PreviewParameterProvider<MatrixUser> {
         get() = sequenceOf(
             aMatrixUser(),
             aMatrixUser(displayName = null),
-        )
-}
-
-open class MatrixUserWithNullProvider : PreviewParameterProvider<MatrixUser?> {
-    override val values: Sequence<MatrixUser?>
-        get() = sequenceOf(
-            aMatrixUser(),
-            aMatrixUser(displayName = null),
-            null,
+            aMatrixUser(displayedStatus = DisplayedStatus.InCall(0L)),
         )
 }
 
 open class MatrixUserWithAvatarProvider : PreviewParameterProvider<MatrixUser?> {
     override val values: Sequence<MatrixUser?>
         get() = sequenceOf(
-            aMatrixUser(displayName = "John Doe"),
-            aMatrixUser(displayName = "John Doe", avatarUrl = "anUrl"),
+            aMatrixUser(displayName = USER_NAME_JOHN_DOE),
+            aMatrixUser(displayName = USER_NAME_JOHN_DOE, avatarUrl = "anUrl"),
         )
 }
 
 fun aMatrixUser(
-    id: String = "@id_of_alice:server.org",
-    displayName: String? = "Alice",
+    id: String? = null,
+    displayName: String? = USER_NAME_ALICE,
     avatarUrl: String? = null,
+    displayedStatus: DisplayedStatus? = null,
 ) = MatrixUser(
-    userId = UserId(id),
+    userId = UserId(id ?: "@${displayName?.lowercase()?.replace(" ", "_") ?: "id"}:server.org"),
     displayName = displayName,
     avatarUrl = avatarUrl,
+    displayedStatus = displayedStatus,
 )
 
 fun aMatrixUserList() = listOf(
-    aMatrixUser("@alice:server.org", "Alice"),
-    aMatrixUser("@bob:server.org", "Bob"),
-    aMatrixUser("@carol:server.org", "Carol"),
-    aMatrixUser("@david:server.org", "David"),
-    aMatrixUser("@eve:server.org", "Eve"),
-    aMatrixUser("@justin:server.org", "Justin"),
-    aMatrixUser("@mallory:server.org", "Mallory"),
-    aMatrixUser("@susie:server.org", "Susie"),
-    aMatrixUser("@victor:server.org", "Victor"),
-    aMatrixUser("@walter:server.org", "Walter"),
+    aMatrixUser(displayName = USER_NAME_ALICE),
+    aMatrixUser(displayName = USER_NAME_BOB),
+    aMatrixUser(displayName = USER_NAME_CAROL),
+    aMatrixUser(displayName = USER_NAME_DAVID),
+    aMatrixUser(displayName = USER_NAME_EVE),
+    aMatrixUser(displayName = USER_NAME_JUSTIN),
+    aMatrixUser(displayName = USER_NAME_MALLORY),
+    aMatrixUser(displayName = USER_NAME_SUSIE),
+    aMatrixUser(displayName = USER_NAME_VICTOR),
+    aMatrixUser(displayName = USER_NAME_WALTER),
 )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
index cf89074737..9fc7ea7b4a 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserRow.kt
@@ -11,6 +11,9 @@ package io.element.android.libraries.matrix.ui.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -23,12 +26,21 @@ fun MatrixUserRow(
     matrixUser: MatrixUser,
     modifier: Modifier = Modifier,
     avatarSize: AvatarSize = AvatarSize.UserListItem,
+    verticalSpaceWidth: Dp = 12.dp,
     trailingContent: @Composable (() -> Unit)? = null,
 ) = UserRow(
     avatarData = matrixUser.getAvatarData(avatarSize),
-    name = matrixUser.getBestName(),
+    nameContent = {
+        DisplayNameWithStatus(
+            name = matrixUser.getBestName(),
+            status = matrixUser.displayedStatus,
+            nameColor = ElementTheme.colors.textPrimary,
+            style = ElementTheme.typography.fontBodyLgRegular,
+        )
+    },
     subtext = if (matrixUser.displayName.isNullOrEmpty()) null else matrixUser.userId.value,
     modifier = modifier,
+    verticalSpaceWidth = verticalSpaceWidth,
     trailingContent = trailingContent,
 )
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/OrganizationHeader.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/OrganizationHeader.kt
index 374ebd7a1a..0a1e3bdc87 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/OrganizationHeader.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/OrganizationHeader.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
 
 /**
  * Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=3643-2048&m=dev
@@ -72,7 +73,7 @@ internal fun OrganizationHeaderPreview() = ElementPreview {
             url = "anUrl",
             size = AvatarSize.OrganizationHeader,
         ),
-        name = "Space name",
+        name = SPACE_NAME,
         numberOfSpaces = 9,
         numberOfRooms = 88,
     )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
index b118dbcbe3..17ec7c6ec7 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_JOHN_DOE
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.getBestName
@@ -58,7 +59,7 @@ internal fun SelectedUserRtlPreview() = CompositionLocalProvider(
 ) {
     ElementPreview {
         SelectedUser(
-            matrixUser = aMatrixUser(displayName = "John Doe"),
+            matrixUser = aMatrixUser(displayName = USER_NAME_JOHN_DOE),
             canRemove = true,
             onUserRemove = {},
         )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
index c3e8292147..7aee62902f 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
@@ -30,6 +30,11 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CHARLIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -115,15 +120,15 @@ internal fun SpaceHeaderViewPreview() = ElementPreview {
             size = AvatarSize.SpaceHeader,
         ),
         alias = RoomAlias("#spaceAlias:matrix.org"),
-        name = "Space name",
+        name = SPACE_NAME,
         topic = "Space topic: " + LoremIpsum(40).values.first(),
         topicMaxLines = 2,
         visibility = SpaceRoomVisibility.Public,
         heroes = persistentListOf(
-            aMatrixUser(id = "@1:d", displayName = "Alice", avatarUrl = "aUrl"),
-            aMatrixUser(id = "@2:d", displayName = "Bob"),
-            aMatrixUser(id = "@3:d", displayName = "Charlie", avatarUrl = "aUrl"),
-            aMatrixUser(id = "@4:d", displayName = "Dave"),
+            aMatrixUser(id = "@1:d", displayName = USER_NAME_ALICE, avatarUrl = "aUrl"),
+            aMatrixUser(id = "@2:d", displayName = USER_NAME_BOB),
+            aMatrixUser(id = "@3:d", displayName = USER_NAME_CHARLIE, avatarUrl = "aUrl"),
+            aMatrixUser(id = "@4:d", displayName = USER_NAME_DAVID),
         ),
         numberOfMembers = 999,
     )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceMembersView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceMembersView.kt
index 202ea79d87..6d927989d5 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceMembersView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceMembersView.kt
@@ -22,6 +22,10 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CHARLIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -98,10 +102,10 @@ internal fun SpaceMembersViewPreview() = ElementPreview(
 ) {
     SpaceMembersView(
         heroes = persistentListOf(
-            aMatrixUser(id = "@1:d", displayName = "Alice", avatarUrl = "aUrl"),
-            aMatrixUser(id = "@2:d", displayName = "Bob"),
-            aMatrixUser(id = "@3:d", displayName = "Charlie", avatarUrl = "aUrl"),
-            aMatrixUser(id = "@4:d", displayName = "Dave"),
+            aMatrixUser(id = "@1:d", displayName = USER_NAME_ALICE, avatarUrl = "aUrl"),
+            aMatrixUser(id = "@2:d", displayName = USER_NAME_BOB),
+            aMatrixUser(id = "@3:d", displayName = USER_NAME_CHARLIE, avatarUrl = "aUrl"),
+            aMatrixUser(id = "@4:d", displayName = USER_NAME_DAVID),
         ),
         numberOfMembers = 123,
     )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
index 4d79018e88..d3824f9eec 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
@@ -78,7 +78,7 @@ fun SpaceRoomItemView(
             indication = ripple(),
             interactionSource = remember { MutableInteractionSource() }
         )
-        .onKeyboardContextMenuAction { onLongClick }
+        .onKeyboardContextMenuAction(onLongClick)
     Column(
         modifier = modifier
             .then(clickModifier)
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
index db63bba779..d6a582d83c 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
@@ -9,6 +9,8 @@
 package io.element.android.libraries.matrix.ui.components
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomType
@@ -28,10 +30,10 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.LEFT,
         ),
         aSpaceRoom(
-            displayName = "Alice",
+            displayName = SPACE_NAME,
             roomType = RoomType.Room,
             isDirect = true,
-            heroes = listOf(aMatrixUser(displayName = "Alice")),
+            heroes = listOf(aMatrixUser(displayName = USER_NAME_ALICE)),
             state = CurrentUserMembership.JOINED,
             numJoinedMembers = 2,
         ),
@@ -69,9 +71,9 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
-            displayName = "Alice",
+            displayName = SPACE_NAME,
             roomType = RoomType.Space,
-            heroes = listOf(aMatrixUser(displayName = "Alice")),
+            heroes = listOf(aMatrixUser(displayName = USER_NAME_ALICE)),
             state = CurrentUserMembership.JOINED,
             numJoinedMembers = 2,
         ),
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt
index 9bcf0b323f..fba2f606e3 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UserRow.kt
@@ -10,13 +10,17 @@ package io.element.android.libraries.matrix.ui.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -27,28 +31,16 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 internal fun UserRow(
     avatarData: AvatarData,
-    name: String,
+    name: AnnotatedString,
     subtext: String?,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
+    verticalSpaceWidth: Dp = 12.dp,
     trailingContent: @Composable (() -> Unit)? = null,
 ) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(start = 16.dp, top = 12.dp, end = 16.dp, bottom = 12.dp),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Avatar(
-            avatarData = avatarData,
-            avatarType = AvatarType.User,
-        )
-        Column(
-            modifier = Modifier
-                .padding(start = 12.dp)
-                .weight(1f),
-        ) {
-            // Name
+    UserRow(
+        avatarData = avatarData,
+        nameContent = {
             Text(
                 modifier = Modifier.clipToBounds(),
                 text = name,
@@ -57,6 +49,41 @@ internal fun UserRow(
                 color = if (enabled) ElementTheme.colors.textPrimary else ElementTheme.colors.textDisabled,
                 style = ElementTheme.typography.fontBodyLgRegular,
             )
+        },
+        subtext = subtext,
+        modifier = modifier,
+        enabled = enabled,
+        verticalSpaceWidth = verticalSpaceWidth,
+        trailingContent = trailingContent,
+    )
+}
+
+@Composable
+internal fun UserRow(
+    avatarData: AvatarData,
+    nameContent: @Composable () -> Unit,
+    subtext: String?,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    verticalSpaceWidth: Dp = 12.dp,
+    trailingContent: @Composable (() -> Unit)? = null,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Avatar(
+            avatarData = avatarData,
+            avatarType = AvatarType.User,
+        )
+        Spacer(modifier = Modifier.width(verticalSpaceWidth))
+        Column(
+            modifier = Modifier.weight(1f),
+        ) {
+            // Name
+            nameContent()
             // Id
             subtext?.let {
                 Text(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentErrorView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentErrorView.kt
new file mode 100644
index 0000000000..24f4a15200
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentErrorView.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+
+@Composable
+internal fun ContentErrorView(
+    title: String,
+    message: String,
+    modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues.Zero,
+    onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+) {
+    Row(
+        modifier = modifier
+            .background(color = ElementTheme.colors.bgCriticalSubtle)
+            .padding(contentPadding),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            modifier = Modifier.size(24.dp),
+            imageVector = CompoundIcons.Error(),
+            contentDescription = null,
+            tint = ElementTheme.colors.iconCriticalPrimary
+        )
+        Column(Modifier.weight(1f)) {
+            Text(
+                text = title,
+                color = ElementTheme.colors.textCriticalPrimary,
+                style = ElementTheme.typography.fontBodyMdMedium,
+            )
+            Text(
+                text = message,
+                color = ElementTheme.colors.textSecondary,
+                style = ElementTheme.typography.fontBodySmRegular,
+                onTextLayout = onTextLayout,
+            )
+        }
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentValidationState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentValidationState.kt
new file mode 100644
index 0000000000..bfc01c4255
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/ContentValidationState.kt
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.update
+
+/**
+ * Wrapper for the content validation state of an event.
+ *
+ * It can be used to check the overall validation state of the event, as well as the validation state of each media item in it.
+ */
+@Immutable
+interface ContentValidationState {
+    /**
+     * A flow that emits the overall validation state of the event, which is an aggregation of the different media values.
+     */
+    val overallStateFlow: Flow<ContentValidationValue>
+
+    /**
+     * Returns a flow that emits the validation state of a specific media item, identified by its URL.
+     */
+    fun getMediaStateFlow(url: String): Flow<ContentValidationValue>
+
+    /**
+     * Returns the current overall validation state of the event.
+     */
+    fun getCurrentOverallState(): ContentValidationValue
+
+    /**
+     * Returns the current validation state of a specific media item, identified by its URL.
+     */
+    fun getCurrentMediaState(url: String): ContentValidationValue
+
+    /**
+     * Updates the validation state of a specific media item, identified by its URL, with a new [ContentValidationValue].
+     */
+    fun update(url: String, newValue: ContentValidationValue)
+}
+
+/**
+ * A no-op implementation of [ContentValidationState] that always returns a fixed validation state.
+ * By default, this is [ContentValidationValue.Valid].
+ */
+@Immutable
+class NoopContentValidationState(
+    private val initial: ContentValidationValue = ContentValidationValue.Valid,
+) : ContentValidationState {
+    override val overallStateFlow: Flow<ContentValidationValue> = MutableStateFlow(initial)
+    override fun getMediaStateFlow(url: String): Flow<ContentValidationValue> = MutableStateFlow(initial)
+    override fun getCurrentOverallState(): ContentValidationValue = initial
+    override fun getCurrentMediaState(url: String): ContentValidationValue = initial
+    override fun update(url: String, newValue: ContentValidationValue) {}
+}
+
+/**
+ * A default implementation of [ContentValidationState] that tracks the validation state of media items in a mutable map.
+ * It calculates the overall validation state based on the individual media states.
+ */
+@Immutable
+class DefaultContentValidationState(
+    private val states: MutableStateFlow<Map<String, ContentValidationValue>>,
+) : ContentValidationState {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override val overallStateFlow: Flow<ContentValidationValue> = states
+        .mapLatest { states -> calculateOverallState(states) }
+        .distinctUntilChanged()
+
+    constructor() : this(states = MutableStateFlow(emptyMap()))
+
+    constructor(initial: Map<String, ContentValidationValue>) : this(states = MutableStateFlow(initial))
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun getMediaStateFlow(url: String): Flow<ContentValidationValue> {
+        return states.map { states ->
+            states[url] ?: ContentValidationValue.Unknown
+        }.distinctUntilChanged()
+    }
+
+    override fun getCurrentOverallState(): ContentValidationValue {
+        return calculateOverallState(states.value)
+    }
+
+    override fun getCurrentMediaState(url: String): ContentValidationValue {
+        return states.value[url] ?: ContentValidationValue.Unknown
+    }
+
+    override fun update(url: String, newValue: ContentValidationValue) {
+        states.update { current ->
+            if (current[url]?.isValidated() == true && newValue.isLoading()) {
+                // If the current state is already validated and the new value is loading, we keep the current validated state
+                current
+            } else {
+                // Otherwise, we update the state for the given URL with the new value
+                current + (url to newValue)
+            }
+        }
+    }
+}
+
+private fun calculateOverallState(states: Map<String, ContentValidationValue>): ContentValidationValue {
+    return when {
+        states.values.isEmpty() -> ContentValidationValue.Unknown
+        states.values.any { it is ContentValidationValue.Invalid } -> ContentValidationValue.Invalid
+        states.values.any { it is ContentValidationValue.Loading } -> ContentValidationValue.Loading
+        states.values.any { it is ContentValidationValue.UnrecoverableError } -> states.values.first { it is ContentValidationValue.UnrecoverableError }
+        states.values.all { it is ContentValidationValue.Valid } -> ContentValidationValue.Valid
+        else -> ContentValidationValue.Unknown
+    }
+}
+
+/**
+ * Represents the validation state of a media item or an event.
+ */
+@Immutable
+sealed interface ContentValidationValue {
+    /** Indicates that the content is valid. */
+    data object Valid : ContentValidationValue
+
+    /** Indicates that the content is invalid/unsafe. */
+    data object Invalid : ContentValidationValue
+
+    /** Indicates that the content is currently being validated. */
+    data object Loading : ContentValidationValue
+
+    /** Indicates that an unrecoverable error occurred during validation, and it should not be retried. */
+    data class UnrecoverableError(val error: Throwable) : ContentValidationValue
+
+    /** Indicates that the validation state is unknown and should be checked. Recoverable errors are also represented with this. */
+    data object Unknown : ContentValidationValue
+
+    /**
+     * Returns true if the validation state is either [Valid], [Invalid], or [UnrecoverableError], meaning that the validation process has completed
+     * and a definitive result is available.
+     */
+    fun isValidated(): Boolean = when (this) {
+        is Valid -> true
+        is Invalid -> true
+        is Loading -> false
+        is UnrecoverableError -> true
+        is Unknown -> false
+    }
+
+    /** Returns true if the validation state is [Valid]. */
+    fun isValid(): Boolean = this is Valid
+
+    /** Returns true if the validation state is [Invalid]. */
+    fun isInvalid(): Boolean = this is Invalid
+
+    /** Returns true if the validation state is [Loading]. */
+    fun isLoading(): Boolean = this is Loading
+
+    /** Returns true if the validation state is [UnrecoverableError]. */
+    fun hasUnrecoverableError(): Boolean = this is UnrecoverableError
+
+    /** Returns true if the validation state is either [Invalid] or [UnrecoverableError]. */
+    fun hasError(): Boolean = this is Invalid || this is UnrecoverableError
+}
+
+/**
+ * Collects the overall validation state of the [ContentValidationState] as a [State] in a Composable context.
+ */
+@Composable
+fun ContentValidationState.collectOverallState(): State<ContentValidationValue> {
+    return produceState(getCurrentOverallState()) {
+        overallStateFlow.collect { value = it }
+    }
+}
+
+/**
+ * Collects the validation state of a specific media item, identified by its URL, as a [State] in a Composable context.
+ */
+@Composable
+fun ContentValidationState.collectMediaState(url: String?): State<ContentValidationValue> {
+    if (url == null) {
+        return remember { mutableStateOf(ContentValidationValue.Valid) }
+    }
+
+    return produceState(getCurrentMediaState(url), key1 = url) {
+        getMediaStateFlow(url).collect { value = it }
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/EventContentValidationCache.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/EventContentValidationCache.kt
new file mode 100644
index 0000000000..df7737e5fb
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/EventContentValidationCache.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import io.element.android.libraries.matrix.api.core.EventId
+
+/**
+ * A cache that holds the validation state of event contents, based on their [EventId].
+ */
+interface EventContentValidationCache {
+    /**
+     * Returns the [ContentValidationState] for the given [eventId]. If none exists, it creates a new one with [ContentValidationValue.Unknown].
+     */
+    operator fun get(eventId: EventId): ContentValidationState
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InMemoryEventContentValidationCache.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InMemoryEventContentValidationCache.kt
new file mode 100644
index 0000000000..999558898a
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InMemoryEventContentValidationCache.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import io.element.android.libraries.matrix.api.core.EventId
+
+/**
+ * In-memory variant of [EventContentValidationCache] that holds the validation state of event contents, based on their [EventId].
+ *
+ * Note: this is intended to be used in tests.
+ */
+class InMemoryEventContentValidationCache(
+    initial: Map<EventId, ContentValidationState> = emptyMap(),
+) : EventContentValidationCache {
+    private val cache = initial.toMutableMap()
+
+    override operator fun get(eventId: EventId): ContentValidationState {
+        return cache[eventId] ?: DefaultContentValidationState()
+    }
+
+    fun put(eventId: EventId, state: ContentValidationState) {
+        cache[eventId] = state
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InvalidContentView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InvalidContentView.kt
new file mode 100644
index 0000000000..b1e4ffc02a
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/InvalidContentView.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * A view to display when the media content is invalid or dangerous.
+ */
+@Composable
+fun InvalidContentView(
+    modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues.Zero,
+    onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+) {
+    ContentErrorView(
+        title = stringResource(CommonStrings.content_scanner_unsafe_title),
+        message = stringResource(CommonStrings.content_scanner_unsafe_message),
+        modifier = modifier,
+        contentPadding = contentPadding,
+        onTextLayout = onTextLayout,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun InvalidContentViewPreview() = ElementPreview {
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        InvalidContentView()
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/LocalEventContentValidationState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/LocalEventContentValidationState.kt
new file mode 100644
index 0000000000..f5277a3537
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/LocalEventContentValidationState.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
+import io.element.android.libraries.matrix.api.timeline.item.event.isMediaContent
+
+private val noopValue = NoopContentValidationState()
+
+/**
+ * A composition local that provides an [EventContentValidationCache] instance, so we can check if a given event content has been validated or not.
+ */
+val LocalEventContentValidationState = staticCompositionLocalOf<EventContentValidationCache> { NoopEventContentValidationCache() }
+
+/**
+ * A noop implementation of the [EventContentValidationCache] that immediately returns a successful validation state. This will be used in FOSS.
+ */
+class NoopEventContentValidationCache(
+    private val provided: ContentValidationState = noopValue,
+) : EventContentValidationCache {
+    override operator fun get(eventId: EventId): ContentValidationState = provided
+}
+
+/**
+ * A helper to remember the validation state of an event content, based on its [EventId] and [EventContent], if known.
+ */
+@Composable
+fun rememberEventContentValidationState(eventId: EventId?, eventContent: EventContent?): ContentValidationState {
+    val needsValidation = remember(eventContent) {
+        when (eventContent) {
+            is MessageContent -> eventContent.isMediaContent()
+            is StickerContent -> true
+            // If the event content is not known or not a media content, we don't need to validate it.
+            else -> false
+        }
+    }
+
+    return rememberEventContentValidationState(eventId, needsValidation)
+}
+
+/**
+ * A helper to remember the validation state of an event content, based on its [EventId] and whether it needs validation or not.
+ */
+@Composable
+fun rememberEventContentValidationState(eventId: EventId?, needsValidation: Boolean): ContentValidationState {
+    if (!needsValidation) {
+        return noopValue
+    }
+
+    return rememberEventContentValidationStateInternal(eventId)
+}
+
+@Composable
+private fun rememberEventContentValidationStateInternal(eventId: EventId?): ContentValidationState {
+    val cache = LocalEventContentValidationState.current
+    return remember(eventId) {
+        if (eventId != null) {
+            cache[eventId]
+        } else {
+            noopValue
+        }
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/NotFoundContentView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/NotFoundContentView.kt
new file mode 100644
index 0000000000..019465965c
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/contentvalidation/NotFoundContentView.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.media.contentvalidation
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.ui.strings.CommonStrings
+
+/**
+ * A view to display when the media content can't be fetched.
+ */
+@Composable
+fun NotFoundContentView(
+    modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues.Zero,
+    onTextLayout: ((TextLayoutResult) -> Unit)? = null,
+) {
+    ContentErrorView(
+        title = stringResource(CommonStrings.content_scanner_not_found_title),
+        message = stringResource(CommonStrings.content_scanner_not_found),
+        modifier = modifier,
+        contentPadding = contentPadding,
+        onTextLayout = onTextLayout,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun NotFoundContentViewPreview() = ElementPreview {
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        NotFoundContentView()
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomMemberProfilesCache.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomMemberProfilesCache.kt
index 4a9f4f98a4..9e131d5621 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomMemberProfilesCache.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/RoomMemberProfilesCache.kt
@@ -13,6 +13,7 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.drop
@@ -31,4 +32,8 @@ class RoomMemberProfilesCache {
     fun getDisplayName(userId: UserId): String? {
         return cache.value[userId]?.disambiguatedDisplayName
     }
+
+    fun getDisplayedStatus(userId: UserId): DisplayedStatus? {
+        return cache.value[userId]?.displayedStatus
+    }
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
index ee9de51681..d29a28cba9 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
@@ -12,8 +12,10 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
-import io.element.android.wysiwyg.utils.HtmlToDomParser
+import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import org.jsoup.nodes.Document.OutputSettings
+import org.jsoup.safety.Safelist
 
 /**
  * Converts the HTML string [FormattedBody.body] to a [Document] by parsing it.
@@ -34,9 +36,9 @@ fun FormattedBody.toHtmlDocument(
         ?.trimEnd()
         ?.let { formattedBody ->
             val dom = if (prefix != null) {
-                HtmlToDomParser.document("$prefix $formattedBody")
+                CustomHtmlToDomParser.document("$prefix $formattedBody")
             } else {
-                HtmlToDomParser.document(formattedBody)
+                CustomHtmlToDomParser.document(formattedBody)
             }
 
             // Prepend `@` to mentions
@@ -60,3 +62,35 @@ private fun fixMentions(
         }
     }
 }
+
+/** Custom Html to DOM parser, based on the one included in the rich text editor library. */
+private object CustomHtmlToDomParser {
+    fun document(html: String): Document {
+        val outputSettings = OutputSettings().prettyPrint(false).indentAmount(0)
+        val cleanHtml = Jsoup.clean(html, "", safeList, outputSettings)
+        return Jsoup.parse(cleanHtml)
+    }
+
+    private val safeList = Safelist()
+        .addTags(
+            "a",
+            "b",
+            "strong",
+            "i",
+            "em",
+            "u",
+            "del",
+            "code",
+            "ul",
+            "ol",
+            "li",
+            "pre",
+            "blockquote",
+            "p",
+            "br",
+            // Add custom `mx-reply` tag, even if it's just to remove its contents from the plain text version of the message
+            "mx-reply"
+        )
+        .addAttributes("a", "href", "data-mention-type", "contenteditable")
+        .addAttributes("ol", "start")
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainText.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainText.kt
index d58d12b785..cf8b03b80d 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainText.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainText.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.matrix.ui.messages
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageTypeWithAttachment
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -26,6 +27,19 @@ fun TextMessageType.toPlainText(
     permalinkParser: PermalinkParser,
 ) = formatted?.toPlainText(permalinkParser) ?: body
 
+/**
+ * Converts the HTML string in [MessageTypeWithAttachment.formattedCaption] to a plain text representation by parsing it and removing all formatting.
+ * If the caption is not formatted or the format is not [MessageFormat.HTML], the [MessageTypeWithAttachment.caption] is returned instead.
+ * If there is no caption, returns [default].
+ */
+fun MessageTypeWithAttachment.toPlainText(
+    permalinkParser: PermalinkParser,
+    default: String = filename,
+): String {
+    val plainTextFromFormatted = formattedCaption?.toPlainText(permalinkParser)
+    return plainTextFromFormatted ?: caption ?: default
+}
+
 /**
  * Converts the HTML string in [FormattedBody.body] to a plain text representation by parsing it and removing all formatting.
  * If the message is not formatted or the format is not [MessageFormat.HTML] we return `null`.
@@ -51,6 +65,8 @@ fun Document.toPlainText(): String {
     return visitor.build()
 }
 
+private const val FALLBACK_REPLY_NODE_TAG = "mx-reply"
+
 private class PlainTextNodeVisitor : NodeVisitor {
     private val builder = StringBuilder()
 
@@ -78,6 +94,9 @@ private class PlainTextNodeVisitor : NodeVisitor {
             } else {
                 builder.append("• ")
             }
+        } else if (node is Element && node.tagName() == FALLBACK_REPLY_NODE_TAG) {
+            // Remove the fallback reply node and its contents so they aren't added to the plain text message
+            node.remove()
         } else if (node is Element && node.isBlock && builder.lastOrNull() != '\n') {
             builder.append("\n")
         }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
index 3179c748ea..2105655b01 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetails.kt
@@ -40,6 +40,12 @@ fun InReplyToDetails.eventId() = when (this) {
     is InReplyToDetails.Error -> eventId
 }
 
+fun InReplyToDetails.content() = when (this) {
+    is InReplyToDetails.Ready -> eventContent
+    is InReplyToDetails.Loading -> null
+    is InReplyToDetails.Error -> null
+}
+
 fun InReplyTo.map(
     permalinkParser: PermalinkParser,
 ) = when (this) {
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
index 5ddf57b723..b335ef9609 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.matrix.ui.messages.reply
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.USER_NAME_SENDER
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaSource
@@ -159,11 +160,12 @@ private fun aInReplyToDetails(
 )
 
 fun aProfileDetailsReady(
-    displayName: String? = "Sender",
+    displayName: String? = USER_NAME_SENDER,
     displayNameAmbiguous: Boolean = false,
     avatarUrl: String? = null,
 ) = ProfileDetails.Ready(
     displayName = displayName,
     displayNameAmbiguous = displayNameAmbiguous,
     avatarUrl = avatarUrl,
+    displayedStatus = null,
 )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadata.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadata.kt
index 9e5e468cd9..3e3f46ffb5 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadata.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadata.kt
@@ -10,12 +10,15 @@ package io.element.android.libraries.matrix.ui.messages.reply
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
@@ -35,6 +38,7 @@ import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToMetadata.Text
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToMetadata.Thumbnail
+import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Immutable
@@ -104,6 +108,52 @@ internal fun InReplyToDetails.Ready.metadata(hideImage: Boolean): InReplyToMetad
                 type = AttachmentThumbnailType.Voice,
             )
         )
+        is GalleryMessageType -> {
+            val caption = textContent?.takeIf { it.isNotBlank() }
+            val isMediaGallery = type.items.all { it is GalleryItemType.Image || it is GalleryItemType.Video }
+            if (isMediaGallery) {
+                val text = caption ?: pluralStringResource(
+                    CommonPlurals.common_gallery_reply_media_items,
+                    type.items.size,
+                    type.items.size,
+                )
+                val firstMediaItem = type.items.firstOrNull { it is GalleryItemType.Image || it is GalleryItemType.Video }
+                val thumbnailSource = when (firstMediaItem) {
+                    is GalleryItemType.Image -> (firstMediaItem.content.info?.thumbnailSource ?: firstMediaItem.content.source).takeUnless { hideImage }
+                    is GalleryItemType.Video -> firstMediaItem.content.info?.thumbnailSource?.takeUnless { hideImage }
+                    else -> null
+                }
+                val blurHash = when (firstMediaItem) {
+                    is GalleryItemType.Image -> firstMediaItem.content.info?.blurhash
+                    is GalleryItemType.Video -> firstMediaItem.content.info?.blurhash
+                    else -> null
+                }
+                val type = when (firstMediaItem) {
+                    is GalleryItemType.Video -> AttachmentThumbnailType.Video
+                    else -> AttachmentThumbnailType.Image
+                }
+                Thumbnail(
+                    AttachmentThumbnailInfo(
+                        thumbnailSource = thumbnailSource,
+                        textContent = text,
+                        type = type,
+                        blurHash = blurHash,
+                    )
+                )
+            } else {
+                val text = caption ?: pluralStringResource(
+                    CommonPlurals.common_gallery_reply_attachments,
+                    type.items.size,
+                    type.items.size,
+                )
+                Thumbnail(
+                    AttachmentThumbnailInfo(
+                        textContent = text,
+                        type = AttachmentThumbnailType.File,
+                    )
+                )
+            }
+        }
         else -> Text(textContent ?: eventContent.body)
     }
     is StickerContent -> Thumbnail(
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
index dcf12f1953..3072c81a15 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToView.kt
@@ -18,8 +18,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -45,6 +45,9 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InvalidContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NotFoundContentView
 import io.element.android.libraries.matrix.ui.messages.sender.SenderName
 import io.element.android.libraries.matrix.ui.messages.sender.SenderNameMode
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -56,19 +59,25 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun InReplyToView(
     inReplyTo: InReplyToDetails,
     hideImage: Boolean,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
+    maxLines: Int = 2,
 ) {
     when (inReplyTo) {
-        is InReplyToDetails.Ready -> {
-            ReplyToReadyContent(
+        is InReplyToDetails.Ready -> when (contentValidationValue) {
+            ContentValidationValue.Valid -> ReplyToReadyContent(
                 senderId = inReplyTo.senderId,
                 senderProfile = inReplyTo.senderProfile,
                 metadata = inReplyTo.metadata(hideImage),
+                maxLines = maxLines,
                 modifier = modifier,
             )
+            ContentValidationValue.Invalid -> ReplyToInvalidContent()
+            is ContentValidationValue.UnrecoverableError -> ReplyToNotFoundContent()
+            else -> ReplyToLoadingContent(modifier = modifier)
         }
         is InReplyToDetails.Error ->
-            ReplyToErrorContent(data = inReplyTo, modifier = modifier)
+            ReplyToErrorContent(data = inReplyTo, maxLines = maxLines, modifier = modifier)
         is InReplyToDetails.Loading ->
             ReplyToLoadingContent(modifier = modifier)
     }
@@ -79,22 +88,23 @@ private fun ReplyToReadyContent(
     senderId: UserId,
     senderProfile: ProfileDetails,
     metadata: InReplyToMetadata?,
+    maxLines: Int,
     modifier: Modifier = Modifier,
 ) {
     val paddings = if (metadata is InReplyToMetadata.Thumbnail) {
-        PaddingValues(start = 4.dp, end = 12.dp, top = 4.dp, bottom = 4.dp)
+        PaddingValues(end = 8.dp)
     } else {
-        PaddingValues(horizontal = 12.dp, vertical = 4.dp)
+        PaddingValues(horizontal = 8.dp)
     }
     Row(
         modifier
-            .background(MaterialTheme.colorScheme.surface)
+            .background(ElementTheme.colors.bgCanvasDefault)
             .padding(paddings)
     ) {
         if (metadata is InReplyToMetadata.Thumbnail) {
             AttachmentThumbnail(
                 info = metadata.attachmentThumbnailInfo,
-                backgroundColor = MaterialTheme.colorScheme.surfaceVariant,
+                backgroundColor = ElementTheme.colors.bgSubtlePrimary,
                 modifier = Modifier
                     .size(36.dp)
                     .clip(RoundedCornerShape(4.dp))
@@ -116,7 +126,7 @@ private fun ReplyToReadyContent(
                     traversalIndex = 1f
                 },
             )
-            ReplyToContentText(metadata)
+            ReplyToContentText(metadata, maxLines)
         }
     }
 }
@@ -128,7 +138,7 @@ private fun ReplyToLoadingContent(
     val paddings = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
     Row(
         modifier
-            .background(MaterialTheme.colorScheme.surface)
+            .background(ElementTheme.colors.bgCanvasDefault)
             .padding(paddings)
     ) {
         Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
@@ -141,26 +151,30 @@ private fun ReplyToLoadingContent(
 @Composable
 private fun ReplyToErrorContent(
     data: InReplyToDetails.Error,
+    maxLines: Int,
     modifier: Modifier = Modifier,
 ) {
     val paddings = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
     Row(
         modifier
-            .background(MaterialTheme.colorScheme.surface)
+            .background(ElementTheme.colors.bgCanvasDefault)
             .padding(paddings)
     ) {
         Text(
             text = data.message,
             style = ElementTheme.typography.fontBodyMdRegular,
             color = ElementTheme.colors.textCriticalPrimary,
-            maxLines = 2,
+            maxLines = maxLines,
             overflow = TextOverflow.Ellipsis,
         )
     }
 }
 
 @Composable
-private fun ReplyToContentText(metadata: InReplyToMetadata?) {
+private fun ReplyToContentText(
+    metadata: InReplyToMetadata?,
+    maxLines: Int,
+) {
     val text = when (metadata) {
         InReplyToMetadata.Redacted -> stringResource(id = CommonStrings.common_message_removed)
         InReplyToMetadata.UnableToDecrypt -> stringResource(id = CommonStrings.common_waiting_for_decryption_key)
@@ -201,17 +215,56 @@ private fun ReplyToContentText(metadata: InReplyToMetadata?) {
             fontStyle = fontStyle,
             textAlign = TextAlign.Start,
             color = ElementTheme.colors.textSecondary,
-            maxLines = 2,
+            maxLines = maxLines,
             overflow = TextOverflow.Ellipsis,
         )
     }
 }
 
+@Composable
+private fun ReplyToInvalidContent(
+    modifier: Modifier = Modifier
+) {
+    InvalidContentView(
+        modifier = modifier,
+        contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
+        onTextLayout = null,
+    )
+}
+
+@Composable
+private fun ReplyToNotFoundContent(
+    modifier: Modifier = Modifier
+) {
+    NotFoundContentView(
+        modifier = modifier,
+        contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
+        onTextLayout = null,
+    )
+}
+
 @PreviewsDayNight
 @Composable
 internal fun InReplyToViewPreview(@PreviewParameter(provider = InReplyToDetailsProvider::class) inReplyTo: InReplyToDetails) = ElementPreview {
     InReplyToView(
         inReplyTo = inReplyTo,
         hideImage = false,
+        contentValidationValue = ContentValidationValue.Valid,
     )
 }
+
+@PreviewsDayNight
+@Composable
+internal fun ReplyToInvalidContentPreview() {
+    ElementPreview {
+        ReplyToInvalidContent(modifier = Modifier.padding(10.dp))
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ReplyToNotFoundContentPreview() {
+    ElementPreview {
+        ReplyToNotFoundContent(modifier = Modifier.padding(10.dp))
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
index cdca0937c1..42432c6950 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderName.kt
@@ -24,6 +24,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.ui.model.toText
 
 // https://www.figma.com/file/Ni6Ii8YKtmXCKYNE90cC67/Timeline-(new)?type=design&node-id=917-80169&mode=design&t=A0CJCBbMqR8NOwUQ-0
 @Composable
@@ -54,6 +55,19 @@ fun SenderName(
                         SecondaryText(text = senderId.value, mode = senderNameMode)
                     }
                 }
+                val userStatus = senderProfile.displayedStatus
+                if (senderNameMode is SenderNameMode.Timeline && userStatus != null) {
+                    Text(
+                        modifier = Modifier
+                            .clipToBounds()
+                            .alignByBaseline(),
+                        text = userStatus.toText(),
+                        style = ElementTheme.typography.fontBodyMdMedium,
+                        color = ElementTheme.colors.textSecondary,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
+                }
             }
         }
     }
@@ -74,13 +88,16 @@ private fun RowScope.MainText(
         SenderNameMode.ActionList,
         SenderNameMode.Reply -> Modifier
     }
+
     val color = when (mode) {
         is SenderNameMode.Timeline -> mode.mainColor
         SenderNameMode.ActionList,
         SenderNameMode.Reply -> ElementTheme.colors.textPrimary
     }
     Text(
-        modifier = modifier.clipToBounds(),
+        modifier = modifier
+            .clipToBounds()
+            .weight(1f, fill = false),
         text = text,
         style = style,
         color = color,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
index 96ad91b869..e4ca73e69c 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/sender/SenderNameDataProvider.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 
 data class SenderNameData(
     val userId: UserId,
@@ -47,12 +48,14 @@ open class SenderNameDataProvider : PreviewParameterProvider<SenderNameData> {
 private fun aSenderNameData(
     senderNameMode: SenderNameMode,
     displayNameAmbiguous: Boolean = false,
+    displayedStatus: DisplayedStatus? = null,
 ) = SenderNameData(
     userId = UserId("@alice:${senderNameMode.javaClass.simpleName.lowercase()}"),
     profileDetails = ProfileDetails.Ready(
         displayName = "Alice ${senderNameMode.javaClass.simpleName}",
         displayNameAmbiguous = displayNameAmbiguous,
-        avatarUrl = null
+        avatarUrl = null,
+        displayedStatus = displayedStatus,
     ),
     senderNameMode = senderNameMode,
 )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/DisplayedStatusExtention.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/DisplayedStatusExtention.kt
new file mode 100644
index 0000000000..31d4a57b32
--- /dev/null
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/DisplayedStatusExtention.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.ui.model
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.ui.strings.CommonStrings
+
+fun DisplayedStatus.toEmojiText(): String = when (this) {
+    is DisplayedStatus.UserSet -> status.emoji
+    is DisplayedStatus.InCall -> "🎧"
+}
+
+@Composable
+fun DisplayedStatus.toText(): String = when (this) {
+    is DisplayedStatus.UserSet -> "${status.emoji} ${status.text}"
+    is DisplayedStatus.InCall -> "🎧 ${stringResource(CommonStrings.common_on_a_call)}"
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
index 3a03d8329b..cf5ac37d74 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
@@ -13,6 +13,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 
 fun RoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
     id = id.value,
@@ -45,3 +46,14 @@ fun RoomInfo.roleOf(userId: UserId): RoomMember.Role {
     val powerLevel = powerLevelOf(userId = userId)
     return RoomMember.Role.forPowerLevel(powerLevel)
 }
+
+/**
+ * Return the [DisplayedStatus] of the other member in a DM.
+ */
+fun RoomInfo.dmUserStatus(): DisplayedStatus? {
+    return if (isDm) {
+        heroes.firstOrNull()?.displayedStatus
+    } else {
+        null
+    }
+}
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
index 098117af74..f09447a083 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.BaseRoom
@@ -42,10 +43,8 @@ fun getRoomMemberAsState(roomMembersState: RoomMembersState, userId: UserId): St
 @Composable
 fun BaseRoom.getDirectRoomMember(roomMembersState: RoomMembersState): State<RoomMember?> {
     val roomInfo by roomInfoFlow.collectAsState()
-    return remember {
-        derivedStateOf {
-            roomMembersState.getDirectRoomMember(roomInfo, sessionId)
-        }
+    return remember(roomInfo.isDm) {
+        mutableStateOf(roomMembersState.getDirectRoomMember(roomInfo, sessionId))
     }
 }
 
diff --git a/libraries/matrixui/src/main/res/values-ca/translations.xml b/libraries/matrixui/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..44d3e10c55
--- /dev/null
+++ b/libraries/matrixui/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Envia invitació"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"Vols iniciar un xat amb %1$s?"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"Enviar invitació?"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) t\'ha convidat"</string>
+</resources>
diff --git a/libraries/matrixui/src/main/res/values-cs/translations.xml b/libraries/matrixui/src/main/res/values-cs/translations.xml
index a8e82b288c..cdfb34c032 100644
--- a/libraries/matrixui/src/main/res/values-cs/translations.xml
+++ b/libraries/matrixui/src/main/res/values-cs/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Poslat pozvánku"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Chcete začít chatovat s %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Poslat pozvánku?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Momentálně s touto osobou nemáte žádné chaty. Před pokračováním potvrďte pozvání."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Chcete zahájit chat s tímto novým kontaktem?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) vás pozval(a)"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-da/translations.xml b/libraries/matrixui/src/main/res/values-da/translations.xml
index 5b4970f003..f2dfa27073 100644
--- a/libraries/matrixui/src/main/res/values-da/translations.xml
+++ b/libraries/matrixui/src/main/res/values-da/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Send invitation"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Kunne du tænke dig at starte en samtale med %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Send invitation?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Du har i øjeblikket ingen samtaler med denne person. Bekræft invitationen, før du fortsætter."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Vil du starte en chat med denne nye kontakt?"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s ) inviterede dig"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-el/translations.xml b/libraries/matrixui/src/main/res/values-el/translations.xml
index 9e9f195464..a1d8da5a56 100644
--- a/libraries/matrixui/src/main/res/values-el/translations.xml
+++ b/libraries/matrixui/src/main/res/values-el/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Αποστολή πρόσκλησης"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Θα θέλατε να ξεκινήσετε μια συνομιλία με τον χρήστη %1$s;"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Αποστολή πρόσκλησης;"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Προς το παρόν δεν έχετε καμία συνομιλία με αυτό το άτομο. Επιβεβαιώστε την πρόσκλησή του πριν συνεχίσετε."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Έναρξη συνομιλίας με αυτήν τη νέα επαφή;"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) σέ προσκάλεσε"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-et/translations.xml b/libraries/matrixui/src/main/res/values-et/translations.xml
index bd9840940e..a84990af10 100644
--- a/libraries/matrixui/src/main/res/values-et/translations.xml
+++ b/libraries/matrixui/src/main/res/values-et/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Saada kutse"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Kas sa soovid alustada vestlust kasutajaga %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Kas saadame kutse?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Sul pole hetkel selle inimesega ühtegi vestlust. Enne jätkamist kinnita talle kutse saatmine."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Kas alustad vestlust selle uue kontaktiga?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) saatis sulle kutse"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-fi/translations.xml b/libraries/matrixui/src/main/res/values-fi/translations.xml
index daba3555bb..b1b971eadb 100644
--- a/libraries/matrixui/src/main/res/values-fi/translations.xml
+++ b/libraries/matrixui/src/main/res/values-fi/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Lähetä kutsu"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Haluaisitko aloittaa keskustelun käyttäjän %1$s kanssa?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Lähetetäänkö kutsu?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Sinulla ei ole tällä hetkellä keskusteluja tämän henkilön kanssa. Vahvista kutsu ennen jatkamista."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Aloitetaanko keskustelu tämän uuden kontaktin kanssa?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) kutsui sinut"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-fr/translations.xml b/libraries/matrixui/src/main/res/values-fr/translations.xml
index ca952f53c0..7e6466d264 100644
--- a/libraries/matrixui/src/main/res/values-fr/translations.xml
+++ b/libraries/matrixui/src/main/res/values-fr/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Envoyer l’invitation"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Voulez-vous entamer une discussion avec %1$s ?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Envoyer l’invitation ?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Vous n’avez actuellement aucune conversation avec cette personne. Confirmez son invitation avant de continuer."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Entamer une conversation avec ce nouveau contact ?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) vous a invité(e)"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-hr/translations.xml b/libraries/matrixui/src/main/res/values-hr/translations.xml
index 333d8fd7b7..6cd6f9fe7f 100644
--- a/libraries/matrixui/src/main/res/values-hr/translations.xml
+++ b/libraries/matrixui/src/main/res/values-hr/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Pošalji pozivnicu"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Želite li započeti razgovor s korisnikom %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Želite li poslati pozivnicu?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Trenutno nemate razgovora s ovom osobom. Potvrdite pozivanje prije nego što nastavite."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Želite li započeti razgovor s ovim novim kontaktom?"</string>
   <string name="screen_invites_invited_you">"Pozvao vas je korisnik %1$s (%2$s)"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-hu/translations.xml b/libraries/matrixui/src/main/res/values-hu/translations.xml
index f22454cd16..6bd7999bff 100644
--- a/libraries/matrixui/src/main/res/values-hu/translations.xml
+++ b/libraries/matrixui/src/main/res/values-hu/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Meghívó küldése"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Csevegést kezd vele: %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Meghívó küldése?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Még nem beszélgetett ezzel a személlyel. Folytatás előtt erősítse meg a meghívást."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Csevegést kezdeményez ezzel az új felhasználóval?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) meghívta"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-in/translations.xml b/libraries/matrixui/src/main/res/values-in/translations.xml
index e7706afa76..30b3116511 100644
--- a/libraries/matrixui/src/main/res/values-in/translations.xml
+++ b/libraries/matrixui/src/main/res/values-in/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Kirim undangan"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Apakah Anda ingin memulai obrolan dengan %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Kirim undangan?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Saat ini Anda belum memiliki obrolan dengan orang ini. Konfirmasikan undangan sebelum melanjutkan."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Mau mulai obrolan dengan kontak baru ini?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) mengundang Anda"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-it/translations.xml b/libraries/matrixui/src/main/res/values-it/translations.xml
index 439d61337e..913c45867c 100644
--- a/libraries/matrixui/src/main/res/values-it/translations.xml
+++ b/libraries/matrixui/src/main/res/values-it/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Invia invito"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Vuoi iniziare una conversazione con%1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Inviare invito?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Al momento non hai alcuna conversazione con questa persona. Conferma l\'invito prima di continuare."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Vuoi avviare una conversazione con questo nuovo contatto?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) ti ha invitato"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-ja/translations.xml b/libraries/matrixui/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..8834c0c18c
--- /dev/null
+++ b/libraries/matrixui/src/main/res/values-ja/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"招待を送信"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"%1$s とチャットを始めますか？"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"招待を送信しますか？"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"この人物とのチャットがありません。はじめに、招待の状況を確認してください。"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"この新しい連絡先と新規にチャットを開始しますか？"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) があなたを招待しました"</string>
+</resources>
diff --git a/libraries/matrixui/src/main/res/values-ko/translations.xml b/libraries/matrixui/src/main/res/values-ko/translations.xml
index 09d831e348..b36a61cf9b 100644
--- a/libraries/matrixui/src/main/res/values-ko/translations.xml
+++ b/libraries/matrixui/src/main/res/values-ko/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"초대장 보내기"</string>
   <string name="screen_bottom_sheet_create_dm_message">"%1$s 와 채팅을 시작하시겠습니까?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"초대장을 보내시겠습니까?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"이 사용자와의 대화 내역이 없습니다. 계속하려면 먼저 초대를 확인해 주세요."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"이 사용자와 대화를 시작하시겠습니까?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) 당신을 초대했습니다"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-nb/translations.xml b/libraries/matrixui/src/main/res/values-nb/translations.xml
index 01bea5c726..01a92ab7f8 100644
--- a/libraries/matrixui/src/main/res/values-nb/translations.xml
+++ b/libraries/matrixui/src/main/res/values-nb/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Send invitasjon"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Vil du starte en chat med %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Vil du sende invitasjon?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Du har for øyeblikket ingen samtaler med denne personen. Bekreft at du vil invitere vedkommende før du fortsetter."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Vil du starte en chat med denne nye kontakten?"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s) inviterte deg"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-pl/translations.xml b/libraries/matrixui/src/main/res/values-pl/translations.xml
index caa2c0e07d..bd31d7edb4 100644
--- a/libraries/matrixui/src/main/res/values-pl/translations.xml
+++ b/libraries/matrixui/src/main/res/values-pl/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Wyślij zaproszenie"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Czy chcesz rozpocząć czat z %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Wysłać zaproszenie?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Obecnie nie posiadasz żadnych czatów z tą osobą. Potwierdź zaproszenie, zanim przejdziesz dalej."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Rozpocząć czat z nowym kontaktem?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) zaprosił Cię"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-ro/translations.xml b/libraries/matrixui/src/main/res/values-ro/translations.xml
index 5156d6bd16..4d3eaa2364 100644
--- a/libraries/matrixui/src/main/res/values-ro/translations.xml
+++ b/libraries/matrixui/src/main/res/values-ro/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Trimiteți invitația"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Doriți să începeți o discuție cu %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Trimiteți invitația?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"În prezent, nu aveți nicio chat cu această persoană. Confirmați invitația înainte de a continua."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Începeți o conversație cu acest nou contact?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) v-a invitat."</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-ru/translations.xml b/libraries/matrixui/src/main/res/values-ru/translations.xml
index ef6b724c1c..77b3c6454e 100644
--- a/libraries/matrixui/src/main/res/values-ru/translations.xml
+++ b/libraries/matrixui/src/main/res/values-ru/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Отправить приглашение"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Хотите начать чат с %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Отправить приглашение?"</string>
-  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) вас"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"У Вас нет других чатов с этим пользователем. Подтвердите, что это действительно кого Вы хотите пригласить, прежде чем продолжить."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Начать чат с этим новым контактом?"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) пригласил(а) Вас"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-uk/translations.xml b/libraries/matrixui/src/main/res/values-uk/translations.xml
index 324bb96086..8217097cd2 100644
--- a/libraries/matrixui/src/main/res/values-uk/translations.xml
+++ b/libraries/matrixui/src/main/res/values-uk/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Надіслати запрошення"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Хочете розпочати бесіду з %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Надіслати запрошення?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Наразі у вас немає бесід з цим користувачем. Підтвердьте запрошення, перш ніж продовжити."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Розпочати бесіду з цим новим контактом?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) запрошує вас"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-uz/translations.xml b/libraries/matrixui/src/main/res/values-uz/translations.xml
index 63add2d3c0..4510619c7a 100644
--- a/libraries/matrixui/src/main/res/values-uz/translations.xml
+++ b/libraries/matrixui/src/main/res/values-uz/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Taklif yuborish"</string>
   <string name="screen_bottom_sheet_create_dm_message">"%1$s bilan chatni boshlashni xohlaysizmi?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Taklif yuborilsinmi?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"Ayni paytda bu shaxs bilan hech qanday suhbatingiz yo‘q. Davom etishdan oldin ularni taklif qilishni tasdiqlang."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Bu yangi kontakt bilan chat boshlansinmi?"</string>
   <string name="screen_invites_invited_you">"%1$s(%2$s ) sizni taklif qildi"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-vi/translations.xml b/libraries/matrixui/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..638996cb06
--- /dev/null
+++ b/libraries/matrixui/src/main/res/values-vi/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invites_invited_you">"%1$s(%2$s ) đã mời bạn"</string>
+</resources>
diff --git a/libraries/matrixui/src/main/res/values-zh-rTW/translations.xml b/libraries/matrixui/src/main/res/values-zh-rTW/translations.xml
index f851e399fe..1d216abfea 100644
--- a/libraries/matrixui/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/matrixui/src/main/res/values-zh-rTW/translations.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"傳送邀請"</string>
   <string name="screen_bottom_sheet_create_dm_message">"您想要開始與 %1$s 聊天嗎？"</string>
   <string name="screen_bottom_sheet_create_dm_title">"傳送邀請？"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"您目前與此人沒有任何聊天紀錄。請確認邀請後再繼續。"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"開始與這位新聯絡人聊天？"</string>
   <string name="screen_invites_invited_you">"%1$s（%2$s）邀請您"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-zh/translations.xml b/libraries/matrixui/src/main/res/values-zh/translations.xml
index aa8479fea0..e05e21095d 100644
--- a/libraries/matrixui/src/main/res/values-zh/translations.xml
+++ b/libraries/matrixui/src/main/res/values-zh/translations.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"发送邀请"</string>
-  <string name="screen_bottom_sheet_create_dm_message">"您想与%1$s 开始聊天吗？"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"你是否要与 %1$s 开始聊天？"</string>
   <string name="screen_bottom_sheet_create_dm_title">"发送邀请？"</string>
-  <string name="screen_invites_invited_you">"%1$s （%2$s）邀请了你"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"你与此人暂无任何聊天。请确认对方被邀请后再继续。"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"是否与新联系人开始聊天？"</string>
+  <string name="screen_invites_invited_you">"%1$s（%2$s）邀请了你"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values/localazy.xml b/libraries/matrixui/src/main/res/values/localazy.xml
index b27021ebd6..c4000519a5 100644
--- a/libraries/matrixui/src/main/res/values/localazy.xml
+++ b/libraries/matrixui/src/main/res/values/localazy.xml
@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Send invite"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Would you like to start a chat with %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Send invite?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"You currently don’t have any chats with this person. Confirm inviting them before continuing."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Start a chat with this new contact?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) invited you"</string>
 </resources>
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocumentTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocumentTest.kt
index ad427999e2..ae336cd0d0 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocumentTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocumentTest.kt
@@ -16,12 +16,10 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class ToHtmlDocumentTest {
+class ToHtmlDocumentTest : RobolectricTest() {
     @Test
     fun `toHtmlDocument - returns null if format is not HTML`() {
         val body = FormattedBody(
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainTextTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainTextTest.kt
index 607f825401..b1031176e7 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainTextTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/ToPlainTextTest.kt
@@ -13,13 +13,11 @@ import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.jsoup.Jsoup
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class ToPlainTextTest {
+class ToPlainTextTest : RobolectricTest() {
     @Test
     fun `Document toPlainText - returns a plain text version of the document`() {
         val document = Jsoup.parse(
@@ -136,4 +134,19 @@ class ToPlainTextTest {
         )
         assertThat(messageType.toPlainText(permalinkParser = FakePermalinkParser())).isEqualTo("This is the fallback text")
     }
+
+    @Test
+    fun `TextMessageType toPlainText - ignores mx-reply element`() {
+        val messageType = TextMessageType(
+            body = "This is the fallback text",
+            formatted = FormattedBody(
+                format = MessageFormat.HTML,
+                body = """
+                    <mx-reply>In reply to...</mx-reply>
+                    This is the message content.
+                """.trimIndent()
+            )
+        )
+        assertThat(messageType.toPlainText(permalinkParser = FakePermalinkParser())).isEqualTo("This is the message content.")
+    }
 }
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
index 5c7fdfaac8..3fcb2f8f18 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.libraries.matrix.ui.messages.reply
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
@@ -25,6 +24,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
@@ -47,14 +48,14 @@ import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembers
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.withConfigurationAndContext
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import kotlin.time.Duration.Companion.minutes
 
-@RunWith(AndroidJUnit4::class)
-class InReplyToMetadataKtTest {
+@Suppress("LargeClass")
+class InReplyToMetadataKtTest : RobolectricTest() {
     @Test
     fun `any message content`() = runTest {
         moleculeFlow(RecompositionMode.Immediate) {
@@ -409,6 +410,226 @@ class InReplyToMetadataKtTest {
         }
     }
 
+    @Test
+    fun `a gallery message with all media items shows media count`() = runTest {
+        moleculeFlow(RecompositionMode.Immediate) {
+            withConfigurationAndContext {
+                anInReplyToDetailsReady(
+                    eventContent = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Image(
+                                    ImageMessageType(
+                                        filename = "image1.jpg",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = anImageInfo(),
+                                    )
+                                ),
+                                GalleryItemType.Image(
+                                    ImageMessageType(
+                                        filename = "image2.jpg",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = anImageInfo(),
+                                    )
+                                ),
+                            ),
+                        )
+                    ),
+                    textContent = "",
+                ).metadata(hideImage = false)
+            }
+        }.test {
+            awaitItem().let {
+                assertThat(it).isEqualTo(
+                    InReplyToMetadata.Thumbnail(
+                        attachmentThumbnailInfo = AttachmentThumbnailInfo(
+                            thumbnailSource = aMediaSource(),
+                            textContent = "2 media items…",
+                            type = AttachmentThumbnailType.Image,
+                            blurHash = A_BLUR_HASH,
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `a gallery message with attachment items shows attachment count`() = runTest {
+        moleculeFlow(RecompositionMode.Immediate) {
+            withConfigurationAndContext {
+                anInReplyToDetailsReady(
+                    eventContent = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.File(
+                                    FileMessageType(
+                                        filename = "doc1.pdf",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = FileInfo(
+                                            mimetype = null,
+                                            size = null,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                        ),
+                                    )
+                                ),
+                                GalleryItemType.File(
+                                    FileMessageType(
+                                        filename = "doc2.pdf",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = FileInfo(
+                                            mimetype = null,
+                                            size = null,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                        ),
+                                    )
+                                ),
+                            ),
+                        )
+                    ),
+                    textContent = "",
+                ).metadata(hideImage = false)
+            }
+        }.test {
+            awaitItem().let {
+                assertThat(it).isEqualTo(
+                    InReplyToMetadata.Thumbnail(
+                        attachmentThumbnailInfo = AttachmentThumbnailInfo(
+                            thumbnailSource = null,
+                            textContent = "2 attachments…",
+                            type = AttachmentThumbnailType.File,
+                            blurHash = null,
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `a gallery message with caption shows caption instead of count`() = runTest {
+        moleculeFlow(RecompositionMode.Immediate) {
+            withConfigurationAndContext {
+                anInReplyToDetailsReady(
+                    eventContent = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "My vacation photos",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Image(
+                                    ImageMessageType(
+                                        filename = "image1.jpg",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = anImageInfo(),
+                                    )
+                                ),
+                                GalleryItemType.Image(
+                                    ImageMessageType(
+                                        filename = "image2.jpg",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = anImageInfo(),
+                                    )
+                                ),
+                            ),
+                        )
+                    ),
+                    textContent = "My vacation photos",
+                ).metadata(hideImage = false)
+            }
+        }.test {
+            awaitItem().let {
+                assertThat(it).isEqualTo(
+                    InReplyToMetadata.Thumbnail(
+                        attachmentThumbnailInfo = AttachmentThumbnailInfo(
+                            thumbnailSource = aMediaSource(),
+                            textContent = "My vacation photos",
+                            type = AttachmentThumbnailType.Image,
+                            blurHash = A_BLUR_HASH,
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `a gallery message with attachment items and caption shows caption instead of count`() = runTest {
+        moleculeFlow(RecompositionMode.Immediate) {
+            withConfigurationAndContext {
+                anInReplyToDetailsReady(
+                    eventContent = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "My documents",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.File(
+                                    FileMessageType(
+                                        filename = "doc1.pdf",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = FileInfo(
+                                            mimetype = null,
+                                            size = null,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                        ),
+                                    )
+                                ),
+                                GalleryItemType.File(
+                                    FileMessageType(
+                                        filename = "doc2.pdf",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = aMediaSource(),
+                                        info = FileInfo(
+                                            mimetype = null,
+                                            size = null,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                        ),
+                                    )
+                                ),
+                            ),
+                        )
+                    ),
+                    textContent = "My documents",
+                ).metadata(hideImage = false)
+            }
+        }.test {
+            awaitItem().let {
+                assertThat(it).isEqualTo(
+                    InReplyToMetadata.Thumbnail(
+                        attachmentThumbnailInfo = AttachmentThumbnailInfo(
+                            thumbnailSource = null,
+                            textContent = "My documents",
+                            type = AttachmentThumbnailType.File,
+                            blurHash = null,
+                        )
+                    )
+                )
+            }
+        }
+    }
+
     @Test
     fun `a poll content`() = runTest {
         moleculeFlow(RecompositionMode.Immediate) {
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensionsTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensionsTest.kt
index dd9d801210..035548a4ec 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensionsTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/model/MatrixUserExtensionsTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.libraries.matrix.ui.model
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.molecule.RecompositionMode
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
@@ -18,14 +17,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.withConfigurationAndContext
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class MatrixUserExtensionsTest {
+class MatrixUserExtensionsTest : RobolectricTest() {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
index 816ac0967e..737fff34ee 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
@@ -30,13 +30,10 @@ class RoomMembersTest {
     private val roomMember3 = aRoomMember(A_USER_ID_3)
 
     @Test
-    fun `getDirectRoomMember emits other member for encrypted DM with 2 joined members`() = runTest {
+    fun `getDirectRoomMember emits other member for encrypted DM`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
-                isDirect = true,
-                joinedMembersCount = 2,
-            )
+            initialRoomInfo = aRoomInfo(isDm = true, isEncrypted = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -51,7 +48,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emit null if the room is not a dm`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = false)
+            initialRoomInfo = aRoomInfo(isDm = false)
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -66,10 +63,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emits other member even if the room is not encrypted`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
-                isDirect = true,
-                activeMembersCount = 2,
-            )
+            initialRoomInfo = aRoomInfo(isDm = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -80,42 +74,11 @@ class RoomMembersTest {
         }
     }
 
-    @Test
-    fun `getDirectRoomMember emit null if the room has only 1 member`() = runTest {
-        val joinedRoom = FakeBaseRoom(
-            sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = true)
-        )
-        moleculeFlow(RecompositionMode.Immediate) {
-            joinedRoom.getDirectRoomMember(
-                RoomMembersState.Ready(persistentListOf(roomMember1))
-            )
-        }.test {
-            assertThat(awaitItem().value).isNull()
-        }
-    }
-
-    @Test
-    fun `getDirectRoomMember emit null if the room has only 3 members`() = runTest {
-        val joinedRoom = FakeBaseRoom(
-            sessionId = A_USER_ID,
-        ).apply {
-            givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 3L))
-        }
-        moleculeFlow(RecompositionMode.Immediate) {
-            joinedRoom.getDirectRoomMember(
-                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2, roomMember3))
-            )
-        }.test {
-            assertThat(awaitItem().value).isNull()
-        }
-    }
-
     @Test
     fun `getDirectRoomMember emit null if the other member is not active`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(isDirect = true),
+            initialRoomInfo = aRoomInfo(isDm = true),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
@@ -135,10 +98,7 @@ class RoomMembersTest {
     fun `getDirectRoomMember emit the other member if there are 2 active members`() = runTest {
         val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
-            initialRoomInfo = aRoomInfo(
-                isDirect = true,
-                activeMembersCount = 2,
-            )
+            initialRoomInfo = aRoomInfo(isDm = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
             joinedRoom.getDirectRoomMember(
diff --git a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerProvider.kt b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerProvider.kt
index 7ae35e8218..1bab693609 100644
--- a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerProvider.kt
+++ b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerProvider.kt
@@ -23,12 +23,23 @@ interface PickerProvider {
         onResult: (Uri?) -> Unit
     ): PickerLauncher<PickVisualMediaRequest, Uri?>
 
+    @Composable
+    fun registerGalleryMultiPicker(
+        onResult: (uris: List<Uri>) -> Unit
+    ): PickerLauncher<PickVisualMediaRequest, List<Uri>>
+
     @Composable
     fun registerFilePicker(
         mimeType: String,
         onResult: (uri: Uri?, mimeType: String?) -> Unit,
     ): PickerLauncher<String, Uri?>
 
+    @Composable
+    fun registerFileMultiPicker(
+        mimeType: String,
+        onResult: (uris: List<Uri>) -> Unit,
+    ): PickerLauncher<Array<String>, List<Uri>>
+
     @Composable
     fun registerCameraPhotoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean>
 
diff --git a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerType.kt b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerType.kt
index 9c69e6448b..da84a66f49 100644
--- a/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerType.kt
+++ b/libraries/mediapickers/api/src/main/kotlin/io/element/android/libraries/mediapickers/api/PickerType.kt
@@ -15,6 +15,9 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.core.mimetype.MimeTypes
 
+// As per MSC4274, the recommended item cap is 60.
+private const val MAX_GALLERY_ITEMS = 60
+
 @Immutable
 sealed interface PickerType<Input, Output> {
     fun getContract(): ActivityResultContract<Input, Output>
@@ -34,6 +37,13 @@ sealed interface PickerType<Input, Output> {
         }
     }
 
+    data object ImageAndVideoMulti : PickerType<PickVisualMediaRequest, List<Uri>> {
+        override fun getContract() = ActivityResultContracts.PickMultipleVisualMedia(MAX_GALLERY_ITEMS)
+        override fun getDefaultRequest(): PickVisualMediaRequest {
+            return PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo)
+        }
+    }
+
     object Camera {
         data class Photo(val destUri: Uri) : PickerType<Uri, Boolean> {
             override fun getContract() = ActivityResultContracts.TakePicture()
@@ -56,4 +66,13 @@ sealed interface PickerType<Input, Output> {
             return mimeType
         }
     }
+
+    data class FileMulti(val mimeType: String = MimeTypes.Any) : PickerType<Array<String>, List<Uri>> {
+        override fun getContract(): ActivityResultContract<Array<String>, List<Uri>> {
+            return ActivityResultContracts.OpenMultipleDocuments()
+        }
+        override fun getDefaultRequest(): Array<String> {
+            return arrayOf(mimeType)
+        }
+    }
 }
diff --git a/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt b/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
index 6c7dbb7db7..752398f7c4 100644
--- a/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
+++ b/libraries/mediapickers/api/src/test/kotlin/io/element/android/libraries/mediapickers/PickerTypeTest.kt
@@ -13,12 +13,10 @@ import androidx.activity.result.contract.ActivityResultContracts
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.mediapickers.api.PickerType
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class PickerTypeTest {
+class PickerTypeTest : RobolectricTest() {
     @Test
     fun `ImageAndVideo - assert types`() {
         val pickerType = PickerType.ImageAndVideo
diff --git a/libraries/mediapickers/impl/src/main/kotlin/io/element/android/libraries/mediapickers/impl/DefaultPickerProvider.kt b/libraries/mediapickers/impl/src/main/kotlin/io/element/android/libraries/mediapickers/impl/DefaultPickerProvider.kt
index 1b3df9c426..45ac408d42 100644
--- a/libraries/mediapickers/impl/src/main/kotlin/io/element/android/libraries/mediapickers/impl/DefaultPickerProvider.kt
+++ b/libraries/mediapickers/impl/src/main/kotlin/io/element/android/libraries/mediapickers/impl/DefaultPickerProvider.kt
@@ -80,6 +80,23 @@ class DefaultPickerProvider(
         }
     }
 
+    /**
+     * Remembers and returns a [PickerLauncher] for selecting multiple gallery items (images/videos).
+     * [onResult] will be called with the list of selected file [Uri]s.
+     */
+    @Composable
+    override fun registerGalleryMultiPicker(
+        onResult: (uris: List<Uri>) -> Unit
+    ): PickerLauncher<PickVisualMediaRequest, List<Uri>> {
+        return if (LocalInspectionMode.current) {
+            NoOpPickerLauncher { onResult(emptyList()) }
+        } else {
+            rememberPickerLauncher(type = PickerType.ImageAndVideoMulti) { uris ->
+                onResult(uris)
+            }
+        }
+    }
+
     /**
      * Remembers and returns a [PickerLauncher] for a file of a certain [mimeType] (any type of file, by default).
      * [onResult] will be called with either the selected file's [Uri] or `null` if nothing was selected.
@@ -100,6 +117,24 @@ class DefaultPickerProvider(
         }
     }
 
+    /**
+     * Remembers and returns a [PickerLauncher] for selecting multiple files of a certain [mimeType].
+     * [onResult] will be called with the list of selected file URIs.
+     */
+    @Composable
+    override fun registerFileMultiPicker(
+        mimeType: String,
+        onResult: (uris: List<Uri>) -> Unit,
+    ): PickerLauncher<Array<String>, List<Uri>> {
+        return if (LocalInspectionMode.current) {
+            NoOpPickerLauncher { onResult(emptyList()) }
+        } else {
+            rememberPickerLauncher(type = PickerType.FileMulti(mimeType)) { uris ->
+                onResult(uris)
+            }
+        }
+    }
+
     /**
      * Remembers and returns a [PickerLauncher] for taking a photo with a camera app.
      * @param [onResult] will be called with either the photo's [Uri] or `null` if nothing was selected.
@@ -113,7 +148,6 @@ class DefaultPickerProvider(
             val tmpFile = remember { getTemporaryFile("photo.jpg") }
             val tmpFileUri = remember(tmpFile) { getTemporaryUri(tmpFile) }
             rememberPickerLauncher(type = PickerType.Camera.Photo(tmpFileUri)) { success ->
-                // Execute callback
                 onResult(if (success) tmpFileUri else null)
             }
         }
@@ -125,7 +159,6 @@ class DefaultPickerProvider(
      */
     @Composable
     override fun registerCameraVideoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> {
-        // Tests and UI preview can't handle Context or FileProviders, so we might as well disable the whole picker
         return if (LocalInspectionMode.current) {
             NoOpPickerLauncher { onResult(null) }
         } else {
diff --git a/libraries/mediapickers/test/src/main/kotlin/io/element/android/libraries/mediapickers/test/FakePickerProvider.kt b/libraries/mediapickers/test/src/main/kotlin/io/element/android/libraries/mediapickers/test/FakePickerProvider.kt
index 98cbcec1ea..022ad05da2 100644
--- a/libraries/mediapickers/test/src/main/kotlin/io/element/android/libraries/mediapickers/test/FakePickerProvider.kt
+++ b/libraries/mediapickers/test/src/main/kotlin/io/element/android/libraries/mediapickers/test/FakePickerProvider.kt
@@ -19,6 +19,7 @@ import io.element.android.libraries.mediapickers.api.PickerProvider
 class FakePickerProvider : PickerProvider {
     private var mimeType = MimeTypes.Any
     private var result: Uri? = null
+    private var multipleResults: List<Uri>? = null
 
     @Composable
     override fun registerGalleryPicker(onResult: (uri: Uri?, mimeType: String?) -> Unit): PickerLauncher<PickVisualMediaRequest, Uri?> {
@@ -30,11 +31,21 @@ class FakePickerProvider : PickerProvider {
         return NoOpPickerLauncher { onResult(result) }
     }
 
+    @Composable
+    override fun registerGalleryMultiPicker(onResult: (uris: List<Uri>) -> Unit): PickerLauncher<PickVisualMediaRequest, List<Uri>> {
+        return NoOpPickerLauncher { onResult(multipleResults ?: result?.let { listOf(it) } ?: emptyList()) }
+    }
+
     @Composable
     override fun registerFilePicker(mimeType: String, onResult: (Uri?, String?) -> Unit): PickerLauncher<String, Uri?> {
         return NoOpPickerLauncher { onResult(result, this.mimeType) }
     }
 
+    @Composable
+    override fun registerFileMultiPicker(mimeType: String, onResult: (uris: List<Uri>) -> Unit): PickerLauncher<Array<String>, List<Uri>> {
+        return NoOpPickerLauncher { onResult(multipleResults ?: result?.let { listOf(it) } ?: emptyList()) }
+    }
+
     @Composable
     override fun registerCameraPhotoPicker(onResult: (Uri?) -> Unit): PickerLauncher<Uri, Boolean> {
         return NoOpPickerLauncher { onResult(result) }
@@ -49,6 +60,10 @@ class FakePickerProvider : PickerProvider {
         this.result = value
     }
 
+    fun givenMultipleResults(uris: List<Uri>) {
+        this.multipleResults = uris
+    }
+
     fun givenMimeType(mimeType: String) {
         this.mimeType = mimeType
     }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
index 628e760c1e..6cca73935e 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
@@ -61,5 +61,12 @@ interface MediaSender {
         inReplyToEventId: EventId? = null,
     ): Result<Unit>
 
+    suspend fun sendGallery(
+        mediaUploadInfos: List<MediaUploadInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit>
+
     fun cleanUp()
 }
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
index f0082a4d1b..29adab2baf 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaUploadInfo.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.mediaupload.api
 
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
+import io.element.android.libraries.matrix.api.media.GalleryItemInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import java.io.File
@@ -31,3 +32,30 @@ fun MediaUploadInfo.allFiles(): List<File> {
         (this@allFiles as? MediaUploadInfo.Video)?.thumbnailFile,
     )
 }
+
+fun MediaUploadInfo.toGalleryItemInfo(): GalleryItemInfo {
+    return when (this) {
+        is MediaUploadInfo.Image -> GalleryItemInfo.Image(
+            file = file,
+            imageInfo = imageInfo,
+            thumbnailFile = thumbnailFile,
+        )
+        is MediaUploadInfo.Video -> GalleryItemInfo.Video(
+            file = file,
+            videoInfo = videoInfo,
+            thumbnailFile = thumbnailFile,
+        )
+        is MediaUploadInfo.Audio -> GalleryItemInfo.Audio(
+            file = file,
+            audioInfo = audioInfo,
+        )
+        is MediaUploadInfo.VoiceMessage -> GalleryItemInfo.Audio(
+            file = file,
+            audioInfo = audioInfo,
+        )
+        is MediaUploadInfo.AnyFile -> GalleryItemInfo.MediaFile(
+            file = file,
+            fileInfo = fileInfo,
+        )
+    }
+}
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
index 2b1883619e..b374e530f4 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessor.kt
@@ -67,7 +67,7 @@ class AndroidMediaPreProcessor(
          */
         private const val IMAGE_SCALE_REF_SIZE = 640
 
-        private val notCompressibleImageTypes = listOf(MimeTypes.Gif, MimeTypes.WebP, MimeTypes.Svg)
+        private val notCompressibleImageTypes = listOf(MimeTypes.Gif, MimeTypes.WebP)
     }
 
     private val contentResolver = context.contentResolver
@@ -83,10 +83,7 @@ class AndroidMediaPreProcessor(
     ): Result<MediaUploadInfo> = withContext(coroutineDispatchers.computation) {
         runCatchingExceptions {
             val result = when {
-                // Special case for SVG, since Android can't read its metadata or create a thumbnail, it must be sent as a file
-                mimeType == MimeTypes.Svg -> {
-                    processFile(uri, mimeType)
-                }
+                mimeType == MimeTypes.Svg -> processSvgImage(uri, mimeType)
                 mimeType.isMimeTypeImage() -> {
                     val shouldBeCompressed = mediaOptimizationConfig.compressImages && mimeType !in notCompressibleImageTypes
                     processImage(uri, mimeType, shouldBeCompressed)
@@ -160,6 +157,7 @@ class AndroidMediaPreProcessor(
 
     private suspend fun processImage(uri: Uri, mimeType: String, shouldBeCompressed: Boolean): MediaUploadInfo {
         Timber.d("Processing image ${uri.path.orEmpty().hash()}")
+
         suspend fun processImageWithCompression(): MediaUploadInfo {
             // Read the orientation metadata from its own stream. Trying to reuse this stream for compression will fail.
             val orientation = contentResolver.openInputStream(uri).use { input ->
@@ -195,18 +193,16 @@ class AndroidMediaPreProcessor(
                 file = file,
                 mimeType = mimeType,
             )
-            val imageInfo = contentResolver.openInputStream(uri).use { input ->
-                val bitmap = BitmapFactory.decodeStream(input, null, null)!!
-                ImageInfo(
-                    width = bitmap.width.toLong(),
-                    height = bitmap.height.toLong(),
-                    mimetype = mimeType,
-                    size = file.length(),
-                    thumbnailInfo = thumbnailResult?.info,
-                    thumbnailSource = null,
-                    blurhash = thumbnailResult?.blurhash,
-                )
-            }
+            val (width, height) = extractOrientedImageDimensions(file)
+            val imageInfo = ImageInfo(
+                width = width,
+                height = height,
+                mimetype = mimeType,
+                size = file.length(),
+                thumbnailInfo = thumbnailResult?.info,
+                thumbnailSource = null,
+                blurhash = thumbnailResult?.blurhash,
+            )
             removeSensitiveImageMetadata(file)
             return MediaUploadInfo.Image(
                 file = file,
@@ -222,6 +218,28 @@ class AndroidMediaPreProcessor(
         }
     }
 
+    private val svgDimensionExtractor = SvgDimensionExtractor()
+
+    private suspend fun processSvgImage(uri: Uri, mimeType: String): MediaUploadInfo {
+        Timber.d("Processing SVG image ${uri.path.orEmpty().hash()}")
+        val file = copyToTmpFile(uri)
+        val size = svgDimensionExtractor.extractDimensions(file)
+        val imageInfo = ImageInfo(
+            width = size.width.toLong(),
+            height = size.height.toLong(),
+            mimetype = mimeType,
+            size = file.length(),
+            thumbnailInfo = null,
+            thumbnailSource = null,
+            blurhash = null,
+        )
+        return MediaUploadInfo.Image(
+            file = file,
+            imageInfo = imageInfo,
+            thumbnailFile = null,
+        )
+    }
+
     private suspend fun processVideo(uri: Uri, mimeType: String?, videoCompressionPreset: VideoCompressionPreset): MediaUploadInfo {
         Timber.d("Processing video ${uri.path.orEmpty().hash()}")
         val resultFile = runCatchingExceptions {
@@ -354,6 +372,23 @@ class AndroidMediaPreProcessor(
         return contentResolver.openInputStream(uri)?.use { createTmpFileWithInput(it) }
             ?: error("Could not copy the contents of $uri to a temporary file")
     }
+
+    private fun extractOrientedImageDimensions(file: File): Pair<Long, Long> {
+        val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+        BitmapFactory.decodeFile(file.path, options)
+
+        val rawWidth = options.outWidth.toLong()
+        val rawHeight = options.outHeight.toLong()
+        val orientation = tryOrNull {
+            ExifInterface(file).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)
+        } ?: ExifInterface.ORIENTATION_UNDEFINED
+
+        return orientedImageDimensions(
+            rawWidth = rawWidth,
+            rawHeight = rawHeight,
+            orientation = orientation,
+        )
+    }
 }
 
 private fun ImageCompressionResult.toImageInfo(mimeType: String, thumbnailResult: ThumbnailResult?) = ImageInfo(
@@ -371,3 +406,18 @@ private fun MediaMetadataRetriever.extractDuration(): Duration {
     val durationInMs = extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
     return durationInMs.milliseconds
 }
+
+internal fun orientedImageDimensions(rawWidth: Long, rawHeight: Long, orientation: Int): Pair<Long, Long> {
+    return if (orientation.rotatesRightAngle()) {
+        rawHeight to rawWidth
+    } else {
+        rawWidth to rawHeight
+    }
+}
+
+private fun Int.rotatesRightAngle(): Boolean {
+    return this == ExifInterface.ORIENTATION_ROTATE_90 ||
+        this == ExifInterface.ORIENTATION_ROTATE_270 ||
+        this == ExifInterface.ORIENTATION_TRANSPOSE ||
+        this == ExifInterface.ORIENTATION_TRANSVERSE
+}
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSender.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSender.kt
index ea2cac2951..37f77d11f8 100644
--- a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSender.kt
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSender.kt
@@ -27,6 +27,7 @@ import io.element.android.libraries.mediaupload.api.MediaSender
 import io.element.android.libraries.mediaupload.api.MediaSenderFactory
 import io.element.android.libraries.mediaupload.api.MediaSenderRoomFactory
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
+import io.element.android.libraries.mediaupload.api.toGalleryItemInfo
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import timber.log.Timber
@@ -167,6 +168,29 @@ class DefaultMediaSender(
             .handleSendResult(mediaId(uri))
     }
 
+    override suspend fun sendGallery(
+        mediaUploadInfos: List<MediaUploadInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        val galleryLogId = "gallery[${mediaUploadInfos.size} items]"
+        Timber.d("Sending $galleryLogId")
+        return getTimeline().flatMap { timeline ->
+            val galleryItems = mediaUploadInfos.map { it.toGalleryItemInfo() }
+            timeline.sendGallery(
+                items = galleryItems,
+                caption = caption,
+                formattedCaption = formattedCaption,
+                inReplyToEventId = inReplyToEventId,
+            )
+        }
+            .flatMapCatching { uploadHandler ->
+                uploadHandler.await()
+            }
+            .handleSendResult(galleryLogId)
+    }
+
     private fun Result<Unit>.handleSendResult(mediaId: String) = this
         .onFailure { error ->
             val job = ongoingUploadJobs.remove(Job)
diff --git a/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/SvgDimensionExtractor.kt b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/SvgDimensionExtractor.kt
new file mode 100644
index 0000000000..f32b596df1
--- /dev/null
+++ b/libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/SvgDimensionExtractor.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaupload.impl
+
+import android.util.Xml
+import org.xmlpull.v1.XmlPullParser
+import java.io.File
+
+class SvgDimensionExtractor(
+    private val defaultWidth: Long = 640L,
+    private val defaultHeight: Long = 480L,
+) {
+    fun extractDimensions(file: File): android.util.Size {
+        return file.inputStream().use { inputStream ->
+            try {
+                val parser = Xml.newPullParser()
+                parser.setInput(inputStream, null)
+                var eventType = parser.eventType
+                while (eventType != XmlPullParser.END_DOCUMENT) {
+                    if (eventType == XmlPullParser.START_TAG && parser.name.equals("svg", ignoreCase = true)) {
+                        val width = parser.getAttributeValue(null, "width")
+                        val height = parser.getAttributeValue(null, "height")
+                        val viewBox = parser.getAttributeValue(null, "viewBox")
+
+                        val parsedWidth = width?.let { parseLength(it) }
+                        val parsedHeight = height?.let { parseLength(it) }
+
+                        if (parsedWidth != null && parsedHeight != null) {
+                            return android.util.Size(parsedWidth.toInt(), parsedHeight.toInt())
+                        }
+
+                        if (viewBox != null) {
+                            val parts = viewBox.trim().split("\\s+".toRegex()).map { it.toFloatOrNull() }
+                            if (parts.size == 4 && parts[2] != null && parts[3] != null) {
+                                val vbWidth = parts[2]!!.toLong().coerceAtLeast(1)
+                                val vbHeight = parts[3]!!.toLong().coerceAtLeast(1)
+                                return android.util.Size(vbWidth.toInt(), vbHeight.toInt())
+                            }
+                        }
+
+                        return android.util.Size((parsedWidth ?: defaultWidth).toInt(), (parsedHeight ?: defaultHeight).toInt())
+                    }
+                    eventType = parser.next()
+                }
+                android.util.Size(defaultWidth.toInt(), defaultHeight.toInt())
+            } catch (_: Exception) {
+                android.util.Size(defaultWidth.toInt(), defaultHeight.toInt())
+            }
+        }
+    }
+
+    private fun parseLength(value: String): Long? {
+        val trimmed = value.trim()
+        if (trimmed.isEmpty()) return null
+        return try {
+            val numericPart = trimmed.replace(Regex("[^\\d.]"), "")
+            if (numericPart.isEmpty()) null else numericPart.toFloat().toLong().coerceAtLeast(1)
+        } catch (_: NumberFormatException) {
+            null
+        }
+    }
+}
diff --git a/libraries/mediaupload/impl/src/test/assets/image.svg b/libraries/mediaupload/impl/src/test/assets/image.svg
new file mode 100644
index 0000000000..03a3fb275b
--- /dev/null
+++ b/libraries/mediaupload/impl/src/test/assets/image.svg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97a22915f50ba62605a8e3f6ba8e8099c1d601d2aa929c2879197b41531ce4dc
+size 210
diff --git a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessorTest.kt b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessorTest.kt
index f4b4e7d4a5..3fb639aa9b 100644
--- a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessorTest.kt
+++ b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/AndroidMediaPreProcessorTest.kt
@@ -12,6 +12,7 @@ import android.content.Context
 import android.net.Uri
 import android.os.Build
 import androidx.core.net.toUri
+import androidx.exifinterface.media.ExifInterface
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
@@ -28,20 +29,42 @@ import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
 import io.element.android.tests.testutils.fake.FakeTemporaryUriDeleter
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Ignore
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
 import kotlin.time.Duration
 
-@RunWith(RobolectricTestRunner::class)
-class AndroidMediaPreProcessorTest {
+class AndroidMediaPreProcessorTest : RobolectricTest() {
+    @Test
+    fun `orientedImageDimensions swaps width and height for 90 degree exif orientation`() {
+        val (width, height) = orientedImageDimensions(
+            rawWidth = 4032,
+            rawHeight = 2268,
+            orientation = ExifInterface.ORIENTATION_ROTATE_90,
+        )
+
+        assertThat(width).isEqualTo(2268)
+        assertThat(height).isEqualTo(4032)
+    }
+
+    @Test
+    fun `orientedImageDimensions keeps width and height for upright exif orientation`() {
+        val (width, height) = orientedImageDimensions(
+            rawWidth = 4032,
+            rawHeight = 2268,
+            orientation = ExifInterface.ORIENTATION_NORMAL,
+        )
+
+        assertThat(width).isEqualTo(4032)
+        assertThat(height).isEqualTo(2268)
+    }
+
     private suspend fun TestScope.process(
         asset: Asset,
         mediaOptimizationConfig: MediaOptimizationConfig,
@@ -376,6 +399,54 @@ class AndroidMediaPreProcessorTest {
         )
     }
 
+    @Test
+    fun `test processing svg`() = runTest {
+        val mediaUploadInfo = process(
+            asset = assetImageSvg,
+            mediaOptimizationConfig = MediaOptimizationConfig(
+                compressImages = true,
+                videoCompressionPreset = VideoCompressionPreset.STANDARD,
+            ),
+        )
+        val info = mediaUploadInfo as MediaUploadInfo.Image
+        assertThat(info.imageInfo).isEqualTo(
+            ImageInfo(
+                width = 800,
+                height = 600,
+                mimetype = MimeTypes.Svg,
+                size = 210,
+                thumbnailInfo = null,
+                thumbnailSource = null,
+                blurhash = null,
+            )
+        )
+        assertThat(info.thumbnailFile).isNull()
+    }
+
+    @Test
+    fun `test processing svg without compression`() = runTest {
+        val mediaUploadInfo = process(
+            asset = assetImageSvg,
+            mediaOptimizationConfig = MediaOptimizationConfig(
+                compressImages = false,
+                videoCompressionPreset = VideoCompressionPreset.STANDARD,
+            ),
+        )
+        val info = mediaUploadInfo as MediaUploadInfo.Image
+        assertThat(info.imageInfo).isEqualTo(
+            ImageInfo(
+                width = 800,
+                height = 600,
+                mimetype = MimeTypes.Svg,
+                size = 210,
+                thumbnailInfo = null,
+                thumbnailSource = null,
+                blurhash = null,
+            )
+        )
+        assertThat(info.thumbnailFile).isNull()
+    }
+
     @Test
     fun `test processing audio`() = runTest {
         val mediaUploadInfo = process(
diff --git a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/Asset.kt b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/Asset.kt
index 4dad31a784..7b70244852 100644
--- a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/Asset.kt
+++ b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/Asset.kt
@@ -83,3 +83,14 @@ val assetAnimatedGif = Asset(
     width = 800,
     height = 600,
 )
+
+/**
+ * "image.svg" is an 800 x 600 SVG image with a size of 210 bytes.
+ */
+val assetImageSvg = Asset(
+    filename = "image.svg",
+    mimeType = MimeTypes.Svg,
+    size = 210,
+    width = 800,
+    height = 600,
+)
diff --git a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
index 139042804f..cfa3585629 100644
--- a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
+++ b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/DefaultMediaSenderTest.kt
@@ -25,18 +25,16 @@ import io.element.android.libraries.mediaupload.api.MediaPreProcessor
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import java.io.File
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultMediaSenderTest {
+class DefaultMediaSenderTest : RobolectricTest() {
     private val mediaOptimizationConfig = MediaOptimizationConfig(
         compressImages = true,
         videoCompressionPreset = VideoCompressionPreset.STANDARD,
diff --git a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfigFactoryTest.kt b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfigFactoryTest.kt
index 041d05ae1e..6af0956541 100644
--- a/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfigFactoryTest.kt
+++ b/libraries/mediaupload/impl/src/test/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressorConfigFactoryTest.kt
@@ -11,13 +11,10 @@ package io.element.android.libraries.mediaupload.impl
 import androidx.media3.transformer.VideoEncoderSettings
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.preferences.api.store.VideoCompressionPreset
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
 @Suppress("NOTHING_TO_INLINE")
-@RunWith(RobolectricTestRunner::class)
-class VideoCompressorConfigFactoryTest {
+class VideoCompressorConfigFactoryTest : RobolectricTest() {
     @Test
     fun `if we don't have metadata the video will be resized`() {
         // Given
diff --git a/libraries/mediaupload/test/build.gradle.kts b/libraries/mediaupload/test/build.gradle.kts
index 7e729089c7..f271ae1316 100644
--- a/libraries/mediaupload/test/build.gradle.kts
+++ b/libraries/mediaupload/test/build.gradle.kts
@@ -15,6 +15,7 @@ android {
 }
 
 dependencies {
+    implementation(libs.coroutines.core)
     api(projects.libraries.mediaupload.api)
     implementation(projects.libraries.core)
     implementation(projects.tests.testutils)
diff --git a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt
index c07ebb6ec9..3750060eef 100644
--- a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt
+++ b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt
@@ -31,6 +31,10 @@ class FakeMediaPreProcessor(
     var cleanUpCallCount = 0
         private set
 
+    /** The [MediaOptimizationConfig] passed to the most recent [process] call, or `null` if it was never called. */
+    var lastMediaOptimizationConfig: MediaOptimizationConfig? = null
+        private set
+
     private var result: Result<MediaUploadInfo> = Result.success(
         MediaUploadInfo.AnyFile(
             File("test"),
@@ -51,6 +55,7 @@ class FakeMediaPreProcessor(
     ): Result<MediaUploadInfo> = simulateLongTask {
         processLatch?.await()
         processCallCount++
+        lastMediaOptimizationConfig = mediaOptimizationConfig
         result
     }
 
diff --git a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaSender.kt b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaSender.kt
index 1713f7b5ea..6ef8da4ab6 100644
--- a/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaSender.kt
+++ b/libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaSender.kt
@@ -19,6 +19,7 @@ class FakeMediaSender(
     private val sendPreProcessedMediaResult: () -> Result<Unit> = { lambdaError() },
     private val sendMediaResult: () -> Result<Unit> = { lambdaError() },
     private val sendVoiceMessageResult: () -> Result<Unit> = { lambdaError() },
+    private val sendGalleryResult: () -> Result<Unit> = { lambdaError() },
     private val cleanUpResult: () -> Unit = { lambdaError() },
 ) : MediaSender {
     override suspend fun preProcessMedia(
@@ -58,6 +59,15 @@ class FakeMediaSender(
         return sendVoiceMessageResult()
     }
 
+    override suspend fun sendGallery(
+        mediaUploadInfos: List<MediaUploadInfo>,
+        caption: String?,
+        formattedCaption: String?,
+        inReplyToEventId: EventId?,
+    ): Result<Unit> {
+        return sendGalleryResult()
+    }
+
     override fun cleanUp() {
         cleanUpResult()
     }
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/GalleryItemData.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/GalleryItemData.kt
new file mode 100644
index 0000000000..fb60a7488c
--- /dev/null
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/GalleryItemData.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.api
+
+import android.os.Parcelable
+import io.element.android.libraries.matrix.api.media.MediaSource
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class GalleryItemData(
+    val filename: String,
+    val mimeType: String,
+    val mediaSource: MediaSource,
+    val thumbnailSource: MediaSource?,
+    val type: Type,
+    val blurHash: String?,
+) : Parcelable {
+    enum class Type {
+        Image,
+        Video,
+        Audio,
+        File,
+    }
+}
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt
index 74b479dc8c..6d70747a07 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaInfo.kt
@@ -13,10 +13,28 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.core.UserId
 import kotlinx.parcelize.Parcelize
 
+@Parcelize
+data class GalleryInfo(
+    val caption: String?,
+    val formattedCaption: CharSequence? = null,
+    val senderId: UserId?,
+    val senderName: String?,
+    val senderAvatar: String?,
+    val dateSent: String?,
+    val dateSentFull: String?,
+    val initialIndex: Int,
+) : Parcelable
+
+@Parcelize
+data class AvatarInfo(
+    val filename: String,
+) : Parcelable
+
 @Parcelize
 data class MediaInfo(
     val filename: String,
     val caption: String?,
+    val formattedCaption: CharSequence? = null,
     val mimeType: String,
     val fileSize: Long?,
     val formattedFileSize: String,
@@ -33,6 +51,7 @@ data class MediaInfo(
 fun anImageMediaInfo(
     senderId: UserId? = UserId("@alice:server.org"),
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -40,6 +59,7 @@ fun anImageMediaInfo(
     filename = "an image file.jpg",
     fileSize = 4 * 1024 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.Jpeg,
     formattedFileSize = "4MB",
     fileExtension = "jpg",
@@ -54,6 +74,7 @@ fun anImageMediaInfo(
 
 fun aVideoMediaInfo(
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -62,6 +83,7 @@ fun aVideoMediaInfo(
     filename = "a video file.mp4",
     fileSize = 14 * 1024 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.Mp4,
     formattedFileSize = "14MB",
     fileExtension = "mp4",
@@ -77,6 +99,7 @@ fun aVideoMediaInfo(
 fun aPdfMediaInfo(
     filename: String = "a pdf file.pdf",
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -84,6 +107,7 @@ fun aPdfMediaInfo(
     filename = filename,
     fileSize = 23 * 1024 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.Pdf,
     formattedFileSize = "23MB",
     fileExtension = "pdf",
@@ -96,6 +120,30 @@ fun aPdfMediaInfo(
     duration = null,
 )
 
+fun aZipMediaInfo(
+    filename: String = "a zip file.zip",
+    caption: String? = null,
+    formattedCaption: CharSequence? = null,
+    senderName: String? = null,
+    dateSent: String? = null,
+    dateSentFull: String? = null,
+): MediaInfo = MediaInfo(
+    filename = filename,
+    fileSize = 12 * 1024 * 1024,
+    caption = caption,
+    formattedCaption = formattedCaption,
+    mimeType = MimeTypes.Pdf,
+    formattedFileSize = "45MB",
+    fileExtension = "zip",
+    senderId = UserId("@alice:server.org"),
+    senderName = senderName,
+    senderAvatar = null,
+    dateSent = dateSent,
+    dateSentFull = dateSentFull,
+    waveform = null,
+    duration = null,
+)
+
 fun anApkMediaInfo(
     senderId: UserId? = UserId("@alice:server.org"),
     senderName: String? = null,
@@ -105,6 +153,7 @@ fun anApkMediaInfo(
     filename = "an apk file.apk",
     fileSize = 50 * 1024 * 1024,
     caption = null,
+    formattedCaption = null,
     mimeType = MimeTypes.Apk,
     formattedFileSize = "50MB",
     fileExtension = "apk",
@@ -120,6 +169,7 @@ fun anApkMediaInfo(
 fun anAudioMediaInfo(
     filename: String = "an audio file.mp3",
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -129,6 +179,7 @@ fun anAudioMediaInfo(
     filename = filename,
     fileSize = 7 * 1024 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.Mp3,
     formattedFileSize = "7MB",
     fileExtension = "mp3",
@@ -144,6 +195,7 @@ fun anAudioMediaInfo(
 fun aVoiceMediaInfo(
     filename: String = "a voice file.ogg",
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -153,6 +205,7 @@ fun aVoiceMediaInfo(
     filename = filename,
     fileSize = 3 * 1024 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.Ogg,
     formattedFileSize = "3MB",
     fileExtension = "ogg",
@@ -168,6 +221,7 @@ fun aVoiceMediaInfo(
 fun aTxtMediaInfo(
     filename: String = "a text file.txt",
     caption: String? = null,
+    formattedCaption: CharSequence? = null,
     senderName: String? = null,
     dateSent: String? = null,
     dateSentFull: String? = null,
@@ -175,6 +229,7 @@ fun aTxtMediaInfo(
     filename = filename,
     fileSize = 2 * 1024,
     caption = caption,
+    formattedCaption = formattedCaption,
     mimeType = MimeTypes.PlainText,
     formattedFileSize = "2kB",
     fileExtension = "txt",
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt
index 536930b968..7b9f65e60e 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/MediaViewerEntryPoint.kt
@@ -35,18 +35,34 @@ interface MediaViewerEntryPoint : FeatureEntryPoint {
         fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean)
     }
 
-    data class Params(
-        val mode: MediaViewerMode,
-        val eventId: EventId?,
-        val mediaInfo: MediaInfo,
-        val mediaSource: MediaSource,
-        val thumbnailSource: MediaSource?,
-        val canShowInfo: Boolean,
-    ) : NodeInputs
+    sealed interface Params : NodeInputs {
+        data class RoomMedia(
+            val mode: MediaViewerMode,
+            val eventId: EventId?,
+            val mediaInfo: MediaInfo,
+            val mediaSource: MediaSource,
+            val thumbnailSource: MediaSource?,
+            val blurHash: String?,
+        ) : Params
+
+        data class EventGallery(
+            val eventId: EventId?,
+            val galleryInfo: GalleryInfo,
+            val galleryItems: List<GalleryItemData>,
+            val fromPinnedMessages: Boolean,
+        ) : Params
+
+        data class Avatar(
+            val avatarInfo: AvatarInfo,
+            val mediaSource: MediaSource,
+            val thumbnailSource: MediaSource?,
+            val blurHash: String?,
+        ) : Params
+    }
 
     sealed interface MediaViewerMode : Parcelable {
         @Parcelize
-        data object SingleMedia : MediaViewerMode
+        data class EventGallery(val fromPinnedMessages: Boolean) : MediaViewerMode
 
         @Parcelize
         data class TimelineImagesAndVideos(val timelineMode: Timeline.Mode) : MediaViewerMode
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/helper/FileExtensionAndSizeFormatter.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/helper/FileExtensionAndSizeFormatter.kt
index fc40bca8dd..e546f50565 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/helper/FileExtensionAndSizeFormatter.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/helper/FileExtensionAndSizeFormatter.kt
@@ -12,8 +12,8 @@ fun formatFileExtensionAndSize(extension: String, size: String?): String {
     return buildString {
         append(extension.uppercase())
         if (size != null) {
-            append(' ')
-            append("($size)")
+            append(" • ")
+            append(size)
         }
     }
 }
diff --git a/libraries/mediaviewer/impl/build.gradle.kts b/libraries/mediaviewer/impl/build.gradle.kts
index 9c2342ecd9..a5d7369056 100644
--- a/libraries/mediaviewer/impl/build.gradle.kts
+++ b/libraries/mediaviewer/impl/build.gradle.kts
@@ -25,9 +25,13 @@ android {
 setupDependencyInjection()
 
 dependencies {
+    implementation(libs.matrix.richtexteditor.compose)
+    implementation(libs.matrix.richtexteditor)
+    implementation(projects.libraries.textcomposer.impl)
     implementation(libs.coroutines.core)
     implementation(libs.coil.compose)
     implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.exoplayer.midi)
     implementation(libs.androidx.media3.ui)
     implementation(libs.telephoto.zoomableimage)
     implementation(libs.vanniktech.blurhash)
@@ -35,6 +39,7 @@ dependencies {
 
     implementation(projects.features.enterprise.api)
     implementation(projects.features.viewfolder.api)
+    implementation(projects.features.contentscanner.api)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.audio.api)
@@ -44,8 +49,10 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
     implementation(projects.libraries.matrixmedia.api)
     implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.uiUtils)
     implementation(projects.libraries.voiceplayer.api)
     implementation(projects.services.toolbox.api)
 
diff --git a/libraries/mediaviewer/impl/src/main/AndroidManifest.xml b/libraries/mediaviewer/impl/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3e5f3ecc7e
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2026 Element Creations Ltd.
+  ~
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+  ~ Please see LICENSE files in the repository root for full details.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- To be able to install APK from the application -->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+</manifest>
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt
index e1e112ecfa..4cbcd75a5e 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPoint.kt
@@ -13,39 +13,22 @@ import com.bumble.appyx.core.node.Node
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.core.mimetype.MimeTypes
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaSource
-import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.api.AvatarInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerNode
 
 @ContributesBinding(AppScope::class)
 class DefaultMediaViewerEntryPoint : MediaViewerEntryPoint {
     override fun createParamsForAvatar(filename: String, avatarUrl: String): MediaViewerEntryPoint.Params {
-        // We need to fake the MimeType here for the viewer to work.
-        val mimeType = MimeTypes.Images
-        return MediaViewerEntryPoint.Params(
-            mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
-            eventId = null,
-            mediaInfo = MediaInfo(
+        return MediaViewerEntryPoint.Params.Avatar(
+            avatarInfo = AvatarInfo(
                 filename = filename,
-                fileSize = null,
-                caption = null,
-                mimeType = mimeType,
-                formattedFileSize = "",
-                fileExtension = "",
-                senderId = UserId("@dummy:server.org"),
-                senderName = null,
-                senderAvatar = null,
-                dateSent = null,
-                dateSentFull = null,
-                waveform = null,
-                duration = null,
             ),
             mediaSource = MediaSource(url = avatarUrl),
             thumbnailSource = null,
-            canShowInfo = false,
+            // Maybe add avatar blurhash if available?
+            blurHash = null,
         )
     }
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt
index 67b73d616d..40a9a0351d 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactory.kt
@@ -13,6 +13,7 @@ import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatter
 import io.element.android.libraries.dateformatter.api.DateFormatterMode
 import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
+import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
@@ -20,6 +21,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
@@ -41,6 +44,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
 import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
@@ -51,10 +56,11 @@ class EventItemFactory(
     private val fileSizeFormatter: FileSizeFormatter,
     private val fileExtensionExtractor: FileExtensionExtractor,
     private val dateFormatter: DateFormatter,
+    private val contentValidationCache: EventContentValidationCache,
 ) {
     fun create(
         currentTimelineItem: MatrixTimelineItem.Event,
-    ): MediaItem.Event? {
+    ): List<MediaItem.Event> {
         val event = currentTimelineItem.event
         val dateSent = dateFormatter.format(
             currentTimelineItem.event.timestamp,
@@ -64,8 +70,10 @@ class EventItemFactory(
             timestamp = currentTimelineItem.event.timestamp,
             mode = DateFormatterMode.Full,
         )
+        val validationState = currentTimelineItem.eventId?.let { contentValidationCache[it] }
+            ?: NoopContentValidationState()
         return when (val content = event.content) {
-            CallNotifyContent,
+            is CallNotifyContent,
             is FailedToParseMessageLikeContent,
             is FailedToParseStateContent,
             LegacyCallInviteContent,
@@ -79,7 +87,7 @@ class EventItemFactory(
             is LiveLocationContent,
             UnknownContent -> {
                 Timber.w("Should not happen: ${content.javaClass.simpleName}")
-                null
+                emptyList()
             }
             is MessageContent -> {
                 when (val type = content.type) {
@@ -89,15 +97,106 @@ class EventItemFactory(
                     is LocationMessageType,
                     is TextMessageType -> {
                         Timber.w("Should not happen: ${content.type}")
-                        null
+                        emptyList()
                     }
-                    is AudioMessageType -> MediaItem.Audio(
+                    is GalleryMessageType -> {
+                        val baseId = currentTimelineItem.uniqueId.value
+                        type.items.mapIndexedNotNull { index, galleryItem ->
+                            val id = UniqueId("${baseId}_$index")
+                            when (galleryItem) {
+                                is GalleryItemType.Image -> {
+                                    val c = galleryItem.content
+                                    MediaItem.Image(
+                                        id = id,
+                                        eventId = currentTimelineItem.eventId,
+                                        mediaInfo = createMediaInfo(
+                                            filename = c.filename,
+                                            fileSize = c.info?.size,
+                                            caption = c.caption,
+                                            mimeType = c.info?.mimetype.orEmpty(),
+                                            fileExtension = c.filename,
+                                            event = event,
+                                            dateSent = dateSent,
+                                            dateSentFull = dateSentFull,
+                                        ),
+                                        mediaSource = c.source,
+                                        thumbnailSource = c.info?.thumbnailSource,
+                                        blurHash = c.info?.blurhash,
+                                        validationState = validationState,
+                                    )
+                                }
+                                is GalleryItemType.Video -> {
+                                    val c = galleryItem.content
+                                    MediaItem.Video(
+                                        id = id,
+                                        eventId = currentTimelineItem.eventId,
+                                        mediaInfo = createMediaInfo(
+                                            filename = c.filename,
+                                            fileSize = c.info?.size,
+                                            caption = c.caption,
+                                            mimeType = c.info?.mimetype.orEmpty(),
+                                            fileExtension = c.filename,
+                                            event = event,
+                                            dateSent = dateSent,
+                                            dateSentFull = dateSentFull,
+                                            duration = c.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),
+                                        ),
+                                        mediaSource = c.source,
+                                        thumbnailSource = c.info?.thumbnailSource,
+                                        blurHash = c.info?.blurhash,
+                                        validationState = validationState,
+                                    )
+                                }
+                                is GalleryItemType.Audio -> {
+                                    val c = galleryItem.content
+                                    MediaItem.Audio(
+                                        id = id,
+                                        eventId = currentTimelineItem.eventId,
+                                        mediaInfo = createMediaInfo(
+                                            filename = c.filename,
+                                            fileSize = c.info?.size,
+                                            caption = c.caption,
+                                            mimeType = c.info?.mimetype.orEmpty(),
+                                            fileExtension = c.filename,
+                                            event = event,
+                                            dateSent = dateSent,
+                                            dateSentFull = dateSentFull,
+                                        ),
+                                        mediaSource = c.source,
+                                        validationState = validationState,
+                                    )
+                                }
+                                is GalleryItemType.File -> {
+                                    val c = galleryItem.content
+                                    MediaItem.File(
+                                        id = id,
+                                        eventId = currentTimelineItem.eventId,
+                                        mediaInfo = createMediaInfo(
+                                            filename = c.filename,
+                                            fileSize = c.info?.size,
+                                            caption = c.caption,
+                                            mimeType = c.info?.mimetype.orEmpty(),
+                                            fileExtension = c.filename,
+                                            event = event,
+                                            dateSent = dateSent,
+                                            dateSentFull = dateSentFull,
+                                        ),
+                                        mediaSource = c.source,
+                                        validationState = validationState,
+                                    )
+                                }
+                                is GalleryItemType.Other -> null
+                            }
+                        }
+                    }
+                    is AudioMessageType -> listOf(MediaItem.Audio(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -110,14 +209,16 @@ class EventItemFactory(
                             duration = null,
                         ),
                         mediaSource = type.source,
-                    )
-                    is FileMessageType -> MediaItem.File(
+                        validationState = validationState,
+                    ))
+                    is FileMessageType -> listOf(MediaItem.File(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -130,15 +231,17 @@ class EventItemFactory(
                             duration = null,
                         ),
                         mediaSource = type.source,
+                        validationState = validationState,
                         // TODO We may want to add a thumbnailSource and set it to type.info?.thumbnailSource
-                    )
-                    is ImageMessageType -> MediaItem.Image(
+                    ))
+                    is ImageMessageType -> listOf(MediaItem.Image(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -152,14 +255,17 @@ class EventItemFactory(
                         ),
                         mediaSource = type.source,
                         thumbnailSource = type.info?.thumbnailSource,
-                    )
-                    is StickerMessageType -> MediaItem.Image(
+                        blurHash = type.info?.blurhash,
+                        validationState = validationState,
+                    ))
+                    is StickerMessageType -> listOf(MediaItem.Image(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -173,14 +279,17 @@ class EventItemFactory(
                         ),
                         mediaSource = type.source,
                         thumbnailSource = type.info?.thumbnailSource,
-                    )
-                    is VideoMessageType -> MediaItem.Video(
+                        blurHash = type.info?.blurhash,
+                        validationState = validationState,
+                    ))
+                    is VideoMessageType -> listOf(MediaItem.Video(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -194,14 +303,17 @@ class EventItemFactory(
                         ),
                         mediaSource = type.source,
                         thumbnailSource = type.info?.thumbnailSource,
-                    )
-                    is VoiceMessageType -> MediaItem.Voice(
+                        blurHash = type.info?.blurhash,
+                        validationState = validationState,
+                    ))
+                    is VoiceMessageType -> listOf(MediaItem.Voice(
                         id = currentTimelineItem.uniqueId,
                         eventId = currentTimelineItem.eventId,
                         mediaInfo = MediaInfo(
                             filename = type.filename,
                             fileSize = type.info?.size,
                             caption = type.caption,
+                            formattedCaption = type.formattedCaption?.body,
                             mimeType = type.info?.mimetype.orEmpty(),
                             formattedFileSize = type.info?.size?.let { fileSizeFormatter.format(it) }.orEmpty(),
                             fileExtension = fileExtensionExtractor.extractFromName(type.filename),
@@ -214,9 +326,37 @@ class EventItemFactory(
                             duration = type.info?.duration?.inWholeMilliseconds?.toHumanReadableDuration(),
                         ),
                         mediaSource = type.source,
-                    )
+                        validationState = validationState,
+                    ))
                 }
             }
         }
     }
+
+    private fun createMediaInfo(
+        filename: String,
+        fileSize: Long?,
+        caption: String?,
+        mimeType: String,
+        fileExtension: String,
+        event: io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem,
+        dateSent: String,
+        dateSentFull: String,
+        waveform: List<Float>? = null,
+        duration: String? = null,
+    ) = MediaInfo(
+        filename = filename,
+        fileSize = fileSize,
+        caption = caption,
+        mimeType = mimeType,
+        formattedFileSize = fileSize?.let { fileSizeFormatter.format(it) }.orEmpty(),
+        fileExtension = fileExtensionExtractor.extractFromName(fileExtension),
+        senderId = event.sender,
+        senderName = event.senderProfile.getDisambiguatedDisplayName(event.sender),
+        senderAvatar = event.senderProfile.getAvatarUrl(),
+        dateSent = dateSent,
+        dateSentFull = dateSentFull,
+        waveform = waveform,
+        duration = duration,
+    )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
index 722e14a790..7bdd4872a3 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -27,10 +28,12 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 
 interface MediaGalleryDataSource {
-    fun start()
+    val isReady: Boolean
+    fun start(coroutineScope: CoroutineScope)
     fun groupedMediaItemsFlow(): Flow<AsyncData<GroupedMediaItems>>
     fun getLastData(): AsyncData<GroupedMediaItems>
     suspend fun loadMore(direction: Timeline.PaginationDirection)
@@ -47,7 +50,7 @@ class TimelineMediaGalleryDataSource(
 ) : MediaGalleryDataSource {
     private var timeline: Timeline? = null
 
-    private val groupedMediaItemsFlow = MutableSharedFlow<AsyncData<GroupedMediaItems>>(replay = 1)
+    private val groupedMediaItemsFlow = MutableSharedFlow<AsyncData<GroupedMediaItems>>(replay = 1, extraBufferCapacity = 10)
 
     override fun groupedMediaItemsFlow(): Flow<AsyncData<GroupedMediaItems>> = groupedMediaItemsFlow
 
@@ -57,9 +60,12 @@ class TimelineMediaGalleryDataSource(
 
     private val isStarted = AtomicBoolean(false)
 
+    override val isReady: Boolean get() = isStarted.get() && timeline != null
+
     @OptIn(ExperimentalCoroutinesApi::class)
-    override fun start() {
+    override fun start(coroutineScope: CoroutineScope) {
         if (!isStarted.compareAndSet(false, true)) {
+            Timber.w("MediaGalleryDataSource for room ${room.roomId} is already started, ignoring subsequent start call")
             return
         }
         flow {
@@ -71,10 +77,12 @@ class TimelineMediaGalleryDataSource(
             }
             mediaTimeline.getTimeline().fold(
                 {
+                    Timber.d("Timeline media data source flow started for room ${room.roomId}")
                     timeline = it
                     emit(it)
                 },
                 {
+                    Timber.e(it, "Failed to get media timeline for room ${room.roomId}")
                     groupedMediaItemsFlow.emit(AsyncData.Failure(it))
                 },
             )
@@ -96,19 +104,22 @@ class TimelineMediaGalleryDataSource(
             groupedMediaItemsFlow.emit(AsyncData.Success(groupedMediaItems))
         }
             .onCompletion {
-                timeline?.close()
+                timeline?.let {
+                    Timber.d("Timeline media gallery data source flow completed for room ${room.roomId}, closing timeline")
+                    it.close()
+                }
             }
-            .launchIn(room.roomCoroutineScope)
+            .launchIn(coroutineScope)
     }
 
     override suspend fun loadMore(direction: Timeline.PaginationDirection) {
-        timeline?.paginate(direction)
+        timeline?.paginate(direction) ?: Timber.w("Timeline is not ready yet, cannot load more media items for room ${room.roomId}")
     }
 
     override suspend fun deleteItem(eventId: EventId) {
         timeline?.redactEvent(
             eventOrTransactionId = eventId.toEventOrTransactionId(),
             reason = null,
-        )
+        ) ?: Timber.w("Timeline is not ready yet, cannot delete media item with eventId $eventId for room ${room.roomId}")
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
index d2f78a7249..1c96e0f44b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt
@@ -9,10 +9,8 @@
 package io.element.android.libraries.mediaviewer.impl.datasource
 
 import dev.zacsweers.metro.Inject
-import io.element.android.libraries.androidutils.diff.DefaultDiffCacheInvalidator
-import io.element.android.libraries.androidutils.diff.DiffCacheUpdater
-import io.element.android.libraries.androidutils.diff.MutableListDiffCache
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import kotlinx.collections.immutable.ImmutableList
@@ -32,18 +30,8 @@ class TimelineMediaItemsFactory(
 ) {
     private val _timelineItems = MutableSharedFlow<ImmutableList<MediaItem>>(replay = 1)
     private val lock = Mutex()
-    private val diffCache = MutableListDiffCache<MediaItem>()
-    private val diffCacheUpdater = DiffCacheUpdater<MatrixTimelineItem, MediaItem>(
-        diffCache = diffCache,
-        detectMoves = false,
-        cacheInvalidator = DefaultDiffCacheInvalidator()
-    ) { old, new ->
-        if (old is MatrixTimelineItem.Event && new is MatrixTimelineItem.Event) {
-            old.uniqueId == new.uniqueId
-        } else {
-            false
-        }
-    }
+    private val cache = mutableMapOf<UniqueId, List<MediaItem>>()
+    private var previousTimelineItems: List<MatrixTimelineItem> = emptyList()
 
     val timelineItems: Flow<ImmutableList<MediaItem>> = _timelineItems.distinctUntilChanged()
 
@@ -51,39 +39,41 @@ class TimelineMediaItemsFactory(
         timelineItems: List<MatrixTimelineItem>,
     ) = withContext(dispatchers.computation) {
         lock.withLock {
-            diffCacheUpdater.updateWith(timelineItems)
-            buildAndEmitTimelineItemStates(timelineItems)
-        }
-    }
-
-    private suspend fun buildAndEmitTimelineItemStates(
-        timelineItems: List<MatrixTimelineItem>,
-    ) {
-        val newTimelineItemStates = ArrayList<MediaItem>()
-        for (index in diffCache.indices().reversed()) {
-            val cacheItem = diffCache.get(index)
-            if (cacheItem == null) {
-                buildAndCacheItem(timelineItems, index)?.also { timelineItemState ->
-                    newTimelineItemStates.add(timelineItemState)
+            val newTimelineItemStates = ArrayList<MediaItem>()
+            for (index in timelineItems.indices.reversed()) {
+                when (val currentTimelineItem = timelineItems[index]) {
+                    is MatrixTimelineItem.Event -> {
+                        val cachedItems = cache[currentTimelineItem.uniqueId]
+                        val items = if (cachedItems != null && currentTimelineItem.isUnchanged(previousTimelineItems)) {
+                            cachedItems
+                        } else {
+                            eventItemFactory.create(currentTimelineItem).also { newItems ->
+                                cache[currentTimelineItem.uniqueId] = newItems
+                            }
+                        }
+                        newTimelineItemStates.addAll(items.asReversed())
+                    }
+                    is MatrixTimelineItem.Virtual -> {
+                        virtualItemFactory.create(currentTimelineItem)?.also {
+                            newTimelineItemStates.add(it)
+                        }
+                    }
+                    MatrixTimelineItem.Other -> Unit
                 }
-            } else {
-                newTimelineItemStates.add(cacheItem)
             }
+            previousTimelineItems = timelineItems
+            _timelineItems.emit(newTimelineItemStates.toImmutableList())
         }
-        _timelineItems.emit(newTimelineItemStates.toImmutableList())
-    }
-
-    private fun buildAndCacheItem(
-        timelineItems: List<MatrixTimelineItem>,
-        index: Int,
-    ): MediaItem? {
-        val timelineItem =
-            when (val currentTimelineItem = timelineItems[index]) {
-                is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem)
-                is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem)
-                MatrixTimelineItem.Other -> null
-            }
-        diffCache[index] = timelineItem
-        return timelineItem
     }
 }
+
+private fun MatrixTimelineItem.Event.isUnchanged(
+    previousItems: List<MatrixTimelineItem>,
+): Boolean {
+    val previousItem = previousItems
+        .find { (it as? MatrixTimelineItem.Event)?.uniqueId == uniqueId }
+        as? MatrixTimelineItem.Event
+    return previousItem != null &&
+        previousItem.event.eventId == event.eventId &&
+        previousItem.event.timestamp == event.timestamp
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetState.kt
index 7cd4dee318..245e3a14b8 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetState.kt
@@ -15,16 +15,17 @@ import io.element.android.libraries.mediaviewer.api.MediaInfo
 sealed interface MediaBottomSheetState {
     data object Hidden : MediaBottomSheetState
 
-    data class MediaDeleteConfirmationState(
-        val eventId: EventId,
-        val mediaInfo: MediaInfo,
-        val thumbnailSource: MediaSource?,
-    ) : MediaBottomSheetState
-
-    data class MediaDetailsBottomSheetState(
+    data class Details(
+        val fromGallery: Boolean,
         val eventId: EventId?,
         val canDelete: Boolean,
         val mediaInfo: MediaInfo,
         val thumbnailSource: MediaSource?,
     ) : MediaBottomSheetState
+
+    data class DeleteConfirmation(
+        val eventId: EventId,
+        val mediaInfo: MediaInfo,
+        val thumbnailSource: MediaSource?,
+    ) : MediaBottomSheetState
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDeleteConfirmationProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDeleteConfirmationProvider.kt
new file mode 100644
index 0000000000..72b16c4e1d
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDeleteConfirmationProvider.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.impl.details
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
+
+open class MediaBottomSheetStateDeleteConfirmationProvider : PreviewParameterProvider<MediaBottomSheetState.DeleteConfirmation> {
+    override val values: Sequence<MediaBottomSheetState.DeleteConfirmation>
+        get() = sequenceOf(
+            aMediaBottomSheetStateDeleteConfirmation(),
+            aMediaBottomSheetStateDeleteConfirmation(
+                thumbnailSource = MediaSource("url_thumbnail")
+            ),
+        )
+}
+
+fun aMediaBottomSheetStateDeleteConfirmation(
+    mediaInfo: MediaInfo = anImageMediaInfo(
+        senderName = USER_NAME_ALICE,
+    ),
+    thumbnailSource: MediaSource? = null,
+) = MediaBottomSheetState.DeleteConfirmation(
+    eventId = EventId("\$eventId"),
+    mediaInfo = mediaInfo,
+    thumbnailSource = thumbnailSource,
+)
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDetailsProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDetailsProvider.kt
new file mode 100644
index 0000000000..7540d49b8a
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaBottomSheetStateDetailsProvider.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.impl.details
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
+import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
+
+open class MediaBottomSheetStateDetailsProvider : PreviewParameterProvider<MediaBottomSheetState.Details> {
+    override val values: Sequence<MediaBottomSheetState.Details>
+        get() = sequenceOf(
+            aMediaBottomSheetStateDetails(),
+            aMediaBottomSheetStateDetails(
+                canDelete = false,
+            ),
+            aMediaBottomSheetStateDetails(
+                mediaInfo = anApkMediaInfo(
+                    dateSentFull = "December 6, 2024 at 12:59",
+                ),
+            ),
+            aMediaBottomSheetStateDetails(
+                eventId = null,
+            ),
+            aMediaBottomSheetStateDetails(
+                fromGallery = true,
+            ),
+        )
+}
+
+fun aMediaBottomSheetStateDetails(
+    fromGallery: Boolean = false,
+    eventId: EventId? = EventId($$"$eventId"),
+    canDelete: Boolean = true,
+    mediaInfo: MediaInfo = anImageMediaInfo(
+        senderName = USER_NAME_ALICE,
+        dateSentFull = "December 6, 2024 at 12:59",
+    ),
+) = MediaBottomSheetState.Details(
+    fromGallery = fromGallery,
+    eventId = eventId,
+    canDelete = canDelete,
+    mediaInfo = mediaInfo,
+    thumbnailSource = null,
+)
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheet.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheet.kt
index 3850f3a0f8..38bbb4dcf0 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheet.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheet.kt
@@ -17,8 +17,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -27,6 +31,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import io.element.android.compound.theme.ElementTheme
@@ -42,11 +47,12 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
 import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.strings.Strings
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MediaDeleteConfirmationBottomSheet(
-    state: MediaBottomSheetState.MediaDeleteConfirmationState,
+    state: MediaBottomSheetState.DeleteConfirmation,
     onDelete: (EventId) -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
@@ -54,10 +60,16 @@ fun MediaDeleteConfirmationBottomSheet(
     ModalBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismiss,
+        sheetState = rememberBottomSheetState(
+            initialValue = SheetValue.Hidden,
+            enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+        ),
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
+                .verticalScroll(rememberScrollState())
                 .padding(horizontal = 16.dp),
         ) {
             IconTitleSubtitleMolecule(
@@ -100,7 +112,7 @@ fun MediaDeleteConfirmationBottomSheet(
 
 @Composable
 private fun MediaRow(
-    state: MediaBottomSheetState.MediaDeleteConfirmationState,
+    state: MediaBottomSheetState.DeleteConfirmation,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -143,7 +155,7 @@ private fun MediaRow(
             )
             // Info
             Text(
-                text = state.mediaInfo.mimeType + " - " + state.mediaInfo.formattedFileSize,
+                text = state.mediaInfo.mimeType + Strings.NICE_SEPARATOR + state.mediaInfo.formattedFileSize,
                 color = ElementTheme.colors.textSecondary,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
@@ -155,9 +167,11 @@ private fun MediaRow(
 
 @PreviewsDayNight
 @Composable
-internal fun MediaDeleteConfirmationBottomSheetPreview() = ElementPreview {
+internal fun MediaDeleteConfirmationBottomSheetPreview(
+    @PreviewParameter(provider = MediaBottomSheetStateDeleteConfirmationProvider::class) state: MediaBottomSheetState.DeleteConfirmation,
+) = ElementPreview(fillMaxSize = true) {
     MediaDeleteConfirmationBottomSheet(
-        state = aMediaDeleteConfirmationState(),
+        state = state,
         onDelete = {},
         onDismiss = {},
     )
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt
index a6c30796af..35d056dc39 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheet.kt
@@ -15,6 +15,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -22,10 +24,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.designsystem.colors.AvatarColorsProvider
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
@@ -43,15 +49,20 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.strings.Strings
 
+/**
+ * Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=2229-149220
+ */
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MediaDetailsBottomSheet(
-    state: MediaBottomSheetState.MediaDetailsBottomSheetState,
+    state: MediaBottomSheetState.Details,
     onViewInTimeline: (EventId) -> Unit,
     onShare: (EventId) -> Unit,
     onForward: (EventId) -> Unit,
     onDownload: (EventId) -> Unit,
+    onOpenWith: (EventId) -> Unit,
     onDelete: (EventId) -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
@@ -59,13 +70,14 @@ fun MediaDetailsBottomSheet(
     ModalBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismiss,
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
-                .fillMaxWidth(),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(24.dp),
+                .fillMaxWidth()
+                .verticalScroll(rememberScrollState()),
         ) {
+            Title()
             Section(
                 title = stringResource(R.string.screen_media_details_uploaded_by),
             ) {
@@ -83,57 +95,72 @@ fun MediaDetailsBottomSheet(
             )
             SectionText(
                 title = stringResource(R.string.screen_media_details_file_format),
-                text = state.mediaInfo.mimeType + " - " + state.mediaInfo.formattedFileSize,
+                text = state.mediaInfo.mimeType + Strings.NICE_SEPARATOR + state.mediaInfo.formattedFileSize,
             )
+            Spacer(modifier = Modifier.height(16.dp))
             if (state.eventId != null) {
-                Column {
-                    HorizontalDivider()
-                    ListItem(
-                        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.VisibilityOn())),
-                        headlineContent = { Text(stringResource(CommonStrings.action_view_in_timeline)) },
-                        style = ListItemStyle.Primary,
-                        onClick = {
-                            onViewInTimeline(state.eventId)
-                        }
-                    )
+                HorizontalDivider()
+                val mimeType = state.mediaInfo.mimeType
+                val icon = when (mimeType) {
+                    MimeTypes.Apk ->
+                        ListItemContent.Icon(IconSource.Resource(R.drawable.ic_apk_install))
+                    else ->
+                        ListItemContent.Icon(IconSource.Vector(CompoundIcons.PopOut()))
+                }
+                val wording = when (mimeType) {
+                    MimeTypes.Apk -> stringResource(id = CommonStrings.common_install_apk_android)
+                    else -> stringResource(id = CommonStrings.action_open_with)
+                }
+                ListItem(
+                    leadingContent = icon,
+                    content = { Text(wording) },
+                    onClick = {
+                        onOpenWith(state.eventId)
+                    }
+                )
+                ListItem(
+                    leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.VisibilityOn())),
+                    content = { Text(stringResource(CommonStrings.action_view_in_timeline)) },
+                    onClick = {
+                        onViewInTimeline(state.eventId)
+                    }
+                )
+                if (state.fromGallery) {
                     ListItem(
                         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ShareAndroid())),
-                        headlineContent = { Text(stringResource(CommonStrings.action_share)) },
-                        style = ListItemStyle.Primary,
+                        content = { Text(stringResource(CommonStrings.action_share)) },
                         onClick = {
                             onShare(state.eventId)
                         }
                     )
-                    ListItem(
-                        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Forward())),
-                        headlineContent = { Text(stringResource(CommonStrings.action_forward)) },
-                        style = ListItemStyle.Primary,
-                        onClick = {
-                            onForward(state.eventId)
-                        }
-                    )
                     ListItem(
                         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Download())),
-                        headlineContent = { Text(stringResource(CommonStrings.action_save)) },
-                        style = ListItemStyle.Primary,
+                        content = { Text(stringResource(CommonStrings.action_download)) },
                         onClick = {
                             onDownload(state.eventId)
                         }
                     )
-                    if (state.canDelete) {
-                        HorizontalDivider()
-                        ListItem(
-                            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
-                            headlineContent = { Text(stringResource(CommonStrings.action_remove)) },
-                            style = ListItemStyle.Destructive,
-                            onClick = {
-                                onDelete(state.eventId)
-                            }
-                        )
+                }
+                ListItem(
+                    leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Forward())),
+                    content = { Text(stringResource(CommonStrings.action_forward)) },
+                    onClick = {
+                        onForward(state.eventId)
                     }
-                    Spacer(modifier = Modifier.height(16.dp))
+                )
+                if (state.canDelete) {
+                    HorizontalDivider()
+                    ListItem(
+                        leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
+                        content = { Text(stringResource(CommonStrings.action_delete_file)) },
+                        style = ListItemStyle.Destructive,
+                        onClick = {
+                            onDelete(state.eventId)
+                        }
+                    )
                 }
             }
+            Spacer(modifier = Modifier.height(16.dp))
         }
     }
 }
@@ -164,27 +191,44 @@ private fun SenderRow(
                 .weight(1f),
         ) {
             // Name
+            val bestName = mediaInfo.senderName ?: mediaInfo.senderId?.value.orEmpty()
             val avatarColors = AvatarColorsProvider.provide(id)
             Text(
                 modifier = Modifier.clipToBounds(),
-                text = mediaInfo.senderName.orEmpty(),
+                text = bestName,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 color = avatarColors.foreground,
                 style = ElementTheme.typography.fontBodyMdMedium,
             )
             // Id
-            Text(
-                text = mediaInfo.senderId?.value.orEmpty(),
-                color = ElementTheme.colors.textSecondary,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                style = ElementTheme.typography.fontBodyMdRegular,
-            )
+            if (!mediaInfo.senderName.isNullOrEmpty()) {
+                Text(
+                    text = mediaInfo.senderId?.value.orEmpty(),
+                    color = ElementTheme.colors.textSecondary,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                )
+            }
         }
     }
 }
 
+@Composable
+private fun Title() {
+    Text(
+        modifier = Modifier
+            .padding(top = 16.dp, bottom = 8.dp, start = 16.dp, end = 16.dp)
+            .semantics {
+                heading()
+            },
+        text = stringResource(R.string.screen_media_details_title),
+        style = ElementTheme.typography.fontBodyLgMedium,
+        color = ElementTheme.colors.textPrimary,
+    )
+}
+
 @Composable
 private fun Section(
     title: String,
@@ -193,12 +237,12 @@ private fun Section(
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(horizontal = 16.dp),
+            .padding(vertical = 8.dp, horizontal = 16.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Text(
-            text = title.uppercase(),
-            style = ElementTheme.typography.fontBodySmRegular,
+            text = title,
+            style = ElementTheme.typography.fontBodyMdMedium,
             color = ElementTheme.colors.textSecondary,
         )
         content()
@@ -221,13 +265,16 @@ private fun SectionText(
 
 @PreviewsDayNight
 @Composable
-internal fun MediaDetailsBottomSheetPreview() = ElementPreview {
+internal fun MediaDetailsBottomSheetPreview(
+    @PreviewParameter(MediaBottomSheetStateDetailsProvider::class) state: MediaBottomSheetState.Details,
+) = ElementPreview(fillMaxSize = true) {
     MediaDetailsBottomSheet(
-        state = aMediaDetailsBottomSheetState(),
+        state = state,
         onViewInTimeline = {},
         onShare = {},
         onForward = {},
         onDownload = {},
+        onOpenWith = {},
         onDelete = {},
         onDismiss = {},
     )
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt
deleted file mode 100644
index a152a32091..0000000000
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/details/Preview.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.mediaviewer.impl.details
-
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
-
-fun aMediaDetailsBottomSheetState(
-    dateSentFull: String = "December 6, 2024 at 12:59",
-    canDelete: Boolean = true,
-): MediaBottomSheetState.MediaDetailsBottomSheetState {
-    return MediaBottomSheetState.MediaDetailsBottomSheetState(
-        eventId = EventId("\$eventId"),
-        canDelete = canDelete,
-        mediaInfo = anImageMediaInfo(
-            senderName = "Alice",
-            dateSentFull = dateSentFull,
-        ),
-        thumbnailSource = null,
-    )
-}
-
-fun aMediaDeleteConfirmationState(): MediaBottomSheetState.MediaDeleteConfirmationState {
-    return MediaBottomSheetState.MediaDeleteConfirmationState(
-        eventId = EventId("\$eventId"),
-        mediaInfo = anImageMediaInfo(
-            senderName = "Alice",
-        ),
-        thumbnailSource = null,
-    )
-}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvent.kt
similarity index 75%
rename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt
rename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvent.kt
index 2bf4f6b37d..219d5dbfb4 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvents.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryEvent.kt
@@ -14,21 +14,22 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 
-sealed interface MediaGalleryEvents {
-    data class ChangeMode(val mode: MediaGalleryMode) : MediaGalleryEvents
-    data class LoadMore(val direction: Timeline.PaginationDirection) : MediaGalleryEvents
-    data class Share(val eventId: EventId) : MediaGalleryEvents
-    data class Forward(val eventId: EventId) : MediaGalleryEvents
-    data class SaveOnDisk(val eventId: EventId) : MediaGalleryEvents
-    data class OpenInfo(val mediaItem: MediaItem.Event) : MediaGalleryEvents
-    data class ViewInTimeline(val eventId: EventId) : MediaGalleryEvents
+sealed interface MediaGalleryEvent {
+    data class ChangeMode(val mode: MediaGalleryMode) : MediaGalleryEvent
+    data class LoadMore(val direction: Timeline.PaginationDirection) : MediaGalleryEvent
+    data class Share(val eventId: EventId) : MediaGalleryEvent
+    data class Forward(val eventId: EventId) : MediaGalleryEvent
+    data class SaveOnDisk(val eventId: EventId) : MediaGalleryEvent
+    data class OpenWith(val eventId: EventId) : MediaGalleryEvent
+    data class OpenInfo(val mediaItem: MediaItem.Event) : MediaGalleryEvent
+    data class ViewInTimeline(val eventId: EventId) : MediaGalleryEvent
 
     data class ConfirmDelete(
         val eventId: EventId,
         val mediaInfo: MediaInfo,
         val thumbnailSource: MediaSource?,
-    ) : MediaGalleryEvents
+    ) : MediaGalleryEvent
 
-    data object CloseBottomSheet : MediaGalleryEvents
-    data class Delete(val eventId: EventId) : MediaGalleryEvents
+    data object CloseBottomSheet : MediaGalleryEvent
+    data class Delete(val eventId: EventId) : MediaGalleryEvent
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
index cc26e69c33..e909c5367c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
@@ -20,6 +20,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.libraries.androidutils.R
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -43,7 +44,11 @@ import io.element.android.libraries.mediaviewer.impl.model.eventId
 import io.element.android.libraries.mediaviewer.impl.model.mediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.mediaPermissions
 import io.element.android.libraries.mediaviewer.impl.model.mediaSource
+import io.element.android.libraries.mediaviewer.impl.model.thumbnailSource
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
 @AssistedInject
@@ -55,6 +60,7 @@ class MediaGalleryPresenter(
     private val mediaLoader: MatrixMediaLoader,
     private val localMediaActions: LocalMediaActions,
     private val snackbarDispatcher: SnackbarDispatcher,
+    private val contentScannerService: ContentScannerService,
 ) : Presenter<MediaGalleryState> {
     @AssistedFactory
     interface Factory {
@@ -74,11 +80,21 @@ class MediaGalleryPresenter(
 
         val groupedMediaItems by remember {
             mediaGalleryDataSource.groupedMediaItemsFlow()
+                .onEach { groupedItems ->
+                    if (groupedItems is AsyncData.Success) {
+                        val items = groupedItems.data.getItems(mode)
+                        items.forEach { item ->
+                            if (item is MediaItem.Event && item.eventId() != null) {
+                                coroutineScope.validateMedia(item)
+                            }
+                        }
+                    }
+                }
         }
             .collectAsState(AsyncData.Uninitialized)
 
         LaunchedEffect(Unit) {
-            mediaGalleryDataSource.start()
+            mediaGalleryDataSource.start(this)
         }
 
         val permissions by room.permissionsAsState(MediaPermissions.DEFAULT) { perms ->
@@ -88,39 +104,48 @@ class MediaGalleryPresenter(
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
         localMediaActions.Configure()
 
-        fun handleEvent(event: MediaGalleryEvents) {
+        fun handleEvent(event: MediaGalleryEvent) {
             when (event) {
-                is MediaGalleryEvents.ChangeMode -> {
+                is MediaGalleryEvent.ChangeMode -> {
                     mode = event.mode
                 }
-                is MediaGalleryEvents.LoadMore -> coroutineScope.launch {
-                    mediaGalleryDataSource.loadMore(event.direction)
+                is MediaGalleryEvent.LoadMore -> coroutineScope.launch {
+                    if (mediaGalleryDataSource.isReady) {
+                        mediaGalleryDataSource.loadMore(event.direction)
+                    }
                 }
-                is MediaGalleryEvents.Delete -> coroutineScope.launch {
+                is MediaGalleryEvent.Delete -> coroutineScope.launch {
                     mediaGalleryDataSource.deleteItem(event.eventId)
                 }
-                is MediaGalleryEvents.SaveOnDisk -> coroutineScope.launch {
+                is MediaGalleryEvent.SaveOnDisk -> coroutineScope.launch {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     groupedMediaItems.dataOrNull().find(event.eventId)?.let {
                         saveOnDisk(it)
                     }
                 }
-                is MediaGalleryEvents.Share -> coroutineScope.launch {
+                is MediaGalleryEvent.OpenWith -> coroutineScope.launch {
+                    mediaBottomSheetState = MediaBottomSheetState.Hidden
+                    groupedMediaItems.dataOrNull().find(event.eventId)?.let {
+                        openWith(it)
+                    }
+                }
+                is MediaGalleryEvent.Share -> coroutineScope.launch {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     groupedMediaItems.dataOrNull().find(event.eventId)?.let {
                         share(it)
                     }
                 }
-                is MediaGalleryEvents.Forward -> {
+                is MediaGalleryEvent.Forward -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onForwardClick(event.eventId)
                 }
-                is MediaGalleryEvents.ViewInTimeline -> {
+                is MediaGalleryEvent.ViewInTimeline -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onViewInTimelineClick(event.eventId)
                 }
-                is MediaGalleryEvents.OpenInfo -> coroutineScope.launch {
-                    mediaBottomSheetState = MediaBottomSheetState.MediaDetailsBottomSheetState(
+                is MediaGalleryEvent.OpenInfo -> coroutineScope.launch {
+                    mediaBottomSheetState = MediaBottomSheetState.Details(
+                        fromGallery = true,
                         eventId = event.mediaItem.eventId(),
                         canDelete = when (event.mediaItem.mediaInfo().senderId) {
                             null -> false
@@ -137,14 +162,14 @@ class MediaGalleryPresenter(
                         },
                     )
                 }
-                is MediaGalleryEvents.ConfirmDelete -> {
-                    mediaBottomSheetState = MediaBottomSheetState.MediaDeleteConfirmationState(
+                is MediaGalleryEvent.ConfirmDelete -> {
+                    mediaBottomSheetState = MediaBottomSheetState.DeleteConfirmation(
                         eventId = event.eventId,
                         mediaInfo = event.mediaInfo,
                         thumbnailSource = event.thumbnailSource,
                     )
                 }
-                MediaGalleryEvents.CloseBottomSheet -> {
+                MediaGalleryEvent.CloseBottomSheet -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                 }
             }
@@ -200,6 +225,32 @@ class MediaGalleryPresenter(
             }
     }
 
+    private suspend fun openWith(mediaItem: MediaItem.Event) {
+        downloadMedia(mediaItem)
+            .mapCatchingExceptions { localMedia ->
+                localMediaActions.open(localMedia)
+            }
+            .onFailure {
+                val snackbarMessage = SnackbarMessage(mediaActionsError(it))
+                snackbarDispatcher.post(snackbarMessage)
+            }
+    }
+
+    private fun CoroutineScope.validateMedia(mediaItem: MediaItem.Event) {
+        launch {
+            val thumbnailSource = mediaItem.thumbnailSource()
+            val mediaSource = mediaItem.mediaSource()
+            val contentValidationState = mediaItem.validationState
+            val currentState = contentValidationState.overallStateFlow.first()
+
+            if (currentState.isLoading() || currentState.isValid()) {
+                return@launch
+            }
+
+            contentScannerService.scan(listOfNotNull(thumbnailSource, mediaSource).distinct(), contentValidationState)
+        }
+    }
+
     private fun mediaActionsError(throwable: Throwable): Int {
         return if (throwable is ActivityNotFoundException) {
             R.string.error_no_compatible_app_found
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt
index 897e5d1e97..5dcb487632 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryState.kt
@@ -20,7 +20,7 @@ data class MediaGalleryState(
     val groupedMediaItems: AsyncData<GroupedMediaItems>,
     val mediaBottomSheetState: MediaBottomSheetState,
     val snackbarMessage: SnackbarMessage?,
-    val eventSink: (MediaGalleryEvents) -> Unit,
+    val eventSink: (MediaGalleryEvent) -> Unit,
 )
 
 enum class MediaGalleryMode(val stringResource: Int) {
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt
index a19f810e45..43a361ac29 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryStateProvider.kt
@@ -11,9 +11,12 @@ package io.element.android.libraries.mediaviewer.impl.gallery
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.media.WaveFormSamples
+import io.element.android.libraries.designsystem.preview.ROOM_NAME
 import io.element.android.libraries.matrix.api.core.UniqueId
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
-import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState
+import io.element.android.libraries.mediaviewer.impl.details.aMediaBottomSheetStateDetails
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import io.element.android.libraries.mediaviewer.impl.model.aMediaItemAudio
@@ -46,9 +49,20 @@ open class MediaGalleryStateProvider : PreviewParameterProvider<MediaGalleryStat
                             aMediaItemImage(id = UniqueId("3")),
                             aMediaItemVideo(id = UniqueId("4")),
                             aMediaItemImage(id = UniqueId("5")),
-                            aMediaItemImage(id = UniqueId("6")),
-                            aMediaItemImage(id = UniqueId("7")),
-                            aMediaItemImage(id = UniqueId("8")),
+                            aMediaItemImage(
+                                id = UniqueId("6"),
+                                validationState = NoopContentValidationState(ContentValidationValue.Loading),
+                                blurHash = "LKO2?U%2Tw=w]~RBVZRi};RPxuwH"
+                            ),
+                            aMediaItemImage(id = UniqueId("7"), validationState = NoopContentValidationState(ContentValidationValue.Invalid)),
+                            aMediaItemImage(
+                                id = UniqueId("8"),
+                                validationState = NoopContentValidationState(
+                                    ContentValidationValue.UnrecoverableError(
+                                        IllegalStateException("Failed to validate media item")
+                                    )
+                                )
+                            ),
                             aMediaItemImage(id = UniqueId("9")),
                             aMediaItemLoadingIndicator(),
                         ).toImmutableList()
@@ -64,7 +78,7 @@ open class MediaGalleryStateProvider : PreviewParameterProvider<MediaGalleryStat
                     aGroupedMediaItems(
                         fileItems = listOf(
                             aMediaItemDateSeparator(id = UniqueId("0")),
-                            aMediaItemFile(id = UniqueId("1")),
+                            aMediaItemFile(id = UniqueId("1"), validationState = NoopContentValidationState(ContentValidationValue.Loading)),
                             aMediaItemDateSeparator(
                                 id = UniqueId("2"),
                                 formattedDate = "September 2004",
@@ -74,12 +88,21 @@ open class MediaGalleryStateProvider : PreviewParameterProvider<MediaGalleryStat
                                 id = UniqueId("5"),
                                 waveform = WaveFormSamples.realisticWaveForm,
                             ),
+                            aMediaItemAudio(id = UniqueId("6"), validationState = NoopContentValidationState(ContentValidationValue.Invalid)),
+                            aMediaItemAudio(
+                                id = UniqueId("7"),
+                                validationState = NoopContentValidationState(
+                                    ContentValidationValue.UnrecoverableError(
+                                        IllegalStateException("Failed to validate media item")
+                                    )
+                                )
+                            ),
                             aMediaItemLoadingIndicator(),
                         ).toImmutableList()
                     )
                 ),
             ),
-            aMediaGalleryState(mediaBottomSheetState = aMediaDetailsBottomSheetState()),
+            aMediaGalleryState(mediaBottomSheetState = aMediaBottomSheetStateDetails()),
             aMediaGalleryState(
                 groupedMediaItems = AsyncData.Failure(Exception("Failed to load media")),
             ),
@@ -112,7 +135,7 @@ open class MediaGalleryStateProvider : PreviewParameterProvider<MediaGalleryStat
 }
 
 private fun aMediaGalleryState(
-    roomName: String = "Room name",
+    roomName: String = ROOM_NAME,
     mode: MediaGalleryMode = MediaGalleryMode.Images,
     groupedMediaItems: AsyncData<GroupedMediaItems> = AsyncData.Uninitialized,
     mediaBottomSheetState: MediaBottomSheetState = MediaBottomSheetState.Hidden,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt
index 6f7a201fdc..441b6082dd 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryView.kt
@@ -9,14 +9,23 @@
 package io.element.android.libraries.mediaviewer.impl.gallery
 
 import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
@@ -31,6 +40,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -49,19 +60,26 @@ import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubti
 import io.element.android.libraries.designsystem.background.OnboardingBackground
 import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.async.AsyncFailure
+import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.SegmentedButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
 import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
 import io.element.android.libraries.mediaviewer.impl.details.MediaDeleteConfirmationBottomSheet
@@ -114,6 +132,7 @@ fun MediaGalleryView(
                 },
             )
         },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { paddingValues ->
         Column(
             modifier = Modifier
@@ -125,14 +144,15 @@ fun MediaGalleryView(
             SingleChoiceSegmentedButtonRow(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
+                    .padding(horizontal = 16.dp)
+                    .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()),
             ) {
                 MediaGalleryMode.entries.forEach { mode ->
                     SegmentedButton(
                         index = mode.ordinal,
                         count = MediaGalleryMode.entries.size,
                         selected = state.mode == mode,
-                        onClick = { state.eventSink(MediaGalleryEvents.ChangeMode(mode)) },
+                        onClick = { state.eventSink(MediaGalleryEvent.ChangeMode(mode)) },
                         text = stringResource(mode.stringResource),
                     )
                 }
@@ -158,24 +178,27 @@ fun MediaGalleryView(
     }
     when (val bottomSheetState = state.mediaBottomSheetState) {
         MediaBottomSheetState.Hidden -> Unit
-        is MediaBottomSheetState.MediaDetailsBottomSheetState -> {
+        is MediaBottomSheetState.Details -> {
             MediaDetailsBottomSheet(
                 state = bottomSheetState,
                 onViewInTimeline = { eventId ->
-                    state.eventSink(MediaGalleryEvents.ViewInTimeline(eventId))
+                    state.eventSink(MediaGalleryEvent.ViewInTimeline(eventId))
                 },
                 onShare = { eventId ->
-                    state.eventSink(MediaGalleryEvents.Share(eventId))
+                    state.eventSink(MediaGalleryEvent.Share(eventId))
                 },
                 onForward = { eventId ->
-                    state.eventSink(MediaGalleryEvents.Forward(eventId))
+                    state.eventSink(MediaGalleryEvent.Forward(eventId))
                 },
                 onDownload = { eventId ->
-                    state.eventSink(MediaGalleryEvents.SaveOnDisk(eventId))
+                    state.eventSink(MediaGalleryEvent.SaveOnDisk(eventId))
+                },
+                onOpenWith = { eventId ->
+                    state.eventSink(MediaGalleryEvent.OpenWith(eventId))
                 },
                 onDelete = { eventId ->
                     state.eventSink(
-                        MediaGalleryEvents.ConfirmDelete(
+                        MediaGalleryEvent.ConfirmDelete(
                             eventId = eventId,
                             mediaInfo = bottomSheetState.mediaInfo,
                             thumbnailSource = bottomSheetState.thumbnailSource,
@@ -183,18 +206,18 @@ fun MediaGalleryView(
                     )
                 },
                 onDismiss = {
-                    state.eventSink(MediaGalleryEvents.CloseBottomSheet)
+                    state.eventSink(MediaGalleryEvent.CloseBottomSheet)
                 },
             )
         }
-        is MediaBottomSheetState.MediaDeleteConfirmationState -> {
+        is MediaBottomSheetState.DeleteConfirmation -> {
             MediaDeleteConfirmationBottomSheet(
                 state = bottomSheetState,
                 onDelete = {
-                    state.eventSink(MediaGalleryEvents.Delete(it))
+                    state.eventSink(MediaGalleryEvent.Delete(it))
                 },
                 onDismiss = {
-                    state.eventSink(MediaGalleryEvents.CloseBottomSheet)
+                    state.eventSink(MediaGalleryEvent.CloseBottomSheet)
                 },
             )
         }
@@ -213,7 +236,7 @@ private fun MediaGalleryPage(
         val loadingItem = groupedMediaItems.dataOrNull()?.getItems(mode)?.singleOrNull() as? MediaItem.LoadingIndicator
         if (loadingItem != null) {
             LaunchedEffect(loadingItem.timestamp) {
-                state.eventSink(MediaGalleryEvents.LoadMore(loadingItem.direction))
+                state.eventSink(MediaGalleryEvent.LoadMore(loadingItem.direction))
             }
         }
         LoadingContent(mode)
@@ -258,7 +281,7 @@ private fun AsyncData<GroupedMediaItems>.isLoadingItems(mode: MediaGalleryMode):
 @Composable
 private fun MediaGalleryImages(
     imagesAndVideos: ImmutableList<MediaItem>,
-    eventSink: (MediaGalleryEvents) -> Unit,
+    eventSink: (MediaGalleryEvent) -> Unit,
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     if (imagesAndVideos.isEmpty()) {
@@ -279,7 +302,7 @@ private fun MediaGalleryImages(
 @Composable
 private fun MediaGalleryFiles(
     files: ImmutableList<MediaItem>,
-    eventSink: (MediaGalleryEvents) -> Unit,
+    eventSink: (MediaGalleryEvent) -> Unit,
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     if (files.isEmpty()) {
@@ -300,34 +323,45 @@ private fun MediaGalleryFiles(
 @Composable
 private fun MediaGalleryFilesList(
     files: ImmutableList<MediaItem>,
-    eventSink: (MediaGalleryEvents) -> Unit,
+    eventSink: (MediaGalleryEvent) -> Unit,
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     val presenterFactories = LocalMediaItemPresenterFactories.current
     LazyColumn(
         modifier = Modifier.fillMaxSize(),
+        contentPadding = lazyColumnContentPadding,
     ) {
         items(
             items = files,
             key = { it.id() },
             contentType = { it::class.java },
         ) { item ->
+            val contentValidationState = remember(item is MediaItem.Event) {
+                if (item is MediaItem.Event) {
+                    item.validationState
+                } else {
+                    NoopContentValidationState()
+                }
+            }
+            val contentValidationValue by contentValidationState.collectOverallState()
             when (item) {
                 is MediaItem.File -> FileItemView(
                     modifier = Modifier.animateItem(),
                     file = item,
                     onClick = { onItemClick(item) },
                     onLongClick = {
-                        eventSink(MediaGalleryEvents.OpenInfo(item))
+                        eventSink(MediaGalleryEvent.OpenInfo(item))
                     },
+                    contentValidationState = contentValidationValue,
                 )
                 is MediaItem.Audio -> AudioItemView(
                     modifier = Modifier.animateItem(),
                     audio = item,
                     onClick = { onItemClick(item) },
                     onLongClick = {
-                        eventSink(MediaGalleryEvents.OpenInfo(item))
+                        eventSink(MediaGalleryEvent.OpenInfo(item))
                     },
+                    contentValidationValue = contentValidationValue,
                 )
                 is MediaItem.Voice -> {
                     val presenter: Presenter<VoiceMessageState> = presenterFactories.rememberPresenter(item)
@@ -336,18 +370,19 @@ private fun MediaGalleryFilesList(
                         state = presenter.present(),
                         voice = item,
                         onLongClick = {
-                            eventSink(MediaGalleryEvents.OpenInfo(item))
+                            eventSink(MediaGalleryEvent.OpenInfo(item))
                         },
+                        contentValidationValue = contentValidationValue,
                     )
                 }
+                is MediaItem.Image,
+                is MediaItem.Video -> {
+                    // Should not happen
+                }
                 is MediaItem.DateSeparator -> DateItemView(
                     modifier = Modifier.animateItem(),
                     item = item
                 )
-                is MediaItem.Image,
-                is MediaItem.Video -> {
-                    // Should not happen
-                }
                 is MediaItem.LoadingIndicator -> LoadingMoreIndicator(
                     modifier = Modifier.animateItem(),
                     item = item,
@@ -361,7 +396,7 @@ private fun MediaGalleryFilesList(
 @Composable
 private fun MediaGalleryImageGrid(
     imagesAndVideos: ImmutableList<MediaItem>,
-    eventSink: (MediaGalleryEvents) -> Unit,
+    eventSink: (MediaGalleryEvent) -> Unit,
     onItemClick: (MediaItem.Event) -> Unit,
 ) {
     LazyVerticalGrid(
@@ -371,6 +406,7 @@ private fun MediaGalleryImageGrid(
         columns = GridCells.Adaptive(80.dp),
         horizontalArrangement = Arrangement.spacedBy(4.dp),
         verticalArrangement = Arrangement.spacedBy(4.dp),
+        contentPadding = lazyColumnContentPadding,
     ) {
         items(
             items = imagesAndVideos,
@@ -384,11 +420,48 @@ private fun MediaGalleryImageGrid(
             key = { it.id() },
             contentType = { it::class.java },
         ) { item ->
+            val blurHash = when (item) {
+                is MediaItem.Image -> item.blurHash
+                is MediaItem.Video -> item.blurHash
+                else -> null
+            }
+
+            val blurHashBackgroundModifier = if (blurHash != null) {
+                Modifier.blurHashBackground(blurHash)
+            } else {
+                Modifier
+            }
+
+            val currentValidationState by when (item) {
+                is MediaItem.Event -> item.validationState.collectOverallState()
+                else -> remember { mutableStateOf(ContentValidationValue.Unknown) }
+            }
+
             when (item) {
-                is MediaItem.DateSeparator -> DateItemView(
-                    modifier = Modifier.animateItem(),
-                    item = item,
-                )
+                is MediaItem.Event if !currentValidationState.isValidated() -> {
+                    Box(modifier = blurHashBackgroundModifier.aspectRatio(1f), contentAlignment = Alignment.Center) {
+                        CircularProgressIndicator(
+                            modifier = Modifier.size(24.dp),
+                            strokeWidth = 2.dp,
+                        )
+                    }
+                }
+                is MediaItem.Event if currentValidationState.isInvalid() -> {
+                    Box(
+                        modifier = Modifier
+                            .clickable { onItemClick(item) }
+                            .background(ElementTheme.colors.bgCriticalSubtle)
+                            .aspectRatio(1f),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            modifier = Modifier.size(24.dp),
+                            imageVector = CompoundIcons.Error(),
+                            tint = ElementTheme.colors.iconCriticalPrimary,
+                            contentDescription = null,
+                        )
+                    }
+                }
                 is MediaItem.Audio -> {
                     // Should not happen
                 }
@@ -399,21 +472,25 @@ private fun MediaGalleryImageGrid(
                     // Should not happen
                 }
                 is MediaItem.Image -> ImageItemView(
-                    modifier = Modifier.animateItem(),
+                    modifier = blurHashBackgroundModifier.animateItem(),
                     image = item,
                     onClick = { onItemClick(item) },
                     onLongClick = {
-                        eventSink(MediaGalleryEvents.OpenInfo(item))
+                        eventSink(MediaGalleryEvent.OpenInfo(item))
                     },
                 )
                 is MediaItem.Video -> VideoItemView(
-                    modifier = Modifier.animateItem(),
+                    modifier = blurHashBackgroundModifier.animateItem(),
                     video = item,
                     onClick = { onItemClick(item) },
                     onLongClick = {
-                        eventSink(MediaGalleryEvents.OpenInfo(item))
+                        eventSink(MediaGalleryEvent.OpenInfo(item))
                     },
                 )
+                is MediaItem.DateSeparator -> DateItemView(
+                    modifier = Modifier.animateItem(),
+                    item = item,
+                )
                 is MediaItem.LoadingIndicator -> LoadingMoreIndicator(
                     modifier = Modifier.animateItem(),
                     item = item,
@@ -427,7 +504,7 @@ private fun MediaGalleryImageGrid(
 @Composable
 private fun LoadingMoreIndicator(
     item: MediaItem.LoadingIndicator,
-    eventSink: (MediaGalleryEvents) -> Unit,
+    eventSink: (MediaGalleryEvent) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Box(
@@ -452,7 +529,7 @@ private fun LoadingMoreIndicator(
         }
         val latestEventSink by rememberUpdatedState(eventSink)
         LaunchedEffect(item.timestamp) {
-            latestEventSink(MediaGalleryEvents.LoadMore(item.direction))
+            latestEventSink(MediaGalleryEvent.LoadMore(item.direction))
         }
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt
index 5d6a48c25b..957f0011d3 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/root/MediaGalleryFlowNode.kt
@@ -34,6 +34,7 @@ import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.gallery.MediaGalleryNode
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
+import io.element.android.libraries.mediaviewer.impl.model.blurHash
 import io.element.android.libraries.mediaviewer.impl.model.eventId
 import io.element.android.libraries.mediaviewer.impl.model.mediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.mediaSource
@@ -68,6 +69,7 @@ class MediaGalleryFlowNode(
             val mediaInfo: MediaInfo,
             val mediaSource: MediaSource,
             val thumbnailSource: MediaSource?,
+            val blurHash: String?,
         ) : NavTarget
     }
 
@@ -104,6 +106,7 @@ class MediaGalleryFlowNode(
                                 mediaInfo = item.mediaInfo(),
                                 mediaSource = item.mediaSource(),
                                 thumbnailSource = item.thumbnailSource(),
+                                blurHash = item.blurHash(),
                             )
                         )
                     }
@@ -128,13 +131,13 @@ class MediaGalleryFlowNode(
                 mediaViewerEntryPoint.createNode(
                     parentNode = this,
                     buildContext = buildContext,
-                    params = MediaViewerEntryPoint.Params(
+                    params = MediaViewerEntryPoint.Params.RoomMedia(
                         mode = navTarget.mode,
                         eventId = navTarget.eventId,
                         mediaInfo = navTarget.mediaInfo,
                         mediaSource = navTarget.mediaSource,
                         thumbnailSource = navTarget.thumbnailSource,
-                        canShowInfo = true,
+                        blurHash = navTarget.blurHash,
                     ),
                     callback = callback,
                 )
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt
index ed4e59d631..cda8422e33 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/AudioItemView.kt
@@ -8,117 +8,38 @@
 
 package io.element.android.libraries.mediaviewer.impl.gallery.ui
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.libraries.core.extensions.withBrackets
-import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
-import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
-import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun AudioItemView(
     audio: MediaItem.Audio,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp),
+    GalleryFileListItem(
+        modifier = modifier,
+        contentValidationValue = contentValidationValue,
+        caption = audio.mediaInfo.caption,
     ) {
-        Spacer(modifier = Modifier.height(20.dp))
-        FilenameRow(
-            audio = audio,
+        GalleryFileListItemContent(
+            name = audio.mediaInfo.filename,
+            formattedSize = audio.mediaInfo.formattedFileSize,
+            icon = CompoundIcons.Audio(),
+            isValidating = contentValidationValue.isLoading(),
             onClick = onClick,
             onLongClick = onLongClick,
         )
-        val caption = audio.mediaInfo.caption
-        if (caption != null) {
-            CaptionView(caption)
-        } else {
-            Spacer(modifier = Modifier.height(20.dp))
-        }
-        HorizontalDivider()
-    }
-}
-
-@Composable
-private fun FilenameRow(
-    audio: MediaItem.Audio,
-    onClick: () -> Unit,
-    onLongClick: () -> Unit,
-) {
-    Row(
-        modifier = Modifier
-            .clip(RoundedCornerShape(12.dp))
-            .background(
-                color = ElementTheme.colors.bgSubtleSecondary,
-                shape = RoundedCornerShape(12.dp),
-            )
-            .combinedClickable(
-                onClick = onClick,
-                onLongClick = onLongClick,
-                onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
-            )
-            .onKeyboardContextMenuAction(onLongClick)
-            .fillMaxWidth()
-            .padding(start = 12.dp, end = 36.dp, top = 8.dp, bottom = 8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            modifier = Modifier
-                .background(
-                    color = ElementTheme.colors.bgActionSecondaryRest,
-                    shape = CircleShape,
-                )
-                .size(32.dp)
-                .padding(6.dp),
-            imageVector = CompoundIcons.Audio(),
-            contentDescription = null,
-        )
-        Spacer(modifier = Modifier.width(8.dp))
-        Text(
-            text = audio.mediaInfo.filename,
-            modifier = Modifier.weight(1f),
-            style = ElementTheme.typography.fontBodyLgRegular,
-            color = ElementTheme.colors.textPrimary,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
-        val formattedSize = audio.mediaInfo.formattedFileSize
-        if (formattedSize.isNotEmpty()) {
-            Text(
-                text = formattedSize.withBrackets(),
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textPrimary,
-            )
-        }
     }
 }
 
@@ -127,9 +48,22 @@ private fun FilenameRow(
 internal fun AudioItemViewPreview(
     @PreviewParameter(MediaItemAudioProvider::class) audio: MediaItem.Audio,
 ) = ElementPreview {
-    AudioItemView(
-        audio = audio,
-        onClick = {},
-        onLongClick = {},
-    )
+    val states = remember {
+        listOf(
+            ContentValidationValue.Valid,
+            ContentValidationValue.Loading,
+            ContentValidationValue.Invalid,
+            ContentValidationValue.UnrecoverableError(Throwable("Unrecoverable error")),
+        )
+    }
+    Column {
+        for (state in states) {
+            AudioItemView(
+                contentValidationValue = state,
+                audio = audio,
+                onClick = {},
+                onLongClick = {},
+            )
+        }
+    }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt
index 7738e4c1e4..b552c374b9 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/FileItemView.kt
@@ -8,117 +8,38 @@
 
 package io.element.android.libraries.mediaviewer.impl.gallery.ui
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
-import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
-import io.element.android.libraries.core.extensions.withBrackets
-import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
-import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
-import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun FileItemView(
     file: MediaItem.File,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
+    contentValidationState: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp),
+    GalleryFileListItem(
+        modifier = modifier,
+        contentValidationValue = contentValidationState,
+        caption = file.mediaInfo.caption
     ) {
-        Spacer(modifier = Modifier.height(20.dp))
-        FilenameRow(
-            file = file,
+        GalleryFileListItemContent(
+            name = file.mediaInfo.filename,
+            formattedSize = file.mediaInfo.formattedFileSize,
+            icon = CompoundIcons.Attachment(),
             onClick = onClick,
+            isValidating = contentValidationState.isLoading(),
             onLongClick = onLongClick,
         )
-        val caption = file.mediaInfo.caption
-        if (caption != null) {
-            CaptionView(caption)
-        } else {
-            Spacer(modifier = Modifier.height(20.dp))
-        }
-        HorizontalDivider()
-    }
-}
-
-@Composable
-private fun FilenameRow(
-    file: MediaItem.File,
-    onClick: () -> Unit,
-    onLongClick: () -> Unit,
-) {
-    Row(
-        modifier = Modifier
-            .clip(RoundedCornerShape(12.dp))
-            .background(
-                color = ElementTheme.colors.bgSubtleSecondary,
-                shape = RoundedCornerShape(12.dp),
-            )
-            .combinedClickable(
-                onClick = onClick,
-                onLongClick = onLongClick,
-                onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
-            )
-            .onKeyboardContextMenuAction(onLongClick)
-            .fillMaxWidth()
-            .padding(start = 12.dp, end = 36.dp, top = 8.dp, bottom = 8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            modifier = Modifier
-                .background(
-                    color = ElementTheme.colors.bgActionSecondaryRest,
-                    shape = CircleShape,
-                )
-                .size(32.dp)
-                .padding(6.dp),
-            imageVector = CompoundIcons.Attachment(),
-            contentDescription = null,
-        )
-        Spacer(modifier = Modifier.width(8.dp))
-        Text(
-            text = file.mediaInfo.filename,
-            modifier = Modifier.weight(1f),
-            style = ElementTheme.typography.fontBodyLgRegular,
-            color = ElementTheme.colors.textPrimary,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
-        )
-        val formattedSize = file.mediaInfo.formattedFileSize
-        if (formattedSize.isNotEmpty()) {
-            Text(
-                text = formattedSize.withBrackets(),
-                style = ElementTheme.typography.fontBodyLgRegular,
-                color = ElementTheme.colors.textPrimary,
-            )
-        }
     }
 }
 
@@ -127,9 +48,22 @@ private fun FilenameRow(
 internal fun FileItemViewPreview(
     @PreviewParameter(MediaItemFileProvider::class) file: MediaItem.File,
 ) = ElementPreview {
-    FileItemView(
-        file = file,
-        onClick = {},
-        onLongClick = {},
-    )
+    val states = remember {
+        listOf(
+            ContentValidationValue.Valid,
+            ContentValidationValue.Loading,
+            ContentValidationValue.Invalid,
+            ContentValidationValue.UnrecoverableError(Throwable("Unrecoverable error")),
+        )
+    }
+    Column {
+        for (state in states) {
+            FileItemView(
+                file = file,
+                onClick = {},
+                onLongClick = {},
+                contentValidationState = state,
+            )
+        }
+    }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/GalleryFileListItem.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/GalleryFileListItem.kt
new file mode 100644
index 0000000000..383f32653e
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/GalleryFileListItem.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.impl.gallery.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+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.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.core.extensions.withBrackets
+import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.InvalidContentView
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NotFoundContentView
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+internal fun GalleryFileListItem(
+    contentValidationValue: ContentValidationValue,
+    caption: String?,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp),
+    ) {
+        Spacer(modifier = Modifier.height(20.dp))
+
+        when (contentValidationValue) {
+            ContentValidationValue.Invalid -> InvalidContentView(
+                modifier = invalidContentModifier(),
+                contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp),
+            )
+            is ContentValidationValue.UnrecoverableError -> NotFoundContentView(
+                modifier = invalidContentModifier(),
+                contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp),
+            )
+            else -> {
+                content()
+            }
+        }
+
+        if (caption != null) {
+            CaptionView(caption)
+        } else {
+            Spacer(modifier = Modifier.height(20.dp))
+        }
+        HorizontalDivider()
+    }
+}
+
+@Composable
+private fun invalidContentModifier(): Modifier {
+    return Modifier
+        .border(width = 1.dp, color = ElementTheme.colors.borderCriticalSubtle, shape = RoundedCornerShape(12.dp))
+        .clip(RoundedCornerShape(12.dp))
+        .background(ElementTheme.colors.bgCriticalSubtle)
+}
+
+@Composable
+internal fun GalleryFileListItemContent(
+    name: String,
+    formattedSize: String,
+    icon: ImageVector,
+    isValidating: Boolean,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .clip(RoundedCornerShape(12.dp))
+            .background(
+                color = ElementTheme.colors.bgSubtleSecondary,
+                shape = RoundedCornerShape(12.dp),
+            )
+            .combinedClickable(
+                onClick = onClick.takeIf { !isValidating } ?: {},
+                onLongClick = onLongClick.takeIf { !isValidating } ?: {},
+                onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+            )
+            .onKeyboardContextMenuAction(onLongClick)
+            .fillMaxWidth()
+            .padding(start = 12.dp, end = 36.dp, top = 8.dp, bottom = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        val iconModifier = Modifier
+            .background(
+                color = ElementTheme.colors.bgActionSecondaryRest,
+                shape = CircleShape,
+            )
+            .size(32.dp)
+            .padding(6.dp)
+
+        if (isValidating) {
+            CircularProgressIndicator(
+                modifier = iconModifier,
+                strokeWidth = 2.dp,
+            )
+        } else {
+            Icon(
+                modifier = iconModifier,
+                imageVector = icon,
+                contentDescription = null,
+            )
+        }
+        Spacer(modifier = Modifier.width(8.dp))
+        Text(
+            text = name,
+            modifier = Modifier.weight(1f),
+            style = ElementTheme.typography.fontBodyLgRegular,
+            color = ElementTheme.colors.textPrimary,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+        if (formattedSize.isNotEmpty()) {
+            Text(
+                text = formattedSize.withBrackets(),
+                style = ElementTheme.typography.fontBodyLgRegular,
+                color = ElementTheme.colors.textPrimary,
+            )
+        }
+    }
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt
index 25e8a88dfe..4dfd1c18c8 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemAudioProvider.kt
@@ -22,7 +22,7 @@ class MediaItemAudioProvider : PreviewParameterProvider<MediaItem.Audio> {
                 caption = "A caption",
             ),
             aMediaItemAudio(
-                caption = loremIpsum,
+                caption = loremIpsum.take(80),
             ),
         )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt
index 7419ae3d44..e64b10adb4 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemFileProvider.kt
@@ -22,7 +22,7 @@ class MediaItemFileProvider : PreviewParameterProvider<MediaItem.File> {
                 caption = "A caption",
             ),
             aMediaItemFile(
-                caption = loremIpsum,
+                caption = loremIpsum.take(80),
             ),
         )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt
index 4b23d28795..56c1c4bb32 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/MediaItemVoiceProvider.kt
@@ -22,7 +22,7 @@ class MediaItemVoiceProvider : PreviewParameterProvider<MediaItem.Voice> {
                 caption = "A caption",
             ),
             aMediaItemVoice(
-                caption = loremIpsum,
+                caption = loremIpsum.take(80),
             ),
             aMediaItemVoice(
                 waveform = emptyList(),
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt
index 7d9e634687..3aad3f1061 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VideoItemView.kt
@@ -34,6 +34,7 @@ import coil3.compose.AsyncImage
 import coil3.compose.AsyncImagePainter
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.components.blurhash.blurHashBackground
 import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenuAction
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -51,6 +52,7 @@ fun VideoItemView(
 ) {
     Box(
         modifier = modifier
+            .blurHashBackground(blurHash = video.blurHash)
             .aspectRatio(1f)
             .combinedClickable(
                 onClick = onClick,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt
index dbbeb28b80..6c9df5fc48 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/ui/VoiceItemView.kt
@@ -45,10 +45,10 @@ import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenu
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import io.element.android.libraries.mediaviewer.impl.model.aMediaItemVoice
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -64,26 +64,20 @@ fun VoiceItemView(
     state: VoiceMessageState,
     voice: MediaItem.Voice,
     onLongClick: () -> Unit,
+    contentValidationValue: ContentValidationValue,
     modifier: Modifier = Modifier,
 ) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp),
+    GalleryFileListItem(
+        modifier = modifier,
+        contentValidationValue = contentValidationValue,
+        caption = voice.mediaInfo.caption,
     ) {
-        Spacer(modifier = Modifier.height(20.dp))
         VoiceInfoRow(
             state = state,
             voice = voice,
+            isValidating = contentValidationValue.isLoading(),
             onLongClick = onLongClick,
         )
-        val caption = voice.mediaInfo.caption
-        if (caption != null) {
-            CaptionView(caption)
-        } else {
-            Spacer(modifier = Modifier.height(16.dp))
-        }
-        HorizontalDivider()
     }
 }
 
@@ -91,6 +85,7 @@ fun VoiceItemView(
 private fun VoiceInfoRow(
     state: VoiceMessageState,
     voice: MediaItem.Voice,
+    isValidating: Boolean,
     onLongClick: () -> Unit,
 ) {
     fun playPause() {
@@ -114,12 +109,21 @@ private fun VoiceInfoRow(
             .padding(start = 12.dp, end = 36.dp, top = 8.dp, bottom = 8.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        when (state.buttonType) {
-            VoiceMessageState.ButtonType.Play -> PlayButton(onClick = ::playPause)
-            VoiceMessageState.ButtonType.Pause -> PauseButton(onClick = ::playPause)
-            VoiceMessageState.ButtonType.Downloading -> ProgressButton()
-            VoiceMessageState.ButtonType.Retry -> RetryButton(onClick = ::playPause)
-            VoiceMessageState.ButtonType.Disabled -> PlayButton(onClick = {}, enabled = false)
+        if (isValidating) {
+            CustomIconButton(onClick = {}, enabled = false) {
+                CircularProgressIndicator(
+                    strokeWidth = 2.dp,
+                    modifier = Modifier.size(16.dp)
+                )
+            }
+        } else {
+            when (state.buttonType) {
+                VoiceMessageState.ButtonType.Play -> PlayButton(onClick = ::playPause)
+                VoiceMessageState.ButtonType.Pause -> PauseButton(onClick = ::playPause)
+                VoiceMessageState.ButtonType.Downloading -> ProgressButton()
+                VoiceMessageState.ButtonType.Retry -> RetryButton(onClick = ::playPause)
+                VoiceMessageState.ButtonType.Disabled -> PlayButton(onClick = {}, enabled = false)
+            }
         }
         Spacer(Modifier.width(8.dp))
         Column(
@@ -128,7 +132,7 @@ private fun VoiceInfoRow(
         ) {
             PlaybackSpeedButton(
                 speed = state.playbackSpeed,
-                onClick = { state.eventSink(VoiceMessageEvent.ChangePlaybackSpeed) },
+                onClick = { state.eventSink(VoiceMessageEvent.ChangePlaybackSpeed) }.takeIf { !isValidating } ?: {},
             )
             Text(
                 text = if (state.progress > 0f) state.time else voice.mediaInfo.duration ?: state.time,
@@ -149,7 +153,7 @@ private fun VoiceInfoRow(
             onSeek = {
                 state.eventSink(VoiceMessageEvent.Seek(it))
             },
-            seekEnabled = true,
+            seekEnabled = !isValidating,
         )
     }
 }
@@ -277,11 +281,24 @@ private fun CustomIconButton(
 internal fun VoiceItemViewPreview(
     @PreviewParameter(MediaItemVoiceProvider::class) voice: MediaItem.Voice,
 ) = ElementPreview {
-    VoiceItemView(
-        state = aVoiceMessageState(),
-        voice = voice,
-        onLongClick = {},
-    )
+    val states = remember {
+        listOf(
+            ContentValidationValue.Valid,
+            ContentValidationValue.Loading,
+            ContentValidationValue.Invalid,
+            ContentValidationValue.UnrecoverableError(Throwable("Unrecoverable error")),
+        )
+    }
+    Column {
+        for (state in states) {
+            VoiceItemView(
+                state = aVoiceMessageState(),
+                voice = voice,
+                onLongClick = {},
+                contentValidationValue = state,
+            )
+        }
+    }
 }
 
 @PreviewsDayNight
@@ -289,9 +306,22 @@ internal fun VoiceItemViewPreview(
 internal fun VoiceItemViewPlayPreview(
     @PreviewParameter(VoiceMessageStateProvider::class) state: VoiceMessageState,
 ) = ElementPreview {
-    VoiceItemView(
-        state = state,
-        voice = aMediaItemVoice(),
-        onLongClick = {},
-    )
+    val validationState = remember {
+        listOf(
+            ContentValidationValue.Valid,
+            ContentValidationValue.Loading,
+            ContentValidationValue.Invalid,
+            ContentValidationValue.UnrecoverableError(Throwable("Unrecoverable error")),
+        )
+    }
+    Column {
+        for (validationState in validationState) {
+            VoiceItemView(
+                state = state,
+                voice = aMediaItemVoice(),
+                onLongClick = {},
+                contentValidationValue = validationState,
+            )
+        }
+    }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActions.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActions.kt
index c7a01ea494..071e0dba64 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActions.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActions.kt
@@ -100,7 +100,11 @@ class AndroidLocalMediaActions(
     override suspend fun share(localMedia: LocalMedia): Result<Unit> = withContext(coroutineDispatchers.io) {
         require(localMedia.uri.scheme == ContentResolver.SCHEME_FILE)
         runCatchingExceptions {
-            val shareableUri = localMedia.toShareableUri()
+            // Make a copy of the shared file in the cache directory, otherwise the original file will be gone once this screen is dismissed
+            // and will prevent sharing the media to another room inside the app.
+            val copiedFile = localMedia.uri.toFile()
+                .copyTo(File(context.cacheDir, "temp/media/" + (localMedia.uri.lastPathSegment ?: "shared_file")), true)
+            val shareableUri = copiedFile.toShareableUri()
             val shareMediaIntent = Intent(Intent.ACTION_SEND)
                 .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 .putExtra(Intent.EXTRA_STREAM, shareableUri)
@@ -157,10 +161,13 @@ class AndroidLocalMediaActions(
         }
     }
 
-    private fun LocalMedia.toShareableUri(): Uri {
-        val mediaAsFile = this.toFile()
+    private fun File.toShareableUri(): Uri {
         val authority = "${buildMeta.applicationId}.fileprovider"
-        return FileProvider.getUriForFile(context, authority, mediaAsFile).normalizeScheme()
+        return FileProvider.getUriForFile(context, authority, this).normalizeScheme()
+    }
+
+    private fun LocalMedia.toShareableUri(): Uri {
+        return this.toFile().toShareableUri()
     }
 
     @RequiresApi(Build.VERSION_CODES.Q)
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt
index 05cbe40f36..09164e36d1 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactory.kt
@@ -9,7 +9,9 @@
 package io.element.android.libraries.mediaviewer.impl.local
 
 import android.content.Context
+import android.graphics.BitmapFactory
 import android.net.Uri
+import android.webkit.MimeTypeMap
 import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
@@ -17,6 +19,7 @@ import io.element.android.libraries.androidutils.file.getFileName
 import io.element.android.libraries.androidutils.file.getFileSize
 import io.element.android.libraries.androidutils.file.getMimeType
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
+import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.UserId
@@ -85,8 +88,12 @@ class AndroidLocalMediaFactory(
         waveform: List<Float>?,
         duration: String?,
     ): LocalMedia {
-        val resolvedMimeType = mimeType ?: context.getMimeType(uri) ?: MimeTypes.OctetStream
         val fileName = name ?: context.getFileName(uri) ?: ""
+        val resolvedMimeType = resolveMimeType(
+            uri = uri,
+            mimeType = mimeType,
+            fileName = fileName,
+        )
         val fileSize = context.getFileSize(uri)
         val calculatedFormattedFileSize = formattedFileSize ?: fileSizeFormatter.format(fileSize)
         val fileExtension = fileExtensionExtractor.extractFromName(fileName)
@@ -97,6 +104,7 @@ class AndroidLocalMediaFactory(
                 filename = fileName,
                 fileSize = fileSize,
                 caption = caption,
+                formattedCaption = null,
                 formattedFileSize = calculatedFormattedFileSize,
                 fileExtension = fileExtension,
                 senderId = senderId,
@@ -109,4 +117,36 @@ class AndroidLocalMediaFactory(
             )
         )
     }
+
+    private fun resolveMimeType(
+        uri: Uri,
+        mimeType: String?,
+        fileName: String,
+    ): String {
+        val explicitMimeType = mimeType.takeUnless { it.isNullOrBlank() || it == MimeTypes.OctetStream }
+        if (explicitMimeType != null) return explicitMimeType
+
+        val resolverMimeType = context.getMimeType(uri).takeUnless { it.isNullOrBlank() || it == MimeTypes.OctetStream }
+        if (resolverMimeType != null) return resolverMimeType
+
+        val decodedImageMimeType = decodeImageMimeType(uri)
+        if (decodedImageMimeType != null) return decodedImageMimeType
+
+        val extensionMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+            fileExtensionExtractor.extractFromName(fileName)
+        )
+        if (!extensionMimeType.isNullOrBlank()) return extensionMimeType
+
+        return MimeTypes.OctetStream
+    }
+
+    private fun decodeImageMimeType(uri: Uri): String? {
+        return tryOrNull {
+            context.contentResolver.openInputStream(uri)?.use { inputStream ->
+                val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                BitmapFactory.decodeStream(inputStream, null, options)
+                options.outMimeType
+            }
+        }
+    }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/DefaultLocalMediaRenderer.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/DefaultLocalMediaRenderer.kt
index 96450d99bf..f7564aec31 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/DefaultLocalMediaRenderer.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/DefaultLocalMediaRenderer.kt
@@ -40,7 +40,9 @@ class DefaultLocalMediaRenderer(
             localMediaViewState = localMediaViewState,
             textFileViewer = textFileViewer,
             audioFocus = audioFocus,
+            forPreview = true,
             onClick = {},
+            onOpenWith = null,
         )
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
index cc276b52c8..01b44f1246 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/LocalMediaView.kt
@@ -31,7 +31,9 @@ fun LocalMediaView(
     bottomPaddingInPixels: Int,
     audioFocus: AudioFocus?,
     onClick: () -> Unit,
+    onOpenWith: (() -> Unit)?,
     textFileViewer: TextFileViewer,
+    forPreview: Boolean,
     modifier: Modifier = Modifier,
     isDisplayed: Boolean = true,
     isUserSelected: Boolean = false,
@@ -44,6 +46,7 @@ fun LocalMediaView(
             localMediaViewState = localMediaViewState,
             localMedia = localMedia,
             modifier = modifier,
+            forPreview = forPreview,
             onClick = onClick,
         )
         mimeType.isMimeTypeVideo() -> MediaVideoView(
@@ -53,6 +56,7 @@ fun LocalMediaView(
             localMedia = localMedia,
             autoplay = isUserSelected,
             audioFocus = audioFocus,
+            forPreview = forPreview,
             modifier = modifier,
         )
         mimeType == MimeTypes.PlainText -> TextFileView(
@@ -80,7 +84,7 @@ fun LocalMediaView(
             uri = localMedia?.uri,
             info = mediaInfo,
             modifier = modifier,
-            onClick = onClick,
+            onOpenWith = onOpenWith,
         )
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
index 01115b7c91..3ac578196d 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaAudioView.kt
@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -51,6 +52,7 @@ import androidx.media3.common.Timeline
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
+import com.bumble.appyx.core.node.LocalNodeTargetVisibility
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.audio.api.AudioFocus
@@ -86,7 +88,7 @@ fun MediaAudioView(
     modifier: Modifier = Modifier,
     isDisplayed: Boolean = true,
 ) {
-    val exoPlayer = rememberExoPlayer()
+    val exoPlayer = rememberExoPlayer(forAudioOnly = true)
     ExoPlayerMediaAudioView(
         isDisplayed = isDisplayed,
         localMediaViewState = localMediaViewState,
@@ -130,6 +132,8 @@ private fun ExoPlayerMediaAudioView(
         mutableStateOf(null)
     }
 
+    val isTargetVisible = LocalNodeTargetVisibility.current
+
     val playableState: PlayableState.Playable by remember {
         derivedStateOf {
             PlayableState.Playable(
@@ -196,13 +200,21 @@ private fun ExoPlayerMediaAudioView(
             exoPlayer.pause()
         }
     }
+    LaunchedEffect(isTargetVisible) {
+        if (!isTargetVisible) {
+            exoPlayer.pause()
+        }
+    }
     if (localMedia?.uri != null) {
         LaunchedEffect(localMedia.uri) {
             val mediaItem = MediaItem.fromUri(localMedia.uri)
             exoPlayer.setMediaItem(mediaItem)
+            exoPlayer.prepare()
         }
     } else {
-        exoPlayer.setMediaItems(emptyList())
+        LaunchedEffect(Unit) {
+            exoPlayer.setMediaItems(emptyList())
+        }
     }
     val context = LocalContext.current
     val waveform = info?.waveform
@@ -247,7 +259,7 @@ private fun ExoPlayerMediaAudioView(
                             }
                         },
                         update = { playerView ->
-                            playerView.isVisible = metadata.hasArtwork()
+                            playerView.isVisible = metadata.hasArtwork() && isTargetVisible
                         },
                         onRelease = { playerView ->
                             playerView.player = null
@@ -317,16 +329,19 @@ private fun ExoPlayerMediaAudioView(
         )
     }
 
-    OnLifecycleEvent { _, event ->
-        when (event) {
-            Lifecycle.Event.ON_CREATE -> exoPlayer.addListener(playerListener)
-            Lifecycle.Event.ON_RESUME -> exoPlayer.prepare()
-            Lifecycle.Event.ON_PAUSE -> exoPlayer.pause()
-            Lifecycle.Event.ON_DESTROY -> {
-                exoPlayer.release()
+    DisposableEffect(exoPlayer) {
+        exoPlayer.addListener(playerListener)
+        onDispose {
+            if (!exoPlayer.isReleased) {
                 exoPlayer.removeListener(playerListener)
+                exoPlayer.release()
             }
-            else -> Unit
+        }
+    }
+
+    OnLifecycleEvent { _, event ->
+        if (event == Lifecycle.Event.ON_PAUSE) {
+            exoPlayer.pause()
         }
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaMetadata.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaMetadata.kt
index 4c267a54dc..dc0090298c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaMetadata.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/audio/MediaMetadata.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.mediaviewer.impl.local.audio
 
 import androidx.media3.common.MediaMetadata
+import io.element.android.libraries.ui.strings.Strings
 
 fun MediaMetadata?.hasArtwork(): Boolean {
     return this?.artworkData != null || this?.artworkUri != null
@@ -22,13 +23,13 @@ fun MediaMetadata?.buildInfo(): String {
         }
         if (title != null) {
             if (isNotEmpty()) {
-                append(" - ")
+                append(Strings.NICE_SEPARATOR)
             }
             append(title)
         }
         if (recordingYear != null) {
             if (isNotEmpty()) {
-                append(" - ")
+                append(Strings.NICE_SEPARATOR)
             }
             append(recordingYear)
         }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
index 912ea88e99..a1c57ef272 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaFileView.kt
@@ -9,23 +9,16 @@
 package io.element.android.libraries.mediaviewer.impl.local.file
 
 import android.net.Uri
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -33,55 +26,54 @@ import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.core.bool.orFalse
+import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.ButtonSize
+import io.element.android.libraries.designsystem.theme.components.IconSource
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.helper.formatFileExtensionAndSize
+import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.mediaviewer.impl.local.LocalMediaViewState
 import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState
+import io.element.android.libraries.ui.strings.CommonStrings
 
+/**
+ * Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=3361-16623
+ */
 @Composable
 fun MediaFileView(
     localMediaViewState: LocalMediaViewState,
     uri: Uri?,
     info: MediaInfo?,
-    onClick: () -> Unit,
+    onOpenWith: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     val isAudio = info?.mimeType.isMimeTypeAudio().orFalse()
     localMediaViewState.isReady = uri != null
-
-    val interactionSource = remember { MutableInteractionSource() }
     Box(
         modifier = modifier
-            .padding(horizontal = 8.dp)
-            .clickable(
-                onClick = onClick,
-                interactionSource = interactionSource,
-                indication = null
-            ),
+            .padding(horizontal = 8.dp),
         contentAlignment = Alignment.Center
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            Box(
-                modifier = Modifier
-                    .size(72.dp)
-                    .clip(CircleShape)
-                    .background(ElementTheme.colors.iconPrimary),
-                contentAlignment = Alignment.Center,
-            ) {
-                Icon(
-                    imageVector = if (isAudio) CompoundIcons.Audio() else CompoundIcons.Attachment(),
-                    contentDescription = null,
-                    tint = ElementTheme.colors.iconOnSolidPrimary,
-                    modifier = Modifier
-                        .size(32.dp)
-                        .rotate(if (isAudio) 0f else -45f),
-                )
+            val isApk = info?.mimeType == MimeTypes.Apk
+            val icon = when {
+                isAudio -> CompoundIcons.Audio()
+                isApk -> CompoundIcons.Bug()
+                else -> CompoundIcons.Files()
             }
+            BigIcon(
+                modifier = Modifier.align(Alignment.CenterHorizontally),
+                style = BigIcon.Style.Default(
+                    vectorIcon = icon,
+                    usePrimaryTint = true,
+                ),
+            )
             if (info != null) {
                 Spacer(modifier = Modifier.height(20.dp))
                 Text(
@@ -100,6 +92,20 @@ fun MediaFileView(
                     overflow = TextOverflow.Ellipsis,
                     color = ElementTheme.colors.textPrimary
                 )
+                if (onOpenWith != null) {
+                    val (icon, textResId) = if (isApk) {
+                        IconSource.Resource(R.drawable.ic_apk_install) to CommonStrings.common_install_apk_android
+                    } else {
+                        IconSource.Vector(CompoundIcons.PopOut()) to CommonStrings.action_open_with
+                    }
+                    OutlinedButton(
+                        modifier = Modifier.padding(top = 24.dp),
+                        size = ButtonSize.Small,
+                        leadingIcon = icon,
+                        onClick = onOpenWith,
+                        text = stringResource(id = textResId),
+                    )
+                }
             }
         }
     }
@@ -115,6 +121,6 @@ internal fun MediaFileViewPreview(
         localMediaViewState = rememberLocalMediaViewState(),
         uri = null,
         info = info,
-        onClick = {},
+        onOpenWith = {},
     )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaInfoFileProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaInfoFileProvider.kt
index 8e41a4809a..3214236253 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaInfoFileProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/file/MediaInfoFileProvider.kt
@@ -10,11 +10,15 @@ package io.element.android.libraries.mediaviewer.impl.local.file
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.mediaviewer.api.MediaInfo
-import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo
+import io.element.android.libraries.mediaviewer.api.aZipMediaInfo
+import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
+import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo
 
 open class MediaInfoFileProvider : PreviewParameterProvider<MediaInfo> {
     override val values: Sequence<MediaInfo>
         get() = sequenceOf(
-            aPdfMediaInfo(),
+            aZipMediaInfo(),
+            anAudioMediaInfo(),
+            anApkMediaInfo(),
         )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/image/MediaImageView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/image/MediaImageView.kt
index 306a18b4d6..c935b17b85 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/image/MediaImageView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/image/MediaImageView.kt
@@ -23,13 +23,14 @@ import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.local.LocalMediaViewState
 import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState
 import io.element.android.libraries.ui.strings.CommonStrings
-import me.saket.telephoto.zoomable.coil.ZoomableAsyncImage
+import me.saket.telephoto.zoomable.coil3.ZoomableAsyncImage
 import me.saket.telephoto.zoomable.rememberZoomableImageState
 
 @Composable
 fun MediaImageView(
     localMediaViewState: LocalMediaViewState,
     localMedia: LocalMedia?,
+    forPreview: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -42,11 +43,16 @@ fun MediaImageView(
     } else {
         val zoomableImageState = rememberZoomableImageState(localMediaViewState.zoomableState)
         localMediaViewState.isReady = zoomableImageState.isImageDisplayed
+        val imageDescription = if (forPreview) {
+            stringResource(CommonStrings.a11y_photo_preview)
+        } else {
+            stringResource(CommonStrings.common_image)
+        }
         ZoomableAsyncImage(
             modifier = modifier,
             state = zoomableImageState,
             model = localMedia?.uri,
-            contentDescription = stringResource(id = CommonStrings.common_image),
+            contentDescription = imageDescription,
             contentScale = ContentScale.Fit,
             onClick = { onClick() }
         )
@@ -60,6 +66,7 @@ internal fun MediaImageViewPreview() = ElementPreview {
         modifier = Modifier.fillMaxSize(),
         localMediaViewState = rememberLocalMediaViewState(),
         localMedia = null,
+        forPreview = false,
         onClick = {},
     )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerFactory.kt
index d0043c657a..ccd628dbc5 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerFactory.kt
@@ -8,14 +8,18 @@
 
 package io.element.android.libraries.mediaviewer.impl.local.player
 
+import androidx.annotation.OptIn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 
+@OptIn(UnstableApi::class)
 @Composable
-fun rememberExoPlayer(): ExoPlayer {
+fun rememberExoPlayer(forAudioOnly: Boolean): ExoPlayer {
     return if (LocalInspectionMode.current) {
         remember {
             ExoPlayerForPreview()
@@ -23,7 +27,14 @@ fun rememberExoPlayer(): ExoPlayer {
     } else {
         val context = LocalContext.current
         remember {
-            ExoPlayer.Builder(context).build()
+            if (forAudioOnly) {
+                // Required for media3-exoplayer-midi to decode MIDI samples produced by DefaultExtractorsFactory.
+                val renderersFactory = DefaultRenderersFactory(context)
+                    .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+                ExoPlayer.Builder(context, renderersFactory).build()
+            } else {
+                ExoPlayer.Builder(context).build()
+            }
         }
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerForPreview.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerForPreview.kt
index 11f99a3ca8..4da8433cd1 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerForPreview.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/ExoPlayerForPreview.kt
@@ -258,7 +258,7 @@ class ExoPlayerForPreview(
     override fun setPriorityTaskManager(priorityTaskManager: PriorityTaskManager?) {}
     override fun isSleepingForOffload(): Boolean = throw NotImplementedError()
     override fun isTunnelingEnabled(): Boolean = throw NotImplementedError()
-    override fun isReleased(): Boolean = throw NotImplementedError()
+    override fun isReleased(): Boolean = false
     override fun setImageOutput(imageOutput: ImageOutput?) {}
     override fun setAudioCodecParameters(codecParameters: CodecParameters) {}
     override fun addAudioCodecParametersChangeListener(listener: CodecParametersChangeListener, keys: List<String>) {}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt
index b83c598c10..1f2b0b93d2 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/player/MediaPlayerControllerView.kt
@@ -12,13 +12,12 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -28,8 +27,10 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -91,49 +92,65 @@ fun MediaPlayerControllerView(
                     .widthIn(max = 480.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                val bgColor = if (state.isPlaying) {
-                    ElementTheme.colors.bgCanvasDefault
+                val colors = if (state.isPlaying) {
+                    IconButtonDefaults.iconButtonColors(
+                        containerColor = ElementTheme.colors.bgCanvasDefault,
+                        contentColor = ElementTheme.colors.iconPrimary,
+                    )
                 } else {
-                    ElementTheme.colors.textPrimary
+                    IconButtonDefaults.iconButtonColors(
+                        containerColor = ElementTheme.colors.iconPrimary,
+                        contentColor = ElementTheme.colors.iconOnSolidPrimary,
+                    )
                 }
-                Box(
+                val a11yPause = stringResource(CommonStrings.a11y_pause)
+                val a11yPlay = stringResource(CommonStrings.a11y_play)
+                IconButton(
                     modifier = Modifier
                         .size(36.dp)
-                        .background(
-                            color = bgColor,
-                            shape = CircleShape,
-                        )
-                        .clip(CircleShape)
-                        .clickable { onTogglePlay() }
-                        .padding(8.dp),
-                    contentAlignment = Alignment.Center,
+                        .semantics {
+                            stateDescription = if (state.isPlaying) a11yPause else a11yPlay
+                        },
+                    onClick = onTogglePlay,
+                    colors = colors,
                 ) {
                     if (state.isPlaying) {
                         Icon(
                             imageVector = CompoundIcons.PauseSolid(),
-                            tint = ElementTheme.colors.iconPrimary,
-                            contentDescription = stringResource(CommonStrings.a11y_pause)
+                            contentDescription = null,
                         )
                     } else {
                         Icon(
                             imageVector = CompoundIcons.PlaySolid(),
-                            tint = ElementTheme.colors.iconOnSolidPrimary,
-                            contentDescription = stringResource(CommonStrings.a11y_play)
+                            contentDescription = null,
                         )
                     }
                 }
+                val position = state.displayProgressInMillis.toHumanReadableDuration()
+                val a11yPosition = stringResource(CommonStrings.a11y_position, position)
                 Text(
                     modifier = Modifier
                         .widthIn(min = 48.dp)
-                        .padding(horizontal = 8.dp),
-                    text = state.displayProgressInMillis.toHumanReadableDuration(),
+                        .padding(horizontal = 8.dp)
+                        .semantics {
+                            contentDescription = a11yPosition
+                        },
+                    text = position,
                     textAlign = TextAlign.Center,
                     color = ElementTheme.colors.textPrimary,
                     style = ElementTheme.typography.fontBodyXsMedium,
                 )
                 var lastSelectedValue by remember { mutableFloatStateOf(-1f) }
                 Slider(
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .semantics {
+                            // Speak out a progress percent instead of milliseconds
+                            stateDescription = buildString {
+                                append((state.progressAsFloat * 100).toInt())
+                                append("%")
+                            }
+                        },
                     valueRange = 0f..state.durationInMillis.toFloat(),
                     value = lastSelectedValue.takeIf { it >= 0 }
                         ?: state.seekingToMillis?.toFloat()
@@ -150,30 +167,40 @@ fun MediaPlayerControllerView(
                 val formattedDuration = remember(state.durationInMillis) {
                     state.durationInMillis.toHumanReadableDuration()
                 }
+                val a11yDuration = stringResource(CommonStrings.a11y_duration, formattedDuration)
                 Text(
                     modifier = Modifier
                         .widthIn(min = 48.dp)
-                        .padding(horizontal = 8.dp),
+                        .padding(horizontal = 8.dp)
+                        .semantics {
+                            contentDescription = a11yDuration
+                        },
                     text = formattedDuration,
                     textAlign = TextAlign.Center,
                     color = ElementTheme.colors.textPrimary,
                     style = ElementTheme.typography.fontBodyXsMedium,
                 )
                 if (state.canMute) {
+                    val a11yUnmute = stringResource(CommonStrings.common_unmute)
+                    val a11yMute = stringResource(CommonStrings.common_mute)
                     IconButton(
                         onClick = onToggleMute,
+                        modifier = Modifier
+                            .semantics {
+                                stateDescription = if (state.isMuted) a11yUnmute else a11yMute
+                            },
                     ) {
                         if (state.isMuted) {
                             Icon(
                                 imageVector = CompoundIcons.VolumeOffSolid(),
                                 tint = ElementTheme.colors.iconPrimary,
-                                contentDescription = stringResource(CommonStrings.common_unmute)
+                                contentDescription = null,
                             )
                         } else {
                             Icon(
                                 imageVector = CompoundIcons.VolumeOnSolid(),
                                 tint = ElementTheme.colors.iconPrimary,
-                                contentDescription = stringResource(CommonStrings.common_mute)
+                                contentDescription = null,
                             )
                         }
                     }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt
index 082dc0571c..b5c65fa609 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/local/video/MediaVideoView.kt
@@ -30,13 +30,17 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.media3.common.MediaItem
+import androidx.media3.common.ParserException
+import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import androidx.media3.common.Player.STATE_READY
 import androidx.media3.common.Timeline
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlaybackException
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
@@ -57,6 +61,8 @@ import io.element.android.libraries.mediaviewer.impl.local.player.rememberExoPla
 import io.element.android.libraries.mediaviewer.impl.local.player.seekToEnsurePlaying
 import io.element.android.libraries.mediaviewer.impl.local.player.togglePlay
 import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.libraries.ui.utils.a11y.isTalkbackActive
 import kotlinx.coroutines.delay
 import me.saket.telephoto.zoomable.zoomable
 import timber.log.Timber
@@ -71,9 +77,10 @@ fun MediaVideoView(
     localMedia: LocalMedia?,
     autoplay: Boolean,
     audioFocus: AudioFocus?,
+    forPreview: Boolean,
     modifier: Modifier = Modifier,
 ) {
-    val exoPlayer = rememberExoPlayer()
+    val exoPlayer = rememberExoPlayer(forAudioOnly = false)
     ExoPlayerMediaVideoView(
         isDisplayed = isDisplayed,
         localMediaViewState = localMediaViewState,
@@ -82,6 +89,7 @@ fun MediaVideoView(
         localMedia = localMedia,
         autoplay = autoplay,
         audioFocus = audioFocus,
+        forPreview = forPreview,
         modifier = modifier,
     )
 }
@@ -96,6 +104,7 @@ private fun ExoPlayerMediaVideoView(
     localMedia: LocalMedia?,
     autoplay: Boolean,
     audioFocus: AudioFocus?,
+    forPreview: Boolean,
     modifier: Modifier = Modifier,
 ) {
     var mediaPlayerControllerState: MediaPlayerControllerState by remember {
@@ -157,17 +166,38 @@ private fun ExoPlayerMediaVideoView(
                     isReady = playbackState == STATE_READY,
                 )
             }
+
+            override fun onPlayerError(error: PlaybackException) {
+                super.onPlayerError(error)
+                Timber.w(error, "Player error")
+                if (error is ExoPlaybackException && error.cause is ParserException) {
+                    // The cause can be:
+                    // androidx.media3.common.ParserException: Invalid NAL length {contentIsMalformed=true, dataType=1}
+                    // This has been observed when the user wants to play a second time a recorded video.
+                    // Workaround the issue #6956, start the playback again
+                    exoPlayer.prepare()
+                    exoPlayer.play()
+                }
+            }
         }
     }
 
     var autoHideController by remember { mutableIntStateOf(0) }
 
-    LaunchedEffect(autoHideController) {
-        delay(5.seconds)
-        if (exoPlayer.isPlaying) {
+    val isTalkbackActive = isTalkbackActive()
+    LaunchedEffect(autoHideController, isTalkbackActive) {
+        if (isTalkbackActive) {
+            // Ensure that the controller is always visible when talkback is active
             mediaPlayerControllerState = mediaPlayerControllerState.copy(
-                isVisible = false,
+                isVisible = true,
             )
+        } else {
+            delay(5.seconds)
+            if (exoPlayer.isPlaying) {
+                mediaPlayerControllerState = mediaPlayerControllerState.copy(
+                    isVisible = false,
+                )
+            }
         }
     }
 
@@ -193,6 +223,11 @@ private fun ExoPlayerMediaVideoView(
                 text = "A Video Player will render here",
             )
         } else {
+            val videoDescription = if (forPreview) {
+                stringResource(CommonStrings.a11y_video_preview)
+            } else {
+                stringResource(CommonStrings.common_video)
+            }
             AndroidView(
                 modifier = Modifier
                     .fillMaxSize()
@@ -211,6 +246,7 @@ private fun ExoPlayerMediaVideoView(
                         resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT
                         layoutParams = FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
                         useController = false
+                        contentDescription = videoDescription
                     }
                 },
                 onRelease = { playerView ->
@@ -218,29 +254,31 @@ private fun ExoPlayerMediaVideoView(
                 },
             )
         }
-        MediaPlayerControllerView(
-            state = mediaPlayerControllerState,
-            onTogglePlay = {
-                autoHideController++
-                exoPlayer.togglePlay()
-            },
-            onSeekChange = {
-                autoHideController++
-                mediaPlayerControllerState = mediaPlayerControllerState.copy(
-                    seekingToMillis = it.toLong(),
-                )
-                exoPlayer.seekToEnsurePlaying(it.toLong())
-            },
-            onToggleMute = {
-                autoHideController++
-                exoPlayer.volume = if (exoPlayer.volume == 1f) 0f else 1f
-            },
-            audioFocus = audioFocus,
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomCenter)
-                .padding(bottom = bottomPaddingInPixels.toDp()),
-        )
+        if (localMedia != null) {
+            MediaPlayerControllerView(
+                state = mediaPlayerControllerState,
+                onTogglePlay = {
+                    autoHideController++
+                    exoPlayer.togglePlay()
+                },
+                onSeekChange = {
+                    autoHideController++
+                    mediaPlayerControllerState = mediaPlayerControllerState.copy(
+                        seekingToMillis = it.toLong(),
+                    )
+                    exoPlayer.seekToEnsurePlaying(it.toLong())
+                },
+                onToggleMute = {
+                    autoHideController++
+                    exoPlayer.volume = if (exoPlayer.volume == 1f) 0f else 1f
+                },
+                audioFocus = audioFocus,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .align(Alignment.BottomCenter)
+                    .padding(bottom = bottomPaddingInPixels.toDp()),
+            )
+        }
     }
 
     LaunchedEffect(exoPlayer.isPlaying) {
@@ -330,5 +368,6 @@ internal fun MediaVideoViewPreview() = ElementPreview {
         localMedia = null,
         audioFocus = null,
         autoplay = false,
+        forPreview = false,
     )
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt
index 90708db802..5367751a19 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItem.kt
@@ -13,6 +13,8 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 
 sealed interface MediaItem {
@@ -27,7 +29,9 @@ sealed interface MediaItem {
         val timestamp: Long,
     ) : MediaItem
 
-    sealed interface Event : MediaItem
+    sealed interface Event : MediaItem {
+        val validationState: ContentValidationState
+    }
 
     data class Image(
         val id: UniqueId,
@@ -35,6 +39,8 @@ sealed interface MediaItem {
         val mediaInfo: MediaInfo,
         val mediaSource: MediaSource,
         val thumbnailSource: MediaSource?,
+        val blurHash: String?,
+        override val validationState: ContentValidationState,
     ) : Event {
         val thumbnailMediaRequestData: MediaRequestData
             get() = MediaRequestData(thumbnailSource ?: mediaSource, MediaRequestData.Kind.Thumbnail(100))
@@ -46,6 +52,8 @@ sealed interface MediaItem {
         val mediaInfo: MediaInfo,
         val mediaSource: MediaSource,
         val thumbnailSource: MediaSource?,
+        val blurHash: String?,
+        override val validationState: ContentValidationState,
     ) : Event {
         val thumbnailMediaRequestData: MediaRequestData
             get() = MediaRequestData(thumbnailSource ?: mediaSource, MediaRequestData.Kind.Thumbnail(100))
@@ -56,6 +64,7 @@ sealed interface MediaItem {
         val eventId: EventId?,
         val mediaInfo: MediaInfo,
         val mediaSource: MediaSource,
+        override val validationState: ContentValidationState,
     ) : Event
 
     data class Voice(
@@ -63,6 +72,7 @@ sealed interface MediaItem {
         val eventId: EventId?,
         val mediaInfo: MediaInfo,
         val mediaSource: MediaSource,
+        override val validationState: ContentValidationState,
     ) : Event
 
     data class File(
@@ -70,6 +80,7 @@ sealed interface MediaItem {
         val eventId: EventId?,
         val mediaInfo: MediaInfo,
         val mediaSource: MediaSource,
+        override val validationState: ContentValidationState,
     ) : Event
 }
 
@@ -124,3 +135,16 @@ fun MediaItem.Event.thumbnailSource(): MediaSource? {
         is MediaItem.Voice -> null
     }
 }
+
+fun MediaItem.Event.blurHash(): String? {
+    return when (this) {
+        is MediaItem.Image -> blurHash
+        is MediaItem.Video -> blurHash
+        else -> null
+    }
+}
+
+fun MediaItem.isMediaValid(): Boolean? = when (this) {
+    is MediaItem.Event -> validationState.getCurrentOverallState() == ContentValidationValue.Valid
+    else -> null
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt
index be73787828..d625ebe398 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/model/MediaItemFactories.kt
@@ -14,6 +14,8 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
 import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo
 import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
 import io.element.android.libraries.mediaviewer.api.aVoiceMediaInfo
@@ -25,6 +27,8 @@ fun aMediaItemImage(
     eventId: EventId? = null,
     senderId: UserId? = null,
     mediaSourceUrl: String = "",
+    validationState: ContentValidationState = NoopContentValidationState(),
+    blurHash: String? = null,
 ): MediaItem.Image {
     return MediaItem.Image(
         id = id,
@@ -34,6 +38,8 @@ fun aMediaItemImage(
         ),
         mediaSource = MediaSource(mediaSourceUrl),
         thumbnailSource = null,
+        blurHash = blurHash,
+        validationState = validationState,
     )
 }
 
@@ -41,6 +47,7 @@ fun aMediaItemVideo(
     id: UniqueId = UniqueId("videoId"),
     mediaSource: MediaSource = MediaSource(""),
     duration: String? = "1:23",
+    validationState: ContentValidationState = NoopContentValidationState(),
 ): MediaItem.Video {
     return MediaItem.Video(
         id = id,
@@ -50,6 +57,8 @@ fun aMediaItemVideo(
         ),
         mediaSource = mediaSource,
         thumbnailSource = null,
+        blurHash = null,
+        validationState = validationState,
     )
 }
 
@@ -58,6 +67,7 @@ fun aMediaItemFile(
     eventId: EventId? = null,
     filename: String = "filename",
     caption: String? = null,
+    validationState: ContentValidationState = NoopContentValidationState(),
 ): MediaItem.File {
     return MediaItem.File(
         id = id,
@@ -67,6 +77,7 @@ fun aMediaItemFile(
             caption = caption,
         ),
         mediaSource = MediaSource(""),
+        validationState = validationState,
     )
 }
 
@@ -75,6 +86,7 @@ fun aMediaItemAudio(
     eventId: EventId? = null,
     filename: String = "filename",
     caption: String? = null,
+    validationState: ContentValidationState = NoopContentValidationState(),
 ): MediaItem.Audio {
     return MediaItem.Audio(
         id = id,
@@ -84,6 +96,7 @@ fun aMediaItemAudio(
             caption = caption,
         ),
         mediaSource = MediaSource(""),
+        validationState = validationState,
     )
 }
 
@@ -93,6 +106,7 @@ fun aMediaItemVoice(
     caption: String? = null,
     duration: String? = "1:23",
     waveform: List<Float> = WaveFormSamples.realisticWaveForm,
+    validationState: ContentValidationState = NoopContentValidationState(),
 ): MediaItem.Voice {
     return MediaItem.Voice(
         id = id,
@@ -104,6 +118,7 @@ fun aMediaItemVoice(
             waveForm = waveform,
         ),
         mediaSource = MediaSource(""),
+        validationState = validationState,
     )
 }
 
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSource.kt
new file mode 100644
index 0000000000..c8b1de07aa
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSource.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.impl.viewer
+
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UniqueId
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.mediaviewer.api.GalleryInfo
+import io.element.android.libraries.mediaviewer.api.GalleryItemData
+import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource
+import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
+import io.element.android.libraries.mediaviewer.impl.model.MediaItem
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.flowOf
+
+class GalleryMediaGalleryDataSource(
+    private val data: GroupedMediaItems,
+) : MediaGalleryDataSource {
+    override val isReady: Boolean = true
+    override fun start(coroutineScope: CoroutineScope) = Unit
+    override fun groupedMediaItemsFlow() = flowOf(AsyncData.Success(data))
+    override fun getLastData(): AsyncData<GroupedMediaItems> = AsyncData.Success(data)
+    override suspend fun loadMore(direction: Timeline.PaginationDirection) = Unit
+    override suspend fun deleteItem(eventId: EventId) = Unit
+
+    companion object {
+        fun createFrom(
+            eventId: EventId?,
+            galleryItems: List<GalleryItemData>,
+            galleryInfo: GalleryInfo,
+            contentValidationState: ContentValidationState,
+        ): GalleryMediaGalleryDataSource {
+            val mixedItems = mutableListOf<MediaItem.Event>()
+            galleryItems.forEachIndexed { index, galleryItem ->
+                val itemMediaInfo = MediaInfo(
+                    filename = galleryItem.filename,
+                    fileSize = null,
+                    caption = galleryInfo.caption,
+                    mimeType = galleryItem.mimeType,
+                    formattedFileSize = "",
+                    fileExtension = galleryItem.filename.substringAfterLast('.', ""),
+                    senderId = galleryInfo.senderId,
+                    senderName = galleryInfo.senderName,
+                    senderAvatar = galleryInfo.senderAvatar,
+                    dateSent = galleryInfo.dateSent,
+                    dateSentFull = galleryInfo.dateSentFull,
+                    waveform = null,
+                    duration = null,
+                )
+                val id = UniqueId("${eventId?.value ?: "gallery"}_$index")
+                val mediaItem: MediaItem.Event = when (galleryItem.type) {
+                    GalleryItemData.Type.Video -> MediaItem.Video(
+                        id = id,
+                        eventId = eventId,
+                        mediaInfo = itemMediaInfo,
+                        mediaSource = galleryItem.mediaSource,
+                        thumbnailSource = galleryItem.thumbnailSource,
+                        blurHash = galleryItem.blurHash,
+                        validationState = contentValidationState,
+                    )
+                    GalleryItemData.Type.Audio -> MediaItem.Audio(
+                        id = id,
+                        eventId = eventId,
+                        mediaInfo = itemMediaInfo,
+                        mediaSource = galleryItem.mediaSource,
+                        validationState = contentValidationState,
+                    )
+                    GalleryItemData.Type.File -> MediaItem.File(
+                        id = id,
+                        eventId = eventId,
+                        mediaInfo = itemMediaInfo,
+                        mediaSource = galleryItem.mediaSource,
+                        validationState = contentValidationState,
+                    )
+                    GalleryItemData.Type.Image -> MediaItem.Image(
+                        id = id,
+                        eventId = eventId,
+                        mediaInfo = itemMediaInfo,
+                        mediaSource = galleryItem.mediaSource,
+                        thumbnailSource = galleryItem.thumbnailSource,
+                        blurHash = galleryItem.blurHash,
+                        validationState = contentValidationState,
+                    )
+                }
+                mixedItems.add(mediaItem)
+            }
+            return GalleryMediaGalleryDataSource(
+                data = GroupedMediaItems(
+                    imageAndVideoItems = mixedItems.toImmutableList(),
+                    fileItems = persistentListOf(),
+                )
+            )
+        }
+    }
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt
index 928e5d9ca8..e1be702c9c 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSource.kt
@@ -11,15 +11,23 @@ package io.element.android.libraries.mediaviewer.impl.viewer
 import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.ProduceStateScope
 import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.rememberUpdatedState
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.core.extensions.mapCatchingExceptions
+import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaFile
+import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint.MediaViewerMode
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
@@ -35,77 +43,110 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
 
 class MediaViewerDataSource(
     mode: MediaViewerMode,
+    coroutineScope: CoroutineScope,
     private val dispatcher: CoroutineDispatcher,
     private val galleryDataSource: MediaGalleryDataSource,
     private val mediaLoader: MatrixMediaLoader,
     private val localMediaFactory: LocalMediaFactory,
     private val systemClock: SystemClock,
     private val pagerKeysHandler: PagerKeysHandler,
+    private val contentScannerService: ContentScannerService,
+    private val contentValidationCache: EventContentValidationCache,
 ) {
     // List of media files that are currently being loaded
-    private val mediaFiles: MutableList<MediaFile> = mutableListOf()
+    private val mediaFiles: ConcurrentHashMap<MediaSource, MediaFile> = ConcurrentHashMap()
 
     private val galleryMode = when (mode) {
-        MediaViewerMode.SingleMedia,
         is MediaViewerMode.TimelineImagesAndVideos -> MediaGalleryMode.Images
         is MediaViewerMode.TimelineFilesAndAudios -> MediaGalleryMode.Files
+        is MediaViewerMode.EventGallery -> MediaGalleryMode.Images
     }
 
     // Map of sourceUrl to local media state
     private val localMediaStates: MutableMap<String, MutableState<AsyncData<LocalMedia>>> =
         mutableMapOf()
 
-    fun setup() {
-        galleryDataSource.start()
+    private val mediaValidationState: MutableMap<String, ContentValidationState> =
+        mutableMapOf()
+
+    fun setup(coroutineScope: CoroutineScope) {
+        galleryDataSource.start(coroutineScope)
     }
 
     fun dispose() {
-        mediaFiles.forEach { it.close() }
+        Timber.d("Disposing MediaViewerDataSource, closing ${mediaFiles.size} media files")
+        mediaFiles.values.forEach { it.close() }
         mediaFiles.clear()
         localMediaStates.clear()
     }
 
+    /**
+     * Helper function to translate the [dataFlow] result to a Compose [State] that can be observed in the UI.
+     */
     @Composable
-    fun collectAsState(): State<ImmutableList<MediaViewerPageData>> {
-        return remember { dataFlow() }.collectAsState(initialData())
+    fun produceState(
+        producer: suspend ProduceStateScope<ImmutableList<MediaViewerPageData>>.(StateFlow<ImmutableList<MediaViewerPageData>>) -> Unit
+    ): State<ImmutableList<MediaViewerPageData>> {
+        val latestProducer by rememberUpdatedState(producer)
+        return produceState(initialValue = initialData()) {
+            latestProducer(dataFlow)
+        }
+    }
+
+    /**
+     * Find the index of the page corresponding to the given eventId, or null if not found.
+     */
+    fun findEventIndex(eventId: EventId?, mediaSource: MediaSource? = null): Int? {
+        if (eventId == null) return null
+        return dataFlow.value.indexOfFirst {
+            val pageData = it as? MediaViewerPageData.MediaViewerData
+            pageData?.eventId == eventId && (mediaSource == null || pageData.mediaSource == mediaSource)
+        }.takeIf { it >= 0 }
     }
 
     @VisibleForTesting
-    internal fun dataFlow(): Flow<ImmutableList<MediaViewerPageData>> {
-        return galleryDataSource.groupedMediaItemsFlow()
-            .map { groupedItems ->
-                when (groupedItems) {
-                    AsyncData.Uninitialized,
-                    is AsyncData.Loading -> {
-                        persistentListOf(
-                            MediaViewerPageData.Loading(
-                                direction = Timeline.PaginationDirection.BACKWARDS,
-                                timestamp = systemClock.epochMillis(),
-                                pagerKey = Long.MIN_VALUE,
-                            )
+    internal val dataFlow: StateFlow<ImmutableList<MediaViewerPageData>> = galleryDataSource.groupedMediaItemsFlow()
+        .map { groupedItems ->
+            when (groupedItems) {
+                AsyncData.Uninitialized,
+                is AsyncData.Loading -> {
+                    persistentListOf(
+                        MediaViewerPageData.Loading(
+                            direction = Timeline.PaginationDirection.BACKWARDS,
+                            timestamp = systemClock.epochMillis(),
+                            pagerKey = Long.MIN_VALUE,
                         )
-                    }
-                    is AsyncData.Failure -> {
-                        persistentListOf(
-                            MediaViewerPageData.Failure(groupedItems.error),
-                        )
-                    }
-                    is AsyncData.Success -> {
-                        withContext(dispatcher) {
-                            val mediaItems = groupedItems.data.getItems(galleryMode)
-                            buildMediaViewerPageList(mediaItems)
-                        }
+                    )
+                }
+                is AsyncData.Failure -> {
+                    persistentListOf(
+                        MediaViewerPageData.Failure(groupedItems.error),
+                    )
+                }
+                is AsyncData.Success -> {
+                    withContext(dispatcher) {
+                        val mediaItems = groupedItems.data.getItems(galleryMode)
+                        buildMediaViewerPageList(mediaItems)
                     }
                 }
             }
-    }
+        }
+        .stateIn(
+            scope = CoroutineScope(coroutineScope.coroutineContext + dispatcher),
+            started = SharingStarted.Lazily,
+            initialValue = initialData(),
+        )
 
     private fun initialData(): ImmutableList<MediaViewerPageData> {
         val initialMediaItems =
@@ -130,6 +171,9 @@ class MediaViewerDataSource(
                     val localMedia = localMediaStates.getOrPut(sourceUrl) {
                         mutableStateOf(AsyncData.Uninitialized)
                     }
+                    val validationState = mediaValidationState.getOrPut(sourceUrl) {
+                        mediaItem.eventId()?.let { contentValidationCache[it] } ?: DefaultContentValidationState()
+                    }
                     add(
                         MediaViewerPageData.MediaViewerData(
                             eventId = mediaItem.eventId(),
@@ -138,13 +182,14 @@ class MediaViewerDataSource(
                             thumbnailSource = mediaItem.thumbnailSource(),
                             downloadedMedia = localMedia,
                             pagerKey = pagerKeysHandler.getKey(mediaItem),
+                            validationState = validationState,
                         )
                     )
                 }
                 is MediaItem.LoadingIndicator -> add(
                     MediaViewerPageData.Loading(
                         direction = mediaItem.direction,
-                        timestamp = systemClock.epochMillis(),
+                        timestamp = mediaItem.timestamp,
                         pagerKey = pagerKeysHandler.getKey(mediaItem),
                     )
                 )
@@ -157,10 +202,18 @@ class MediaViewerDataSource(
     }
 
     suspend fun loadMore(direction: Timeline.PaginationDirection) {
-        galleryDataSource.loadMore(direction)
+        if (galleryDataSource.isReady) {
+            galleryDataSource.loadMore(direction)
+        }
     }
 
     suspend fun loadMedia(data: MediaViewerPageData.MediaViewerData) {
+        val currentState = localMediaStates[data.mediaSource.safeUrl]?.value
+        // If the media is already loading or has been loaded successfully, do nothing
+        if (currentState?.isLoading() == true || currentState?.isSuccess() == true) {
+            return
+        }
+
         Timber.d("loadMedia for ${data.eventId}")
         val localMediaState = localMediaStates.getOrPut(data.mediaSource.safeUrl) {
             mutableStateOf(AsyncData.Uninitialized)
@@ -173,7 +226,7 @@ class MediaViewerDataSource(
                 filename = data.mediaInfo.filename
             )
             .onSuccess { mediaFile ->
-                mediaFiles.add(mediaFile)
+                mediaFiles[data.mediaSource] = mediaFile
             }
             .mapCatchingExceptions { mediaFile ->
                 localMediaFactory.createFromMediaFile(
@@ -188,4 +241,23 @@ class MediaViewerDataSource(
                 localMediaState.value = AsyncData.Failure(it)
             }
     }
+
+    fun validateMedia(mediaSource: MediaSource, thumbnailMediaSource: MediaSource?) {
+        val validationState = mediaValidationState[mediaSource.safeUrl] ?: return
+        val currentState = validationState.getCurrentOverallState()
+
+        if (currentState.isLoading() || currentState.isValid()) {
+            return
+        }
+
+        contentScannerService.scan(listOfNotNull(mediaSource, thumbnailMediaSource), validationState)
+    }
+
+    fun cancelLoadingMedia(data: MediaViewerPageData.MediaViewerData) {
+        if (localMediaStates[data.mediaSource.safeUrl]?.value?.isLoading() == true) {
+            Timber.d("cancelLoadingMedia for ${data.eventId}")
+            mediaFiles.remove(data.mediaSource)?.close()
+            localMediaStates[data.mediaSource.safeUrl]?.value = AsyncData.Uninitialized
+        }
+    }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvent.kt
similarity index 57%
rename from libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt
rename to libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvent.kt
index 3f1436b9b6..8374294075 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvents.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerEvent.kt
@@ -9,24 +9,27 @@
 package io.element.android.libraries.mediaviewer.impl.viewer
 
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
 
-sealed interface MediaViewerEvents {
-    data class LoadMedia(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
-    data class SaveOnDisk(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
-    data class Share(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
-    data class OpenWith(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
-    data class ClearLoadingError(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
-    data class ViewInTimeline(val eventId: EventId) : MediaViewerEvents
-    data class Forward(val eventId: EventId) : MediaViewerEvents
-    data class OpenInfo(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvents
+sealed interface MediaViewerEvent {
+    data class LoadMedia(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class SaveOnDisk(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class Share(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class OpenWith(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class ClearLoadingError(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class ViewInTimeline(val eventId: EventId) : MediaViewerEvent
+    data class Forward(val eventId: EventId) : MediaViewerEvent
+    data class OpenInfo(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
     data class ConfirmDelete(
         val eventId: EventId,
         val data: MediaViewerPageData.MediaViewerData,
-    ) : MediaViewerEvents
+    ) : MediaViewerEvent
 
-    data object CloseBottomSheet : MediaViewerEvents
-    data class Delete(val eventId: EventId) : MediaViewerEvents
-    data class OnNavigateTo(val index: Int) : MediaViewerEvents
-    data class LoadMore(val direction: Timeline.PaginationDirection) : MediaViewerEvents
+    data object CloseBottomSheet : MediaViewerEvent
+    data class Delete(val eventId: EventId) : MediaViewerEvent
+    data class OnNavigateTo(val index: Int) : MediaViewerEvent
+    data class LoadMore(val direction: Timeline.PaginationDirection) : MediaViewerEvent
+    data class CancelLoadingMedia(val data: MediaViewerPageData.MediaViewerData) : MediaViewerEvent
+    data class ValidateMedia(val mediaSource: MediaSource, val thumbnailMediaSource: MediaSource?) : MediaViewerEvent
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
index d834534e3e..e53153ce19 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerNode.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
@@ -21,6 +22,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.compound.theme.ForcedDarkElementTheme
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.viewfolder.api.TextFileViewer
 import io.element.android.libraries.architecture.callback
@@ -32,6 +34,8 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
 import io.element.android.libraries.mediaviewer.impl.datasource.FocusedTimelineMediaGalleryDataSourceFactory
@@ -56,6 +60,8 @@ class MediaViewerNode(
     private val audioFocus: AudioFocus,
     private val sessionId: SessionId,
     private val enterpriseService: EnterpriseService,
+    private val contentScannerService: ContentScannerService,
+    private val contentValidationCache: EventContentValidationCache,
 ) : Node(buildContext, plugins = plugins),
     MediaViewerNavigator {
     private val callback: MediaViewerEntryPoint.Callback = callback()
@@ -73,42 +79,52 @@ class MediaViewerNode(
         callback.onDone()
     }
 
-    private val mediaGallerySource = if (inputs.mode == MediaViewerEntryPoint.MediaViewerMode.SingleMedia) {
-        SingleMediaGalleryDataSource.createFrom(inputs)
-    } else {
-        val eventId = inputs.eventId
-        if (eventId == null) {
-            // Should not happen
-            timelineMediaGalleryDataSource
-        } else {
-            // Can we use a specific timeline?
-            val timelineMode = inputs.mode.getTimelineMode()
-            when (timelineMode) {
-                null -> timelineMediaGalleryDataSource
-                Timeline.Mode.Live,
-                is Timeline.Mode.FocusedOnEvent,
-                is Timeline.Mode.Thread -> {
-                    // Does timelineMediaGalleryDataSource knows the eventId?
-                    val lastData = timelineMediaGalleryDataSource.getLastData().dataOrNull()
-                    val isEventKnown = lastData?.hasEvent(eventId) == true
-                    if (isEventKnown) {
-                        timelineMediaGalleryDataSource
-                    } else {
+    private val mediaGallerySource = when (inputs) {
+        is MediaViewerEntryPoint.Params.Avatar ->
+            SingleMediaGalleryDataSource.createFrom(inputs, contentValidationCache)
+        is MediaViewerEntryPoint.Params.EventGallery ->
+            GalleryMediaGalleryDataSource.createFrom(
+                eventId = inputs.eventId,
+                galleryItems = inputs.galleryItems,
+                galleryInfo = inputs.galleryInfo,
+                contentValidationState = inputs.eventId?.let { contentValidationCache[it] } ?: NoopContentValidationState(),
+            )
+        is MediaViewerEntryPoint.Params.RoomMedia -> {
+            val eventId = inputs.eventId
+            if (eventId == null) {
+                // Should not happen
+                timelineMediaGalleryDataSource
+            } else {
+                // Can we use a specific timeline?
+                val timelineMode = inputs.mode.getTimelineMode()
+                when (timelineMode) {
+                    Timeline.Mode.Live,
+                    is Timeline.Mode.FocusedOnEvent,
+                    is Timeline.Mode.Thread -> {
+                        // Does timelineMediaGalleryDataSource knows the eventId?
+                        val lastData = timelineMediaGalleryDataSource.getLastData().dataOrNull()
+                        val isEventKnown = lastData?.hasEvent(eventId) == true
+                        if (isEventKnown) {
+                            timelineMediaGalleryDataSource
+                        } else {
+                            focusedTimelineMediaGalleryDataSourceFactory.createFor(
+                                eventId = eventId,
+                                mediaItem = inputs.toMediaItem(contentValidationCache[eventId]),
+                                onlyPinnedEvents = false,
+                            )
+                        }
+                    }
+                    Timeline.Mode.PinnedEvents -> {
                         focusedTimelineMediaGalleryDataSourceFactory.createFor(
                             eventId = eventId,
-                            mediaItem = inputs.toMediaItem(),
-                            onlyPinnedEvents = false,
+                            mediaItem = inputs.toMediaItem(contentValidationCache[eventId]),
+                            onlyPinnedEvents = true,
                         )
                     }
+                    Timeline.Mode.Media -> timelineMediaGalleryDataSource
+                    // null should not happen, input should be MediaViewerEntryPoint.Params.EventGallery in this case
+                    null -> timelineMediaGalleryDataSource
                 }
-                Timeline.Mode.PinnedEvents -> {
-                    focusedTimelineMediaGalleryDataSourceFactory.createFor(
-                        eventId = eventId,
-                        mediaItem = inputs.toMediaItem(),
-                        onlyPinnedEvents = true,
-                    )
-                }
-                Timeline.Mode.Media -> timelineMediaGalleryDataSource
             }
         }
     }
@@ -117,13 +133,23 @@ class MediaViewerNode(
         inputs = inputs,
         navigator = this,
         dataSource = MediaViewerDataSource(
-            mode = inputs.mode,
+            mode = when (inputs) {
+                is MediaViewerEntryPoint.Params.Avatar ->
+                    MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media)
+                is MediaViewerEntryPoint.Params.EventGallery ->
+                    MediaViewerEntryPoint.MediaViewerMode.EventGallery(fromPinnedMessages = inputs.fromPinnedMessages)
+                is MediaViewerEntryPoint.Params.RoomMedia ->
+                    inputs.mode
+            },
+            coroutineScope = lifecycleScope,
             dispatcher = coroutineDispatchers.computation,
             galleryDataSource = mediaGallerySource,
             mediaLoader = mediaLoader,
             localMediaFactory = localMediaFactory,
             systemClock = systemClock,
             pagerKeysHandler = pagerKeysHandler,
+            contentScannerService = contentScannerService,
+            contentValidationCache = contentValidationCache,
         )
     )
 
@@ -151,6 +177,6 @@ internal fun MediaViewerEntryPoint.MediaViewerMode.getTimelineMode(): Timeline.M
     return when (this) {
         is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> timelineMode
         is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> timelineMode
-        else -> null
+        is MediaViewerEntryPoint.MediaViewerMode.EventGallery -> null
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
index dc0feb70cf..35dc4d97ba 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
@@ -14,14 +14,12 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.IntState
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
@@ -44,11 +42,10 @@ import io.element.android.libraries.mediaviewer.impl.model.MediaPermissions
 import io.element.android.libraries.mediaviewer.impl.model.mediaPermissions
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import io.element.android.libraries.androidutils.R as UtilsR
 
@@ -72,15 +69,42 @@ class MediaViewerPresenter(
     // Use a local snackbarDispatcher because this presenter is used in an Overlay Node
     private val snackbarDispatcher = SnackbarDispatcher()
 
+    private val eventId = inputs.eventId()
+    private val mediaSource = inputs.mediaSource()
+
+    @OptIn(ExperimentalCoroutinesApi::class)
     @Composable
     override fun present(): MediaViewerState {
         val coroutineScope = rememberCoroutineScope()
-        val data = dataSource.collectAsState()
-        val currentIndex = remember { mutableIntStateOf(searchIndex(data.value, inputs.eventId)) }
+        val currentIndex = remember {
+            val firstIndex = if (inputs is MediaViewerEntryPoint.Params.EventGallery) {
+                // Order is reversed so we have to reverse the index
+                inputs.galleryItems.lastIndex - inputs.galleryInfo.initialIndex
+            } else {
+                dataSource.findEventIndex(eventId, mediaSource) ?: 0
+            }
+            mutableIntStateOf(firstIndex)
+        }
+        val data = dataSource.produceState { flow ->
+            flow.collectLatest { new ->
+                val existingItem = value.getOrNull(currentIndex.intValue)
+                val newItem = new.getOrNull(currentIndex.intValue)
+                if (existingItem is MediaViewerPageData.MediaViewerData && existingItem.eventId == eventId && newItem != existingItem) {
+                    currentIndex.intValue = dataSource.findEventIndex(eventId, mediaSource) ?: 0
+                } else if (currentIndex.intValue > 0 && value.firstOrNull() is MediaViewerPageData.Loading &&
+                    new.firstOrNull() !is MediaViewerPageData.Loading) {
+                    // Restore index based on the eventId after the initial items have been loaded
+                    currentIndex.intValue = dataSource.findEventIndex(eventId, mediaSource) ?: 0
+                }
+                value = new.toImmutableList()
+            }
+        }
+
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
 
-        NoMoreItemsBackwardSnackBarDisplayer(currentIndex, data)
-        NoMoreItemsForwardSnackBarDisplayer(currentIndex, data)
+        // Add both forward and backward pagination state checks to display a snackbar when there is no more items to load in either direction
+        NoMoreItemsSnackBarDisplayer(currentIndex, data, Timeline.PaginationDirection.FORWARDS)
+        NoMoreItemsSnackBarDisplayer(currentIndex, data, Timeline.PaginationDirection.BACKWARDS)
 
         val permissions by room.permissionsAsState(MediaPermissions.DEFAULT) { perms ->
             perms.mediaPermissions()
@@ -88,50 +112,62 @@ class MediaViewerPresenter(
         var mediaBottomSheetState by remember { mutableStateOf<MediaBottomSheetState>(MediaBottomSheetState.Hidden) }
 
         DisposableEffect(Unit) {
-            dataSource.setup()
+            dataSource.setup(coroutineScope)
             onDispose {
                 dataSource.dispose()
             }
         }
         localMediaActions.Configure()
 
-        fun handleEvent(event: MediaViewerEvents) {
+        fun handleEvent(event: MediaViewerEvent) {
             when (event) {
-                is MediaViewerEvents.LoadMedia -> {
+                is MediaViewerEvent.LoadMedia -> {
                     coroutineScope.downloadMedia(data = event.data)
                 }
-                is MediaViewerEvents.ClearLoadingError -> {
+                is MediaViewerEvent.CancelLoadingMedia -> {
+                    dataSource.cancelLoadingMedia(event.data)
+                }
+                is MediaViewerEvent.ClearLoadingError -> {
                     dataSource.clearLoadingError(event.data)
                 }
-                is MediaViewerEvents.SaveOnDisk -> {
+                is MediaViewerEvent.SaveOnDisk -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     coroutineScope.saveOnDisk(event.data.downloadedMedia.value)
                 }
-                is MediaViewerEvents.Share -> {
+                is MediaViewerEvent.Share -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     coroutineScope.share(event.data.downloadedMedia.value)
                 }
-                is MediaViewerEvents.OpenWith -> {
+                is MediaViewerEvent.OpenWith -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     coroutineScope.open(event.data.downloadedMedia.value)
                 }
-                is MediaViewerEvents.Delete -> {
+                is MediaViewerEvent.Delete -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     coroutineScope.delete(event.eventId)
                 }
-                is MediaViewerEvents.ViewInTimeline -> {
+                is MediaViewerEvent.ViewInTimeline -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onViewInTimelineClick(event.eventId)
                 }
-                is MediaViewerEvents.Forward -> {
+                is MediaViewerEvent.Forward -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                     navigator.onForwardClick(
                         eventId = event.eventId,
-                        fromPinnedEvents = inputs.mode.getTimelineMode() == Timeline.Mode.PinnedEvents,
+                        fromPinnedEvents = when (inputs) {
+                            is MediaViewerEntryPoint.Params.RoomMedia -> when (val myMode = inputs.mode) {
+                                is MediaViewerEntryPoint.MediaViewerMode.EventGallery -> myMode.fromPinnedMessages
+                                is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> myMode.getTimelineMode() == Timeline.Mode.PinnedEvents
+                                is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> myMode.getTimelineMode() == Timeline.Mode.PinnedEvents
+                            }
+                            is MediaViewerEntryPoint.Params.EventGallery -> inputs.fromPinnedMessages
+                            is MediaViewerEntryPoint.Params.Avatar -> false
+                        },
                     )
                 }
-                is MediaViewerEvents.OpenInfo -> coroutineScope.launch {
-                    mediaBottomSheetState = MediaBottomSheetState.MediaDetailsBottomSheetState(
+                is MediaViewerEvent.OpenInfo -> coroutineScope.launch {
+                    mediaBottomSheetState = MediaBottomSheetState.Details(
+                        fromGallery = false,
                         eventId = event.data.eventId,
                         canDelete = when (event.data.mediaInfo.senderId) {
                             null -> false
@@ -142,92 +178,85 @@ class MediaViewerPresenter(
                         thumbnailSource = event.data.thumbnailSource,
                     )
                 }
-                is MediaViewerEvents.ConfirmDelete -> {
-                    mediaBottomSheetState = MediaBottomSheetState.MediaDeleteConfirmationState(
+                is MediaViewerEvent.ConfirmDelete -> {
+                    mediaBottomSheetState = MediaBottomSheetState.DeleteConfirmation(
                         eventId = event.eventId,
                         mediaInfo = event.data.mediaInfo,
                         thumbnailSource = event.data.thumbnailSource ?: event.data.mediaSource,
                     )
                 }
-                MediaViewerEvents.CloseBottomSheet -> {
+                MediaViewerEvent.CloseBottomSheet -> {
                     mediaBottomSheetState = MediaBottomSheetState.Hidden
                 }
-                is MediaViewerEvents.OnNavigateTo -> {
+                is MediaViewerEvent.OnNavigateTo -> {
                     currentIndex.intValue = event.index
                 }
-                is MediaViewerEvents.LoadMore -> coroutineScope.launch {
+                is MediaViewerEvent.LoadMore -> coroutineScope.launch {
                     dataSource.loadMore(event.direction)
                 }
+                is MediaViewerEvent.ValidateMedia -> dataSource.validateMedia(event.mediaSource, event.thumbnailMediaSource)
             }
         }
 
         return MediaViewerState(
-            initiallySelectedEventId = inputs.eventId,
+            initiallySelectedEventId = eventId,
             listData = data.value,
             currentIndex = currentIndex.intValue,
             snackbarMessage = snackbarMessage,
-            canShowInfo = inputs.canShowInfo,
+            canShowInfo = inputs !is MediaViewerEntryPoint.Params.Avatar,
             mediaBottomSheetState = mediaBottomSheetState,
             eventSink = ::handleEvent,
         )
     }
 
     @Composable
-    private fun NoMoreItemsBackwardSnackBarDisplayer(
+    private fun NoMoreItemsSnackBarDisplayer(
         currentIndex: IntState,
         data: State<ImmutableList<MediaViewerPageData>>,
+        direction: Timeline.PaginationDirection,
     ) {
-        val isRenderingLoadingBackward by remember {
-            derivedStateOf {
-                currentIndex.intValue == data.value.lastIndex &&
-                    data.value.size > 1 &&
-                    data.value.lastOrNull() is MediaViewerPageData.Loading
+        var previousIndex by remember { mutableIntStateOf(currentIndex.intValue) }
+        var previousDataSize by remember { mutableIntStateOf(data.value.size) }
+        var wasLoading: Boolean? by remember { mutableStateOf(null) }
+        LaunchedEffect(currentIndex.intValue, data.value) {
+            fun isLoading(index: Int, data: List<MediaViewerPageData>, direction: Timeline.PaginationDirection): Boolean {
+                return when (direction) {
+                    Timeline.PaginationDirection.BACKWARDS -> index == data.lastIndex && data.lastOrNull() is MediaViewerPageData.Loading
+                    Timeline.PaginationDirection.FORWARDS -> index == 0 && data.firstOrNull() is MediaViewerPageData.Loading
+                }
             }
-        }
-        if (isRenderingLoadingBackward) {
-            LaunchedEffect(Unit) {
-                // Observe the loading data vanishing
-                snapshotFlow { data.value.lastOrNull() is MediaViewerPageData.Loading }
-                    .distinctUntilChanged()
-                    .filter { !it }
-                    .onEach { showNoMoreItemsSnackbar() }
-                    .launchIn(this)
+            // Reset the effect when the user navigate to another item so we only take into account index changes caused by data changes
+            if (previousIndex != currentIndex.intValue) {
+                wasLoading = null
+                previousIndex = currentIndex.intValue
+            }
+            // If we were navigating backwards and the data size grew, we can discard the previous value: it means we received new items
+            if (direction == Timeline.PaginationDirection.BACKWARDS && previousDataSize < data.value.size) {
+                wasLoading = null
             }
-        }
-    }
 
-    @Composable
-    private fun NoMoreItemsForwardSnackBarDisplayer(
-        currentIndex: IntState,
-        data: State<ImmutableList<MediaViewerPageData>>,
-    ) {
-        val isRenderingLoadingForward by remember {
-            derivedStateOf {
-                currentIndex.intValue == 0 &&
-                    data.value.size > 1 &&
-                    data.value.firstOrNull() is MediaViewerPageData.Loading
-            }
-        }
-        if (isRenderingLoadingForward) {
-            LaunchedEffect(Unit) {
-                // Observe the loading data vanishing
-                snapshotFlow { data.value.firstOrNull() is MediaViewerPageData.Loading }
-                    .distinctUntilChanged()
-                    .filter { !it }
-                    .onEach { showNoMoreItemsSnackbar() }
-                    .launchIn(this)
+            val isLoading = isLoading(currentIndex.intValue, data.value, direction)
+
+            if (wasLoading == true && !isLoading) {
+                showNoMoreItemsSnackbar()
             }
+
+            previousDataSize = data.value.size
+            wasLoading = isLoading
         }
     }
 
     private fun showNoMoreItemsSnackbar() {
-        val messageResId = when (inputs.mode) {
-            MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
-            is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> R.string.screen_media_details_no_more_media_to_show
-            is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> R.string.screen_media_details_no_more_files_to_show
+        if (inputs is MediaViewerEntryPoint.Params.RoomMedia) {
+            val messageResId = when (inputs.mode) {
+                is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> R.string.screen_media_details_no_more_media_to_show
+                is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> R.string.screen_media_details_no_more_files_to_show
+                // Should not happen
+                is MediaViewerEntryPoint.MediaViewerMode.EventGallery -> R.string.screen_media_details_no_more_media_to_show
+            }
+            val message = SnackbarMessage(messageResId)
+            snackbarDispatcher.post(message)
         }
-        val message = SnackbarMessage(messageResId)
-        snackbarDispatcher.post(message)
     }
 
     private fun CoroutineScope.downloadMedia(
@@ -288,13 +317,16 @@ class MediaViewerPresenter(
             CommonStrings.error_unknown
         }
     }
-
-    private fun searchIndex(data: List<MediaViewerPageData>, eventId: EventId?): Int {
-        if (eventId == null) {
-            return 0
-        }
-        return data.indexOfFirst {
-            (it as? MediaViewerPageData.MediaViewerData)?.eventId == eventId
-        }.coerceAtLeast(0)
-    }
+}
+
+private fun MediaViewerEntryPoint.Params.eventId() = when (this) {
+    is MediaViewerEntryPoint.Params.Avatar -> null
+    is MediaViewerEntryPoint.Params.EventGallery -> eventId
+    is MediaViewerEntryPoint.Params.RoomMedia -> eventId
+}
+
+private fun MediaViewerEntryPoint.Params.mediaSource() = when (this) {
+    is MediaViewerEntryPoint.Params.Avatar -> mediaSource
+    is MediaViewerEntryPoint.Params.EventGallery -> null
+    is MediaViewerEntryPoint.Params.RoomMedia -> mediaSource
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt
index ae1a422a6f..03803708af 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerState.kt
@@ -8,12 +8,14 @@
 
 package io.element.android.libraries.mediaviewer.impl.viewer
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.State
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
@@ -26,9 +28,10 @@ data class MediaViewerState(
     val snackbarMessage: SnackbarMessage?,
     val canShowInfo: Boolean,
     val mediaBottomSheetState: MediaBottomSheetState,
-    val eventSink: (MediaViewerEvents) -> Unit,
+    val eventSink: (MediaViewerEvent) -> Unit,
 )
 
+@Immutable
 sealed interface MediaViewerPageData {
     val pagerKey: Long
 
@@ -49,6 +52,7 @@ sealed interface MediaViewerPageData {
         val mediaSource: MediaSource,
         val thumbnailSource: MediaSource?,
         val downloadedMedia: State<AsyncData<LocalMedia>>,
+        val validationState: ContentValidationState,
         override val pagerKey: Long,
     ) : MediaViewerPageData
 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt
index 85aecc41a8..440d366c30 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerStateProvider.kt
@@ -13,9 +13,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.components.media.WaveFormSamples
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.aPdfMediaInfo
 import io.element.android.libraries.mediaviewer.api.aTxtMediaInfo
@@ -25,10 +29,18 @@ import io.element.android.libraries.mediaviewer.api.anAudioMediaInfo
 import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
-import io.element.android.libraries.mediaviewer.impl.details.aMediaDeleteConfirmationState
-import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState
+import io.element.android.libraries.mediaviewer.impl.details.aMediaBottomSheetStateDeleteConfirmation
+import io.element.android.libraries.mediaviewer.impl.details.aMediaBottomSheetStateDetails
 import kotlinx.collections.immutable.toImmutableList
 
+private const val LONG_CAPTION = "This is a very long caption that should be scrollable in the media viewer. " +
+    "It contains multiple lines of text to demonstrate the scrolling behavior. " +
+    "Line 1: Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
+    "Line 2: Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " +
+    "Line 3: Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris. " +
+    "Line 4: Duis aute irure dolor in reprehenderit in voluptate velit esse cillum. " +
+    "Line 5: Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia."
+
 open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState> {
     override val values: Sequence<MediaViewerState>
         get() = sequenceOf(
@@ -133,10 +145,10 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
                 )
             },
             aMediaViewerState(
-                mediaBottomSheetState = aMediaDetailsBottomSheetState(),
+                mediaBottomSheetState = aMediaBottomSheetStateDetails(),
             ),
             aMediaViewerState(
-                mediaBottomSheetState = aMediaDeleteConfirmationState(),
+                mediaBottomSheetState = aMediaBottomSheetStateDeleteConfirmation(),
             ),
             anAudioMediaInfo(
                 waveForm = WaveFormSamples.realisticWaveForm,
@@ -170,6 +182,130 @@ open class MediaViewerStateProvider : PreviewParameterProvider<MediaViewerState>
                     )
                 )
             ),
+            anImageMediaInfo(
+                senderName = USER_NAME_ALICE,
+                dateSent = "21 NOV, 2024",
+                caption = LONG_CAPTION,
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Bob",
+                dateSent = "22 NOV, 2024",
+                formattedCaption = "This is a <strong>bold</strong> caption",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Charlie",
+                dateSent = "23 NOV, 2024",
+                formattedCaption = "This is an <em>italic</em> caption",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Diana",
+                dateSent = "24 NOV, 2024",
+                formattedCaption = "This is a <code>code</code> caption",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Eve",
+                dateSent = "25 NOV, 2024",
+                formattedCaption = "<blockquote>This is a quote caption</blockquote>",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Frank",
+                dateSent = "26 NOV, 2024",
+                formattedCaption = "This caption has <strong>bold</strong>, <em>italic</em>, and <code>code</code> formatting.",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Success(
+                                LocalMedia(Uri.EMPTY, it)
+                            ),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Frank",
+                dateSent = "26 NOV, 2024",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Uninitialized,
+                            validationState = NoopContentValidationState(ContentValidationValue.Loading),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
+            anImageMediaInfo(
+                senderName = "Frank",
+                dateSent = "26 NOV, 2024",
+            ).let {
+                aMediaViewerState(
+                    listOf(
+                        aMediaViewerPageData(
+                            downloadedMedia = AsyncData.Uninitialized,
+                            validationState = NoopContentValidationState(ContentValidationValue.Invalid),
+                            mediaInfo = it,
+                        )
+                    )
+                )
+            },
         )
 }
 
@@ -188,6 +324,7 @@ fun aMediaViewerPageData(
     downloadedMedia: AsyncData<LocalMedia> = AsyncData.Uninitialized,
     mediaInfo: MediaInfo = anImageMediaInfo(),
     mediaSource: MediaSource = MediaSource(""),
+    validationState: ContentValidationState = NoopContentValidationState(),
 ): MediaViewerPageData.MediaViewerData = MediaViewerPageData.MediaViewerData(
     eventId = null,
     mediaInfo = mediaInfo,
@@ -195,6 +332,7 @@ fun aMediaViewerPageData(
     thumbnailSource = null,
     downloadedMedia = mutableStateOf(downloadedMedia),
     pagerKey = 0L,
+    validationState = validationState,
 )
 
 fun aMediaViewerState(
@@ -202,7 +340,7 @@ fun aMediaViewerState(
     currentIndex: Int = 0,
     canShowInfo: Boolean = true,
     mediaBottomSheetState: MediaBottomSheetState = MediaBottomSheetState.Hidden,
-    eventSink: (MediaViewerEvents) -> Unit = {},
+    eventSink: (MediaViewerEvent) -> Unit = {},
 ) = MediaViewerState(
     initiallySelectedEventId = EventId("\$a:b"),
     listData = listData.toImmutableList(),
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
index 7439909330..6eca5e9dbc 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
@@ -12,53 +12,78 @@ package io.element.android.libraries.mediaviewer.impl.viewer
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.spring
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.layout.onVisibilityChanged
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import androidx.core.text.toSpannable
 import coil3.compose.AsyncImage
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.viewfolder.api.TextFileViewer
+import io.element.android.libraries.androidutils.text.safeLinkify
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.audio.api.AudioFocus
-import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.async.AsyncFailure
+import io.element.android.libraries.designsystem.components.async.AsyncIndicator
 import io.element.android.libraries.designsystem.components.async.AsyncLoading
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
@@ -69,13 +94,14 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.hasCompactHeightWindowSize
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
 import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.ui.media.MediaRequestData
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectMediaState
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
-import io.element.android.libraries.mediaviewer.impl.R
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
 import io.element.android.libraries.mediaviewer.impl.details.MediaDeleteConfirmationBottomSheet
 import io.element.android.libraries.mediaviewer.impl.details.MediaDetailsBottomSheet
@@ -83,14 +109,19 @@ import io.element.android.libraries.mediaviewer.impl.local.LocalMediaView
 import io.element.android.libraries.mediaviewer.impl.local.PlayableState
 import io.element.android.libraries.mediaviewer.impl.local.rememberLocalMediaViewState
 import io.element.android.libraries.mediaviewer.impl.util.bgCanvasWithTransparency
+import io.element.android.libraries.textcomposer.ElementRichTextEditorStyle
 import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.wysiwyg.compose.EditorStyledText
 import kotlinx.coroutines.delay
 import me.saket.telephoto.zoomable.OverzoomEffect
 import me.saket.telephoto.zoomable.ZoomSpec
 import me.saket.telephoto.zoomable.rememberZoomableState
 
-val topAppBarHeight = 88.dp
+val topAppBarHeight = 112.dp
 
+/**
+ * Ref: https://www.figma.com/design/pDlJZGBsri47FNTXMnEdXB/Compound-Android-Templates?node-id=3361-16623
+ */
 @Composable
 fun MediaViewerView(
     state: MediaViewerState,
@@ -102,101 +133,18 @@ fun MediaViewerView(
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
     var showOverlay by remember { mutableStateOf(true) }
 
-    val defaultBottomPaddingInPixels = if (LocalInspectionMode.current) 303 else 0
     val currentData = state.listData.getOrNull(state.currentIndex)
+    val defaultBottomPaddingInPixels = if (LocalInspectionMode.current && !hasCompactHeightWindowSize()) 303 else 0
+
     BackHandler { onBackClick() }
     Scaffold(
         modifier,
         containerColor = Color.Transparent,
-        snackbarHost = { SnackbarHost(snackbarHostState) },
-    ) {
-        val pagerState = rememberPagerState(state.currentIndex, 0f) {
-            state.listData.size
-        }
-        LaunchedEffect(pagerState) {
-            snapshotFlow { pagerState.currentPage }.collect { page ->
-                state.eventSink(MediaViewerEvents.OnNavigateTo(page))
-            }
-        }
-        HorizontalPager(
-            state = pagerState,
-            modifier = Modifier,
-            // Pre-load previous and next pages
-            beyondViewportPageCount = 1,
-            key = { index -> state.listData[index].pagerKey },
-        ) { page ->
-            when (val dataForPage = state.listData[page]) {
-                is MediaViewerPageData.Failure -> {
-                    MediaViewerErrorPage(
-                        throwable = dataForPage.throwable,
-                        onDismiss = onBackClick,
-                    )
-                }
-                is MediaViewerPageData.Loading -> {
-                    LaunchedEffect(dataForPage.timestamp) {
-                        state.eventSink(MediaViewerEvents.LoadMore(dataForPage.direction))
-                    }
-                    MediaViewerLoadingPage(
-                        onDismiss = onBackClick,
-                    )
-                }
-                is MediaViewerPageData.MediaViewerData -> {
-                    var bottomPaddingInPixels by remember { mutableIntStateOf(defaultBottomPaddingInPixels) }
-                    LaunchedEffect(Unit) {
-                        state.eventSink(MediaViewerEvents.LoadMedia(dataForPage))
-                    }
-                    Box(
-                        modifier = Modifier.fillMaxSize()
-                    ) {
-                        val isDisplayed = remember(pagerState.settledPage) {
-                            // This 'item provider' lambda will be called when the data source changes with an outdated `settlePage` value
-                            // So we need to update this value only when the `settledPage` value changes. It seems like a bug that needs to be fixed in Compose.
-                            page == pagerState.settledPage
-                        }
-                        MediaViewerPage(
-                            isDisplayed = isDisplayed,
-                            showOverlay = showOverlay,
-                            bottomPaddingInPixels = bottomPaddingInPixels,
-                            data = dataForPage,
-                            textFileViewer = textFileViewer,
-                            onDismiss = onBackClick,
-                            onRetry = {
-                                state.eventSink(MediaViewerEvents.LoadMedia(dataForPage))
-                            },
-                            onDismissError = {
-                                state.eventSink(MediaViewerEvents.ClearLoadingError(dataForPage))
-                            },
-                            onShowOverlayChange = {
-                                showOverlay = it
-                            },
-                            audioFocus = audioFocus,
-                            isUserSelected = (state.listData[page] as? MediaViewerPageData.MediaViewerData)?.eventId == state.initiallySelectedEventId,
-                        )
-                        // Bottom bar
-                        AnimatedVisibility(visible = showOverlay, enter = fadeIn(), exit = fadeOut()) {
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .navigationBarsPadding()
-                            ) {
-                                MediaViewerBottomBar(
-                                    modifier = Modifier.align(Alignment.BottomCenter),
-                                    showDivider = dataForPage.mediaInfo.mimeType.isMimeTypeVideo(),
-                                    caption = dataForPage.mediaInfo.caption,
-                                    onHeightChange = { bottomPaddingInPixels = it },
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        // Top bar
-        AnimatedVisibility(visible = showOverlay, enter = fadeIn(), exit = fadeOut()) {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .navigationBarsPadding()
+        topBar = {
+            AnimatedVisibility(
+                visible = showOverlay,
+                enter = fadeIn(),
+                exit = fadeOut(),
             ) {
                 when (currentData) {
                     is MediaViewerPageData.MediaViewerData -> {
@@ -204,10 +152,15 @@ fun MediaViewerView(
                             data = currentData,
                             canShowInfo = state.canShowInfo,
                             onBackClick = onBackClick,
-                            onInfoClick = {
-                                state.eventSink(MediaViewerEvents.OpenInfo(currentData))
+                            onShareClick = {
+                                state.eventSink(MediaViewerEvent.Share(currentData))
+                            },
+                            onSaveClick = {
+                                state.eventSink(MediaViewerEvent.SaveOnDisk(currentData))
+                            },
+                            onInfoClick = {
+                                state.eventSink(MediaViewerEvent.OpenInfo(currentData))
                             },
-                            eventSink = state.eventSink
                         )
                     }
                     else -> {
@@ -232,34 +185,156 @@ fun MediaViewerView(
                     }
                 }
             }
+        },
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+    ) { padding ->
+        val pagerState = rememberPagerState(state.currentIndex, 0f) {
+            state.listData.size
+        }
+
+        LaunchedEffect(pagerState.targetPage, state.currentIndex) {
+            // Only emit an index navigation change when it's triggered by the user scrolling
+            if (pagerState.targetPage != state.currentIndex && pagerState.isScrollInProgress) {
+                state.eventSink(MediaViewerEvent.OnNavigateTo(pagerState.targetPage))
+            }
+        }
+        HorizontalPager(
+            state = pagerState,
+            modifier = Modifier,
+            // Pre-load previous and next pages
+            beyondViewportPageCount = 1,
+            key = { index -> state.listData[index].pagerKey },
+            reverseLayout = true,
+        ) { page ->
+            when (val dataForPage = state.listData[page]) {
+                is MediaViewerPageData.Failure -> {
+                    MediaViewerErrorPage(
+                        throwable = dataForPage.throwable,
+                        onDismiss = onBackClick,
+                    )
+                }
+                is MediaViewerPageData.Loading -> {
+                    LaunchedEffect(dataForPage.timestamp) {
+                        state.eventSink(MediaViewerEvent.LoadMore(dataForPage.direction))
+                    }
+                    MediaViewerLoadingPage(
+                        onDismiss = onBackClick,
+                    )
+                }
+                is MediaViewerPageData.MediaViewerData -> {
+                    // We need to check the 2 validation states and can't use the overall state because these might be part of a gallery event
+                    // If that was the case, the overall state would be invalid if any of the sources for any media in the gallery was invalid, e.g.:
+                    // Media 1: mediaSource = valid, thumbnailSource = valid
+                    // Media 2: mediaSource = invalid, thumbnailSource = valid
+                    // The overall state would be invalid, so the whole gallery event and all its medias would be considered invalid.
+                    val mediaValidationState by dataForPage.validationState.collectMediaState(dataForPage.mediaSource.safeUrl)
+                    val thumbnailValidationState by dataForPage.validationState.collectMediaState(dataForPage.thumbnailSource?.safeUrl)
+
+                    // Check if the media to display is valid or dangerous
+                    LaunchedEffect(Unit) {
+                        state.eventSink(
+                            MediaViewerEvent.ValidateMedia(mediaSource = dataForPage.mediaSource, thumbnailMediaSource = dataForPage.thumbnailSource)
+                        )
+                    }
+
+                    var bottomPaddingInPixels by remember { mutableIntStateOf(defaultBottomPaddingInPixels) }
+                    val loadMediaOnVisibilityChangedModifier = remember(mediaValidationState) {
+                        if (mediaValidationState.isValid() && thumbnailValidationState.isValid()) {
+                            Modifier.onVisibilityChanged(minDurationMs = 200L) { isVisible ->
+                                if (isVisible) {
+                                    state.eventSink(MediaViewerEvent.LoadMedia(dataForPage))
+                                } else {
+                                    state.eventSink(MediaViewerEvent.CancelLoadingMedia(dataForPage))
+                                }
+                            }
+                        } else {
+                            Modifier
+                        }
+                    }
+                    Box(
+                        modifier = loadMediaOnVisibilityChangedModifier.fillMaxSize()
+                    ) {
+                        val isDisplayed = remember(pagerState.settledPage) {
+                            // This 'item provider' lambda will be called when the data source changes with an outdated `settlePage` value
+                            // So we need to update this value only when the `settledPage` value changes. It seems like a bug that needs to be fixed in Compose.
+                            page == pagerState.settledPage
+                        }
+                        val navigationBarPadding = WindowInsets.navigationBars.getBottom(LocalDensity.current)
+                        MediaViewerPage(
+                            isDisplayed = isDisplayed,
+                            showOverlay = showOverlay,
+                            containerPadding = padding,
+                            bottomPaddingInPixels = (bottomPaddingInPixels - navigationBarPadding).coerceAtLeast(0),
+                            data = dataForPage,
+                            textFileViewer = textFileViewer,
+                            onDismiss = onBackClick,
+                            onRetry = {
+                                state.eventSink(MediaViewerEvent.LoadMedia(dataForPage))
+                            },
+                            onOpenWith = {
+                                state.eventSink(MediaViewerEvent.OpenWith(dataForPage))
+                            },
+                            onDismissError = {
+                                state.eventSink(MediaViewerEvent.ClearLoadingError(dataForPage))
+                            },
+                            onShowOverlayChange = {
+                                showOverlay = it
+                            },
+                            audioFocus = audioFocus,
+                            isUserSelected = (state.listData[page] as? MediaViewerPageData.MediaViewerData)?.eventId == state.initiallySelectedEventId,
+                        )
+                        // Bottom bar
+                        AnimatedVisibility(
+                            visible = showOverlay,
+                            enter = fadeIn(),
+                            exit = fadeOut(),
+                            modifier = Modifier.align(Alignment.BottomCenter),
+                        ) {
+                            MediaViewerBottomBar(
+                                showDivider = dataForPage.mediaInfo.mimeType.isMimeTypeVideo(),
+                                caption = dataForPage.mediaInfo.caption,
+                                formattedCaption = dataForPage.mediaInfo.formattedCaption,
+                                onHeightChange = { bottomPaddingInPixels = it },
+                            )
+                        }
+                    }
+                }
+            }
         }
     }
 
     when (val bottomSheetState = state.mediaBottomSheetState) {
         MediaBottomSheetState.Hidden -> Unit
-        is MediaBottomSheetState.MediaDetailsBottomSheetState -> {
+        is MediaBottomSheetState.Details -> {
             MediaDetailsBottomSheet(
                 state = bottomSheetState,
                 onViewInTimeline = {
-                    state.eventSink(MediaViewerEvents.ViewInTimeline(it))
+                    state.eventSink(MediaViewerEvent.ViewInTimeline(it))
                 },
                 onShare = {
+                    // Note: share action is not rendered when the bottom sheet is opened from the media viewer
                     (currentData as? MediaViewerPageData.MediaViewerData)?.let {
-                        state.eventSink(MediaViewerEvents.Share(currentData))
+                        state.eventSink(MediaViewerEvent.Share(currentData))
                     }
                 },
                 onForward = {
-                    state.eventSink(MediaViewerEvents.Forward(it))
+                    state.eventSink(MediaViewerEvent.Forward(it))
                 },
                 onDownload = {
+                    // Note: download action is not rendered when the bottom sheet is opened from the media viewer
                     (currentData as? MediaViewerPageData.MediaViewerData)?.let {
-                        state.eventSink(MediaViewerEvents.SaveOnDisk(currentData))
+                        state.eventSink(MediaViewerEvent.SaveOnDisk(currentData))
+                    }
+                },
+                onOpenWith = {
+                    (currentData as? MediaViewerPageData.MediaViewerData)?.let {
+                        state.eventSink(MediaViewerEvent.OpenWith(currentData))
                     }
                 },
                 onDelete = { eventId ->
                     (currentData as? MediaViewerPageData.MediaViewerData)?.let {
                         state.eventSink(
-                            MediaViewerEvents.ConfirmDelete(
+                            MediaViewerEvent.ConfirmDelete(
                                 eventId,
                                 currentData,
                             )
@@ -267,18 +342,18 @@ fun MediaViewerView(
                     }
                 },
                 onDismiss = {
-                    state.eventSink(MediaViewerEvents.CloseBottomSheet)
+                    state.eventSink(MediaViewerEvent.CloseBottomSheet)
                 },
             )
         }
-        is MediaBottomSheetState.MediaDeleteConfirmationState -> {
+        is MediaBottomSheetState.DeleteConfirmation -> {
             MediaDeleteConfirmationBottomSheet(
                 state = bottomSheetState,
                 onDelete = {
-                    state.eventSink(MediaViewerEvents.Delete(it))
+                    state.eventSink(MediaViewerEvent.Delete(it))
                 },
                 onDismiss = {
-                    state.eventSink(MediaViewerEvents.CloseBottomSheet)
+                    state.eventSink(MediaViewerEvent.CloseBottomSheet)
                 },
             )
         }
@@ -290,11 +365,13 @@ private fun MediaViewerPage(
     isDisplayed: Boolean,
     showOverlay: Boolean,
     bottomPaddingInPixels: Int,
+    containerPadding: PaddingValues,
     data: MediaViewerPageData.MediaViewerData,
     textFileViewer: TextFileViewer,
     isUserSelected: Boolean,
     onDismiss: () -> Unit,
     onRetry: () -> Unit,
+    onOpenWith: () -> Unit,
     onDismissError: () -> Unit,
     onShowOverlayChange: (Boolean) -> Unit,
     audioFocus: AudioFocus?,
@@ -315,12 +392,33 @@ private fun MediaViewerPage(
     ) {
         val downloadedMedia by data.downloadedMedia
         val showProgress = rememberShowProgress(downloadedMedia)
+        val mediaValidationState by data.validationState.collectMediaState(data.mediaSource.safeUrl)
+        val thumbnailValidationState by data.validationState.collectMediaState(data.thumbnailSource?.safeUrl)
 
         Box(
             modifier = Modifier
                 .fillMaxSize()
                 .navigationBarsPadding()
         ) {
+            AnimatedVisibility(
+                visible = mediaValidationState.isLoading(),
+                modifier = Modifier.padding(top = containerPadding.calculateTopPadding()).align(Alignment.TopCenter),
+                enter = fadeIn(spring(stiffness = 500F)),
+                exit = fadeOut(spring(stiffness = 500F)),
+            ) {
+                AsyncIndicator.Loading(
+                    text = stringResource(CommonStrings.content_scanner_scanning),
+                )
+            }
+
+            if (showProgress) {
+                LinearProgressIndicator(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(2.dp)
+                )
+            }
+
             Box(contentAlignment = Alignment.Center) {
                 val zoomableState = rememberZoomableState(
                     zoomSpec = ZoomSpec(maxZoomFactor = 4f, overzoomEffect = OverzoomEffect.NoLimits)
@@ -336,27 +434,44 @@ private fun MediaViewerPage(
                     }
                 }
 
-                LocalMediaView(
-                    modifier = Modifier.fillMaxSize(),
-                    isDisplayed = isDisplayed,
-                    bottomPaddingInPixels = bottomPaddingInPixels,
-                    localMediaViewState = localMediaViewState,
-                    localMedia = downloadedMedia.dataOrNull(),
-                    mediaInfo = data.mediaInfo,
-                    textFileViewer = textFileViewer,
-                    onClick = {
-                        if (playableState is PlayableState.NotPlayable) {
-                            currentOnShowOverlayChange(!currentShowOverlay)
-                        }
-                    },
-                    isUserSelected = isUserSelected,
-                    audioFocus = audioFocus,
-                )
-                ThumbnailView(
-                    mediaInfo = data.mediaInfo,
-                    thumbnailSource = data.thumbnailSource,
-                    isVisible = showThumbnail,
-                )
+                if (mediaValidationState.isInvalid() || thumbnailValidationState.isInvalid()) {
+                    Column(
+                        modifier = Modifier.fillMaxSize(),
+                        verticalArrangement = Arrangement.Center,
+                    ) {
+                        IconTitleSubtitleMolecule(
+                            iconStyle = BigIcon.Style.AlertSolid,
+                            title = stringResource(CommonStrings.content_scanner_unsafe_title),
+                            subTitle = stringResource(CommonStrings.content_scanner_unsafe_message),
+                        )
+                    }
+                } else if (mediaValidationState.isValid() && thumbnailValidationState.isValid()) {
+                    LocalMediaView(
+                        modifier = Modifier.fillMaxSize(),
+                        isDisplayed = isDisplayed,
+                        bottomPaddingInPixels = bottomPaddingInPixels,
+                        localMediaViewState = localMediaViewState,
+                        localMedia = downloadedMedia.dataOrNull(),
+                        mediaInfo = data.mediaInfo,
+                        textFileViewer = textFileViewer,
+                        onClick = {
+                            if (playableState is PlayableState.NotPlayable) {
+                                currentOnShowOverlayChange(!currentShowOverlay)
+                            }
+                        },
+                        onOpenWith = onOpenWith,
+                        isUserSelected = isUserSelected,
+                        audioFocus = audioFocus,
+                        forPreview = false,
+                    )
+                    if (showThumbnail) {
+                        ThumbnailView(
+                            mediaInfo = data.mediaInfo,
+                            thumbnailSource = data.thumbnailSource,
+                        )
+                    }
+                }
+
                 if (showError) {
                     ErrorView(
                         errorMessage = stringResource(id = CommonStrings.error_unknown),
@@ -365,13 +480,6 @@ private fun MediaViewerPage(
                     )
                 }
             }
-            if (showProgress) {
-                LinearProgressIndicator(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(2.dp)
-                )
-            }
         }
     }
 }
@@ -447,25 +555,31 @@ private fun MediaViewerTopBar(
     data: MediaViewerPageData.MediaViewerData,
     canShowInfo: Boolean,
     onBackClick: () -> Unit,
+    onShareClick: () -> Unit,
+    onSaveClick: () -> Unit,
     onInfoClick: () -> Unit,
-    eventSink: (MediaViewerEvents) -> Unit,
 ) {
     val downloadedMedia by data.downloadedMedia
     val actionsEnabled = downloadedMedia.isSuccess()
-    val mimeType = data.mediaInfo.mimeType
     val senderName = data.mediaInfo.senderName
     val dateSent = data.mediaInfo.dateSent
     TopAppBar(
         title = {
             if (senderName != null && dateSent != null) {
+                val description = stringResource(
+                    CommonStrings.a11y_sent_by_sender_at_date,
+                    senderName,
+                    dateSent,
+                )
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()
+                        .clearAndSetSemantics {
+                            heading()
+                            contentDescription = description
+                        },
                 ) {
                     Text(
-                        modifier = Modifier.semantics {
-                            heading()
-                        },
                         text = senderName,
                         style = ElementTheme.typography.fontBodyMdMedium,
                         color = ElementTheme.colors.textPrimary,
@@ -488,21 +602,22 @@ private fun MediaViewerTopBar(
         navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             IconButton(
+                onClick = onShareClick,
                 enabled = actionsEnabled,
-                onClick = {
-                    eventSink(MediaViewerEvents.OpenWith(data))
-                },
             ) {
-                when (mimeType) {
-                    MimeTypes.Apk -> Icon(
-                        resourceId = R.drawable.ic_apk_install,
-                        contentDescription = stringResource(id = CommonStrings.common_install_apk_android)
-                    )
-                    else -> Icon(
-                        imageVector = CompoundIcons.PopOut(),
-                        contentDescription = stringResource(id = CommonStrings.action_open_with)
-                    )
-                }
+                Icon(
+                    imageVector = CompoundIcons.ShareAndroid(),
+                    contentDescription = stringResource(id = CommonStrings.action_share),
+                )
+            }
+            IconButton(
+                onClick = onSaveClick,
+                enabled = actionsEnabled,
+            ) {
+                Icon(
+                    imageVector = CompoundIcons.Download(),
+                    contentDescription = stringResource(id = CommonStrings.action_download),
+                )
             }
             if (canShowInfo) {
                 IconButton(
@@ -522,6 +637,7 @@ private fun MediaViewerTopBar(
 @Composable
 private fun MediaViewerBottomBar(
     caption: String?,
+    formattedCaption: CharSequence?,
     showDivider: Boolean,
     onHeightChange: (Int) -> Unit,
     modifier: Modifier = Modifier,
@@ -534,27 +650,67 @@ private fun MediaViewerBottomBar(
                 onHeightChange(it.height)
             },
     ) {
-        if (caption != null) {
+        if (caption != null || formattedCaption != null) {
             if (showDivider) {
                 HorizontalDivider()
             }
-            Text(
+            val scrollState = rememberScrollState()
+            val showBottomShadow by remember { derivedStateOf { scrollState.value < scrollState.maxValue } }
+            Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(16.dp),
-                text = caption,
-                maxLines = 5,
-                overflow = TextOverflow.Ellipsis,
-                style = ElementTheme.typography.fontBodyLgRegular,
-            )
+                    .heightIn(max = if (hasCompactHeightWindowSize()) maxCaptionHeightLandscape else maxCaptionHeightPortrait)
+                    .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal).asPaddingValues()),
+            ) {
+                val textToRender = when {
+                    formattedCaption != null -> formattedCaption
+                    caption != null -> caption.safeLinkify().toSpannable()
+                    else -> null
+                }
+                if (textToRender != null) {
+                    CompositionLocalProvider(
+                        LocalContentColor provides ElementTheme.colors.textPrimary,
+                        LocalTextStyle provides ElementTheme.typography.fontBodyLgRegular
+                    ) {
+                        EditorStyledText(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(16.dp)
+                                .verticalScroll(scrollState)
+                                .navigationBarsPadding(),
+                            text = textToRender,
+                            style = ElementRichTextEditorStyle.textStyle(),
+                            releaseOnDetach = false,
+                        )
+                    }
+                }
+                if (showBottomShadow) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(48.dp)
+                            .align(Alignment.BottomCenter)
+                            .background(
+                                brush = Brush.verticalGradient(
+                                    colors = listOf(
+                                        Color.Transparent,
+                                        bgCanvasWithTransparency,
+                                    ),
+                                ),
+                            ),
+                    )
+                }
+            }
         }
     }
 }
 
+private val maxCaptionHeightPortrait = 200.dp
+private val maxCaptionHeightLandscape = 128.dp
+
 @Composable
 private fun ThumbnailView(
     thumbnailSource: MediaSource?,
-    isVisible: Boolean,
     mediaInfo: MediaInfo,
     modifier: Modifier = Modifier,
 ) {
@@ -562,21 +718,19 @@ private fun ThumbnailView(
         modifier = modifier.fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
-        if (isVisible) {
-            val mediaRequestData = MediaRequestData(
-                source = thumbnailSource,
-                kind = MediaRequestData.Kind.File(mediaInfo.filename, mediaInfo.mimeType)
-            )
-            val alpha = if (LocalInspectionMode.current) 0.1f else 1f
-            AsyncImage(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .alpha(alpha),
-                model = mediaRequestData,
-                contentScale = ContentScale.Fit,
-                contentDescription = null,
-            )
-        }
+        val mediaRequestData = MediaRequestData(
+            source = thumbnailSource,
+            kind = MediaRequestData.Kind.File(mediaInfo.filename, mediaInfo.mimeType)
+        )
+        val alpha = if (LocalInspectionMode.current) 0.1f else 1f
+        AsyncImage(
+            modifier = Modifier
+                .fillMaxSize()
+                .alpha(alpha),
+            model = mediaRequestData,
+            contentScale = ContentScale.Fit,
+            contentDescription = null,
+        )
     }
 }
 
@@ -604,3 +758,14 @@ internal fun MediaViewerViewPreview(@PreviewParameter(MediaViewerStateProvider::
         onBackClick = {},
     )
 }
+
+@Preview(device = "${Devices.PHONE}, orientation=landscape")
+@Composable
+internal fun MediaViewerViewLandscapePreview(@PreviewParameter(MediaViewerStateProvider::class) state: MediaViewerState) = ElementPreviewDark {
+    MediaViewerView(
+        state = state,
+        audioFocus = null,
+        textFileViewer = { _, _ -> },
+        onBackClick = {},
+    )
+}
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt
index a2234143af..b8de20a41d 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/PagerKeysHandler.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.mediaviewer.impl.viewer
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import io.element.android.libraries.mediaviewer.impl.model.eventId
+import io.element.android.libraries.mediaviewer.impl.model.mediaSource
 
 /**
  * x and y are loading items.
@@ -50,31 +51,32 @@ class PagerKeysHandler {
         if (cachedData.mediaItems.isEmpty()) {
             cachedData = Data(mediaItems, 0)
         } else {
-            // Search a common item in both lists, i.e. an item with the same eventId
-            val itemInCacheIndex = cachedData.mediaItems.indexOfFirst { mediaItem ->
-                mediaItem is MediaItem.Event && mediaItems
+            // Search a common item in both lists using eventId + mediaSource to handle gallery items
+            val itemInCacheIndex = cachedData.mediaItems.indexOfFirst { cachedItem ->
+                cachedItem is MediaItem.Event && mediaItems
                     .filterIsInstance<MediaItem.Event>()
-                    .any { mediaItem.eventId() == it.eventId() }
+                    .any { newItem ->
+                        cachedItem.eventId() == newItem.eventId() &&
+                            cachedItem.mediaSource().safeUrl == newItem.mediaSource().safeUrl
+                    }
             }
             cachedData = if (itemInCacheIndex == -1) {
-                // If the item is not found, start with a new cache
                 Data(mediaItems, 0)
             } else {
                 val cachedItem = cachedData.mediaItems[itemInCacheIndex]
                 val eventId = (cachedItem as? MediaItem.Event)?.eventId()
-                if (eventId == null) {
-                    // Should not happen, but in this case, start with a new cache
+                val cachedSourceUrl = (cachedItem as? MediaItem.Event)?.mediaSource()?.safeUrl
+                if (eventId == null || cachedSourceUrl == null) {
                     Data(mediaItems, 0)
                 } else {
-                    // Search the index of the item in the new list
                     val itemIndex = mediaItems.indexOfFirst { mediaItem ->
-                        mediaItem is MediaItem.Event && mediaItem.eventId() == eventId
+                        mediaItem is MediaItem.Event &&
+                            mediaItem.eventId() == eventId &&
+                            mediaItem.mediaSource().safeUrl == cachedSourceUrl
                     }
                     if (itemIndex == -1) {
-                        // If the item is not found, start with a new cache
                         Data(mediaItems, 0)
                     } else {
-                        // Update the cache with the new list and the new offset
                         Data(mediaItems, cachedData.keyOffset + itemInCacheIndex - itemIndex.toLong())
                     }
                 }
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt
index f243ac4fd7..1f21252d9f 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSource.kt
@@ -9,41 +9,81 @@
 package io.element.android.libraries.mediaviewer.impl.viewer
 
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeAudio
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeImage
 import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.DefaultContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.EventContentValidationCache
+import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.flowOf
 
 class SingleMediaGalleryDataSource(
     private val data: GroupedMediaItems,
+    private val contentValidationCache: EventContentValidationCache,
 ) : MediaGalleryDataSource {
-    override fun start() = Unit
+    override fun start(coroutineScope: CoroutineScope) = Unit
     override fun groupedMediaItemsFlow() = flowOf(AsyncData.Success(data))
     override fun getLastData(): AsyncData<GroupedMediaItems> = AsyncData.Success(data)
 
+    override val isReady: Boolean = true
+
     override suspend fun loadMore(direction: Timeline.PaginationDirection) = Unit
     override suspend fun deleteItem(eventId: EventId) = Unit
 
     companion object {
-        fun createFrom(params: MediaViewerEntryPoint.Params) = SingleMediaGalleryDataSource(
+        fun createFrom(
+            params: MediaViewerEntryPoint.Params.Avatar,
+            contentValidationCache: EventContentValidationCache,
+        ) = SingleMediaGalleryDataSource(
             data = GroupedMediaItems(
                 // Always use imageAndVideoItems, in Single mode, this is the data that will be used
-                imageAndVideoItems = persistentListOf(params.toMediaItem()),
+                imageAndVideoItems = persistentListOf(
+                    MediaItem.Image(
+                        id = UniqueId("dummy"),
+                        eventId = null,
+                        mediaInfo = MediaInfo(
+                            filename = params.avatarInfo.filename,
+                            caption = null,
+                            formattedCaption = null,
+                            mimeType = MimeTypes.Images,
+                            fileSize = null,
+                            formattedFileSize = "",
+                            fileExtension = "",
+                            senderId = null,
+                            senderName = null,
+                            senderAvatar = null,
+                            dateSent = null,
+                            dateSentFull = null,
+                            waveform = null,
+                            duration = null,
+                        ),
+                        mediaSource = params.mediaSource,
+                        thumbnailSource = params.thumbnailSource,
+                        blurHash = params.blurHash,
+                        validationState = DefaultContentValidationState(),
+                    )
+                ),
                 fileItems = persistentListOf(),
-            )
+            ),
+            contentValidationCache = contentValidationCache,
         )
     }
 }
 
-fun MediaViewerEntryPoint.Params.toMediaItem() = when {
+fun MediaViewerEntryPoint.Params.RoomMedia.toMediaItem(
+    contentValidationState: ContentValidationState,
+) = when {
     mediaInfo.mimeType.isMimeTypeImage() -> {
         MediaItem.Image(
             id = UniqueId("dummy"),
@@ -51,6 +91,8 @@ fun MediaViewerEntryPoint.Params.toMediaItem() = when {
             mediaInfo = mediaInfo,
             mediaSource = mediaSource,
             thumbnailSource = thumbnailSource,
+            blurHash = null,
+            validationState = contentValidationState,
         )
     }
     mediaInfo.mimeType.isMimeTypeVideo() -> {
@@ -60,6 +102,8 @@ fun MediaViewerEntryPoint.Params.toMediaItem() = when {
             mediaInfo = mediaInfo,
             mediaSource = mediaSource,
             thumbnailSource = thumbnailSource,
+            blurHash = null,
+            validationState = contentValidationState,
         )
     }
     mediaInfo.mimeType.isMimeTypeAudio() -> {
@@ -69,6 +113,7 @@ fun MediaViewerEntryPoint.Params.toMediaItem() = when {
                 eventId = eventId,
                 mediaInfo = mediaInfo,
                 mediaSource = mediaSource,
+                validationState = contentValidationState,
             )
         } else {
             MediaItem.Voice(
@@ -76,6 +121,7 @@ fun MediaViewerEntryPoint.Params.toMediaItem() = when {
                 eventId = eventId,
                 mediaInfo = mediaInfo,
                 mediaSource = mediaSource,
+                validationState = contentValidationState,
             )
         }
     }
@@ -85,6 +131,7 @@ fun MediaViewerEntryPoint.Params.toMediaItem() = when {
             eventId = eventId,
             mediaInfo = mediaInfo,
             mediaSource = mediaSource,
+            validationState = contentValidationState,
         )
     }
 }
diff --git a/libraries/mediaviewer/impl/src/main/res/values-be/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-be/translations.xml
new file mode 100644
index 0000000000..9dc6e13043
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-be/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_details_title">"Інфармацыя пра файл"</string>
+</resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-ca/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..44bf749c0f
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_browser_delete_confirmation_subtitle">"L\'arxiu s\'eliminarà de la sala i el membres no en tindran accés."</string>
+  <string name="screen_media_browser_delete_confirmation_title">"Eliminar el document?"</string>
+  <string name="screen_media_browser_download_error_message">"Comprova la connexió a internet i torna-ho a provar."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Els documents, àudios i missatges de veu que s\'hagin penjat a la sala es mostraran aquí."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Encara no s\'han pujat documents"</string>
+  <string name="screen_media_browser_list_loading_files">"Carregant documents…"</string>
+  <string name="screen_media_browser_list_loading_media">"Carregant multimèdia…"</string>
+  <string name="screen_media_browser_list_mode_files">"Documents"</string>
+  <string name="screen_media_browser_list_mode_media">"Multimèdia"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Les imatges i vídeos penjats a la sala es mostraran aquí."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Encara no s\'ha pujat multimèdia"</string>
+  <string name="screen_media_browser_title">"Multimèdia i documents"</string>
+  <string name="screen_media_details_file_format">"Format del document"</string>
+  <string name="screen_media_details_filename">"Nom del document"</string>
+  <string name="screen_media_details_no_more_files_to_show">"No hi ha més fitxers a mostrar"</string>
+  <string name="screen_media_details_no_more_media_to_show">"No hi ha més multimèdia a mostrar"</string>
+  <string name="screen_media_details_uploaded_by">"Pujat per"</string>
+  <string name="screen_media_details_uploaded_on">"Pujat el"</string>
+</resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml
index bcb7b64237..654aa869a6 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-cs/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Název souboru"</string>
   <string name="screen_media_details_no_more_files_to_show">"Žádné další soubory k zobrazení"</string>
   <string name="screen_media_details_no_more_media_to_show">"Žádná další média k zobrazení"</string>
+  <string name="screen_media_details_title">"Informace o souboru"</string>
   <string name="screen_media_details_uploaded_by">"Nahrál(a)"</string>
   <string name="screen_media_details_uploaded_on">"Nahráno"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-da/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-da/translations.xml
index 5d88458495..6108eab22d 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-da/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-da/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Filnavn"</string>
   <string name="screen_media_details_no_more_files_to_show">"Ikke flere filer at vise"</string>
   <string name="screen_media_details_no_more_media_to_show">"Ikke flere medier at vise"</string>
+  <string name="screen_media_details_title">"Filoplysninger"</string>
   <string name="screen_media_details_uploaded_by">"Uploadet af"</string>
   <string name="screen_media_details_uploaded_on">"Uploadet på"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml
index 63329a797d..f982b32433 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-et/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Failinimi"</string>
   <string name="screen_media_details_no_more_files_to_show">"Pole enam kuvatavaid faile"</string>
   <string name="screen_media_details_no_more_media_to_show">"Pole enam kuvatavat meediat"</string>
+  <string name="screen_media_details_title">"Faili teave"</string>
   <string name="screen_media_details_uploaded_by">"Üleslaadija"</string>
   <string name="screen_media_details_uploaded_on">"Üleslaaditud"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-fi/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-fi/translations.xml
index b3728cb9b7..05154b293c 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-fi/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-fi/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Tiedostonimi"</string>
   <string name="screen_media_details_no_more_files_to_show">"Ei enää näytettäviä tiedostoja"</string>
   <string name="screen_media_details_no_more_media_to_show">"Ei enää näytettävää mediaa"</string>
+  <string name="screen_media_details_title">"Tiedoston tiedot"</string>
   <string name="screen_media_details_uploaded_by">"Lähettäjä"</string>
   <string name="screen_media_details_uploaded_on">"Lähetetty"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml
index b6334095ab..77372c1374 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-fr/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Nom du fichier"</string>
   <string name="screen_media_details_no_more_files_to_show">"Il n’y a plus de fichiers à montrer"</string>
   <string name="screen_media_details_no_more_media_to_show">"Il n’y a plus de médias à montrer"</string>
+  <string name="screen_media_details_title">"Informations sur le fichier"</string>
   <string name="screen_media_details_uploaded_by">"Envoyé par"</string>
   <string name="screen_media_details_uploaded_on">"Envoyé le"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml
index 7637fbf350..2a417cc070 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-hr/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Naziv datoteke"</string>
   <string name="screen_media_details_no_more_files_to_show">"Nema više datoteka za prikaz"</string>
   <string name="screen_media_details_no_more_media_to_show">"Nema više medijskih sadržaja za prikaz"</string>
+  <string name="screen_media_details_title">"Informacije o datoteci"</string>
   <string name="screen_media_details_uploaded_by">"Prenio/la"</string>
   <string name="screen_media_details_uploaded_on">"Preneseno na"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml
index 14cc11fb96..4f4d244d44 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-hu/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Fájlnév"</string>
   <string name="screen_media_details_no_more_files_to_show">"Nincs több megjeleníthető fájl"</string>
   <string name="screen_media_details_no_more_media_to_show">"Nincs több megjeleníthető média"</string>
+  <string name="screen_media_details_title">"Fájlinformáció"</string>
   <string name="screen_media_details_uploaded_by">"Feltöltötte:"</string>
   <string name="screen_media_details_uploaded_on">"Feltöltve:"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-in/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-in/translations.xml
index b5c2bde7cb..e4c4218aa7 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-in/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-in/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Nama berkas"</string>
   <string name="screen_media_details_no_more_files_to_show">"Tidak ada lagi berkas untuk ditampilkan"</string>
   <string name="screen_media_details_no_more_media_to_show">"Tidak ada lagi media untuk ditampilkan"</string>
+  <string name="screen_media_details_title">"Informasi file"</string>
   <string name="screen_media_details_uploaded_by">"Diunggah oleh"</string>
   <string name="screen_media_details_uploaded_on">"Diunggah pada"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml
index 72701194fc..913329122e 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-it/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Nome del file"</string>
   <string name="screen_media_details_no_more_files_to_show">"Nessun altro file da mostrare"</string>
   <string name="screen_media_details_no_more_media_to_show">"Non ci sono più contenuti multimediali da mostrare"</string>
+  <string name="screen_media_details_title">"Informazioni sul file"</string>
   <string name="screen_media_details_uploaded_by">"Caricato da"</string>
   <string name="screen_media_details_uploaded_on">"Caricato il"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-ja/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..9e136b0884
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_browser_delete_confirmation_subtitle">"このファイルはルームから削除され、他のユーザーは確認することができなくなります。"</string>
+  <string name="screen_media_browser_delete_confirmation_title">"ファイルを削除しますか？"</string>
+  <string name="screen_media_browser_download_error_message">"インターネット接続を確認した上、再度お試しください。"</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"このルームに投稿された文書ファイルや音声ファイル・メッセージはここに表示されます。"</string>
+  <string name="screen_media_browser_files_empty_state_title">"アップロードされたファイルはありません"</string>
+  <string name="screen_media_browser_list_loading_files">"ファイルを読み込み中…"</string>
+  <string name="screen_media_browser_list_loading_media">"メディアを読み込み中…"</string>
+  <string name="screen_media_browser_list_mode_files">"ファイル"</string>
+  <string name="screen_media_browser_list_mode_media">"メディア"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"このルームに投稿された画像と動画はここに表示されます。"</string>
+  <string name="screen_media_browser_media_empty_state_title">"アップロードされたメディアはありません"</string>
+  <string name="screen_media_browser_title">"ファイルとメディア"</string>
+  <string name="screen_media_details_file_format">"ファイル形式"</string>
+  <string name="screen_media_details_filename">"ファイル名"</string>
+  <string name="screen_media_details_no_more_files_to_show">"これ以上ファイルはありません"</string>
+  <string name="screen_media_details_no_more_media_to_show">"これ以上メディアはありません"</string>
+  <string name="screen_media_details_title">"ファイル情報"</string>
+  <string name="screen_media_details_uploaded_by">"アップロード元"</string>
+  <string name="screen_media_details_uploaded_on">"アップロード先"</string>
+</resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-ko/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ko/translations.xml
index 3362171d27..0a14586e6c 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-ko/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-ko/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"파일 명"</string>
   <string name="screen_media_details_no_more_files_to_show">"더 이상 표시할 파일이 없습니다"</string>
   <string name="screen_media_details_no_more_media_to_show">"더 이상 보여줄 미디어가 없습니다"</string>
+  <string name="screen_media_details_title">"파일 정보"</string>
   <string name="screen_media_details_uploaded_by">"에 의해 업로드됨"</string>
   <string name="screen_media_details_uploaded_on">"에 업로드됨"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-nb/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-nb/translations.xml
index 8cc6eb3c84..8f1817b067 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-nb/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-nb/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Filnavn"</string>
   <string name="screen_media_details_no_more_files_to_show">"Ingen flere filer å vise"</string>
   <string name="screen_media_details_no_more_media_to_show">"Ikke flere mediefiler å vise"</string>
+  <string name="screen_media_details_title">"Filinformasjon"</string>
   <string name="screen_media_details_uploaded_by">"Lastet opp av"</string>
   <string name="screen_media_details_uploaded_on">"Lastet opp den"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-pl/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-pl/translations.xml
index c398123873..a1f7a3bdf9 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-pl/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Nazwa pliku"</string>
   <string name="screen_media_details_no_more_files_to_show">"Brak plików do pokazania"</string>
   <string name="screen_media_details_no_more_media_to_show">"Brak mediów do pokazania"</string>
+  <string name="screen_media_details_title">"Informacje pliku"</string>
   <string name="screen_media_details_uploaded_by">"Przesłane przez"</string>
   <string name="screen_media_details_uploaded_on">"Przesłane w dniu"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-ro/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ro/translations.xml
index bfd1d49c2b..aa713361d0 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-ro/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-ro/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Nume fișier"</string>
   <string name="screen_media_details_no_more_files_to_show">"Nu mai există fișiere de afișat"</string>
   <string name="screen_media_details_no_more_media_to_show">"Nu mai există conținut media de afișat"</string>
+  <string name="screen_media_details_title">"Informații despre fișier"</string>
   <string name="screen_media_details_uploaded_by">"Încărcat de"</string>
   <string name="screen_media_details_uploaded_on">"Încărcat la"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml
index cdbe07f2e1..74b910faaa 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-ru/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Имя файла"</string>
   <string name="screen_media_details_no_more_files_to_show">"Больше нет файлов для отображения"</string>
   <string name="screen_media_details_no_more_media_to_show">"Больше нет медиа для отображения"</string>
+  <string name="screen_media_details_title">"Информация о файле"</string>
   <string name="screen_media_details_uploaded_by">"Загружено"</string>
   <string name="screen_media_details_uploaded_on">"Загружено"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-uk/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-uk/translations.xml
index 45e1e1703b..ddc316fb4b 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-uk/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-uk/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Назва файлу"</string>
   <string name="screen_media_details_no_more_files_to_show">"Більше немає файлів для показу"</string>
   <string name="screen_media_details_no_more_media_to_show">"Більше немає медіа для показу"</string>
+  <string name="screen_media_details_title">"Інформація про файл"</string>
   <string name="screen_media_details_uploaded_by">"Вивантажено користувачем"</string>
   <string name="screen_media_details_uploaded_on">"Вивантажено"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
index 8f838c0d26..233d057039 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-uz/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_media_details_filename">"Fayl nomi"</string>
   <string name="screen_media_details_no_more_files_to_show">"Ko‘rsatish uchun boshqa fayllar yo‘q"</string>
   <string name="screen_media_details_no_more_media_to_show">"Ko‘rsatish uchun boshqa media yo‘q"</string>
+  <string name="screen_media_details_title">"Fayl haqida"</string>
   <string name="screen_media_details_uploaded_by">"Tomonidan yuklangan"</string>
   <string name="screen_media_details_uploaded_on">"Yuklangan"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-zh/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-zh/translations.xml
index 08b33993dc..5bdec732a2 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-zh/translations.xml
@@ -11,11 +11,12 @@
   <string name="screen_media_browser_list_mode_media">"媒体"</string>
   <string name="screen_media_browser_media_empty_state_subtitle">"上传到此房间的图像和视频将在此处显示。"</string>
   <string name="screen_media_browser_media_empty_state_title">"尚未上传任何媒体"</string>
-  <string name="screen_media_browser_title">"媒体和文件"</string>
+  <string name="screen_media_browser_title">"媒体与文件"</string>
   <string name="screen_media_details_file_format">"文件格式"</string>
   <string name="screen_media_details_filename">"文件名"</string>
   <string name="screen_media_details_no_more_files_to_show">"没有更多文件可显示了"</string>
   <string name="screen_media_details_no_more_media_to_show">"没有更多媒体可显示了"</string>
+  <string name="screen_media_details_title">"文件信息"</string>
   <string name="screen_media_details_uploaded_by">"上传者："</string>
   <string name="screen_media_details_uploaded_on">"上传于"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml
index 2982f8002f..02a16a8736 100644
--- a/libraries/mediaviewer/impl/src/main/res/values/localazy.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values/localazy.xml
@@ -12,10 +12,11 @@
   <string name="screen_media_browser_media_empty_state_subtitle">"Images and videos uploaded to this room will be shown here."</string>
   <string name="screen_media_browser_media_empty_state_title">"No media uploaded yet"</string>
   <string name="screen_media_browser_title">"Media and files"</string>
-  <string name="screen_media_details_file_format">"File format"</string>
-  <string name="screen_media_details_filename">"File name"</string>
+  <string name="screen_media_details_file_format">"Format"</string>
+  <string name="screen_media_details_filename">"Name"</string>
   <string name="screen_media_details_no_more_files_to_show">"No more files to show"</string>
   <string name="screen_media_details_no_more_media_to_show">"No more media to show"</string>
+  <string name="screen_media_details_title">"File info"</string>
   <string name="screen_media_details_uploaded_by">"Uploaded by"</string>
   <string name="screen_media_details_uploaded_on">"Uploaded on"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt
index b848ea2a7b..3ca702a47f 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/DefaultMediaViewerEntryPointTest.kt
@@ -12,15 +12,15 @@ import android.net.Uri
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
-import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import io.element.android.libraries.mediaplayer.test.FakeAudioFocus
-import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.api.AvatarInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.impl.datasource.createTimelineMediaGalleryDataSource
 import io.element.android.libraries.mediaviewer.impl.viewer.MediaViewerNode
@@ -33,16 +33,21 @@ import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
 import org.junit.Rule
 import org.junit.Test
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class DefaultMediaViewerEntryPointTest {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
     @Test
     fun `test node builder`() = runTest {
+        Dispatchers.setMain(testCoroutineDispatchers().main)
         val entryPoint = DefaultMediaViewerEntryPoint()
         val mockMediaUri: Uri = mockk("localMediaUri")
         val localMediaFactory = FakeLocalMediaFactory(mockMediaUri)
@@ -68,6 +73,8 @@ class DefaultMediaViewerEntryPointTest {
                 audioFocus = FakeAudioFocus(),
                 sessionId = A_SESSION_ID,
                 enterpriseService = FakeEnterpriseService(),
+                contentValidationCache = NoopEventContentValidationCache(),
+                contentScannerService = ContentScannerService { _, _ -> },
             )
         }
         val callback = object : MediaViewerEntryPoint.Callback {
@@ -89,6 +96,7 @@ class DefaultMediaViewerEntryPointTest {
 
     @Test
     fun `test node builder avatar`() = runTest {
+        Dispatchers.setMain(testCoroutineDispatchers().main)
         val entryPoint = DefaultMediaViewerEntryPoint()
         val mockMediaUri: Uri = mockk("localMediaUri")
         val localMediaFactory = FakeLocalMediaFactory(mockMediaUri)
@@ -114,6 +122,8 @@ class DefaultMediaViewerEntryPointTest {
                 audioFocus = FakeAudioFocus(),
                 sessionId = A_SESSION_ID,
                 enterpriseService = FakeEnterpriseService(),
+                contentValidationCache = NoopEventContentValidationCache(),
+                contentScannerService = ContentScannerService { _, _ -> },
             )
         }
         val callback = object : MediaViewerEntryPoint.Callback {
@@ -122,7 +132,7 @@ class DefaultMediaViewerEntryPointTest {
             override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) = lambdaError()
         }
         val params = entryPoint.createParamsForAvatar(
-            filename = "fn",
+            filename = "avatar.png",
             avatarUrl = "avatarUrl",
         )
         val result = entryPoint.createNode(
@@ -133,27 +143,11 @@ class DefaultMediaViewerEntryPointTest {
         )
         assertThat(result).isInstanceOf(MediaViewerNode::class.java)
         assertThat(result.plugins).contains(
-            MediaViewerEntryPoint.Params(
-                mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
-                eventId = null,
-                mediaInfo = MediaInfo(
-                    filename = "fn",
-                    fileSize = null,
-                    caption = null,
-                    mimeType = MimeTypes.Images,
-                    formattedFileSize = "",
-                    fileExtension = "",
-                    senderId = UserId("@dummy:server.org"),
-                    senderName = null,
-                    senderAvatar = null,
-                    dateSent = null,
-                    dateSentFull = null,
-                    waveform = null,
-                    duration = null,
-                ),
+            MediaViewerEntryPoint.Params.Avatar(
+                avatarInfo = AvatarInfo(filename = "avatar.png"),
                 mediaSource = MediaSource(url = "avatarUrl"),
                 thumbnailSource = null,
-                canShowInfo = false,
+                blurHash = null,
             )
         )
         assertThat(result.plugins).contains(callback)
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactoryTest.kt
similarity index 52%
rename from libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt
rename to libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactoryTest.kt
index 6c88f1c33f..4ed89e8923 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactoryTest.kt
@@ -12,12 +12,14 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
+import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.media.AudioDetails
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.media.FileInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.media.VideoInfo
+import io.element.android.libraries.matrix.api.notification.CallIntent
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyContent
@@ -25,6 +27,8 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryItemType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
@@ -48,6 +52,8 @@ import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageCo
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
@@ -56,12 +62,19 @@ import kotlinx.collections.immutable.toImmutableList
 import org.junit.Test
 import kotlin.time.Duration.Companion.seconds
 
-class DefaultEventItemFactoryTest {
+@Suppress("LargeClass")
+class EventItemFactoryTest {
     @Test
     fun `create check all null cases`() {
         val factory = createEventItemFactory()
         val contents = listOf(
-            CallNotifyContent,
+            CallNotifyContent(
+                callIntent = CallIntent.VIDEO,
+                declinedBy = emptyList(),
+                activeMembers = emptyList(),
+                isJoined = false,
+                callStartTsMillis = null,
+            ),
             FailedToParseMessageLikeContent("", ""),
             FailedToParseStateContent("", "", ""),
             LegacyCallInviteContent,
@@ -96,7 +109,7 @@ class DefaultEventItemFactoryTest {
                     )
                 )
             )
-            assertThat(result).isNull()
+            assertThat(result).isEmpty()
         }
     }
 
@@ -121,7 +134,7 @@ class DefaultEventItemFactoryTest {
                     )
                 )
             )
-            assertThat(result).isNull()
+            assertThat(result).isEmpty()
         }
     }
 
@@ -149,7 +162,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.File(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -169,6 +182,7 @@ class DefaultEventItemFactoryTest {
                     duration = null,
                 ),
                 mediaSource = MediaSource(""),
+                validationState = noopValidationState,
             )
         )
     }
@@ -200,7 +214,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.Image(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -221,6 +235,8 @@ class DefaultEventItemFactoryTest {
                 ),
                 mediaSource = MediaSource(""),
                 thumbnailSource = null,
+                blurHash = null,
+                validationState = noopValidationState,
             )
         )
     }
@@ -248,7 +264,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.Audio(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -268,6 +284,7 @@ class DefaultEventItemFactoryTest {
                     duration = null,
                 ),
                 mediaSource = MediaSource(""),
+                validationState = noopValidationState,
             )
         )
     }
@@ -300,7 +317,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.Video(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -321,6 +338,8 @@ class DefaultEventItemFactoryTest {
                 ),
                 mediaSource = MediaSource(""),
                 thumbnailSource = null,
+                blurHash = null,
+                validationState = noopValidationState,
             )
         )
     }
@@ -352,7 +371,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.Voice(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -372,10 +391,332 @@ class DefaultEventItemFactoryTest {
                     duration = "7:36",
                 ),
                 mediaSource = MediaSource(""),
+                validationState = noopValidationState,
             )
         )
     }
 
+    @Test
+    fun `create for GalleryMessageType with image item`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Image(
+                                    content = ImageMessageType(
+                                        filename = "image.jpg",
+                                        caption = "caption",
+                                        formattedCaption = null,
+                                        source = MediaSource("image_url"),
+                                        info = ImageInfo(
+                                            mimetype = MimeTypes.Jpeg,
+                                            size = 123L,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = MediaSource("thumbnail_url"),
+                                            height = 1L,
+                                            width = 2L,
+                                            blurhash = null,
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).containsExactly(
+            MediaItem.Image(
+                id = UniqueId("aUniqueId_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = MediaInfo(
+                    mimeType = MimeTypes.Jpeg,
+                    filename = "image.jpg",
+                    fileSize = 123L,
+                    caption = "caption",
+                    formattedFileSize = "123 Bytes",
+                    fileExtension = "jpg",
+                    senderId = A_USER_ID,
+                    senderName = "alice",
+                    senderAvatar = null,
+                    dateSent = "0 Day false",
+                    dateSentFull = "0 Full false",
+                    waveform = null,
+                    duration = null,
+                ),
+                mediaSource = MediaSource("image_url"),
+                thumbnailSource = MediaSource("thumbnail_url"),
+                blurHash = null,
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `create for GalleryMessageType with video item`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Video(
+                                    content = VideoMessageType(
+                                        filename = "video.mp4",
+                                        caption = "caption",
+                                        formattedCaption = null,
+                                        source = MediaSource("video_url"),
+                                        info = VideoInfo(
+                                            mimetype = MimeTypes.Mp4,
+                                            size = 123L,
+                                            thumbnailInfo = null,
+                                            duration = 123.seconds,
+                                            height = 1L,
+                                            width = 2L,
+                                            thumbnailSource = MediaSource("thumbnail_url"),
+                                            blurhash = null,
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).containsExactly(
+            MediaItem.Video(
+                id = UniqueId("aUniqueId_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = MediaInfo(
+                    mimeType = MimeTypes.Mp4,
+                    filename = "video.mp4",
+                    fileSize = 123L,
+                    caption = "caption",
+                    formattedFileSize = "123 Bytes",
+                    fileExtension = "mp4",
+                    senderId = A_USER_ID,
+                    senderName = "alice",
+                    senderAvatar = null,
+                    dateSent = "0 Day false",
+                    dateSentFull = "0 Full false",
+                    waveform = null,
+                    duration = "2:03",
+                ),
+                mediaSource = MediaSource("video_url"),
+                thumbnailSource = MediaSource("thumbnail_url"),
+                blurHash = null,
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `create for GalleryMessageType with audio item`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Audio(
+                                    content = AudioMessageType(
+                                        filename = "audio.mp3",
+                                        caption = "caption",
+                                        formattedCaption = null,
+                                        source = MediaSource("audio_url"),
+                                        info = AudioInfo(
+                                            mimetype = MimeTypes.Mp3,
+                                            size = 123L,
+                                            duration = 456.seconds,
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).containsExactly(
+            MediaItem.Audio(
+                id = UniqueId("aUniqueId_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = MediaInfo(
+                    mimeType = MimeTypes.Mp3,
+                    filename = "audio.mp3",
+                    fileSize = 123L,
+                    caption = "caption",
+                    formattedFileSize = "123 Bytes",
+                    fileExtension = "mp3",
+                    senderId = A_USER_ID,
+                    senderName = "alice",
+                    senderAvatar = null,
+                    dateSent = "0 Day false",
+                    dateSentFull = "0 Full false",
+                    waveform = null,
+                    duration = null,
+                ),
+                mediaSource = MediaSource("audio_url"),
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `create for GalleryMessageType with file item`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.File(
+                                    content = FileMessageType(
+                                        filename = "document.pdf",
+                                        caption = "caption",
+                                        formattedCaption = null,
+                                        source = MediaSource("file_url"),
+                                        info = FileInfo(
+                                            mimetype = MimeTypes.Pdf,
+                                            size = 456L,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                        )
+                                    )
+                                )
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).containsExactly(
+            MediaItem.File(
+                id = UniqueId("aUniqueId_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = MediaInfo(
+                    mimeType = MimeTypes.Pdf,
+                    filename = "document.pdf",
+                    fileSize = 456L,
+                    caption = "caption",
+                    formattedFileSize = "456 Bytes",
+                    fileExtension = "pdf",
+                    senderId = A_USER_ID,
+                    senderName = "alice",
+                    senderAvatar = null,
+                    dateSent = "0 Day false",
+                    dateSentFull = "0 Full false",
+                    waveform = null,
+                    duration = null,
+                ),
+                mediaSource = MediaSource("file_url"),
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `create for GalleryMessageType with Other item returns empty list`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Other(itemType = "unknown_type", body = "Some body")
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).isEmpty()
+    }
+
+    @Test
+    fun `create for GalleryMessageType with multiple items produces indexed IDs`() {
+        val factory = createEventItemFactory()
+        val result = factory.create(
+            MatrixTimelineItem.Event(
+                uniqueId = A_UNIQUE_ID,
+                event = anEventTimelineItem(
+                    content = aMessageContent(
+                        messageType = GalleryMessageType(
+                            body = "Gallery body",
+                            formatted = null,
+                            items = listOf(
+                                GalleryItemType.Image(
+                                    content = ImageMessageType(
+                                        filename = "image.jpg",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = MediaSource("image_url"),
+                                        info = ImageInfo(
+                                            mimetype = MimeTypes.Jpeg,
+                                            size = 123L,
+                                            thumbnailInfo = null,
+                                            thumbnailSource = null,
+                                            height = 1L,
+                                            width = 2L,
+                                            blurhash = null,
+                                        )
+                                    )
+                                ),
+                                GalleryItemType.Video(
+                                    content = VideoMessageType(
+                                        filename = "video.mp4",
+                                        caption = null,
+                                        formattedCaption = null,
+                                        source = MediaSource("video_url"),
+                                        info = VideoInfo(
+                                            mimetype = MimeTypes.Mp4,
+                                            size = 456L,
+                                            thumbnailInfo = null,
+                                            duration = null,
+                                            height = 1L,
+                                            width = 2L,
+                                            thumbnailSource = null,
+                                            blurhash = null,
+                                        )
+                                    )
+                                ),
+                                GalleryItemType.Other(itemType = "unknown_type", body = "ignored"),
+                            )
+                        )
+                    )
+                )
+            )
+        )
+        assertThat(result).hasSize(2)
+        assertThat(result[0]).isInstanceOf(MediaItem.Image::class.java)
+        assertThat((result[0] as MediaItem.Image).id).isEqualTo(UniqueId("aUniqueId_0"))
+        assertThat(result[1]).isInstanceOf(MediaItem.Video::class.java)
+        assertThat((result[1] as MediaItem.Video).id).isEqualTo(UniqueId("aUniqueId_1"))
+    }
+
     @Test
     fun `create for StickerMessageType`() {
         val factory = createEventItemFactory()
@@ -403,7 +744,7 @@ class DefaultEventItemFactoryTest {
                 )
             )
         )
-        assertThat(result).isEqualTo(
+        assertThat(result).containsExactly(
             MediaItem.Image(
                 id = A_UNIQUE_ID,
                 eventId = AN_EVENT_ID,
@@ -424,13 +765,17 @@ class DefaultEventItemFactoryTest {
                 ),
                 mediaSource = MediaSource(""),
                 thumbnailSource = null,
+                blurHash = null,
+                validationState = noopValidationState,
             )
         )
     }
 }
 
+private val noopValidationState = NoopContentValidationState()
 private fun createEventItemFactory() = EventItemFactory(
     fileSizeFormatter = FakeFileSizeFormatter(),
     fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
     dateFormatter = FakeDateFormatter(),
+    contentValidationCache = NoopEventContentValidationCache(noopValidationState),
 )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt
index c612bba1bc..5839f33ce6 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FakeMediaGalleryDataSource.kt
@@ -13,19 +13,22 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.tests.testutils.lambda.lambdaError
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 
 class FakeMediaGalleryDataSource(
+    initialData: AsyncData<GroupedMediaItems> = AsyncData.Uninitialized,
+    private val isReadyResult: () -> Boolean = { true },
     private val startLambda: () -> Unit = { lambdaError() },
     private val loadMoreLambda: (Timeline.PaginationDirection) -> Unit = { lambdaError() },
     private val deleteItemLambda: (EventId) -> Unit = { lambdaError() },
-    ) : MediaGalleryDataSource {
-    override fun start() = startLambda()
+) : MediaGalleryDataSource {
+    override fun start(coroutineScope: CoroutineScope) = startLambda()
 
-    private val groupedMediaItemsFlow = MutableSharedFlow<AsyncData<GroupedMediaItems>>(
-        replay = 1
-    )
+    private val groupedMediaItemsFlow = MutableStateFlow(initialData)
+
+    override val isReady: Boolean get() = isReadyResult()
 
     override fun groupedMediaItemsFlow(): Flow<AsyncData<GroupedMediaItems>> {
         return groupedMediaItemsFlow
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
index bb8419dde5..81bb23d73c 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
@@ -34,6 +34,8 @@ import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
@@ -80,7 +82,7 @@ class TimelineMediaGalleryDataSourceTest {
                     roomCoroutineScope = backgroundScope,
                 )
             )
-            sut.start()
+            sut.start(backgroundScope)
             assertThat(sut.getLastData()).isEqualTo(AsyncData.Uninitialized)
             sut.groupedMediaItemsFlow().test {
                 assertThat(awaitItem().isLoading()).isTrue()
@@ -95,7 +97,7 @@ class TimelineMediaGalleryDataSourceTest {
                 )
                 assertThat(sut.getLastData().isSuccess()).isTrue()
                 // Also test that starting again should have no effect
-                sut.start()
+                sut.start(backgroundScope)
             }
         }
         // Ensure that the timeline has been closed on flow completion
@@ -117,7 +119,7 @@ class TimelineMediaGalleryDataSourceTest {
                 roomCoroutineScope = backgroundScope,
             )
         )
-        sut.start()
+        sut.start(backgroundScope)
         sut.groupedMediaItemsFlow().test {
             skipItems(2)
             sut.loadMore(Timeline.PaginationDirection.BACKWARDS)
@@ -140,7 +142,7 @@ class TimelineMediaGalleryDataSourceTest {
                 roomCoroutineScope = backgroundScope,
             )
         )
-        sut.start()
+        sut.start(backgroundScope)
         sut.groupedMediaItemsFlow().test {
             skipItems(2)
             sut.deleteItem(AN_EVENT_ID)
@@ -159,7 +161,7 @@ class TimelineMediaGalleryDataSourceTest {
                 roomCoroutineScope = backgroundScope,
             )
         )
-        sut.start()
+        sut.start(backgroundScope)
         sut.groupedMediaItemsFlow().test {
             assertThat(awaitItem().isLoading()).isTrue()
             assertThat(sut.getLastData().isLoading()).isTrue()
@@ -181,7 +183,7 @@ class TimelineMediaGalleryDataSourceTest {
                 roomCoroutineScope = backgroundScope,
             )
         )
-        sut.start()
+        sut.start(backgroundScope)
         sut.groupedMediaItemsFlow().test {
             assertThat(awaitItem().isLoading()).isTrue()
             assertThat(sut.getLastData().isLoading()).isTrue()
@@ -235,6 +237,7 @@ class TimelineMediaGalleryDataSourceTest {
                                     filename = "body.jpg",
                                     fileSize = 888L,
                                     caption = "body.jpg caption",
+                                    formattedCaption = "formatted",
                                     mimeType = MimeTypes.Jpeg,
                                     formattedFileSize = "888 Bytes",
                                     fileExtension = "jpg",
@@ -248,6 +251,8 @@ class TimelineMediaGalleryDataSourceTest {
                                 ),
                                 mediaSource = MediaSource("url"),
                                 thumbnailSource = MediaSource("url_thumbnail"),
+                                blurHash = A_BLUR_HASH,
+                                validationState = noopValidationState,
                             )
                         ),
                         fileItems = persistentListOf()
@@ -258,6 +263,8 @@ class TimelineMediaGalleryDataSourceTest {
     }
 }
 
+private val noopValidationState = NoopContentValidationState()
+
 internal fun TestScope.createTimelineMediaGalleryDataSource(
     room: JoinedRoom = FakeJoinedRoom(
         liveTimeline = FakeTimeline(),
@@ -280,5 +287,6 @@ fun TestScope.createTimelineMediaItemsFactory() = TimelineMediaItemsFactory(
         fileSizeFormatter = FakeFileSizeFormatter(),
         fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
         dateFormatter = FakeDateFormatter(),
-    ),
+        contentValidationCache = NoopEventContentValidationCache(noopValidationState),
+    )
 )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheetTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheetTest.kt
index 4d8b81a2dd..a9fbae9eec 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheetTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDeleteConfirmationBottomSheetTest.kt
@@ -6,13 +6,15 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.mediaviewer.impl.details
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -20,45 +22,39 @@ import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MediaDeleteConfirmationBottomSheetTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class MediaDeleteConfirmationBottomSheetTest : RobolectricTest() {
     @Test
-    fun `clicking on Cancel invokes expected callback`() {
-        val state = aMediaDeleteConfirmationState()
+    fun `clicking on Cancel invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDeleteConfirmation()
         ensureCalledOnce { callback ->
-            rule.setMediaDeleteConfirmationBottomSheet(
+            setMediaDeleteConfirmationBottomSheet(
                 state = state,
                 onDismiss = callback,
             )
-            rule.clickOn(CommonStrings.action_cancel)
+            clickOn(CommonStrings.action_cancel)
         }
     }
 
     @Test
-    fun `clicking on Remove invokes expected callback`() {
-        val state = aMediaDeleteConfirmationState()
+    fun `clicking on Remove invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDeleteConfirmation()
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDeleteConfirmationBottomSheet(
+            setMediaDeleteConfirmationBottomSheet(
                 state = state,
                 onDelete = callback,
             )
-            rule.onNodeWithText(rule.activity.getString(CommonStrings.action_remove)).assertExists()
-            rule.clickOn(CommonStrings.action_remove)
+            onNodeWithText(activity!!.getString(CommonStrings.action_remove)).assertExists()
+            clickOn(CommonStrings.action_remove)
         }
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMediaDeleteConfirmationBottomSheet(
-    state: MediaBottomSheetState.MediaDeleteConfirmationState,
+private fun AndroidComposeUiTest<ComponentActivity>.setMediaDeleteConfirmationBottomSheet(
+    state: MediaBottomSheetState.DeleteConfirmation,
     onDelete: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDismiss: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt
index 580cd89c72..4ad348a847 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/details/MediaDetailsBottomSheetTest.kt
@@ -6,116 +6,135 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.mediaviewer.impl.details
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnceWithParam
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class MediaDetailsBottomSheetTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class MediaDetailsBottomSheetTest : RobolectricTest() {
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on View in timeline invokes expected callback`() {
-        val state = aMediaDetailsBottomSheetState()
+    fun `clicking on View in timeline invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails()
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDetailsBottomSheet(
+            setMediaDetailsBottomSheet(
                 state = state,
                 onViewInTimeline = callback,
             )
-            rule.clickOn(CommonStrings.action_view_in_timeline)
+            clickOn(CommonStrings.action_view_in_timeline)
         }
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on Share invokes expected callback`() {
-        val state = aMediaDetailsBottomSheetState()
+    fun `clicking on Share invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails(
+            fromGallery = true,
+        )
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDetailsBottomSheet(
+            setMediaDetailsBottomSheet(
                 state = state,
                 onShare = callback,
             )
-            rule.clickOn(CommonStrings.action_share)
+            clickOn(CommonStrings.action_share)
         }
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on Forward invokes expected callback`() {
-        val state = aMediaDetailsBottomSheetState()
+    fun `item Share is not displayed when opened from the media viewer`() = runAndroidComposeUiTest {
+        setMediaDetailsBottomSheet(
+            state = aMediaBottomSheetStateDetails(),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.action_share)).assertDoesNotExist()
+    }
+
+    @Test
+    @Config(qualifiers = "h1024dp")
+    fun `clicking on Forward invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails()
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDetailsBottomSheet(
+            setMediaDetailsBottomSheet(
                 state = state,
                 onForward = callback,
             )
-            rule.clickOn(CommonStrings.action_forward)
+            clickOn(CommonStrings.action_forward)
         }
     }
 
     @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on Save invokes expected callback`() {
-        val state = aMediaDetailsBottomSheetState()
+    fun `clicking on Download invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails(
+            fromGallery = true,
+        )
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDetailsBottomSheet(
+            setMediaDetailsBottomSheet(
                 state = state,
                 onDownload = callback,
             )
-            rule.clickOn(CommonStrings.action_save)
+            clickOn(CommonStrings.action_download)
         }
     }
 
+    @Test
+    @Config(qualifiers = "h1024dp")
+    fun `item Download is not displayed when opened from the media viewer`() = runAndroidComposeUiTest {
+        setMediaDetailsBottomSheet(
+            state = aMediaBottomSheetStateDetails(),
+        )
+        onNodeWithText(activity!!.getString(CommonStrings.action_download)).assertDoesNotExist()
+    }
+
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on Remove invokes expected callback`() {
-        val state = aMediaDetailsBottomSheetState()
+    fun `clicking on Delete invokes expected callback`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails()
         ensureCalledOnceWithParam(state.eventId) { callback ->
-            rule.setMediaDetailsBottomSheet(
+            setMediaDetailsBottomSheet(
                 state = state,
                 onDelete = callback,
             )
-            rule.onNodeWithText(rule.activity.getString(CommonStrings.action_remove)).assertExists()
-            rule.clickOn(CommonStrings.action_remove)
+            onNodeWithText(activity!!.getString(CommonStrings.action_delete_file)).assertExists()
+            clickOn(CommonStrings.action_delete_file)
         }
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `Remove is not present if canDelete is false`() {
-        val state = aMediaDetailsBottomSheetState(
+    fun `Remove is not present if canDelete is false`() = runAndroidComposeUiTest {
+        val state = aMediaBottomSheetStateDetails(
             canDelete = false,
         )
-        rule.setMediaDetailsBottomSheet(
+        setMediaDetailsBottomSheet(
             state = state,
         )
-        rule.onNodeWithText(rule.activity.getString(CommonStrings.action_remove)).assertDoesNotExist()
+        onNodeWithText(activity!!.getString(CommonStrings.action_remove)).assertDoesNotExist()
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMediaDetailsBottomSheet(
-    state: MediaBottomSheetState.MediaDetailsBottomSheetState,
+private fun AndroidComposeUiTest<ComponentActivity>.setMediaDetailsBottomSheet(
+    state: MediaBottomSheetState.Details,
     onViewInTimeline: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onShare: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onForward: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDownload: (EventId) -> Unit = EnsureNeverCalledWithParam(),
+    onOpenWith: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDelete: (EventId) -> Unit = EnsureNeverCalledWithParam(),
     onDismiss: () -> Unit = EnsureNeverCalled(),
 ) {
@@ -126,6 +145,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMedia
             onShare = onShare,
             onForward = onForward,
             onDownload = onDownload,
+            onOpenWith = onOpenWith,
             onDelete = onDelete,
             onDismiss = onDismiss,
         )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
index 3069a4fd9d..a6e7e6b201 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
@@ -6,6 +6,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.element.android.libraries.mediaviewer.impl.gallery
 
 import android.net.Uri
@@ -27,6 +29,7 @@ import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource
 import io.element.android.libraries.mediaviewer.impl.datasource.MediaGalleryDataSource
 import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetState
@@ -39,6 +42,8 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
 import io.mockk.mockk
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -52,8 +57,12 @@ class MediaGalleryPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
+        val configureLambda = lambdaRecorder<Unit> { }
         val startLambda = lambdaRecorder<Unit> { }
         val presenter = createMediaGalleryPresenter(
+            localMediaActions = FakeLocalMediaActions(
+                configureResult = configureLambda,
+            ),
             mediaGalleryDataSource = FakeMediaGalleryDataSource(
                 startLambda = startLambda,
             ),
@@ -70,6 +79,7 @@ class MediaGalleryPresenterTest {
             assertThat(initialState.groupedMediaItems.isUninitialized()).isTrue()
             assertThat(initialState.snackbarMessage).isNull()
         }
+        configureLambda.assertions().isCalledOnce()
         startLambda.assertions().isCalledOnce()
     }
 
@@ -84,10 +94,10 @@ class MediaGalleryPresenterTest {
         presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.mode).isEqualTo(MediaGalleryMode.Images)
-            initialState.eventSink(MediaGalleryEvents.ChangeMode(MediaGalleryMode.Files))
+            initialState.eventSink(MediaGalleryEvent.ChangeMode(MediaGalleryMode.Files))
             val state = awaitItem()
             assertThat(state.mode).isEqualTo(MediaGalleryMode.Files)
-            state.eventSink(MediaGalleryEvents.ChangeMode(MediaGalleryMode.Images))
+            state.eventSink(MediaGalleryEvent.ChangeMode(MediaGalleryMode.Images))
             val imageModeState = awaitItem()
             assertThat(imageModeState.mode).isEqualTo(MediaGalleryMode.Images)
         }
@@ -123,10 +133,11 @@ class MediaGalleryPresenterTest {
                 eventId = AN_EVENT_ID,
                 senderId = A_USER_ID,
             )
-            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            initialState.eventSink(MediaGalleryEvent.OpenInfo(item))
             val state = awaitItem()
             assertThat(state.mediaBottomSheetState).isEqualTo(
-                MediaBottomSheetState.MediaDetailsBottomSheetState(
+                MediaBottomSheetState.Details(
+                    fromGallery = true,
                     eventId = AN_EVENT_ID,
                     canDelete = canDeleteOwn,
                     mediaInfo = item.mediaInfo,
@@ -134,7 +145,7 @@ class MediaGalleryPresenterTest {
                 )
             )
             // Close the bottom sheet
-            state.eventSink(MediaGalleryEvents.CloseBottomSheet)
+            state.eventSink(MediaGalleryEvent.CloseBottomSheet)
             val closedState = awaitItem()
             assertThat(closedState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
         }
@@ -170,10 +181,11 @@ class MediaGalleryPresenterTest {
                 eventId = AN_EVENT_ID,
                 senderId = A_USER_ID_2,
             )
-            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            initialState.eventSink(MediaGalleryEvent.OpenInfo(item))
             val state = awaitItem()
             assertThat(state.mediaBottomSheetState).isEqualTo(
-                MediaBottomSheetState.MediaDetailsBottomSheetState(
+                MediaBottomSheetState.Details(
+                    fromGallery = true,
                     eventId = AN_EVENT_ID,
                     canDelete = canDeleteOther,
                     mediaInfo = item.mediaInfo,
@@ -181,7 +193,7 @@ class MediaGalleryPresenterTest {
                 )
             )
             // Close the bottom sheet
-            state.eventSink(MediaGalleryEvents.CloseBottomSheet)
+            state.eventSink(MediaGalleryEvent.CloseBottomSheet)
             val closedState = awaitItem()
             assertThat(closedState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
         }
@@ -199,17 +211,17 @@ class MediaGalleryPresenterTest {
             val initialState = awaitFirstItem()
             // Delete bottom sheet
             val item = aMediaItemImage()
-            initialState.eventSink(MediaGalleryEvents.ConfirmDelete(AN_EVENT_ID, item.mediaInfo, item.thumbnailSource))
+            initialState.eventSink(MediaGalleryEvent.ConfirmDelete(AN_EVENT_ID, item.mediaInfo, item.thumbnailSource))
             val deleteState = awaitItem()
             assertThat(deleteState.mediaBottomSheetState).isEqualTo(
-                MediaBottomSheetState.MediaDeleteConfirmationState(
+                MediaBottomSheetState.DeleteConfirmation(
                     eventId = AN_EVENT_ID,
                     mediaInfo = item.mediaInfo,
                     thumbnailSource = item.thumbnailSource,
                 )
             )
             // Close the bottom sheet
-            deleteState.eventSink(MediaGalleryEvents.CloseBottomSheet)
+            deleteState.eventSink(MediaGalleryEvent.CloseBottomSheet)
             val deleteClosedState = awaitItem()
             assertThat(deleteClosedState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
         }
@@ -226,7 +238,7 @@ class MediaGalleryPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.Delete(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.Delete(AN_EVENT_ID))
             deleteItemLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
         }
     }
@@ -236,7 +248,7 @@ class MediaGalleryPresenterTest {
         val presenter = createMediaGalleryPresenter()
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.Share(AN_EVENT_ID))
         }
     }
 
@@ -258,7 +270,7 @@ class MediaGalleryPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.Share(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.snackbarMessage).isNull()
         }
@@ -283,7 +295,7 @@ class MediaGalleryPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.Share(AN_EVENT_ID))
             skipItems(1)
             val finalState = awaitItem()
             assertThat(finalState.snackbarMessage).isInstanceOf(SnackbarMessage::class.java)
@@ -295,7 +307,7 @@ class MediaGalleryPresenterTest {
         val presenter = createMediaGalleryPresenter()
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.SaveOnDisk(AN_EVENT_ID))
         }
     }
 
@@ -304,23 +316,89 @@ class MediaGalleryPresenterTest {
         val mediaGalleryDataSource = FakeMediaGalleryDataSource(
             startLambda = { },
         )
+        val saveOnDiskResult = lambdaRecorder<LocalMedia, Result<Unit>> { _ -> Result.success(Unit) }
+        val media = aMediaItemImage(eventId = AN_EVENT_ID)
         mediaGalleryDataSource.emitGroupedMediaItems(
             AsyncData.Success(
                 aGroupedMediaItems(
-                    imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),
+                    imageAndVideoItems = listOf(media),
                     fileItems = emptyList(),
                 )
             )
         )
         val presenter = createMediaGalleryPresenter(
+            localMediaActions = FakeLocalMediaActions(
+                saveOnDiskResult = saveOnDiskResult,
+            ),
             mediaGalleryDataSource = mediaGalleryDataSource,
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.SaveOnDisk(AN_EVENT_ID))
             skipItems(1)
             val finalState = awaitItem()
             assertThat(finalState.snackbarMessage?.messageResId).isEqualTo(CommonStrings.common_file_saved_on_disk_android)
+            saveOnDiskResult.assertions().isCalledOnce().with(
+                value(
+                    LocalMedia(
+                        uri = mockMediaUri,
+                        info = media.mediaInfo,
+                    )
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `present - open with closes the bottom sheet and invokes the navigator`() = runTest {
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+        )
+        val openWithResult = lambdaRecorder<LocalMedia, Result<Unit>> { _ -> Result.success(Unit) }
+        val item = aMediaItemImage(
+            eventId = AN_EVENT_ID,
+            senderId = A_USER_ID,
+        )
+        mediaGalleryDataSource.emitGroupedMediaItems(
+            AsyncData.Success(
+                aGroupedMediaItems(
+                    imageAndVideoItems = listOf(item),
+                    fileItems = emptyList(),
+                )
+            )
+        )
+        val presenter = createMediaGalleryPresenter(
+            localMediaActions = FakeLocalMediaActions(
+                openResult = openWithResult,
+            ),
+            mediaGalleryDataSource = mediaGalleryDataSource,
+            room = FakeJoinedRoom(
+                createTimelineResult = { Result.success(FakeTimeline()) },
+                baseRoom = FakeBaseRoom(
+                    roomPermissions = FakeRoomPermissions(
+                        canRedactOwn = true
+                    ),
+                ),
+            ),
+        )
+        presenter.test {
+            skipItems(1)
+            val initialState = awaitFirstItem()
+            initialState.eventSink(MediaGalleryEvent.OpenInfo(item))
+            val withBottomSheetState = awaitItem()
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            withBottomSheetState.eventSink(MediaGalleryEvent.OpenWith(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+            advanceUntilIdle()
+            openWithResult.assertions().isCalledOnce().with(
+                value(
+                    LocalMedia(
+                        uri = mockMediaUri,
+                        info = item.mediaInfo,
+                    )
+                )
+            )
         }
     }
 
@@ -343,7 +421,7 @@ class MediaGalleryPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
+            initialState.eventSink(MediaGalleryEvent.SaveOnDisk(AN_EVENT_ID))
             skipItems(1)
             val finalState = awaitItem()
             assertThat(finalState.snackbarMessage).isInstanceOf(SnackbarMessage::class.java)
@@ -373,10 +451,10 @@ class MediaGalleryPresenterTest {
                 eventId = AN_EVENT_ID,
                 senderId = A_USER_ID,
             )
-            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            initialState.eventSink(MediaGalleryEvent.OpenInfo(item))
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
-            withBottomSheetState.eventSink(MediaGalleryEvents.ViewInTimeline(AN_EVENT_ID))
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            withBottomSheetState.eventSink(MediaGalleryEvent.ViewInTimeline(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
@@ -406,10 +484,10 @@ class MediaGalleryPresenterTest {
                 eventId = AN_EVENT_ID,
                 senderId = A_USER_ID,
             )
-            initialState.eventSink(MediaGalleryEvents.OpenInfo(item))
+            initialState.eventSink(MediaGalleryEvent.OpenInfo(item))
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
-            withBottomSheetState.eventSink(MediaGalleryEvents.Forward(AN_EVENT_ID))
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            withBottomSheetState.eventSink(MediaGalleryEvent.Forward(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onForwardClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
@@ -427,7 +505,7 @@ class MediaGalleryPresenterTest {
         )
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(MediaGalleryEvents.LoadMore(Timeline.PaginationDirection.BACKWARDS))
+            initialState.eventSink(MediaGalleryEvent.LoadMore(Timeline.PaginationDirection.BACKWARDS))
             loadMoreLambda.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))
         }
     }
@@ -456,6 +534,7 @@ class MediaGalleryPresenterTest {
             mediaLoader = matrixMediaLoader,
             localMediaActions = localMediaActions,
             snackbarDispatcher = snackbarDispatcher,
+            contentScannerService = { _, _ -> },
         )
     }
 }
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActionsTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActionsTest.kt
index cd7b7003af..cdc5f7220d 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActionsTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaActionsTest.kt
@@ -18,16 +18,14 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.mediaviewer.test.viewer.aLocalMedia
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class AndroidLocalMediaActionsTest {
+class AndroidLocalMediaActionsTest : RobolectricTest() {
     @Test
     fun `present - AndroidLocalMediaAction configure`() = runTest {
         val sut = createAndroidLocalMediaActions()
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt
index f01ac1d749..246ae50b4d 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt
@@ -8,7 +8,9 @@
 
 package io.element.android.libraries.mediaviewer.impl.local
 
+import android.graphics.Bitmap
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.file.getMimeType
 import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MediaFile
@@ -18,13 +20,15 @@ import io.element.android.libraries.matrix.test.media.FakeMediaFile
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.anImageMediaInfo
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
+import java.io.File
+import java.io.FileOutputStream
+
+class AndroidLocalMediaFactoryTest : RobolectricTest() {
+    private val context = RuntimeEnvironment.getApplication()
 
-@RunWith(RobolectricTestRunner::class)
-class AndroidLocalMediaFactoryTest {
     @Test
     fun `test AndroidLocalMediaFactory`() {
         val sut = createAndroidLocalMediaFactory()
@@ -58,13 +62,34 @@ class AndroidLocalMediaFactoryTest {
         )
     }
 
+    @Test
+    fun `createFromUri detects image mime type from content when picker mime type is generic`() {
+        val imageFile = File(context.cacheDir, "picked-media").apply {
+            FileOutputStream(this).use { outputStream ->
+                Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+                    .compress(Bitmap.CompressFormat.PNG, 100, outputStream)
+            }
+        }
+
+        val result = createAndroidLocalMediaFactory().createFromUri(
+            uri = imageFile.toURI().toString().let(android.net.Uri::parse),
+            mimeType = MimeTypes.OctetStream,
+            name = imageFile.name,
+            formattedFileSize = null,
+        )
+
+        assertThat(context.getMimeType(result.uri)).isNull()
+        assertThat(result.info.mimeType).isEqualTo(MimeTypes.Png)
+        assertThat(result.info.fileExtension).isEmpty()
+    }
+
     private fun aMediaFile(): MediaFile {
         return FakeMediaFile("aPath")
     }
 
     private fun createAndroidLocalMediaFactory(): AndroidLocalMediaFactory {
         return AndroidLocalMediaFactory(
-            RuntimeEnvironment.getApplication(),
+            context,
             FakeFileSizeFormatter(),
             FileExtensionExtractorWithoutValidation()
         )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt
index 3c5c91589c..6f0d85894a 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/util/FileExtensionExtractorWithValidationTest.kt
@@ -9,12 +9,10 @@
 package io.element.android.libraries.mediaviewer.impl.util
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class FileExtensionExtractorWithValidationTest {
+class FileExtensionExtractorWithValidationTest : RobolectricTest() {
     @Test
     fun `test FileExtensionExtractor with validation OK`() {
         val sut = FileExtensionExtractorWithValidation()
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSourceTest.kt
new file mode 100644
index 0000000000..38f59f48cc
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/GalleryMediaGalleryDataSourceTest.kt
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.mediaviewer.impl.viewer
+
+import app.cash.turbine.test
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.core.mimetype.MimeTypes
+import io.element.android.libraries.matrix.api.core.UniqueId
+import io.element.android.libraries.matrix.api.media.MediaSource
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopContentValidationState
+import io.element.android.libraries.mediaviewer.api.GalleryInfo
+import io.element.android.libraries.mediaviewer.api.GalleryItemData
+import io.element.android.libraries.mediaviewer.api.MediaInfo
+import io.element.android.libraries.mediaviewer.impl.gallery.aGroupedMediaItems
+import io.element.android.libraries.mediaviewer.impl.model.MediaItem
+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemFile
+import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage
+import io.element.android.tests.testutils.WarmUpRule
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class GalleryMediaGalleryDataSourceTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `isReady is true`() {
+        val sut = GalleryMediaGalleryDataSource(aGroupedMediaItems())
+        assertThat(sut.isReady).isTrue()
+    }
+
+    @Test
+    fun `function start is no op`() = runTest {
+        val sut = GalleryMediaGalleryDataSource(aGroupedMediaItems())
+        sut.start(backgroundScope)
+    }
+
+    @Test
+    fun `function loadMore is no op`() = runTest {
+        val sut = GalleryMediaGalleryDataSource(aGroupedMediaItems())
+        sut.loadMore(Timeline.PaginationDirection.BACKWARDS)
+        sut.loadMore(Timeline.PaginationDirection.FORWARDS)
+    }
+
+    @Test
+    fun `function deleteItem is no op`() = runTest {
+        val sut = GalleryMediaGalleryDataSource(aGroupedMediaItems())
+        sut.deleteItem(AN_EVENT_ID)
+    }
+
+    @Test
+    fun `getLastData should return the data`() {
+        val data = aGroupedMediaItems(
+            imageAndVideoItems = listOf(aMediaItemImage()),
+            fileItems = listOf(aMediaItemFile()),
+        )
+        val sut = GalleryMediaGalleryDataSource(data)
+        assertThat(sut.getLastData()).isEqualTo(AsyncData.Success(data))
+    }
+
+    @Test
+    fun `groupedMediaItemsFlow emits a single item`() = runTest {
+        val data = aGroupedMediaItems(
+            imageAndVideoItems = listOf(aMediaItemImage()),
+            fileItems = listOf(aMediaItemFile()),
+        )
+        val sut = GalleryMediaGalleryDataSource(data)
+        sut.groupedMediaItemsFlow().test {
+            assertThat(awaitItem()).isEqualTo(AsyncData.Success(data))
+            awaitComplete()
+        }
+    }
+
+    @Test
+    fun `createFrom with image item creates MediaItem Image in imageAndVideoItems`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = AN_EVENT_ID,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "image.jpg",
+                    mimeType = MimeTypes.Jpeg,
+                    mediaSource = MediaSource("image_url"),
+                    thumbnailSource = MediaSource("thumbnail_url"),
+                    type = GalleryItemData.Type.Image,
+                    blurHash = null,
+                )
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        assertThat(data.fileItems).isEmpty()
+        assertThat(data.imageAndVideoItems).containsExactly(
+            MediaItem.Image(
+                id = UniqueId("${AN_EVENT_ID.value}_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = expectedMediaInfo("image.jpg", MimeTypes.Jpeg),
+                mediaSource = MediaSource("image_url"),
+                thumbnailSource = MediaSource("thumbnail_url"),
+                blurHash = null,
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `createFrom with video item creates MediaItem Video in imageAndVideoItems`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = AN_EVENT_ID,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "video.mp4",
+                    mimeType = MimeTypes.Mp4,
+                    mediaSource = MediaSource("video_url"),
+                    thumbnailSource = MediaSource("thumbnail_url"),
+                    type = GalleryItemData.Type.Video,
+                    blurHash = null,
+                )
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        assertThat(data.fileItems).isEmpty()
+        assertThat(data.imageAndVideoItems).containsExactly(
+            MediaItem.Video(
+                id = UniqueId("${AN_EVENT_ID.value}_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = expectedMediaInfo("video.mp4", MimeTypes.Mp4),
+                mediaSource = MediaSource("video_url"),
+                thumbnailSource = MediaSource("thumbnail_url"),
+                blurHash = null,
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `createFrom with audio item creates MediaItem Audio in imageAndVideoItems`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = AN_EVENT_ID,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "audio.mp3",
+                    mimeType = MimeTypes.Mp3,
+                    mediaSource = MediaSource("audio_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.Audio,
+                    blurHash = null,
+                )
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        assertThat(data.fileItems).isEmpty()
+        assertThat(data.imageAndVideoItems).containsExactly(
+            MediaItem.Audio(
+                id = UniqueId("${AN_EVENT_ID.value}_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = expectedMediaInfo("audio.mp3", MimeTypes.Mp3),
+                mediaSource = MediaSource("audio_url"),
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `createFrom with file item creates MediaItem File in imageAndVideoItems`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = AN_EVENT_ID,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "document.pdf",
+                    mimeType = MimeTypes.Pdf,
+                    mediaSource = MediaSource("file_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.File,
+                    blurHash = null,
+                )
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        assertThat(data.fileItems).isEmpty()
+        assertThat(data.imageAndVideoItems).containsExactly(
+            MediaItem.File(
+                id = UniqueId("${AN_EVENT_ID.value}_0"),
+                eventId = AN_EVENT_ID,
+                mediaInfo = expectedMediaInfo("document.pdf", MimeTypes.Pdf),
+                mediaSource = MediaSource("file_url"),
+                validationState = noopValidationState,
+            )
+        )
+    }
+
+    @Test
+    fun `createFrom uses gallery prefix when eventId is null`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = null,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "image.jpg",
+                    mimeType = MimeTypes.Jpeg,
+                    mediaSource = MediaSource("image_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.Image,
+                    blurHash = null,
+                )
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        val item = data.imageAndVideoItems.single() as MediaItem.Image
+        assertThat(item.id).isEqualTo(UniqueId("gallery_0"))
+        assertThat(item.eventId).isNull()
+    }
+
+    @Test
+    fun `createFrom with multiple items produces indexed IDs and all go to imageAndVideoItems`() {
+        val result = GalleryMediaGalleryDataSource.createFrom(
+            eventId = AN_EVENT_ID,
+            galleryItems = listOf(
+                GalleryItemData(
+                    filename = "image.jpg",
+                    mimeType = MimeTypes.Jpeg,
+                    mediaSource = MediaSource("image_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.Image,
+                    blurHash = null,
+                ),
+                GalleryItemData(
+                    filename = "document.pdf",
+                    mimeType = MimeTypes.Pdf,
+                    mediaSource = MediaSource("file_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.File,
+                    blurHash = null,
+                ),
+                GalleryItemData(
+                    filename = "video.mp4",
+                    mimeType = MimeTypes.Mp4,
+                    mediaSource = MediaSource("video_url"),
+                    thumbnailSource = null,
+                    type = GalleryItemData.Type.Video,
+                    blurHash = null,
+                ),
+            ),
+            galleryInfo = aGalleryInfo(),
+            contentValidationState = noopValidationState,
+        )
+        val data = (result.getLastData() as AsyncData.Success).data
+        assertThat(data.fileItems).isEmpty()
+        assertThat(data.imageAndVideoItems).hasSize(3)
+        assertThat((data.imageAndVideoItems[0] as MediaItem.Image).id).isEqualTo(UniqueId("${AN_EVENT_ID.value}_0"))
+        assertThat((data.imageAndVideoItems[1] as MediaItem.File).id).isEqualTo(UniqueId("${AN_EVENT_ID.value}_1"))
+        assertThat((data.imageAndVideoItems[2] as MediaItem.Video).id).isEqualTo(UniqueId("${AN_EVENT_ID.value}_2"))
+    }
+
+    private val noopValidationState = NoopContentValidationState()
+
+    private fun aGalleryInfo() = GalleryInfo(
+        caption = "A caption",
+        formattedCaption = null,
+        senderId = A_USER_ID,
+        senderName = "Alice",
+        senderAvatar = null,
+        dateSent = "Today",
+        dateSentFull = "Today at 12:00",
+        initialIndex = 0,
+    )
+
+    private fun expectedMediaInfo(filename: String, mimeType: String) = MediaInfo(
+        filename = filename,
+        fileSize = null,
+        caption = "A caption",
+        mimeType = mimeType,
+        formattedFileSize = "",
+        fileExtension = filename.substringAfterLast('.', ""),
+        senderId = A_USER_ID,
+        senderName = "Alice",
+        senderAvatar = null,
+        dateSent = "Today",
+        dateSentFull = "Today at 12:00",
+        waveform = null,
+        duration = null,
+    )
+}
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt
index 44eed2733f..bc8e3f1a50 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerDataSourceTest.kt
@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint.MediaViewerMode
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
 import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource
@@ -50,7 +51,7 @@ class MediaViewerDataSourceTest {
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.setup()
+        sut.setup(backgroundScope)
         startLambda.assertions().isCalledOnce()
     }
 
@@ -62,15 +63,20 @@ class MediaViewerDataSourceTest {
 
     @Test
     fun `test dataFlow uninitialized, loading and error`() = runTest {
-        val galleryDataSource = FakeMediaGalleryDataSource()
+        val galleryDataSource = FakeMediaGalleryDataSource(
+            initialData = AsyncData.Uninitialized,
+        )
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            // The flow starts with an empty result
+            assertThat(awaitItem()).isEmpty()
             galleryDataSource.emitGroupedMediaItems(AsyncData.Uninitialized)
             assertThat(awaitItem().first()).isInstanceOf(MediaViewerPageData.Loading::class.java)
             galleryDataSource.emitGroupedMediaItems(AsyncData.Loading())
-            assertThat(awaitItem().first()).isInstanceOf(MediaViewerPageData.Loading::class.java)
+            // No items emitted, we were already loading data
+            ensureAllEventsConsumed()
             galleryDataSource.emitGroupedMediaItems(AsyncData.Failure(AN_EXCEPTION))
             assertThat(awaitItem().first()).isEqualTo(MediaViewerPageData.Failure(AN_EXCEPTION))
         }
@@ -82,7 +88,7 @@ class MediaViewerDataSourceTest {
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -102,7 +108,8 @@ class MediaViewerDataSourceTest {
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -141,7 +148,8 @@ class MediaViewerDataSourceTest {
             mode = MediaViewerMode.TimelineImagesAndVideos(timelineMode = Timeline.Mode.Media),
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -163,7 +171,8 @@ class MediaViewerDataSourceTest {
             mode = MediaViewerMode.TimelineFilesAndAudios(timelineMode = Timeline.Mode.Media),
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -184,7 +193,8 @@ class MediaViewerDataSourceTest {
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -217,7 +227,8 @@ class MediaViewerDataSourceTest {
         val sut = createMediaViewerDataSource(
             galleryDataSource = galleryDataSource,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -241,7 +252,8 @@ class MediaViewerDataSourceTest {
             galleryDataSource = galleryDataSource,
             mediaLoader = mediaLoader,
         )
-        sut.dataFlow().test {
+        sut.dataFlow.test {
+            skipItems(1)
             galleryDataSource.emitGroupedMediaItems(
                 AsyncData.Success(
                     aGroupedMediaItems(
@@ -271,6 +283,7 @@ class MediaViewerDataSourceTest {
         mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
         localMediaFactory: LocalMediaFactory = FakeLocalMediaFactory(mockMediaUrl),
     ) = MediaViewerDataSource(
+        coroutineScope = backgroundScope,
         mode = mode,
         dispatcher = testCoroutineDispatchers().computation,
         galleryDataSource = galleryDataSource,
@@ -278,5 +291,7 @@ class MediaViewerDataSourceTest {
         localMediaFactory = localMediaFactory,
         systemClock = FakeSystemClock(),
         pagerKeysHandler = PagerKeysHandler(),
+        contentScannerService = { _, _ -> },
+        contentValidationCache = NoopEventContentValidationCache(),
     )
 }
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
index a9d1704bdc..be577362bd 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
@@ -21,6 +21,7 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
@@ -29,6 +30,8 @@ import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.powerlevels.FakeRoomPermissions
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
+import io.element.android.libraries.mediaviewer.api.AvatarInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
 import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
@@ -51,6 +54,8 @@ import io.mockk.mockk
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -97,6 +102,8 @@ class MediaViewerPresenterTest {
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.canShowInfo).isTrue()
             assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+
+            cancelAndIgnoreRemainingEvents()
         }
     }
 
@@ -104,7 +111,12 @@ class MediaViewerPresenterTest {
     fun `present - initial state cannot show info`() = runTest {
         val presenter = createMediaViewerPresenter(
             localMediaFactory = localMediaFactory,
-            canShowInfo = false,
+            inputs = MediaViewerEntryPoint.Params.Avatar(
+                avatarInfo = AvatarInfo(filename = "avatar.png"),
+                mediaSource = aMediaSource(),
+                thumbnailSource = null,
+                blurHash = null,
+            ),
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
                     roomPermissions = FakeRoomPermissions(
@@ -120,6 +132,8 @@ class MediaViewerPresenterTest {
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.canShowInfo).isFalse()
             assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+
+            cancelAndIgnoreRemainingEvents()
         }
     }
 
@@ -143,6 +157,8 @@ class MediaViewerPresenterTest {
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.canShowInfo).isTrue()
             assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+
+            cancelAndIgnoreRemainingEvents()
         }
     }
 
@@ -167,6 +183,8 @@ class MediaViewerPresenterTest {
             assertThat(initialState.snackbarMessage).isNull()
             assertThat(initialState.canShowInfo).isTrue()
             assertThat(initialState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
+
+            cancelAndIgnoreRemainingEvents()
         }
     }
 
@@ -226,7 +244,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.LoadMedia(
+                MediaViewerEvent.LoadMedia(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
@@ -266,16 +284,16 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.OpenInfo(
+                MediaViewerEvent.OpenInfo(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
                 )
             )
             val withInfoState = awaitItem()
-            assertThat(withInfoState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
+            assertThat(withInfoState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
             withInfoState.eventSink(
-                MediaViewerEvents.CloseBottomSheet
+                MediaViewerEvent.CloseBottomSheet
             )
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
@@ -306,7 +324,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.ClearLoadingError(
+                MediaViewerEvent.ClearLoadingError(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
@@ -339,7 +357,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.Share(
+                MediaViewerEvent.Share(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
@@ -372,7 +390,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.SaveOnDisk(
+                MediaViewerEvent.SaveOnDisk(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
@@ -405,7 +423,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.OpenWith(
+                MediaViewerEvent.OpenWith(
                     aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
                     )
@@ -438,7 +456,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.ConfirmDelete(
+                MediaViewerEvent.ConfirmDelete(
                     eventId = AN_EVENT_ID,
                     data = aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
@@ -446,9 +464,9 @@ class MediaViewerPresenterTest {
                 )
             )
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDeleteConfirmationState::class.java)
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.DeleteConfirmation::class.java)
             withBottomSheetState.eventSink(
-                MediaViewerEvents.CloseBottomSheet
+                MediaViewerEvent.CloseBottomSheet
             )
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
@@ -498,7 +516,7 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.ConfirmDelete(
+                MediaViewerEvent.ConfirmDelete(
                     eventId = AN_EVENT_ID,
                     data = aMediaViewerPageData(
                         mediaSource = MediaSource(aUrl)
@@ -506,9 +524,9 @@ class MediaViewerPresenterTest {
                 )
             )
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDeleteConfirmationState::class.java)
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.DeleteConfirmation::class.java)
             updatedState.eventSink(
-                MediaViewerEvents.Delete(
+                MediaViewerEvent.Delete(
                     eventId = AN_EVENT_ID,
                 )
             )
@@ -551,10 +569,12 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.OnNavigateTo(1)
+                MediaViewerEvent.OnNavigateTo(1)
             )
             val finalState = awaitItem()
             assertThat(finalState.currentIndex).isEqualTo(1)
+
+            cancelAndIgnoreRemainingEvents()
         }
     }
 
@@ -578,35 +598,37 @@ class MediaViewerPresenterTest {
         mode: MediaViewerEntryPoint.MediaViewerMode,
         expectedSnackbarResId: Int,
     ) = runTest {
+        val image = anImage.copy(eventId = AN_EVENT_ID)
         val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            initialData = AsyncData.Success(
+                if (mode is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios) {
+                    GroupedMediaItems(
+                        imageAndVideoItems = persistentListOf(),
+                        fileItems = persistentListOf(aForwardLoadingIndicator, image, aBackwardLoadingIndicator),
+                    )
+                } else {
+                    GroupedMediaItems(
+                        imageAndVideoItems = persistentListOf(aForwardLoadingIndicator, image, aBackwardLoadingIndicator),
+                        fileItems = persistentListOf(),
+                    )
+                }
+            ),
             startLambda = { },
         )
         val presenter = createMediaViewerPresenter(
+            eventId = AN_EVENT_ID,
             localMediaFactory = localMediaFactory,
             mode = mode,
             mediaGalleryDataSource = mediaGalleryDataSource,
         )
         presenter.test {
-            awaitFirstItem()
-            mediaGalleryDataSource.emitGroupedMediaItems(
-                AsyncData.Success(
-                    if (mode is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios) {
-                        GroupedMediaItems(
-                            imageAndVideoItems = persistentListOf(),
-                            fileItems = persistentListOf(aForwardLoadingIndicator, anImage, aBackwardLoadingIndicator),
-                        )
-                    } else {
-                        GroupedMediaItems(
-                            imageAndVideoItems = persistentListOf(aForwardLoadingIndicator, anImage, aBackwardLoadingIndicator),
-                            fileItems = persistentListOf(),
-                        )
-                    }
-                )
-            )
-            val updatedState = awaitItem()
+            val updatedState = awaitFirstItem()
+
+            advanceUntilIdle()
+            runCurrent()
             // User navigate to the first item (forward loading indicator)
             updatedState.eventSink(
-                MediaViewerEvents.OnNavigateTo(0)
+                MediaViewerEvent.OnNavigateTo(0)
             )
             // data source claims that there is no more items to load forward
             mediaGalleryDataSource.emitGroupedMediaItems(
@@ -614,11 +636,11 @@ class MediaViewerPresenterTest {
                     if (mode is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios) {
                         GroupedMediaItems(
                             imageAndVideoItems = persistentListOf(),
-                            fileItems = persistentListOf(anImage, aBackwardLoadingIndicator),
+                            fileItems = persistentListOf(image, aBackwardLoadingIndicator),
                         )
                     } else {
                         GroupedMediaItems(
-                            imageAndVideoItems = persistentListOf(anImage, aBackwardLoadingIndicator),
+                            imageAndVideoItems = persistentListOf(image, aBackwardLoadingIndicator),
                             fileItems = persistentListOf(),
                         )
                     }
@@ -678,7 +700,7 @@ class MediaViewerPresenterTest {
             val updatedState = awaitItem()
             // User navigate to the last item (backward loading indicator)
             updatedState.eventSink(
-                MediaViewerEvents.OnNavigateTo(2)
+                MediaViewerEvent.OnNavigateTo(2)
             )
             skipItems(1)
             // data source claims that there is no more items to load backward
@@ -707,25 +729,23 @@ class MediaViewerPresenterTest {
     fun `present - no snackbar displayed when there is no more items but not displaying a loading item`() = runTest {
         val mediaGalleryDataSource = FakeMediaGalleryDataSource(
             startLambda = { },
+            initialData = AsyncData.Success(
+                GroupedMediaItems(
+                    imageAndVideoItems = persistentListOf(aForwardLoadingIndicator, anImage, anImage.copy(eventId = AN_EVENT_ID_2), aBackwardLoadingIndicator),
+                    fileItems = persistentListOf(),
+                )
+            )
         )
         val presenter = createMediaViewerPresenter(
+            eventId = AN_EVENT_ID,
             localMediaFactory = localMediaFactory,
             mediaGalleryDataSource = mediaGalleryDataSource,
         )
         presenter.test {
-            awaitFirstItem()
-            mediaGalleryDataSource.emitGroupedMediaItems(
-                AsyncData.Success(
-                    GroupedMediaItems(
-                        imageAndVideoItems = persistentListOf(aForwardLoadingIndicator, anImage, aBackwardLoadingIndicator),
-                        fileItems = persistentListOf(),
-                    )
-                )
-            )
             val updatedState = awaitItem()
             // User navigate to the media
             updatedState.eventSink(
-                MediaViewerEvents.OnNavigateTo(1)
+                MediaViewerEvent.OnNavigateTo(1)
             )
             skipItems(1)
             // data source claims that there is no more items to load at all
@@ -768,12 +788,57 @@ class MediaViewerPresenterTest {
             )
             val updatedState = awaitItem()
             updatedState.eventSink(
-                MediaViewerEvents.LoadMore(Timeline.PaginationDirection.BACKWARDS)
+                MediaViewerEvent.LoadMore(Timeline.PaginationDirection.BACKWARDS)
             )
             loadMoreLambda.assertions().isCalledOnce().with(value(Timeline.PaginationDirection.BACKWARDS))
         }
     }
 
+    @Test
+    fun `present - receiving loading items with different timestamps emits different items too`() = runTest {
+        val loadMoreLambda = lambdaRecorder<Timeline.PaginationDirection, Unit> { }
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+            loadMoreLambda = loadMoreLambda,
+        )
+        val presenter = createMediaViewerPresenter(
+            localMediaFactory = localMediaFactory,
+            mediaGalleryDataSource = mediaGalleryDataSource,
+        )
+        val anImage = aMediaItemImage(
+            mediaSourceUrl = aUrl,
+        )
+        presenter.test {
+            awaitFirstItem()
+            mediaGalleryDataSource.emitGroupedMediaItems(
+                AsyncData.Success(
+                    GroupedMediaItems(
+                        imageAndVideoItems = persistentListOf(aForwardLoadingIndicator, anImage, aBackwardLoadingIndicator),
+                        fileItems = persistentListOf(),
+                    )
+                )
+            )
+            val updatedState = awaitItem()
+
+            // Get the exact same items, but with new timestamps for the loading indicators
+            mediaGalleryDataSource.emitGroupedMediaItems(
+                AsyncData.Success(
+                    GroupedMediaItems(
+                        imageAndVideoItems = persistentListOf(
+                            aForwardLoadingIndicator.copy(timestamp = 1234L),
+                            anImage,
+                            aBackwardLoadingIndicator.copy(timestamp = 1234L),
+                        ),
+                        fileItems = persistentListOf(),
+                    )
+                )
+            )
+
+            // We should get a new list of items, which should not be equal to the previous one
+            assertThat(updatedState.listData).isNotEqualTo(awaitItem().listData)
+        }
+    }
+
     @Test
     fun `present - view in timeline hides the bottom sheet and invokes the navigator`() = runTest {
         val onViewInTimelineClickLambda = lambdaRecorder<EventId, Unit> { }
@@ -793,10 +858,11 @@ class MediaViewerPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))
+            initialState.eventSink(MediaViewerEvent.OpenInfo(aMediaViewerPageData()))
+            skipItems(1)
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
-            initialState.eventSink(MediaViewerEvents.ViewInTimeline(AN_EVENT_ID))
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            initialState.eventSink(MediaViewerEvent.ViewInTimeline(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onViewInTimelineClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
@@ -822,10 +888,11 @@ class MediaViewerPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))
+            initialState.eventSink(MediaViewerEvent.OpenInfo(aMediaViewerPageData()))
+            skipItems(1)
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
-            initialState.eventSink(MediaViewerEvents.Forward(AN_EVENT_ID))
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            initialState.eventSink(MediaViewerEvent.Forward(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onForwardClickLambda.assertions().isCalledOnce()
@@ -853,10 +920,11 @@ class MediaViewerPresenterTest {
         )
         presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(MediaViewerEvents.OpenInfo(aMediaViewerPageData()))
+            initialState.eventSink(MediaViewerEvent.OpenInfo(aMediaViewerPageData()))
+            skipItems(1)
             val withBottomSheetState = awaitItem()
-            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.MediaDetailsBottomSheetState::class.java)
-            initialState.eventSink(MediaViewerEvents.Forward(AN_EVENT_ID))
+            assertThat(withBottomSheetState.mediaBottomSheetState).isInstanceOf(MediaBottomSheetState.Details::class.java)
+            initialState.eventSink(MediaViewerEvent.Forward(AN_EVENT_ID))
             val finalState = awaitItem()
             assertThat(finalState.mediaBottomSheetState).isEqualTo(MediaBottomSheetState.Hidden)
             onForwardClickLambda.assertions().isCalledOnce()
@@ -871,34 +939,39 @@ class MediaViewerPresenterTest {
 
 internal fun TestScope.createMediaViewerPresenter(
     localMediaFactory: LocalMediaFactory,
+    inputs: MediaViewerEntryPoint.Params? = null,
     eventId: EventId? = null,
-    mode: MediaViewerEntryPoint.MediaViewerMode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
+    mode: MediaViewerEntryPoint.MediaViewerMode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media),
     matrixMediaLoader: FakeMatrixMediaLoader = FakeMatrixMediaLoader(),
     localMediaActions: FakeLocalMediaActions = FakeLocalMediaActions(),
     mediaGalleryDataSource: MediaGalleryDataSource = FakeMediaGalleryDataSource(
         startLambda = { },
     ),
-    canShowInfo: Boolean = true,
     mediaViewerNavigator: MediaViewerNavigator = FakeMediaViewerNavigator(),
     room: JoinedRoom = FakeJoinedRoom(
         liveTimeline = FakeTimeline(),
     ),
 ): MediaViewerPresenter {
+    val actualInputs = inputs ?: createMediaViewerEntryPointParams(eventId = eventId, mode = mode)
+    val actualMode = when (actualInputs) {
+        is MediaViewerEntryPoint.Params.Avatar -> MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media)
+        is MediaViewerEntryPoint.Params.EventGallery -> MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media)
+        is MediaViewerEntryPoint.Params.RoomMedia -> actualInputs.mode
+    }
     return MediaViewerPresenter(
-        inputs = createMediaViewerEntryPointParams(
-            eventId = eventId,
-            mode = mode,
-            canShowInfo = canShowInfo,
-        ),
+        inputs = actualInputs,
         navigator = mediaViewerNavigator,
         dataSource = MediaViewerDataSource(
-            mode = mode,
+            coroutineScope = backgroundScope,
+            mode = actualMode,
             dispatcher = testCoroutineDispatchers().computation,
             galleryDataSource = mediaGalleryDataSource,
             mediaLoader = matrixMediaLoader,
             localMediaFactory = localMediaFactory,
             systemClock = FakeSystemClock(),
             pagerKeysHandler = PagerKeysHandler(),
+            contentScannerService = { _, _ -> },
+            contentValidationCache = NoopEventContentValidationCache(),
         ),
         room = room,
         localMediaActions = localMediaActions,
@@ -907,13 +980,12 @@ internal fun TestScope.createMediaViewerPresenter(
 
 internal fun createMediaViewerEntryPointParams(
     eventId: EventId? = null,
-    mode: MediaViewerEntryPoint.MediaViewerMode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
-    canShowInfo: Boolean = true,
-) = MediaViewerEntryPoint.Params(
+    mode: MediaViewerEntryPoint.MediaViewerMode = MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios(timelineMode = Timeline.Mode.Media),
+) = MediaViewerEntryPoint.Params.RoomMedia(
     mode = mode,
     eventId = eventId,
     mediaInfo = TESTED_MEDIA_INFO,
     mediaSource = aMediaSource(),
     thumbnailSource = null,
-    canShowInfo = canShowInfo,
+    blurHash = null,
 )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt
index b1114945c2..ef668849d7 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerViewTest.kt
@@ -6,20 +6,29 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.mediaviewer.impl.viewer
 
 import android.net.Uri
 import androidx.activity.ComponentActivity
+import androidx.annotation.StringRes
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assertHasClickAction
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeDown
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.mediaviewer.impl.details.aMediaDetailsBottomSheetState
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.mediaviewer.impl.details.aMediaBottomSheetStateDetails
 import io.element.android.libraries.mediaviewer.test.viewer.aLocalMedia
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -27,230 +36,332 @@ import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.element.android.tests.testutils.setSafeContent
 import io.mockk.mockk
-import org.junit.Rule
+import kotlinx.coroutines.delay
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import kotlin.time.Duration.Companion.milliseconds
 
-@RunWith(AndroidJUnit4::class)
-class MediaViewerViewTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
-
+class MediaViewerViewTest : RobolectricTest() {
     private val mockMediaUrl: Uri = mockk("localMediaUri")
 
     @Test
-    fun `clicking on back invokes expected callback`() {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
+    fun `displaying a media will automatically validate it`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
+        val pagerData = aMediaViewerPageData(downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)))
+        val state = aMediaViewerState(
+            listData = listOf(pagerData),
+            eventSink = eventsRecorder
+        )
+        setMediaViewerView(
+            state = state,
+        )
+        eventsRecorder.assertList(
+            listOf(
+                MediaViewerEvent.ValidateMedia(mediaSource = pagerData.mediaSource, thumbnailMediaSource = pagerData.thumbnailSource),
+            )
+        )
+    }
+
+    @Test
+    fun `clicking on back invokes expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
         val state = aMediaViewerState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMediaViewerView(
+            setMediaViewerView(
                 state = state,
                 onBackClick = callback,
             )
-            rule.pressBack()
+
+            // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+            eventsRecorder.clear()
+
+            // Wait for enough time for the onVisibilityChanged modifier to trigger
+            mainClock.advanceTimeBy(200)
+
+            pressBack()
         }
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
+                MediaViewerEvent.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
             )
         )
     }
 
     @Test
-    fun `clicking on open emit expected Event`() {
-        val data = aMediaViewerPageData(
-            downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),
-        )
-        testMenuAction(
-            data,
-            CommonStrings.action_open_with,
-            MediaViewerEvents.OpenWith(data),
-        )
-    }
-
-    @Test
-    fun `clicking on info emit expected Event`() {
+    fun `clicking on info emits expected Event`() {
         val data = aMediaViewerPageData(
             downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),
         )
         testMenuAction(
             data,
             CommonStrings.a11y_view_details,
-            MediaViewerEvents.OpenInfo(data),
+            MediaViewerEvent.OpenInfo(data),
+        )
+    }
+
+    @Test
+    fun `clicking on top action share emits expected Event`() {
+        val data = aMediaViewerPageData(
+            downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),
+        )
+        testMenuAction(
+            data,
+            CommonStrings.action_share,
+            MediaViewerEvent.Share(data),
+        )
+    }
+
+    @Test
+    fun `clicking on top action download emits expected Event`() {
+        val data = aMediaViewerPageData(
+            downloadedMedia = AsyncData.Success(aLocalMedia(uri = mockMediaUrl)),
+        )
+        testMenuAction(
+            data,
+            CommonStrings.action_download,
+            MediaViewerEvent.SaveOnDisk(data),
         )
     }
 
     private fun testMenuAction(
         data: MediaViewerPageData.MediaViewerData,
-        contentDescriptionRes: Int,
-        expectedEvent: MediaViewerEvents,
-    ) {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
-        rule.setMediaViewerView(
+        @StringRes contentDescriptionRes: Int,
+        expectedEvent: MediaViewerEvent,
+    ) = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
+        setMediaViewerView(
             aMediaViewerState(
                 listData = listOf(data),
                 eventSink = eventsRecorder
             ),
         )
-        val contentDescription = rule.activity.getString(contentDescriptionRes)
-        rule.onNodeWithContentDescription(contentDescription).performClick()
+
+        // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+        eventsRecorder.clear()
+
+        // Wait for enough time for the onVisibilityChanged modifier to trigger
+        mainClock.advanceTimeBy(200)
+
+        val contentDescription = activity!!.getString(contentDescriptionRes)
+        onNodeWithContentDescription(contentDescription).performClick()
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(data),
+                MediaViewerEvent.LoadMedia(data),
                 expectedEvent,
             )
         )
     }
 
-    @Test
     @Config(qualifiers = "h1024dp")
-    fun `clicking on save emit expected Event`() {
+    @Test
+    fun `clicking on open in emits expected Event`() {
         val data = aMediaViewerPageData()
         testBottomSheetAction(
             data,
-            CommonStrings.action_save,
-            MediaViewerEvents.SaveOnDisk(data),
-        )
-    }
-
-    @Test
-    @Config(qualifiers = "h1024dp")
-    fun `clicking on share emit expected Event`() {
-        val data = aMediaViewerPageData()
-        testBottomSheetAction(
-            data,
-            CommonStrings.action_share,
-            MediaViewerEvents.Share(data),
+            CommonStrings.action_open_with,
+            MediaViewerEvent.OpenWith(data),
         )
     }
 
     private fun testBottomSheetAction(
         data: MediaViewerPageData.MediaViewerData,
-        contentDescriptionRes: Int,
-        expectedEvent: MediaViewerEvents,
-    ) {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
-        rule.setMediaViewerView(
+        @StringRes textRes: Int,
+        expectedEvent: MediaViewerEvent,
+    ) = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
+        setMediaViewerView(
             aMediaViewerState(
                 listData = listOf(data),
-                mediaBottomSheetState = aMediaDetailsBottomSheetState(),
+                mediaBottomSheetState = aMediaBottomSheetStateDetails(),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(contentDescriptionRes)
+
+        clickOn(textRes)
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(data),
+                MediaViewerEvent.ValidateMedia(mediaSource = data.mediaSource, thumbnailMediaSource = data.thumbnailSource),
+                MediaViewerEvent.LoadMedia(data),
                 expectedEvent,
             )
         )
     }
 
     @Test
-    fun `clicking on image hides the overlay`() {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
+    fun `clicking on image hides the overlay`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
         val state = aMediaViewerState(
             eventSink = eventsRecorder
         )
-        rule.setMediaViewerView(
+        setMediaViewerView(
             state = state,
         )
+
+        // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+        eventsRecorder.clear()
+
         // Ensure that the action are visible
-        val contentDescription = rule.activity.getString(CommonStrings.action_open_with)
-        rule.onNodeWithContentDescription(contentDescription)
+        val resources = activity!!.resources
+        val contentDescription = resources.getString(CommonStrings.action_share)
+        onNodeWithContentDescription(contentDescription)
             .assertExists()
             .assertHasClickAction()
-        val imageContentDescription = rule.activity.getString(CommonStrings.common_image)
-        rule.onNodeWithContentDescription(imageContentDescription).performClick()
+        val imageContentDescription = resources.getString(CommonStrings.common_image)
+        onNodeWithContentDescription(imageContentDescription).performClick()
         // Give time for the animation (? since even by removing AnimatedVisibility it still fails)
-        rule.mainClock.advanceTimeBy(1_000)
-        rule.onNodeWithContentDescription(contentDescription)
+        mainClock.advanceTimeBy(1_000)
+        onNodeWithContentDescription(contentDescription)
             .assertDoesNotExist()
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
+                MediaViewerEvent.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
             )
         )
     }
 
     @Test
-    fun `clicking swipe on the image invokes the expected callback`() {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
+    fun `clicking swipe on the image invokes the expected callback`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
         val state = aMediaViewerState(
             eventSink = eventsRecorder
         )
         ensureCalledOnce { callback ->
-            rule.setMediaViewerView(
+            setMediaViewerView(
                 state = state,
                 onBackClick = callback,
             )
-            val imageContentDescription = rule.activity.getString(CommonStrings.common_image)
-            rule.onNodeWithContentDescription(imageContentDescription).performTouchInput { swipeDown(startY = centerY) }
-            rule.mainClock.advanceTimeBy(1_000)
+
+            // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+            eventsRecorder.clear()
+
+            val imageContentDescription = activity!!.getString(CommonStrings.common_image)
+            onNodeWithContentDescription(imageContentDescription).performTouchInput { swipeDown(startY = centerY) }
+            mainClock.advanceTimeBy(1_000)
         }
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
+                MediaViewerEvent.LoadMedia(state.listData.first() as MediaViewerPageData.MediaViewerData),
             )
         )
     }
 
     @Test
-    fun `error case, click on retry emits the expected Event`() {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
+    fun `error case, click on retry emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
         val data = aMediaViewerPageData(
             downloadedMedia = AsyncData.Failure(IllegalStateException("error")),
         )
-        rule.setMediaViewerView(
+        setMediaViewerView(
             aMediaViewerState(
                 listData = listOf(data),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_retry)
+
+        // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+        eventsRecorder.clear()
+
+        // Wait for enough time for the onVisibilityChanged modifier to trigger
+        mainClock.advanceTimeBy(200)
+
+        clickOn(CommonStrings.action_retry)
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(data),
-                MediaViewerEvents.LoadMedia(data),
+                MediaViewerEvent.LoadMedia(data),
+                MediaViewerEvent.LoadMedia(data),
             )
         )
     }
 
     @Test
-    fun `error case, click on cancel emits the expected Event`() {
-        val eventsRecorder = EventsRecorder<MediaViewerEvents>()
+    fun `error case, click on cancel emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
         val data = aMediaViewerPageData(
             downloadedMedia = AsyncData.Failure(IllegalStateException("error")),
         )
-        rule.setMediaViewerView(
+        setMediaViewerView(
             aMediaViewerState(
                 listData = listOf(data),
                 eventSink = eventsRecorder
             ),
         )
-        rule.clickOn(CommonStrings.action_cancel)
+
+        // Remove the `ValidateMedia` event that is emitted when the media is loaded, since we are not testing it here.
+        eventsRecorder.clear()
+
+        // Wait for enough time for the onVisibilityChanged modifier to trigger
+        mainClock.advanceTimeBy(200)
+
+        clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertList(
             listOf(
-                MediaViewerEvents.OnNavigateTo(0),
-                MediaViewerEvents.LoadMedia(data),
-                MediaViewerEvents.ClearLoadingError(data)
+                MediaViewerEvent.LoadMedia(data),
+                MediaViewerEvent.ClearLoadingError(data)
+            )
+        )
+    }
+
+    @Test
+    fun `loading event after an error triggers load more Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<MediaViewerEvent>()
+        val states = listOf(
+            aMediaViewerState(
+                listData = listOf(aMediaViewerPageDataLoading(timestamp = 0L)),
+                eventSink = eventsRecorder,
+            ),
+            aMediaViewerState(
+                listData = listOf(MediaViewerPageData.Failure(IllegalStateException("error"))),
+                eventSink = eventsRecorder,
+            ),
+            aMediaViewerState(
+                listData = listOf(aMediaViewerPageDataLoading(timestamp = 0L)),
+                eventSink = eventsRecorder,
+            ),
+            // This one should be ignored since it has the same timestamp as the last one, it should not trigger a recomposition
+            aMediaViewerState(
+                listData = listOf(aMediaViewerPageDataLoading(timestamp = 0L)),
+                eventSink = eventsRecorder,
+            ),
+        )
+        setSafeContent {
+            // Iterate over the states with a delay to give the view some time to trigger the `LoadMore` Event
+            var state by remember { mutableStateOf(states.first()) }
+            LaunchedEffect(Unit) {
+                val iterator = states.iterator()
+                while (iterator.hasNext()) {
+                    delay(200.milliseconds)
+                    state = iterator.next()
+                }
+            }
+            MediaViewerView(
+                state = state,
+                textFileViewer = { _, _ -> },
+                onBackClick = EnsureNeverCalled(),
+                audioFocus = null,
+            )
+        }
+
+        // Advance time to let the states update
+        mainClock.advanceTimeBy(3_000)
+
+        // `LoadMore` should be called twice, once for the first loading state, and once for the second one even though they have the same timestamp because
+        // of the intermediate error state.
+        // The third one will be ignored since it has the same timestamp as the second one and it'll be discarded by the Compose's equality diffing.
+        eventsRecorder.assertList(
+            listOf(
+                MediaViewerEvent.LoadMore(direction = Timeline.PaginationDirection.BACKWARDS),
+                MediaViewerEvent.LoadMore(direction = Timeline.PaginationDirection.BACKWARDS),
             )
         )
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMediaViewerView(
+private fun AndroidComposeUiTest<ComponentActivity>.setMediaViewerView(
     state: MediaViewerState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt
index c6460cb70a..ebd722f25c 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/SingleMediaGalleryDataSourceTest.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.media.aMediaSource
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.api.aVideoMediaInfo
@@ -36,22 +37,24 @@ class SingleMediaGalleryDataSourceTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
+    private val contentValidationCache = NoopEventContentValidationCache()
+
     @Test
-    fun `function start is no op`() {
-        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())
-        sut.start()
+    fun `function start is no op`() = runTest {
+        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems(), contentValidationCache)
+        sut.start(backgroundScope)
     }
 
     @Test
     fun `function loadMore is no op`() = runTest {
-        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())
+        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems(), contentValidationCache)
         sut.loadMore(Timeline.PaginationDirection.BACKWARDS)
         sut.loadMore(Timeline.PaginationDirection.FORWARDS)
     }
 
     @Test
     fun `function deleteItem is no op`() = runTest {
-        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems())
+        val sut = SingleMediaGalleryDataSource(aGroupedMediaItems(), contentValidationCache)
         sut.deleteItem(AN_EVENT_ID)
     }
 
@@ -61,7 +64,7 @@ class SingleMediaGalleryDataSourceTest {
             imageAndVideoItems = listOf(aMediaItemImage()),
             fileItems = listOf(aMediaItemFile()),
         )
-        val sut = SingleMediaGalleryDataSource(data)
+        val sut = SingleMediaGalleryDataSource(data, contentValidationCache)
         assertThat(sut.getLastData()).isEqualTo(AsyncData.Success(data))
     }
 
@@ -71,7 +74,7 @@ class SingleMediaGalleryDataSourceTest {
             imageAndVideoItems = listOf(aMediaItemImage()),
             fileItems = listOf(aMediaItemFile()),
         )
-        val sut = SingleMediaGalleryDataSource(data)
+        val sut = SingleMediaGalleryDataSource(data, contentValidationCache)
         sut.groupedMediaItemsFlow().test {
             assertThat(awaitItem()).isEqualTo(AsyncData.Success(data))
             awaitComplete()
@@ -89,6 +92,8 @@ class SingleMediaGalleryDataSourceTest {
                     mediaInfo = params.mediaInfo,
                     mediaSource = params.mediaSource,
                     thumbnailSource = params.thumbnailSource,
+                    blurHash = null,
+                    validationState = contentValidationCache[AN_EVENT_ID],
                 )
             }
         )
@@ -105,6 +110,8 @@ class SingleMediaGalleryDataSourceTest {
                     mediaInfo = params.mediaInfo,
                     mediaSource = params.mediaSource,
                     thumbnailSource = params.thumbnailSource,
+                    blurHash = null,
+                    validationState = contentValidationCache[AN_EVENT_ID],
                 )
             }
         )
@@ -120,6 +127,7 @@ class SingleMediaGalleryDataSourceTest {
                     eventId = params.eventId,
                     mediaInfo = params.mediaInfo,
                     mediaSource = params.mediaSource,
+                    validationState = contentValidationCache[AN_EVENT_ID],
                 )
             }
         )
@@ -138,6 +146,7 @@ class SingleMediaGalleryDataSourceTest {
                     eventId = params.eventId,
                     mediaInfo = params.mediaInfo,
                     mediaSource = params.mediaSource,
+                    validationState = contentValidationCache[AN_EVENT_ID],
                 )
             }
         )
@@ -153,6 +162,7 @@ class SingleMediaGalleryDataSourceTest {
                     eventId = params.eventId,
                     mediaInfo = params.mediaInfo,
                     mediaSource = params.mediaSource,
+                    validationState = contentValidationCache[AN_EVENT_ID],
                 )
             }
         )
@@ -160,23 +170,21 @@ class SingleMediaGalleryDataSourceTest {
 
     private fun testFactory(
         mediaInfo: MediaInfo,
-        expectedResult: (MediaViewerEntryPoint.Params) -> MediaItem,
+        expectedResult: (MediaViewerEntryPoint.Params.RoomMedia) -> MediaItem,
     ) {
         val params = aMediaViewerEntryPointParams(mediaInfo)
-        val result = SingleMediaGalleryDataSource.createFrom(params)
-        val resultData = result.getLastData().dataOrNull()
-        assertThat(resultData!!.imageAndVideoItems.first()).isEqualTo(expectedResult(params))
-        assertThat(resultData.fileItems).isEmpty()
+        val result = params.toMediaItem(contentValidationCache[AN_EVENT_ID],)
+        assertThat(result).isEqualTo(expectedResult(params))
     }
 
     internal fun aMediaViewerEntryPointParams(
         mediaInfo: MediaInfo,
-    ) = MediaViewerEntryPoint.Params(
-        mode = MediaViewerEntryPoint.MediaViewerMode.SingleMedia,
+    ) = MediaViewerEntryPoint.Params.RoomMedia(
+        mode = MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos(Timeline.Mode.Media),
         eventId = AN_EVENT_ID,
         mediaInfo = mediaInfo,
         mediaSource = aMediaSource(url = "aUrl"),
         thumbnailSource = aMediaSource(url = "aThumbnailUrl"),
-        canShowInfo = true,
+        blurHash = null,
     )
 }
diff --git a/libraries/mediaviewer/test/build.gradle.kts b/libraries/mediaviewer/test/build.gradle.kts
index 1918714d7b..87665e6d69 100644
--- a/libraries/mediaviewer/test/build.gradle.kts
+++ b/libraries/mediaviewer/test/build.gradle.kts
@@ -18,6 +18,7 @@ android {
 
 dependencies {
     api(projects.libraries.mediaviewer.impl)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
     implementation(projects.tests.testutils)
     implementation(projects.libraries.matrix.api)
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaActions.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaActions.kt
index 875be941db..d048f73eab 100644
--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaActions.kt
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaActions.kt
@@ -11,37 +11,29 @@ package io.element.android.libraries.mediaviewer.test
 import androidx.compose.runtime.Composable
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
 import io.element.android.libraries.mediaviewer.impl.local.LocalMediaActions
+import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 
-class FakeLocalMediaActions : LocalMediaActions {
-    var shouldFail = false
-
+class FakeLocalMediaActions(
+    val configureResult: () -> Unit = { },
+    val saveOnDiskResult: (LocalMedia) -> Result<Unit> = { lambdaError() },
+    val shareResult: (LocalMedia) -> Result<Unit> = { lambdaError() },
+    val openResult: (LocalMedia) -> Result<Unit> = { lambdaError() },
+) : LocalMediaActions {
     @Composable
     override fun Configure() {
-        // NOOP
+        configureResult()
     }
 
     override suspend fun saveOnDisk(localMedia: LocalMedia): Result<Unit> = simulateLongTask {
-        if (shouldFail) {
-            Result.failure(RuntimeException())
-        } else {
-            Result.success(Unit)
-        }
+        saveOnDiskResult(localMedia)
     }
 
     override suspend fun share(localMedia: LocalMedia): Result<Unit> = simulateLongTask {
-        if (shouldFail) {
-            Result.failure(RuntimeException())
-        } else {
-            Result.success(Unit)
-        }
+        shareResult(localMedia)
     }
 
     override suspend fun open(localMedia: LocalMedia): Result<Unit> = simulateLongTask {
-        if (shouldFail) {
-            Result.failure(RuntimeException())
-        } else {
-            Result.success(Unit)
-        }
+        openResult(localMedia)
     }
 }
diff --git a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt
index faa27fd0e3..8dbee232df 100644
--- a/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt
+++ b/libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt
@@ -41,6 +41,7 @@ class FakeLocalMediaFactory(
             filename = safeName,
             fileSize = null,
             caption = null,
+            formattedCaption = null,
             mimeType = mimeType ?: fallbackMimeType,
             formattedFileSize = formattedFileSize ?: fallbackFileSize,
             fileExtension = fileExtensionExtractor.extractFromName(safeName),
diff --git a/libraries/network/build.gradle.kts b/libraries/network/build.gradle.kts
index 72e7eb05f2..20f75091d9 100644
--- a/libraries/network/build.gradle.kts
+++ b/libraries/network/build.gradle.kts
@@ -24,6 +24,7 @@ android {
 setupDependencyInjection()
 
 dependencies {
+    implementation(libs.coroutines.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/NetworkModule.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/NetworkModule.kt
index d8809e042c..90e78d860e 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/NetworkModule.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/NetworkModule.kt
@@ -16,6 +16,7 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.network.interceptors.DynamicHttpLoggingInterceptor
 import io.element.android.libraries.network.interceptors.FormattedJsonHttpLogger
 import io.element.android.libraries.network.interceptors.UserAgentInterceptor
+import okhttp3.Call
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import java.util.concurrent.TimeUnit
@@ -36,6 +37,9 @@ object NetworkModule {
         addInterceptor(dynamicHttpLoggingInterceptor)
     }.build()
 
+    @Provides
+    fun providesCallFactory(okHttpClient: OkHttpClient): Call.Factory = Call.Factory { request -> okHttpClient.newCall(request) }
+
     @Provides
     @SingleIn(AppScope::class)
     fun providesHttpLoggingInterceptor(): HttpLoggingInterceptor {
diff --git a/libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt b/libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
index 88240c3d65..ecb1004b90 100644
--- a/libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
+++ b/libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
@@ -9,22 +9,21 @@
 package io.element.android.libraries.network
 
 import dev.zacsweers.metro.Inject
-import dev.zacsweers.metro.Provider
 import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.core.uri.ensureTrailingSlash
+import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
 
 @Inject
 class RetrofitFactory(
-    private val okHttpClient: Provider<OkHttpClient>,
-    private val json: Provider<JsonProvider>,
+    private val callFactory: () -> Call.Factory,
+    private val json: () -> JsonProvider,
 ) {
     fun create(baseUrl: String): Retrofit = Retrofit.Builder()
         .baseUrl(baseUrl.ensureTrailingSlash())
         .addConverterFactory(json()().asConverterFactory("application/json".toMediaType()))
-        .callFactory { request -> okHttpClient().newCall(request) }
+        .callFactory(callFactory())
         .build()
 }
diff --git a/libraries/oidc/api/build.gradle.kts b/libraries/oauth/api/build.gradle.kts
similarity index 87%
rename from libraries/oidc/api/build.gradle.kts
rename to libraries/oauth/api/build.gradle.kts
index 8cc0125142..8c863db0bf 100644
--- a/libraries/oidc/api/build.gradle.kts
+++ b/libraries/oauth/api/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.libraries.oidc.api"
+    namespace = "io.element.android.libraries.oauth.api"
 }
 
 dependencies {
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthAction.kt
similarity index 54%
rename from libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt
rename to libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthAction.kt
index d7c061ab25..033516b93d 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcAction.kt
+++ b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthAction.kt
@@ -6,9 +6,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.api
+package io.element.android.libraries.oauth.api
 
-sealed interface OidcAction {
-    data class GoBack(val toUnblock: Boolean = false) : OidcAction
-    data class Success(val url: String) : OidcAction
+sealed interface OAuthAction {
+    data class GoBack(val toUnblock: Boolean = false) : OAuthAction
+    data class Success(val url: String) : OAuthAction
 }
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthActionFlow.kt
similarity index 63%
rename from libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt
rename to libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthActionFlow.kt
index 17340eb5ec..c6791e3197 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcActionFlow.kt
+++ b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthActionFlow.kt
@@ -6,12 +6,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.api
+package io.element.android.libraries.oauth.api
 
 import kotlinx.coroutines.flow.FlowCollector
 
-interface OidcActionFlow {
-    fun post(oidcAction: OidcAction)
-    suspend fun collect(collector: FlowCollector<OidcAction?>)
+interface OAuthActionFlow {
+    fun post(oAuthAction: OAuthAction)
+    suspend fun collect(collector: FlowCollector<OAuthAction?>)
     fun reset()
 }
diff --git a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthIntentResolver.kt
similarity index 68%
rename from libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt
rename to libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthIntentResolver.kt
index 97fa1baa27..2091a86db4 100644
--- a/libraries/oidc/api/src/main/kotlin/io/element/android/libraries/oidc/api/OidcIntentResolver.kt
+++ b/libraries/oauth/api/src/main/kotlin/io/element/android/libraries/oauth/api/OAuthIntentResolver.kt
@@ -6,10 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.api
+package io.element.android.libraries.oauth.api
 
 import android.content.Intent
 
-interface OidcIntentResolver {
-    fun resolve(intent: Intent): OidcAction?
+interface OAuthIntentResolver {
+    fun resolve(intent: Intent): OAuthAction?
 }
diff --git a/libraries/oidc/impl/build.gradle.kts b/libraries/oauth/impl/build.gradle.kts
similarity index 93%
rename from libraries/oidc/impl/build.gradle.kts
rename to libraries/oauth/impl/build.gradle.kts
index e11ce11c70..d051c06497 100644
--- a/libraries/oidc/impl/build.gradle.kts
+++ b/libraries/oauth/impl/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.libraries.oidc.impl"
+    namespace = "io.element.android.libraries.oauth.impl"
 
     testOptions {
         unitTests {
@@ -39,7 +39,7 @@ dependencies {
     implementation(platform(libs.network.retrofit.bom))
     implementation(libs.network.retrofit)
     implementation(libs.serialization.json)
-    api(projects.libraries.oidc.api)
+    api(projects.libraries.oauth.api)
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlow.kt
similarity index 58%
rename from libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt
rename to libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlow.kt
index 6096ef7eef..6b23676059 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlow.kt
+++ b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlow.kt
@@ -6,26 +6,26 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.impl
+package io.element.android.libraries.oauth.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @ContributesBinding(AppScope::class)
 @SingleIn(AppScope::class)
-class DefaultOidcActionFlow : OidcActionFlow {
-    private val mutableStateFlow = MutableStateFlow<OidcAction?>(null)
+class DefaultOAuthActionFlow : OAuthActionFlow {
+    private val mutableStateFlow = MutableStateFlow<OAuthAction?>(null)
 
-    override fun post(oidcAction: OidcAction) {
-        mutableStateFlow.value = oidcAction
+    override fun post(oAuthAction: OAuthAction) {
+        mutableStateFlow.value = oAuthAction
     }
 
-    override suspend fun collect(collector: FlowCollector<OidcAction?>) {
+    override suspend fun collect(collector: FlowCollector<OAuthAction?>) {
         mutableStateFlow.collect(collector)
     }
 
diff --git a/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolver.kt b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolver.kt
new file mode 100644
index 0000000000..c2a29e228c
--- /dev/null
+++ b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolver.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.oauth.impl
+
+import android.content.Intent
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthIntentResolver
+
+@ContributesBinding(AppScope::class)
+class DefaultOAuthIntentResolver(
+    private val oAuthUrlParser: OAuthUrlParser,
+) : OAuthIntentResolver {
+    override fun resolve(intent: Intent): OAuthAction? {
+        return oAuthUrlParser.parse(intent.dataString.orEmpty())
+    }
+}
diff --git a/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt
new file mode 100644
index 0000000000..7e2c4d03f5
--- /dev/null
+++ b/libraries/oauth/impl/src/main/kotlin/io/element/android/libraries/oauth/impl/OAuthUrlParser.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.oauth.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.matrix.api.auth.OAuthRedirectUrlProvider
+import io.element.android.libraries.oauth.api.OAuthAction
+import timber.log.Timber
+
+fun interface OAuthUrlParser {
+    fun parse(url: String): OAuthAction?
+}
+
+/**
+ * Simple parser for OAuth url interception.
+ * TODO Find documentation about the format.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultOAuthUrlParser(
+    private val oAuthRedirectUrlProvider: OAuthRedirectUrlProvider,
+) : OAuthUrlParser {
+    /**
+     * Return a [OAuthAction], or null if the url is not an OAuth url.
+     * Note:
+     * When user press button "Cancel", we get the url:
+     * `io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO`
+     * On success, we get:
+     * `io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB`
+     */
+    override fun parse(url: String): OAuthAction? {
+        if (url.startsWith(oAuthRedirectUrlProvider.provide()).not()) return null
+        if (url.contains("error=access_denied")) return OAuthAction.GoBack()
+        if (url.contains("code=")) return OAuthAction.Success(url)
+
+        // Other cases are not supported, log an error and return null
+        Timber.w("Unsupported OAuth url")
+        return null
+    }
+}
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlowTest.kt
similarity index 58%
rename from libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt
rename to libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlowTest.kt
index 387b9aceb0..817487b3ff 100644
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcActionFlowTest.kt
+++ b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthActionFlowTest.kt
@@ -1,34 +1,33 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.impl
+package io.element.android.libraries.oauth.impl
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.oidc.api.OidcAction
+import io.element.android.libraries.oauth.api.OAuthAction
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class DefaultOidcActionFlowTest {
+class DefaultOAuthActionFlowTest {
     @Test
     fun `collect gets all the posted events`() = runTest {
-        val data = mutableListOf<OidcAction?>()
-        val sut = DefaultOidcActionFlow()
+        val data = mutableListOf<OAuthAction?>()
+        val sut = DefaultOAuthActionFlow()
         backgroundScope.launch {
             sut.collect { action ->
                 data.add(action)
             }
         }
-        sut.post(OidcAction.GoBack())
+        sut.post(OAuthAction.GoBack())
         delay(1)
         sut.reset()
         delay(1)
-        assertThat(data).containsExactly(OidcAction.GoBack(), null)
+        assertThat(data).containsExactly(OAuthAction.GoBack(), null)
     }
 }
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt
similarity index 54%
rename from libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt
rename to libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt
index 64068030d7..a93debd46a 100644
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolverTest.kt
+++ b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthIntentResolverTest.kt
@@ -1,69 +1,64 @@
 /*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
+ * Copyright (c) 2026 Element Creations Ltd.
  *
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.impl
+package io.element.android.libraries.oauth.impl
 
 import android.app.Activity
 import android.content.Intent
 import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
-import io.element.android.libraries.oidc.api.OidcAction
-import org.junit.Assert.assertThrows
+import io.element.android.libraries.matrix.test.auth.FakeOAuthRedirectUrlProvider
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultOidcIntentResolverTest {
+class DefaultOAuthIntentResolverTest : RobolectricTest() {
     @Test
-    fun `test resolve oidc go back`() {
-        val sut = createDefaultOidcIntentResolver()
+    fun `test resolve OAuth go back`() {
+        val sut = createDefaultOAuthIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = "io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO".toUri()
         }
         val result = sut.resolve(intent)
-        assertThat(result).isEqualTo(OidcAction.GoBack())
+        assertThat(result).isEqualTo(OAuthAction.GoBack())
     }
 
     @Test
-    fun `test resolve oidc success`() {
-        val sut = createDefaultOidcIntentResolver()
+    fun `test resolve OAuth success`() {
+        val sut = createDefaultOAuthIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB".toUri()
         }
         val result = sut.resolve(intent)
         assertThat(result).isEqualTo(
-            OidcAction.Success(
+            OAuthAction.Success(
                 url = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
             )
         )
     }
 
     @Test
-    fun `test resolve oidc invalid`() {
-        val sut = createDefaultOidcIntentResolver()
+    fun `test resolve OAuth invalid`() {
+        val sut = createDefaultOAuthIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = "io.element.android:/invalid".toUri()
         }
-        assertThrows(IllegalStateException::class.java) {
-            sut.resolve(intent)
-        }
+        val result = sut.resolve(intent)
+        assertThat(result).isNull()
     }
 
-    private fun createDefaultOidcIntentResolver(): DefaultOidcIntentResolver {
-        return DefaultOidcIntentResolver(
-            oidcUrlParser = DefaultOidcUrlParser(
-                oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+    private fun createDefaultOAuthIntentResolver(): DefaultOAuthIntentResolver {
+        return DefaultOAuthIntentResolver(
+            oAuthUrlParser = DefaultOAuthUrlParser(
+                oAuthRedirectUrlProvider = FakeOAuthRedirectUrlProvider(),
             ),
         )
     }
diff --git a/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthUrlParserTest.kt b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthUrlParserTest.kt
new file mode 100644
index 0000000000..7dde7356d4
--- /dev/null
+++ b/libraries/oauth/impl/src/test/kotlin/io/element/android/libraries/oauth/impl/DefaultOAuthUrlParserTest.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.oauth.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.auth.FAKE_REDIRECT_URL
+import io.element.android.libraries.matrix.test.auth.FakeOAuthRedirectUrlProvider
+import io.element.android.libraries.oauth.api.OAuthAction
+import org.junit.Test
+
+class DefaultOAuthUrlParserTest {
+    @Test
+    fun `test empty url`() {
+        val sut = createDefaultOAuthUrlParser()
+        assertThat(sut.parse("")).isNull()
+    }
+
+    @Test
+    fun `test regular url`() {
+        val sut = createDefaultOAuthUrlParser()
+        assertThat(sut.parse("https://matrix.org")).isNull()
+    }
+
+    @Test
+    fun `test cancel url`() {
+        val sut = createDefaultOAuthUrlParser()
+        val aCancelUrl = "$FAKE_REDIRECT_URL?error=access_denied&state=IFF1UETGye2ZA8pO"
+        assertThat(sut.parse(aCancelUrl)).isEqualTo(OAuthAction.GoBack())
+    }
+
+    @Test
+    fun `test success url`() {
+        val sut = createDefaultOAuthUrlParser()
+        val aSuccessUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+        assertThat(sut.parse(aSuccessUrl)).isEqualTo(OAuthAction.Success(aSuccessUrl))
+    }
+
+    @Test
+    fun `test unknown url`() {
+        val sut = createDefaultOAuthUrlParser()
+        val anUnknownUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&goat=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+        assertThat(sut.parse(anUnknownUrl)).isNull()
+    }
+
+    private fun createDefaultOAuthUrlParser(): DefaultOAuthUrlParser {
+        return DefaultOAuthUrlParser(
+            oAuthRedirectUrlProvider = FakeOAuthRedirectUrlProvider(),
+        )
+    }
+}
diff --git a/libraries/oidc/test/build.gradle.kts b/libraries/oauth/test/build.gradle.kts
similarity index 80%
rename from libraries/oidc/test/build.gradle.kts
rename to libraries/oauth/test/build.gradle.kts
index efe32d404a..6850653ddc 100644
--- a/libraries/oidc/test/build.gradle.kts
+++ b/libraries/oauth/test/build.gradle.kts
@@ -11,11 +11,11 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.libraries.oidc.test"
+    namespace = "io.element.android.libraries.oauth.test"
 }
 
 dependencies {
     implementation(libs.coroutines.core)
-    api(projects.libraries.oidc.api)
+    api(projects.libraries.oauth.api)
     implementation(projects.tests.testutils)
 }
diff --git a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt b/libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/FakeOAuthIntentResolver.kt
similarity index 50%
rename from libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt
rename to libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/FakeOAuthIntentResolver.kt
index 45b400868b..893289023e 100644
--- a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/FakeOidcIntentResolver.kt
+++ b/libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/FakeOAuthIntentResolver.kt
@@ -6,17 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.oidc.test
+package io.element.android.libraries.oauth.test
 
 import android.content.Intent
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcIntentResolver
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthIntentResolver
 import io.element.android.tests.testutils.lambda.lambdaError
 
-class FakeOidcIntentResolver(
-    private val resolveResult: (Intent) -> OidcAction? = { lambdaError() }
-) : OidcIntentResolver {
-    override fun resolve(intent: Intent): OidcAction? {
+class FakeOAuthIntentResolver(
+    private val resolveResult: (Intent) -> OAuthAction? = { lambdaError() }
+) : OAuthIntentResolver {
+    override fun resolve(intent: Intent): OAuthAction? {
         return resolveResult(intent)
     }
 }
diff --git a/libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/customtab/FakeOAuthActionFlow.kt b/libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/customtab/FakeOAuthActionFlow.kt
new file mode 100644
index 0000000000..5a5ca4369e
--- /dev/null
+++ b/libraries/oauth/test/src/main/kotlin/io/element/android/libraries/oauth/test/customtab/FakeOAuthActionFlow.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.oauth.test.customtab
+
+import io.element.android.libraries.oauth.api.OAuthAction
+import io.element.android.libraries.oauth.api.OAuthActionFlow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * This is actually a copy of DefaultOAuthActionFlow.
+ */
+class FakeOAuthActionFlow : OAuthActionFlow {
+    private val mutableStateFlow = MutableStateFlow<OAuthAction?>(null)
+
+    override fun post(oAuthAction: OAuthAction) {
+        mutableStateFlow.value = oAuthAction
+    }
+
+    override suspend fun collect(collector: FlowCollector<OAuthAction?>) {
+        mutableStateFlow.collect(collector)
+    }
+
+    override fun reset() {
+        mutableStateFlow.value = null
+    }
+}
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt
deleted file mode 100644
index 2a16030b3b..0000000000
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcIntentResolver.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.oidc.impl
-
-import android.content.Intent
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcIntentResolver
-
-@ContributesBinding(AppScope::class)
-class DefaultOidcIntentResolver(
-    private val oidcUrlParser: OidcUrlParser,
-) : OidcIntentResolver {
-    override fun resolve(intent: Intent): OidcAction? {
-        return oidcUrlParser.parse(intent.dataString.orEmpty())
-    }
-}
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt
deleted file mode 100644
index 8933873dc2..0000000000
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.oidc.impl
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
-import io.element.android.libraries.oidc.api.OidcAction
-
-fun interface OidcUrlParser {
-    fun parse(url: String): OidcAction?
-}
-
-/**
- * Simple parser for oidc url interception.
- * TODO Find documentation about the format.
- */
-@ContributesBinding(AppScope::class)
-class DefaultOidcUrlParser(
-    private val oidcRedirectUrlProvider: OidcRedirectUrlProvider,
-) : OidcUrlParser {
-    /**
-     * Return a OidcAction, or null if the url is not a OidcUrl.
-     * Note:
-     * When user press button "Cancel", we get the url:
-     * `io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO`
-     * On success, we get:
-     * `io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB`
-     */
-    override fun parse(url: String): OidcAction? {
-        if (url.startsWith(oidcRedirectUrlProvider.provide()).not()) return null
-        if (url.contains("error=access_denied")) return OidcAction.GoBack()
-        if (url.contains("code=")) return OidcAction.Success(url)
-
-        // Other case not supported, let's crash the app for now
-        error("Not supported: $url")
-    }
-}
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt
deleted file mode 100644
index 7f145c053d..0000000000
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.oidc.impl
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.test.auth.FAKE_REDIRECT_URL
-import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
-import io.element.android.libraries.oidc.api.OidcAction
-import org.junit.Assert
-import org.junit.Test
-
-class DefaultOidcUrlParserTest {
-    @Test
-    fun `test empty url`() {
-        val sut = createDefaultOidcUrlParser()
-        assertThat(sut.parse("")).isNull()
-    }
-
-    @Test
-    fun `test regular url`() {
-        val sut = createDefaultOidcUrlParser()
-        assertThat(sut.parse("https://matrix.org")).isNull()
-    }
-
-    @Test
-    fun `test cancel url`() {
-        val sut = createDefaultOidcUrlParser()
-        val aCancelUrl = "$FAKE_REDIRECT_URL?error=access_denied&state=IFF1UETGye2ZA8pO"
-        assertThat(sut.parse(aCancelUrl)).isEqualTo(OidcAction.GoBack())
-    }
-
-    @Test
-    fun `test success url`() {
-        val sut = createDefaultOidcUrlParser()
-        val aSuccessUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
-        assertThat(sut.parse(aSuccessUrl)).isEqualTo(OidcAction.Success(aSuccessUrl))
-    }
-
-    @Test
-    fun `test unknown url`() {
-        val sut = createDefaultOidcUrlParser()
-        val anUnknownUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&goat=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
-        Assert.assertThrows(IllegalStateException::class.java) {
-            assertThat(sut.parse(anUnknownUrl))
-        }
-    }
-
-    private fun createDefaultOidcUrlParser(): DefaultOidcUrlParser {
-        return DefaultOidcUrlParser(
-            oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
-        )
-    }
-}
diff --git a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/customtab/FakeOidcActionFlow.kt b/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/customtab/FakeOidcActionFlow.kt
deleted file mode 100644
index 5362aefa7c..0000000000
--- a/libraries/oidc/test/src/main/kotlin/io/element/android/libraries/oidc/test/customtab/FakeOidcActionFlow.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.oidc.test.customtab
-
-import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.api.OidcActionFlow
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.MutableStateFlow
-
-/**
- * This is actually a copy of DefaultOidcActionFlow.
- */
-class FakeOidcActionFlow : OidcActionFlow {
-    private val mutableStateFlow = MutableStateFlow<OidcAction?>(null)
-
-    override fun post(oidcAction: OidcAction) {
-        mutableStateFlow.value = oidcAction
-    }
-
-    override suspend fun collect(collector: FlowCollector<OidcAction?>) {
-        mutableStateFlow.collect(collector)
-    }
-
-    override fun reset() {
-        mutableStateFlow.value = null
-    }
-}
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
index fd01e12134..8604959068 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvent.kt
@@ -9,7 +9,23 @@
 package io.element.android.libraries.permissions.api
 
 sealed interface PermissionsEvent {
+    /**
+     * Request the runtime permission. If the app has already recorded a soft denial for this
+     * permission, this event is intercepted to raise [PermissionsState.showDialog] instead of
+     * hitting the OS — the intent is for the caller to render `PermissionsView` to prompt the
+     * user to open system settings.
+     *
+     * If the caller renders its own "already denied" UI and wants the OS prompt regardless,
+     * use [ForceRequestPermissions].
+     */
     data object RequestPermissions : PermissionsEvent
+
+    /**
+     * Same as [RequestPermissions] but bypasses the soft-denial intercept — always launches
+     * the OS permission dialog. The OS may still auto-deny for permanently-denied permissions.
+     */
+    data object ForceRequestPermissions : PermissionsEvent
+
     data object CloseDialog : PermissionsEvent
     data object OpenSystemSettingAndCloseDialog : PermissionsEvent
 }
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionAdvisor.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionAdvisor.kt
new file mode 100644
index 0000000000..9863dbb751
--- /dev/null
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionAdvisor.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.api.localnetwork
+
+interface LocalNetworkPermissionAdvisor {
+    /**
+     * Returns true when the app should request the ACCESS_LOCAL_NETWORK permission before making
+     * network requests to [homeserverUrl].
+     */
+    suspend fun shouldRequestPermissionFor(homeserverUrl: String): Boolean
+}
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialog.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialog.kt
new file mode 100644
index 0000000000..68a440680f
--- /dev/null
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialog.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.api.localnetwork
+
+/**
+ * Which rationale dialog (if any) should be rendered on top of the caller's UI.
+ *
+ * [Rationale] is shown before the runtime prompt so the user knows why the permission is needed.
+ * [Settings] is shown when the OS says a rationale can no longer be shown (permanently denied).
+ */
+enum class LocalNetworkPermissionDialog {
+    None,
+    Rationale,
+    Settings,
+}
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialogView.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialogView.kt
new file mode 100644
index 0000000000..66616c197e
--- /dev/null
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/localnetwork/LocalNetworkPermissionDialogView.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.api.localnetwork
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.theme.LocalBuildMeta
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@Composable
+fun LocalNetworkPermissionDialogView(
+    dialog: LocalNetworkPermissionDialog,
+    onSubmit: () -> Unit,
+    onDismiss: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val submitTextRes = when (dialog) {
+        LocalNetworkPermissionDialog.None -> return
+        LocalNetworkPermissionDialog.Rationale -> CommonStrings.dialog_allow_access
+        LocalNetworkPermissionDialog.Settings -> CommonStrings.action_open_settings
+    }
+    ConfirmationDialog(
+        title = stringResource(CommonStrings.screen_local_network_opt_in_title),
+        content = stringResource(CommonStrings.screen_local_network_opt_in_subtitle, LocalBuildMeta.current.applicationName),
+        submitText = stringResource(submitTextRes),
+        cancelText = stringResource(CommonStrings.action_not_now),
+        onSubmitClick = onSubmit,
+        onDismiss = onDismiss,
+        modifier = modifier,
+    )
+}
diff --git a/libraries/permissions/api/src/main/res/values-ca/translations.xml b/libraries/permissions/api/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..0b8527649b
--- /dev/null
+++ b/libraries/permissions/api/src/main/res/values-ca/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="dialog_permission_camera">"Per permetre que l\'aplicació utilitzi la càmera, concedeix-li permís a la configuració del sistema."</string>
+  <string name="dialog_permission_generic">"Concedeix el permís a la configuració del sistema."</string>
+  <string name="dialog_permission_microphone">"Per permetre que l\'aplicació utilitzi el micròfon, concedeix-li permís a la configuració del sistema."</string>
+  <string name="dialog_permission_notification">"Per permetre que l\'aplicació mostri notificacions, concedeix-li permís a la configuració del sistema."</string>
+</resources>
diff --git a/libraries/permissions/api/src/main/res/values-ja/translations.xml b/libraries/permissions/api/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..1749b855a3
--- /dev/null
+++ b/libraries/permissions/api/src/main/res/values-ja/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="dialog_permission_camera">"カメラを使用するには、本体の設定から権限を付与する必要があります。"</string>
+  <string name="dialog_permission_generic">"本体の設定から権限を付与してください。"</string>
+  <string name="dialog_permission_microphone">"マイクを使用するには、本体の設定から権限を付与してください。"</string>
+  <string name="dialog_permission_notification">"通知を表示するには、本体の設定から権限を付与してください。"</string>
+</resources>
diff --git a/libraries/permissions/api/src/main/res/values-vi/translations.xml b/libraries/permissions/api/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..c575d3b3bb
--- /dev/null
+++ b/libraries/permissions/api/src/main/res/values-vi/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="dialog_permission_camera">"Để ứng dụng sử dụng camera, vui lòng cấp quyền trong cài đặt hệ thống."</string>
+  <string name="dialog_permission_generic">"Vui lòng cấp quyền trong cài đặt hệ thống."</string>
+  <string name="dialog_permission_microphone">"Để ứng dụng có thể sử dụng micro, vui lòng cấp quyền trong cài đặt hệ thống."</string>
+  <string name="dialog_permission_notification">"Để ứng dụng hiển thị thông báo, vui lòng cấp quyền trong cài đặt hệ thống."</string>
+</resources>
diff --git a/libraries/permissions/api/src/main/res/values-zh/translations.xml b/libraries/permissions/api/src/main/res/values-zh/translations.xml
index eb093046a3..a071113a1f 100644
--- a/libraries/permissions/api/src/main/res/values-zh/translations.xml
+++ b/libraries/permissions/api/src/main/res/values-zh/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="dialog_permission_camera">"为了让应用程序使用相机，请在系统设置中授予权限。"</string>
+  <string name="dialog_permission_camera">"为了让 app 使用相机，请在系统设置中授予权限。"</string>
   <string name="dialog_permission_generic">"请在系统设置中授予权限。"</string>
-  <string name="dialog_permission_microphone">"为了让应用程序使用麦克风，请在系统设置中授予权限。"</string>
-  <string name="dialog_permission_notification">"为了让应用程序显示通知，请在系统设置中授予权限。"</string>
+  <string name="dialog_permission_microphone">"为了让 app 使用麦克风，请在系统设置中授予权限。"</string>
+  <string name="dialog_permission_notification">"为了让 app 显示通知，请在系统设置中授予权限。"</string>
 </resources>
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
index 42331e001a..e3979e5ed2 100644
--- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
@@ -112,6 +112,9 @@ class DefaultPermissionsPresenter(
                         permissionState.launchPermissionRequest()
                     }
                 }
+                PermissionsEvent.ForceRequestPermissions -> {
+                    permissionState.launchPermissionRequest()
+                }
                 PermissionsEvent.OpenSystemSettingAndCloseDialog -> {
                     permissionActions.openSettings(permission)
                     showDialog.value = false
diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisor.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisor.kt
new file mode 100644
index 0000000000..a1f4022c3c
--- /dev/null
+++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisor.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.impl.localnetwork
+
+import android.Manifest
+import android.os.Build
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.network.LocalNetworkAddressClassifier
+import io.element.android.libraries.androidutils.network.LocalNetworkClassification
+import io.element.android.libraries.permissions.api.PermissionStateProvider
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
+import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
+
+@ContributesBinding(AppScope::class)
+class DefaultLocalNetworkPermissionAdvisor(
+    private val classifier: LocalNetworkAddressClassifier,
+    private val permissionStateProvider: PermissionStateProvider,
+    private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
+) : LocalNetworkPermissionAdvisor {
+    override suspend fun shouldRequestPermissionFor(homeserverUrl: String): Boolean {
+        if (!buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.CINNAMON_BUN)) return false
+        if (permissionStateProvider.isPermissionGranted(Manifest.permission.ACCESS_LOCAL_NETWORK)) return false
+        return when (classifier.classify(homeserverUrl)) {
+            LocalNetworkClassification.LocalIp -> true
+            LocalNetworkClassification.PublicIp,
+            // Unresolvable: we can't confirm the host is local, so we don't prompt, acceptable trade-off vs. over-prompting.
+            LocalNetworkClassification.Unresolvable -> false
+        }
+    }
+}
diff --git a/libraries/permissions/impl/src/main/res/values-ca/translations.xml b/libraries/permissions/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..206c416d8b
--- /dev/null
+++ b/libraries/permissions/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_check_permission_description">"Comprova que l\'aplicació pot mostrar notificacions."</string>
+  <string name="troubleshoot_notifications_test_check_permission_title">"Comprova els permisos"</string>
+</resources>
diff --git a/libraries/permissions/impl/src/main/res/values-fa/translations.xml b/libraries/permissions/impl/src/main/res/values-fa/translations.xml
index 8d566ef035..29ecf36e0c 100644
--- a/libraries/permissions/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/permissions/impl/src/main/res/values-fa/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_check_permission_description">"بررسی امکان نمایش آگاهی‌ها در برنامه."</string>
   <string name="troubleshoot_notifications_test_check_permission_title">"بررسی اجازه‌ها"</string>
 </resources>
diff --git a/libraries/permissions/impl/src/main/res/values-ja/translations.xml b/libraries/permissions/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..c29d26fd69
--- /dev/null
+++ b/libraries/permissions/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_check_permission_description">"アプリケーションが通知を表示できることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_check_permission_title">"権限の確認"</string>
+</resources>
diff --git a/libraries/permissions/impl/src/main/res/values-vi/translations.xml b/libraries/permissions/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..0f960c909e
--- /dev/null
+++ b/libraries/permissions/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_check_permission_description">"Kiểm tra xem ứng dụng có hiển thị thông báo hay không."</string>
+  <string name="troubleshoot_notifications_test_check_permission_title">"Kiểm tra quyền truy cập"</string>
+</resources>
diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisorTest.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisorTest.kt
new file mode 100644
index 0000000000..1609ee1f20
--- /dev/null
+++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/localnetwork/DefaultLocalNetworkPermissionAdvisorTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.impl.localnetwork
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.androidutils.network.LocalNetworkAddressClassifier
+import io.element.android.libraries.androidutils.network.LocalNetworkClassification
+import io.element.android.libraries.permissions.test.FakePermissionStateProvider
+import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+private const val LOCAL_URL = "https://matrix.corp.internal"
+private const val PUBLIC_URL = "https://matrix.org"
+
+class DefaultLocalNetworkPermissionAdvisorTest {
+    private fun advisor(
+        sdkInt: Int,
+        permissionGranted: Boolean,
+        classification: LocalNetworkClassification,
+    ) = DefaultLocalNetworkPermissionAdvisor(
+        classifier = FakeLocalNetworkAddressClassifier(classification),
+        permissionStateProvider = FakePermissionStateProvider(permissionGranted = permissionGranted),
+        buildVersionSdkIntProvider = FakeBuildVersionSdkIntProvider(sdkInt),
+    )
+
+    @Test
+    fun `returns false when SDK below 37`() = runTest {
+        val result = advisor(sdkInt = 36, permissionGranted = false, classification = LocalNetworkClassification.LocalIp)
+            .shouldRequestPermissionFor(LOCAL_URL)
+        assertThat(result).isFalse()
+    }
+
+    @Test
+    fun `returns false when permission already granted`() = runTest {
+        val result = advisor(sdkInt = 37, permissionGranted = true, classification = LocalNetworkClassification.LocalIp)
+            .shouldRequestPermissionFor(LOCAL_URL)
+        assertThat(result).isFalse()
+    }
+
+    @Test
+    fun `returns false when URL classified as public IP`() = runTest {
+        val result = advisor(sdkInt = 37, permissionGranted = false, classification = LocalNetworkClassification.PublicIp)
+            .shouldRequestPermissionFor(PUBLIC_URL)
+        assertThat(result).isFalse()
+    }
+
+    @Test
+    fun `returns true when SDK 37, permission missing, URL is local`() = runTest {
+        val result = advisor(sdkInt = 37, permissionGranted = false, classification = LocalNetworkClassification.LocalIp)
+            .shouldRequestPermissionFor(LOCAL_URL)
+        assertThat(result).isTrue()
+    }
+
+    @Test
+    fun `returns false when SDK 37, permission missing, URL unresolvable`() = runTest {
+        val result = advisor(sdkInt = 37, permissionGranted = false, classification = LocalNetworkClassification.Unresolvable)
+            .shouldRequestPermissionFor(LOCAL_URL)
+        assertThat(result).isFalse()
+    }
+
+    @Test
+    fun `returns true when SDK above 37, permission missing, URL is local`() = runTest {
+        val result = advisor(sdkInt = 38, permissionGranted = false, classification = LocalNetworkClassification.LocalIp)
+            .shouldRequestPermissionFor(LOCAL_URL)
+        assertThat(result).isTrue()
+    }
+}
+
+private class FakeLocalNetworkAddressClassifier(
+    private val classification: LocalNetworkClassification,
+) : LocalNetworkAddressClassifier {
+    override suspend fun classify(url: String): LocalNetworkClassification = classification
+}
diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakeLocalNetworkPermissionAdvisor.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakeLocalNetworkPermissionAdvisor.kt
new file mode 100644
index 0000000000..f16872441c
--- /dev/null
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakeLocalNetworkPermissionAdvisor.kt
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.permissions.test
+
+import io.element.android.libraries.permissions.api.localnetwork.LocalNetworkPermissionAdvisor
+
+class FakeLocalNetworkPermissionAdvisor(
+    private val shouldPrompt: Boolean = false,
+) : LocalNetworkPermissionAdvisor {
+    override suspend fun shouldRequestPermissionFor(homeserverUrl: String): Boolean = shouldPrompt
+}
diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt
index efd584585f..4c04a919da 100644
--- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt
+++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt
@@ -21,6 +21,7 @@ class FakePermissionsPresenter(
     private fun handleEvent(event: PermissionsEvent) {
         when (event) {
             PermissionsEvent.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
+            PermissionsEvent.ForceRequestPermissions -> state.value = state.value.copy(permissionAlreadyAsked = true)
             PermissionsEvent.CloseDialog -> state.value = state.value.copy(showDialog = false)
             PermissionsEvent.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false)
         }
diff --git a/libraries/preferences/api/build.gradle.kts b/libraries/preferences/api/build.gradle.kts
index a441616657..7084c960c6 100644
--- a/libraries/preferences/api/build.gradle.kts
+++ b/libraries/preferences/api/build.gradle.kts
@@ -9,7 +9,7 @@ import extension.testCommonDependencies
  */
 
 plugins {
-    id("io.element.android-library")
+    id("io.element.android-compose-library")
 }
 
 android {
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/AppPreferencesStore.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/AppPreferencesStore.kt
index 476658946a..b1877b3ae5 100644
--- a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/AppPreferencesStore.kt
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/AppPreferencesStore.kt
@@ -23,6 +23,9 @@ interface AppPreferencesStore {
     suspend fun setTheme(theme: String)
     fun getThemeFlow(): Flow<String?>
 
+    suspend fun setLiveLocationMinimumDistanceInMetersUpdate(value: Int)
+    fun getLiveLocationMinimumDistanceInMetersUpdateFlow(): Flow<Int>
+
     @Deprecated("Use MediaPreviewService instead. Kept only for migration.")
     suspend fun setHideInviteAvatars(hide: Boolean?)
     @Deprecated("Use MediaPreviewService instead. Kept only for migration.")
@@ -38,5 +41,27 @@ interface AppPreferencesStore {
     suspend fun setTracingLogPacks(targets: Set<TraceLogPack>)
     fun getTracingLogPacksFlow(): Flow<Set<TraceLogPack>>
 
+    fun getMessageSoundFlow(): Flow<NotificationSound>
+
+    /**
+     * Atomically persists [sound] (with copy-time [title] for Custom; cleared otherwise) and
+     * bumps the channel version. Single transaction so process death can't desync URI and version.
+     */
+    suspend fun setMessageSoundAndIncrementVersion(sound: NotificationSound, title: String?): Int
+
+    /** Title captured at copy time. Null for SystemDefault / Silent or pre-title persisted data. */
+    fun getMessageSoundDisplayNameFlow(): Flow<String?>
+
+    fun getCallRingtoneFlow(): Flow<NotificationSound>
+
+    /** See [setMessageSoundAndIncrementVersion]. */
+    suspend fun setCallRingtoneAndIncrementVersion(sound: NotificationSound, title: String?): Int
+
+    /** See [getMessageSoundDisplayNameFlow]. */
+    fun getCallRingtoneDisplayNameFlow(): Flow<String?>
+
+    /** Single-snapshot read of all sound prefs; used at boot to seed channels without N reads. */
+    suspend fun getNotificationSoundChannelConfig(): NotificationSoundChannelConfig
+
     suspend fun reset()
 }
diff --git a/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/NotificationSound.kt b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/NotificationSound.kt
new file mode 100644
index 0000000000..f138dd592b
--- /dev/null
+++ b/libraries/preferences/api/src/main/kotlin/io/element/android/libraries/preferences/api/store/NotificationSound.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.preferences.api.store
+
+import androidx.compose.runtime.Immutable
+
+/**
+ * The user's choice of notification sound for a notification channel.
+ */
+@Immutable
+sealed interface NotificationSound {
+    /** Use the system's default tone for this channel (e.g. notification or ringtone). */
+    data object SystemDefault : NotificationSound
+
+    /**
+     * Use the bundled in-app sound. Semantically meaningful only for the noisy message channel,
+     * where it resolves to `R.raw.message`; the ringing-call channel has no bundled tone and
+     * treats this the same as [SystemDefault].
+     */
+    data object ElementDefault : NotificationSound
+
+    /**
+     * Use the bundled in-app fade sound. Like [ElementDefault] this is meaningful only for the
+     * noisy message channel (`R.raw.element_fade`); the ringing-call channel has no bundled tone
+     * and treats this the same as [SystemDefault].
+     */
+    data object ElementFade : NotificationSound
+
+    /** Produce no sound. */
+    data object Silent : NotificationSound
+
+    /** Use the ringtone at [uri]. */
+    data class Custom(val uri: String) : NotificationSound
+
+    companion object {
+        // String? round-trip used by [AppPreferencesStore]:
+        //   null -> SystemDefault, "silent" -> Silent, "element_default" -> ElementDefault,
+        //   "element_fade" -> ElementFade, else -> Custom(uri).
+        private const val STORED_SILENT = "silent"
+        private const val STORED_ELEMENT_DEFAULT = "element_default"
+        private const val STORED_ELEMENT_FADE = "element_fade"
+
+        fun fromStored(value: String?): NotificationSound = when (value) {
+            null -> SystemDefault
+            STORED_SILENT -> Silent
+            STORED_ELEMENT_DEFAULT -> ElementDefault
+            STORED_ELEMENT_FADE -> ElementFade
+            else -> Custom(value)
+        }
+
+        fun NotificationSound.toStored(): String? = when (this) {
+            SystemDefault -> null
+            Silent -> STORED_SILENT
+            ElementDefault -> STORED_ELEMENT_DEFAULT
+            ElementFade -> STORED_ELEMENT_FADE
+            is Custom -> uri
+        }
+    }
+}
+
+/**
+ * Snapshot of the persisted notification-sound state, returned by
+ * [AppPreferencesStore.getNotificationSoundChannelConfig] in a single read.
+ */
+data class NotificationSoundChannelConfig(
+    val messageSound: NotificationSound,
+    val messageSoundVersion: Int,
+    val messageSoundDisplayName: String?,
+    val callRingtone: NotificationSound,
+    val callRingtoneVersion: Int,
+    val callRingtoneDisplayName: String?,
+)
diff --git a/libraries/preferences/impl/build.gradle.kts b/libraries/preferences/impl/build.gradle.kts
index c567471da4..73327a69a2 100644
--- a/libraries/preferences/impl/build.gradle.kts
+++ b/libraries/preferences/impl/build.gradle.kts
@@ -1,4 +1,5 @@
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
  * Copyright (c) 2025 Element Creations Ltd.
@@ -25,4 +26,7 @@ dependencies {
     implementation(projects.libraries.di)
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.sessionStorage.api)
+    testCommonDependencies(libs)
+    testImplementation(projects.libraries.preferences.test)
 }
diff --git a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
index 6856f8bdb6..af35ac3c44 100644
--- a/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
+++ b/libraries/preferences/impl/src/main/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStore.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.preferences.impl.store
 
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
@@ -19,8 +20,12 @@ import io.element.android.libraries.matrix.api.media.MediaPreviewValue
 import io.element.android.libraries.matrix.api.tracing.LogLevel
 import io.element.android.libraries.matrix.api.tracing.TraceLogPack
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.preferences.api.store.NotificationSound.Companion.toStored
+import io.element.android.libraries.preferences.api.store.NotificationSoundChannelConfig
 import io.element.android.libraries.preferences.api.store.PreferenceDataStoreFactory
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 
 private val developerModeKey = booleanPreferencesKey("developerMode")
@@ -28,8 +33,15 @@ private val customElementCallBaseUrlKey = stringPreferencesKey("elementCallBaseU
 private val themeKey = stringPreferencesKey("theme")
 private val hideInviteAvatarsKey = booleanPreferencesKey("hideInviteAvatars")
 private val timelineMediaPreviewValueKey = stringPreferencesKey("timelineMediaPreviewValue")
+private val liveLocationMinimumDistanceUpdateKey = intPreferencesKey("liveLocationMinimumDistanceUpdate")
 private val logLevelKey = stringPreferencesKey("logLevel")
 private val traceLogPacksKey = stringPreferencesKey("traceLogPacks")
+private val messageSoundUriKey = stringPreferencesKey("notificationMessageSoundUri")
+private val messageSoundChannelVersionKey = intPreferencesKey("notificationMessageSoundChannelVersion")
+private val messageSoundDisplayNameKey = stringPreferencesKey("notificationMessageSoundDisplayName")
+private val callRingtoneUriKey = stringPreferencesKey("notificationCallRingtoneUri")
+private val callRingtoneChannelVersionKey = intPreferencesKey("notificationCallRingtoneChannelVersion")
+private val callRingtoneDisplayNameKey = stringPreferencesKey("notificationCallRingtoneDisplayName")
 
 @ContributesBinding(AppScope::class)
 class DefaultAppPreferencesStore(
@@ -79,6 +91,18 @@ class DefaultAppPreferencesStore(
         }
     }
 
+    override suspend fun setLiveLocationMinimumDistanceInMetersUpdate(value: Int) {
+        store.edit { prefs ->
+            prefs[liveLocationMinimumDistanceUpdateKey] = value
+        }
+    }
+
+    override fun getLiveLocationMinimumDistanceInMetersUpdateFlow(): Flow<Int> {
+        return store.data.map { prefs ->
+            prefs[liveLocationMinimumDistanceUpdateKey] ?: 10
+        }
+    }
+
     @Deprecated("Use MediaPreviewService instead. Kept only for migration.")
     override fun getHideInviteAvatarsFlow(): Flow<Boolean?> {
         return store.data.map { prefs ->
@@ -144,6 +168,75 @@ class DefaultAppPreferencesStore(
         }
     }
 
+    override fun getMessageSoundFlow(): Flow<NotificationSound> {
+        return store.data.map { prefs -> NotificationSound.fromStored(prefs[messageSoundUriKey]) }
+    }
+
+    override suspend fun setMessageSoundAndIncrementVersion(sound: NotificationSound, title: String?): Int {
+        var newVersion = 0
+        store.edit { prefs ->
+            val stored = sound.toStored()
+            if (stored != null) {
+                prefs[messageSoundUriKey] = stored
+            } else {
+                prefs.remove(messageSoundUriKey)
+            }
+            // Clear title on non-Custom so the picker doesn't show a stale label after a revert.
+            if (sound is NotificationSound.Custom && !title.isNullOrBlank()) {
+                prefs[messageSoundDisplayNameKey] = title
+            } else {
+                prefs.remove(messageSoundDisplayNameKey)
+            }
+            newVersion = (prefs[messageSoundChannelVersionKey] ?: 0) + 1
+            prefs[messageSoundChannelVersionKey] = newVersion
+        }
+        return newVersion
+    }
+
+    override fun getMessageSoundDisplayNameFlow(): Flow<String?> {
+        return store.data.map { prefs -> prefs[messageSoundDisplayNameKey] }
+    }
+
+    override fun getCallRingtoneFlow(): Flow<NotificationSound> {
+        return store.data.map { prefs -> NotificationSound.fromStored(prefs[callRingtoneUriKey]) }
+    }
+
+    override suspend fun setCallRingtoneAndIncrementVersion(sound: NotificationSound, title: String?): Int {
+        var newVersion = 0
+        store.edit { prefs ->
+            val stored = sound.toStored()
+            if (stored != null) {
+                prefs[callRingtoneUriKey] = stored
+            } else {
+                prefs.remove(callRingtoneUriKey)
+            }
+            if (sound is NotificationSound.Custom && !title.isNullOrBlank()) {
+                prefs[callRingtoneDisplayNameKey] = title
+            } else {
+                prefs.remove(callRingtoneDisplayNameKey)
+            }
+            newVersion = (prefs[callRingtoneChannelVersionKey] ?: 0) + 1
+            prefs[callRingtoneChannelVersionKey] = newVersion
+        }
+        return newVersion
+    }
+
+    override fun getCallRingtoneDisplayNameFlow(): Flow<String?> {
+        return store.data.map { prefs -> prefs[callRingtoneDisplayNameKey] }
+    }
+
+    override suspend fun getNotificationSoundChannelConfig(): NotificationSoundChannelConfig {
+        val prefs = store.data.first()
+        return NotificationSoundChannelConfig(
+            messageSound = NotificationSound.fromStored(prefs[messageSoundUriKey]),
+            messageSoundVersion = prefs[messageSoundChannelVersionKey] ?: 0,
+            messageSoundDisplayName = prefs[messageSoundDisplayNameKey],
+            callRingtone = NotificationSound.fromStored(prefs[callRingtoneUriKey]),
+            callRingtoneVersion = prefs[callRingtoneChannelVersionKey] ?: 0,
+            callRingtoneDisplayName = prefs[callRingtoneDisplayNameKey],
+        )
+    }
+
     override suspend fun reset() {
         store.edit { it.clear() }
     }
diff --git a/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt b/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt
new file mode 100644
index 0000000000..c52d1648ac
--- /dev/null
+++ b/libraries/preferences/impl/src/test/kotlin/io/element/android/libraries/preferences/impl/store/DefaultAppPreferencesStoreTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.preferences.impl.store
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.core.meta.BuildType
+import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultAppPreferencesStoreTest {
+    private val buildMeta = BuildMeta(
+        buildType = BuildType.DEBUG,
+        isDebuggable = true,
+        applicationName = "Element X",
+        productionApplicationName = "Element",
+        desktopApplicationName = "Element Desktop",
+        applicationId = "io.element.android",
+        isEnterpriseBuild = false,
+        lowPrivacyLoggingEnabled = false,
+        versionName = "1.0.0",
+        versionCode = 1,
+        gitRevision = "test",
+        gitBranchName = "test",
+        flavorDescription = "test",
+        flavorShortDescription = "test",
+    )
+
+    @Test
+    fun `live location minimum distance defaults to 10`() = runTest {
+        val store = DefaultAppPreferencesStore(
+            buildMeta = buildMeta,
+            preferenceDataStoreFactory = FakePreferenceDataStoreFactory(),
+        )
+
+        assertThat(store.getLiveLocationMinimumDistanceInMetersUpdateFlow().first()).isEqualTo(10)
+    }
+
+    @Test
+    fun `live location minimum distance persists updates`() = runTest {
+        val store = DefaultAppPreferencesStore(
+            buildMeta = buildMeta,
+            preferenceDataStoreFactory = FakePreferenceDataStoreFactory(),
+        )
+
+        store.setLiveLocationMinimumDistanceInMetersUpdate(25)
+
+        assertThat(store.getLiveLocationMinimumDistanceInMetersUpdateFlow().first()).isEqualTo(25)
+    }
+}
diff --git a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemoryAppPreferencesStore.kt b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemoryAppPreferencesStore.kt
index 6e7d22a568..6499e70223 100644
--- a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemoryAppPreferencesStore.kt
+++ b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/InMemoryAppPreferencesStore.kt
@@ -12,8 +12,11 @@ import io.element.android.libraries.matrix.api.media.MediaPreviewValue
 import io.element.android.libraries.matrix.api.tracing.LogLevel
 import io.element.android.libraries.matrix.api.tracing.TraceLogPack
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.preferences.api.store.NotificationSoundChannelConfig
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.updateAndGet
 
 class InMemoryAppPreferencesStore(
     isDeveloperModeEnabled: Boolean = false,
@@ -21,16 +24,30 @@ class InMemoryAppPreferencesStore(
     hideInviteAvatars: Boolean? = null,
     timelineMediaPreviewValue: MediaPreviewValue? = null,
     theme: String? = null,
+    liveLocationMinimumDistanceUpdate: Int = 10,
     logLevel: LogLevel = LogLevel.INFO,
-    traceLockPacks: Set<TraceLogPack> = emptySet(),
+    traceLogPacks: Set<TraceLogPack> = emptySet(),
+    messageSound: NotificationSound = NotificationSound.SystemDefault,
+    messageSoundChannelVersion: Int = 0,
+    messageSoundDisplayName: String? = null,
+    callRingtone: NotificationSound = NotificationSound.SystemDefault,
+    callRingtoneChannelVersion: Int = 0,
+    callRingtoneDisplayName: String? = null,
 ) : AppPreferencesStore {
     private val isDeveloperModeEnabled = MutableStateFlow(isDeveloperModeEnabled)
     private val customElementCallBaseUrl = MutableStateFlow(customElementCallBaseUrl)
     private val theme = MutableStateFlow(theme)
+    private val liveLocationMinimumDistanceUpdate = MutableStateFlow(liveLocationMinimumDistanceUpdate)
     private val logLevel = MutableStateFlow(logLevel)
-    private val tracingLogPacks = MutableStateFlow(traceLockPacks)
+    private val tracingLogPacks = MutableStateFlow(traceLogPacks)
     private val hideInviteAvatars = MutableStateFlow(hideInviteAvatars)
     private val timelineMediaPreviewValue = MutableStateFlow(timelineMediaPreviewValue)
+    private val messageSound = MutableStateFlow(messageSound)
+    private val messageSoundChannelVersion = MutableStateFlow(messageSoundChannelVersion)
+    private val messageSoundDisplayName = MutableStateFlow(messageSoundDisplayName)
+    private val callRingtone = MutableStateFlow(callRingtone)
+    private val callRingtoneChannelVersion = MutableStateFlow(callRingtoneChannelVersion)
+    private val callRingtoneDisplayName = MutableStateFlow(callRingtoneDisplayName)
 
     override suspend fun setDeveloperModeEnabled(enabled: Boolean) {
         isDeveloperModeEnabled.value = enabled
@@ -56,6 +73,14 @@ class InMemoryAppPreferencesStore(
         return theme
     }
 
+    override suspend fun setLiveLocationMinimumDistanceInMetersUpdate(value: Int) {
+        liveLocationMinimumDistanceUpdate.value = value
+    }
+
+    override fun getLiveLocationMinimumDistanceInMetersUpdateFlow(): Flow<Int> {
+        return liveLocationMinimumDistanceUpdate
+    }
+
     @Deprecated("Use MediaPreviewService instead. Kept only for migration.")
     override fun getHideInviteAvatarsFlow(): Flow<Boolean?> {
         return hideInviteAvatars
@@ -92,6 +117,45 @@ class InMemoryAppPreferencesStore(
         return tracingLogPacks
     }
 
+    override fun getMessageSoundFlow(): Flow<NotificationSound> {
+        return messageSound
+    }
+
+    override suspend fun setMessageSoundAndIncrementVersion(sound: NotificationSound, title: String?): Int {
+        messageSound.value = sound
+        messageSoundDisplayName.value = if (sound is NotificationSound.Custom && !title.isNullOrBlank()) title else null
+        return messageSoundChannelVersion.updateAndGet { it + 1 }
+    }
+
+    override fun getMessageSoundDisplayNameFlow(): Flow<String?> {
+        return messageSoundDisplayName
+    }
+
+    override fun getCallRingtoneFlow(): Flow<NotificationSound> {
+        return callRingtone
+    }
+
+    override suspend fun setCallRingtoneAndIncrementVersion(sound: NotificationSound, title: String?): Int {
+        callRingtone.value = sound
+        callRingtoneDisplayName.value = if (sound is NotificationSound.Custom && !title.isNullOrBlank()) title else null
+        return callRingtoneChannelVersion.updateAndGet { it + 1 }
+    }
+
+    override fun getCallRingtoneDisplayNameFlow(): Flow<String?> {
+        return callRingtoneDisplayName
+    }
+
+    override suspend fun getNotificationSoundChannelConfig(): NotificationSoundChannelConfig {
+        return NotificationSoundChannelConfig(
+            messageSound = messageSound.value,
+            messageSoundVersion = messageSoundChannelVersion.value,
+            messageSoundDisplayName = messageSoundDisplayName.value,
+            callRingtone = callRingtone.value,
+            callRingtoneVersion = callRingtoneChannelVersion.value,
+            callRingtoneDisplayName = callRingtoneDisplayName.value,
+        )
+    }
+
     override suspend fun reset() {
         // No op
     }
diff --git a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt
index 1b73ccea31..e835075d81 100644
--- a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt
+++ b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/RoomMemberFixture.kt
@@ -8,9 +8,20 @@
 
 package io.element.android.libraries.previewutils.room
 
+import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE
+import io.element.android.libraries.designsystem.preview.USER_NAME_BOB
+import io.element.android.libraries.designsystem.preview.USER_NAME_CAROL
+import io.element.android.libraries.designsystem.preview.USER_NAME_DAVID
+import io.element.android.libraries.designsystem.preview.USER_NAME_EVE
+import io.element.android.libraries.designsystem.preview.USER_NAME_JUSTIN
+import io.element.android.libraries.designsystem.preview.USER_NAME_MALLORY
+import io.element.android.libraries.designsystem.preview.USER_NAME_SUSIE
+import io.element.android.libraries.designsystem.preview.USER_NAME_VICTOR
+import io.element.android.libraries.designsystem.preview.USER_NAME_WALTER
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import kotlinx.collections.immutable.persistentListOf
 
 fun aRoomMember(
@@ -23,6 +34,8 @@ fun aRoomMember(
     isIgnored: Boolean = false,
     role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
+    isServiceMember: Boolean = false,
+    displayedStatus: DisplayedStatus? = null,
 ) = RoomMember(
     userId = userId,
     displayName = displayName,
@@ -33,32 +46,34 @@ fun aRoomMember(
     isIgnored = isIgnored,
     role = role,
     membershipChangeReason = membershipChangeReason,
+    isServiceMember = isServiceMember,
+    displayedStatus = displayedStatus,
 )
 
 fun aRoomMemberList() = persistentListOf(
     anAlice(),
     aBob(),
-    aRoomMember(UserId("@carol:server.org"), "Carol"),
-    aRoomMember(UserId("@david:server.org"), "David"),
-    aRoomMember(UserId("@eve:server.org"), "Eve"),
-    aRoomMember(UserId("@justin:server.org"), "Justin"),
-    aRoomMember(UserId("@mallory:server.org"), "Mallory"),
-    aRoomMember(UserId("@susie:server.org"), "Susie"),
+    aRoomMember(UserId("@carol:server.org"), USER_NAME_CAROL),
+    aRoomMember(UserId("@david:server.org"), USER_NAME_DAVID),
+    aRoomMember(UserId("@eve:server.org"), USER_NAME_EVE),
+    aRoomMember(UserId("@justin:server.org"), USER_NAME_JUSTIN),
+    aRoomMember(UserId("@mallory:server.org"), USER_NAME_MALLORY),
+    aRoomMember(UserId("@susie:server.org"), USER_NAME_SUSIE),
     aVictor(),
     aWalter(),
 )
 
-fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.Admin)
-fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.Moderator)
+fun anAlice() = aRoomMember(UserId("@alice:server.org"), USER_NAME_ALICE, role = RoomMember.Role.Admin)
+fun aBob() = aRoomMember(UserId("@bob:server.org"), USER_NAME_BOB, role = RoomMember.Role.Moderator)
 
 fun aVictor() = aRoomMember(
     UserId("@victor:server.org"),
-    "Victor",
+    USER_NAME_VICTOR,
     membership = RoomMembershipState.INVITE
 )
 
 fun aWalter() = aRoomMember(
     UserId("@walter:server.org"),
-    "Walter",
+    USER_NAME_WALTER,
     membership = RoomMembershipState.INVITE
 )
diff --git a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
index 4bf1d2501b..6f86789693 100644
--- a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
+++ b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.previewutils.room
 
+import io.element.android.libraries.designsystem.preview.SPACE_NAME
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
@@ -19,7 +20,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 fun aSpaceRoom(
     rawName: String? = null,
-    displayName: String = "Space name",
+    displayName: String = SPACE_NAME,
     avatarUrl: String? = null,
     canonicalAlias: RoomAlias? = null,
     childrenCount: Int = 0,
@@ -33,6 +34,7 @@ fun aSpaceRoom(
     topic: String? = null,
     worldReadable: Boolean = false,
     isDirect: Boolean? = null,
+    isDm: Boolean? = null,
     via: List<String> = emptyList(),
 ) = SpaceRoom(
     rawName = rawName,
@@ -50,5 +52,6 @@ fun aSpaceRoom(
     topic = topic,
     worldReadable = worldReadable,
     via = via.toImmutableList(),
-    isDirect = isDirect
+    isDirect = isDirect,
+    isDm = isDm,
 )
diff --git a/libraries/push/api/build.gradle.kts b/libraries/push/api/build.gradle.kts
index df6ac6120a..91e545daed 100644
--- a/libraries/push/api/build.gradle.kts
+++ b/libraries/push/api/build.gradle.kts
@@ -20,5 +20,6 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.pushproviders.api)
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationIdProvider.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationIdProvider.kt
index ff7119b647..367052eaad 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationIdProvider.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationIdProvider.kt
@@ -53,4 +53,5 @@ object NotificationIdProvider {
 enum class ForegroundServiceType {
     INCOMING_CALL,
     ONGOING_CALL,
+    LIVE_LOCATION,
 }
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationSoundUpdater.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationSoundUpdater.kt
new file mode 100644
index 0000000000..b23c4122ad
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/NotificationSoundUpdater.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.api.notifications
+
+import io.element.android.libraries.preferences.api.store.NotificationSound
+
+/**
+ * Reads and writes the sound on the message / ringing-call channels. Writes create a new
+ * versioned channel because Android forbids mutating sound after creation.
+ */
+interface NotificationSoundUpdater {
+    fun recreateNoisyChannel(sound: NotificationSound, version: Int)
+
+    fun recreateRingingCallChannel(sound: NotificationSound, version: Int)
+
+    /** Current channel sound classified into [NotificationSound]. Null when the channel doesn't exist. */
+    suspend fun readNoisyChannelSound(): NotificationSound?
+
+    /** See [readNoisyChannelSound]. */
+    suspend fun readRingingCallChannelSound(): NotificationSound?
+}
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/SoundDisplayNameResolver.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/SoundDisplayNameResolver.kt
new file mode 100644
index 0000000000..a850b3e435
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/SoundDisplayNameResolver.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.api.notifications
+
+/**
+ * Resolves the user-facing title of a custom notification sound URI (the title shown by the
+ * system ringtone picker). Lifts the [android.media.RingtoneManager] side effect out of UI code
+ * so views and presenters stay testable.
+ */
+interface SoundDisplayNameResolver {
+    /** Returns the title of the ringtone at [uri], or null if it cannot be resolved. */
+    suspend fun resolveCustomSoundTitle(uri: String): String?
+}
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/conversations/NotificationConversationService.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/conversations/NotificationConversationService.kt
index 504adacdb6..4ea80e4ce8 100644
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/conversations/NotificationConversationService.kt
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/conversations/NotificationConversationService.kt
@@ -22,7 +22,7 @@ interface NotificationConversationService {
     suspend fun onSendMessage(
         sessionId: SessionId,
         roomId: RoomId,
-        roomName: String,
+        roomName: String?,
         roomIsDirect: Boolean,
         roomAvatarUrl: String?,
     )
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/sound/NotificationSoundCopier.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/sound/NotificationSoundCopier.kt
new file mode 100644
index 0000000000..2268198353
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/notifications/sound/NotificationSoundCopier.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.api.notifications.sound
+
+/**
+ * Copies a picked notification sound into app-private storage and re-exposes it via the app's
+ * FileProvider, so the persisted reference outlives the original source.
+ */
+interface NotificationSoundCopier {
+    suspend fun copyToAppFiles(sourceUriString: String, slot: SoundSlot): CopyResult
+
+    /**
+     * Removes any previously copied file for [slot] from app-private storage. No-op when no file
+     * exists. Call this when persisting a non-[NotificationSound.Custom] pick (SystemDefault /
+     * Silent) so the previous Custom copy doesn't linger as orphaned bytes — [copyToAppFiles]
+     * already sweeps stale files inline for Custom-to-Custom transitions.
+     */
+    suspend fun deleteStoredSoundFor(slot: SoundSlot)
+
+    enum class SoundSlot { Message, Call }
+
+    sealed interface CopyResult {
+        /**
+         * @property fileProviderUriString FileProvider URI to persist as the channel sound.
+         * @property displayName [android.media.Ringtone.getTitle] for the source, or null. The
+         * picker substitutes a localised fallback label, so localisation stays in the UI layer.
+         */
+        data class Success(val fileProviderUriString: String, val displayName: String?) : CopyResult
+
+        /** [android.media.RingtoneManager] could not open the source URI as a Ringtone. */
+        data object UnplayableSource : CopyResult
+
+        /** The bytes copied successfully, but the resulting file is not a playable Ringtone. */
+        data object UnplayableCopy : CopyResult
+
+        /** Source exceeded the 5 MB cap. */
+        data object FileTooLarge : CopyResult
+
+        /** Any other I/O or unexpected failure. */
+        data class Failure(val cause: Throwable) : CopyResult
+    }
+}
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/FetchPushForegroundServiceManager.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/FetchPushForegroundServiceManager.kt
new file mode 100644
index 0000000000..be178bbe6c
--- /dev/null
+++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/FetchPushForegroundServiceManager.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.api.push
+
+/**
+ * A helper to manage the foreground service used to keep the device awake while we schedule and wait for the work to fetch the notification content to run.
+ */
+interface FetchPushForegroundServiceManager {
+    /**
+     * Start the foreground service to acquire the wakelock. If the device is already awake, this method does nothing.
+     *
+     * @return true if the service was started, false otherwise (e.g. if the device was already awake or if starting the service failed).
+     */
+    fun start(): Boolean
+
+    /**
+     * Stop the foreground service to release the wakelock. If the service is not running, this method does nothing.
+     *
+     * @return true if the service was stopped, false otherwise (e.g. if the service was not running or if stopping the service failed).
+     */
+    suspend fun stop(): Boolean
+}
diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/PushHandlingWakeLock.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/PushHandlingWakeLock.kt
deleted file mode 100644
index 2b19ed9225..0000000000
--- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/push/PushHandlingWakeLock.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.push.api.push
-
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
-
-/**
- * Abstraction over wakelocks used for push handling to ensure the device stays awake while we handle the push and schedule and run the work.
- */
-interface PushHandlingWakeLock {
-    /**
-     * Acquire a wakelock. The wakelock will be held for the given [time] or until [unlock] is called, whichever happens first.
-     */
-    fun lock(time: Duration = 1.minutes)
-
-    /**
-     * Release the wakelock. If no wakelock is associated with the key, this method does nothing.
-     */
-    fun unlock()
-}
diff --git a/libraries/push/impl/build.gradle.kts b/libraries/push/impl/build.gradle.kts
index e8acda59da..b9082c50f6 100644
--- a/libraries/push/impl/build.gradle.kts
+++ b/libraries/push/impl/build.gradle.kts
@@ -57,6 +57,7 @@ dependencies {
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.troubleshoot.api)
     implementation(projects.libraries.workmanager.api)
+    implementation(projects.features.announcement.api)
     implementation(projects.features.call.api)
     implementation(projects.features.enterprise.api)
     implementation(projects.features.lockscreen.api)
@@ -80,6 +81,7 @@ dependencies {
     testImplementation(projects.libraries.pushstore.test)
     testImplementation(projects.libraries.troubleshoot.test)
     testImplementation(projects.libraries.workmanager.test)
+    testImplementation(projects.features.announcement.test)
     testImplementation(projects.features.call.test)
     testImplementation(projects.features.enterprise.test)
     testImplementation(projects.features.lockscreen.test)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriber.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriber.kt
index 39f9d3acd6..35482aa164 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriber.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriber.kt
@@ -83,7 +83,8 @@ class DefaultPusherSubscriber(
             // TODO getDeviceInfoUseCase.execute().displayName().orEmpty()
             deviceDisplayName = "MyDevice",
             url = gateway,
-            defaultPayload = createDefaultPayload(pushClientSecret.getSecretForUser(userId))
+            defaultPayload = createDefaultPayload(pushClientSecret.getSecretForUser(userId)),
+            append = false,
         )
 
     /**
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/di/PushHistoryModule.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/di/PushHistoryModule.kt
index 6472883d4d..93194b2738 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/di/PushHistoryModule.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/history/di/PushHistoryModule.kt
@@ -17,7 +17,9 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.push.impl.PushDatabase
 import io.element.encrypteddb.SqlCipherDriverFactory
-import io.element.encrypteddb.passphrase.RandomSecretPassphraseProvider
+import io.element.encrypteddb.passphrase.RandomDatabaseSecretProvider
+import io.element.encrypteddb.utils.ReplaceDatabaseKey
+import timber.log.Timber
 
 @BindingContainer
 @ContributesTo(AppScope::class)
@@ -36,9 +38,20 @@ object PushHistoryModule {
             parentDir.mkdirs()
         }
 
-        val passphraseProvider = RandomSecretPassphraseProvider(context, secretFile)
+        val rekeyMigrationVersion = 2L
+        val passphraseProvider = RandomDatabaseSecretProvider(context, secretFile)
         val driver = SqlCipherDriverFactory(passphraseProvider)
-            .create(PushDatabase.Schema, "$name.db", context)
+            .create(
+                schema = PushDatabase.Schema,
+                name = "$name.db",
+                context = context
+            ) { db, oldVersion, newVersion ->
+                Timber.d("Migrating $name database from version $oldVersion to $newVersion")
+                if (rekeyMigrationVersion in oldVersion..newVersion) {
+                    ReplaceDatabaseKey(passphraseProvider).replaceKey(name, db)
+                }
+            }
+
         return PushDatabase(driver)
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt
index cf76b26e64..abbda10a3c 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt
@@ -41,6 +41,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventType
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.GalleryMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.ImageMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
@@ -298,11 +299,32 @@ class DefaultNotifiableEventResolver(
                 Timber.tag(loggerTag.value).d("Ignoring notification for sticker")
                 throw NotificationResolverException.EventFilteredOut
             }
+            NotificationContent.MessageLike.Beacon -> {
+                Timber.tag(loggerTag.value).d("Ignoring notification for beacon")
+                throw NotificationResolverException.EventFilteredOut
+            }
+            is NotificationContent.StateEvent.BeaconInfo -> {
+                val notifiableEventMessage = buildNotifiableMessageEvent(
+                    sessionId = userId,
+                    senderId = content.senderId,
+                    roomId = roomId,
+                    eventId = eventId,
+                    noisy = isNoisy,
+                    timestamp = this.timestamp,
+                    senderDisambiguatedDisplayName = getDisambiguatedDisplayName(content.senderId),
+                    body = stringProvider.getString(R.string.notification_live_location_started_body),
+                    imageUriString = null,
+                    roomName = roomDisplayName,
+                    roomIsDm = isDm,
+                    roomAvatarPath = roomAvatarUrl,
+                    senderAvatarPath = senderAvatarUrl,
+                )
+                ResolvedPushEvent.Event(notifiableEventMessage)
+            }
             is NotificationContent.StateEvent.RoomMemberContent,
             NotificationContent.StateEvent.PolicyRuleRoom,
             NotificationContent.StateEvent.PolicyRuleServer,
             NotificationContent.StateEvent.PolicyRuleUser,
-            NotificationContent.StateEvent.RoomAliases,
             NotificationContent.StateEvent.RoomAvatar,
             NotificationContent.StateEvent.RoomCanonicalAlias,
             NotificationContent.StateEvent.RoomCreate,
@@ -345,6 +367,7 @@ class DefaultNotifiableEventResolver(
             is TextMessageType -> messageType.toPlainText(permalinkParser = permalinkParser)
             is VideoMessageType -> messageType.bestDescription
             is LocationMessageType -> messageType.body
+            is GalleryMessageType -> messageType.body
             is OtherMessageType -> messageType.body
         }
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
index e328c46209..b6d15dac4e 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.push.impl.notifications
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
+import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
@@ -37,6 +38,7 @@ import io.element.android.services.appnavstate.api.currentRoomId
 import io.element.android.services.appnavstate.api.currentSessionId
 import io.element.android.services.appnavstate.api.currentThreadId
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 
 /**
@@ -55,6 +57,7 @@ class DefaultNotificationDrawerManager(
     private val matrixClientProvider: MatrixClientProvider,
     private val imageLoaderHolder: ImageLoaderHolder,
     private val activeNotificationsProvider: ActiveNotificationsProvider,
+    private val lockScreenService: LockScreenService,
     sessionObserver: SessionObserver,
 ) : NotificationCleaner {
     // TODO EAx add a setting per user for this
@@ -197,6 +200,8 @@ class DefaultNotificationDrawerManager(
             it.sessionId
         }
 
+        val isAppLocked = lockScreenService.isPinSetup().first()
+
         for ((sessionId, notifiableEvents) in eventsForSessions) {
             val client = matrixClientProvider.getOrRestore(sessionId).getOrThrow()
             val imageLoader = imageLoaderHolder.get(client)
@@ -207,7 +212,25 @@ class DefaultNotificationDrawerManager(
             } else {
                 client.getUserProfile().getOrNull() ?: MatrixUser(sessionId)
             }
-            notificationRenderer.render(currentUser, useCompleteNotificationFormat, notifiableEvents, imageLoader)
+            if (isAppLocked) {
+                // When the app is locked, show a single fallback notification with event count
+                // instead of per-room notifications with message content/sender info.
+                clearAllMessagesEvents(sessionId)
+                val fallbackEvents = notifiableEvents.mapNotNull { it.toFallbackNotifiableEvent() }
+                notificationRenderer.render(
+                    currentUser = currentUser,
+                    useCompleteNotificationFormat = false,
+                    eventsToProcess = fallbackEvents,
+                    imageLoader = imageLoader,
+                )
+            } else {
+                notificationRenderer.render(
+                    currentUser = currentUser,
+                    useCompleteNotificationFormat = useCompleteNotificationFormat,
+                    eventsToProcess = notifiableEvents,
+                    imageLoader = imageLoader,
+                )
+            }
         }
     }
 }
@@ -238,3 +261,29 @@ private fun AppNavigationState.shouldIgnoreEvent(event: NotifiableEvent): Boolea
             }
         }
 }
+
+/**
+ * Convert a [NotifiableEvent] into a [FallbackNotifiableEvent], stripping all content and sender info.
+ * Used when notification content should be hidden (app locked with PIN).
+ */
+private fun NotifiableEvent.toFallbackNotifiableEvent(): FallbackNotifiableEvent? {
+    val timestamp = when (this) {
+        is NotifiableMessageEvent -> timestamp
+        is InviteNotifiableEvent -> timestamp
+        is SimpleNotifiableEvent -> timestamp
+        is FallbackNotifiableEvent -> timestamp
+        is NotifiableRingingCallEvent -> return null
+    }
+    return FallbackNotifiableEvent(
+        sessionId = sessionId,
+        roomId = roomId,
+        eventId = eventId,
+        editedEventId = null,
+        description = null,
+        canBeReplaced = false,
+        isRedacted = false,
+        isUpdated = false,
+        timestamp = timestamp,
+        cause = null,
+    )
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSoundDisplayNameResolver.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSoundDisplayNameResolver.kt
new file mode 100644
index 0000000000..b6237aba03
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSoundDisplayNameResolver.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.notifications
+
+import android.content.Context
+import android.media.RingtoneManager
+import androidx.core.net.toUri
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.push.api.notifications.SoundDisplayNameResolver
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@ContributesBinding(AppScope::class)
+class DefaultSoundDisplayNameResolver(
+    @ApplicationContext private val context: Context,
+) : SoundDisplayNameResolver {
+    override suspend fun resolveCustomSoundTitle(uri: String): String? = withContext(Dispatchers.IO) {
+        val parsed = runCatchingExceptions { uri.toUri() }.getOrNull() ?: return@withContext null
+        // Probing our own FileProvider URI yields the internal filename ("call_sound.ogg"),
+        // not a user-meaningful tone name — better to fall through to the localised "Custom"
+        // label in the UI.
+        if (parsed.authority == context.notificationSoundFileProviderAuthority()) return@withContext null
+        runCatchingExceptions {
+            RingtoneManager.getRingtone(context, parsed)?.getTitle(context)
+        }.getOrNull()
+    }
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
index eb08a25c6a..8dedb3325c 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
@@ -19,7 +19,6 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.JoinedRoom
-import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStoreFactory
@@ -106,13 +105,21 @@ class NotificationBroadcastReceiverHandler(
     @Suppress("unused")
     private fun handleMarkAsRead(sessionId: SessionId, roomId: RoomId, threadId: ThreadId?) = appCoroutineScope.launch {
         val client = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return@launch
-        val isSendPublicReadReceiptsEnabled = sessionPreferencesStore.get(sessionId, this).isSendPublicReadReceiptsEnabled().first()
+        val isSendPublicReadReceiptsEnabled = sessionPreferencesStore.get(
+            sessionId = sessionId,
+            // Make sure `sessionCoroutineScope` is used here, otherwise we'll have several instances using different coroutines,
+            // and it will not work as expected.
+            sessionCoroutineScope = client.sessionCoroutineScope,
+        ).isSendPublicReadReceiptsEnabled().first()
         val receiptType = if (isSendPublicReadReceiptsEnabled) {
             ReceiptType.READ
         } else {
             ReceiptType.READ_PRIVATE
         }
-        val room = client.getJoinedRoom(roomId) ?: return@launch
+
+        val (room, needsDestroy) = activeRoomsHolder.getActiveRoomMatching(sessionId, roomId)?.let { it to false }
+            ?: client.getJoinedRoom(roomId)?.let { it to true }
+            ?: return@launch
         val timeline = if (threadId != null) {
             room.createTimeline(CreateTimelineParams.Threaded(threadId)).getOrNull()
         } else {
@@ -132,6 +139,10 @@ class NotificationBroadcastReceiverHandler(
         if (timeline?.mode != Timeline.Mode.Live) {
             timeline?.close()
         }
+
+        if (needsDestroy) {
+            room.destroy()
+        }
     }
 
     private fun handleSmartReply(
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResultProcessor.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResultProcessor.kt
index e6a3201cbf..a97937f5d0 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResultProcessor.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationResultProcessor.kt
@@ -10,11 +10,9 @@ package io.element.android.libraries.push.impl.notifications
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.featureflag.api.FeatureFlagService
-import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -32,7 +30,6 @@ import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEv
 import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore
 import io.element.android.libraries.push.impl.push.OnNotifiableEventReceived
 import io.element.android.libraries.push.impl.push.OnRedactedEventReceived
-import io.element.android.libraries.push.impl.push.SyncOnNotifiableEvent
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -60,8 +57,6 @@ class DefaultNotificationResultProcessor(
     private val userPushStoreFactory: UserPushStoreFactory,
     private val onRedactedEventReceived: OnRedactedEventReceived,
     private val onNotifiableEventReceived: OnNotifiableEventReceived,
-    private val featureFlagService: FeatureFlagService,
-    private val syncOnNotifiableEvent: SyncOnNotifiableEvent,
     private val elementCallEntryPoint: ElementCallEntryPoint,
     private val notificationChannels: NotificationChannels,
     @AppCoroutineScope private val coroutineScope: CoroutineScope,
@@ -215,18 +210,14 @@ class DefaultNotificationResultProcessor(
         if (nonRingingCallEvents.isNotEmpty()) {
             onNotifiableEventReceived.onNotifiableEventsReceived(nonRingingCallEvents)
         }
-
-        if (!featureFlagService.isFeatureEnabled(FeatureFlags.SyncNotificationsWithWorkManager)) {
-            syncOnNotifiableEvent(results.keys.toList())
-        }
     }
 
     private suspend fun handleRingingCallEvent(notifiableEvent: NotifiableRingingCallEvent) {
         Timber.i("## handleInternal() : Incoming call.")
         elementCallEntryPoint.handleIncomingCall(
-            callType = CallType.RoomCall(
-                notifiableEvent.sessionId,
-                notifiableEvent.roomId,
+            callData = CallData(
+                sessionId = notifiableEvent.sessionId,
+                roomId = notifiableEvent.roomId,
                 isAudioCall = notifiableEvent.callIntent == CallIntent.AUDIO
             ),
             eventId = notifiableEvent.eventId,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationSoundFileProviderAuthority.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationSoundFileProviderAuthority.kt
new file mode 100644
index 0000000000..db9fa47c02
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationSoundFileProviderAuthority.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.notifications
+
+import android.content.Context
+
+// Mirrors the FileProvider authority declared in AndroidManifest.xml as
+// `${applicationId}.fileprovider`. Kept here so the resolver's skip-rule and the copier's URI
+// construction never drift apart.
+internal const val NOTIFICATION_SOUND_FILE_PROVIDER_AUTHORITY_SUFFIX = ".fileprovider"
+
+internal fun Context.notificationSoundFileProviderAuthority(): String =
+    packageName + NOTIFICATION_SOUND_FILE_PROVIDER_AUTHORITY_SUFFIX
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomGroupMessageCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomGroupMessageCreator.kt
index 150f4a9a2d..d814fcaeb2 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomGroupMessageCreator.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/RoomGroupMessageCreator.kt
@@ -67,7 +67,7 @@ class DefaultRoomGroupMessageCreator(
         val roomIsDm = !roomIsGroup
         return notificationCreator.createMessagesListNotification(
             notificationAccountParams = notificationAccountParams,
-            RoomEventGroupInfo(
+            roomInfo = RoomEventGroupInfo(
                 sessionId = notificationAccountParams.user.userId,
                 roomId = roomId,
                 roomDisplayName = roomName,
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
index dc009c0b7d..8d9b776694 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
@@ -10,6 +10,7 @@ package io.element.android.libraries.push.impl.notifications.channels
 
 import android.content.ContentResolver
 import android.content.Context
+import android.content.Intent
 import android.media.AudioAttributes
 import android.media.AudioAttributes.USAGE_NOTIFICATION
 import android.media.AudioManager
@@ -19,28 +20,50 @@ import android.provider.Settings
 import androidx.annotation.ChecksSdkIntAtLeast
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.net.toUri
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
+import dev.zacsweers.metro.binding
 import io.element.android.appconfig.NotificationConfig
 import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.push.api.notifications.NotificationSoundUpdater
 import io.element.android.libraries.push.impl.R
 import io.element.android.services.toolbox.api.strings.StringProvider
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 /* ==========================================================================================
  * IDs for channels
  * ========================================================================================== */
 internal const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2"
-internal const val NOISY_NOTIFICATION_CHANNEL_ID = "DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID_V2"
+internal const val NOISY_NOTIFICATION_CHANNEL_ID_BASE = "DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID_V2"
 internal const val CALL_NOTIFICATION_CHANNEL_ID = "CALL_NOTIFICATION_CHANNEL_ID_V3"
-internal const val RINGING_CALL_NOTIFICATION_CHANNEL_ID = "RINGING_CALL_NOTIFICATION_CHANNEL_ID"
+internal const val RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE = "RINGING_CALL_NOTIFICATION_CHANNEL_ID"
+
+private fun versionedChannelId(base: String, version: Int): String =
+    if (version <= 0) base else "${base}_v$version"
+
+internal fun noisyNotificationChannelId(version: Int): String =
+    versionedChannelId(NOISY_NOTIFICATION_CHANNEL_ID_BASE, version)
+
+internal fun ringingCallNotificationChannelId(version: Int): String =
+    versionedChannelId(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE, version)
 
 /**
  * on devices >= android O, we need to define a channel for each notifications.
+ *
+ * Extends [NotificationSoundUpdater] so consumers can re-create the noisy and ringing-call
+ * channels when the user picks a new sound URI in settings.
  */
-interface NotificationChannels {
+interface NotificationChannels : NotificationSoundUpdater {
     /**
      * Get the channel for incoming call.
      * @param ring true if the device should ring when receiving the call.
@@ -66,14 +89,22 @@ interface NotificationChannels {
 private fun supportNotificationChannels() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 
 @SingleIn(AppScope::class)
-@ContributesBinding(AppScope::class)
+@ContributesBinding(AppScope::class, binding = binding<NotificationChannels>())
+@ContributesBinding(AppScope::class, binding = binding<NotificationSoundUpdater>())
 class DefaultNotificationChannels(
     private val notificationManager: NotificationManagerCompat,
     private val stringProvider: StringProvider,
     @ApplicationContext
     private val context: Context,
     private val enterpriseService: EnterpriseService,
+    private val appPreferencesStore: AppPreferencesStore,
 ) : NotificationChannels {
+    @Volatile private var currentNoisyChannelId: String = NOISY_NOTIFICATION_CHANNEL_ID_BASE
+    @Volatile private var currentRingingCallChannelId: String = RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE
+
+    // Serializes concurrent recreate* calls; readers stay lock-free via @Volatile on the id fields.
+    private val recreateLock = Any()
+
     init {
         createNotificationChannels()
     }
@@ -88,9 +119,27 @@ class DefaultNotificationChannels(
 
         val accentColor = NotificationConfig.NOTIFICATION_ACCENT_COLOR
 
+        // Single-snapshot read; keep this path minimal — extra ContentResolver lookups here would
+        // risk a cold-start ANR.
+        val config = runBlocking {
+            val initial = appPreferencesStore.getNotificationSoundChannelConfig()
+            // Pre-dialog builds mapped the noisy `SystemDefault` to our bundled message.mp3.
+            // Now `SystemDefault` means Android's system tone, so untouched legacy state would
+            // silently flip sound. Promote it to `ElementDefault` once, gated on version==0 so the
+            // migration is idempotent.
+            if (initial.messageSoundVersion == 0 && initial.messageSound == NotificationSound.SystemDefault) {
+                appPreferencesStore.setMessageSoundAndIncrementVersion(NotificationSound.ElementDefault, title = null)
+                appPreferencesStore.getNotificationSoundChannelConfig()
+            } else {
+                initial
+            }
+        }
+
+        currentNoisyChannelId = noisyNotificationChannelId(config.messageSoundVersion)
+        currentRingingCallChannelId = ringingCallNotificationChannelId(config.callRingtoneVersion)
+
         // Migration - the noisy channel was deleted and recreated when sound preference was changed (id was DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID_BASE
         // + currentTimeMillis).
-        // Now the sound can only be change directly in system settings, so for app upgrading we are deleting this former channel
         // Starting from this version the channel will not be dynamic
         for (channel in notificationManager.notificationChannels) {
             val channelId = channel.id
@@ -111,30 +160,19 @@ class DefaultNotificationChannels(
                 notificationManager.deleteNotificationChannel(channelId)
             }
         }
+        // Drop older versioned channels; only the current one remains.
+        deleteStaleVersionedChannels(NOISY_NOTIFICATION_CHANNEL_ID_BASE, currentNoisyChannelId)
+        deleteStaleVersionedChannels(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE, currentRingingCallChannelId)
 
         // Default notification importance: shows everywhere, makes noise, but does not visually intrude.
+        val noisySoundUri = resolveNoisySoundUri(config.messageSound)
+        grantSoundUriToSystem(noisySoundUri)
         notificationManager.createNotificationChannel(
-            NotificationChannelCompat.Builder(
-                NOISY_NOTIFICATION_CHANNEL_ID,
-                NotificationManagerCompat.IMPORTANCE_DEFAULT
+            buildNoisyChannel(
+                channelId = currentNoisyChannelId,
+                soundUri = noisySoundUri,
+                accentColor = accentColor,
             )
-                .setSound(
-                    Uri.Builder()
-                        .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
-                        // Strangely we have to provide a "//" before the package name
-                        .path("//" + context.packageName + "/" + R.raw.message)
-                        .build(),
-                    AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(USAGE_NOTIFICATION)
-                        .build(),
-                )
-                .setName(stringProvider.getString(R.string.notification_channel_noisy).ifEmpty { "Noisy notifications" })
-                .setDescription(stringProvider.getString(R.string.notification_channel_noisy))
-                .setVibrationEnabled(true)
-                .setLightsEnabled(true)
-                .setLightColor(accentColor)
-                .build()
         )
 
         // Low notification importance: shows everywhere, but is not intrusive.
@@ -166,40 +204,205 @@ class DefaultNotificationChannels(
         )
 
         // Register a channel for incoming call notifications which will ring the device when received
+        val ringingSoundUri = resolveRingingSoundUri(config.callRingtone)
+        grantSoundUriToSystem(ringingSoundUri)
         notificationManager.createNotificationChannel(
-            NotificationChannelCompat.Builder(
-                RINGING_CALL_NOTIFICATION_CHANNEL_ID,
-                NotificationManagerCompat.IMPORTANCE_MAX,
+            buildRingingCallChannel(
+                channelId = currentRingingCallChannelId,
+                soundUri = ringingSoundUri,
+                accentColor = accentColor,
             )
-                .setName(stringProvider.getString(R.string.notification_channel_ringing_calls).ifEmpty { "Ringing calls" })
-                .setVibrationEnabled(true)
-                .setSound(
-                    Settings.System.DEFAULT_RINGTONE_URI,
-                    AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setLegacyStreamType(AudioManager.STREAM_RING)
-                        .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                        .build()
-                )
-                .setDescription(stringProvider.getString(R.string.notification_channel_ringing_calls))
-                .setLightsEnabled(true)
-                .setLightColor(accentColor)
-                .build()
         )
     }
 
+    private fun buildNoisyChannel(channelId: String, soundUri: Uri?, accentColor: Int): NotificationChannelCompat {
+        val builder = NotificationChannelCompat.Builder(channelId, NotificationManagerCompat.IMPORTANCE_DEFAULT)
+            .setName(stringProvider.getString(R.string.notification_channel_noisy).ifEmpty { "Noisy notifications" })
+            .setDescription(stringProvider.getString(R.string.notification_channel_noisy))
+            .setVibrationEnabled(true)
+            .setLightsEnabled(true)
+            .setLightColor(accentColor)
+        if (soundUri != null) {
+            builder.setSound(
+                soundUri,
+                AudioAttributes.Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setUsage(USAGE_NOTIFICATION)
+                    .build(),
+            )
+        } else {
+            builder.setSound(null, null)
+        }
+        return builder.build()
+    }
+
+    private fun buildRingingCallChannel(channelId: String, soundUri: Uri?, accentColor: Int): NotificationChannelCompat {
+        val builder = NotificationChannelCompat.Builder(channelId, NotificationManagerCompat.IMPORTANCE_MAX)
+            .setName(stringProvider.getString(R.string.notification_channel_ringing_calls).ifEmpty { "Ringing calls" })
+            .setDescription(stringProvider.getString(R.string.notification_channel_ringing_calls))
+            .setVibrationEnabled(true)
+            .setLightsEnabled(true)
+            .setLightColor(accentColor)
+        if (soundUri != null) {
+            builder.setSound(
+                soundUri,
+                AudioAttributes.Builder()
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .setLegacyStreamType(AudioManager.STREAM_RING)
+                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                    .build()
+            )
+        } else {
+            builder.setSound(null, null)
+        }
+        return builder.build()
+    }
+
+    private fun resolveNoisySoundUri(sound: NotificationSound): Uri? = when (sound) {
+        NotificationSound.Silent -> null
+        NotificationSound.SystemDefault -> Settings.System.DEFAULT_NOTIFICATION_URI
+        NotificationSound.ElementDefault -> bundledMessageSoundUri()
+        NotificationSound.ElementFade -> bundledFadeSoundUri()
+        is NotificationSound.Custom -> parseUriOrFallback(sound.uri) { bundledMessageSoundUri() }
+    }
+
+    private fun resolveRingingSoundUri(sound: NotificationSound): Uri? = when (sound) {
+        NotificationSound.Silent -> null
+        // The ringing channel has no bundled tone — treat ElementDefault and ElementFade like SystemDefault here.
+        NotificationSound.SystemDefault,
+        NotificationSound.ElementDefault,
+        NotificationSound.ElementFade -> Settings.System.DEFAULT_RINGTONE_URI
+        is NotificationSound.Custom -> parseUriOrFallback(sound.uri) { Settings.System.DEFAULT_RINGTONE_URI }
+    }
+
+    private fun bundledMessageSoundUri(): Uri =
+        "${ContentResolver.SCHEME_ANDROID_RESOURCE}://${context.packageName}/${R.raw.message}".toUri()
+
+    private fun bundledFadeSoundUri(): Uri =
+        "${ContentResolver.SCHEME_ANDROID_RESOURCE}://${context.packageName}/${R.raw.element_fade}".toUri()
+
+    /**
+     * Lets system_server ("android") and SystemUI read our FileProvider sound URI; no-op otherwise.
+     * SystemUI hosts the lock-screen notification surface on most OEMs, so a missing grant there
+     * silently mutes ringtones when the device is locked.
+     */
+    private fun grantSoundUriToSystem(uri: Uri?) {
+        if (uri == null || uri.scheme != ContentResolver.SCHEME_CONTENT) return
+        for (pkg in arrayOf("android", "com.android.systemui")) {
+            runCatchingExceptions {
+                context.grantUriPermission(pkg, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }.onFailure { Timber.w(it, "grantUriPermission(%s) failed for notification sound", pkg) }
+        }
+    }
+
+    /** Parses [uriString], or returns [fallback] (the SystemDefault URI) on failure. */
+    private inline fun parseUriOrFallback(uriString: String, fallback: () -> Uri): Uri =
+        runCatchingExceptions { uriString.toUri() }
+            .getOrElse {
+                // Don't pass the throwable: legacy persisted URIs may carry SAF auth tokens.
+                Timber.w("Failed to parse persisted sound URI; falling back to default cause=%s", it::class.simpleName)
+                fallback()
+            }
+
+    private fun deleteStaleVersionedChannels(baseId: String, currentId: String) {
+        if (!supportNotificationChannels()) return
+        for (channel in notificationManager.notificationChannels) {
+            val id = channel.id
+            // Match either the unversioned base ID or any "${baseId}_v<n>" variant.
+            val isBaseOrVersioned = id == baseId || id.startsWith("${baseId}_v")
+            if (isBaseOrVersioned && id != currentId) {
+                notificationManager.deleteNotificationChannel(id)
+            }
+        }
+    }
+
     override fun getChannelForIncomingCall(ring: Boolean): String {
-        return if (ring) RINGING_CALL_NOTIFICATION_CHANNEL_ID else CALL_NOTIFICATION_CHANNEL_ID
+        return if (ring) currentRingingCallChannelId else CALL_NOTIFICATION_CHANNEL_ID
     }
 
     override fun getChannelIdForMessage(sessionId: SessionId, noisy: Boolean): String {
         return if (noisy) {
             enterpriseService.getNoisyNotificationChannelId(sessionId)
-                ?: NOISY_NOTIFICATION_CHANNEL_ID
+                ?: currentNoisyChannelId
         } else {
             SILENT_NOTIFICATION_CHANNEL_ID
         }
     }
 
-    override fun getChannelIdForTest(): String = NOISY_NOTIFICATION_CHANNEL_ID
+    override fun getChannelIdForTest(): String = currentNoisyChannelId
+
+    override fun recreateNoisyChannel(sound: NotificationSound, version: Int) {
+        if (!supportNotificationChannels()) return
+        synchronized(recreateLock) {
+            val accentColor = NotificationConfig.NOTIFICATION_ACCENT_COLOR
+            val newChannelId = noisyNotificationChannelId(version)
+            val soundUri = resolveNoisySoundUri(sound)
+            grantSoundUriToSystem(soundUri)
+            // Create channel before publishing the id: a reader landing between the assignment and
+            // the create call would notify() against a missing id, which Android silently drops.
+            notificationManager.createNotificationChannel(
+                buildNoisyChannel(newChannelId, soundUri, accentColor)
+            )
+            currentNoisyChannelId = newChannelId
+            deleteStaleVersionedChannels(NOISY_NOTIFICATION_CHANNEL_ID_BASE, newChannelId)
+        }
+    }
+
+    override fun recreateRingingCallChannel(sound: NotificationSound, version: Int) {
+        if (!supportNotificationChannels()) return
+        synchronized(recreateLock) {
+            val accentColor = NotificationConfig.NOTIFICATION_ACCENT_COLOR
+            val newChannelId = ringingCallNotificationChannelId(version)
+            val soundUri = resolveRingingSoundUri(sound)
+            grantSoundUriToSystem(soundUri)
+            // See recreateNoisyChannel: the channel must exist before the id is published.
+            notificationManager.createNotificationChannel(
+                buildRingingCallChannel(newChannelId, soundUri, accentColor)
+            )
+            currentRingingCallChannelId = newChannelId
+            deleteStaleVersionedChannels(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE, newChannelId)
+        }
+    }
+
+    override suspend fun readNoisyChannelSound(): NotificationSound? {
+        return readChannelSound(
+            channelId = currentNoisyChannelId,
+            bundledUri = bundledMessageSoundUri(),
+            bundledFadeUri = bundledFadeSoundUri(),
+            systemDefaultUri = Settings.System.DEFAULT_NOTIFICATION_URI,
+        )
+    }
+
+    override suspend fun readRingingCallChannelSound(): NotificationSound? {
+        return readChannelSound(
+            channelId = currentRingingCallChannelId,
+            bundledUri = null,
+            bundledFadeUri = null,
+            systemDefaultUri = Settings.System.DEFAULT_RINGTONE_URI,
+        )
+    }
+
+    /**
+     * Classifies the channel's sound URI: null → Silent, bundled → ElementDefault, bundled fade →
+     * ElementFade, system default → SystemDefault, else → Custom. Both bundled URIs are nullable
+     * because the ringing channel has no bundled tones.
+     */
+    private suspend fun readChannelSound(
+        channelId: String,
+        bundledUri: Uri?,
+        bundledFadeUri: Uri?,
+        systemDefaultUri: Uri,
+    ): NotificationSound? {
+        if (!supportNotificationChannels()) return null
+        val channel = withContext(Dispatchers.IO) {
+            notificationManager.getNotificationChannel(channelId)
+        } ?: return null
+        return when (val sound = channel.sound) {
+            null -> NotificationSound.Silent
+            bundledUri -> NotificationSound.ElementDefault
+            bundledFadeUri -> NotificationSound.ElementFade
+            systemDefaultUri -> NotificationSound.SystemDefault
+            else -> NotificationSound.Custom(sound.toString())
+        }
+    }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt
index ce20234385..f898e4a9ed 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt
@@ -76,7 +76,7 @@ class DefaultNotificationConversationService(
     override suspend fun onSendMessage(
         sessionId: SessionId,
         roomId: RoomId,
-        roomName: String,
+        roomName: String?,
         roomIsDirect: Boolean,
         roomAvatarUrl: String?,
     ) {
@@ -93,10 +93,11 @@ class DefaultNotificationConversationService(
         val imageLoader = imageLoaderHolder.get(client)
 
         val defaultShortcutIconSize = ShortcutManagerCompat.getIconMaxWidth(context)
+        val name = roomName?.takeIf { it.isNotBlank() } ?: roomId.value
         val icon = bitmapLoader.getRoomBitmap(
             avatarData = AvatarData(
                 id = roomId.value,
-                name = roomName,
+                name = name,
                 url = roomAvatarUrl,
                 size = AvatarSize.RoomDetailsHeader,
             ),
@@ -105,7 +106,7 @@ class DefaultNotificationConversationService(
         )?.let(IconCompat::createWithBitmap)
 
         val shortcutInfo = ShortcutInfoCompat.Builder(context, createShortcutId(sessionId, roomId))
-            .setShortLabel(roomName)
+            .setShortLabel(name)
             .setIcon(icon)
             .setIntent(intentProvider.getViewRoomIntent(sessionId, roomId, threadId = null, eventId = null))
             .setCategories(categories)
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopier.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopier.kt
new file mode 100644
index 0000000000..2eeb07189a
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopier.kt
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.notifications.sound
+
+import android.content.ContentResolver
+import android.content.Context
+import android.media.RingtoneManager
+import android.net.Uri
+import android.provider.OpenableColumns
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.CopyResult
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.SoundSlot
+import io.element.android.libraries.push.impl.notifications.notificationSoundFileProviderAuthority
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.io.IOException
+import java.io.InputStream
+
+private const val MAX_BYTES = 5L * 1024 * 1024
+private const val DIRECTORY_NAME = "notification_sounds"
+private const val FALLBACK_EXTENSION = "bin"
+private const val COPY_BUFFER_SIZE = 8 * 1024
+private const val MAX_DISPLAY_NAME_LENGTH = 256
+
+// Defence-in-depth: we only ever expect URIs from the system ringtone picker (content://) or
+// the bundled resource (android.resource://). Reject anything else before doing I/O so a future
+// caller that constructs a NotificationSound.Custom from an untrusted intent can't trick the
+// copier into reading file:// or unrelated providers.
+private val ALLOWED_SOURCE_SCHEMES = setOf(
+    ContentResolver.SCHEME_CONTENT,
+    ContentResolver.SCHEME_ANDROID_RESOURCE,
+)
+
+@ContributesBinding(AppScope::class)
+class DefaultNotificationSoundCopier(
+    @ApplicationContext private val context: Context,
+) : NotificationSoundCopier {
+    // Per-slot serialization: concurrent picks for the same slot would race on `<slot>.tmp`.
+    private val slotMutexes = SoundSlot.entries.associateWith { Mutex() }
+
+    override suspend fun copyToAppFiles(sourceUriString: String, slot: SoundSlot): CopyResult = withContext(Dispatchers.IO) {
+        slotMutexes.getValue(slot).withLock {
+            runCatchingExceptions { performCopy(sourceUriString, slot) }
+                .getOrElse { ex ->
+                    // Don't pass the throwable to Timber: SAF/MediaProvider exceptions sometimes
+                    // embed the source URI (which can carry short-lived auth tokens).
+                    Timber.w("Notification sound copy failed for slot=%s cause=%s", slot, ex::class.simpleName)
+                    CopyResult.Failure(ex)
+                }
+        }
+    }
+
+    override suspend fun deleteStoredSoundFor(slot: SoundSlot) {
+        withContext(Dispatchers.IO) {
+            slotMutexes.getValue(slot).withLock {
+                val dir = File(context.filesDir, DIRECTORY_NAME)
+                if (!dir.exists()) return@withLock
+                val slotBase = slotBaseFor(slot)
+                dir.listFiles { f -> f.isFile && f.name.startsWith("$slotBase.") }
+                    ?.forEach { stale ->
+                        if (!stale.delete()) {
+                            Timber.w("Could not remove stored slot file %s", stale.name)
+                        }
+                    }
+            }
+        }
+    }
+
+    private fun slotBaseFor(slot: SoundSlot): String = when (slot) {
+        SoundSlot.Message -> "message_sound"
+        SoundSlot.Call -> "call_sound"
+    }
+
+    private fun performCopy(sourceUriString: String, slot: SoundSlot): CopyResult {
+        val source = sourceUriString.toUri()
+        if (source.scheme !in ALLOWED_SOURCE_SCHEMES) return CopyResult.UnplayableSource
+        // Reject unplayable sources up front instead of persisting a known-broken pick.
+        val sourceRingtone = RingtoneManager.getRingtone(context, source)
+            ?: return CopyResult.UnplayableSource
+        // Capture the source's display name before copy — once persisted, the row only sees the
+        // FileProvider URI, where Ringtone.getTitle() would resolve to our internal filename
+        // (e.g. "call_sound.ogg"). RingtoneManager → MediaStore TITLE → OpenableColumns covers
+        // system tones, MediaStore-indexed audio, and SAF-picked files respectively. The value
+        // crosses our security boundary (foreign provider → persisted state → UI), so cap and
+        // sanitize it.
+        val displayName = (sourceRingtone.getTitle(context)?.takeUnless { it.isBlank() }
+            ?: queryOpenableDisplayName(source))
+            ?.let(::sanitizeDisplayName)
+
+        // MIME comes from an arbitrary content provider; refuse extensions outside the platform
+        // table to keep filenames bounded to notification_sounds/.
+        val mimeMap = MimeTypeMap.getSingleton()
+        val candidateExtension = mimeMap.getExtensionFromMimeType(context.contentResolver.getType(source))
+        val extension = candidateExtension
+            ?.takeIf { it.isNotBlank() && mimeMap.hasExtension(it) }
+            ?: FALLBACK_EXTENSION
+
+        val slotBase = slotBaseFor(slot)
+
+        val dir = File(context.filesDir, DIRECTORY_NAME).apply { mkdirs() }
+        val tmpFile = File(dir, "$slotBase.tmp").also { if (it.exists()) it.delete() }
+        val finalFile = File(dir, "$slotBase.$extension")
+
+        val inputStream = context.contentResolver.openInputStream(source)
+            ?: return CopyResult.UnplayableSource
+        val bytesCopied = try {
+            inputStream.use { input -> tmpFile.outputStream().buffered().use { out -> input.copyToCapped(out, MAX_BYTES) } }
+        } catch (_: SizeLimitExceeded) {
+            tmpFile.delete()
+            Timber.w("Notification sound copy aborted: source exceeds %d bytes (slot=%s)", MAX_BYTES, slot)
+            return CopyResult.FileTooLarge
+        }
+
+        // The finally below guarantees the temp file doesn't outlive a thrown probe / rename.
+        var committed = false
+        try {
+            // Probe through the FileProvider URI we'll actually persist (catches torn writes
+            // and OEM codec quirks).
+            val fileProviderUri = FileProvider.getUriForFile(
+                context,
+                context.notificationSoundFileProviderAuthority(),
+                tmpFile,
+            )
+            if (RingtoneManager.getRingtone(context, fileProviderUri) == null) {
+                return CopyResult.UnplayableCopy
+            }
+
+            // Sweep all `<slot>.*` so an extension change between picks doesn't leak orphans.
+            dir.listFiles { f -> f.isFile && f.name.startsWith("$slotBase.") && f.name != tmpFile.name }
+                ?.forEach { stale ->
+                    if (!stale.delete()) {
+                        Timber.w("Could not remove stale slot file %s", stale.name)
+                    }
+                }
+            if (!tmpFile.renameTo(finalFile)) {
+                return CopyResult.Failure(IOException("Could not rename temp file to ${finalFile.name}"))
+            }
+            committed = true
+
+            val finalUri = FileProvider.getUriForFile(
+                context,
+                context.notificationSoundFileProviderAuthority(),
+                finalFile,
+            )
+            Timber.d("Notification sound copied: slot=%s bytes=%d", slot, bytesCopied)
+            return CopyResult.Success(finalUri.toString(), displayName)
+        } finally {
+            if (!committed) tmpFile.delete()
+        }
+    }
+
+    private fun queryOpenableDisplayName(uri: Uri): String? {
+        return runCatchingExceptions {
+            context.contentResolver.query(uri, arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)
+                ?.use { cursor ->
+                    if (cursor.moveToFirst() && cursor.columnCount > 0) {
+                        cursor.getString(0)?.takeUnless { it.isBlank() }
+                    } else {
+                        null
+                    }
+                }
+        }.getOrNull()
+    }
+}
+
+internal fun sanitizeDisplayName(raw: String): String? {
+    // Display name comes from a foreign content provider; strip C0 / DEL control characters and
+    // cap length so a hostile or malformed value can't bloat persisted state or break UI rendering.
+    val cleaned = buildString(raw.length.coerceAtMost(MAX_DISPLAY_NAME_LENGTH)) {
+        for (ch in raw) {
+            if (length >= MAX_DISPLAY_NAME_LENGTH) break
+            if (ch.code >= 0x20 && ch.code != 0x7F) append(ch)
+        }
+    }.trim()
+    return cleaned.takeUnless { it.isEmpty() }
+}
+
+private class SizeLimitExceeded : IOException("Sound source exceeds the configured size limit")
+
+private fun InputStream.copyToCapped(out: java.io.OutputStream, maxBytes: Long): Long {
+    val buffer = ByteArray(COPY_BUFFER_SIZE)
+    var totalBytes = 0L
+    while (true) {
+        val read = read(buffer)
+        if (read == -1) break
+        totalBytes += read
+        if (totalBytes > maxBytes) throw SizeLimitExceeded()
+        out.write(buffer, 0, read)
+    }
+    out.flush()
+    return totalBytes
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManager.kt
new file mode 100644
index 0000000000..968661268a
--- /dev/null
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManager.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.push
+
+import android.app.ActivityManager
+import android.content.Context
+import android.content.Context.ACTIVITY_SERVICE
+import android.content.Context.POWER_SERVICE
+import android.content.Intent
+import android.os.Build
+import android.os.PowerManager
+import androidx.core.content.ContextCompat
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.push.api.push.FetchPushForegroundServiceManager
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withTimeoutOrNull
+import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
+
+@ContributesBinding(AppScope::class)
+@SingleIn(AppScope::class)
+class DefaultFetchPushForegroundServiceManager(
+    @ApplicationContext private val context: Context,
+) : FetchPushForegroundServiceManager {
+    private val stopMutex = Mutex()
+
+    override fun start(): Boolean {
+        Timber.d("Acquiring wakelock for push handling, starting service.")
+
+        // Don't start the foreground service if the device is already awake
+        val powerManager = context.getSystemService(POWER_SERVICE) as PowerManager
+        if (powerManager.isInteractive) {
+            Timber.d("Device is already in an interactive state, no need to start FetchPushForegroundService")
+            return false
+        }
+
+        val intent = Intent(context, FetchPushForegroundService::class.java)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            runCatchingExceptions { ContextCompat.startForegroundService(context, intent) }
+                .onFailure { throwable ->
+                    Timber.e(throwable, "Failed to start FetchPushForegroundService, notifications may take longer than usual to sync")
+                }
+        } else {
+            context.startService(intent)
+        }
+
+        return true
+    }
+
+    override suspend fun stop(): Boolean {
+        Timber.d("Releasing wakelock used for push handling, stopping service.")
+        return stopMutex.withLock {
+            val runningServiceInfo = getRunningServiceInfo(context)
+            if (runningServiceInfo != null) {
+                val intent = Intent(context, FetchPushForegroundService::class.java)
+                // If it's still not running in foreground, it means the service is still starting,
+                // so we delay the stop to give it time to start and be set as foreground, otherwise we can crash
+                // with `ForegroundServiceDidNotStartInTimeException`.
+                var isInForeground = runningServiceInfo.foreground
+                withTimeoutOrNull(5.seconds) {
+                    while (!isInForeground) {
+                        delay(50)
+                        val updatedServiceInfo = getRunningServiceInfo(context)
+                        if (updatedServiceInfo == null) {
+                            Timber.d("FetchPushForegroundService is no longer running, no need to stop it.")
+                            return@withTimeoutOrNull
+                        }
+                        isInForeground = updatedServiceInfo.foreground == true
+                    }
+                } ?: Timber.w("FetchPushForegroundService did not start in foreground after 5s, stopping it anyway.")
+                context.stopService(intent)
+            } else {
+                false
+            }
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    private fun getRunningServiceInfo(context: Context): ActivityManager.RunningServiceInfo? {
+        val activityManager = context.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+        return activityManager.getRunningServices(Int.MAX_VALUE)
+            .firstOrNull { it.service.className == FetchPushForegroundService::class.java.name }
+    }
+}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
index 44cf6edefc..d5c3f04348 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.push.impl.push
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.push.impl.db.PushRequest
@@ -35,6 +36,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 private val loggerTag = LoggerTag("PushHandler", LoggerTag.PushLoggerTag)
@@ -53,6 +55,7 @@ class DefaultPushHandler(
     private val workManagerScheduler: WorkManagerScheduler,
     private val syncPendingNotificationsRequestFactory: SyncPendingNotificationsRequestBuilder.Factory,
     resultProcessor: NotificationResultProcessor,
+    private val dispatchers: CoroutineDispatchers,
 ) : PushHandler {
     init {
         resultProcessor.start()
@@ -64,7 +67,7 @@ class DefaultPushHandler(
      * @param pushData the data received in the push.
      * @param providerInfo the provider info.
      */
-    override suspend fun handle(pushData: PushData, providerInfo: String): Boolean {
+    override suspend fun handle(pushData: PushData, providerInfo: String): Boolean = withContext(dispatchers.computation) {
         // Start measuring how long it takes to display a notification from when the push is received
         Timber.d("Calculating push-to-notification for event ${pushData.eventId}")
         val parent = analyticsService.startLongRunningTransaction(AnalyticsLongRunningTransaction.PushToNotification(pushData.eventId.value))
@@ -81,7 +84,7 @@ class DefaultPushHandler(
         }
 
         // Diagnostic Push
-        return if (pushData.eventId == DefaultTestPush.TEST_EVENT_ID) {
+        if (pushData.eventId == DefaultTestPush.TEST_EVENT_ID) {
             pushHistoryService.onDiagnosticPush(providerInfo)
             diagnosticPushHandler.handlePush()
             false
@@ -90,7 +93,7 @@ class DefaultPushHandler(
         }
     }
 
-    override suspend fun handleInvalid(providerInfo: String, data: String) {
+    override suspend fun handleInvalid(providerInfo: String, data: String) = withContext(dispatchers.computation) {
         incrementPushDataStore.incrementPushCounter()
         pushHistoryService.onInvalidPushReceived(providerInfo, data)
     }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlingWakeLock.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlingWakeLock.kt
deleted file mode 100644
index 1388aac19b..0000000000
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlingWakeLock.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.push.impl.push
-
-import android.content.Context
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.SingleIn
-import io.element.android.libraries.di.annotations.ApplicationContext
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
-import timber.log.Timber
-import java.util.concurrent.atomic.AtomicInteger
-import kotlin.time.Duration
-
-@ContributesBinding(AppScope::class)
-@SingleIn(AppScope::class)
-class DefaultPushHandlingWakeLock(
-    @ApplicationContext private val context: Context,
-) : PushHandlingWakeLock {
-    private val count = AtomicInteger(0)
-
-    override fun lock(time: Duration) {
-        Timber.d("Acquiring wakelock for push handling, starting service.")
-        FetchPushForegroundService.startIfNeeded(context)
-
-        count.incrementAndGet()
-    }
-
-    override fun unlock() {
-        Timber.d("Releasing wakelock used for push handling.")
-        FetchPushForegroundService.stop(context)
-        if (count.decrementAndGet() <= 0) {
-            Timber.d("No more wakelock needed for push handling, stopping service.")
-            count.set(0)
-        } else {
-            Timber.d("Wakelock still needed for push handling, restarting service | count: ${count.get()}.")
-            FetchPushForegroundService.startIfNeeded(context)
-        }
-    }
-}
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/FetchPushForegroundService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/FetchPushForegroundService.kt
index f0f4ebb2de..b1c90a374a 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/FetchPushForegroundService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/FetchPushForegroundService.kt
@@ -8,23 +8,22 @@
 package io.element.android.libraries.push.impl.push
 
 import android.app.Service
-import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
+import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
-import dev.zacsweers.metro.Inject
-import io.element.android.libraries.architecture.bindings
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
+import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.designsystem.utils.CommonDrawables
-import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
-import io.element.android.libraries.push.impl.di.PushBindings
-import io.element.android.libraries.push.impl.notifications.channels.NotificationChannels
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import kotlin.time.Duration.Companion.minutes
 
 private const val NOTIFICATION_ID = 1001
@@ -32,6 +31,12 @@ private const val NOTIFICATION_ID = 1001
 // This kind of foreground service can only last up to 3 minutes before onTimeout is called
 private val wakelockTimeout = 3.minutes.inWholeMilliseconds
 
+// The channel ID to use for the notification of the foreground service.
+private const val CHANNEL_ID = "fetch_push_notification_channel"
+
+// The tag to use for the wakelock, this is used for debugging purposes and should be unique to this service.
+private const val WAKELOCK_TAG = "FetchPushService:WakeLock"
+
 /**
  * Foreground service used to ensure the device stays awake while we handle the pushes and schedule and run the work to fetch the notification content.
  */
@@ -40,76 +45,107 @@ class FetchPushForegroundService : Service() {
         return null
     }
 
-    @Inject lateinit var notificationChannels: NotificationChannels
-    @Inject lateinit var pushHandlingWakeLock: PushHandlingWakeLock
-    @Inject @AppCoroutineScope lateinit var coroutineScope: CoroutineScope
-
     private val wakelock: PowerManager.WakeLock by lazy {
         val powerManager = getSystemService(POWER_SERVICE) as PowerManager
-        powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "FetchPushService:WakeLock").apply {
+        powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG).apply {
             setReferenceCounted(false)
         }
     }
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        bindings<PushBindings>().inject(this)
+    private var isOnForeground = false
 
-        wakelock.acquire(wakelockTimeout)
+    private fun ensureNotificationChannelExists() {
+        NotificationManagerCompat.from(this).createNotificationChannelsCompat(
+            listOf(
+                NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
+                    .setName(getString(CommonStrings.common_fetching_notifications_title_android).ifEmpty { "Syncing notifications…" })
+                    .setVibrationEnabled(false)
+                    .setSound(null, null)
+                    .build()
+            )
+        )
+    }
 
-        val notificationCompat = NotificationCompat.Builder(this, notificationChannels.getSilentChannelId())
+    override fun onCreate() {
+        Timber.i("Creating FetchPushForegroundService to handle incoming push, acquiring wakelock for up to $wakelockTimeout ms")
+        ensureNotificationChannelExists()
+
+        // Start the foreground service as soon as possible
+        val notificationCompat = NotificationCompat.Builder(this, CHANNEL_ID)
             .setSmallIcon(CommonDrawables.ic_notification)
-            .setContentTitle(getString(CommonStrings.common_android_fetching_notifications_title))
+            .setContentTitle(getString(CommonStrings.common_fetching_notifications_title_android).ifEmpty { "Syncing notifications…" })
             .setProgress(0, 0, true)
             .setVibrate(longArrayOf(0))
             .setSound(null)
             .build()
-        startForeground(NOTIFICATION_ID, notificationCompat)
+
+        // Try to start the service in foreground. This can fail, even in cases where it's supposed to work according to the docs.
+        // In those cases we catch the exception and handle the failure so we don't try to start the wakelock or stop the service
+        // from running in foreground later.
+        val serviceType = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            ServiceInfo.FOREGROUND_SERVICE_TYPE_SHORT_SERVICE
+        } else {
+            0
+        }
+        runCatchingExceptions {
+            ServiceCompat.startForeground(this, NOTIFICATION_ID, notificationCompat, serviceType)
+        }
+            .onSuccess {
+                isOnForeground = true
+                Timber.d("FetchPushForegroundService started in foreground successfully")
+            }
+            .onFailure {
+                isOnForeground = false
+                Timber.e(it, "Failed to start FetchPushForegroundService in foreground")
+            }
+
+        super.onCreate()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (!isOnForeground) {
+            Timber.w("FetchPushForegroundService is not running in foreground, stopping it to avoid crash")
+            stopSelf()
+            return START_NOT_STICKY
+        }
+
+        wakelock.acquire(wakelockTimeout)
 
         // The timeout is not automatic before Android 15, so we need to schedule it ourselves
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-            coroutineScope.launch {
+            MainScope().launch {
                 delay(wakelockTimeout)
-                onTimeout(startId)
+                onTimeoutAction(calledByTheSystem = false)
             }
         }
 
         return START_NOT_STICKY
     }
 
-    override fun stopService(intent: Intent?): Boolean {
-        wakelock.release()
+    override fun onDestroy() {
+        super.onDestroy()
 
-        stopForeground(STOP_FOREGROUND_REMOVE)
-        return super.stopService(intent)
+        if (isOnForeground) {
+            Timber.i("Destroying FetchPushForegroundService, releasing wakelock and stopping foreground")
+            if (wakelock.isHeld) {
+                wakelock.release()
+            }
+            ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        } else {
+            Timber.w("Destroying FetchPushForegroundService that was not running in foreground, this is unexpected")
+        }
     }
 
     override fun onTimeout(startId: Int) {
         super.onTimeout(startId)
-
-        pushHandlingWakeLock.unlock()
+        onTimeoutAction(calledByTheSystem = true)
     }
 
-    companion object {
-        fun startIfNeeded(context: Context) {
-            // Don't start the foreground service if the device is already awake
-            val powerManager = context.getSystemService(POWER_SERVICE) as PowerManager
-            if (powerManager.isInteractive) return
-
-            start(context)
-        }
-
-        fun start(context: Context) {
-            val intent = Intent(context, FetchPushForegroundService::class.java)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                context.startForegroundService(intent)
-            } else {
-                context.startService(intent)
-            }
-        }
-
-        fun stop(context: Context) {
-            val intent = Intent(context, FetchPushForegroundService::class.java)
-            context.stopService(intent)
+    private fun onTimeoutAction(calledByTheSystem: Boolean) {
+        Timber.w("onTimeoutAction, calledByTheSystem: $calledByTheSystem, isOnForeground: $isOnForeground")
+        if (isOnForeground) {
+            Timber.w("Wakelock timeout reached, stopping FetchPushForegroundService")
+            stopSelf()
         }
     }
 }
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationsWorker.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationsWorker.kt
index ec57582529..cefbd31515 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationsWorker.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationsWorker.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.matrix.api.auth.SessionRestorationException
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.api.exception.isNetworkError
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
+import io.element.android.libraries.push.api.push.FetchPushForegroundServiceManager
 import io.element.android.libraries.push.impl.db.PushRequest
 import io.element.android.libraries.push.impl.history.PushHistoryService
 import io.element.android.libraries.push.impl.notifications.NotifiableEventResolver
@@ -58,7 +58,7 @@ class FetchPendingNotificationsWorker(
     private val resultProcessor: NotificationResultProcessor,
     private val analyticsService: AnalyticsService,
     private val systemClock: SystemClock,
-    private val pushHandlingWakeLock: PushHandlingWakeLock,
+    private val fetchPushForegroundServiceManager: FetchPushForegroundServiceManager,
 ) : CoroutineWorker(context, params) {
     override suspend fun doWork(): Result {
         Timber.d("FetchNotificationsWorker started")
@@ -67,7 +67,8 @@ class FetchPendingNotificationsWorker(
             inputData.getString(SyncPendingNotificationsRequestBuilder.SESSION_ID)?.let(::SessionId)
         }.getOrNull() ?: return Result.failure()
 
-        pushHandlingWakeLock.unlock()
+        // We can stop the foreground service and unlock the wakelock, since the work is now running and the device should be kept awake
+        fetchPushForegroundServiceManager.stop()
 
         // Fetch pending requests in the last 24 hours
         val fetchSince = Instant.fromEpochMilliseconds(systemClock.epochMillis()).minus(1.days)
@@ -152,7 +153,7 @@ class FetchPendingNotificationsWorker(
 
     private suspend fun checkNetworkConnection(requests: List<PushRequest>): Result? {
         val networkTimeoutSpans = requests.mapNotNull { request ->
-            val parent = analyticsService.getLongRunningTransaction(AnalyticsLongRunningTransaction.PushToWorkManager(request.eventId))
+            val parent = analyticsService.getLongRunningTransaction(AnalyticsLongRunningTransaction.PushToNotification(request.eventId))
             parent?.startChild("Waiting for network connectivity", "await_network")
         }
 
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncPendingNotificationsRequestBuilder.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncPendingNotificationsRequestBuilder.kt
index bdb8389feb..4c1da42660 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncPendingNotificationsRequestBuilder.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncPendingNotificationsRequestBuilder.kt
@@ -76,7 +76,6 @@ class DefaultSyncPendingNotificationsRequestBuilder(
             .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
 
         // If we're in an air-gapped environment, we shouldn't validate internet connectivity, as the checker will fail and the worker won't run at all.
-        // Note this will always be false for FOSS, since the feature is only enabled in Element Pro.
         if (networkMonitor.isInAirGappedEnvironment.first()) {
             Timber.d("In an air-gapped environment, not adding NET_CAPABILITY_VALIDATED to the network request")
             networkRequestBuilder.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
diff --git a/libraries/push/impl/src/main/res/raw/element_fade.mp3 b/libraries/push/impl/src/main/res/raw/element_fade.mp3
new file mode 100644
index 0000000000..bf31420e49
Binary files /dev/null and b/libraries/push/impl/src/main/res/raw/element_fade.mp3 differ
diff --git a/libraries/push/impl/src/main/res/values-ca/translations.xml b/libraries/push/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..56655d250d
--- /dev/null
+++ b/libraries/push/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_call">"Trucada"</string>
+  <string name="notification_channel_listening_for_events">"Escoltant esdeveniments"</string>
+  <string name="notification_channel_noisy">"Notificacions sonores"</string>
+  <string name="notification_channel_ringing_calls">"Trucades amb so"</string>
+  <string name="notification_channel_silent">"Notificacions silencioses"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="one">"%1$s: %2$d missatge"</item>
+    <item quantity="other">"%1$s: %2$d missatges"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="one">"%d notificació"</item>
+    <item quantity="other">"%d notificacions"</item>
+  </plurals>
+  <string name="notification_fallback_content">"Tens missatges nous."</string>
+  <string name="notification_incoming_call">"📹 Trucada entrant"</string>
+  <string name="notification_inline_reply_failed">"** No s\'ha pogut enviar. Obre la sala"</string>
+  <string name="notification_invitation_action_join">"Uneix-te"</string>
+  <string name="notification_invitation_action_reject">"Rebutja"</string>
+  <plurals name="notification_invitations">
+    <item quantity="one">"%d invitació"</item>
+    <item quantity="other">"%d invitacions"</item>
+  </plurals>
+  <string name="notification_invite_body">"T\'ha convidat a xatejar"</string>
+  <string name="notification_invite_body_with_sender">"%1$s t\'ha convidat a xatejar"</string>
+  <string name="notification_mentioned_you_body">"T\'ha mencionat: %1$s"</string>
+  <string name="notification_new_messages">"Missatges nous"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d missatge nou"</item>
+    <item quantity="other">"%d missatges nous"</item>
+  </plurals>
+  <string name="notification_reaction_body">"Ha reaccionat amb %1$s"</string>
+  <string name="notification_room_action_mark_as_read">"Marca com a llegit"</string>
+  <string name="notification_room_action_quick_reply">"Resposta ràpida"</string>
+  <string name="notification_room_invite_body">"T\'ha convidat a unir-te a la sala"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s t\'ha convidat a unir-te a la sala"</string>
+  <string name="notification_sender_me">"Jo"</string>
+  <string name="notification_sender_mention_reply">"%1$s ha mencionat o respost"</string>
+  <string name="notification_test_push_notification_content">"Estàs veient la notificació! Fes-hi clic!"</string>
+  <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
+  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="one">"%d missatge notificat no llegit"</item>
+    <item quantity="other">"%d missatges notificats no llegits"</item>
+  </plurals>
+  <string name="notification_unread_notified_messages_and_invitation">"%1$s i %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room">"%1$s en %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s en %2$s i %3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="one">"%d sala"</item>
+    <item quantity="other">"%d sales"</item>
+  </plurals>
+  <string name="push_distributor_background_sync_android">"Sincronització en segon pla"</string>
+  <string name="push_distributor_firebase_android">"Serveis de Google"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"No s\'ha trobat \'Serveis de Google Play\' vàlid. És possible que les notificacions no funcionin correctament."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Usuaris bloquejats"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_description">"Obté el nom del proveïdor actual."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure">"No s\'han seleccionat proveïdors push."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success">"Proveïdor actual de notificacions push: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_title">"Proveïdor actual de notificacions push"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"Assegura\'t que l\'aplicació admet com a mínim un proveïdor de notificacions push."</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"No s\'ha trobat cap proveïdor de notificacions push."</string>
+  <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
+    <item quantity="one">"S\'ha trobat %1$d proveïdor push: %2$s"</item>
+    <item quantity="other">"S\'han trobat %1$d proveïdors push: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"L\'aplicació s\'ha creat per permetre: %1$s"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"Suport del proveïdor de notificacions Push"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"Comprova que l\'aplicació pot mostrar notificacions."</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"No s\'ha fet clic a la notificació."</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"No es pot mostrar la notificació."</string>
+  <string name="troubleshoot_notifications_test_display_notification_success">"S\'ha fet clic a la notificació!"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"Mostrar notificació"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"Fes clic a la notificació per continuar el test."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_description">"Assegureua\'t que l\'aplicació rep notificacions push."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_1">"Error: el proveïdor push ha rebutjat la sol·licitud."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"Error: %1$s."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"Error, no s\'han pogut provar les notificacions push."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"Error, s\'ha acabat el temps d\'espera de la notificació push."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"El bucle de notificacions push ha tardat %1$d ms."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"Prova el bucle de notificacions push"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-de/translations.xml b/libraries/push/impl/src/main/res/values-de/translations.xml
index 6c0e51564a..60e03373f1 100644
--- a/libraries/push/impl/src/main/res/values-de/translations.xml
+++ b/libraries/push/impl/src/main/res/values-de/translations.xml
@@ -15,6 +15,11 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"Der Dienst für UnifiedPush Benachrichtigungen konnte nicht registriert werden. Daher können aktuell keine Push-Benachrichtigungen erhalten werden. Bitte überprüfe die Einstellungen der Benachrichtigungen in der App und den Status des Push-Dienstes."</string>
   <string name="notification_fallback_content">"Du hast neue Nachrichten."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Du hast %d neue Nachricht."</item>
+    <item quantity="other">"Du hast %d neue Nachrichten."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Eingehender Anruf"</string>
   <string name="notification_incoming_call">"Eingehender Anruf"</string>
   <string name="notification_inline_reply_failed">"** Fehler beim Senden - bitte Chat öffnen"</string>
   <string name="notification_invitation_action_join">"Beitreten"</string>
diff --git a/libraries/push/impl/src/main/res/values-et/translations.xml b/libraries/push/impl/src/main/res/values-et/translations.xml
index 4b00b7b5e7..49010359cd 100644
--- a/libraries/push/impl/src/main/res/values-et/translations.xml
+++ b/libraries/push/impl/src/main/res/values-et/translations.xml
@@ -19,7 +19,8 @@
     <item quantity="one">"Sul on %d uus sõnum."</item>
     <item quantity="other">"Sul on %d uut sõnumit."</item>
   </plurals>
-  <string name="notification_incoming_call">"📹 Sissetulev kõne"</string>
+  <string name="notification_incoming_audio_call">"📞 Saabuv kõne"</string>
+  <string name="notification_incoming_call">"📹 Saabuv kõne"</string>
   <string name="notification_inline_reply_failed">"** Saatmine ei õnnestunud - palun ava jututoa täisvaade"</string>
   <string name="notification_invitation_action_join">"Liitu"</string>
   <string name="notification_invitation_action_reject">"Keeldu"</string>
diff --git a/libraries/push/impl/src/main/res/values-fa/translations.xml b/libraries/push/impl/src/main/res/values-fa/translations.xml
index ef24f09c1e..4afd68e17b 100644
--- a/libraries/push/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fa/translations.xml
@@ -55,9 +55,24 @@
   <string name="push_distributor_firebase_android">"خدمات گوگل"</string>
   <string name="push_no_valid_google_play_services_apk_android">"خدمت پلی گوگل معتبری پیدا نشد. ممکن است آگاهی‌ها به درستی کار نکنند."</string>
   <string name="troubleshoot_notifications_test_blocked_users_title">"کاربران مسدود"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_description">"گرفتن نام فراهم کنندهٔ کنونی."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure">"هیچ فراهم کنندهٔ ارسالی گزیده نشده."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success">"فراهم کنندهٔ ارسال کنونی: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_title">"فراهم کنندهٔ ارسال کنونی"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"ازمینان از پشتیبانی برنامه از لااقل یک فراهم کنندهٔ ارسال."</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"پشتیبانی از هیچ فراهم کنندهٔ ارسالی پیدا نشد."</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"پشتیبانی از فراهم‌کنندهٔ ارسال"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"بررسی توانایی برنامه در نمایش آگاهی."</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"روی آگاهی زده نشد."</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"نمی‌توان آگاهی را نشان داد."</string>
   <string name="troubleshoot_notifications_test_display_notification_success">"روی آگاهی کلیک شد!"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"نمایش آگاهی"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"زدن روی آگاهی برای ادامهٔ آزمون"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_description">"اطمینان از این که برنامه ارسال را می‌گیرد."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_1">"خطا: فرستنده درخواست را رد کرد."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"خطا: %1$s."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"خطا. نتوانست فرستادن را بیازماید."</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"خطا. مهلت زمانی انتظار برای فرستادن سر رسید."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"باز خورد معکوس ارسال %1$d م‌ث طول کشید."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"بررسی بازخورد معکوس ارسال"</string>
 </resources>
diff --git a/libraries/push/impl/src/main/res/values-hr/translations.xml b/libraries/push/impl/src/main/res/values-hr/translations.xml
index 86c458dbf9..eead0db104 100644
--- a/libraries/push/impl/src/main/res/values-hr/translations.xml
+++ b/libraries/push/impl/src/main/res/values-hr/translations.xml
@@ -17,6 +17,11 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"Distributer obavijesti UnifiedPush nije mogao biti registriran, tako da više nećete primati obavijesti. Provjerite postavke obavijesti u aplikaciji i status distributera push obavijesti."</string>
   <string name="notification_fallback_content">"Imate nove poruke."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Imate%d novu poruku."</item>
+    <item quantity="other">"Imate %d novi poruka."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Dolazni poziv"</string>
   <string name="notification_incoming_call">"📹 Dolazni poziv"</string>
   <string name="notification_inline_reply_failed">"** Slanje nije uspjelo – otvorite sobu"</string>
   <string name="notification_invitation_action_join">"Pridruži se"</string>
diff --git a/libraries/push/impl/src/main/res/values-in/translations.xml b/libraries/push/impl/src/main/res/values-in/translations.xml
index 4baa46d5a9..465f996ddd 100644
--- a/libraries/push/impl/src/main/res/values-in/translations.xml
+++ b/libraries/push/impl/src/main/res/values-in/translations.xml
@@ -11,7 +11,12 @@
   <plurals name="notification_compat_summary_title">
     <item quantity="other">"%d pemberitahuan"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Distributor notifikasi UnifiedPush tidak dapat didaftarkan, sehingga Anda tidak akan lagi menerima notifikasi. Silakan periksa pengaturan notifikasi aplikasi dan status distributor push."</string>
   <string name="notification_fallback_content">"Anda memiliki pesan baru."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="other">"Anda memiliki %d pesan baru."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"Panggilan masuk"</string>
   <string name="notification_incoming_call">"📹 Panggilan masuk"</string>
   <string name="notification_inline_reply_failed">"** Gagal mengirim — silakan buka ruangan"</string>
   <string name="notification_invitation_action_join">"Gabung"</string>
@@ -33,7 +38,10 @@
   <string name="notification_room_invite_body_with_sender">"%1$s mengundang Anda untuk bergabung dengan ruangan"</string>
   <string name="notification_sender_me">"Saya"</string>
   <string name="notification_sender_mention_reply">"%1$s disebut atau dibalas"</string>
+  <string name="notification_space_invite_body">"Kami mengundang Anda untuk bergabung di ruang ini."</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s mengundang Anda untuk bergabung ke ruang ini."</string>
   <string name="notification_test_push_notification_content">"Anda sedang melihat pemberitahuan ini! Klik saya!"</string>
+  <string name="notification_thread_in_room">"Diskusi di %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
@@ -48,10 +56,19 @@
   <string name="push_distributor_background_sync_android">"Sinkronisasi latar belakang"</string>
   <string name="push_distributor_firebase_android">"Layanan Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Tidak ditemukan Layanan Google Play yang valid. Pemberitahuan mungkin tidak berfungsi dengan baik."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Memeriksa pengguna yang diblokir"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Lihat pengguna yang diblokir"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"Tidak ada pengguna yang diblokir."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="other">"Anda telah memblokir pengguna %1$d. Anda tidak akan menerima notifikasi dari pengguna tersebut."</item>
+  </plurals>
   <string name="troubleshoot_notifications_test_blocked_users_title">"Pengguna yang diblokir"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Dapatkan nama penyedia saat ini."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Tidak ada penyedia notifikasi dorongan yang dipilih."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Penyedia notifikasi dorongan saat ini: %1$s dan distributor saat ini: %2$s. Namun, distributor %3$s tidak ditemukan. Mungkin aplikasinya sudah dihapus?"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Penyedia notifikasi dorongan saat ini: %1$s, tetapi belum ada distributor yang dikonfigurasi."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Penyedia notifikasi dorongan saat ini: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Penyedia notifikasi dorongan saat ini: %1$s (%2$s)"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"Penyedia notifikasi dorongan saat ini"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"Pastikan aplikasi memiliki setidaknya satu penyedia notifikasi dorongan."</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Tidak ada penyedia notifikasi dorongan yang ditemukan."</string>
diff --git a/libraries/push/impl/src/main/res/values-it/translations.xml b/libraries/push/impl/src/main/res/values-it/translations.xml
index 9e44c2d7f9..6ed91c3b6b 100644
--- a/libraries/push/impl/src/main/res/values-it/translations.xml
+++ b/libraries/push/impl/src/main/res/values-it/translations.xml
@@ -15,6 +15,11 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"Non è stato possibile registrare il distributore di notifiche UnifiedPush, quindi non riceverai più notifiche. Controlla le impostazioni delle notifiche dell\'app e lo stato del distributore push."</string>
   <string name="notification_fallback_content">"Hai nuovi messaggi."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Hai %d nuovo messaggio."</item>
+    <item quantity="other">"Hai %d nuovi messaggi."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Chiamata in arrivo"</string>
   <string name="notification_incoming_call">"📹 Chiamata in arrivo"</string>
   <string name="notification_inline_reply_failed">"** Invio fallito - si prega di aprire la stanza"</string>
   <string name="notification_invitation_action_join">"Entra"</string>
@@ -38,6 +43,8 @@
   <string name="notification_room_invite_body_with_sender">"%1$s ti ha invitato a unirti alla stanza"</string>
   <string name="notification_sender_me">"Io"</string>
   <string name="notification_sender_mention_reply">"%1$s ti ha menzionato o risposto"</string>
+  <string name="notification_space_invite_body">"Ti abbiamo invitato a unirti allo spazio"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s ti ha invitato a unirti allo spazio"</string>
   <string name="notification_test_push_notification_content">"Stai visualizzando la notifica! Cliccami!"</string>
   <string name="notification_thread_in_room">"Discussione in %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
diff --git a/libraries/push/impl/src/main/res/values-ja/translations.xml b/libraries/push/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..f115a54042
--- /dev/null
+++ b/libraries/push/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_call">"通話"</string>
+  <string name="notification_channel_listening_for_events">"イベントを監視中"</string>
+  <string name="notification_channel_noisy">"通常の通知"</string>
+  <string name="notification_channel_ringing_calls">"着信"</string>
+  <string name="notification_channel_silent">"サイレント通知"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="other">"%1$s: %2$d件のメッセージ"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="other">"%d 件の通知"</item>
+  </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Unified Push の通知配信サービス (notification distributor) を登録できないため、通知を受け取ることができません。通知の設定と通知ディストリビューター (push distributor) の状況を確認してください。"</string>
+  <string name="notification_fallback_content">"新着メッセージがあります。"</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="other">"新着のメッセージが%d 件あります。"</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 着信"</string>
+  <string name="notification_incoming_call">"📹 通話着信"</string>
+  <string name="notification_inline_reply_failed">"** 送信失敗 - ルームを開いてください"</string>
+  <string name="notification_invitation_action_join">"参加"</string>
+  <string name="notification_invitation_action_reject">"拒否"</string>
+  <plurals name="notification_invitations">
+    <item quantity="other">"%d 件の招待"</item>
+  </plurals>
+  <string name="notification_invite_body">"チャットにあなたを招待しました"</string>
+  <string name="notification_invite_body_with_sender">"%1$sがあなたをチャットに招待しました"</string>
+  <string name="notification_mentioned_you_body">"%1$s があなたをメンションしました"</string>
+  <string name="notification_new_messages">"新着メッセージ"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="other">"%d 件の新着メッセージ"</item>
+  </plurals>
+  <string name="notification_reaction_body">"%1$sへのリアクション"</string>
+  <string name="notification_room_action_mark_as_read">"既読にする"</string>
+  <string name="notification_room_action_quick_reply">"クイック返信"</string>
+  <string name="notification_room_invite_body">"ルームに招待されました"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s があなたをルームに招待しました"</string>
+  <string name="notification_sender_me">"自分"</string>
+  <string name="notification_sender_mention_reply">"%1$s がメンションまたは返信しました"</string>
+  <string name="notification_space_invite_body">"スペースに招待されました"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s があなたをスペースに招待しました"</string>
+  <string name="notification_test_push_notification_content">"通知を表示しています。タップしてください。"</string>
+  <string name="notification_thread_in_room">"%1$sのスレッド"</string>
+  <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
+  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="other">"%d件の未読メッセージ"</item>
+  </plurals>
+  <string name="notification_unread_notified_messages_and_invitation">"%1$sと%2$s"</string>
+  <string name="notification_unread_notified_messages_in_room">"%2$sに%1$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%2$sに%1$sと%3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="other">"%d 個のルーム"</item>
+  </plurals>
+  <string name="push_distributor_background_sync_android">"バックグラウンド同期"</string>
+  <string name="push_distributor_firebase_android">"Google サービス"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"有効なGoogle Play 開発者サービスがありません。通知が正しく機能しない可能性があります。"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"ブロックしたユーザーを確認中"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"ブロックしたユーザーを表示"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"ブロックしたユーザーはいません。"</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="other">"%1$d 人のユーザーをブロックしました。以降の通知を受信しません。"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"ブロックしたユーザー"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_description">"現在のプロバイダーの名前を取得してください。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure">"プッシュ通知プロバイダーが選択されていません。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"現在のプッシュ通知プロバイダーは %1$s で、現在のプッシュ通知ディストリビューター は %2$s です。しかし、ディストリビューター %3$s は見つかりませんでした。アンインストールされている可能性があります。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"現在のプッシュ通知プロバイダーは %1$s ですが、ディストリビューターが設定されていません。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success">"現在のプッシュ通知プロバイダー: %1$s"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"現在のプッシュ通知プロバイダー: %1$s (%2$s)"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_title">"現在のプッシュ通知プロバイダー"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"少なくとも一つ以上のプッシュ通知プロバイダーに、アプリケーションが対応していることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"対応しているプッシュ通知プロバイダーが見つかりませんでした。"</string>
+  <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
+    <item quantity="other">"%1$d 個の通知プロバイダーを発見: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"このアプリケーションは %1$s に対応しています。"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"プッシュ通知プロバイダーへの対応状況"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"アプリケーションが通知を表示できることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"通知がタップされていません。"</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"通知を表示できません。"</string>
+  <string name="troubleshoot_notifications_test_display_notification_success">"通知がタップされました。"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"通知の表示"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"テストを続行するには、通知にタップしてください。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_description">"プッシュ通知をアプリケーションが受信していることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_1">"エラー: プッシュ通知プロバイダーがリクエストを拒否しました。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"エラー: %1$s"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"エラー: プッシュ通知をテストできません。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"エラー: 通知の待機がタイムアウトしました。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"プッシュ通知のループバックに %1$d ms 要しました。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"プッシュ通知のループバックをテスト"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-ko/translations.xml b/libraries/push/impl/src/main/res/values-ko/translations.xml
index 3aa015392f..f4399cda2b 100644
--- a/libraries/push/impl/src/main/res/values-ko/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ko/translations.xml
@@ -16,6 +16,7 @@
   <plurals name="notification_fallback_n_content">
     <item quantity="other">"%d개의 새 메시지가 있습니다."</item>
   </plurals>
+  <string name="notification_incoming_audio_call">"📞 수신 전화"</string>
   <string name="notification_incoming_call">"📹 수신 전화"</string>
   <string name="notification_inline_reply_failed">"** 전송 실패 - 방을 열여주세요"</string>
   <string name="notification_invitation_action_join">"참가하기"</string>
diff --git a/libraries/push/impl/src/main/res/values-pl/translations.xml b/libraries/push/impl/src/main/res/values-pl/translations.xml
index b9ae289507..d8a4077d05 100644
--- a/libraries/push/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/push/impl/src/main/res/values-pl/translations.xml
@@ -15,7 +15,14 @@
     <item quantity="few">"%d powiadomienia"</item>
     <item quantity="many">"%d powiadomień"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Nie udało się zarejestrować dystrybutora powiadomień Push, przez co nie będziesz już otrzymywać powiadomień. Sprawdź ustawienia powiadomień aplikacji i status dystrybutora powiadomień Push."</string>
   <string name="notification_fallback_content">"Masz nowe wiadomości."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Masz %d nową wiadomość."</item>
+    <item quantity="few">"Masz %d nowe wiadomości."</item>
+    <item quantity="many">"Masz %d nowych wiadomości."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Połączenie przychodzące"</string>
   <string name="notification_incoming_call">"📹 Połączenie przychodzące"</string>
   <string name="notification_inline_reply_failed">"** Nie udało się wysłać - proszę otworzyć pokój"</string>
   <string name="notification_invitation_action_join">"Dołącz"</string>
@@ -41,12 +48,15 @@
   <string name="notification_room_invite_body_with_sender">"%1$s zaprosił Cię do pokoju"</string>
   <string name="notification_sender_me">"Ja"</string>
   <string name="notification_sender_mention_reply">"%1$s wspomniał lub odpowiedział"</string>
+  <string name="notification_space_invite_body">"Zaprosił Cię do dołączenia do przestrzeni"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s zaprosił Cię do dołączenia do przestrzeni"</string>
   <string name="notification_test_push_notification_content">"Wyświetlasz powiadomienie! Kliknij mnie!"</string>
+  <string name="notification_thread_in_room">"Wątek w %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
     <item quantity="one">"%d nieprzeczytana wiadomość"</item>
-    <item quantity="few">"%d nieprzeczytane wiadomość"</item>
+    <item quantity="few">"%d nieprzeczytane wiadomości"</item>
     <item quantity="many">"%d nieprzeczytanych wiadomości"</item>
   </plurals>
   <string name="notification_unread_notified_messages_and_invitation">"%1$s i %2$s"</string>
diff --git a/libraries/push/impl/src/main/res/values-ro/translations.xml b/libraries/push/impl/src/main/res/values-ro/translations.xml
index 0a83e6afad..2f677568ea 100644
--- a/libraries/push/impl/src/main/res/values-ro/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ro/translations.xml
@@ -15,10 +15,16 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"Distribuitorul de notificări UnifiedPush nu a putut fi înregistrat, așadar nu veți mai primi notificări. Verificați setările de notificări ale aplicației și starea distribuitorului push."</string>
   <string name="notification_fallback_content">"Aveți mesaje noi"</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Aveți %d mesaj nou."</item>
+    <item quantity="few">"Aveți %d mesaje noi."</item>
+    <item quantity="other">"Aveți %d mesaje noi."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Apel primit"</string>
   <string name="notification_incoming_call">"Apel primit"</string>
   <string name="notification_inline_reply_failed">"** Trimiterea eșuată - vă rugăm să deschideți camera"</string>
   <string name="notification_invitation_action_join">"Alăturați-vă"</string>
-  <string name="notification_invitation_action_reject">"Respinge"</string>
+  <string name="notification_invitation_action_reject">"Respingeți"</string>
   <plurals name="notification_invitations">
     <item quantity="one">"%d invitație"</item>
     <item quantity="other">"%d invitații"</item>
diff --git a/libraries/push/impl/src/main/res/values-ru/translations.xml b/libraries/push/impl/src/main/res/values-ru/translations.xml
index 24b1412500..2fe8645d82 100644
--- a/libraries/push/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/push/impl/src/main/res/values-ru/translations.xml
@@ -15,8 +15,8 @@
     <item quantity="few">"%d уведомления"</item>
     <item quantity="many">"%d уведомлений"</item>
   </plurals>
-  <string name="notification_error_unified_push_unregistered_android">"Не удалось зарегистрировать дистрибьютора уведомлений UnifiedPush, поэтому вы больше не будете получать уведомления. Проверьте настройки уведомлений в приложении и статус дистрибьютора push-уведомлений."</string>
-  <string name="notification_fallback_content">"У вас есть новые сообщения."</string>
+  <string name="notification_error_unified_push_unregistered_android">"Не удалось зарегистрировать дистрибьютора уведомлений UnifiedPush, поэтому Вы больше не будете получать уведомления. Проверьте настройки уведомлений в приложении и статус дистрибьютора push-уведомлений."</string>
+  <string name="notification_fallback_content">"У Вас есть новые сообщения."</string>
   <plurals name="notification_fallback_n_content">
     <item quantity="one">"У Вас %d новое сообщение."</item>
     <item quantity="few">"У Вас %d новых сообщения."</item>
@@ -32,8 +32,8 @@
     <item quantity="few">"%d приглашения"</item>
     <item quantity="many">"%d приглашений"</item>
   </plurals>
-  <string name="notification_invite_body">"Пригласил(а) вас в чат"</string>
-  <string name="notification_invite_body_with_sender">"%1$s пригласил(а) вас в чат"</string>
+  <string name="notification_invite_body">"Пригласил(а) Вас в чат"</string>
+  <string name="notification_invite_body_with_sender">"%1$s пригласил(а) Вас в чат"</string>
   <string name="notification_mentioned_you_body">"Упомянул(а) вас: %1$s"</string>
   <string name="notification_new_messages">"Новые сообщения"</string>
   <plurals name="notification_new_messages_for_room">
@@ -44,14 +44,14 @@
   <string name="notification_reaction_body">"Отреагировал(а) на %1$s"</string>
   <string name="notification_room_action_mark_as_read">"Пометить как прочитанное"</string>
   <string name="notification_room_action_quick_reply">"Быстрый ответ"</string>
-  <string name="notification_room_invite_body">"Пригласил(а) вас в комнату"</string>
-  <string name="notification_room_invite_body_with_sender">"%1$s пригласил(а) вас в комнату"</string>
+  <string name="notification_room_invite_body">"Пригласил(а) Вас в комнату"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s пригласил(а) Вас в комнату"</string>
   <string name="notification_sender_me">"Я"</string>
   <string name="notification_sender_mention_reply">"%1$s упомянул(а) или ответил(а)"</string>
-  <string name="notification_space_invite_body">"Пригласил(а) вас в пространство"</string>
-  <string name="notification_space_invite_body_with_sender">"%1$s пригласил(а) вас в пространство"</string>
+  <string name="notification_space_invite_body">"Пригласил(а) Вас в пространство"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s пригласил(а) Вас в пространство"</string>
   <string name="notification_test_push_notification_content">"Вы просматриваете уведомление! Нажмите на меня!"</string>
-  <string name="notification_thread_in_room">"Ветка в %1$s"</string>
+  <string name="notification_thread_in_room">"Обсуждение в %1$s"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
diff --git a/libraries/push/impl/src/main/res/values-uk/translations.xml b/libraries/push/impl/src/main/res/values-uk/translations.xml
index d3aee22165..253bebda78 100644
--- a/libraries/push/impl/src/main/res/values-uk/translations.xml
+++ b/libraries/push/impl/src/main/res/values-uk/translations.xml
@@ -15,7 +15,14 @@
     <item quantity="few">"%d сповіщення"</item>
     <item quantity="many">"%d сповіщень"</item>
   </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Розподільник сповіщень UnifiedPush не вдалося зареєструвати, тому ви більше не отримуватимете сповіщень. Перевірте налаштування сповіщень у застосунку та стан розподільника push-сповіщень."</string>
   <string name="notification_fallback_content">"У вас є нові повідомлення."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"У вас %d нове повідомлення."</item>
+    <item quantity="few">"У вас %d нових повідомлення."</item>
+    <item quantity="many">"У вас %d нових повідомлень."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Вхідний виклик"</string>
   <string name="notification_incoming_call">"📹 Вхідний виклик"</string>
   <string name="notification_inline_reply_failed">"** Не вдалося надіслати - відкрийте кімнату"</string>
   <string name="notification_invitation_action_join">"Доєднатися"</string>
@@ -26,7 +33,8 @@
     <item quantity="many">"%d запрошень"</item>
   </plurals>
   <string name="notification_invite_body">"Запрошує вас до бесіди"</string>
-  <string name="notification_invite_body_with_sender">"%1$s запросив вас до чату"</string>
+  <string name="notification_invite_body_with_sender">"%1$s запрошує вас до бесіди"</string>
+  <string name="notification_live_location_started_body">"Починає ділитися своїм поточним місцем розташування"</string>
   <string name="notification_mentioned_you_body">"Вас згадує: %1$s"</string>
   <string name="notification_new_messages">"Нові повідомлення"</string>
   <plurals name="notification_new_messages_for_room">
@@ -41,6 +49,7 @@
   <string name="notification_room_invite_body_with_sender">"%1$s запросив вас приєднатися до кімнати"</string>
   <string name="notification_sender_me">"Я"</string>
   <string name="notification_sender_mention_reply">"%1$s згадували або відповідали"</string>
+  <string name="notification_space_invite_body">"Вас запросили приєднатися до простору"</string>
   <string name="notification_space_invite_body_with_sender">"%1$s запрошує вас приєднатися до простору"</string>
   <string name="notification_test_push_notification_content">"Ви переглядаєте сповіщення! Натисніть тут!"</string>
   <string name="notification_thread_in_room">"Гілка в %1$s"</string>
@@ -62,11 +71,18 @@
   <string name="push_distributor_background_sync_android">"Фонова синхронізація"</string>
   <string name="push_distributor_firebase_android">"Сервіси Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Не знайдено дійсних сервісів Google Play. Сповіщення можуть не працювати належним чином."</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"Перевірка заблокованих користувачів"</string>
   <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"Переглянути заблокованих користувачів"</string>
   <string name="troubleshoot_notifications_test_blocked_users_result_none">"Немає заблокованих користувачів"</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="one">"Ви заблокували %1$d користувача. Ви не отримуватимете сповіщення для цього користувача."</item>
+    <item quantity="few">"Ви заблокували %1$d користувачів. Ви не отримуватимете сповіщення для цих користувачів."</item>
+    <item quantity="many">"Ви заблокували %1$d користувачів. Ви не отримуватимете сповіщення для цих користувачів."</item>
+  </plurals>
   <string name="troubleshoot_notifications_test_blocked_users_title">"Заблоковані користувачі"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"Отримує назву поточного постачальника."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"Постачальників push-сповіщень не вибрано."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"Поточний провайдер push-повідомлень: %1$s та поточний дистриб\'ютор: %2$s. Але дистриб\'ютора %3$s не знайдено. Можливо, застосунок було видалено?"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"Поточний постачальник push-сповіщень: %1$s, але дистриб\'юторів не налаштовано."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"Поточний постачальник: %1$s."</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"Поточний постачальник push-сповіщень: %1$s (%2$s)"</string>
diff --git a/libraries/push/impl/src/main/res/values-uz/translations.xml b/libraries/push/impl/src/main/res/values-uz/translations.xml
index 1058fdd1d2..d4a018ab80 100644
--- a/libraries/push/impl/src/main/res/values-uz/translations.xml
+++ b/libraries/push/impl/src/main/res/values-uz/translations.xml
@@ -15,6 +15,11 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"UnifiedPush bildirishnoma tarqatuvchisini roʻyxatdan oʻtkazib boʻlmadi, shuning uchun siz endi bildirishnomalarni olmaysiz. Iltimos, ilovaning bildirishnoma sozlamalarini va push distribyutor holatini tekshiring."</string>
   <string name="notification_fallback_content">"Sizda yangi xabarlar bor."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="one">"Sizda %d ta yangi xabar bor."</item>
+    <item quantity="other">"Sizda %d ta yangi xabar bor."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Kiruvchi qo‘ng‘iroq"</string>
   <string name="notification_incoming_call">"📹 Kiruvchi qoʻngʻiroq"</string>
   <string name="notification_inline_reply_failed">"** Yuborilmadi - iltimos, xonani oching"</string>
   <string name="notification_invitation_action_join">"Qo\'shilish"</string>
diff --git a/libraries/push/impl/src/main/res/values-vi/translations.xml b/libraries/push/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..b286c8fc29
--- /dev/null
+++ b/libraries/push/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="notification_channel_call">"Gọi"</string>
+  <string name="notification_channel_listening_for_events">"Đang lắng nghe sự kiện"</string>
+  <string name="notification_channel_noisy">"Thông báo ồn ào"</string>
+  <string name="notification_channel_ringing_calls">"Cuộc gọi đang đổ chuông"</string>
+  <string name="notification_channel_silent">"Thông báo im lặng"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="other">"%1$s:%2$d tin nhắn"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="other">"%d thông báo"</item>
+  </plurals>
+  <string name="notification_error_unified_push_unregistered_android">"Không thể đăng ký trình phân phối thông báo UnifiedPush, vì vậy bạn sẽ không nhận được thông báo nữa. Vui lòng kiểm tra cài đặt thông báo của ứng dụng và trạng thái của trình phân phối thông báo."</string>
+  <string name="notification_fallback_content">"Bạn có tin nhắn mới."</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="other">"Bạn có %d tin nhắn mới."</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 Cuộc gọi đến"</string>
+  <string name="notification_incoming_call">"📹 Cuộc gọi đến"</string>
+  <string name="notification_inline_reply_failed">"** Không gửi được - vui lòng mở phòng"</string>
+  <string name="notification_invitation_action_join">"Tham gia"</string>
+  <string name="notification_invitation_action_reject">"Từ chối"</string>
+  <plurals name="notification_invitations">
+    <item quantity="other">"%d lời mời"</item>
+  </plurals>
+  <string name="notification_invite_body">"Đã mời bạn trò chuyện"</string>
+  <string name="notification_invite_body_with_sender">"%1$s đã mời bạn trò chuyện"</string>
+  <string name="notification_mentioned_you_body">"Đã nhắc đến bạn: %1$s"</string>
+  <string name="notification_new_messages">"Tin nhắn mới"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="other">"%dtin nhắn mới"</item>
+  </plurals>
+  <string name="notification_reaction_body">"Đã thả %1$s vào tin nhắn"</string>
+  <string name="notification_room_action_mark_as_read">"Đánh dấu đã đọc"</string>
+  <string name="notification_room_action_quick_reply">"Trả lời nhanh"</string>
+  <string name="notification_room_invite_body">"Đã mời bạn tham gia phòng"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s đã mời bạn tham gia phòng chat"</string>
+  <string name="notification_sender_me">"Tôi"</string>
+  <string name="notification_sender_mention_reply">"%1$s đã đề cập hoặc trả lời"</string>
+  <string name="notification_space_invite_body">"Mời bạn tham gia không gian này."</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s đã mời bạn tham gia không gian này."</string>
+  <string name="notification_test_push_notification_content">"Bạn đang xem thông báo! Bấm vào đây!"</string>
+  <string name="notification_thread_in_room">"Chuỗi cuộc trò chuyện trong: %1$s"</string>
+  <string name="notification_ticker_text_dm">"%1$s:%2$s"</string>
+  <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="other">"%dtin nhắn chưa đọc đã thông báo"</item>
+  </plurals>
+  <string name="notification_unread_notified_messages_and_invitation">"%1$s và %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room">"%1$s in %2$s"</string>
+  <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s trong %2$s và %3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="other">"%d phòng"</item>
+  </plurals>
+  <string name="push_distributor_background_sync_android">"Đồng bộ hóa trong nền"</string>
+  <string name="push_distributor_firebase_android">"Dịch vụ của Google"</string>
+  <string name="push_no_valid_google_play_services_apk_android">"Không tìm thấy Dịch vụ Google Play hợp lệ. Thông báo có thể không hoạt động đúng cách."</string>
+  <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
+    <item quantity="other">"Bạn đã chặn người dùng %1$d. Bạn sẽ không nhận được thông báo từ người này."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_blocked_users_title">"Người dùng bị chặn"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"Hãy đảm bảo rằng ứng dụng hỗ trợ ít nhất một nhà cung cấp thông báo đẩy."</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Không tìm thấy hỗ trợ từ nhà cung cấp thông báo đẩy."</string>
+  <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
+    <item quantity="other">"Đã tìm thấy %1$d nhà cung cấp thông báo đẩy: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"Hỗ trợ nhà cung cấp thông báo đẩy"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"Kiểm tra xem ứng dụng có thể hiển thị thông báo hay không."</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"Thông báo chưa được nhấp vào."</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"Không thể hiển thị thông báo."</string>
+  <string name="troubleshoot_notifications_test_display_notification_success">"Thông báo đã được nhấp!"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"Hiển thị thông báo"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"Hãy nhấp vào thông báo để tiếp tục thử nghiệm."</string>
+</resources>
diff --git a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
index 2d289e9a9e..207f962b90 100644
--- a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
@@ -13,6 +13,10 @@
   </plurals>
   <string name="notification_error_unified_push_unregistered_android">"Unified Push 通知散佈程式註冊失敗，因此您無法再收到通知。請檢查應用程式的通知設定與推播散佈程式的狀態。"</string>
   <string name="notification_fallback_content">"您有新訊息。"</string>
+  <plurals name="notification_fallback_n_content">
+    <item quantity="other">"您有 %d 則新訊息。"</item>
+  </plurals>
+  <string name="notification_incoming_audio_call">"📞 來電"</string>
   <string name="notification_incoming_call">"📹 來電"</string>
   <string name="notification_inline_reply_failed">"** 無法傳送，請開啟聊天室"</string>
   <string name="notification_invitation_action_join">"加入"</string>
@@ -34,6 +38,8 @@
   <string name="notification_room_invite_body_with_sender">"%1$s 邀請您加入聊天室"</string>
   <string name="notification_sender_me">"我"</string>
   <string name="notification_sender_mention_reply">"%1$s 提及或回覆"</string>
+  <string name="notification_space_invite_body">"已邀請您加入空間"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s 已邀請您的加入此空間"</string>
   <string name="notification_test_push_notification_content">"您正在查看通知！點我！"</string>
   <string name="notification_thread_in_room">"在 %1$s 的討論串"</string>
   <string name="notification_ticker_text_dm">"%1$s：%2$s"</string>
diff --git a/libraries/push/impl/src/main/res/values-zh/translations.xml b/libraries/push/impl/src/main/res/values-zh/translations.xml
index 9a9057b07b..155c9d8ce6 100644
--- a/libraries/push/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh/translations.xml
@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="notification_channel_call">"通话"</string>
-  <string name="notification_channel_listening_for_events">"监听事件"</string>
+  <string name="notification_channel_listening_for_events">"正在监听事件"</string>
   <string name="notification_channel_noisy">"嘈杂通知"</string>
-  <string name="notification_channel_ringing_calls">"来电振铃"</string>
+  <string name="notification_channel_ringing_calls">"响铃通话"</string>
   <string name="notification_channel_silent">"静默通知"</string>
   <plurals name="notification_compat_summary_line_for_room">
-    <item quantity="other">"%1$s：%2$d 条消息"</item>
+    <item quantity="other">"%1$s：%2$d 个消息"</item>
   </plurals>
   <plurals name="notification_compat_summary_title">
-    <item quantity="other">"%d 条通知"</item>
+    <item quantity="other">"%d 个通知"</item>
   </plurals>
-  <string name="notification_error_unified_push_unregistered_android">"统一推送通知分发器注册失败，您将无法再接收通知。请检查应用的通知设置及推送分发器的状态。"</string>
-  <string name="notification_fallback_content">"您有新消息。"</string>
+  <string name="notification_error_unified_push_unregistered_android">"UnifiedPush 分发器注册失败，你将无法再接收通知。请检查 app 的通知设置及推送分发器的状态。"</string>
+  <string name="notification_fallback_content">"你有新消息。"</string>
   <plurals name="notification_fallback_n_content">
-    <item quantity="other">"您有 %d 条新消息。"</item>
+    <item quantity="other">"你有 %d 个新消息。"</item>
   </plurals>
+  <string name="notification_incoming_audio_call">"📞 来电"</string>
   <string name="notification_incoming_call">"📹 来电"</string>
-  <string name="notification_inline_reply_failed">"** 无法发送——请打开聊天室"</string>
+  <string name="notification_inline_reply_failed">"** 无法发送——请打开房间"</string>
   <string name="notification_invitation_action_join">"加入"</string>
   <string name="notification_invitation_action_reject">"拒绝"</string>
   <plurals name="notification_invitations">
     <item quantity="other">"%d 个邀请"</item>
   </plurals>
-  <string name="notification_invite_body">"邀请您聊天"</string>
-  <string name="notification_invite_body_with_sender">"%1$s 邀您聊天"</string>
+  <string name="notification_invite_body">"已邀请你聊天"</string>
+  <string name="notification_invite_body_with_sender">"%1$s 已邀请你聊天"</string>
+  <string name="notification_live_location_started_body">"已开始共享其实时位置"</string>
   <string name="notification_mentioned_you_body">"提到了你：%1$s"</string>
   <string name="notification_new_messages">"新消息"</string>
   <plurals name="notification_new_messages_for_room">
-    <item quantity="other">"%d 条新消息"</item>
+    <item quantity="other">"%d 个新消息"</item>
   </plurals>
-  <string name="notification_reaction_body">"使用 %1$s 回应"</string>
-  <string name="notification_room_action_mark_as_read">"标记为已读"</string>
+  <string name="notification_reaction_body">"已使用 %1$s 反应"</string>
+  <string name="notification_room_action_mark_as_read">"设为已读"</string>
   <string name="notification_room_action_quick_reply">"快速回复"</string>
-  <string name="notification_room_invite_body">"邀请你加入聊天室"</string>
-  <string name="notification_room_invite_body_with_sender">"%1$s 邀请您加入房间"</string>
+  <string name="notification_room_invite_body">"邀请你加入房间"</string>
+  <string name="notification_room_invite_body_with_sender">"%1$s 已邀请你加入房间"</string>
   <string name="notification_sender_me">"我"</string>
-  <string name="notification_sender_mention_reply">"%1$s提及或回复"</string>
-  <string name="notification_space_invite_body">"已邀请您加入该空间"</string>
-  <string name="notification_space_invite_body_with_sender">"%1$s 邀请您加入该空间"</string>
-  <string name="notification_test_push_notification_content">"您正在查看通知！点击我！"</string>
-  <string name="notification_thread_in_room">"线程 %1$s"</string>
+  <string name="notification_sender_mention_reply">"%1$s 个提及或回复"</string>
+  <string name="notification_space_invite_body">"已邀请你加入空间"</string>
+  <string name="notification_space_invite_body_with_sender">"%1$s 邀请你加入空间"</string>
+  <string name="notification_test_push_notification_content">"你正在查看通知！点击我！"</string>
+  <string name="notification_thread_in_room">"位于 %1$s 中的消息列"</string>
   <string name="notification_ticker_text_dm">"%1$s：%2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
   <plurals name="notification_unread_notified_messages">
-    <item quantity="other">"%d 条未读消息"</item>
+    <item quantity="other">"%d 个未读消息"</item>
   </plurals>
   <string name="notification_unread_notified_messages_and_invitation">"%1$s 和 %2$s"</string>
   <string name="notification_unread_notified_messages_in_room">"%2$s 中的 %1$s"</string>
   <string name="notification_unread_notified_messages_in_room_and_invitation">"在 %2$s 和 %3$s 中的 %1$s"</string>
   <plurals name="notification_unread_notified_messages_in_room_rooms">
-    <item quantity="other">"%d 个聊天室"</item>
+    <item quantity="other">"%d 个房间"</item>
   </plurals>
   <string name="push_distributor_background_sync_android">"后台同步"</string>
-  <string name="push_distributor_firebase_android">"谷歌服务"</string>
+  <string name="push_distributor_firebase_android">"Google 服务"</string>
   <string name="push_no_valid_google_play_services_apk_android">"找不到有效的 Google Play 服务。通知可能无法正常工作。"</string>
-  <string name="troubleshoot_notifications_test_blocked_users_description">"检查被阻止的用户"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_description">"检查被屏蔽的用户"</string>
   <string name="troubleshoot_notifications_test_blocked_users_quick_fix">"查看被屏蔽的用户"</string>
-  <string name="troubleshoot_notifications_test_blocked_users_result_none">"没有用户被阻止。"</string>
+  <string name="troubleshoot_notifications_test_blocked_users_result_none">"未屏蔽任何用户。"</string>
   <plurals name="troubleshoot_notifications_test_blocked_users_result_some">
-    <item quantity="other">"您已屏蔽 %1$d 位用户。您将不再收到这些用户的推送通知。"</item>
+    <item quantity="other">"你已屏蔽 %1$d 位用户。将不再收到这些用户的通知。"</item>
   </plurals>
   <string name="troubleshoot_notifications_test_blocked_users_title">"已屏蔽用户"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_description">"获取当前推送提供者的名称。"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_failure">"未选择任何推送提供者。"</string>
-  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"当前推送提供商：%1$s和当前分销商：%2$s . 但经销商%3$s未找到。应用程序可能已被卸载？"</string>
-  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"当前推送提供商：%1$s ，但尚未配置分销商。"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_distributor_not_found">"当前推送提供者：%1$s 及当前分发器：%2$s。但未找到分发器 %3$s。该 app 可能已被卸载？"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure_no_distributor">"当前推送提供者：%1$s ，但尚未配置分发器。"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_success">"当前推送提供者：%1$s。"</string>
-  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"当前推送提供商：%1$s （%2$s ）"</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success_with_distributor">"当前推送提供者：%1$s（%2$s）"</string>
   <string name="troubleshoot_notifications_test_current_push_provider_title">"当前推送提供者"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_description">"确保应用程序至少有一个推送提供者。"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_failure">"未找到推送提供者。"</string>
@@ -87,6 +89,6 @@
   <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"错误：%1$s。"</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"错误，无法测试推送。"</string>
   <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"错误，等待推送超时。"</string>
-  <string name="troubleshoot_notifications_test_push_loop_back_success">"推送回路耗时%1$d 毫秒。"</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"推送回路耗时 %1$d 毫秒。"</string>
   <string name="troubleshoot_notifications_test_push_loop_back_title">"测试推送回路"</string>
 </resources>
diff --git a/libraries/push/impl/src/main/res/values/localazy.xml b/libraries/push/impl/src/main/res/values/localazy.xml
index d680ffeb5a..1620408c15 100644
--- a/libraries/push/impl/src/main/res/values/localazy.xml
+++ b/libraries/push/impl/src/main/res/values/localazy.xml
@@ -30,6 +30,7 @@
   </plurals>
   <string name="notification_invite_body">"Invited you to chat"</string>
   <string name="notification_invite_body_with_sender">"%1$s invited you to chat"</string>
+  <string name="notification_live_location_started_body">"Started sharing their live location"</string>
   <string name="notification_mentioned_you_body">"Mentioned you: %1$s"</string>
   <string name="notification_new_messages">"New Messages"</string>
   <plurals name="notification_new_messages_for_room">
diff --git a/libraries/push/impl/src/main/sqldelight/migrations/2.sqm b/libraries/push/impl/src/main/sqldelight/migrations/2.sqm
new file mode 100644
index 0000000000..e7adfb091a
--- /dev/null
+++ b/libraries/push/impl/src/main/sqldelight/migrations/2.sqm
@@ -0,0 +1,2 @@
+-- Migrate DB from version 2
+-- Dummy migration to trigger a re-key
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriberTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriberTest.kt
index dd2cb24841..8cb1e2a7f6 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriberTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/DefaultPusherSubscriberTest.kt
@@ -103,6 +103,7 @@ class DefaultPusherSubscriberTest {
                         profileTag = DEFAULT_PUSHER_FILE_TAG + "_",
                         lang = "en",
                         defaultPayload = "{\"cs\":\"$A_SECRET\"}",
+                        append = false,
                     ),
                 )
             )
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt
index dd1dd7b74d..b3358ba97f 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/AndroidBatteryOptimizationTest.kt
@@ -16,12 +16,10 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.services.toolbox.api.intent.ExternalIntentLauncher
 import io.element.android.services.toolbox.test.intent.FakeExternalIntentLauncher
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class AndroidBatteryOptimizationTest {
+class AndroidBatteryOptimizationTest : RobolectricTest() {
     @Test
     fun `isIgnoringBatteryOptimizations should return false`() {
         val sut = createAndroidBatteryOptimization()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
index 04a65073f6..df9697b94f 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultActiveNotificationsProviderTest.kt
@@ -19,14 +19,12 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultActiveNotificationsProviderTest {
+class DefaultActiveNotificationsProviderTest : RobolectricTest() {
     private val notificationIdProvider = NotificationIdProvider
 
     @Test
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
index 3caec04add..408063712a 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
@@ -31,18 +31,16 @@ import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiable
 import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
 private const val A_ROOM_AVATAR = "mxc://roomAvatar"
 private const val A_USER_AVATAR_1 = "mxc://userAvatar1"
 private const val A_USER_AVATAR_2 = "mxc://userAvatar2"
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultBaseRoomGroupMessageCreatorTest {
+class DefaultBaseRoomGroupMessageCreatorTest : RobolectricTest() {
     @Test
     fun `test createRoomMessage with one Event`() = runTest {
         val sut = createRoomGroupMessageCreator()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
index 63b903a3f7..eedc107c67 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt
@@ -56,20 +56,17 @@ import io.element.android.libraries.push.impl.notifications.model.FallbackNotifi
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
-import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class DefaultNotifiableEventResolverTest {
+class DefaultNotifiableEventResolverTest : RobolectricTest() {
     @Test
     fun `resolve event no session`() = runTest {
         val sut = createDefaultNotifiableEventResolver(notificationService = null)
@@ -419,6 +416,27 @@ class DefaultNotifiableEventResolverTest {
         assertThat(result.getEvent(request)).isEqualTo(Result.success(expectedResult))
     }
 
+    @Test
+    fun `resolve live location share start`() = runTest {
+        val sut = createDefaultNotifiableEventResolver(
+            notificationResult = Result.success(
+                mapOf(
+                    AN_EVENT_ID to Result.success(aNotificationData(
+                        content = NotificationContent.StateEvent.BeaconInfo(
+                            senderId = A_USER_ID_2,
+                        ),
+                    ))
+                )
+            )
+        )
+        val request = aPushRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, "firebase")
+        val result = sut.resolveEvents(A_SESSION_ID, listOf(request))
+        val expectedResult = ResolvedPushEvent.Event(
+            aNotifiableMessageEvent(body = "Started sharing their live location")
+        )
+        assertThat(result.getEvent(request)).isEqualTo(Result.success(expectedResult))
+    }
+
     @Test
     fun `resolve RoomMemberContent invite room`() = runTest {
         val sut = createDefaultNotifiableEventResolver(
@@ -832,10 +850,10 @@ class DefaultNotifiableEventResolverTest {
         testNoResults(NotificationContent.MessageLike.KeyVerificationDone)
         testNoResults(NotificationContent.MessageLike.ReactionContent(relatedEventId = AN_EVENT_ID_2.value))
         testNoResults(NotificationContent.MessageLike.Sticker)
+        testNoResults(NotificationContent.MessageLike.Beacon)
         testNoResults(NotificationContent.StateEvent.PolicyRuleRoom)
         testNoResults(NotificationContent.StateEvent.PolicyRuleServer)
         testNoResults(NotificationContent.StateEvent.PolicyRuleUser)
-        testNoResults(NotificationContent.StateEvent.RoomAliases)
         testNoResults(NotificationContent.StateEvent.RoomAvatar)
         testNoResults(NotificationContent.StateEvent.RoomCanonicalAlias)
         testNoResults(NotificationContent.StateEvent.RoomCreate)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
index 04da6ef556..4e2685e63a 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManagerTest.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.graphics.Color
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.features.lockscreen.api.LockScreenService
+import io.element.android.features.lockscreen.test.FakeLockScreenService
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID_2
@@ -510,6 +512,7 @@ fun TestScope.createDefaultNotificationDrawerManager(
     enterpriseService: EnterpriseService = FakeEnterpriseService(),
     sessionObserver: SessionObserver = FakeSessionObserver(),
     analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
+    lockScreenService: LockScreenService = FakeLockScreenService(),
 ): DefaultNotificationDrawerManager {
     return DefaultNotificationDrawerManager(
         notificationDisplayer = notificationDisplayer,
@@ -530,6 +533,7 @@ fun TestScope.createDefaultNotificationDrawerManager(
         matrixClientProvider = matrixClientProvider,
         imageLoaderHolder = FakeImageLoaderHolder(),
         activeNotificationsProvider = activeNotificationsProvider,
+        lockScreenService = lockScreenService,
         sessionObserver = sessionObserver,
     )
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationResultProcessorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationResultProcessorTest.kt
index 5a0d95c017..91f29dd28e 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationResultProcessorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationResultProcessorTest.kt
@@ -8,9 +8,8 @@
 package io.element.android.libraries.push.impl.notifications
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.call.api.CallType
+import io.element.android.features.call.api.CallData
 import io.element.android.features.call.test.FakeElementCallEntryPoint
-import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -34,7 +33,6 @@ import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEv
 import io.element.android.libraries.push.impl.push.FakeMutableBatteryOptimizationStore
 import io.element.android.libraries.push.impl.push.FakeOnNotifiableEventReceived
 import io.element.android.libraries.push.impl.push.FakeOnRedactedEventReceived
-import io.element.android.libraries.push.impl.push.SyncOnNotifiableEvent
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStoreFactory
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.any
@@ -106,7 +104,7 @@ class DefaultNotificationResultProcessorTest {
     @Test
     fun `when ringing call PushData is received, the incoming call will be handled`() = runTest {
         val handleIncomingCallLambda = lambdaRecorder<
-            CallType.RoomCall,
+            CallData,
             EventId,
             UserId,
             String?,
@@ -142,7 +140,7 @@ class DefaultNotificationResultProcessorTest {
     fun `when notify call PushData is received, the incoming call will be treated as a normal notification`() = runTest {
         val onNotifiableEventsReceived = lambdaRecorder<List<NotifiableEvent>, Unit> {}
         val handleIncomingCallLambda = lambdaRecorder<
-            CallType.RoomCall,
+            CallData,
             EventId,
             UserId,
             String?,
@@ -178,7 +176,7 @@ class DefaultNotificationResultProcessorTest {
     fun `when notify call PushData is received, the incoming call will be treated as a normal notification even if notification are disabled`() = runTest {
         val onNotifiableEventsReceived = lambdaRecorder<List<NotifiableEvent>, Unit> {}
         val handleIncomingCallLambda = lambdaRecorder<
-            CallType.RoomCall,
+            CallData,
             EventId,
             UserId,
             String?,
@@ -289,8 +287,6 @@ class DefaultNotificationResultProcessorTest {
         userPushStoreFactory: FakeUserPushStoreFactory = FakeUserPushStoreFactory(),
         onRedactedEventReceived: (List<ResolvedPushEvent.Redaction>) -> Unit = {},
         onNotifiableEventsReceived: (List<NotifiableEvent>) -> Unit = {},
-        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
-        syncOnNotifiableEvent: SyncOnNotifiableEvent = {},
         elementCallEntryPoint: FakeElementCallEntryPoint = FakeElementCallEntryPoint(),
         notificationChannels: FakeNotificationChannels = FakeNotificationChannels(),
         coroutineScope: CoroutineScope = backgroundScope,
@@ -301,8 +297,6 @@ class DefaultNotificationResultProcessorTest {
         userPushStoreFactory = userPushStoreFactory,
         onRedactedEventReceived = FakeOnRedactedEventReceived(onRedactedEventReceived),
         onNotifiableEventReceived = FakeOnNotifiableEventReceived(onNotifiableEventsReceived),
-        featureFlagService = featureFlagService,
-        syncOnNotifiableEvent = syncOnNotifiableEvent,
         elementCallEntryPoint = elementCallEntryPoint,
         notificationChannels = notificationChannels,
         coroutineScope = coroutineScope,
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt
index 9bba1c32d3..e9f6b76b7a 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt
@@ -18,7 +18,6 @@ import io.element.android.libraries.matrix.test.notification.FakeNotificationSer
 import io.element.android.libraries.matrix.test.notification.aNotificationData
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDataFactory
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
index 0973ee69ce..f623214fc4 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultSummaryGroupMessageCreatorTest.kt
@@ -18,13 +18,11 @@ import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import io.element.android.tests.testutils.lambda.any
 import io.element.android.tests.testutils.lambda.nonNull
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultSummaryGroupMessageCreatorTest {
+class DefaultSummaryGroupMessageCreatorTest : RobolectricTest() {
     @Test
     fun `process notifications`() = runTest {
         val notificationCreator = FakeNotificationCreator()
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeCallNotificationEventResolver.kt
similarity index 87%
rename from libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt
rename to libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeCallNotificationEventResolver.kt
index f923d0c9fe..a1049683f5 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeCallNotificationEventResolver.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeCallNotificationEventResolver.kt
@@ -6,11 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.test.notifications
+package io.element.android.libraries.push.impl.notifications
 
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.notification.NotificationData
-import io.element.android.libraries.push.impl.notifications.CallNotificationEventResolver
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.tests.testutils.lambda.lambdaError
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
index a52eb16b07..fa77e2d761 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.room.IntentionalMention
 import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.timeline.MsgType
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_MESSAGE
@@ -48,6 +49,7 @@ import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
@@ -55,12 +57,8 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
 @ExperimentalCoroutinesApi
-@RunWith(RobolectricTestRunner::class)
-class NotificationBroadcastReceiverHandlerTest {
+class NotificationBroadcastReceiverHandlerTest : RobolectricTest() {
     private val actionIds = NotificationActionIds(aBuildMeta())
 
     @Test
@@ -341,9 +339,9 @@ class NotificationBroadcastReceiverHandlerTest {
 
     @Test
     fun `Test send reply`() = runTest {
-        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, MsgType, Boolean, Result<Unit>> { _, _, _, _, _ -> Result.success(Unit) }
         val replyMessage =
-            lambdaRecorder<EventId?, String, String?, List<IntentionalMention>, Boolean, Result<Unit>> { _, _, _, _, _ -> Result.success(Unit) }
+            lambdaRecorder<EventId?, String, String?, List<IntentionalMention>, Boolean, MsgType, Result<Unit>> { _, _, _, _, _, _ -> Result.success(Unit) }
         val liveTimeline = FakeTimeline().apply {
             sendMessageLambda = sendMessage
             replyMessageLambda = replyMessage
@@ -375,7 +373,13 @@ class NotificationBroadcastReceiverHandlerTest {
         advanceUntilIdle()
         sendMessage.assertions()
             .isCalledOnce()
-            .with(value(A_MESSAGE), value(null), value(emptyList<IntentionalMention>()))
+            .with(
+                value(A_MESSAGE),
+                value(null),
+                value(emptyList<IntentionalMention>()),
+                value(MsgType.MSG_TYPE_TEXT),
+                value(false),
+            )
         onNotifiableEventsReceivedResult.assertions()
             .isCalledOnce()
         replyMessage.assertions()
@@ -384,7 +388,7 @@ class NotificationBroadcastReceiverHandlerTest {
 
     @Test
     fun `Test send reply blank message`() = runTest {
-        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, MsgType, Boolean, Result<Unit>> { _, _, _, _, _ -> Result.success(Unit) }
         val liveTimeline = FakeTimeline().apply {
             sendMessageLambda = sendMessage
         }
@@ -408,9 +412,9 @@ class NotificationBroadcastReceiverHandlerTest {
 
     @Test
     fun `Test send reply to thread`() = runTest {
-        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, Result<Unit>> { _, _, _ -> Result.success(Unit) }
+        val sendMessage = lambdaRecorder<String, String?, List<IntentionalMention>, MsgType, Boolean, Result<Unit>> { _, _, _, _, _ -> Result.success(Unit) }
         val replyMessage =
-            lambdaRecorder<EventId?, String, String?, List<IntentionalMention>, Boolean, Result<Unit>> { _, _, _, _, _ -> Result.success(Unit) }
+            lambdaRecorder<EventId?, String, String?, List<IntentionalMention>, Boolean, MsgType, Result<Unit>> { _, _, _, _, _, _ -> Result.success(Unit) }
         val liveTimeline = FakeTimeline().apply {
             sendMessageLambda = sendMessage
             replyMessageLambda = replyMessage
@@ -453,7 +457,8 @@ class NotificationBroadcastReceiverHandlerTest {
                 value(A_MESSAGE),
                 value(null),
                 value(emptyList<IntentionalMention>()),
-                value(true)
+                value(true),
+                value(MsgType.MSG_TYPE_TEXT),
             )
     }
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
index f897388c66..1a46546db8 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationDataFactoryTest.kt
@@ -24,10 +24,9 @@ import io.element.android.libraries.push.impl.notifications.fixtures.aFallbackNo
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.aSimpleNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.fixtures.anInviteNotifiableEvent
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
 private val MY_AVATAR_URL: String? = null
 
@@ -36,8 +35,7 @@ private val A_SIMPLE_EVENT = aSimpleNotifiableEvent(eventId = AN_EVENT_ID)
 private val A_MESSAGE_EVENT = aNotifiableMessageEvent(eventId = AN_EVENT_ID, roomId = A_ROOM_ID)
 private val A_FALLBACK_EVENT = aFallbackNotifiableEvent()
 
-@RunWith(RobolectricTestRunner::class)
-class NotificationDataFactoryTest {
+class NotificationDataFactoryTest : RobolectricTest() {
     private val notificationCreator = FakeNotificationCreator()
     private val fakeRoomGroupMessageCreator = FakeRoomGroupMessageCreator()
     private val fakeSummaryGroupMessageCreator = FakeSummaryGroupMessageCreator()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
index 6ca19b7acc..43991444fe 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRendererTest.kt
@@ -32,10 +32,9 @@ import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
 private const val MY_USER_DISPLAY_NAME = "display-name"
 private const val MY_USER_AVATAR_URL = "avatar-url"
@@ -45,8 +44,7 @@ private val A_SUMMARY_NOTIFICATION = SummaryNotification.Update(A_NOTIFICATION)
 private val ONE_SHOT_NOTIFICATION =
     OneShotNotification(notification = A_NOTIFICATION, tag = "ignored", isNoisy = false, timestamp = -1)
 
-@RunWith(RobolectricTestRunner::class)
-class NotificationRendererTest {
+class NotificationRendererTest : RobolectricTest() {
     private val notificationDisplayer = FakeNotificationDisplayer()
 
     private val notificationCreator = FakeNotificationCreator()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/FakeNotificationChannels.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/FakeNotificationChannels.kt
index 194caf7287..94d7905f6a 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/FakeNotificationChannels.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/FakeNotificationChannels.kt
@@ -9,11 +9,19 @@
 package io.element.android.libraries.push.impl.notifications.channels
 
 import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeNotificationChannels(
     var channelForIncomingCall: (ring: Boolean) -> String = { _ -> "" },
     var channelIdForMessage: (sessionId: SessionId, noisy: Boolean) -> String = { _, _ -> "" },
-    var channelIdForTest: () -> String = { "" }
+    var channelIdForTest: () -> String = { "" },
+    // Side-effecting recreates default to lambdaError (matching FakeNotificationSoundUpdater) so a
+    // test that doesn't expect a channel rebuild loudly fails instead of silently swallowing the call.
+    var recreateNoisyChannelLambda: (sound: NotificationSound, version: Int) -> Unit = { _, _ -> lambdaError() },
+    var recreateRingingCallChannelLambda: (sound: NotificationSound, version: Int) -> Unit = { _, _ -> lambdaError() },
+    var readNoisyChannelSoundLambda: () -> NotificationSound? = { null },
+    var readRingingCallChannelSoundLambda: () -> NotificationSound? = { null },
 ) : NotificationChannels {
     override fun getChannelForIncomingCall(ring: Boolean): String {
         return channelForIncomingCall(ring)
@@ -26,4 +34,16 @@ class FakeNotificationChannels(
     override fun getChannelIdForTest(): String {
         return channelIdForTest()
     }
+
+    override fun recreateNoisyChannel(sound: NotificationSound, version: Int) {
+        recreateNoisyChannelLambda(sound, version)
+    }
+
+    override fun recreateRingingCallChannel(sound: NotificationSound, version: Int) {
+        recreateRingingCallChannelLambda(sound, version)
+    }
+
+    override suspend fun readNoisyChannelSound(): NotificationSound? = readNoisyChannelSoundLambda()
+
+    override suspend fun readRingingCallChannelSound(): NotificationSound? = readRingingCallChannelSoundLambda()
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannelsTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannelsTest.kt
index b004c35537..1df87232f5 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannelsTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannelsTest.kt
@@ -9,24 +9,29 @@
 package io.element.android.libraries.push.impl.notifications.channels
 
 import android.os.Build
+import android.provider.Settings
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.enterprise.test.FakeEnterpriseService
 import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.slot
 import io.mockk.verify
+import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
-@RunWith(RobolectricTestRunner::class)
-class NotificationChannelsTest {
+class NotificationChannelsTest : RobolectricTest() {
     @Test
     @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
     fun `init - creates notification channels and migrates old ones`() {
@@ -45,7 +50,7 @@ class NotificationChannelsTest {
         val notificationChannels = createNotificationChannels()
 
         val ringingChannel = notificationChannels.getChannelForIncomingCall(ring = true)
-        assertThat(ringingChannel).isEqualTo(RINGING_CALL_NOTIFICATION_CHANNEL_ID)
+        assertThat(ringingChannel).isEqualTo(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE)
 
         val normalChannel = notificationChannels.getChannelForIncomingCall(ring = false)
         assertThat(normalChannel).isEqualTo(CALL_NOTIFICATION_CHANNEL_ID)
@@ -59,7 +64,7 @@ class NotificationChannelsTest {
             ),
         )
         assertThat(notificationChannels.getChannelIdForMessage(sessionId = A_SESSION_ID, noisy = true))
-            .isEqualTo(NOISY_NOTIFICATION_CHANNEL_ID)
+            .isEqualTo(NOISY_NOTIFICATION_CHANNEL_ID_BASE)
         assertThat(notificationChannels.getChannelIdForMessage(sessionId = A_SESSION_ID, noisy = false))
             .isEqualTo(SILENT_NOTIFICATION_CHANNEL_ID)
     }
@@ -81,16 +86,418 @@ class NotificationChannelsTest {
     fun `getChannelIdForTest - returns the right channel`() {
         val notificationChannels = createNotificationChannels()
 
-        assertThat(notificationChannels.getChannelIdForTest()).isEqualTo(NOISY_NOTIFICATION_CHANNEL_ID)
+        assertThat(notificationChannels.getChannelIdForTest()).isEqualTo(NOISY_NOTIFICATION_CHANNEL_ID_BASE)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - reads persisted message version and seeds versioned channel id`() {
+        val notificationChannels = createNotificationChannels(
+            appPreferencesStore = InMemoryAppPreferencesStore(messageSoundChannelVersion = 3),
+            enterpriseService = FakeEnterpriseService(getNoisyNotificationChannelIdResult = { null }),
+        )
+        assertThat(notificationChannels.getChannelIdForTest()).isEqualTo("${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v3")
+        assertThat(notificationChannels.getChannelIdForMessage(sessionId = A_SESSION_ID, noisy = true))
+            .isEqualTo("${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v3")
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - reads persisted call ringtone version and seeds versioned channel id`() {
+        val notificationChannels = createNotificationChannels(
+            appPreferencesStore = InMemoryAppPreferencesStore(callRingtoneChannelVersion = 2),
+        )
+        assertThat(notificationChannels.getChannelForIncomingCall(ring = true))
+            .isEqualTo("${RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE}_v2")
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - creates new versioned channel and updates current id`() {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.Custom("content://media/internal/audio/media/42"), version = 7)
+
+        val expectedId = "${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v7"
+        assertThat(channels.getChannelIdForTest()).isEqualTo(expectedId)
+        verify { notificationManager.createNotificationChannel(match<NotificationChannelCompat> { it.id == expectedId }) }
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - Silent produces channel with no sound`() {
+        val captured = slot<NotificationChannelCompat>()
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { createNotificationChannel(capture(captured)) } returns Unit
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.Silent, version = 1)
+
+        // The last captured channel (the recreated one) should have a null sound and the new id.
+        assertThat(captured.captured.id).isEqualTo("${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v1")
+        assertThat(captured.captured.sound).isNull()
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - SystemDefault uses Android system notification URI`() {
+        val captured = slot<NotificationChannelCompat>()
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { createNotificationChannel(capture(captured)) } returns Unit
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.SystemDefault, version = 2)
+
+        assertThat(captured.captured.sound).isEqualTo(Settings.System.DEFAULT_NOTIFICATION_URI)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - ElementDefault uses bundled message URI`() {
+        val captured = slot<NotificationChannelCompat>()
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { createNotificationChannel(capture(captured)) } returns Unit
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.ElementDefault, version = 1)
+
+        assertThat(captured.captured.sound?.scheme).isEqualTo("android.resource")
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - ElementFade uses bundled fade URI`() {
+        val captured = slot<NotificationChannelCompat>()
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { createNotificationChannel(capture(captured)) } returns Unit
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.ElementFade, version = 1)
+
+        val context = RuntimeEnvironment.getApplication()
+        val expected = "android.resource://${context.packageName}/${io.element.android.libraries.push.impl.R.raw.element_fade}".toUri()
+        assertThat(captured.captured.sound).isEqualTo(expected)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateNoisyChannel - deletes prior versioned channels`() {
+        val priorChannel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { id } returns "${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v3"
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns listOf(priorChannel)
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.SystemDefault, version = 4)
+
+        verify { notificationManager.deleteNotificationChannel("${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v3") }
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateRingingCallChannel - creates new versioned channel and updates current id`() {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateRingingCallChannel(sound = NotificationSound.Custom("content://settings/system/ringtone"), version = 5)
+
+        val expectedId = "${RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE}_v5"
+        assertThat(channels.getChannelForIncomingCall(ring = true)).isEqualTo(expectedId)
+        verify { notificationManager.createNotificationChannel(match<NotificationChannelCompat> { it.id == expectedId }) }
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreateRingingCallChannel - Silent produces channel with no sound`() {
+        val captured = slot<NotificationChannelCompat>()
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { createNotificationChannel(capture(captured)) } returns Unit
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateRingingCallChannel(sound = NotificationSound.Silent, version = 1)
+
+        assertThat(captured.captured.id).isEqualTo("${RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE}_v1")
+        assertThat(captured.captured.sound).isNull()
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `recreate noisy then ringing produces both versioned channels with current ids`() {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        channels.recreateNoisyChannel(sound = NotificationSound.Custom("content://a"), version = 5)
+        channels.recreateRingingCallChannel(sound = NotificationSound.Custom("content://b"), version = 7)
+
+        // Each recreate updates the corresponding currentId independently — the lock guarding
+        // recreate* against itself does not interfere across the two channel families.
+        assertThat(channels.getChannelIdForTest()).isEqualTo("${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v5")
+        assertThat(channels.getChannelForIncomingCall(ring = true)).isEqualTo("${RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE}_v7")
+        verify { notificationManager.createNotificationChannel(match<NotificationChannelCompat> { it.id == "${NOISY_NOTIFICATION_CHANNEL_ID_BASE}_v5" }) }
+        verify {
+            notificationManager.createNotificationChannel(
+            match<NotificationChannelCompat> { it.id == "${RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE}_v7" }
+        )
+        }
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - returns Custom for non-default URI`() = runTest {
+        val customUri = "content://media/internal/audio/media/42".toUri()
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns customUri
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.Custom(customUri.toString()))
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - classifies the bundled message URI as ElementDefault`() = runTest {
+        val context = RuntimeEnvironment.getApplication()
+        val ourBundled = "android.resource://${context.packageName}/${io.element.android.libraries.push.impl.R.raw.message}".toUri()
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns ourBundled
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.ElementDefault)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - classifies the bundled fade URI as ElementFade`() = runTest {
+        val context = RuntimeEnvironment.getApplication()
+        val ourFade = "android.resource://${context.packageName}/${io.element.android.libraries.push.impl.R.raw.element_fade}".toUri()
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns ourFade
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.ElementFade)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - classifies DEFAULT_NOTIFICATION_URI as SystemDefault`() = runTest {
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns Settings.System.DEFAULT_NOTIFICATION_URI
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.SystemDefault)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - migrates legacy SystemDefault message sound to ElementDefault when version is 0`() = runTest {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            messageSound = NotificationSound.SystemDefault,
+            messageSoundChannelVersion = 0,
+        )
+
+        createNotificationChannels(
+            notificationManager = notificationManager,
+            appPreferencesStore = appPreferencesStore,
+        )
+
+        val config = appPreferencesStore.getNotificationSoundChannelConfig()
+        assertThat(config.messageSound).isEqualTo(NotificationSound.ElementDefault)
+        assertThat(config.messageSoundVersion).isEqualTo(1)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - migration is idempotent across multiple instantiations`() = runTest {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            messageSound = NotificationSound.SystemDefault,
+            messageSoundChannelVersion = 0,
+        )
+
+        // First boot: migrate.
+        createNotificationChannels(notificationManager = notificationManager, appPreferencesStore = appPreferencesStore)
+        val afterFirst = appPreferencesStore.getNotificationSoundChannelConfig()
+        assertThat(afterFirst.messageSound).isEqualTo(NotificationSound.ElementDefault)
+        assertThat(afterFirst.messageSoundVersion).isEqualTo(1)
+
+        // Second boot: gate (version == 0) no longer matches, so the version must not bump again.
+        createNotificationChannels(notificationManager = notificationManager, appPreferencesStore = appPreferencesStore)
+        val afterSecond = appPreferencesStore.getNotificationSoundChannelConfig()
+        assertThat(afterSecond.messageSound).isEqualTo(NotificationSound.ElementDefault)
+        assertThat(afterSecond.messageSoundVersion).isEqualTo(1)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - does not re-migrate when message version is non-zero`() = runTest {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            messageSound = NotificationSound.SystemDefault,
+            messageSoundChannelVersion = 5,
+        )
+
+        createNotificationChannels(
+            notificationManager = notificationManager,
+            appPreferencesStore = appPreferencesStore,
+        )
+
+        val config = appPreferencesStore.getNotificationSoundChannelConfig()
+        assertThat(config.messageSound).isEqualTo(NotificationSound.SystemDefault)
+        assertThat(config.messageSoundVersion).isEqualTo(5)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `init - does not migrate when persisted message sound is not SystemDefault`() = runTest {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+        }
+        val appPreferencesStore = InMemoryAppPreferencesStore(
+            messageSound = NotificationSound.Silent,
+            messageSoundChannelVersion = 0,
+        )
+
+        createNotificationChannels(
+            notificationManager = notificationManager,
+            appPreferencesStore = appPreferencesStore,
+        )
+
+        val config = appPreferencesStore.getNotificationSoundChannelConfig()
+        assertThat(config.messageSound).isEqualTo(NotificationSound.Silent)
+        assertThat(config.messageSoundVersion).isEqualTo(0)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - returns Silent when channel sound is null`() = runTest {
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns null
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.Silent)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readNoisyChannelSound - returns null when channel does not exist`() = runTest {
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID_BASE) } returns null
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readNoisyChannelSound()
+
+        assertThat(result).isNull()
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readRingingCallChannelSound - returns SystemDefault when channel sound matches DEFAULT_RINGTONE_URI`() = runTest {
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns Settings.System.DEFAULT_RINGTONE_URI
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readRingingCallChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.SystemDefault)
+    }
+
+    @Test
+    @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+    fun `readRingingCallChannelSound - returns Custom for non-default URI`() = runTest {
+        val customUri = "content://media/external/audio/media/9001".toUri()
+        val channel = mockk<android.app.NotificationChannel>(relaxed = true) {
+            every { sound } returns customUri
+        }
+        val notificationManager = mockk<NotificationManagerCompat>(relaxed = true) {
+            every { notificationChannels } returns emptyList()
+            every { getNotificationChannel(RINGING_CALL_NOTIFICATION_CHANNEL_ID_BASE) } returns channel
+        }
+        val channels = createNotificationChannels(notificationManager = notificationManager)
+
+        val result = channels.readRingingCallChannelSound()
+
+        assertThat(result).isEqualTo(NotificationSound.Custom(customUri.toString()))
     }
 
     private fun createNotificationChannels(
         notificationManager: NotificationManagerCompat = mockk(relaxed = true),
         enterpriseService: EnterpriseService = FakeEnterpriseService(),
+        // Default to ElementDefault so the legacy `(SystemDefault, version=0)` migration gate
+        // doesn't fire and silently rewrite the prefs store. Tests that exercise the migration
+        // construct their own store explicitly.
+        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(messageSound = NotificationSound.ElementDefault),
     ) = DefaultNotificationChannels(
         notificationManager = notificationManager,
         stringProvider = FakeStringProvider(),
         context = RuntimeEnvironment.getApplication(),
         enterpriseService = enterpriseService,
+        appPreferencesStore = appPreferencesStore,
     )
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationServiceTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationServiceTest.kt
index d4d7713c2d..41e601c50d 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationServiceTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationServiceTest.kt
@@ -26,18 +26,15 @@ import io.element.android.libraries.push.impl.notifications.factories.FakeIntent
 import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
 import io.element.android.libraries.push.test.notifications.push.FakeNotificationBitmapLoader
 import io.element.android.libraries.sessionstorage.test.observer.FakeSessionObserver
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-
-@RunWith(RobolectricTestRunner::class)
 @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
-class DefaultNotificationConversationServiceTest {
+class DefaultNotificationConversationServiceTest : RobolectricTest() {
     @Test
     fun `onSendMessage adds a shortcut`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
index c58a29d866..38b387a180 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/factories/DefaultNotificationCreatorTest.kt
@@ -45,14 +45,12 @@ import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvid
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultNotificationCreatorTest {
+class DefaultNotificationCreatorTest : RobolectricTest() {
     @Test
     fun `test createDiagnosticNotification`() {
         val sut = createNotificationCreator()
@@ -373,10 +371,12 @@ fun createNotificationChannels(
     enterpriseService: EnterpriseService = FakeEnterpriseService(),
 ): NotificationChannels {
     val context = RuntimeEnvironment.getApplication()
+    val notificationManagerCompat = NotificationManagerCompat.from(context)
     return DefaultNotificationChannels(
-        notificationManager = NotificationManagerCompat.from(context),
+        notificationManager = notificationManagerCompat,
         stringProvider = FakeStringProvider(""),
         context = context,
         enterpriseService = enterpriseService,
+        appPreferencesStore = io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore(),
     )
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
index 33071ef1ac..a0c233bc39 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fake/FakeNotificationCreator.kt
@@ -57,7 +57,17 @@ class FakeNotificationCreator(
         events: List<NotifiableMessageEvent>,
     ): Notification {
         return createMessagesListNotificationResult(
-            listOf(notificationAccountParams, roomInfo, threadId, largeIcon, lastMessageTimestamp, tickerText, existingNotification, imageLoader, events)
+            listOf(
+                notificationAccountParams,
+                roomInfo,
+                threadId,
+                largeIcon,
+                lastMessageTimestamp,
+                tickerText,
+                existingNotification,
+                imageLoader,
+                events,
+            )
         )
     }
 
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopierTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopierTest.kt
new file mode 100644
index 0000000000..e57829b218
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/sound/DefaultNotificationSoundCopierTest.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.notifications.sound
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+import org.robolectric.RuntimeEnvironment
+
+class DefaultNotificationSoundCopierTest : RobolectricTest() {
+    private val context: Context get() = RuntimeEnvironment.getApplication()
+
+    @Test
+    fun `sanitizeDisplayName - trims surrounding whitespace`() {
+        assertThat(sanitizeDisplayName("  Hello World  ")).isEqualTo("Hello World")
+    }
+
+    @Test
+    fun `sanitizeDisplayName - DEL and control characters are dropped`() {
+        // Build the raw string programmatically — embedding control chars as source-file bytes
+        // doesn't survive editor / tool round-tripping reliably.
+        val bel = 0x07.toChar()
+        val tab = 0x09.toChar()
+        val newline = 0x0A.toChar()
+        val del = 0x7F.toChar()
+        val raw = "${bel}Hello$tab${newline}World$del"
+        assertThat(sanitizeDisplayName(raw)).isEqualTo("HelloWorld")
+    }
+
+    @Test
+    fun `sanitizeDisplayName - truncates oversized input to 256 chars`() {
+        val long = "x".repeat(500)
+        val sanitized = sanitizeDisplayName(long)
+        assertThat(sanitized).isNotNull()
+        assertThat(sanitized!!.length).isEqualTo(256)
+    }
+
+    @Test
+    fun `sanitizeDisplayName - returns null when nothing survives sanitization`() {
+        assertThat(sanitizeDisplayName("")).isNull()
+        assertThat(sanitizeDisplayName("    ")).isNull()
+        val controls = (0..0x1F).joinToString(separator = "") { it.toChar().toString() } + 0x7F.toChar()
+        assertThat(sanitizeDisplayName(controls)).isNull()
+    }
+
+    @Test
+    fun `sanitizeDisplayName - preserves unicode beyond ASCII`() {
+        val input = "Element Tone " + 0x266A.toChar()
+        assertThat(sanitizeDisplayName(input)).isEqualTo(input)
+    }
+
+    @Test
+    fun `copyToAppFiles - rejects file scheme`() = runTest {
+        val copier = DefaultNotificationSoundCopier(context)
+        val result = copier.copyToAppFiles("file:///tmp/evil.mp3", NotificationSoundCopier.SoundSlot.Message)
+        assertThat(result).isEqualTo(NotificationSoundCopier.CopyResult.UnplayableSource)
+    }
+
+    @Test
+    fun `copyToAppFiles - rejects http scheme`() = runTest {
+        val copier = DefaultNotificationSoundCopier(context)
+        val result = copier.copyToAppFiles("https://attacker.example.com/sound.mp3", NotificationSoundCopier.SoundSlot.Call)
+        assertThat(result).isEqualTo(NotificationSoundCopier.CopyResult.UnplayableSource)
+    }
+
+    @Test
+    fun `copyToAppFiles - rejects URI without a scheme`() = runTest {
+        val copier = DefaultNotificationSoundCopier(context)
+        val result = copier.copyToAppFiles("not-a-real-uri", NotificationSoundCopier.SoundSlot.Message)
+        assertThat(result).isEqualTo(NotificationSoundCopier.CopyResult.UnplayableSource)
+    }
+}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManagerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManagerTest.kt
new file mode 100644
index 0000000000..2c0ca8e854
--- /dev/null
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultFetchPushForegroundServiceManagerTest.kt
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.impl.push
+
+import android.app.ActivityManager
+import android.content.ComponentName
+import android.content.Context.ACTIVITY_SERVICE
+import android.content.Context.POWER_SERVICE
+import android.os.PowerManager
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.common.truth.Truth.assertThat
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.coroutines.async
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withTimeout
+import org.junit.Test
+import org.robolectric.Shadows
+import org.robolectric.shadows.ShadowActivityManager
+import org.robolectric.shadows.ShadowPowerManager
+import kotlin.time.Duration.Companion.seconds
+
+class DefaultFetchPushForegroundServiceManagerTest : RobolectricTest() {
+    @Test
+    fun `start should start the service if the device is not interactive`() {
+        val manager = createDefaultFetchPushForegroundServiceManager()
+
+        getShadowPowerManager().turnScreenOn(false)
+
+        assertThat(manager.start()).isTrue()
+    }
+
+    @Test
+    fun `start won't start the service if the device is interactive`() {
+        val manager = createDefaultFetchPushForegroundServiceManager()
+
+        getShadowPowerManager().turnScreenOn(true)
+
+        assertThat(manager.start()).isFalse()
+    }
+
+    @Test
+    fun `stop will stop the service if it's running`() = runTest {
+        val manager = createDefaultFetchPushForegroundServiceManager()
+
+        // Start the service first
+        getShadowPowerManager().turnScreenOn(false)
+        manager.start()
+
+        getShadowActivityManager().setServices(
+            listOf(
+                ActivityManager.RunningServiceInfo().apply {
+                    service = ComponentName(InstrumentationRegistry.getInstrumentation().context, FetchPushForegroundService::class.java)
+                    foreground = true
+                }
+            )
+        )
+
+        assertThat(manager.stop()).isTrue()
+    }
+
+    @Test
+    fun `stop will eventually stop the service once it's on foreground`() = runTest {
+        val manager = createDefaultFetchPushForegroundServiceManager()
+
+        // Start the service first
+        getShadowPowerManager().turnScreenOn(false)
+        manager.start()
+
+        // The service is started, but not yet in foreground
+        getShadowActivityManager().setServices(
+            listOf(
+                ActivityManager.RunningServiceInfo().apply {
+                    service = ComponentName(InstrumentationRegistry.getInstrumentation().context, FetchPushForegroundService::class.java)
+                    foreground = false
+                }
+            )
+        )
+
+        // We call stop, which won't stop the service yet since it's not in foreground
+        val future = async { manager.stop() }
+
+        // Then we set the service as running in foreground, which should allow the stop to complete
+        getShadowActivityManager().setServices(
+            listOf(
+                ActivityManager.RunningServiceInfo().apply {
+                    service = ComponentName(InstrumentationRegistry.getInstrumentation().context, FetchPushForegroundService::class.java)
+                    foreground = true
+                }
+            )
+        )
+
+        val stopped = withTimeout(5.seconds) { future.await() }
+        assertThat(stopped).isTrue()
+    }
+
+    @Test
+    fun `stop will not stop the service if it's stopped`() = runTest {
+        val manager = createDefaultFetchPushForegroundServiceManager()
+
+        // Set some fake running service data, even if the service is not really running
+        getShadowActivityManager().setServices(
+            listOf(
+                ActivityManager.RunningServiceInfo().apply {
+                    service = ComponentName(InstrumentationRegistry.getInstrumentation().context, FetchPushForegroundService::class.java)
+                    foreground = true
+                }
+            )
+        )
+
+        // Since the service was not really running, it was not stopped
+        assertThat(manager.stop()).isFalse()
+    }
+
+    private fun createDefaultFetchPushForegroundServiceManager() = DefaultFetchPushForegroundServiceManager(
+        context = InstrumentationRegistry.getInstrumentation().context,
+    )
+
+    private fun getShadowPowerManager(): ShadowPowerManager {
+        val powerManager = InstrumentationRegistry.getInstrumentation().context.getSystemService(POWER_SERVICE) as PowerManager
+        return Shadows.shadowOf(powerManager)
+    }
+
+    private fun getShadowActivityManager(): ShadowActivityManager {
+        val activityManager = InstrumentationRegistry.getInstrumentation().context.getSystemService(ACTIVITY_SERVICE) as ActivityManager
+        return Shadows.shadowOf(activityManager)
+    }
+}
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultOnRedactedEventReceivedTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultOnRedactedEventReceivedTest.kt
index 2bab4c14c2..8c7f9e0454 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultOnRedactedEventReceivedTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultOnRedactedEventReceivedTest.kt
@@ -30,15 +30,13 @@ import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEv
 import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultOnRedactedEventReceivedTest {
+class DefaultOnRedactedEventReceivedTest : RobolectricTest() {
     private val fakePerson = Person.Builder().setName(A_USER_NAME).setKey(A_USER_ID.value).build()
     private val fakeMessage = NotificationCompat.MessagingStyle.Message("A message", 0L, fakePerson).also {
         it.extras.putString(DefaultNotificationCreator.MESSAGE_EVENT_ID, AN_EVENT_ID.value)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
index cc6e4674f9..f0dee4446c 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
@@ -11,6 +11,7 @@
 package io.element.android.libraries.push.impl.push
 
 import app.cash.turbine.test
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -26,8 +27,8 @@ import io.element.android.libraries.push.impl.history.PushHistoryService
 import io.element.android.libraries.push.impl.notifications.FakeNotificationResultProcessor
 import io.element.android.libraries.push.impl.test.DefaultTestPush
 import io.element.android.libraries.push.impl.troubleshoot.DiagnosticPushHandler
+import io.element.android.libraries.push.impl.workmanager.FakeSyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.push.impl.workmanager.SyncPendingNotificationsRequestBuilder
-import io.element.android.libraries.push.test.workmanager.FakeSyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStore
@@ -40,7 +41,9 @@ import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
@@ -212,7 +215,7 @@ class DefaultPushHandlerTest {
             .isCalledOnce()
     }
 
-    private fun createDefaultPushHandler(
+    private fun TestScope.createDefaultPushHandler(
         incrementPushCounterResult: () -> Unit = { lambdaError() },
         userPushStore: FakeUserPushStore = FakeUserPushStore(),
         pushClientSecret: PushClientSecret = FakePushClientSecret(),
@@ -227,6 +230,7 @@ class DefaultPushHandlerTest {
             start = {},
             stop = {},
         ),
+        dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
     ): DefaultPushHandler {
         return DefaultPushHandler(
             incrementPushDataStore = object : IncrementPushDataStore {
@@ -246,7 +250,8 @@ class DefaultPushHandlerTest {
             resultProcessor = resultProcessor,
             syncPendingNotificationsRequestFactory = SyncPendingNotificationsRequestBuilder.Factory {
                 FakeSyncPendingNotificationsRequestBuilder()
-            }
+            },
+            dispatchers = dispatchers,
         )
     }
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt
index 796d5d192f..49d0d12ec8 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt
@@ -8,7 +8,6 @@
 package io.element.android.libraries.push.impl.workmanager
 
 import android.net.NetworkCapabilities
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.work.OneTimeWorkRequest
 import androidx.work.hasKeyWithValueOfType
 import com.google.common.truth.Truth.assertThat
@@ -21,14 +20,13 @@ import io.element.android.libraries.workmanager.api.WorkManagerRequestType
 import io.element.android.libraries.workmanager.api.WorkManagerWorkerType
 import io.element.android.libraries.workmanager.api.workManagerTag
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
 @Config(sdk = [33])
-@RunWith(AndroidJUnit4::class)
-class DefaultSyncPendingNotificationsRequestBuilderTest {
+class DefaultSyncPendingNotificationsRequestBuilderTest : RobolectricTest() {
     @Test
     fun `build - success API 33`() = runTest {
         val request = createSyncPendingNotificationsRequestBuilder(
@@ -80,6 +78,9 @@ class DefaultSyncPendingNotificationsRequestBuilderTest {
             sessionId = A_SESSION_ID,
             sdkVersion = 33,
             isInAirGapEnvironment = false,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(
+                FeatureFlags.ValidateNetworkWhenSchedulingNotificationFetching.key to true
+            )),
         )
 
         val results = request.build()
@@ -100,6 +101,9 @@ class DefaultSyncPendingNotificationsRequestBuilderTest {
             sessionId = A_SESSION_ID,
             sdkVersion = 33,
             isInAirGapEnvironment = true,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(
+                FeatureFlags.ValidateNetworkWhenSchedulingNotificationFetching.key to true
+            )),
         )
 
         val results = request.build()
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt
similarity index 78%
rename from libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt
rename to libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt
index ef0e38991e..f2da936b87 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt
@@ -5,9 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.test.workmanager
+package io.element.android.libraries.push.impl.workmanager
 
-import io.element.android.libraries.push.impl.workmanager.SyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.workmanager.api.WorkManagerRequestWrapper
 
 class FakeSyncPendingNotificationsRequestBuilder(
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationWorkerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationWorkerTest.kt
index 8168019a99..889fb878d2 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationWorkerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchPendingNotificationWorkerTest.kt
@@ -8,7 +8,6 @@
 
 package io.element.android.libraries.push.impl.workmanager
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.work.Data
 import androidx.work.ListenableWorker
@@ -28,18 +27,18 @@ import io.element.android.libraries.push.impl.notifications.FakeNotificationResu
 import io.element.android.libraries.push.impl.notifications.fixtures.aPushRequest
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
 import io.element.android.libraries.push.impl.push.SyncOnNotifiableEvent
-import io.element.android.libraries.push.test.push.FakePushHandlingWakeLock
+import io.element.android.libraries.push.test.push.FakeFetchPushForegroundServiceManager
 import io.element.android.libraries.workmanager.api.WorkManagerRequestBuilder
 import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
 import java.util.UUID
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
@@ -48,8 +47,7 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.Instant
 
 @OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(AndroidJUnit4::class)
-class FetchPendingNotificationWorkerTest {
+class FetchPendingNotificationWorkerTest : RobolectricTest() {
     @Test
     fun `test - success`() = runTest {
         var synced = false
@@ -239,7 +237,7 @@ class FetchPendingNotificationWorkerTest {
         pushHistoryService: FakePushHistoryService = FakePushHistoryService(),
         resultProcessor: FakeNotificationResultProcessor = FakeNotificationResultProcessor(),
         systemClock: FakeSystemClock = FakeSystemClock(),
-        pushHandlingWakeLock: FakePushHandlingWakeLock = FakePushHandlingWakeLock(),
+        pushHandlingWakeLock: FakeFetchPushForegroundServiceManager = FakeFetchPushForegroundServiceManager(),
     ) = FetchPendingNotificationsWorker(
         params = createWorkerParams(workDataOf("session_id" to input)),
         context = InstrumentationRegistry.getInstrumentation().context,
@@ -250,7 +248,7 @@ class FetchPendingNotificationWorkerTest {
         pushHistoryService = pushHistoryService,
         resultProcessor = resultProcessor,
         systemClock = systemClock,
-        pushHandlingWakeLock = pushHandlingWakeLock,
+        fetchPushForegroundServiceManager = pushHandlingWakeLock,
     )
 
     private fun TestScope.createWorkerParams(
diff --git a/libraries/push/test/build.gradle.kts b/libraries/push/test/build.gradle.kts
index 475d4a4ae5..d125a2387e 100644
--- a/libraries/push/test/build.gradle.kts
+++ b/libraries/push/test/build.gradle.kts
@@ -18,8 +18,8 @@ dependencies {
     api(projects.libraries.push.api)
     api(projects.libraries.pushproviders.api)
     implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.push.impl)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.preferences.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.workmanager.api)
     implementation(projects.tests.testutils)
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationSoundUpdater.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationSoundUpdater.kt
new file mode 100644
index 0000000000..1bbd410aec
--- /dev/null
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeNotificationSoundUpdater.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.test.notifications
+
+import io.element.android.libraries.preferences.api.store.NotificationSound
+import io.element.android.libraries.push.api.notifications.NotificationSoundUpdater
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeNotificationSoundUpdater(
+    private val recreateNoisyChannelLambda: (sound: NotificationSound, version: Int) -> Unit = { _, _ -> lambdaError() },
+    private val recreateRingingCallChannelLambda: (sound: NotificationSound, version: Int) -> Unit = { _, _ -> lambdaError() },
+    private val readNoisyChannelSoundLambda: () -> NotificationSound? = { null },
+    private val readRingingCallChannelSoundLambda: () -> NotificationSound? = { null },
+) : NotificationSoundUpdater {
+    override fun recreateNoisyChannel(sound: NotificationSound, version: Int) {
+        recreateNoisyChannelLambda(sound, version)
+    }
+
+    override fun recreateRingingCallChannel(sound: NotificationSound, version: Int) {
+        recreateRingingCallChannelLambda(sound, version)
+    }
+
+    override suspend fun readNoisyChannelSound(): NotificationSound? = readNoisyChannelSoundLambda()
+
+    override suspend fun readRingingCallChannelSound(): NotificationSound? = readRingingCallChannelSoundLambda()
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeSoundDisplayNameResolver.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeSoundDisplayNameResolver.kt
new file mode 100644
index 0000000000..69bb77b65c
--- /dev/null
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/FakeSoundDisplayNameResolver.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.test.notifications
+
+import io.element.android.libraries.push.api.notifications.SoundDisplayNameResolver
+
+class FakeSoundDisplayNameResolver(
+    // Default resolves to a non-null sentinel so a default-constructed fake doesn't masquerade
+    // as "every Custom URI is unresolvable" — that would trip mid-session detection paths in
+    // every test that uses default fakes. Tests that need the unavailable case pass `{ null }`.
+    private val resolveLambda: suspend (uri: String) -> String? = { "FakeRingtoneTitle" },
+) : SoundDisplayNameResolver {
+    override suspend fun resolveCustomSoundTitle(uri: String): String? = resolveLambda(uri)
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/conversations/FakeNotificationConversationService.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/conversations/FakeNotificationConversationService.kt
index 0c8d870448..a2022ea22d 100644
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/conversations/FakeNotificationConversationService.kt
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/conversations/FakeNotificationConversationService.kt
@@ -16,7 +16,7 @@ class FakeNotificationConversationService : NotificationConversationService {
     override suspend fun onSendMessage(
         sessionId: SessionId,
         roomId: RoomId,
-        roomName: String,
+        roomName: String?,
         roomIsDirect: Boolean,
         roomAvatarUrl: String?,
     ) = Unit
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/sound/FakeNotificationSoundCopier.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/sound/FakeNotificationSoundCopier.kt
new file mode 100644
index 0000000000..9fe88b7718
--- /dev/null
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/notifications/sound/FakeNotificationSoundCopier.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.test.notifications.sound
+
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.CopyResult
+import io.element.android.libraries.push.api.notifications.sound.NotificationSoundCopier.SoundSlot
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeNotificationSoundCopier(
+    private val copyLambda: (String, SoundSlot) -> CopyResult = { _, _ -> lambdaError() },
+    private val deleteStoredSoundForLambda: (SoundSlot) -> Unit = {},
+) : NotificationSoundCopier {
+    override suspend fun copyToAppFiles(sourceUriString: String, slot: SoundSlot): CopyResult = copyLambda(sourceUriString, slot)
+
+    override suspend fun deleteStoredSoundFor(slot: SoundSlot) {
+        deleteStoredSoundForLambda(slot)
+    }
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakeFetchPushForegroundServiceManager.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakeFetchPushForegroundServiceManager.kt
new file mode 100644
index 0000000000..d0128b4a09
--- /dev/null
+++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakeFetchPushForegroundServiceManager.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.push.test.push
+
+import io.element.android.libraries.push.api.push.FetchPushForegroundServiceManager
+
+class FakeFetchPushForegroundServiceManager(
+    private val lock: () -> Boolean = { true },
+    private val unlock: () -> Boolean = { true },
+) : FetchPushForegroundServiceManager {
+    override fun start(): Boolean {
+        return lock.invoke()
+    }
+
+    override suspend fun stop(): Boolean {
+        return unlock.invoke()
+    }
+}
diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakePushHandlingWakeLock.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakePushHandlingWakeLock.kt
deleted file mode 100644
index 925581db9b..0000000000
--- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/push/FakePushHandlingWakeLock.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2026 Element Creations Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.push.test.push
-
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
-import kotlin.time.Duration
-
-class FakePushHandlingWakeLock(
-    private val lock: (time: Duration) -> Unit = {},
-    private val unlock: () -> Unit = {},
-) : PushHandlingWakeLock {
-    override fun lock(time: Duration) {
-        lock.invoke(time)
-    }
-
-    override fun unlock() {
-        unlock.invoke()
-    }
-}
diff --git a/libraries/pushproviders/firebase/build.gradle.kts b/libraries/pushproviders/firebase/build.gradle.kts
index 49ce7135d5..1a8e73a4da 100644
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@@ -11,6 +11,8 @@
 import config.BuildTimeConfig
 import extension.setupDependencyInjection
 import extension.testCommonDependencies
+import org.gradle.kotlin.dsl.withType
+import org.sonarqube.gradle.SonarResolverTask
 
 plugins {
     id("io.element.android-library")
@@ -19,6 +21,10 @@ plugins {
 android {
     namespace = "io.element.android.libraries.pushproviders.firebase"
 
+    buildFeatures {
+        resValues = true
+    }
+
     buildTypes {
         getByName("release") {
             consumerProguardFiles("consumer-proguard-rules.pro")
@@ -47,6 +53,11 @@ android {
     }
 }
 
+// Configure the SonarQube plugin to wait for the resource generation tasks to complete before running the analysis.
+tasks.withType<SonarResolverTask>().configureEach {
+    dependsOn("generateDebugResValues", "generateDebugAndroidTestResValues")
+}
+
 setupDependencyInjection()
 
 dependencies {
@@ -57,6 +68,7 @@ dependencies {
     implementation(projects.libraries.di)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.push.api)
+    implementation(projects.libraries.sessionStorage.api)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.troubleshoot.api)
     implementation(projects.services.toolbox.api)
diff --git a/libraries/pushproviders/firebase/src/main/AndroidManifest.xml b/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
index 24bad30d77..9a6972e412 100644
--- a/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
+++ b/libraries/pushproviders/firebase/src/main/AndroidManifest.xml
@@ -7,6 +7,10 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
+        <meta-data
+            android:name="firebase_messaging_installation_id_enabled"
+            android:value="true" />
+
         <!-- Firebase components -->
         <meta-data
             android:name="firebase_analytics_collection_deactivated"
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewInstallationIdHandler.kt
similarity index 81%
rename from libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
rename to libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewInstallationIdHandler.kt
index 72977afa3b..b04874cbbf 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewTokenHandler.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseNewInstallationIdHandler.kt
@@ -20,26 +20,26 @@ import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.api.toUserList
 import timber.log.Timber
 
-private val loggerTag = LoggerTag("FirebaseNewTokenHandler", LoggerTag.PushLoggerTag)
+private val loggerTag = LoggerTag("FirebaseNewInstallationIdHandler", LoggerTag.PushLoggerTag)
 
 /**
- * Handle new token receive from Firebase. Will update all the sessions which are using Firebase as a push provider.
+ * Handle new installationId received from Firebase. Will update all the sessions which are using Firebase as a push provider.
  */
-interface FirebaseNewTokenHandler {
-    suspend fun handle(firebaseToken: String)
+interface FirebaseNewInstallationIdHandler {
+    suspend fun handle(installationId: String)
 }
 
 @ContributesBinding(AppScope::class)
-class DefaultFirebaseNewTokenHandler(
+class DefaultFirebaseNewInstallationIdHandler(
     private val pusherSubscriber: PusherSubscriber,
     private val sessionStore: SessionStore,
     private val userPushStoreFactory: UserPushStoreFactory,
     private val matrixClientProvider: MatrixClientProvider,
     private val firebaseStore: FirebaseStore,
     private val firebaseGatewayProvider: FirebaseGatewayProvider,
-) : FirebaseNewTokenHandler {
-    override suspend fun handle(firebaseToken: String) {
-        firebaseStore.storeFcmToken(firebaseToken)
+) : FirebaseNewInstallationIdHandler {
+    override suspend fun handle(installationId: String) {
+        firebaseStore.storeInstallationId(installationId)
         // Register the pusher for all the sessions
         sessionStore.getAllSessions().toUserList()
             .map { SessionId(it) }
@@ -55,7 +55,7 @@ class DefaultFirebaseNewTokenHandler(
                             pusherSubscriber
                                 .registerPusher(
                                     matrixClient = client,
-                                    pushKey = firebaseToken,
+                                    pushKey = installationId,
                                     gateway = firebaseGatewayProvider.getFirebaseGateway(),
                                 )
                                 .onFailure {
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
index fdb886bd90..a365a2d6b9 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProvider.kt
@@ -26,7 +26,7 @@ class FirebasePushProvider(
     private val firebaseStore: FirebaseStore,
     private val pusherSubscriber: PusherSubscriber,
     private val isPlayServiceAvailable: IsPlayServiceAvailable,
-    private val firebaseTokenRotator: FirebaseTokenRotator,
+    private val rotateFirebaseSession: RotateFirebaseSession,
     private val firebaseGatewayProvider: FirebaseGatewayProvider,
 ) : PushProvider {
     override val index = FirebaseConfig.INDEX
@@ -40,7 +40,7 @@ class FirebasePushProvider(
     }
 
     override suspend fun registerWith(matrixClient: MatrixClient, distributor: Distributor): Result<Unit> {
-        val pushKey = firebaseStore.getFcmToken() ?: return Result.failure<Unit>(
+        val pushKey = firebaseStore.getInstallationId() ?: return Result.failure<Unit>(
             IllegalStateException(
                 "Unable to register pusher, Firebase token is not known."
             )
@@ -59,7 +59,7 @@ class FirebasePushProvider(
     override suspend fun getCurrentDistributor(sessionId: SessionId) = firebaseDistributor
 
     override suspend fun unregister(matrixClient: MatrixClient): Result<Unit> {
-        val pushKey = firebaseStore.getFcmToken()
+        val pushKey = firebaseStore.getInstallationId()
         return if (pushKey == null) {
             Timber.tag(loggerTag.value).w("Unable to unregister pusher, Firebase token is not known.")
             Result.success(Unit)
@@ -74,7 +74,7 @@ class FirebasePushProvider(
     override suspend fun onSessionDeleted(sessionId: SessionId) = Unit
 
     override suspend fun getPushConfig(sessionId: SessionId): Config? {
-        return firebaseStore.getFcmToken()?.let { fcmToken ->
+        return firebaseStore.getInstallationId()?.let { fcmToken ->
             Config(
                 url = firebaseGatewayProvider.getFirebaseGateway(),
                 pushKey = fcmToken
@@ -85,7 +85,7 @@ class FirebasePushProvider(
     override fun canRotateToken(): Boolean = true
 
     override suspend fun rotateToken(): Result<Unit> {
-        return firebaseTokenRotator.rotate()
+        return rotateFirebaseSession()
     }
 
     companion object {
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt
index 1f6a4709cc..748d540a54 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseStore.kt
@@ -18,28 +18,28 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 
 /**
- * This class store the Firebase token in SharedPrefs.
+ * This class stores the Firebase installationId in SharedPrefs.
  */
 interface FirebaseStore {
-    fun getFcmToken(): String?
-    fun fcmTokenFlow(): Flow<String?>
-    fun storeFcmToken(token: String?)
+    fun getInstallationId(): String?
+    fun fcmInstallationIdFlow(): Flow<String?>
+    fun storeInstallationId(installationId: String?)
 }
 
 @ContributesBinding(AppScope::class)
 class SharedPreferencesFirebaseStore(
     private val sharedPreferences: SharedPreferences,
 ) : FirebaseStore {
-    override fun getFcmToken(): String? {
-        return sharedPreferences.getString(PREFS_KEY_FCM_TOKEN, null)
+    override fun getInstallationId(): String? {
+        return sharedPreferences.getString(PREFS_KEY_FCM_INSTALLATION_ID, null)
     }
 
-    override fun fcmTokenFlow(): Flow<String?> {
-        val flow = MutableStateFlow(getFcmToken())
+    override fun fcmInstallationIdFlow(): Flow<String?> {
+        val flow = MutableStateFlow(getInstallationId())
         val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, k ->
-            if (k == PREFS_KEY_FCM_TOKEN) {
+            if (k == PREFS_KEY_FCM_INSTALLATION_ID) {
                 try {
-                    flow.value = getFcmToken()
+                    flow.value = getInstallationId()
                 } catch (_: Exception) {
                     flow.value = null
                 }
@@ -50,13 +50,13 @@ class SharedPreferencesFirebaseStore(
             .onCompletion { sharedPreferences.unregisterOnSharedPreferenceChangeListener(listener) }
     }
 
-    override fun storeFcmToken(token: String?) {
+    override fun storeInstallationId(installationId: String?) {
         sharedPreferences.edit {
-            putString(PREFS_KEY_FCM_TOKEN, token)
+            putString(PREFS_KEY_FCM_INSTALLATION_ID, installationId)
         }
     }
 
     companion object {
-        private const val PREFS_KEY_FCM_TOKEN = "FCM_TOKEN"
+        private const val PREFS_KEY_FCM_INSTALLATION_ID = "FCM_TOKEN"
     }
 }
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt
deleted file mode 100644
index 21fa189121..0000000000
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenDeleter.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.pushproviders.firebase
-
-import com.google.firebase.messaging.FirebaseMessaging
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import timber.log.Timber
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-
-interface FirebaseTokenDeleter {
-    /**
-     * Deletes the current Firebase token.
-     */
-    suspend fun delete()
-}
-
-@ContributesBinding(AppScope::class)
-class DefaultFirebaseTokenDeleter(
-    private val isPlayServiceAvailable: IsPlayServiceAvailable,
-) : FirebaseTokenDeleter {
-    override suspend fun delete() {
-        // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'
-        isPlayServiceAvailable.checkAvailableOrThrow()
-        suspendCoroutine { continuation ->
-            try {
-                FirebaseMessaging.getInstance().deleteToken()
-                    .addOnSuccessListener {
-                        continuation.resume(Unit)
-                    }
-                    .addOnFailureListener { e ->
-                        Timber.e(e, "## deleteFirebaseToken() : failed")
-                        continuation.resumeWithException(e)
-                    }
-            } catch (e: Throwable) {
-                Timber.e(e, "## deleteFirebaseToken() : failed")
-                continuation.resumeWithException(e)
-            }
-        }
-    }
-}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt
deleted file mode 100644
index 80fd9726d4..0000000000
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenGetter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.pushproviders.firebase
-
-import com.google.firebase.messaging.FirebaseMessaging
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import timber.log.Timber
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
-
-interface FirebaseTokenGetter {
-    /**
-     * Read the current Firebase token from FirebaseMessaging.
-     * If the token does not exist, it will be generated.
-     */
-    suspend fun get(): String
-}
-
-@ContributesBinding(AppScope::class)
-class DefaultFirebaseTokenGetter(
-    private val isPlayServiceAvailable: IsPlayServiceAvailable,
-) : FirebaseTokenGetter {
-    override suspend fun get(): String {
-        // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'
-        isPlayServiceAvailable.checkAvailableOrThrow()
-        return suspendCoroutine { continuation ->
-            try {
-                FirebaseMessaging.getInstance().token
-                    .addOnSuccessListener { token ->
-                        continuation.resume(token)
-                    }
-                    .addOnFailureListener { e ->
-                        Timber.e(e, "## retrievedFirebaseToken() : failed")
-                        continuation.resumeWithException(e)
-                    }
-            } catch (e: Throwable) {
-                Timber.e(e, "## retrievedFirebaseToken() : failed")
-                continuation.resumeWithException(e)
-            }
-        }
-    }
-}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt
deleted file mode 100644
index 78b33cbb08..0000000000
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTokenRotator.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2024, 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.pushproviders.firebase
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.core.extensions.runCatchingExceptions
-
-interface FirebaseTokenRotator {
-    suspend fun rotate(): Result<Unit>
-}
-
-/**
- * This class delete the Firebase token and generate a new one.
- */
-@ContributesBinding(AppScope::class)
-class DefaultFirebaseTokenRotator(
-    private val firebaseTokenDeleter: FirebaseTokenDeleter,
-    private val firebaseTokenGetter: FirebaseTokenGetter,
-) : FirebaseTokenRotator {
-    override suspend fun rotate(): Result<Unit> {
-        return runCatchingExceptions {
-            firebaseTokenDeleter.delete()
-            firebaseTokenGetter.get()
-        }
-    }
-}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt
index 78fce0338d..0e58133a60 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/FirebaseTroubleshooter.kt
@@ -10,7 +10,6 @@ package io.element.android.libraries.pushproviders.firebase
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.core.extensions.runCatchingExceptions
 
 interface FirebaseTroubleshooter {
     suspend fun troubleshoot(): Result<Unit>
@@ -21,13 +20,9 @@ interface FirebaseTroubleshooter {
  */
 @ContributesBinding(AppScope::class)
 class DefaultFirebaseTroubleshooter(
-    private val newTokenHandler: FirebaseNewTokenHandler,
-    private val firebaseTokenGetter: FirebaseTokenGetter,
+    private val rotateFirebaseSession: RotateFirebaseSession,
 ) : FirebaseTroubleshooter {
     override suspend fun troubleshoot(): Result<Unit> {
-        return runCatchingExceptions {
-            val token = firebaseTokenGetter.get()
-            newTokenHandler.handle(token)
-        }
+        return rotateFirebaseSession()
     }
 }
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RegisterFirebaseSession.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RegisterFirebaseSession.kt
new file mode 100644
index 0000000000..42604bd013
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RegisterFirebaseSession.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.pushproviders.firebase
+
+import com.google.firebase.messaging.FirebaseMessaging
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.pushproviders.firebase.util.runFirebaseTask
+import timber.log.Timber
+
+fun interface RegisterFirebaseSession {
+    /**
+     * Register the device to Firebase Messaging.
+     */
+    suspend operator fun invoke(): Result<Unit>
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultRegisterFirebaseSession(
+    private val isPlayServiceAvailable: IsPlayServiceAvailable,
+) : RegisterFirebaseSession {
+    override suspend operator fun invoke(): Result<Unit> {
+        // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'
+        isPlayServiceAvailable.checkAvailableOrThrow()
+        return runFirebaseTask { FirebaseMessaging.getInstance().register() }
+            .onFailure { Timber.e(it, "## registerFirebaseMessaging() : failed") }
+            // Change return type from Void! to Unit
+            .map {}
+    }
+}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RotateFirebaseSession.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RotateFirebaseSession.kt
new file mode 100644
index 0000000000..a6e51dafa2
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/RotateFirebaseSession.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2024, 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.pushproviders.firebase
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+
+fun interface RotateFirebaseSession {
+    suspend operator fun invoke(): Result<Unit>
+}
+
+/**
+ * This class deletes the Firebase installation id and generates a new one.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultRotateFirebaseSession(
+    private val registerFirebaseSession: RegisterFirebaseSession,
+    private val unregisterFirebaseSession: UnregisterFirebaseSession,
+) : RotateFirebaseSession {
+    override suspend operator fun invoke(): Result<Unit> {
+        return runCatchingExceptions {
+            // Stop the current session, which will also delete the existing installation id from Firebase
+            unregisterFirebaseSession().getOrThrow()
+            // Register again to get a new installation id
+            registerFirebaseSession().getOrThrow()
+        }
+    }
+}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/UnregisterFirebaseSession.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/UnregisterFirebaseSession.kt
new file mode 100644
index 0000000000..815f2d734c
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/UnregisterFirebaseSession.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2023-2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.pushproviders.firebase
+
+import com.google.firebase.installations.FirebaseInstallations
+import com.google.firebase.messaging.FirebaseMessaging
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.pushproviders.firebase.util.runFirebaseTask
+import timber.log.Timber
+
+fun interface UnregisterFirebaseSession {
+    /**
+     * Deletes the current Firebase token.
+     */
+    suspend operator fun invoke(): Result<Unit>
+}
+
+@ContributesBinding(AppScope::class)
+class DefaultUnregisterFirebaseSession(
+    private val isPlayServiceAvailable: IsPlayServiceAvailable,
+) : UnregisterFirebaseSession {
+    override suspend operator fun invoke(): Result<Unit> {
+        // 'app should always check the device for a compatible Google Play services APK before accessing Google Play services features'
+        isPlayServiceAvailable.checkAvailableOrThrow()
+        return runFirebaseTask {
+            // Unregister the device from Firebase Messaging
+            FirebaseMessaging.getInstance().unregister()
+                // Also delete the existing installation id from Firebase
+                .continueWithTask { FirebaseInstallations.getInstance().delete() }
+        }
+            .onFailure {
+                Timber.e(it, "## unregisterFirebaseMessaging() : failed")
+            }
+            // Change return type from Void! to Unit
+            .map {}
+    }
+}
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
index 67da09f1ab..cd6ad3c8bc 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingService.kt
@@ -10,11 +10,12 @@ package io.element.android.libraries.pushproviders.firebase
 
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.google.firebase.messaging.RemoteMessage.PRIORITY_HIGH
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
+import io.element.android.libraries.push.api.push.FetchPushForegroundServiceManager
 import io.element.android.libraries.pushproviders.api.PushHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -23,10 +24,10 @@ import timber.log.Timber
 private val loggerTag = LoggerTag("VectorFirebaseMessagingService", LoggerTag.PushLoggerTag)
 
 class VectorFirebaseMessagingService : FirebaseMessagingService() {
-    @Inject lateinit var firebaseNewTokenHandler: FirebaseNewTokenHandler
+    @Inject lateinit var firebaseNewInstallationIdHandler: FirebaseNewInstallationIdHandler
     @Inject lateinit var pushParser: FirebasePushParser
     @Inject lateinit var pushHandler: PushHandler
-    @Inject lateinit var pushHandlingWakeLock: PushHandlingWakeLock
+    @Inject lateinit var fetchPushForegroundServiceManager: FetchPushForegroundServiceManager
     @AppCoroutineScope
     @Inject lateinit var coroutineScope: CoroutineScope
 
@@ -35,18 +36,23 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
         bindings<VectorFirebaseMessagingServiceBindings>().inject(this)
     }
 
-    override fun onNewToken(token: String) {
-        Timber.tag(loggerTag.value).w("New Firebase token")
+    override fun onRegistered(installationId: String) {
+        super.onRegistered(installationId)
+
+        Timber.tag(loggerTag.value).w("New Firebase installation id")
         coroutineScope.launch {
-            firebaseNewTokenHandler.handle(token)
+            firebaseNewInstallationIdHandler.handle(installationId)
         }
     }
 
     override fun onMessageReceived(message: RemoteMessage) {
         Timber.tag(loggerTag.value).w("New Firebase message. Priority: ${message.priority}/${message.originalPriority}")
 
-        // Acquire wakelock to ensure the device stays awake while we handle the push and schedule and run the work
-        pushHandlingWakeLock.lock()
+        val isHighPriority = message.priority == PRIORITY_HIGH
+        if (isHighPriority) {
+            // Acquire wakelock to ensure the device stays awake while we handle the push and schedule and run the work
+            fetchPushForegroundServiceManager.start()
+        }
 
         coroutineScope.launch {
             val pushData = pushParser.parse(message.data)
@@ -58,7 +64,9 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                         "$it: ${message.data[it]}"
                     },
                 )
-                pushHandlingWakeLock.unlock()
+                if (isHighPriority) {
+                    fetchPushForegroundServiceManager.stop()
+                }
             } else {
                 val handled = pushHandler.handle(
                     pushData = pushData,
@@ -66,8 +74,8 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                 )
 
                 // If we failed to handle the push, we should release the wakelock early to avoid keeping the device awake for too long.
-                if (!handled) {
-                    pushHandlingWakeLock.unlock()
+                if (!handled && isHighPriority) {
+                    fetchPushForegroundServiceManager.stop()
                 }
             }
         }
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt
index 7ea7c6cee2..c3af8df542 100644
--- a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTest.kt
@@ -49,7 +49,7 @@ class FirebaseTokenTest(
     override suspend fun run(coroutineScope: CoroutineScope) {
         currentJob?.cancel()
         delegate.start()
-        currentJob = firebaseStore.fcmTokenFlow()
+        currentJob = firebaseStore.fcmInstallationIdFlow()
             .onEach { token ->
                 if (token != null) {
                     delegate.updateState(
diff --git a/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/util/RunFirebaseTask.kt b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/util/RunFirebaseTask.kt
new file mode 100644
index 0000000000..0ddde69d1e
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/kotlin/io/element/android/libraries/pushproviders/firebase/util/RunFirebaseTask.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.pushproviders.firebase.util
+
+import com.google.android.gms.tasks.Task
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+suspend fun <T> runFirebaseTaskWithResult(closure: () -> Task<T>): Result<T> {
+    return runCatchingExceptions {
+        suspendCancellableCoroutine { continuation ->
+            try {
+                closure().addOnSuccessListener {
+                    continuation.resume(it)
+                }.addOnFailureListener { e ->
+                    continuation.resumeWithException(e)
+                }
+            } catch (e: Throwable) {
+                continuation.resumeWithException(e)
+            }
+        }
+    }
+}
+
+// Special case for `Void!` return type, which is not a valid Kotlin type. We convert it to `Unit` instead.
+suspend fun runFirebaseTask(closure: () -> Task<Void?>): Result<Unit> {
+    return runFirebaseTaskWithResult<Unit> { closure().continueWith {} }
+}
diff --git a/libraries/pushproviders/firebase/src/main/res/values-ca/translations.xml b/libraries/pushproviders/firebase/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..acd61bab06
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values-ca/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_firebase_availability_description">"Assegura\'t que Firebase estigui disponible."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_failure">"Firebase no està disponible."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_success">"Firebase està disponible."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_title">"Comprova Firebase"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_description">"Assegura\'t que el token de Firebase està disponible."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_failure">"Token de Firebase desconegut."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_success">"Token de Firebase: %1$s."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_title">"Comprova el token de Firebase"</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/main/res/values-fa/translations.xml b/libraries/pushproviders/firebase/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..df11b72c7f
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values-fa/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_firebase_availability_description">"اطمینان از در دسترس بودن فایربیس."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_failure">"فایربیس در دسترس نیست."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_success">"فایربیس در دسترس است."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_title">"بررسی فایربیس"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_description">"اطمینان از در دسترس بودن ژتون فایربیس."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_failure">"ژتون فایربیس شناخته نشده."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_success">"ژتون فایربیس: %1$s."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_title">"بررسی ژتون فایربیس"</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/main/res/values-ja/translations.xml b/libraries/pushproviders/firebase/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..5c07e2ad79
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values-ja/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_firebase_availability_description">"Firebase が利用可能であることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_failure">"Firebase を利用できません。"</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_success">"Firebase は利用可能です。"</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_title">"Firebase の確認"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_description">"Firebase トークンが利用可能であることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_failure">"Firebase トークンが不明です。"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_success">"Firebase トークン: %1$s"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_title">"Firebase トークンの確認"</string>
+</resources>
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewInstallationIdHandlerTest.kt
similarity index 96%
rename from libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
rename to libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewInstallationIdHandlerTest.kt
index 4db9ea667f..78d35fe2a5 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewInstallationIdHandlerTest.kt
@@ -30,16 +30,16 @@ import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class DefaultFirebaseNewTokenHandlerTest {
+class DefaultFirebaseNewInstallationIdHandlerTest {
     @Test
     fun `when a new token is received it is stored in the firebase store`() = runTest {
         val firebaseStore = InMemoryFirebaseStore()
-        assertThat(firebaseStore.getFcmToken()).isNull()
+        assertThat(firebaseStore.getInstallationId()).isNull()
         val firebaseNewTokenHandler = createDefaultFirebaseNewTokenHandler(
             firebaseStore = firebaseStore,
         )
         firebaseNewTokenHandler.handle("aToken")
-        assertThat(firebaseStore.getFcmToken()).isEqualTo("aToken")
+        assertThat(firebaseStore.getInstallationId()).isEqualTo("aToken")
     }
 
     @Test
@@ -142,8 +142,8 @@ class DefaultFirebaseNewTokenHandlerTest {
         matrixClientProvider: MatrixClientProvider = FakeMatrixClientProvider(),
         firebaseStore: FirebaseStore = InMemoryFirebaseStore(),
         firebaseGatewayProvider: FirebaseGatewayProvider = FakeFirebaseGatewayProvider(),
-    ): FirebaseNewTokenHandler {
-        return DefaultFirebaseNewTokenHandler(
+    ): FirebaseNewInstallationIdHandler {
+        return DefaultFirebaseNewInstallationIdHandler(
             pusherSubscriber = pusherSubscriber,
             sessionStore = sessionStore,
             userPushStoreFactory = userPushStoreFactory,
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewTokenHandler.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewInstallationIdHandler.kt
similarity index 71%
rename from libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewTokenHandler.kt
rename to libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewInstallationIdHandler.kt
index 2fa9508103..b6b310fbb8 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewTokenHandler.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseNewInstallationIdHandler.kt
@@ -10,10 +10,10 @@ package io.element.android.libraries.pushproviders.firebase
 
 import io.element.android.tests.testutils.lambda.lambdaError
 
-class FakeFirebaseNewTokenHandler(
+class FakeFirebaseNewInstallationIdHandler(
     private val handleResult: (String) -> Unit = { lambdaError() }
-) : FirebaseNewTokenHandler {
-    override suspend fun handle(firebaseToken: String) {
-        handleResult(firebaseToken)
+) : FirebaseNewInstallationIdHandler {
+    override suspend fun handle(installationId: String) {
+        handleResult(installationId)
     }
 }
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeRotateFirebaseSession.kt
similarity index 81%
rename from libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt
rename to libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeRotateFirebaseSession.kt
index d504aa32ae..34ae929af8 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeFirebaseTokenRotator.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FakeRotateFirebaseSession.kt
@@ -10,10 +10,10 @@ package io.element.android.libraries.pushproviders.firebase
 
 import io.element.android.tests.testutils.lambda.lambdaError
 
-class FakeFirebaseTokenRotator(
+class FakeRotateFirebaseSession(
     private val rotateWithResult: () -> Result<Unit> = { lambdaError() }
-) : FirebaseTokenRotator {
-    override suspend fun rotate(): Result<Unit> {
+) : RotateFirebaseSession {
+    override suspend fun invoke(): Result<Unit> {
         return rotateWithResult()
     }
 }
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt
index 312689da6e..a2737bc377 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/FirebasePushProviderTest.kt
@@ -61,7 +61,7 @@ class FirebasePushProviderTest {
         val registerPusherResultLambda = lambdaRecorder<MatrixClient, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = "aToken"
+                installationId = "aToken"
             ),
             pusherSubscriber = FakePusherSubscriber(
                 registerPusherResult = registerPusherResultLambda
@@ -78,7 +78,7 @@ class FirebasePushProviderTest {
     fun `register ko no token`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = null
+                installationId = null
             ),
             pusherSubscriber = FakePusherSubscriber(
                 registerPusherResult = { _, _, _ -> Result.success(Unit) }
@@ -92,7 +92,7 @@ class FirebasePushProviderTest {
     fun `register ko error`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = "aToken"
+                installationId = "aToken"
             ),
             pusherSubscriber = FakePusherSubscriber(
                 registerPusherResult = { _, _, _ -> Result.failure(AN_EXCEPTION) }
@@ -108,7 +108,7 @@ class FirebasePushProviderTest {
         val unregisterPusherResultLambda = lambdaRecorder<MatrixClient, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = "aToken"
+                installationId = "aToken"
             ),
             pusherSubscriber = FakePusherSubscriber(
                 unregisterPusherResult = unregisterPusherResultLambda
@@ -125,7 +125,7 @@ class FirebasePushProviderTest {
     fun `unregister no token - in this case, the error is ignored`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = null
+                installationId = null
             ),
         )
         val result = firebasePushProvider.unregister(FakeMatrixClient())
@@ -136,7 +136,7 @@ class FirebasePushProviderTest {
     fun `unregister ko error`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = "aToken"
+                installationId = "aToken"
             ),
             pusherSubscriber = FakePusherSubscriber(
                 unregisterPusherResult = { _, _, _ -> Result.failure(AN_EXCEPTION) }
@@ -150,7 +150,7 @@ class FirebasePushProviderTest {
     fun `getCurrentUserPushConfig no push ket`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = null
+                installationId = null
             )
         )
         val result = firebasePushProvider.getPushConfig(A_SESSION_ID)
@@ -161,7 +161,7 @@ class FirebasePushProviderTest {
     fun `getCurrentUserPushConfig ok`() = runTest {
         val firebasePushProvider = createFirebasePushProvider(
             firebaseStore = InMemoryFirebaseStore(
-                token = "aToken"
+                installationId = "aToken"
             ),
         )
         val result = firebasePushProvider.getPushConfig(A_SESSION_ID)
@@ -169,10 +169,10 @@ class FirebasePushProviderTest {
     }
 
     @Test
-    fun `rotateToken invokes the FirebaseTokenRotator`() = runTest {
+    fun `rotateToken invokes the FirebaseMessagingSessionRotator`() = runTest {
         val lambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
         val firebasePushProvider = createFirebasePushProvider(
-            firebaseTokenRotator = FakeFirebaseTokenRotator(lambda),
+            rotateFirebaseSession = FakeRotateFirebaseSession(lambda),
         )
         firebasePushProvider.rotateToken()
         lambda.assertions().isCalledOnce()
@@ -194,14 +194,14 @@ class FirebasePushProviderTest {
         firebaseStore: FirebaseStore = InMemoryFirebaseStore(),
         pusherSubscriber: PusherSubscriber = FakePusherSubscriber(),
         isPlayServiceAvailable: IsPlayServiceAvailable = FakeIsPlayServiceAvailable(false),
-        firebaseTokenRotator: FirebaseTokenRotator = FakeFirebaseTokenRotator(),
+        rotateFirebaseSession: RotateFirebaseSession = FakeRotateFirebaseSession(),
         firebaseGatewayProvider: FirebaseGatewayProvider = FakeFirebaseGatewayProvider()
     ): FirebasePushProvider {
         return FirebasePushProvider(
             firebaseStore = firebaseStore,
             pusherSubscriber = pusherSubscriber,
             isPlayServiceAvailable = isPlayServiceAvailable,
-            firebaseTokenRotator = firebaseTokenRotator,
+            rotateFirebaseSession = rotateFirebaseSession,
             firebaseGatewayProvider = firebaseGatewayProvider,
         )
     }
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt
index 3e6292f445..9e55cdcb4d 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/InMemoryFirebaseStore.kt
@@ -12,13 +12,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 class InMemoryFirebaseStore(
-    private var token: String? = null
+    private var installationId: String? = null
 ) : FirebaseStore {
-    override fun getFcmToken(): String? = token
+    override fun getInstallationId(): String? = installationId
 
-    override fun fcmTokenFlow(): Flow<String?> = flowOf(token)
+    override fun fcmInstallationIdFlow(): Flow<String?> = flowOf(installationId)
 
-    override fun storeFcmToken(token: String?) {
-        this.token = token
+    override fun storeInstallationId(installationId: String?) {
+        this.installationId = installationId
     }
 }
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
index 87ca74730c..d640e3c858 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/VectorFirebaseMessagingServiceTest.kt
@@ -15,24 +15,21 @@ import com.google.firebase.messaging.RemoteMessage
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SECRET
-import io.element.android.libraries.push.test.push.FakePushHandlingWakeLock
+import io.element.android.libraries.push.test.push.FakeFetchPushForegroundServiceManager
 import io.element.android.libraries.push.test.test.FakePushHandler
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import kotlin.time.Duration
 
-@RunWith(RobolectricTestRunner::class)
-class VectorFirebaseMessagingServiceTest {
+class VectorFirebaseMessagingServiceTest : RobolectricTest() {
     @Test
     fun `test receiving invalid data`() = runTest {
         val lambda = lambdaRecorder<String, String, Unit> { _, _ -> }
@@ -81,11 +78,11 @@ class VectorFirebaseMessagingServiceTest {
 
     @Test
     fun `test pushHandler returning true locks and does not unlock the wakelock so it continues running`() = runTest {
-        val lockLambda = lambdaRecorder<Duration, Unit> { _ -> }
-        val unlockLambda = lambdaRecorder<Unit> { }
+        val lockLambda = lambdaRecorder<Boolean> { true }
+        val unlockLambda = lambdaRecorder<Boolean> { true }
         val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
             pushHandler = FakePushHandler(handleResult = { _, _ -> true }),
-            pushHandlingWakeLock = FakePushHandlingWakeLock(
+            pushHandlingWakeLock = FakeFetchPushForegroundServiceManager(
                 lock = lockLambda,
                 unlock = unlockLambda
             )
@@ -96,6 +93,7 @@ class VectorFirebaseMessagingServiceTest {
                     putString("event_id", AN_EVENT_ID.value)
                     putString("room_id", A_ROOM_ID.value)
                     putString("cs", A_SECRET)
+                    putString("google.priority", "high")
                 },
             )
         )
@@ -112,11 +110,11 @@ class VectorFirebaseMessagingServiceTest {
 
     @Test
     fun `test pushHandler returning false locks and unlocks the wakelock early`() = runTest {
-        val lockLambda = lambdaRecorder<Duration, Unit> { _ -> }
-        val unlockLambda = lambdaRecorder<Unit> { }
+        val lockLambda = lambdaRecorder<Boolean> { true }
+        val unlockLambda = lambdaRecorder<Boolean> { true }
         val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
             pushHandler = FakePushHandler(handleResult = { _, _ -> false }),
-            pushHandlingWakeLock = FakePushHandlingWakeLock(
+            pushHandlingWakeLock = FakeFetchPushForegroundServiceManager(
                 lock = lockLambda,
                 unlock = unlockLambda
             )
@@ -127,6 +125,7 @@ class VectorFirebaseMessagingServiceTest {
                     putString("event_id", AN_EVENT_ID.value)
                     putString("room_id", A_ROOM_ID.value)
                     putString("cs", A_SECRET)
+                    putString("google.priority", "high")
                 },
             )
         )
@@ -141,30 +140,57 @@ class VectorFirebaseMessagingServiceTest {
         unlockLambda.assertions().isCalledOnce()
     }
 
+    @Test
+    fun `test pushHandler with a remote message with normal priority won't lock the wakelock`() = runTest {
+        val lockLambda = lambdaRecorder<Boolean> { true }
+        val unlockLambda = lambdaRecorder<Boolean> { true }
+        val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
+            pushHandler = FakePushHandler(handleResult = { _, _ -> false }),
+            pushHandlingWakeLock = FakeFetchPushForegroundServiceManager(
+                lock = lockLambda,
+                unlock = unlockLambda
+            )
+        )
+        vectorFirebaseMessagingService.onMessageReceived(
+            message = RemoteMessage(
+                Bundle().apply {
+                    putString("event_id", AN_EVENT_ID.value)
+                    putString("room_id", A_ROOM_ID.value)
+                    putString("cs", A_SECRET)
+                    putString("google.priority", "normal")
+                },
+            )
+        )
+
+        // The wakelock should not be locked
+        lockLambda.assertions().isNeverCalled()
+        unlockLambda.assertions().isNeverCalled()
+    }
+
     @Test
     fun `test new token is forwarded to the handler`() = runTest {
         val lambda = lambdaRecorder<String, Unit> { }
         val vectorFirebaseMessagingService = createVectorFirebaseMessagingService(
-            firebaseNewTokenHandler = FakeFirebaseNewTokenHandler(handleResult = lambda)
+            firebaseNewInstallationIdHandler = FakeFirebaseNewInstallationIdHandler(handleResult = lambda)
         )
-        vectorFirebaseMessagingService.onNewToken("aToken")
+        vectorFirebaseMessagingService.onRegistered("installationId")
         advanceUntilIdle()
         lambda.assertions()
             .isCalledOnce()
-            .with(value("aToken"))
+            .with(value("installationId"))
     }
 
     private fun TestScope.createVectorFirebaseMessagingService(
-        firebaseNewTokenHandler: FirebaseNewTokenHandler = FakeFirebaseNewTokenHandler(),
+        firebaseNewInstallationIdHandler: FirebaseNewInstallationIdHandler = FakeFirebaseNewInstallationIdHandler(),
         pushHandler: PushHandler = FakePushHandler(),
-        pushHandlingWakeLock: FakePushHandlingWakeLock = FakePushHandlingWakeLock(),
+        pushHandlingWakeLock: FakeFetchPushForegroundServiceManager = FakeFetchPushForegroundServiceManager(),
     ): VectorFirebaseMessagingService {
         return VectorFirebaseMessagingService().apply {
-            this.firebaseNewTokenHandler = firebaseNewTokenHandler
+            this.firebaseNewInstallationIdHandler = firebaseNewInstallationIdHandler
             this.pushParser = FirebasePushParser()
             this.pushHandler = pushHandler
             this.coroutineScope = this@createVectorFirebaseMessagingService
-            this.pushHandlingWakeLock = pushHandlingWakeLock
+            this.fetchPushForegroundServiceManager = pushHandlingWakeLock
         }
     }
 }
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt
index 8f9721a17d..963a4352ec 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/troubleshoot/FirebaseTokenTestTest.kt
@@ -45,7 +45,7 @@ class FirebaseTokenTestTest {
             firebaseStore = firebaseStore,
             firebaseTroubleshooter = FakeFirebaseTroubleshooter(
                 troubleShootResult = {
-                    firebaseStore.storeFcmToken(FAKE_TOKEN)
+                    firebaseStore.storeInstallationId(FAKE_TOKEN)
                     Result.success(Unit)
                 }
             ),
@@ -70,7 +70,7 @@ class FirebaseTokenTestTest {
             firebaseStore = firebaseStore,
             firebaseTroubleshooter = FakeFirebaseTroubleshooter(
                 troubleShootResult = {
-                    firebaseStore.storeFcmToken(FAKE_TOKEN)
+                    firebaseStore.storeInstallationId(FAKE_TOKEN)
                     Result.success(Unit)
                 }
             ),
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/GuardServiceStarter.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/GuardServiceStarter.kt
deleted file mode 100644
index 4a8eefe37f..0000000000
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/GuardServiceStarter.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.pushproviders.unifiedpush
-
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.ContributesBinding
-
-interface GuardServiceStarter {
-    fun start() {}
-    fun stop() {}
-}
-
-@ContributesBinding(AppScope::class)
-class NoopGuardServiceStarter : GuardServiceStarter
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayUrlResolver.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayUrlResolver.kt
index 78a569a211..1155293567 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayUrlResolver.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnifiedPushGatewayUrlResolver.kt
@@ -29,8 +29,9 @@ class DefaultUnifiedPushGatewayUrlResolver(
     ): String {
         return when (gatewayResult) {
             is UnifiedPushGatewayResolverResult.Error -> {
-                // Use previous gateway if any, or the provided one
-                unifiedPushStore.getPushGateway(instance) ?: gatewayResult.gateway
+                // Use previous gateway if any, or the default one
+                unifiedPushStore.getPushGateway(instance)
+                    ?: defaultPushGatewayHttpUrlProvider.provide()
             }
             UnifiedPushGatewayResolverResult.ErrorInvalidUrl,
             UnifiedPushGatewayResolverResult.NoMatrixGateway -> {
diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiver.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiver.kt
index 363400ba13..b1e9ba648b 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiver.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiver.kt
@@ -14,7 +14,7 @@ import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
 import io.element.android.libraries.di.annotations.AppCoroutineScope
-import io.element.android.libraries.push.api.push.PushHandlingWakeLock
+import io.element.android.libraries.push.api.push.FetchPushForegroundServiceManager
 import io.element.android.libraries.pushproviders.api.PushHandler
 import io.element.android.libraries.pushproviders.unifiedpush.registration.EndpointRegistrationHandler
 import io.element.android.libraries.pushproviders.unifiedpush.registration.RegistrationResult
@@ -31,14 +31,13 @@ private val loggerTag = LoggerTag("VectorUnifiedPushMessagingReceiver", LoggerTa
 class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
     @Inject lateinit var pushParser: UnifiedPushParser
     @Inject lateinit var pushHandler: PushHandler
-    @Inject lateinit var guardServiceStarter: GuardServiceStarter
     @Inject lateinit var unifiedPushStore: UnifiedPushStore
     @Inject lateinit var unifiedPushGatewayResolver: UnifiedPushGatewayResolver
     @Inject lateinit var unifiedPushGatewayUrlResolver: UnifiedPushGatewayUrlResolver
     @Inject lateinit var newGatewayHandler: UnifiedPushNewGatewayHandler
     @Inject lateinit var removedGatewayHandler: UnifiedPushRemovedGatewayHandler
     @Inject lateinit var endpointRegistrationHandler: EndpointRegistrationHandler
-    @Inject lateinit var pushHandlingWakeLock: PushHandlingWakeLock
+    @Inject lateinit var fetchPushForegroundServiceManager: FetchPushForegroundServiceManager
 
     @AppCoroutineScope
     @Inject lateinit var coroutineScope: CoroutineScope
@@ -59,8 +58,8 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
      * @param instance connection, for multi-account
      */
     override fun onMessage(context: Context, message: PushMessage, instance: String) {
-        // Acquire wakelock to ensure the device stays awake while we handle the push and schedule and run the work
-        pushHandlingWakeLock.lock()
+        // Start the foreground service to ensure the device stays awake while we handle the push and schedule and run the work.
+        fetchPushForegroundServiceManager.start()
 
         Timber.tag(loggerTag.value).d("New message, decrypted: ${message.decrypted}")
         coroutineScope.launch {
@@ -71,16 +70,16 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
                     providerInfo = "${UnifiedPushConfig.NAME} - $instance",
                     data = String(message.content),
                 )
-                pushHandlingWakeLock.unlock()
+                fetchPushForegroundServiceManager.stop()
             } else {
                 val handled = pushHandler.handle(
                     pushData = pushData,
                     providerInfo = "${UnifiedPushConfig.NAME} - $instance",
                 )
 
-                // If we failed to handle the push, we should release the wakelock early to avoid keeping the device awake for too long.
+                // If we failed to handle the push, we should stop the foreground service early to avoid keeping the device awake for too long.
                 if (!handled) {
-                    pushHandlingWakeLock.unlock()
+                    fetchPushForegroundServiceManager.stop()
                 }
             }
         }
@@ -112,7 +111,6 @@ class VectorUnifiedPushMessagingReceiver : MessagingReceiver() {
                 )
             )
         }
-        guardServiceStarter.stop()
     }
 
     /**
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-ca/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..51096a1cfa
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-ca/translations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_unified_push_description">"Assegura\'t que hi hagi distribuïdors d\'UnifiedPush disponibles."</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"No s\'han trobat distribuïdors push."</string>
+  <plurals name="troubleshoot_notifications_test_unified_push_success">
+    <item quantity="one">"%1$d distribuïdor trobat: %2$s."</item>
+    <item quantity="other">"%1$d distribuïdors trobats: %2$s."</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_unified_push_title">"Prova UnifiedPush"</string>
+</resources>
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-fa/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..c80e952967
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-fa/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_unified_push_description">"اطمینان از در دسترس بودن توزیعگرهای ارسال یکپارچه."</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"هیچ توزیعگر ارسال یکپارچه‌ای پیدا نشد."</string>
+  <string name="troubleshoot_notifications_test_unified_push_title">"بررسی ارسال یکپارچه"</string>
+</resources>
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-ja/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..a081ba04ff
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-ja/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_unified_push_description">"UnifiedPush のディストリビューターが利用可能であることを確認してください。"</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"プッシュ通知ディストリビューターが見つかりませんでした。"</string>
+  <plurals name="troubleshoot_notifications_test_unified_push_success">
+    <item quantity="other">"%1$d 個のディストリビューターを発見: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_unified_push_title">"UnifiedPush を確認"</string>
+</resources>
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-vi/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..3305adad2a
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-vi/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="troubleshoot_notifications_test_unified_push_success">
+    <item quantity="other">"%1$d nhà phân phối đã tìm thấy: %2$s ."</item>
+  </plurals>
+</resources>
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-zh/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-zh/translations.xml
index 2fac432ca8..3b9048a37f 100644
--- a/libraries/pushproviders/unifiedpush/src/main/res/values-zh/translations.xml
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-zh/translations.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="troubleshoot_notifications_test_unified_push_description">"确保 UnifiedPush distributor 可用。"</string>
-  <string name="troubleshoot_notifications_test_unified_push_failure">"未找到推送 distributor。"</string>
+  <string name="troubleshoot_notifications_test_unified_push_description">"确保 UnifiedPush 分发器可用。"</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"未找到推送分发器。"</string>
   <plurals name="troubleshoot_notifications_test_unified_push_success">
-    <item quantity="other">"找到 %1$d 个 distributors：%2$s"</item>
+    <item quantity="other">"找到 %1$d 个分发器：%2$s"</item>
   </plurals>
   <string name="troubleshoot_notifications_test_unified_push_title">"检查 UnifiedPush"</string>
 </resources>
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultRegisterUnifiedPushUseCaseTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultRegisterUnifiedPushUseCaseTest.kt
index 1e77df79a2..fe7da75951 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultRegisterUnifiedPushUseCaseTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultRegisterUnifiedPushUseCaseTest.kt
@@ -16,17 +16,15 @@ import io.element.android.libraries.pushproviders.api.Distributor
 import io.element.android.libraries.pushproviders.unifiedpush.registration.EndpointRegistrationHandler
 import io.element.android.libraries.pushproviders.unifiedpush.registration.RegistrationResult
 import io.element.android.tests.testutils.fake.FakeAndroidKeyStore
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultRegisterUnifiedPushUseCaseTest {
+class DefaultRegisterUnifiedPushUseCaseTest : RobolectricTest() {
     @Before
     fun setup() {
         FakeAndroidKeyStore.setup
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayUrlResolverTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayUrlResolverTest.kt
index 3f437bdafa..664ff26d15 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayUrlResolverTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushGatewayUrlResolverTest.kt
@@ -60,7 +60,7 @@ class DefaultUnifiedPushGatewayUrlResolverTest {
     }
 
     @Test
-    fun `resolve Error returns the url if no current url is available`() {
+    fun `resolve Error returns the default gateway url if no current url is available`() {
         val sut = createDefaultUnifiedPushGatewayUrlResolver(
             unifiedPushStore = FakeUnifiedPushStore(
                 getPushGatewayResult = { instance ->
@@ -73,7 +73,7 @@ class DefaultUnifiedPushGatewayUrlResolverTest {
             gatewayResult = UnifiedPushGatewayResolverResult.Error("aUrl"),
             instance = "instance",
         )
-        assertThat(result).isEqualTo("aUrl")
+        assertThat(result).isEqualTo(FakeDefaultPushGatewayHttpUrlProvider().provide())
     }
 
     private fun createDefaultUnifiedPushGatewayUrlResolver(
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnregisterUnifiedPushUseCaseTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnregisterUnifiedPushUseCaseTest.kt
index ed2337c5bb..e6454406d5 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnregisterUnifiedPushUseCaseTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnregisterUnifiedPushUseCaseTest.kt
@@ -18,13 +18,11 @@ import io.element.android.libraries.push.test.FakePusherSubscriber
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class DefaultUnregisterUnifiedPushUseCaseTest {
+class DefaultUnregisterUnifiedPushUseCaseTest : RobolectricTest() {
     @Test
     fun `test un registration successful`() = runTest {
         val lambda = lambdaRecorder { _: MatrixClient, _: String, _: String -> Result.success(Unit) }
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
index ef81c647b3..6d86cb2b9d 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/VectorUnifiedPushMessagingReceiverTest.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SECRET
-import io.element.android.libraries.push.test.push.FakePushHandlingWakeLock
+import io.element.android.libraries.push.test.push.FakeFetchPushForegroundServiceManager
 import io.element.android.libraries.push.test.test.FakePushHandler
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushproviders.api.PushHandler
@@ -27,22 +27,19 @@ import io.element.android.libraries.pushproviders.unifiedpush.registration.Regis
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertThrows
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 import org.unifiedpush.android.connector.FailedReason
 import org.unifiedpush.android.connector.data.PublicKeySet
 import org.unifiedpush.android.connector.data.PushEndpoint
 import org.unifiedpush.android.connector.data.PushMessage
-import kotlin.time.Duration
 
-@RunWith(RobolectricTestRunner::class)
-class VectorUnifiedPushMessagingReceiverTest {
+class VectorUnifiedPushMessagingReceiverTest : RobolectricTest() {
     @Test
     fun `onReceive does the binding`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
@@ -106,13 +103,13 @@ class VectorUnifiedPushMessagingReceiverTest {
     fun `pushHandler returning true locks the wake lock but does not unlock it so it continues to run`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
         val pushHandlerResult = lambdaRecorder<PushData, String, Boolean> { _, _ -> true }
-        val lockLambda = lambdaRecorder<Duration, Unit> { _ -> }
-        val unlockLambda = lambdaRecorder<Unit> { }
+        val lockLambda = lambdaRecorder<Boolean> { true }
+        val unlockLambda = lambdaRecorder<Boolean> { true }
         val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver(
             pushHandler = FakePushHandler(
                 handleResult = pushHandlerResult
             ),
-            pushHandlingWakeLock = FakePushHandlingWakeLock(
+            pushHandlingWakeLock = FakeFetchPushForegroundServiceManager(
                 lock = lockLambda,
                 unlock = unlockLambda,
             ),
@@ -133,13 +130,13 @@ class VectorUnifiedPushMessagingReceiverTest {
     fun `pushHandler returning false locks and unlocks the wakelock early`() = runTest {
         val context = InstrumentationRegistry.getInstrumentation().context
         val pushHandlerResult = lambdaRecorder<PushData, String, Boolean> { _, _ -> false }
-        val lockLambda = lambdaRecorder<Duration, Unit> { _ -> }
-        val unlockLambda = lambdaRecorder<Unit> { }
+        val lockLambda = lambdaRecorder<Boolean> { true }
+        val unlockLambda = lambdaRecorder<Boolean> { true }
         val vectorUnifiedPushMessagingReceiver = createVectorUnifiedPushMessagingReceiver(
             pushHandler = FakePushHandler(
                 handleResult = pushHandlerResult
             ),
-            pushHandlingWakeLock = FakePushHandlingWakeLock(
+            pushHandlingWakeLock = FakeFetchPushForegroundServiceManager(
                 lock = lockLambda,
                 unlock = unlockLambda,
             ),
@@ -264,12 +261,11 @@ class VectorUnifiedPushMessagingReceiverTest {
         unifiedPushNewGatewayHandler: UnifiedPushNewGatewayHandler = FakeUnifiedPushNewGatewayHandler(),
         endpointRegistrationHandler: EndpointRegistrationHandler = EndpointRegistrationHandler(),
         removedGatewayHandler: UnifiedPushRemovedGatewayHandler = UnifiedPushRemovedGatewayHandler { lambdaError() },
-        pushHandlingWakeLock: FakePushHandlingWakeLock = FakePushHandlingWakeLock(),
+        pushHandlingWakeLock: FakeFetchPushForegroundServiceManager = FakeFetchPushForegroundServiceManager(),
     ): VectorUnifiedPushMessagingReceiver {
         return VectorUnifiedPushMessagingReceiver().apply {
             this.pushParser = unifiedPushParser
             this.pushHandler = pushHandler
-            this.guardServiceStarter = NoopGuardServiceStarter()
             this.unifiedPushStore = unifiedPushStore
             this.unifiedPushGatewayResolver = unifiedPushGatewayResolver
             this.unifiedPushGatewayUrlResolver = unifiedPushGatewayUrlResolver
@@ -277,7 +273,7 @@ class VectorUnifiedPushMessagingReceiverTest {
             this.removedGatewayHandler = removedGatewayHandler
             this.endpointRegistrationHandler = endpointRegistrationHandler
             this.coroutineScope = this@createVectorUnifiedPushMessagingReceiver
-            this.pushHandlingWakeLock = pushHandlingWakeLock
+            this.fetchPushForegroundServiceManager = pushHandlingWakeLock
         }
     }
 }
diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt
index 8ad2d62b33..fe9494a2c8 100644
--- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt
+++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt
@@ -56,7 +56,6 @@ class UserPushStoreDataStore(
     private val currentPushKey = stringPreferencesKey("currentPushKey")
     private val notificationEnabled = booleanPreferencesKey("notificationEnabled")
     private val ignoreRegistrationError = booleanPreferencesKey("ignoreRegistrationError")
-
     override suspend fun getPushProviderName(): String? {
         return store.data.first()[pushProviderName]
     }
diff --git a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStoreTest.kt b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStoreTest.kt
index 9191ea4ab4..773a5e3430 100644
--- a/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStoreTest.kt
+++ b/libraries/pushstore/impl/src/test/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStoreTest.kt
@@ -14,14 +14,12 @@ import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.preferences.test.FakePreferenceDataStoreFactory
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class UserPushStoreDataStoreTest {
+class UserPushStoreDataStoreTest : RobolectricTest() {
     @Test
     fun `test getPushProviderName`() = runTest {
         val sut = createUserPushStoreDataStore()
diff --git a/libraries/qrcode/build.gradle.kts b/libraries/qrcode/build.gradle.kts
index cf76e117c0..1cf6a8cdff 100644
--- a/libraries/qrcode/build.gradle.kts
+++ b/libraries/qrcode/build.gradle.kts
@@ -20,4 +20,5 @@ dependencies {
     implementation(libs.androidx.camera.camera2)
     implementation(libs.zxing.cpp)
     implementation(libs.google.zxing)
+    implementation(libs.google.guava)
 }
diff --git a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
index 18bd1cff10..cae7452cd8 100644
--- a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeCameraView.kt
@@ -18,6 +18,7 @@ import androidx.camera.view.PreviewView
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -114,7 +115,8 @@ fun QrCodeCameraView(
     Box(modifier.clipToBounds()) {
         if (LocalInspectionMode.current) {
             Box(
-                modifier = modifier
+                modifier = Modifier
+                    .fillMaxSize()
                     .background(color = ElementTheme.colors.bgSubtlePrimary),
                 contentAlignment = Alignment.Center,
             ) {
diff --git a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt
index e045e42f17..b50b202e2c 100644
--- a/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt
+++ b/libraries/qrcode/src/main/kotlin/io/element/android/libraries/qrcode/QrCodeImage.kt
@@ -57,8 +57,8 @@ private fun BitMatrix.toBitmap(
 @Composable
 fun QrCodeImage(
     data: String,
-    forceMaxBrightness: Boolean = true,
     modifier: Modifier = Modifier,
+    forceMaxBrightness: Boolean = true,
 ) {
     if (forceMaxBrightness) {
         ForceMaxBrightness()
diff --git a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt b/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt
deleted file mode 100644
index 161dd0cc56..0000000000
--- a/libraries/recentemojis/impl/src/main/kotlin/io/element/android/libraries/recentemojis/impl/DefaultEmojibaseProvider.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.libraries.recentemojis.impl
-
-import android.content.Context
-import io.element.android.emojibasebindings.EmojibaseDatasource
-import io.element.android.emojibasebindings.EmojibaseStore
-import io.element.android.libraries.recentemojis.api.EmojibaseProvider
-
-class DefaultEmojibaseProvider(val context: Context) : EmojibaseProvider {
-    override val emojibaseStore: EmojibaseStore by lazy {
-        EmojibaseDatasource().load(context)
-    }
-}
diff --git a/libraries/recentemojis/test/build.gradle.kts b/libraries/recentemojis/test/build.gradle.kts
deleted file mode 100644
index 7c32d162ee..0000000000
--- a/libraries/recentemojis/test/build.gradle.kts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-plugins {
-    id("io.element.android-library")
-}
-
-android {
-    namespace = "io.element.android.libraries.recentemojis.test"
-}
-
-dependencies {
-    api(projects.libraries.matrix.api)
-    api(libs.coroutines.core)
-
-    implementation(libs.kotlinx.collections.immutable)
-    implementation(libs.coroutines.test)
-    implementation(projects.tests.testutils)
-    implementation(projects.libraries.recentemojis.api)
-    implementation(libs.matrix.emojibase.bindings)
-}
diff --git a/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectEntryPoint.kt b/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectEntryPoint.kt
index ba5ca79d40..3c5c5d5ac3 100644
--- a/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectEntryPoint.kt
+++ b/libraries/roomselect/api/src/main/kotlin/io/element/android/libraries/roomselect/api/RoomSelectEntryPoint.kt
@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 interface RoomSelectEntryPoint : FeatureEntryPoint {
     data class Params(
         val mode: RoomSelectMode,
+        val maxNumberOfRooms: Int,
     )
 
     fun createNode(
@@ -30,4 +31,8 @@ interface RoomSelectEntryPoint : FeatureEntryPoint {
         fun onRoomSelected(roomIds: List<RoomId>)
         fun onCancel()
     }
+
+    companion object {
+        const val DEFAULT_MAX_NUMBER_OF_ROOMS = 10
+    }
 }
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPoint.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPoint.kt
index 4ca92663a9..ff3ba06f0d 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPoint.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPoint.kt
@@ -26,7 +26,10 @@ class DefaultRoomSelectEntryPoint : RoomSelectEntryPoint {
         return parentNode.createNode<RoomSelectNode>(
             buildContext = buildContext,
             plugins = listOf(
-                RoomSelectNode.Inputs(mode = params.mode),
+                RoomSelectNode.Inputs(
+                    mode = params.mode,
+                    maxNumberOfRooms = params.maxNumberOfRooms,
+                ),
                 callback,
             )
         )
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvents.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvent.kt
similarity index 60%
rename from libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvents.kt
rename to libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvent.kt
index a3512c419c..13c5bc5f8d 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvents.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectEvent.kt
@@ -10,11 +10,8 @@ package io.element.android.libraries.roomselect.impl
 
 import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
 
-sealed interface RoomSelectEvents {
-    data class SetSelectedRoom(val room: SelectRoomInfo) : RoomSelectEvents
-
-    // TODO remove to restore multi-selection
-    data object RemoveSelectedRoom : RoomSelectEvents
-    data object ToggleSearchActive : RoomSelectEvents
-    data class UpdateVisibleRange(val range: IntRange) : RoomSelectEvents
+sealed interface RoomSelectEvent {
+    data class ToggleSelectedRoom(val room: SelectRoomInfo) : RoomSelectEvent
+    data object ToggleSearchActive : RoomSelectEvent
+    data class UpdateVisibleRange(val range: IntRange) : RoomSelectEvent
 }
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectNode.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectNode.kt
index 943da643c6..0297f13066 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectNode.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectNode.kt
@@ -35,10 +35,14 @@ class RoomSelectNode(
 ) : Node(buildContext, plugins = plugins) {
     data class Inputs(
         val mode: RoomSelectMode,
+        val maxNumberOfRooms: Int,
     ) : NodeInputs
 
     private val inputs: Inputs = inputs()
-    private val presenter = presenterFactory.create(inputs.mode)
+    private val presenter = presenterFactory.create(
+        mode = inputs.mode,
+        maxNumberOfRooms = inputs.maxNumberOfRooms,
+    )
     private val stateFlow = launchMolecule { presenter.present() }
     private val callback: RoomSelectEntryPoint.Callback = callback()
 
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
index b7547b8a45..618f30a3e8 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenter.kt
@@ -34,11 +34,15 @@ import kotlinx.coroutines.launch
 @AssistedInject
 class RoomSelectPresenter(
     @Assisted private val mode: RoomSelectMode,
+    @Assisted private val maxNumberOfRooms: Int,
     private val dataSourceFactory: RoomSelectSearchDataSource.Factory,
 ) : Presenter<RoomSelectState> {
     @AssistedFactory
     fun interface Factory {
-        fun create(mode: RoomSelectMode): RoomSelectPresenter
+        fun create(
+            mode: RoomSelectMode,
+            maxNumberOfRooms: Int,
+        ): RoomSelectPresenter
     }
 
     @Composable
@@ -61,27 +65,24 @@ class RoomSelectPresenter(
             derivedStateOf {
                 when {
                     roomSummaryDetailsList.isNotEmpty() -> SearchBarResultState.Results(roomSummaryDetailsList.toImmutableList())
-                    isSearchActive -> SearchBarResultState.NoResultsFound()
-                    else -> SearchBarResultState.Initial()
+                    isSearchActive -> SearchBarResultState.NoResultsFound
+                    else -> SearchBarResultState.Initial
                 }
             }
         }
 
-        fun handleEvent(event: RoomSelectEvents) {
+        fun handleEvent(event: RoomSelectEvent) {
             when (event) {
-                is RoomSelectEvents.SetSelectedRoom -> {
-                    selectedRooms = persistentListOf(event.room)
-                    // Restore for multi-selection
-//                    val index = selectedRooms.indexOfFirst { it.roomId == event.room.roomId }
-//                    selectedRooms = if (index >= 0) {
-//                        selectedRooms.removeAt(index)
-//                    } else {
-//                        selectedRooms.add(event.room)
-//                    }
+                is RoomSelectEvent.ToggleSelectedRoom -> {
+                    val index = selectedRooms.indexOfFirst { it.roomId == event.room.roomId }
+                    selectedRooms = if (index >= 0) {
+                        selectedRooms.removingAt(index)
+                    } else {
+                        selectedRooms.adding(event.room)
+                    }
                 }
-                RoomSelectEvents.RemoveSelectedRoom -> selectedRooms = persistentListOf()
-                RoomSelectEvents.ToggleSearchActive -> isSearchActive = !isSearchActive
-                is RoomSelectEvents.UpdateVisibleRange -> coroutineScope.launch {
+                RoomSelectEvent.ToggleSearchActive -> isSearchActive = !isSearchActive
+                is RoomSelectEvent.UpdateVisibleRange -> coroutineScope.launch {
                     dataSource.updateVisibleRange(event.range)
                 }
             }
@@ -89,6 +90,7 @@ class RoomSelectPresenter(
 
         return RoomSelectState(
             mode = mode,
+            maxNumberOfRooms = maxNumberOfRooms,
             resultState = searchResults,
             searchQuery = queryState,
             isSearchActive = isSearchActive,
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt
index 927a1c02d6..aadb7c10d1 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectState.kt
@@ -16,9 +16,12 @@ import kotlinx.collections.immutable.ImmutableList
 
 data class RoomSelectState(
     val mode: RoomSelectMode,
+    val maxNumberOfRooms: Int,
     val resultState: SearchBarResultState<ImmutableList<SelectRoomInfo>>,
     val searchQuery: TextFieldState,
     val isSearchActive: Boolean,
     val selectedRooms: ImmutableList<SelectRoomInfo>,
-    val eventSink: (RoomSelectEvents) -> Unit
-)
+    val eventSink: (RoomSelectEvent) -> Unit,
+) {
+    val canSelectMoreRooms = selectedRooms.size < maxNumberOfRooms
+}
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
index b0d18659b6..e57266b7e7 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectStateProvider.kt
@@ -40,18 +40,26 @@ open class RoomSelectStateProvider : PreviewParameterProvider<RoomSelectState> {
                 mode = RoomSelectMode.Share,
                 resultState = SearchBarResultState.Results(aRoomSelectRoomList()),
             ),
+            aRoomSelectState(
+                mode = RoomSelectMode.Share,
+                resultState = SearchBarResultState.Results(aRoomSelectRoomList()),
+                selectedRooms = aRoomSelectRoomList().subList(0, 1),
+                maxNumberOfRooms = 1,
+            ),
         )
 }
 
 internal fun aRoomSelectState(
     mode: RoomSelectMode = RoomSelectMode.Forward,
-    resultState: SearchBarResultState<ImmutableList<SelectRoomInfo>> = SearchBarResultState.Initial(),
+    maxNumberOfRooms: Int = 10,
+    resultState: SearchBarResultState<ImmutableList<SelectRoomInfo>> = SearchBarResultState.Initial,
     searchQuery: String = "",
     isSearchActive: Boolean = false,
     selectedRooms: ImmutableList<SelectRoomInfo> = persistentListOf(),
-    eventSink: (RoomSelectEvents) -> Unit = {},
+    eventSink: (RoomSelectEvent) -> Unit = {},
 ) = RoomSelectState(
     mode = mode,
+    maxNumberOfRooms = maxNumberOfRooms,
     resultState = resultState,
     searchQuery = TextFieldState(initialText = searchQuery),
     isSearchActive = isSearchActive,
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
index 69f091ddc4..7153306746 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
@@ -44,8 +44,8 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Checkbox
 import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
-import io.element.android.libraries.designsystem.theme.components.RadioButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.SearchBar
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
@@ -53,6 +53,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.utils.OnVisibleRangeChangeEffect
+import io.element.android.libraries.designsystem.utils.lazyColumnContentPadding
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.SelectedRoom
 import io.element.android.libraries.matrix.ui.model.SelectRoomInfo
@@ -71,26 +73,30 @@ fun RoomSelectView(
     onSubmit: (List<RoomId>) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    @Suppress("UNUSED_PARAMETER")
     fun onRoomRemoved(roomInfo: SelectRoomInfo) {
-        // TODO toggle selection when multi-selection is enabled
-        state.eventSink(RoomSelectEvents.RemoveSelectedRoom)
+        state.eventSink(RoomSelectEvent.ToggleSelectedRoom(roomInfo))
     }
 
     @Composable
-    fun SelectedRoomsHelper(isForwarding: Boolean, selectedRooms: ImmutableList<SelectRoomInfo>) {
-        if (isForwarding) return
-        SelectedRooms(
-            selectedRooms = selectedRooms,
-            onRemoveRoom = ::onRoomRemoved,
-            modifier = Modifier.padding(vertical = 16.dp)
-        )
+    fun SelectedRoomsHelper(
+        selectedRooms: ImmutableList<SelectRoomInfo>,
+        showVerticalSpace: Boolean,
+    ) {
+        if (selectedRooms.isNotEmpty()) {
+            SelectedRooms(
+                selectedRooms = selectedRooms,
+                onRemoveRoom = ::onRoomRemoved,
+                modifier = Modifier.padding(vertical = 16.dp)
+            )
+        } else if (showVerticalSpace) {
+            Spacer(modifier = Modifier.height(20.dp))
+        }
     }
 
     var canHandleBack by remember { mutableStateOf(true) }
     fun onBackButton(state: RoomSelectState) {
         if (state.isSearchActive) {
-            state.eventSink(RoomSelectEvents.ToggleSearchActive)
+            state.eventSink(RoomSelectEvent.ToggleSearchActive)
         } else if (canHandleBack) {
             canHandleBack = false
             onDismiss()
@@ -104,7 +110,7 @@ fun RoomSelectView(
 
     val lazyListState = rememberLazyListState()
     OnVisibleRangeChangeEffect(lazyListState) { visibleRange ->
-        state.eventSink(RoomSelectEvents.UpdateVisibleRange(visibleRange))
+        state.eventSink(RoomSelectEvent.UpdateVisibleRange(visibleRange))
     }
 
     Scaffold(
@@ -129,7 +135,8 @@ fun RoomSelectView(
                     )
                 }
             )
-        }
+        },
+        contentWindowInsets = scaffoldScrollableContentInsets,
     ) { paddingValues ->
         Column(
             Modifier
@@ -141,16 +148,18 @@ fun RoomSelectView(
                 placeHolderTitle = stringResource(CommonStrings.action_search),
                 queryState = state.searchQuery,
                 active = state.isSearchActive,
-                onActiveChange = { state.eventSink(RoomSelectEvents.ToggleSearchActive) },
+                onActiveChange = { state.eventSink(RoomSelectEvent.ToggleSearchActive) },
                 resultState = state.resultState,
                 showBackButton = false,
             ) { summaries ->
-                LazyColumn(state = lazyListState) {
+                LazyColumn(
+                    state = lazyListState,
+                    contentPadding = lazyColumnContentPadding,
+                ) {
                     item {
                         SelectedRoomsHelper(
-                            // TODO state.isForwarding
-                            isForwarding = false,
-                            selectedRooms = state.selectedRooms
+                            selectedRooms = state.selectedRooms,
+                            showVerticalSpace = false,
                         )
                     }
                     items(summaries, key = { it.roomId.value }) { roomSummary ->
@@ -159,8 +168,9 @@ fun RoomSelectView(
                                 roomSummary,
                                 isSelected = state.selectedRooms.any { it.roomId == roomSummary.roomId },
                                 onSelection = { roomSummary ->
-                                    state.eventSink(RoomSelectEvents.SetSelectedRoom(roomSummary))
-                                }
+                                    state.eventSink(RoomSelectEvent.ToggleSelectedRoom(roomSummary))
+                                },
+                                canBeSelected = state.canSelectMoreRooms,
                             )
                             HorizontalDivider(modifier = Modifier.fillMaxWidth())
                         }
@@ -169,13 +179,10 @@ fun RoomSelectView(
             }
 
             if (!state.isSearchActive) {
-                // TODO restore for multi-selection
-//                SelectedRoomsHelper(
-//                    isForwarding = state.isForwarding,
-//                    selectedRooms = state.selectedRooms
-//                )
-                Spacer(modifier = Modifier.height(20.dp))
-
+                SelectedRoomsHelper(
+                    selectedRooms = state.selectedRooms,
+                    showVerticalSpace = true,
+                )
                 if (state.resultState is SearchBarResultState.Results) {
                     LazyColumn(state = lazyListState) {
                         items(state.resultState.results, key = { it.roomId.value }) { roomSummary ->
@@ -184,8 +191,9 @@ fun RoomSelectView(
                                     roomSummary,
                                     isSelected = state.selectedRooms.any { it.roomId == roomSummary.roomId },
                                     onSelection = { roomSummary ->
-                                        state.eventSink(RoomSelectEvents.SetSelectedRoom(roomSummary))
-                                    }
+                                        state.eventSink(RoomSelectEvent.ToggleSelectedRoom(roomSummary))
+                                    },
+                                    canBeSelected = state.canSelectMoreRooms,
                                 )
                                 HorizontalDivider(modifier = Modifier.fillMaxWidth())
                             }
@@ -218,6 +226,7 @@ private fun SelectedRooms(
 private fun RoomSummaryView(
     roomInfo: SelectRoomInfo,
     isSelected: Boolean,
+    canBeSelected: Boolean,
     onSelection: (SelectRoomInfo) -> Unit,
 ) {
     Row(
@@ -262,7 +271,11 @@ private fun RoomSummaryView(
                 )
             }
         }
-        RadioButton(selected = isSelected, onClick = { onSelection(roomInfo) })
+        Checkbox(
+            checked = isSelected,
+            enabled = isSelected || canBeSelected,
+            onCheckedChange = { onSelection(roomInfo) },
+        )
     }
 }
 
diff --git a/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPointTest.kt b/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPointTest.kt
index a99a0396c2..6863c1ce20 100644
--- a/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPointTest.kt
+++ b/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/DefaultRoomSelectEntryPointTest.kt
@@ -9,7 +9,6 @@
 package io.element.android.libraries.roomselect.impl
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -17,14 +16,13 @@ import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class DefaultRoomSelectEntryPointTest {
+class DefaultRoomSelectEntryPointTest : RobolectricTest() {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
@@ -33,13 +31,15 @@ class DefaultRoomSelectEntryPointTest {
     fun `test node builder`() = runTest {
         val entryPoint = DefaultRoomSelectEntryPoint()
         val testMode = RoomSelectMode.Share
+        val testMaxNumberOfRooms = 12
         val parentNode = TestParentNode.create { buildContext, plugins ->
             RoomSelectNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                presenterFactory = { mode ->
+                presenterFactory = { mode, maxNumberOfRooms ->
                     assertThat(mode).isEqualTo(testMode)
-                    createRoomSelectPresenter(mode)
+                    assertThat(maxNumberOfRooms).isEqualTo(testMaxNumberOfRooms)
+                    createRoomSelectPresenter(mode, maxNumberOfRooms)
                 },
             )
         }
@@ -47,7 +47,10 @@ class DefaultRoomSelectEntryPointTest {
             override fun onRoomSelected(roomIds: List<RoomId>) = lambdaError()
             override fun onCancel() = lambdaError()
         }
-        val params = RoomSelectEntryPoint.Params(testMode)
+        val params = RoomSelectEntryPoint.Params(
+            mode = testMode,
+            maxNumberOfRooms = testMaxNumberOfRooms,
+        )
         val result = entryPoint.createNode(
             parentNode = parentNode,
             buildContext = BuildContext.root(null),
@@ -55,7 +58,7 @@ class DefaultRoomSelectEntryPointTest {
             callback = callback,
         )
         assertThat(result).isInstanceOf(RoomSelectNode::class.java)
-        assertThat(result.plugins).contains(RoomSelectNode.Inputs(params.mode))
+        assertThat(result.plugins).contains(RoomSelectNode.Inputs(params.mode, params.maxNumberOfRooms))
         assertThat(result.plugins).contains(callback)
     }
 }
diff --git a/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt b/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt
index 67c1b52231..b5a4ccfd12 100644
--- a/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt
+++ b/libraries/roomselect/impl/src/test/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectPresenterTest.kt
@@ -9,9 +9,6 @@
 package io.element.android.libraries.roomselect.impl
 
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
@@ -20,10 +17,12 @@ import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeDynamicRoomList
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.ui.model.toSelectRoomInfo
+import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
 import io.element.android.libraries.roomselect.api.RoomSelectMode
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.test
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
@@ -40,26 +39,24 @@ class RoomSelectPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createRoomSelectPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.selectedRooms).isEmpty()
             assertThat(initialState.resultState).isInstanceOf(SearchBarResultState.Initial::class.java)
             assertThat(initialState.isSearchActive).isFalse()
+            assertThat(initialState.maxNumberOfRooms).isEqualTo(10)
+            assertThat(initialState.canSelectMoreRooms).isTrue()
         }
     }
 
     @Test
     fun `present - toggle search active`() = runTest {
         val presenter = createRoomSelectPresenter()
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
-            initialState.eventSink(RoomSelectEvents.ToggleSearchActive)
+            initialState.eventSink(RoomSelectEvent.ToggleSearchActive)
             assertThat(awaitItem().isSearchActive).isTrue()
-            initialState.eventSink(RoomSelectEvents.ToggleSearchActive)
+            initialState.eventSink(RoomSelectEvent.ToggleSearchActive)
             assertThat(awaitItem().isSearchActive).isFalse()
         }
     }
@@ -76,15 +73,13 @@ class RoomSelectPresenterTest {
         val presenter = createRoomSelectPresenter(
             roomListService = roomListService
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             val expectedRoomInfo = roomSummary.toSelectRoomInfo()
             // Do not compare the lambda because they will be different. So copy the lambda from expectedRoomSummary to result
             val result = (awaitItem().resultState as SearchBarResultState.Results).results
             assertThat(result).isEqualTo(listOf(expectedRoomInfo))
-            initialState.eventSink(RoomSelectEvents.ToggleSearchActive)
+            initialState.eventSink(RoomSelectEvent.ToggleSearchActive)
             skipItems(1)
             initialState.searchQuery.setTextAndPlaceCursorAtEnd("string not contained")
             assertThat(
@@ -110,17 +105,22 @@ class RoomSelectPresenterTest {
             createRoomListLambda = { roomList }
         )
         val presenter = createRoomSelectPresenter(
+            maxNumberOfRooms = 1,
             roomListService = roomListService,
         )
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             val roomInfo = roomSummary.toSelectRoomInfo()
-            initialState.eventSink(RoomSelectEvents.SetSelectedRoom(roomInfo))
-            assertThat(awaitItem().selectedRooms).isEqualTo(persistentListOf(roomInfo))
-            initialState.eventSink(RoomSelectEvents.RemoveSelectedRoom)
-            assertThat(awaitItem().selectedRooms).isEmpty()
+            initialState.eventSink(RoomSelectEvent.ToggleSelectedRoom(roomInfo))
+            awaitItem().let {
+                assertThat(it.selectedRooms).isEqualTo(persistentListOf(roomInfo))
+                assertThat(it.canSelectMoreRooms).isFalse()
+                it.eventSink(RoomSelectEvent.ToggleSelectedRoom(roomInfo))
+            }
+            awaitItem().let {
+                assertThat(it.selectedRooms).isEmpty()
+                assertThat(it.canSelectMoreRooms).isTrue()
+            }
             cancel()
         }
     }
@@ -136,9 +136,7 @@ class RoomSelectPresenterTest {
             createRoomListLambda = { roomList }
         )
         val presenter = createRoomSelectPresenter(roomListService = roomListService)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
+        presenter.test {
             val initialState = awaitItem()
             // Post some rooms to simulate loaded content
             val rooms = (1..10).map { aRoomSummary() }
@@ -146,7 +144,7 @@ class RoomSelectPresenterTest {
             skipItems(1)
 
             // UpdateVisibleRange near end should trigger loadMore
-            initialState.eventSink(RoomSelectEvents.UpdateVisibleRange(IntRange(0, 9)))
+            initialState.eventSink(RoomSelectEvent.UpdateVisibleRange(IntRange(0, 9)))
             // Give time for the coroutine to complete
             testScheduler.advanceUntilIdle()
 
@@ -157,9 +155,11 @@ class RoomSelectPresenterTest {
 
 internal fun TestScope.createRoomSelectPresenter(
     mode: RoomSelectMode = RoomSelectMode.Forward,
+    maxNumberOfRooms: Int = RoomSelectEntryPoint.DEFAULT_MAX_NUMBER_OF_ROOMS,
     roomListService: RoomListService = FakeRoomListService(),
 ) = RoomSelectPresenter(
     mode = mode,
+    maxNumberOfRooms = maxNumberOfRooms,
     dataSourceFactory = object : RoomSelectSearchDataSource.Factory {
         override fun create(coroutineScope: CoroutineScope): RoomSelectSearchDataSource {
             return RoomSelectSearchDataSource(
diff --git a/libraries/rustls-tls/README.md b/libraries/rustls-tls/README.md
new file mode 100644
index 0000000000..aa45fe6743
--- /dev/null
+++ b/libraries/rustls-tls/README.md
@@ -0,0 +1,9 @@
+This module is a wrapper for the Android code distributed in the rustls-platform-verifier-android crate.
+
+To avoid the distribution mess that this library has (download a Rust crate, then search for it using Gradle and use it as local maven repo),
+we previously just manually updated the AAR file instead using a script. This won't work for F-Droid because the AAR library is a black box with
+no sources attached to it, so we can't use it like that.
+
+Instead, for the time being, we're adding the single `CertificateVerifier.kt` class this AAR had in it as part of our sources.
+
+When this file is updated, the [UPDATED.md](./UPDATED.md) file should be updated too with the commit SHA of the new version.
diff --git a/libraries/rustls-tls/UPDATED.md b/libraries/rustls-tls/UPDATED.md
new file mode 100644
index 0000000000..10dba2dd53
--- /dev/null
+++ b/libraries/rustls-tls/UPDATED.md
@@ -0,0 +1,7 @@
+Below is the commit SHA in [rustls-platform-verifier](https://github.com/rustls/rustls-platform-verifier) library used to update the code in this module:
+
+```
+996b1c903491641b17b3c9afb65d1352f6fc6b76
+```
+
+Please update it after making manual changes.
diff --git a/libraries/rustls-tls/build.gradle.kts b/libraries/rustls-tls/build.gradle.kts
new file mode 100644
index 0000000000..85f3f4c476
--- /dev/null
+++ b/libraries/rustls-tls/build.gradle.kts
@@ -0,0 +1,24 @@
+import extension.buildConfigFieldBoolean
+
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "org.rustls.platformverifier"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    defaultConfig {
+        buildConfigFieldBoolean("TEST", false)
+    }
+}
diff --git a/libraries/rustls-tls/src/main/kotlin/org/rustls/platformverifier/CertificateVerifier.kt b/libraries/rustls-tls/src/main/kotlin/org/rustls/platformverifier/CertificateVerifier.kt
new file mode 100644
index 0000000000..b70413ffe5
--- /dev/null
+++ b/libraries/rustls-tls/src/main/kotlin/org/rustls/platformverifier/CertificateVerifier.kt
@@ -0,0 +1,398 @@
+@file:SuppressLint("LogNotTimber", "ObsoleteSdkInt")
+@file:Suppress("KotlinConstantConditions")
+
+// IMPORTANT: this file comes from rustls-platform-verifier and should not be modified locally.
+
+/*
+ * Copyright (c) 2022 1Password
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+package org.rustls.platformverifier
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.http.X509TrustManagerExtensions
+import android.util.Log
+import java.io.ByteArrayInputStream
+import java.io.File
+import java.security.KeyStore
+import java.security.KeyStoreException
+import java.security.MessageDigest
+import java.security.PublicKey
+import java.security.cert.CertificateException
+import java.security.cert.CertificateExpiredException
+import java.security.cert.CertificateFactory
+import java.security.cert.CertificateNotYetValidException
+import java.security.cert.CertificateParsingException
+import java.security.cert.X509Certificate
+import java.util.Date
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+import javax.security.auth.x500.X500Principal
+
+// If this is updated, update the Rust definition too.
+// Marked private as this is not meant to be used in Android code.
+private enum class StatusCode(val value: Int) {
+    Ok(0),
+    Unavailable(1),
+    Expired(2),
+    UnknownCert(3),
+    Revoked(4),
+    InvalidEncoding(5),
+    InvalidExtension(6),
+}
+
+// Marked private as this is not meant to be used in Android code.
+private class VerificationResult(
+    status: StatusCode,
+    @Suppress("unused") val message: String? = null
+) {
+    @Suppress("unused")
+    private val code: Int = status.value
+}
+
+// NOTE: All TrustManager and certificate validation methods are not thread safe. These
+// are all guarded by Kotlin's `Synchronized` accessors to prevent undefined behavior.
+
+// Only JNI and test code calls this, so unused code warnings are suppressed.
+// Internal for test code - no other Kotlin code should use this object directly.
+@Suppress("unused")
+// We want to show a difference between Kotlin-side logs and those in Rust code
+@SuppressLint("LongLogTag")
+internal object CertificateVerifier {
+    private const val TAG = "rustls-platform-verifier-android"
+
+    private fun createTrustManager(keystore: KeyStore?): X509TrustManagerExtensions? {
+        // This can never throw since the default algorithm is used.
+        val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+
+        factory.init(keystore)
+
+        val availableTrustManagers = try {
+            factory.trustManagers
+        } catch (e: RuntimeException) {
+            Log.w(TAG, "exception thrown creating a TrustManager: $e")
+            return null
+        }
+
+        for (manager in availableTrustManagers) {
+            if (manager is X509TrustManager) {
+                // Kotlin ensures this can't throw at runtime since it knows that
+                // it must be the correct type by now.
+                return X509TrustManagerExtensions(manager)
+            }
+        }
+
+        Log.e(TAG, "failed to find a usable trust manager")
+        return null
+    }
+
+    private fun makeLazyTrustManager(keystore: KeyStore?): Lazy<X509TrustManagerExtensions?> {
+        // Ensure the keystore is loaded. Since all of the trust managers are initialized in a
+        // `Lazy`, this will only run once.
+        keystore?.load(null)
+
+        return lazy { createTrustManager(keystore) }
+    }
+
+    // -- Test only --
+    // Ideally, all of this will be optimized out at compile time due to not being accessed
+    // in release builds.
+
+    @get:Synchronized
+    private val mockKeystore: KeyStore = KeyStore.getInstance(KeyStore.getDefaultType())
+
+    @get:Synchronized
+    private var mockTrustManager: Lazy<X509TrustManagerExtensions?> =
+        makeLazyTrustManager(mockKeystore)
+
+    @JvmStatic
+    private fun addMockRoot(root: ByteArray) {
+        if (!BuildConfig.TEST) {
+            throw Exception("attempted to add a mock root outside a test!")
+        }
+
+        val alias = "root_${mockKeystore.size()}"
+        // Throwing here is fine since test roots should always be well-formed
+        val cert = certFactory.generateCertificate(ByteArrayInputStream(root))
+        mockKeystore.setCertificateEntry(alias, cert)
+
+        reloadMockData()
+    }
+
+    @JvmStatic
+    private fun clearMockRoots() {
+        // Reload to get a completely fresh internal state
+        mockKeystore.load(null)
+        reloadMockData()
+    }
+
+    @JvmStatic
+    private fun reloadMockData() {
+        if (mockTrustManager.isInitialized()) {
+            mockTrustManager = makeLazyTrustManager(mockKeystore)
+        }
+    }
+
+    // Get a list of the system's root CAs.
+    // Function is public for testing only.
+    @JvmStatic
+    fun getSystemRootCAs(): List<X509Certificate> {
+        val rootCAs = mutableListOf<X509Certificate>()
+
+        val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+        factory.init(systemKeystore)
+
+        val availableTrustManagers = try {
+            factory.trustManagers
+        } catch (e: RuntimeException) {
+            Log.w(TAG, "exception thrown creating a TrustManager: $e")
+            return rootCAs
+        }
+
+        availableTrustManagers.forEach { trustManager ->
+            if (trustManager is X509TrustManager) {
+                rootCAs.addAll(trustManager.acceptedIssuers)
+            }
+        }
+
+        return rootCAs
+    }
+
+    // -- End testing requirements --
+
+    private val certFactory: CertificateFactory = CertificateFactory.getInstance("X.509")
+
+    private var systemTrustAnchorCache = hashSetOf<Pair<X500Principal, PublicKey>>()
+
+    @get:Synchronized
+    private var systemCertificateDirectory: File? = System.getenv("ANDROID_ROOT")?.let { rootPath ->
+        File("$rootPath/etc/security/cacerts")
+    }
+
+    @get:Synchronized
+    private val systemKeystore: KeyStore? = try {
+        KeyStore.getInstance("AndroidCAStore")
+    } catch (_: KeyStoreException) {
+        null
+    }
+
+    @get:Synchronized
+    private val systemTrustManager: Lazy<X509TrustManagerExtensions?> =
+        makeLazyTrustManager(systemKeystore)
+
+    @JvmStatic
+    private fun verifyCertificateChain(
+        @Suppress("UNUSED_PARAMETER") context: Context,
+        serverName: String,
+        authMethod: String,
+        allowedEkus: Array<String>,
+        ocspResponse: ByteArray?,
+        time: Long,
+        certChain: Array<ByteArray>
+    ): VerificationResult {
+        // Convert the array of (supposedly) DER bytes into certificates.
+        val certificateChain = mutableListOf<X509Certificate>()
+        certChain.forEach { certBytes ->
+            val certificate = try {
+                certFactory.generateCertificate(ByteArrayInputStream(certBytes))
+            } catch (e: CertificateException) {
+                return VerificationResult(StatusCode.InvalidEncoding)
+            }
+            certificateChain.add(certificate as X509Certificate)
+        }
+
+        // Will never throw `ArrayIndexOutOfBoundsException` because `rustls`'s `ServerCertVerifier` trait
+        // has a mandatory `end_entity` parameter in `verify_server_cert`.
+        val endEntity = certificateChain[0]
+
+        // Check that the certificate is valid at the point of time provided by `rustls`.
+        try {
+            endEntity.checkValidity(Date(time))
+        } catch (e: CertificateExpiredException) {
+            return VerificationResult(StatusCode.Expired)
+        } catch (e: CertificateNotYetValidException) {
+            return VerificationResult(StatusCode.Expired)
+        }
+
+        // Check that this certificate can be used in a TLS server.
+        if (!verifyCertUsage(endEntity, allowedEkus)) {
+            return VerificationResult(StatusCode.InvalidExtension)
+        }
+
+        // Select the trust manager to use.
+        //
+        // We select them as follows:
+        // - If built for release, only use the system trust manager. This should let all test-related
+        // code be optimized out.
+        // - If built for tests:
+        //      - If the mock CA store has any values, use the mock trust manager.
+        //      - Otherwise, use the system trust manager.
+        val (trustManager, keystore) = if (!BuildConfig.TEST) {
+            val trustManager =
+                systemTrustManager.value ?: return VerificationResult(StatusCode.Unavailable)
+            Pair(trustManager, systemKeystore)
+        } else {
+            if (mockKeystore.size() != 0) {
+                val trustManager = mockTrustManager.value!!
+                Pair(trustManager, mockKeystore)
+            } else {
+                val trustManager =
+                    systemTrustManager.value ?: return VerificationResult(StatusCode.Unavailable)
+                Pair(trustManager, systemKeystore)
+            }
+        }
+
+        // Verify that the certificate chain is valid and correct, and nothing more.
+        //
+        // NOTE: This does not validate `serverName` is valid for the end-entity certificate.
+        // That is handled in Rust as Android/Java do not currently provide a RFC 6125 compliant
+        // hostname verifier. Additionally, even the RFC 2818 verifier is not available until API 24.
+        //
+        // `serverName` is only used for pinning/CT requirements.
+        //
+        // Returns the "the properly ordered chain used for verification as a list of X509Certificates.",
+        // meaning a list from end-entity certificate to trust-anchor.
+        val validChain = try {
+            trustManager.checkServerTrusted(certificateChain.toTypedArray(), authMethod, serverName)
+        } catch (e: CertificateException) {
+            // In test configurations we may see `checkServerTrusted` fail once vendored test
+            // certificates pass their expiry date. We try to avoid that by using a fixed
+            // verification time when calling `endEntity.checkValidity` above, however we can't
+            // fix the time for the `checkServerTrusted` call.
+            //
+            // To make diagnosing CI test failures easier we try to find the root cause of
+            // checkServerTrusted failing, returning a different `StatusCode` as appropriate.
+            if (BuildConfig.TEST) {
+                var rootCause: Throwable? = e
+                while (rootCause?.cause != null && rootCause.cause != rootCause) {
+                    rootCause = rootCause.cause
+                }
+                return when (rootCause) {
+                    is CertificateExpiredException, is CertificateNotYetValidException -> VerificationResult(
+                        StatusCode.Expired,
+                        rootCause.toString()
+                    )
+
+                    else -> VerificationResult(StatusCode.UnknownCert, rootCause.toString())
+                }
+            }
+            // In non-test configurations we should have caught expiry errors earlier and
+            // can simply return an unknown cert error without digging through the exception
+            // cause chain.
+            return VerificationResult(StatusCode.UnknownCert, e.toString())
+        }
+
+        // TEST ONLY: Mock test suite cannot attempt to check revocation status if no OSCP data has been stapled,
+        // because Android requires certificates to an specify OCSP responder for network fetch in this case.
+        // If in testing w/o OCSP stapled, short-circuit here - only prior checks apply.
+        if (BuildConfig.TEST && (mockKeystore.size() != 0) && (ocspResponse == null)) {
+            return VerificationResult(StatusCode.Ok)
+        }
+
+        // =================================================================================================
+        // IMPORTANT! DIFF WITH THE ORIGINAL SOURCES HERE:
+        //
+        // We removed the cert revocation checks because Android won't do them by default
+        // and supporting them would be quite difficult given CRLs won't work out of the box.
+        //
+        // See https://github.com/rustls/rustls-platform-verifier/issues/221 for more info.
+        // =================================================================================================
+
+        return VerificationResult(StatusCode.Ok)
+    }
+
+    private fun verifyCertUsage(certificate: X509Certificate, allowedEkus: Array<String>): Boolean {
+        val ekus = try {
+            certificate.extendedKeyUsage
+        }
+        // This should be unreachable, but could happen.
+        catch (_: CertificateParsingException) {
+            return false
+        } catch (_: NullPointerException) {
+            // According to Chromium's implementation, this can crash when the EKU data is malformed.
+            Log.w(TAG, "exception handling certificate EKU")
+            return false
+        } ?: return true // If the list is empty, we have nothing to do.
+
+        return ekus.any { allowedEkus.contains(it) }
+    }
+
+    // Android hashes a principal using the first four bytes of its MD5 digest, encoded in
+    // lowercase hex and reversed.
+    //
+    // Ref: https://source.chromium.org/chromium/chromium/src/+/main:net/android/java/src/org/chromium/net/X509Util.java;l=339
+    private fun hashPrincipal(principal: X500Principal): String {
+        val hexDigits = "0123456789abcdef".toCharArray()
+        val digest = MessageDigest.getInstance("MD5").digest(principal.encoded)
+        val hexChars = CharArray(8)
+
+        for (i in 0..3) {
+            // Kotlin doesn't support bitwise operators for bytes, only Int and Long.
+            val digestByte = digest[3 - i].toInt()
+            hexChars[2 * i] = hexDigits[(digestByte shr 4) and 0xf]
+            hexChars[2 * i + 1] = hexDigits[digestByte and 0xf]
+        }
+
+        return String(hexChars)
+    }
+
+    // Check if CA root is known or not.
+    // Known means installed in root CA store, either a preset public CA or a custom one installed by an enterprise/user.
+    //
+    // Ref: https://source.chromium.org/chromium/chromium/src/+/main:net/android/java/src/org/chromium/net/X509Util.java;l=351
+    fun isKnownRoot(root: X509Certificate): Boolean {
+        // System keystore and cert directory must be non-null to perform checking
+        systemKeystore?.let { loadedSystemKeystore ->
+            systemCertificateDirectory?.let { loadedSystemCertificateDirectory ->
+
+                // Check the in-memory cache first
+                val key = Pair(root.subjectX500Principal, root.publicKey)
+                if (systemTrustAnchorCache.contains(key)) {
+                    return true
+                }
+
+                // System trust anchors are stored under a hash of the principal.
+                // In case of collisions, append number.
+                val hash = hashPrincipal(root.subjectX500Principal)
+                var i = 0
+                while (true) {
+                    val alias = "$hash.$i"
+
+                    if (!File(loadedSystemCertificateDirectory, alias).exists()) {
+                        break
+                    }
+
+                    val anchor = loadedSystemKeystore.getCertificate("system:$alias")
+
+                    // It's possible for `anchor` to be `null` if the user deleted a trust anchor.
+                    // Continue iterating as there may be further collisions after the deleted anchor.
+                    if (anchor == null) {
+                        continue
+                        // This should never happen
+                    } else if (anchor !is X509Certificate) {
+                        // SAFETY: This logs a unique identifier (hash value) only in cases where a file within the
+                        // system's root trust store is not a valid X509 certificate (extremely unlikely error).
+                        // The hash doesn't tell us any sensitive information about the invalid cert or reveal any of
+                        // its contents - it just lets us ID the bad file if a user is having TLS failure issues.
+                        Log.e(TAG, "anchor is not a certificate, alias: $alias")
+                        continue
+                        // If subject and public key match, it's a system root.
+                    } else {
+                        if ((root.subjectX500Principal == anchor.subjectX500Principal) && (root.publicKey == anchor.publicKey)) {
+                            systemTrustAnchorCache.add(key)
+                            return true
+                        }
+                    }
+
+                    i += 1
+                }
+            }
+        }
+
+        // Not found in cache or store: non-public
+        return false
+    }
+}
diff --git a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionData.kt b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionData.kt
index 568dbe7e3a..88cf9558b3 100644
--- a/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionData.kt
+++ b/libraries/session-storage/api/src/main/kotlin/io/element/android/libraries/sessionstorage/api/SessionData.kt
@@ -24,8 +24,8 @@ data class SessionData(
     val refreshToken: String?,
     /** The homeserver URL of the session. */
     val homeserverUrl: String,
-    /** The Open ID Connect info for this session, if any. */
-    val oidcData: String?,
+    /** The Open Authorization info for this session, if any. */
+    val oAuthData: String?,
     /** The timestamp of the last login. May be `null` in very old sessions. */
     val loginTimestamp: Date?,
     /** Whether the [accessToken] is valid or not. */
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
index ea69709bbd..316bf86c1c 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/SessionDataMapper.kt
@@ -20,7 +20,7 @@ internal fun SessionData.toDbModel(): DbSessionData {
         accessToken = accessToken,
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
-        oidcData = oidcData,
+        oidcData = oAuthData,
         loginTimestamp = loginTimestamp?.time,
         isTokenValid = if (isTokenValid) 1L else 0L,
         loginType = loginType.name,
@@ -41,7 +41,7 @@ internal fun DbSessionData.toApiModel(): SessionData {
         accessToken = accessToken,
         refreshToken = refreshToken,
         homeserverUrl = homeserverUrl,
-        oidcData = oidcData,
+        oAuthData = oidcData,
         loginTimestamp = loginTimestamp?.let { Date(it) },
         isTokenValid = isTokenValid == 1L,
         loginType = LoginType.fromName(loginType ?: LoginType.UNKNOWN.name),
diff --git a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt
index fb2c9a2c78..8955aa4a27 100644
--- a/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt
+++ b/libraries/session-storage/impl/src/main/kotlin/io/element/android/libraries/sessionstorage/impl/di/SessionStorageModule.kt
@@ -17,7 +17,9 @@ import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.libraries.sessionstorage.impl.SessionDatabase
 import io.element.encrypteddb.SqlCipherDriverFactory
-import io.element.encrypteddb.passphrase.RandomSecretPassphraseProvider
+import io.element.encrypteddb.passphrase.RandomDatabaseSecretProvider
+import io.element.encrypteddb.utils.ReplaceDatabaseKey
+import timber.log.Timber
 
 @BindingContainer
 @ContributesTo(AppScope::class)
@@ -36,9 +38,20 @@ object SessionStorageModule {
             parentDir.mkdirs()
         }
 
-        val passphraseProvider = RandomSecretPassphraseProvider(context, secretFile)
+        val rekeyMigrationVersion = 11L
+        val passphraseProvider = RandomDatabaseSecretProvider(context, secretFile)
         val driver = SqlCipherDriverFactory(passphraseProvider)
-            .create(SessionDatabase.Schema, "$name.db", context)
+            .create(
+                schema = SessionDatabase.Schema,
+                name = "$name.db",
+                context = context,
+            ) { db, oldVersion, newVersion ->
+                Timber.d("Migrating $name database from version $oldVersion to $newVersion")
+                if (rekeyMigrationVersion in oldVersion..newVersion) {
+                    ReplaceDatabaseKey(passphraseProvider).replaceKey(name, db)
+                }
+            }
+
         return SessionDatabase(driver)
     }
 }
diff --git a/libraries/session-storage/impl/src/main/sqldelight/migrations/11.sqm b/libraries/session-storage/impl/src/main/sqldelight/migrations/11.sqm
new file mode 100644
index 0000000000..3d61c92c07
--- /dev/null
+++ b/libraries/session-storage/impl/src/main/sqldelight/migrations/11.sqm
@@ -0,0 +1,2 @@
+-- Migrate DB from version 11
+-- Dummy migration to trigger a re-key
diff --git a/libraries/session-storage/test/build.gradle.kts b/libraries/session-storage/test/build.gradle.kts
index cfdc3018a9..7a89746812 100644
--- a/libraries/session-storage/test/build.gradle.kts
+++ b/libraries/session-storage/test/build.gradle.kts
@@ -14,6 +14,7 @@ android {
 }
 
 dependencies {
+    implementation(libs.coroutines.core)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.sessionStorage.api)
 }
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
index c791a20620..c5acd77755 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/SessionData.kt
@@ -30,7 +30,7 @@ fun aSessionData(
         accessToken = accessToken,
         refreshToken = refreshToken,
         homeserverUrl = "aHomeserverUrl",
-        oidcData = null,
+        oAuthData = null,
         loginTimestamp = null,
         isTokenValid = isTokenValid,
         loginType = LoginType.UNKNOWN,
diff --git a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/FakeSessionObserver.kt b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/FakeSessionObserver.kt
index fdf5cc5f1b..a7c3a6837b 100644
--- a/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/FakeSessionObserver.kt
+++ b/libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/observer/FakeSessionObserver.kt
@@ -10,12 +10,13 @@ package io.element.android.libraries.sessionstorage.test.observer
 
 import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import java.util.concurrent.CopyOnWriteArraySet
 
 class FakeSessionObserver : SessionObserver {
-    private val _listeners = mutableListOf<SessionListener>()
+    private val _listeners = CopyOnWriteArraySet<SessionListener>()
 
     val listeners: List<SessionListener>
-        get() = _listeners
+        get() = _listeners.toList()
 
     override fun addListener(listener: SessionListener) {
         _listeners.add(listener)
diff --git a/libraries/slashcommands/api/build.gradle.kts b/libraries/slashcommands/api/build.gradle.kts
new file mode 100644
index 0000000000..8cec0e65af
--- /dev/null
+++ b/libraries/slashcommands/api/build.gradle.kts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.slashcommands.api"
+}
+
+dependencies {
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/ChatEffect.kt b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/ChatEffect.kt
new file mode 100644
index 0000000000..7b31ffb3b7
--- /dev/null
+++ b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/ChatEffect.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.api
+
+enum class ChatEffect {
+    CONFETTI,
+    SNOWFALL
+}
diff --git a/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/MessagePrefix.kt b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/MessagePrefix.kt
new file mode 100644
index 0000000000..713458c720
--- /dev/null
+++ b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/MessagePrefix.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.api
+
+enum class MessagePrefix {
+    Shrug,
+    TableFlip,
+    Unflip,
+    Lenny,
+}
diff --git a/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommand.kt b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommand.kt
new file mode 100644
index 0000000000..50d5a5ce32
--- /dev/null
+++ b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommand.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.api
+
+import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.UserId
+
+/**
+ * Represent a slash command.
+ */
+sealed interface SlashCommand {
+    // This is not a Slash command
+    data object NotACommand : SlashCommand
+
+    // Slash command types:
+    sealed interface Error : SlashCommand
+    sealed interface SlashCommandSendMessage : SlashCommand
+    sealed interface SlashCommandAdmin : SlashCommand
+    sealed interface SlashCommandNavigation : SlashCommand
+
+    // Errors
+    data class ErrorEmptySlashCommand(val message: String) : Error
+    data class ErrorCommandNotSupportedInThreads(val message: String) : Error
+
+    // Unknown/Unsupported slash command
+    data class ErrorUnknownSlashCommand(val message: String) : Error
+
+    // A slash command is detected, but there is an error
+    data class ErrorSyntax(val message: String) : Error
+
+    // Valid commands:
+    data class SendPlainText(val message: CharSequence) : SlashCommandSendMessage
+    data class SendEmote(val message: CharSequence) : SlashCommandSendMessage
+    data class SendRainbow(val message: CharSequence) : SlashCommandSendMessage
+    data class SendRainbowEmote(val message: CharSequence) : SlashCommandSendMessage
+    data class BanUser(val userId: UserId, val reason: String?) : SlashCommandAdmin
+    data class UnbanUser(val userId: UserId, val reason: String?) : SlashCommandAdmin
+    data class IgnoreUser(val userId: UserId) : SlashCommandAdmin
+    data class UnignoreUser(val userId: UserId) : SlashCommandAdmin
+    data class SetUserPowerLevel(val userId: UserId, val powerLevel: Int?) : SlashCommandAdmin
+    data class ChangeRoomName(val name: String) : SlashCommandAdmin
+    data class Invite(val userId: UserId, val reason: String?) : SlashCommandAdmin
+    data class JoinRoom(val roomIdOrAlias: RoomIdOrAlias, val reason: String?) : SlashCommandAdmin
+    data class ChangeTopic(val topic: String) : SlashCommandAdmin
+    data class RemoveUser(val userId: UserId, val reason: String?) : SlashCommandAdmin
+    data class ChangeDisplayName(val displayName: String) : SlashCommandAdmin
+    data class ChangeDisplayNameForRoom(val displayName: String) : SlashCommandAdmin
+    data class ChangeRoomAvatar(val url: String) : SlashCommandAdmin
+    data class ChangeAvatar(val url: String) : SlashCommandAdmin
+    data class ChangeAvatarForRoom(val url: String) : SlashCommandAdmin
+    data class SendSpoiler(val message: String) : SlashCommandSendMessage
+    data class SendWithPrefix(val prefix: MessagePrefix, val message: CharSequence) : SlashCommandSendMessage
+    data object DiscardSession : SlashCommandAdmin
+    data class SendChatEffect(val chatEffect: ChatEffect, val message: String) : SlashCommandSendMessage
+    data object LeaveRoom : SlashCommandAdmin
+    data class UpgradeRoom(val newVersion: String) : SlashCommandAdmin
+
+    data object DevTools : SlashCommandNavigation
+    data class ShowUser(val userId: UserId) : SlashCommandNavigation
+}
+
+fun SlashCommand.Error.message() = when (this) {
+    is SlashCommand.ErrorEmptySlashCommand -> message
+    is SlashCommand.ErrorCommandNotSupportedInThreads -> message
+    is SlashCommand.ErrorUnknownSlashCommand -> message
+    is SlashCommand.ErrorSyntax -> message
+}
diff --git a/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandService.kt b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandService.kt
new file mode 100644
index 0000000000..9dfca26078
--- /dev/null
+++ b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandService.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.api
+
+import io.element.android.libraries.matrix.api.timeline.Timeline
+
+interface SlashCommandService {
+    suspend fun getSuggestions(
+        text: String,
+        isInThread: Boolean,
+    ): List<SlashCommandSuggestion>
+
+    /**
+     * Parse the message and return a SlashCommand.
+     */
+    suspend fun parse(
+        textMessage: CharSequence,
+        formattedMessage: String?,
+        isInThreadTimeline: Boolean,
+    ): SlashCommand
+
+    /**
+     * Proceed a SlashCommandSendMessage.
+     */
+    suspend fun proceedSendMessage(
+        slashCommand: SlashCommand.SlashCommandSendMessage,
+        timeline: Timeline,
+    ): Result<Unit>
+
+    /**
+     * Proceed a SlashCommandAdmin.
+     */
+    suspend fun proceedAdmin(
+        slashCommand: SlashCommand.SlashCommandAdmin,
+    ): Result<Unit>
+}
diff --git a/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandSuggestion.kt b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandSuggestion.kt
new file mode 100644
index 0000000000..5a826d5fbd
--- /dev/null
+++ b/libraries/slashcommands/api/src/main/kotlin/io/element/android/libraries/slashcommands/api/SlashCommandSuggestion.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.api
+
+data class SlashCommandSuggestion(
+    val command: String,
+    val parameters: String?,
+    val description: String,
+)
diff --git a/libraries/slashcommands/impl/build.gradle.kts b/libraries/slashcommands/impl/build.gradle.kts
new file mode 100644
index 0000000000..8e10b09b71
--- /dev/null
+++ b/libraries/slashcommands/impl/build.gradle.kts
@@ -0,0 +1,36 @@
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.slashcommands.impl"
+}
+
+setupDependencyInjection()
+
+dependencies {
+    implementation(libs.coroutines.core)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.api)
+    api(projects.libraries.slashcommands.api)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.featureflag.api)
+    implementation(projects.services.toolbox.api)
+
+    testCommonDependencies(libs)
+    testImplementation(projects.libraries.featureflag.test)
+    testImplementation(projects.libraries.preferences.test)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.services.toolbox.test)
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/Command.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/Command.kt
new file mode 100644
index 0000000000..5df871e361
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/Command.kt
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import androidx.annotation.StringRes
+
+/**
+ * Defines the command line operations.
+ * The user can write these messages to perform some actions.
+ * The list will be displayed in this order.
+ */
+enum class Command(
+    val command: String,
+    val aliases: List<String>? = null,
+    val parameters: String? = null,
+    @StringRes val description: Int,
+    val isAllowedInThread: Boolean = true,
+    val isSupported: Boolean = true,
+    val isDevCommand: Boolean = false,
+) {
+    CRASH_APP(
+        command = "/crash",
+        description = R.string.slash_command_description_crash_application,
+        isDevCommand = true,
+    ),
+    EMOTE(
+        command = "/me",
+        parameters = "<message>",
+        description = R.string.slash_command_description_emote,
+    ),
+    BAN_USER(
+        command = "/ban",
+        parameters = "<user-id> [reason]",
+        description = R.string.slash_command_description_ban_user,
+    ),
+    UNBAN_USER(
+        command = "/unban",
+        parameters = "<user-id> [reason]",
+        description = R.string.slash_command_description_unban_user,
+    ),
+    IGNORE_USER(
+        command = "/ignore",
+        parameters = "<user-id> [reason]",
+        description = R.string.slash_command_description_ignore_user,
+    ),
+    UNIGNORE_USER(
+        command = "/unignore",
+        parameters = "<user-id>",
+        description = R.string.slash_command_description_unignore_user,
+    ),
+    SET_USER_POWER_LEVEL(
+        command = "/op",
+        parameters = "<user-id> [<power-level>]",
+        description = R.string.slash_command_description_op_user,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    RESET_USER_POWER_LEVEL(
+        command = "/deop",
+        parameters = "<user-id>",
+        description = R.string.slash_command_description_deop_user,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    ROOM_NAME(
+        command = "/roomname",
+        parameters = "<name>",
+        description = R.string.slash_command_description_room_name,
+        isAllowedInThread = false,
+    ),
+    INVITE(
+        command = "/invite",
+        parameters = "<user-id> [reason]",
+        description = R.string.slash_command_description_invite_user,
+    ),
+    JOIN_ROOM(
+        command = "/join",
+        aliases = listOf("/j", "/goto"),
+        parameters = "<room-address> [reason]",
+        description = R.string.slash_command_description_join_room,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    TOPIC(
+        command = "/topic",
+        parameters = "<topic>",
+        description = R.string.slash_command_description_topic,
+        isAllowedInThread = false,
+    ),
+    REMOVE_USER(
+        command = "/remove",
+        aliases = listOf("/kick"),
+        parameters = "<user-id> [reason]",
+        description = R.string.slash_command_description_remove_user,
+    ),
+    CHANGE_DISPLAY_NAME(
+        command = "/nick",
+        parameters = "<display-name>",
+        description = R.string.slash_command_description_nick,
+    ),
+    CHANGE_DISPLAY_NAME_FOR_ROOM(
+        command = "/myroomnick",
+        aliases = listOf("/roomnick"),
+        parameters = "<display-name>",
+        description = R.string.slash_command_description_nick_for_room,
+        isAllowedInThread = false,
+        isSupported = true,
+    ),
+    ROOM_AVATAR(
+        command = "/roomavatar",
+        parameters = "<mxc_url>",
+        description = R.string.slash_command_description_room_avatar,
+        isAllowedInThread = false,
+        // Dev command since user has to know the mxc url
+        isDevCommand = true,
+        isSupported = false,
+    ),
+    CHANGE_AVATAR(
+        command = "/myavatar",
+        parameters = "<mxc_url>",
+        description = R.string.slash_command_description_avatar,
+        isAllowedInThread = false,
+        // Dev command since user has to know the mxc url
+        isDevCommand = true,
+        isSupported = false,
+    ),
+    CHANGE_AVATAR_FOR_ROOM(
+        command = "/myroomavatar",
+        parameters = "<mxc_url>",
+        description = R.string.slash_command_description_avatar_for_room,
+        isAllowedInThread = false,
+        // Dev command since user has to know the mxc url
+        isDevCommand = true,
+        isSupported = false,
+    ),
+    RAINBOW(
+        command = "/rainbow",
+        parameters = "<message>",
+        description = R.string.slash_command_description_rainbow,
+    ),
+    RAINBOW_EMOTE(
+        command = "/rainbowme",
+        parameters = "<message>",
+        description = R.string.slash_command_description_rainbow_emote,
+    ),
+    DEVTOOLS(
+        command = "/devtools",
+        description = R.string.slash_command_description_devtools,
+        isDevCommand = true,
+    ),
+    SPOILER(
+        command = "/spoiler",
+        parameters = "<message>",
+        description = R.string.slash_command_description_spoiler,
+    ),
+    SHRUG(
+        command = "/shrug",
+        parameters = "<message>",
+        description = R.string.slash_command_description_shrug,
+    ),
+    LENNY(
+        command = "/lenny",
+        parameters = "<message>",
+        description = R.string.slash_command_description_lenny,
+    ),
+    PLAIN(
+        command = "/plain",
+        parameters = "<message>",
+        description = R.string.slash_command_description_plain,
+    ),
+    WHOIS(
+        command = "/whois",
+        parameters = "<user-id>",
+        description = R.string.slash_command_description_whois,
+    ),
+    DISCARD_SESSION(
+        command = "/discardsession",
+        description = R.string.slash_command_description_discard_session,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    CONFETTI(
+        command = "/confetti",
+        parameters = "<message>",
+        description = R.string.slash_command_confetti,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    SNOWFALL(
+        command = "/snowfall",
+        parameters = "<message>",
+        description = R.string.slash_command_snow,
+        isAllowedInThread = false,
+        isSupported = false,
+    ),
+    LEAVE_ROOM(
+        command = "/leave",
+        aliases = listOf("/part"),
+        description = R.string.slash_command_description_leave_room,
+        isAllowedInThread = false,
+        isDevCommand = true,
+    ),
+    UPGRADE_ROOM(
+        command = "/upgraderoom",
+        parameters = "newVersion",
+        description = R.string.slash_command_description_upgrade_room,
+        isAllowedInThread = false,
+        isDevCommand = true,
+        isSupported = false,
+    ),
+    TABLE_FLIP(
+        command = "/tableflip",
+        parameters = "<message>",
+        description = R.string.slash_command_description_table_flip,
+    ),
+    UNFLIP(
+        command = "/unflip",
+        parameters = "<message>",
+        description = R.string.slash_command_description_unflip,
+    );
+
+    val allAliases = listOf(command) + aliases.orEmpty()
+
+    /**
+     * Checks if the input command matches any of the command aliases, ignoring case.
+     * Do not exclude not supported commands so that user can discover that the command is not supported.
+     * Used for whole command parsing.
+     */
+    fun matches(inputCommand: CharSequence) = allAliases.any { it.contentEquals(inputCommand, true) }
+
+    /**
+     * Checks if the input is a prefix of any of the command aliases, ignoring the first character (the slash), and excluding not supported command.
+     * Used for suggestions.
+     */
+    fun startsWith(input: CharSequence) = isSupported &&
+        allAliases.any { it.startsWith(input, 1, true) }
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutor.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutor.kt
new file mode 100644
index 0000000000..01bac5825b
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutor.kt
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.timeline.MsgType
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.slashcommands.api.MessagePrefix
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.impl.rainbow.RainbowGenerator
+import io.element.android.services.toolbox.api.strings.StringProvider
+
+@Inject
+class CommandExecutor(
+    private val matrixClient: MatrixClient,
+    private val joinedRoom: JoinedRoom,
+    private val rainbowGenerator: RainbowGenerator,
+    private val stringProvider: StringProvider,
+) {
+    suspend fun proceedSendMessage(
+        slashCommand: SlashCommand.SlashCommandSendMessage,
+        timeline: Timeline,
+    ): Result<Unit> {
+        return when (slashCommand) {
+            is SlashCommand.SendChatEffect -> sendChatEffect()
+            is SlashCommand.SendEmote -> sendEmote(slashCommand, timeline)
+            is SlashCommand.SendWithPrefix -> sendPrefixedMessage(slashCommand.prefix, slashCommand.message, timeline)
+            is SlashCommand.SendPlainText -> sendPlainText(slashCommand, timeline)
+            is SlashCommand.SendRainbow -> sendRainbow(slashCommand, timeline)
+            is SlashCommand.SendRainbowEmote -> sendRainbowEmote(slashCommand, timeline)
+            is SlashCommand.SendSpoiler -> sendSpoiler(slashCommand, timeline)
+        }
+    }
+
+    suspend fun proceedAdmin(
+        slashCommand: SlashCommand.SlashCommandAdmin,
+    ): Result<Unit> {
+        return when (slashCommand) {
+            is SlashCommand.BanUser -> banUser(slashCommand)
+            is SlashCommand.ChangeAvatar -> changeAvatar()
+            is SlashCommand.ChangeAvatarForRoom -> changeAvatarForRoom()
+            is SlashCommand.ChangeDisplayName -> changeDisplayName(slashCommand)
+            is SlashCommand.ChangeDisplayNameForRoom -> changeDisplayNameForRoom(slashCommand)
+            is SlashCommand.ChangeRoomAvatar -> changeRoomAvatar()
+            is SlashCommand.ChangeRoomName -> changeRoomName(slashCommand)
+            is SlashCommand.ChangeTopic -> changeTopic(slashCommand)
+            is SlashCommand.DiscardSession -> discardSession()
+            is SlashCommand.IgnoreUser -> ignoreUser(slashCommand)
+            is SlashCommand.Invite -> invite(slashCommand)
+            is SlashCommand.JoinRoom -> joinRoom(slashCommand)
+            is SlashCommand.LeaveRoom -> leaveRoom(joinedRoom)
+            is SlashCommand.RemoveUser -> removeUser(slashCommand)
+            is SlashCommand.SetUserPowerLevel -> setUserPowerLevel()
+            is SlashCommand.UnbanUser -> unbanUser(slashCommand)
+            is SlashCommand.UnignoreUser -> unignoreUser(slashCommand)
+            is SlashCommand.UpgradeRoom -> upgradeRoom()
+        }
+    }
+
+    private fun upgradeRoom(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun unignoreUser(slashCommand: SlashCommand.UnignoreUser): Result<Unit> {
+        return matrixClient.unignoreUser(slashCommand.userId)
+    }
+
+    private suspend fun unbanUser(slashCommand: SlashCommand.UnbanUser): Result<Unit> {
+        return joinedRoom.unbanUser(slashCommand.userId, slashCommand.reason)
+    }
+
+    private fun setUserPowerLevel(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun sendSpoiler(slashCommand: SlashCommand.SendSpoiler, timeline: Timeline): Result<Unit> {
+        val text = "[${stringProvider.getString(R.string.common_spoiler)}](${slashCommand.message})"
+        val formattedText = "<span data-mx-spoiler>${slashCommand.message}</span>"
+        return timeline.sendMessage(
+            body = text,
+            htmlBody = formattedText,
+            intentionalMentions = emptyList(),
+        )
+    }
+
+    private suspend fun sendRainbowEmote(slashCommand: SlashCommand.SendRainbowEmote, timeline: Timeline): Result<Unit> {
+        val message = slashCommand.message.toString()
+        return timeline.sendMessage(
+            body = message,
+            htmlBody = rainbowGenerator.generate(message),
+            msgType = MsgType.MSG_TYPE_EMOTE,
+            intentionalMentions = emptyList(),
+        )
+    }
+
+    private suspend fun sendRainbow(slashCommand: SlashCommand.SendRainbow, timeline: Timeline): Result<Unit> {
+        val message = slashCommand.message.toString()
+        return timeline.sendMessage(
+            body = message,
+            htmlBody = rainbowGenerator.generate(message),
+            intentionalMentions = emptyList(),
+        )
+    }
+
+    private suspend fun sendPlainText(slashCommand: SlashCommand.SendPlainText, timeline: Timeline): Result<Unit> {
+        return timeline.sendMessage(
+            body = slashCommand.message.toString(),
+            htmlBody = null,
+            intentionalMentions = emptyList(),
+            asPlainText = true,
+        )
+    }
+
+    private suspend fun sendEmote(slashCommand: SlashCommand.SendEmote, timeline: Timeline): Result<Unit> {
+        val message = slashCommand.message.toString()
+        return timeline.sendMessage(
+            body = message,
+            htmlBody = null,
+            msgType = MsgType.MSG_TYPE_EMOTE,
+            intentionalMentions = emptyList(),
+        )
+    }
+
+    private fun sendChatEffect(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun removeUser(slashCommand: SlashCommand.RemoveUser): Result<Unit> {
+        return joinedRoom.kickUser(slashCommand.userId, slashCommand.reason)
+    }
+
+    private suspend fun leaveRoom(
+        room: JoinedRoom,
+    ): Result<Unit> {
+        return room.leave()
+    }
+
+    private suspend fun joinRoom(slashCommand: SlashCommand.JoinRoom): Result<Unit> {
+        return matrixClient.joinRoomByIdOrAlias(slashCommand.roomIdOrAlias, emptyList())
+            .map {}
+    }
+
+    private suspend fun invite(slashCommand: SlashCommand.Invite): Result<Unit> {
+        return joinedRoom.inviteUserById(slashCommand.userId)
+    }
+
+    private suspend fun ignoreUser(slashCommand: SlashCommand.IgnoreUser): Result<Unit> {
+        return matrixClient.ignoreUser(slashCommand.userId)
+    }
+
+    private fun discardSession(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun changeTopic(slashCommand: SlashCommand.ChangeTopic): Result<Unit> {
+        return joinedRoom.setTopic(slashCommand.topic)
+    }
+
+    private suspend fun changeRoomName(slashCommand: SlashCommand.ChangeRoomName): Result<Unit> {
+        return joinedRoom.setName(slashCommand.name)
+    }
+
+    private fun changeRoomAvatar(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun changeDisplayNameForRoom(slashCommand: SlashCommand.ChangeDisplayNameForRoom): Result<Unit> {
+        return joinedRoom.setOwnMemberDisplayName(slashCommand.displayName)
+    }
+
+    private suspend fun changeDisplayName(slashCommand: SlashCommand.ChangeDisplayName): Result<Unit> {
+        return matrixClient.setDisplayName(slashCommand.displayName)
+    }
+
+    private fun changeAvatar(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private fun changeAvatarForRoom(): Result<Unit> {
+        return Result.failure(Exception("Not yet implemented"))
+    }
+
+    private suspend fun banUser(slashCommand: SlashCommand.BanUser): Result<Unit> {
+        return joinedRoom.banUser(slashCommand.userId, slashCommand.reason)
+    }
+
+    private suspend fun sendPrefixedMessage(
+        prefix: MessagePrefix,
+        message: CharSequence,
+        timeline: Timeline,
+    ): Result<Unit> {
+        val sequence = buildString {
+            append(prefix.toMarkdown())
+            if (message.isNotEmpty()) {
+                append(" ")
+                append(message)
+            }
+        }
+        return timeline.sendMessage(
+            body = sequence,
+            htmlBody = null,
+            intentionalMentions = emptyList(),
+        )
+    }
+}
+
+private fun MessagePrefix.toMarkdown() = when (this) {
+    MessagePrefix.Shrug -> "¯\\\\_(ツ)\\_/¯"
+    MessagePrefix.TableFlip -> "(╯°□°）╯︵ ┻━┻"
+    MessagePrefix.Unflip -> "┬──┬ ノ( ゜-゜ノ)"
+    MessagePrefix.Lenny -> "( ͡° ͜ʖ ͡°)"
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandParser.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandParser.kt
new file mode 100644
index 0000000000..55125af20b
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/CommandParser.kt
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.matrix.api.core.MatrixPatterns
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.mxc.isMxcUrl
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.slashcommands.api.ChatEffect
+import io.element.android.libraries.slashcommands.api.MessagePrefix
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.services.toolbox.api.strings.StringProvider
+import kotlinx.coroutines.flow.first
+import timber.log.Timber
+
+@Inject
+class CommandParser(
+    private val appPreferencesStore: AppPreferencesStore,
+    private val featureFlagService: FeatureFlagService,
+    private val stringProvider: StringProvider,
+) {
+    /**
+     * Convert the text message into a Slash command.
+     *
+     * @param textMessage the text message in plain text
+     * @param formattedMessage the text messaged in HTML format
+     * @param isInThreadTimeline true if the user is currently typing in a thread
+     * @return a parsed slash command (ok or error)
+     */
+    suspend fun parseSlashCommand(
+        textMessage: CharSequence,
+        formattedMessage: String?,
+        isInThreadTimeline: Boolean,
+    ): SlashCommand {
+        if (!featureFlagService.isFeatureEnabled(FeatureFlags.SlashCommand)) {
+            return SlashCommand.NotACommand
+        }
+        // check if it has the Slash marker
+        val message = formattedMessage ?: textMessage
+        return if (!message.startsWith("/")) {
+            SlashCommand.NotACommand
+        } else {
+            // "/" only
+            if (message.length == 1) {
+                return SlashCommand.ErrorEmptySlashCommand(
+                    stringProvider.getString(R.string.slash_command_unrecognized, "/")
+                )
+            }
+            // Exclude "//"
+            if ("/" == message.substring(1, 2)) {
+                return SlashCommand.NotACommand
+            }
+            val (messageParts, message) = extractMessage(message.toString())
+                ?: return SlashCommand.ErrorEmptySlashCommand(
+                    stringProvider.getString(R.string.slash_command_unrecognized, "/")
+                )
+            val slashCommand = messageParts.first()
+            getNotSupportedByThreads(isInThreadTimeline, slashCommand)?.let {
+                return SlashCommand.ErrorCommandNotSupportedInThreads(
+                    stringProvider.getString(
+                        R.string.slash_command_not_supported_in_threads,
+                        it.command,
+                    )
+                )
+            }
+            when {
+                Command.PLAIN.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.SendPlainText(message = message)
+                    } else {
+                        syntaxError(Command.PLAIN)
+                    }
+                }
+                Command.CHANGE_DISPLAY_NAME.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.ChangeDisplayName(displayName = message)
+                    } else {
+                        syntaxError(Command.CHANGE_DISPLAY_NAME)
+                    }
+                }
+                Command.CHANGE_DISPLAY_NAME_FOR_ROOM.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.ChangeDisplayNameForRoom(displayName = message)
+                    } else {
+                        syntaxError(Command.CHANGE_DISPLAY_NAME_FOR_ROOM)
+                    }
+                }
+                Command.ROOM_AVATAR.matches(slashCommand) -> {
+                    if (messageParts.size == 2) {
+                        val url = messageParts[1]
+                        if (url.isMxcUrl()) {
+                            SlashCommand.ChangeRoomAvatar(url)
+                        } else {
+                            syntaxError(Command.ROOM_AVATAR)
+                        }
+                    } else {
+                        syntaxError(Command.ROOM_AVATAR)
+                    }
+                }
+                Command.CHANGE_AVATAR.matches(slashCommand) -> {
+                    if (messageParts.size == 2) {
+                        val url = messageParts[1]
+                        if (url.isMxcUrl()) {
+                            SlashCommand.ChangeAvatar(url)
+                        } else {
+                            syntaxError(Command.CHANGE_AVATAR)
+                        }
+                    } else {
+                        syntaxError(Command.CHANGE_AVATAR)
+                    }
+                }
+                Command.CHANGE_AVATAR_FOR_ROOM.matches(slashCommand) -> {
+                    if (messageParts.size == 2) {
+                        val url = messageParts[1]
+
+                        if (url.isMxcUrl()) {
+                            SlashCommand.ChangeAvatarForRoom(url)
+                        } else {
+                            syntaxError(Command.CHANGE_AVATAR_FOR_ROOM)
+                        }
+                    } else {
+                        syntaxError(Command.CHANGE_AVATAR_FOR_ROOM)
+                    }
+                }
+                Command.TOPIC.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.ChangeTopic(topic = message)
+                    } else {
+                        syntaxError(Command.TOPIC)
+                    }
+                }
+                Command.EMOTE.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.SendEmote(message)
+                    } else {
+                        syntaxError(Command.EMOTE)
+                    }
+                }
+                Command.RAINBOW.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.SendRainbow(message)
+                    } else {
+                        syntaxError(Command.RAINBOW)
+                    }
+                }
+                Command.RAINBOW_EMOTE.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.SendRainbowEmote(message)
+                    } else {
+                        syntaxError(Command.RAINBOW_EMOTE)
+                    }
+                }
+                Command.JOIN_ROOM.matches(slashCommand) -> {
+                    if (messageParts.size >= 2) {
+                        val id = messageParts[1]
+                        val roomIdOrAlias = RoomIdOrAlias.from(id)
+                        if (roomIdOrAlias != null) {
+                            SlashCommand.JoinRoom(
+                                RoomIdOrAlias.Id(RoomId(id)),
+                                trimParts(textMessage, messageParts.take(2))
+                            )
+                        } else {
+                            syntaxError(Command.JOIN_ROOM)
+                        }
+                    } else {
+                        syntaxError(Command.JOIN_ROOM)
+                    }
+                }
+                Command.ROOM_NAME.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.ChangeRoomName(name = message)
+                    } else {
+                        syntaxError(Command.ROOM_NAME)
+                    }
+                }
+                Command.INVITE.matches(slashCommand) -> {
+                    if (messageParts.size >= 2) {
+                        parseUserId(messageParts)
+                            ?.let { userId ->
+                                SlashCommand.Invite(
+                                    userId = userId,
+                                    reason = trimParts(textMessage, messageParts.take(2))
+                                )
+                            }
+                            ?: syntaxError(Command.INVITE)
+                    } else {
+                        syntaxError(Command.INVITE)
+                    }
+                }
+                Command.REMOVE_USER.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.RemoveUser(
+                                userId = userId,
+                                reason = trimParts(textMessage, messageParts.take(2))
+                            )
+                        }
+                        ?: syntaxError(Command.REMOVE_USER)
+                }
+                Command.BAN_USER.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.BanUser(
+                                userId = userId,
+                                reason = trimParts(textMessage, messageParts.take(2))
+                            )
+                        }
+                        ?: syntaxError(Command.BAN_USER)
+                }
+                Command.UNBAN_USER.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.UnbanUser(
+                                userId = userId,
+                                reason = trimParts(textMessage, messageParts.take(2))
+                            )
+                        }
+                        ?: syntaxError(Command.UNBAN_USER)
+                }
+                Command.IGNORE_USER.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.IgnoreUser(
+                                userId = userId,
+                            )
+                        }
+                        ?: syntaxError(Command.IGNORE_USER)
+                }
+                Command.UNIGNORE_USER.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.UnignoreUser(
+                                userId = userId,
+                            )
+                        }
+                        ?: syntaxError(Command.UNIGNORE_USER)
+                }
+                Command.SET_USER_POWER_LEVEL.matches(slashCommand) -> {
+                    if (messageParts.size == 3) {
+                        val userId = parseUserId(messageParts)
+                        if (userId != null) {
+                            val powerLevelsAsString = messageParts[2]
+                            try {
+                                val powerLevelsAsInt = Integer.parseInt(powerLevelsAsString)
+                                SlashCommand.SetUserPowerLevel(
+                                    userId = userId,
+                                    powerLevel = powerLevelsAsInt
+                                )
+                            } catch (_: Exception) {
+                                syntaxError(Command.SET_USER_POWER_LEVEL)
+                            }
+                        } else {
+                            syntaxError(Command.SET_USER_POWER_LEVEL)
+                        }
+                    } else {
+                        syntaxError(Command.SET_USER_POWER_LEVEL)
+                    }
+                }
+                Command.RESET_USER_POWER_LEVEL.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.SetUserPowerLevel(
+                                userId = userId,
+                                powerLevel = null
+                            )
+                        }
+                        ?: syntaxError(Command.SET_USER_POWER_LEVEL)
+                }
+                Command.DEVTOOLS.matches(slashCommand) -> {
+                    if (messageParts.size == 1) {
+                        SlashCommand.DevTools
+                    } else {
+                        syntaxError(Command.DEVTOOLS)
+                    }
+                }
+                Command.SPOILER.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.SendSpoiler(message)
+                    } else {
+                        syntaxError(Command.SPOILER)
+                    }
+                }
+                Command.SHRUG.matches(slashCommand) -> {
+                    SlashCommand.SendWithPrefix(MessagePrefix.Shrug, message)
+                }
+                Command.LENNY.matches(slashCommand) -> {
+                    SlashCommand.SendWithPrefix(MessagePrefix.Lenny, message)
+                }
+                Command.TABLE_FLIP.matches(slashCommand) -> {
+                    SlashCommand.SendWithPrefix(MessagePrefix.TableFlip, message)
+                }
+                Command.UNFLIP.matches(slashCommand) -> {
+                    SlashCommand.SendWithPrefix(MessagePrefix.Unflip, message)
+                }
+                Command.DISCARD_SESSION.matches(slashCommand) -> {
+                    if (messageParts.size == 1) {
+                        SlashCommand.DiscardSession
+                    } else {
+                        syntaxError(Command.DISCARD_SESSION)
+                    }
+                }
+                Command.WHOIS.matches(slashCommand) -> {
+                    parseUserId(messageParts)
+                        ?.let { userId ->
+                            SlashCommand.ShowUser(
+                                userId = userId,
+                            )
+                        }
+                        ?: syntaxError(Command.WHOIS)
+                }
+                Command.CONFETTI.matches(slashCommand) -> {
+                    SlashCommand.SendChatEffect(ChatEffect.CONFETTI, message)
+                }
+                Command.SNOWFALL.matches(slashCommand) -> {
+                    SlashCommand.SendChatEffect(ChatEffect.SNOWFALL, message)
+                }
+                Command.LEAVE_ROOM.matches(slashCommand) -> {
+                    if (messageParts.size == 1) {
+                        SlashCommand.LeaveRoom
+                    } else {
+                        syntaxError(Command.LEAVE_ROOM)
+                    }
+                }
+                Command.UPGRADE_ROOM.matches(slashCommand) -> {
+                    if (message.isNotEmpty()) {
+                        SlashCommand.UpgradeRoom(newVersion = message)
+                    } else {
+                        syntaxError(Command.UPGRADE_ROOM)
+                    }
+                }
+                Command.CRASH_APP.matches(slashCommand) && appPreferencesStore.isDeveloperModeEnabledFlow().first() -> {
+                    error("Application crashed from user demand")
+                }
+                else -> {
+                    // Unknown command
+                    SlashCommand.ErrorUnknownSlashCommand(
+                        stringProvider.getString(R.string.slash_command_unrecognized, slashCommand)
+                    )
+                }
+            }
+        }
+    }
+
+    private fun parseUserId(messageParts: List<String>): UserId? {
+        val str = messageParts.getOrNull(1) ?: return null
+        return when {
+            MatrixPatterns.isUserId(str) -> str
+            str == "<a" -> {
+                // Rich text editor mode
+                messageParts.getOrNull(2)?.let { html ->
+                    // html must match "href="https://matrix.to/#/@user:domain.org">@user:domain.org</a>"
+                    val regex = "href=\"https://matrix.to/#/([^\"]+)\">([^<]+)</a>".toRegex()
+                    val matchResult = regex.find(html)
+                    val userId = matchResult?.groupValues?.getOrNull(1)
+                    userId?.takeIf {
+                        userId == matchResult.groupValues.getOrNull(2) && MatrixPatterns.isUserId(it)
+                    }
+                }
+            }
+            else -> {
+                // Can be markdown format like "[@user:domain.org](https://matrix.to/#/@user:domain.org)"
+                val regex = "\\[([^\\]]+)]\\(https://matrix.to/#/([^\\]]+)\\)".toRegex()
+                val matchResult = regex.find(str)
+                val userId = matchResult?.groupValues?.getOrNull(1)
+                userId?.takeIf {
+                    userId == matchResult.groupValues.getOrNull(2) && MatrixPatterns.isUserId(it)
+                }
+            }
+        }
+            ?.let(::UserId)
+    }
+
+    private fun syntaxError(command: Command) = SlashCommand.ErrorSyntax(
+        stringProvider.getString(
+            R.string.slash_command_parameters_error,
+            command.command,
+            buildString {
+                append(command.command)
+                if (command.parameters != null) {
+                    append(" ${command.parameters}")
+                }
+            },
+        )
+    )
+
+    private fun extractMessage(message: String): Pair<List<String>, String>? {
+        val messageParts = try {
+            message.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }
+        } catch (e: Exception) {
+            Timber.e(e, "## parseSlashCommand() : split failed")
+            null
+        }
+
+        // test if the string cut fails
+        if (messageParts.isNullOrEmpty()) {
+            return null
+        }
+
+        val slashCommand = messageParts.first()
+        val trimmedMessage = message.substring(slashCommand.length).trim()
+
+        return messageParts to trimmedMessage
+    }
+
+    private val notSupportedThreadsCommands: List<Command> by lazy {
+        Command.entries.filter {
+            !it.isAllowedInThread
+        }
+    }
+
+    /**
+     * Checks whether the current command is not supported by threads.
+     * @param isInThreadTimeline if its true we are in a thread timeline
+     * @param slashCommand the slash command that will be checked
+     * @return The command that is not supported
+     */
+    private fun getNotSupportedByThreads(isInThreadTimeline: Boolean, slashCommand: String): Command? {
+        return if (isInThreadTimeline) {
+            notSupportedThreadsCommands.firstOrNull {
+                it.command == slashCommand
+            }
+        } else {
+            null
+        }
+    }
+
+    private fun trimParts(message: CharSequence, messageParts: List<String>): String? {
+        val partsSize = messageParts.sumOf { it.length }
+        val gapsNumber = messageParts.size - 1
+        return message.substring(partsSize + gapsNumber).trim().takeIf { it.isNotEmpty() }
+    }
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandService.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandService.kt
new file mode 100644
index 0000000000..6cd8688cad
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandService.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.matrix.api.HomeserverCapabilitiesProvider
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.api.SlashCommandService
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
+import io.element.android.services.toolbox.api.strings.StringProvider
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.time.Duration.Companion.seconds
+
+@ContributesBinding(RoomScope::class)
+class DefaultSlashCommandService(
+    private val commandParser: CommandParser,
+    private val commandExecutor: CommandExecutor,
+    private val stringProvider: StringProvider,
+    private val appPreferencesStore: AppPreferencesStore,
+    private val featureFlagService: FeatureFlagService,
+    private val capabilitiesProvider: HomeserverCapabilitiesProvider,
+) : SlashCommandService {
+    override suspend fun getSuggestions(
+        text: String,
+        isInThread: Boolean,
+    ): List<SlashCommandSuggestion> {
+        if (!featureFlagService.isFeatureEnabled(FeatureFlags.SlashCommand)) return emptyList()
+        val isDeveloperModeEnabled = appPreferencesStore.isDeveloperModeEnabledFlow().first()
+        return Command.entries
+            .asSequence()
+            .filter { it.startsWith(text) }
+            .filter { !isInThread || it.isAllowedInThread }
+            .filter { !it.isDevCommand || isDeveloperModeEnabled }
+            // Don't include the change display name commands if the user can't change their display name
+            .run {
+                val canUserChangeDisplayName = withTimeoutOrNull(5.seconds) {
+                    capabilitiesProvider.canChangeDisplayName().getOrNull()
+                } ?: false
+                if (!canUserChangeDisplayName) {
+                    filterNot { it == Command.CHANGE_DISPLAY_NAME || it == Command.CHANGE_DISPLAY_NAME_FOR_ROOM }
+                } else {
+                    this
+                }
+            }
+            // Don't include the change avatar commands if the user can't change their avatar url
+            .run {
+                val canUserChangeAvatar = withTimeoutOrNull(5.seconds) {
+                    capabilitiesProvider.canChangeAvatarUrl().getOrNull()
+                } ?: false
+                if (!canUserChangeAvatar) {
+                    filterNot { it == Command.CHANGE_AVATAR || it == Command.CHANGE_AVATAR_FOR_ROOM }
+                } else {
+                    this
+                }
+            }
+            .map {
+                SlashCommandSuggestion(
+                    command = it.command,
+                    parameters = it.parameters,
+                    description = stringProvider.getString(it.description),
+                )
+            }
+            .toList()
+    }
+
+    override suspend fun parse(
+        textMessage: CharSequence,
+        formattedMessage: String?,
+        isInThreadTimeline: Boolean,
+    ): SlashCommand {
+        return commandParser.parseSlashCommand(
+            textMessage = textMessage,
+            formattedMessage = formattedMessage,
+            isInThreadTimeline = isInThreadTimeline,
+        )
+    }
+
+    override suspend fun proceedSendMessage(
+        slashCommand: SlashCommand.SlashCommandSendMessage,
+        timeline: Timeline,
+    ): Result<Unit> {
+        return commandExecutor.proceedSendMessage(
+            slashCommand = slashCommand,
+            timeline = timeline,
+        )
+    }
+
+    override suspend fun proceedAdmin(
+        slashCommand: SlashCommand.SlashCommandAdmin,
+    ): Result<Unit> {
+        return commandExecutor.proceedAdmin(
+            slashCommand = slashCommand,
+        )
+    }
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RainbowGenerator.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RainbowGenerator.kt
new file mode 100644
index 0000000000..594b51cbf6
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RainbowGenerator.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl.rainbow
+
+import dev.zacsweers.metro.Inject
+import kotlin.math.cos
+import kotlin.math.pow
+import kotlin.math.roundToInt
+import kotlin.math.sin
+
+/**
+ * Inspired from React-Sdk
+ * Ref: https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/utils/colour.js
+ */
+@Inject
+class RainbowGenerator {
+    fun generate(text: String): String {
+        val split = text.splitEmoji()
+        val frequency = 2 * Math.PI / split.size
+
+        return split
+            .mapIndexed { idx, letter ->
+                // Do better than React-Sdk: Avoid adding font color for spaces
+                if (letter == " ") {
+                    "$letter"
+                } else {
+                    val (a, b) = generateAB(idx * frequency, 1f)
+                    val dashColor = labToRGB(75, a, b).toDashColor()
+                    "<font color=\"$dashColor\">$letter</font>"
+                }
+            }
+            .joinToString(separator = "")
+    }
+
+    private fun generateAB(hue: Double, chroma: Float): Pair<Double, Double> {
+        val a = chroma * 127 * cos(hue)
+        val b = chroma * 127 * sin(hue)
+
+        return Pair(a, b)
+    }
+
+    private fun labToRGB(l: Int, a: Double, b: Double): RgbColor {
+        // Convert CIELAB to CIEXYZ (D65)
+        var y = (l + 16) / 116.0
+        val x = adjustXYZ(y + a / 500) * 0.9505
+        val z = adjustXYZ(y - b / 200) * 1.0890
+
+        y = adjustXYZ(y)
+
+        // Linear transformation from CIEXYZ to RGB
+        val red = 3.24096994 * x - 1.53738318 * y - 0.49861076 * z
+        val green = -0.96924364 * x + 1.8759675 * y + 0.04155506 * z
+        val blue = 0.05563008 * x - 0.20397696 * y + 1.05697151 * z
+
+        return RgbColor(adjustRGB(red), adjustRGB(green), adjustRGB(blue))
+    }
+
+    private fun adjustXYZ(value: Double): Double {
+        if (value > 0.2069) {
+            return value.pow(3)
+        }
+        return 0.1284 * value - 0.01771
+    }
+
+    private fun gammaCorrection(value: Double): Double {
+        // Non-linear transformation to sRGB
+        if (value <= 0.0031308) {
+            return 12.92 * value
+        }
+        return 1.055 * value.pow(1 / 2.4) - 0.055
+    }
+
+    private fun adjustRGB(value: Double): Int {
+        return (gammaCorrection(value)
+            .coerceIn(0.0, 1.0) * 255)
+            .roundToInt()
+    }
+}
+
+/**
+ * Same as split, but considering emojis.
+ */
+private fun CharSequence.splitEmoji(): List<CharSequence> {
+    val result = mutableListOf<CharSequence>()
+    var index = 0
+    while (index < length) {
+        val firstChar = get(index)
+        if (firstChar.code == 0x200e) {
+            // Left to right mark. What should I do with it?
+        } else if (firstChar.code in 0xD800..0xDBFF && index + 1 < length) {
+            // We have the start of a surrogate pair
+            val secondChar = get(index + 1)
+            if (secondChar.code in 0xDC00..0xDFFF) {
+                // We have an emoji
+                result.add("$firstChar$secondChar")
+                index++
+            } else {
+                // Not sure what we have here...
+                result.add("$firstChar")
+            }
+        } else {
+            // Regular char
+            result.add("$firstChar")
+        }
+        index++
+    }
+    return result
+}
diff --git a/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RgbColor.kt b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RgbColor.kt
new file mode 100644
index 0000000000..c425d81d73
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/kotlin/io/element/android/libraries/slashcommands/impl/rainbow/RgbColor.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl.rainbow
+
+data class RgbColor(
+    val r: Int,
+    val g: Int,
+    val b: Int
+)
+
+fun RgbColor.toDashColor(): String {
+    return listOf(r, g, b)
+        .joinToString(separator = "", prefix = "#") {
+            it.toString(16).padStart(2, '0')
+        }
+}
diff --git a/libraries/slashcommands/impl/src/main/res/values/temporary.xml b/libraries/slashcommands/impl/src/main/res/values/temporary.xml
new file mode 100644
index 0000000000..26232ea9b3
--- /dev/null
+++ b/libraries/slashcommands/impl/src/main/res/values/temporary.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2026 Element Creations Ltd.
+  ~
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+  ~ Please see LICENSE files in the repository root for full details.
+  -->
+<resources>
+    <string name="slash_command_error">Command error</string>
+    <string name="slash_command_unrecognized">Unrecognized command: %1$s</string>
+    <string name="slash_command_parameters_error">The command \"%1$s\" needs more parameters, or some parameters are incorrect.The syntax is\n\n%2$s</string>
+    <string name="slash_command_not_supported_in_threads">The command \"%1$s\" is recognized but not supported in threads.</string>
+    <string name="slash_command_description_emote">Displays action</string>
+    <string name="slash_command_description_crash_application">Crash the application.</string>
+    <string name="slash_command_description_ban_user">Bans user with given id</string>
+    <string name="slash_command_description_unban_user">Unbans user with given id</string>
+    <string name="slash_command_description_ignore_user">Ignores a user, hiding their messages from you</string>
+    <string name="slash_command_description_unignore_user">Stops ignoring a user, showing their messages going forward</string>
+    <string name="slash_command_description_op_user">Define the power level of a user</string>
+    <string name="slash_command_description_deop_user">Deops user with given id</string>
+    <string name="slash_command_description_room_name">Sets the room name</string>
+    <string name="slash_command_description_rainbow">Sends the given message colored as a rainbow</string>
+    <string name="slash_command_description_rainbow_emote">Sends the given emote colored as a rainbow</string>
+    <string name="slash_command_description_invite_user">Invites user with given id to current room</string>
+    <string name="slash_command_description_join_room">Joins room with given address</string>
+    <string name="slash_command_description_spoiler">Sends the given message as a spoiler</string>
+    <string name="slash_command_description_topic">Set the room topic</string>
+    <string name="slash_command_description_remove_user">Removes user with given id from this room</string>
+    <string name="slash_command_description_nick">Changes your display nickname</string>
+    <string name="slash_command_description_avatar">Changes your profile picture in all rooms</string>
+    <string name="slash_command_confetti">Sends the given message with confetti</string>
+    <string name="slash_command_snow">Sends the given message with snowfall</string>
+    <string name="slash_command_description_plain">Sends a message as plain text, without interpreting it as markdown</string>
+    <string name="slash_command_description_nick_for_room">Changes your display nickname in the current room only</string>
+    <string name="slash_command_description_room_avatar">Changes the avatar of the current room</string>
+    <string name="slash_command_description_avatar_for_room">Changes your avatar in this current room only</string>
+    <string name="slash_command_description_devtools">Open the developer tools screen</string>
+    <string name="slash_command_description_whois">Displays information about a user</string>
+    <string name="slash_command_description_shrug">Prepends ¯\\_(ツ)_/¯ to a plain-text message</string>
+    <string name="slash_command_description_lenny">Prepends ( ͡° ͜ʖ ͡°) to a plain-text message</string>
+    <string name="slash_command_description_table_flip">Prepends (╯°□°）╯︵ ┻━┻ to a plain-text message</string>
+    <string name="slash_command_description_unflip">Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message</string>
+    <string name="slash_command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
+    <string name="slash_command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
+    <string name="slash_command_description_leave_room">Leave the current room</string>
+    <string name="slash_command_description_upgrade_room">Upgrades a room to a new version</string>
+
+    <string name="common_spoiler">Spoiler</string>
+</resources>
diff --git a/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutorTest.kt b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutorTest.kt
new file mode 100644
index 0000000000..c0f2ce89c2
--- /dev/null
+++ b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandExecutorTest.kt
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.timeline.MsgType
+import io.element.android.libraries.matrix.test.AN_AVATAR_URL
+import io.element.android.libraries.matrix.test.A_MESSAGE
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.slashcommands.api.ChatEffect
+import io.element.android.libraries.slashcommands.api.MessagePrefix
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.impl.rainbow.RainbowGenerator
+import io.element.android.services.toolbox.api.strings.StringProvider
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class CommandExecutorTest {
+    @Test
+    fun `send plain text delegates to timeline with plain flag`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        var capturedHtml: String? = "initial"
+        var capturedAsPlainText = false
+        timeline.sendMessageLambda = { body, htmlBody, _, _, asPlainText ->
+            capturedBody = body
+            capturedHtml = htmlBody
+            capturedAsPlainText = asPlainText
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendPlainText("hello"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("hello")
+        assertThat(capturedHtml).isNull()
+        assertThat(capturedAsPlainText).isTrue()
+    }
+
+    @Test
+    fun `send emote delegates to timeline as emote`() = runTest {
+        val timeline = FakeTimeline()
+        var msgType: MsgType? = null
+        timeline.sendMessageLambda = { _, _, _, type, _ ->
+            msgType = type
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendEmote("yay"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(msgType).isEqualTo(MsgType.MSG_TYPE_EMOTE)
+    }
+
+    @Test
+    fun `send lenny prefixes message`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        timeline.sendMessageLambda = { body, _, _, _, _ ->
+            capturedBody = body
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendWithPrefix(MessagePrefix.Lenny, "fun"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("( ͡° ͜ʖ ͡°) fun")
+    }
+
+    @Test
+    fun `send table flip prefixes message`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        timeline.sendMessageLambda = { body, _, _, _, _ ->
+            capturedBody = body
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendWithPrefix(MessagePrefix.TableFlip, "wow"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("(╯°□°）╯︵ ┻━┻ wow")
+    }
+
+    @Test
+    fun `send unflip prefixes message`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        timeline.sendMessageLambda = { body, _, _, _, _ ->
+            capturedBody = body
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendWithPrefix(MessagePrefix.Unflip, "keep cool"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("┬──┬ ノ( ゜-゜ノ) keep cool")
+    }
+
+    @Test
+    fun `send shrug prefixes message`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        timeline.sendMessageLambda = { body, _, _, _, _ ->
+            capturedBody = body
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendWithPrefix(MessagePrefix.Shrug, "wow"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("¯\\\\_(ツ)\\_/¯ wow")
+    }
+
+    @Test
+    fun `send rainbow provides html body`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedHtml: String? = null
+        var capturedBody: String? = null
+        var capturedMsgType: MsgType? = null
+        timeline.sendMessageLambda = { body, htmlBody, _, msgType, _ ->
+            capturedBody = body
+            capturedHtml = htmlBody
+            capturedMsgType = msgType
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendRainbow("a nice rainbow"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("a nice rainbow")
+        assertThat(capturedHtml).isNotNull()
+        assertThat(capturedHtml!!.contains("<font") || capturedHtml!!.contains("<span")).isTrue()
+        assertThat(capturedMsgType).isEqualTo(MsgType.MSG_TYPE_TEXT)
+    }
+
+    @Test
+    fun `send rainbow emote provides html body`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedHtml: String? = null
+        var capturedBody: String? = null
+        var capturedMsgType: MsgType? = null
+        timeline.sendMessageLambda = { body, htmlBody, _, msgType, _ ->
+            capturedBody = body
+            capturedHtml = htmlBody
+            capturedMsgType = msgType
+            Result.success(Unit)
+        }
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(SlashCommand.SendRainbowEmote("a nice rainbow"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("a nice rainbow")
+        assertThat(capturedHtml).isNotNull()
+        assertThat(capturedHtml!!.contains("<font") || capturedHtml!!.contains("<span")).isTrue()
+        assertThat(capturedMsgType).isEqualTo(MsgType.MSG_TYPE_EMOTE)
+    }
+
+    @Test
+    fun `change display name invokes the method of the matrix client`() = runTest {
+        val matrixClient = FakeMatrixClient()
+        val sut = createCommandExecutor(matrixClient = matrixClient)
+        val res = sut.proceedAdmin(SlashCommand.ChangeDisplayName("new name"))
+        assertThat(res.isSuccess).isTrue()
+        assertThat(matrixClient.setDisplayNameCalled).isTrue()
+    }
+
+    @Test
+    fun `change room avatar is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedAdmin(SlashCommand.ChangeRoomAvatar(AN_AVATAR_URL))
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `change avatar for room is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedAdmin(SlashCommand.ChangeAvatarForRoom(AN_AVATAR_URL))
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `change display name for room delegates to joined room`() = runTest {
+        var capturedDisplayName: String? = null
+        val joinedRoom = FakeJoinedRoom(
+            setOwnMemberDisplayNameResult = { displayName ->
+                capturedDisplayName = displayName
+                Result.success(Unit)
+            }
+        )
+        val sut = createCommandExecutor(joinedRoom = joinedRoom)
+        val res = sut.proceedAdmin(SlashCommand.ChangeDisplayNameForRoom("room nick"))
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedDisplayName).isEqualTo("room nick")
+    }
+
+    @Test
+    fun `upgrade room is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedAdmin(SlashCommand.UpgradeRoom("1"))
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `set user power level is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedAdmin(SlashCommand.SetUserPowerLevel(A_USER_ID, 50))
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `discard session is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedAdmin(SlashCommand.DiscardSession)
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `send spoiler sets formatted and body includes spoiler label`() = runTest {
+        val timeline = FakeTimeline()
+        var capturedBody: String? = null
+        var capturedHtml: String? = null
+        timeline.sendMessageLambda = { body, htmlBody, _, _, _ ->
+            capturedBody = body
+            capturedHtml = htmlBody
+            Result.success(Unit)
+        }
+        val stringProvider = FakeStringProvider(defaultResult = "SPOILER")
+        val sut = createCommandExecutor(
+            stringProvider = stringProvider,
+        )
+        val res = sut.proceedSendMessage(SlashCommand.SendSpoiler("secret"), timeline)
+        assertThat(res.isSuccess).isTrue()
+        assertThat(capturedBody).isEqualTo("[SPOILER](secret)")
+        assertThat(capturedHtml).isEqualTo("<span data-mx-spoiler>secret</span>")
+    }
+
+    @Test
+    fun `send chat effect is not supported`() = runTest {
+        val sut = createCommandExecutor()
+        val res = sut.proceedSendMessage(
+            SlashCommand.SendChatEffect(ChatEffect.CONFETTI, A_MESSAGE),
+            FakeTimeline()
+        )
+        assertThat(res.isFailure).isTrue()
+    }
+
+    @Test
+    fun `admin commands call underlying client and room APIs`() = runTest {
+        var kicked = false
+        var banned = false
+        var unbanned = false
+        var invited = false
+        var ignored = false
+        var unignored = false
+        var left = false
+        var topicSet = false
+        var nameSet = false
+        var joined = false
+
+        val joinedRoom = FakeJoinedRoom(
+            kickUserResult = { _, _ ->
+                kicked = true
+                Result.success(Unit)
+            },
+            banUserResult = { _, _ ->
+                banned = true
+                Result.success(Unit)
+            },
+            unBanUserResult = { _, _ ->
+                unbanned = true
+                Result.success(Unit)
+            },
+            inviteUserResult = { _ ->
+                invited = true
+                Result.success(Unit)
+            },
+            setTopicResult = { _ ->
+                topicSet = true
+                Result.success(Unit)
+            },
+            setNameResult = { _ ->
+                nameSet = true
+                Result.success(Unit)
+            },
+            baseRoom = FakeBaseRoom(
+                leaveRoomLambda = {
+                    left = true
+                    Result.success(Unit)
+                },
+            )
+        )
+        val matrixClient = FakeMatrixClient(
+            ignoreUserResult = { _ ->
+                ignored = true
+                Result.success(Unit)
+            },
+            unIgnoreUserResult = { _ ->
+                unignored = true
+                Result.success(Unit)
+            },
+        ).apply {
+            joinRoomByIdOrAliasLambda = { _, _ ->
+                joined = true
+                Result.success(null)
+            }
+        }
+        val sut = createCommandExecutor(
+            matrixClient = matrixClient,
+            joinedRoom = joinedRoom,
+        )
+        val kickRes = sut.proceedAdmin(SlashCommand.RemoveUser(A_USER_ID, null))
+        assertThat(kicked).isTrue()
+        assertThat(kickRes.isSuccess).isTrue()
+        val banRes = sut.proceedAdmin(SlashCommand.BanUser(A_USER_ID, "reason"))
+        assertThat(banned).isTrue()
+        assertThat(banRes.isSuccess).isTrue()
+        val unbanRes = sut.proceedAdmin(SlashCommand.UnbanUser(A_USER_ID, null))
+        assertThat(unbanned).isTrue()
+        assertThat(unbanRes.isSuccess).isTrue()
+        val inviteRes = sut.proceedAdmin(SlashCommand.Invite(A_USER_ID, null))
+        assertThat(invited).isTrue()
+        assertThat(inviteRes.isSuccess).isTrue()
+        val ignoreRes = sut.proceedAdmin(SlashCommand.IgnoreUser(A_USER_ID))
+        assertThat(ignoreRes.isSuccess).isTrue()
+        assertThat(ignored).isTrue()
+        val unignoreRes = sut.proceedAdmin(SlashCommand.UnignoreUser(A_USER_ID))
+        assertThat(unignoreRes.isSuccess).isTrue()
+        assertThat(unignored).isTrue()
+        val leaveRes = sut.proceedAdmin(SlashCommand.LeaveRoom)
+        assertThat(leaveRes.isSuccess).isTrue()
+        assertThat(left).isTrue()
+        val topicRes = sut.proceedAdmin(SlashCommand.ChangeTopic("t"))
+        assertThat(topicRes.isSuccess).isTrue()
+        assertThat(topicSet).isTrue()
+        val nameRes = sut.proceedAdmin(SlashCommand.ChangeRoomName("n"))
+        assertThat(nameRes.isSuccess).isTrue()
+        assertThat(nameSet).isTrue()
+        val joinRes = sut.proceedAdmin(
+            SlashCommand.JoinRoom(
+                roomIdOrAlias = RoomIdOrAlias.Id(
+                    RoomId("!room:domain")
+                ),
+                reason = null,
+            )
+        )
+        assertThat(joinRes.isSuccess).isTrue()
+        assertThat(joined).isTrue()
+    }
+}
+
+fun createCommandExecutor(
+    matrixClient: FakeMatrixClient = FakeMatrixClient(),
+    joinedRoom: FakeJoinedRoom = FakeJoinedRoom(),
+    rainbowGenerator: RainbowGenerator = RainbowGenerator(),
+    stringProvider: StringProvider = FakeStringProvider(),
+) = CommandExecutor(
+    matrixClient = matrixClient,
+    joinedRoom = joinedRoom,
+    rainbowGenerator = rainbowGenerator,
+    stringProvider = stringProvider,
+)
diff --git a/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandParserTest.kt b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandParserTest.kt
new file mode 100644
index 0000000000..f5a6f54dfd
--- /dev/null
+++ b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/CommandParserTest.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
+import io.element.android.libraries.slashcommands.api.ChatEffect
+import io.element.android.libraries.slashcommands.api.MessagePrefix
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.services.toolbox.api.strings.StringProvider
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class CommandParserTest {
+    @Test
+    fun parseSlashCommandEmpty() = runTest {
+        test("/", SlashCommand.ErrorEmptySlashCommand("A string/"))
+    }
+
+    @Test
+    fun parseSlashCommandUnknown() = runTest {
+        test("/unknown", SlashCommand.ErrorUnknownSlashCommand("A string/unknown"))
+        test("/unknown with param", SlashCommand.ErrorUnknownSlashCommand("A string/unknown"))
+    }
+
+    @Test
+    fun parseSlashCommandNotACommand() = runTest {
+        test("", SlashCommand.NotACommand)
+        test("test", SlashCommand.NotACommand)
+        test("// test", SlashCommand.NotACommand)
+    }
+
+    @Test
+    fun parseSlashCommandEmote() = runTest {
+        test("/me test", SlashCommand.SendEmote("test"))
+        test("/me", SlashCommand.ErrorSyntax("A string/me, /me <message>"))
+    }
+
+    @Test
+    fun parseSlashCommandRemove() = runTest {
+        // Nominal
+        test("/remove $A_USER_ID", SlashCommand.RemoveUser(A_USER_ID, null))
+        // With a reason
+        test("/remove $A_USER_ID a reason", SlashCommand.RemoveUser(A_USER_ID, "a reason"))
+        // Trim the reason
+        test("/remove $A_USER_ID    a    reason    ", SlashCommand.RemoveUser(A_USER_ID, "a    reason"))
+        // Alias
+        test("/kick $A_USER_ID", SlashCommand.RemoveUser(A_USER_ID, null))
+        // Error
+        test("/remove", SlashCommand.ErrorSyntax("A string/remove, /remove <user-id> [reason]"))
+    }
+
+    @Test
+    fun parseSlashCommandRemoveMarkdown() = runTest {
+        // Nominal
+        test(
+            "/remove [@user:domain.org](https://matrix.to/#/@user:domain.org)",
+            SlashCommand.RemoveUser(UserId("@user:domain.org"), null)
+        )
+        test(
+            "/remove [@user:domain.org](https://matrix.to/#/@user:domain.org) reason",
+            SlashCommand.RemoveUser(UserId("@user:domain.org"), "reason")
+        )
+    }
+
+    @Test
+    fun parseSlashCommandPlain() = runTest {
+        test("/plain hello", SlashCommand.SendPlainText("hello"))
+        test("/plain", SlashCommand.ErrorSyntax("A string/plain, /plain <message>"))
+    }
+
+    @Test
+    fun parseSlashCommandNickAndMyAvatar() = runTest {
+        test("/nick John", SlashCommand.ChangeDisplayName("John"))
+        test("/nick", SlashCommand.ErrorSyntax("A string/nick, /nick <display-name>"))
+
+        test("/myavatar mxc://matrix.org/abc", SlashCommand.ChangeAvatar("mxc://matrix.org/abc"))
+        test("/myavatar http://notmxc", SlashCommand.ErrorSyntax("A string/myavatar, /myavatar <mxc_url>"))
+        test("/myavatar", SlashCommand.ErrorSyntax("A string/myavatar, /myavatar <mxc_url>"))
+    }
+
+    @Test
+    fun parseSlashCommandRoomNickAndAvatars() = runTest {
+        test("/myroomnick Roomy", SlashCommand.ChangeDisplayNameForRoom("Roomy"))
+        test("/roomavatar mxc://matrix.org/abc", SlashCommand.ChangeRoomAvatar("mxc://matrix.org/abc"))
+        test("/roomavatar http://notmxc", SlashCommand.ErrorSyntax("A string/roomavatar, /roomavatar <mxc_url>"))
+        test("/myroomavatar mxc://matrix.org/abc", SlashCommand.ChangeAvatarForRoom("mxc://matrix.org/abc"))
+    }
+
+    @Test
+    fun parseSlashCommandTopicAndRainbow() = runTest {
+        test("/topic New topic", SlashCommand.ChangeTopic("New topic"))
+        test("/topic", SlashCommand.ErrorSyntax("A string/topic, /topic <topic>"))
+
+        test("/rainbow yay", SlashCommand.SendRainbow("yay"))
+        test("/rainbow", SlashCommand.ErrorSyntax("A string/rainbow, /rainbow <message>"))
+
+        test("/rainbowme yay", SlashCommand.SendRainbowEmote("yay"))
+        test("/rainbowme", SlashCommand.ErrorSyntax("A string/rainbowme, /rainbowme <message>"))
+    }
+
+    @Test
+    fun parseSlashCommandJoinAndRoomName() = runTest {
+        // valid join
+        test(
+            "/join !roomId:domain reason",
+            SlashCommand.JoinRoom(
+                RoomIdOrAlias.Id(RoomId("!roomId:domain")),
+                "reason"
+            )
+        )
+
+        // invalid join
+        test("/join notavalid", SlashCommand.ErrorSyntax("A string/join, /join <room-address> [reason]"))
+
+        test("/roomname My Room", SlashCommand.ChangeRoomName("My Room"))
+        test("/roomname", SlashCommand.ErrorSyntax("A string/roomname, /roomname <name>"))
+    }
+
+    @Test
+    fun parseSlashCommandInviteBanEtc() = runTest {
+        test("/invite $A_USER_ID", SlashCommand.Invite(A_USER_ID, null))
+        test("/invite", SlashCommand.ErrorSyntax("A string/invite, /invite <user-id> [reason]"))
+
+        test("/ban $A_USER_ID bad", SlashCommand.BanUser(A_USER_ID, "bad"))
+        test("/unban $A_USER_ID", SlashCommand.UnbanUser(A_USER_ID, null))
+
+        test("/ignore $A_USER_ID", SlashCommand.IgnoreUser(A_USER_ID))
+        test("/unignore $A_USER_ID", SlashCommand.UnignoreUser(A_USER_ID))
+    }
+
+    @Test
+    fun parseSlashCommandPowerLevels() = runTest {
+        test("/op $A_USER_ID 50", SlashCommand.SetUserPowerLevel(A_USER_ID, 50))
+        test("/op $A_USER_ID notnumber", SlashCommand.ErrorSyntax("A string/op, /op <user-id> [<power-level>]"))
+        test("/deop $A_USER_ID", SlashCommand.SetUserPowerLevel(A_USER_ID, null))
+    }
+
+    @Test
+    fun parseSlashCommandDevtoolsAndSpoiler() = runTest {
+        test("/devtools", SlashCommand.DevTools)
+        test("/devtools extra", SlashCommand.ErrorSyntax("A string/devtools, /devtools"))
+
+        test("/spoiler secret", SlashCommand.SendSpoiler("secret"))
+        test("/spoiler", SlashCommand.ErrorSyntax("A string/spoiler, /spoiler <message>"))
+    }
+
+    @Test
+    fun parseSlashCommandEmojisAndSession() = runTest {
+        test("/shrug hello", SlashCommand.SendWithPrefix(MessagePrefix.Shrug, "hello"))
+        test("/shrug", SlashCommand.SendWithPrefix(MessagePrefix.Shrug, ""))
+
+        test("/lenny fun", SlashCommand.SendWithPrefix(MessagePrefix.Lenny, "fun"))
+        test("/tableflip wow", SlashCommand.SendWithPrefix(MessagePrefix.TableFlip, "wow"))
+        test("/unflip be safe", SlashCommand.SendWithPrefix(MessagePrefix.Unflip, "be safe"))
+
+        test("/discardsession", SlashCommand.DiscardSession)
+        test("/discardsession extra", SlashCommand.ErrorSyntax("A string/discardsession, /discardsession"))
+    }
+
+    @Test
+    fun parseSlashCommandWhoisAndEffectsAndLeave() = runTest {
+        test("/whois $A_USER_ID", SlashCommand.ShowUser(A_USER_ID))
+
+        test("/confetti party", SlashCommand.SendChatEffect(ChatEffect.CONFETTI, "party"))
+        test("/snowfall snow", SlashCommand.SendChatEffect(ChatEffect.SNOWFALL, "snow"))
+
+        test("/leave", SlashCommand.LeaveRoom)
+        test("/leave now", SlashCommand.ErrorSyntax("A string/leave, /leave"))
+    }
+
+    @Test
+    fun parseSlashCommandUpgradeAndCrashAndFeatureFlagAndThreads() = runTest {
+        test("/upgraderoom 9", SlashCommand.UpgradeRoom("9"))
+        test("/upgraderoom", SlashCommand.ErrorSyntax("A string/upgraderoom, /upgraderoom newVersion"))
+
+        // Crash only when developer mode enabled
+        val cpDev = createCommandParser(appPreferencesStore = InMemoryAppPreferencesStore(isDeveloperModeEnabled = true))
+        try {
+            cpDev.parseSlashCommand("/crash", null, false)
+            org.junit.Assert.fail("Expected crash to throw")
+        } catch (_: IllegalStateException) {
+            // expected
+        }
+
+        // Feature flag disabled
+        val cpFF = createCommandParser(featureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.SlashCommand.key to false)))
+        val res = cpFF.parseSlashCommand("/me test", null, false)
+        assertThat(res).isEqualTo(SlashCommand.NotACommand)
+
+        // Not supported in threads (e.g. /join)
+        val cpThread = createCommandParser()
+        val threadRes = cpThread.parseSlashCommand("/join !roomId:domain", null, true)
+        assertThat(threadRes).isInstanceOf(SlashCommand.ErrorCommandNotSupportedInThreads::class.java)
+        assertThat((threadRes as SlashCommand.ErrorCommandNotSupportedInThreads).message).isEqualTo("A string/join")
+    }
+
+    private suspend fun test(message: String, expectedResult: SlashCommand) {
+        val commandParser = createCommandParser()
+        val result = commandParser.parseSlashCommand(message, null, false)
+        assertThat(result).isEqualTo(expectedResult)
+    }
+}
+
+internal fun createCommandParser(
+    appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
+    featureFlagService: FeatureFlagService = FakeFeatureFlagService(
+        initialState = mapOf(
+            FeatureFlags.SlashCommand.key to true,
+        ),
+    ),
+    stringProvider: StringProvider = FakeStringProvider(),
+) = CommandParser(
+    appPreferencesStore = appPreferencesStore,
+    featureFlagService = featureFlagService,
+    stringProvider = stringProvider,
+)
diff --git a/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandServiceTest.kt b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandServiceTest.kt
new file mode 100644
index 0000000000..cee4d17b21
--- /dev/null
+++ b/libraries/slashcommands/impl/src/test/kotlin/io/element/android/libraries/slashcommands/impl/DefaultSlashCommandServiceTest.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.matrix.api.room.IntentionalMention
+import io.element.android.libraries.matrix.api.timeline.MsgType
+import io.element.android.libraries.matrix.test.FakeHomeserverCapabilitiesProvider
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
+import io.element.android.libraries.matrix.test.timeline.FakeTimeline
+import io.element.android.libraries.preferences.api.store.AppPreferencesStore
+import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.impl.rainbow.RainbowGenerator
+import io.element.android.services.toolbox.api.strings.StringProvider
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultSlashCommandServiceTest {
+    @Test
+    fun `getSuggestions filters by text and maps to suggestions`() = runTest {
+        val stringProvider = FakeStringProvider(defaultResult = "desc")
+        val prefs = InMemoryAppPreferencesStore(isDeveloperModeEnabled = false)
+        val sut = createDefaultSlashCommandService(
+            commandParser = CommandParser(
+                appPreferencesStore = prefs,
+                featureFlagService = FakeFeatureFlagService(
+                    initialState = mapOf(
+                        FeatureFlags.SlashCommand.key to true,
+                    )
+                ),
+                stringProvider = stringProvider,
+            ),
+            stringProvider = stringProvider,
+            appPreferencesStore = prefs,
+        )
+        val res = sut.getSuggestions("ra", isInThread = true)
+        // Expect commands starting with "/ra" (case-insensitive) and that are allowed in threads
+        assertThat(res).isNotEmpty()
+        assertThat(res.first().description).isEqualTo("desc")
+    }
+
+    @Test
+    fun `getSuggestions hides dev commands when developer mode disabled`() = runTest {
+        val stringProvider = FakeStringProvider()
+        val prefs = InMemoryAppPreferencesStore(isDeveloperModeEnabled = false)
+        val sut = createDefaultSlashCommandService(appPreferencesStore = prefs, stringProvider = stringProvider)
+        val all = sut.getSuggestions("crash", isInThread = true)
+        assertThat(all).isEmpty()
+    }
+
+    @Test
+    fun `getSuggestions returns empty list when the feature is enabled`() = runTest {
+        val sut = createDefaultSlashCommandService(isFeatureEnabled = true)
+        val all = sut.getSuggestions("me", isInThread = false)
+        assertThat(all).isNotEmpty()
+    }
+
+    @Test
+    fun `getSuggestions returns empty list when the feature is disabled`() = runTest {
+        val sut = createDefaultSlashCommandService(isFeatureEnabled = false)
+        val all = sut.getSuggestions("me", isInThread = false)
+        assertThat(all).isEmpty()
+    }
+
+    @Test
+    fun `getSuggestions for aliases`() = runTest {
+        val stringProvider = FakeStringProvider()
+        val prefs = InMemoryAppPreferencesStore(isDeveloperModeEnabled = false)
+        val sut = createDefaultSlashCommandService(appPreferencesStore = prefs, stringProvider = stringProvider)
+        val all = sut.getSuggestions("part", isInThread = true)
+        assertThat(all).isEmpty()
+    }
+
+    @Test
+    fun `getSuggestions shows dev commands when developer mode enabled`() = runTest {
+        val stringProvider = FakeStringProvider()
+        val prefs = InMemoryAppPreferencesStore(isDeveloperModeEnabled = true)
+        val sut = createDefaultSlashCommandService(appPreferencesStore = prefs, stringProvider = stringProvider)
+        val all = sut.getSuggestions("crash", isInThread = true)
+        assertThat(all).isNotEmpty()
+        assertThat(all.first().command).isEqualTo("/crash")
+    }
+
+    @Test
+    fun `parse delegates to commandParser`() = runTest {
+        val sut = createDefaultSlashCommandService()
+        val res = sut.parse("test", null, false)
+        assertThat(res).isEqualTo(SlashCommand.NotACommand)
+    }
+
+    @Test
+    fun `proceedSendMessage delegate to commandExecutor`() = runTest {
+        val sendMessage = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention>, _: MsgType, _: Boolean ->
+            Result.success(Unit)
+        }
+        val sut = createDefaultSlashCommandService()
+        val sendRes = sut.proceedSendMessage(
+            slashCommand = SlashCommand.SendPlainText("hi"),
+            timeline = FakeTimeline().apply {
+                sendMessageLambda = sendMessage
+            },
+        )
+        assertThat(sendRes.isSuccess).isTrue()
+        sendMessage.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `canChangeDisplayName is respected in suggestions`() = runTest {
+        var result = false
+        val capabilitiesProvider = FakeHomeserverCapabilitiesProvider(
+            canChangeDisplayName = { Result.success(result) },
+        )
+        val sut = createDefaultSlashCommandService(capabilitiesProvider = capabilitiesProvider)
+
+        // Initially, with a disabled capability, the change display name command should not be in the suggestions
+        var changeNameCommand = sut.getSuggestions("", isInThread = false)
+            .find { it.command == Command.CHANGE_DISPLAY_NAME.command }
+        assertThat(changeNameCommand).isNull()
+
+        // When the capability is true, the command should be included in the suggestions
+        result = true
+        changeNameCommand = sut.getSuggestions("", isInThread = false)
+            .find { it.command == Command.CHANGE_DISPLAY_NAME.command }
+        assertThat(changeNameCommand).isNotNull()
+    }
+
+    @Test
+    fun `proceedAdmin delegates to commandExecutor`() = runTest {
+        val leaveRoomLambda = lambdaRecorder<Result<Unit>> {
+            Result.success(Unit)
+        }
+        val sut = createDefaultSlashCommandService(
+            commandExecutor = CommandExecutor(
+                matrixClient = FakeMatrixClient(),
+                joinedRoom = FakeJoinedRoom(
+                    baseRoom = FakeBaseRoom(
+                        leaveRoomLambda = leaveRoomLambda
+                    ),
+                ),
+                rainbowGenerator = RainbowGenerator(),
+                stringProvider = FakeStringProvider(),
+            ),
+        )
+        val adminRes = sut.proceedAdmin(SlashCommand.LeaveRoom)
+        assertThat(adminRes.isSuccess).isTrue()
+        leaveRoomLambda.assertions().isCalledOnce()
+    }
+
+    private fun createDefaultSlashCommandService(
+        isFeatureEnabled: Boolean = true,
+        featureFlagService: FeatureFlagService = FakeFeatureFlagService(
+            initialState = mapOf(
+                FeatureFlags.SlashCommand.key to isFeatureEnabled,
+            ),
+        ),
+        appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
+        stringProvider: StringProvider = FakeStringProvider(),
+        commandParser: CommandParser = createCommandParser(
+            featureFlagService = featureFlagService,
+            appPreferencesStore = appPreferencesStore,
+            stringProvider = stringProvider,
+        ),
+        commandExecutor: CommandExecutor = createCommandExecutor(
+            stringProvider = stringProvider,
+        ),
+        capabilitiesProvider: FakeHomeserverCapabilitiesProvider = FakeHomeserverCapabilitiesProvider(),
+    ) = DefaultSlashCommandService(
+        commandParser = commandParser,
+        commandExecutor = commandExecutor,
+        stringProvider = stringProvider,
+        appPreferencesStore = appPreferencesStore,
+        featureFlagService = featureFlagService,
+        capabilitiesProvider = capabilitiesProvider,
+    )
+}
diff --git a/libraries/slashcommands/test/build.gradle.kts b/libraries/slashcommands/test/build.gradle.kts
new file mode 100644
index 0000000000..d8a54aa180
--- /dev/null
+++ b/libraries/slashcommands/test/build.gradle.kts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.slashcommands.test"
+}
+
+dependencies {
+    implementation(projects.libraries.slashcommands.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
diff --git a/libraries/slashcommands/test/src/main/kotlin/io/element/android/libraries/slashcommands/test/FakeSlashCommandService.kt b/libraries/slashcommands/test/src/main/kotlin/io/element/android/libraries/slashcommands/test/FakeSlashCommandService.kt
new file mode 100644
index 0000000000..319a8e647c
--- /dev/null
+++ b/libraries/slashcommands/test/src/main/kotlin/io/element/android/libraries/slashcommands/test/FakeSlashCommandService.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.slashcommands.test
+
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.slashcommands.api.SlashCommand
+import io.element.android.libraries.slashcommands.api.SlashCommandService
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeSlashCommandService(
+    private val getSuggestionsResult: (String, Boolean) -> List<SlashCommandSuggestion> = { _, _ -> lambdaError() },
+    private val parseResult: (CharSequence, String?, Boolean) -> SlashCommand = { _, _, _ -> lambdaError() },
+    private val proceedSendMessageResult: (SlashCommand.SlashCommandSendMessage, Timeline) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val proceedAdminResult: (SlashCommand.SlashCommandAdmin) -> Result<Unit> = { lambdaError() },
+) : SlashCommandService {
+    override suspend fun getSuggestions(text: String, isInThread: Boolean): List<SlashCommandSuggestion> = simulateLongTask {
+        getSuggestionsResult(text, isInThread)
+    }
+
+    override suspend fun parse(
+        textMessage: CharSequence,
+        formattedMessage: String?,
+        isInThreadTimeline: Boolean,
+    ): SlashCommand = simulateLongTask {
+        parseResult(textMessage, formattedMessage, isInThreadTimeline)
+    }
+
+    override suspend fun proceedSendMessage(
+        slashCommand: SlashCommand.SlashCommandSendMessage,
+        timeline: Timeline,
+    ): Result<Unit> = simulateLongTask {
+        proceedSendMessageResult(slashCommand, timeline)
+    }
+
+    override suspend fun proceedAdmin(slashCommand: SlashCommand.SlashCommandAdmin): Result<Unit> = simulateLongTask {
+        proceedAdminResult(slashCommand)
+    }
+}
diff --git a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
index e564ddac41..7fed08b3e9 100644
--- a/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
+++ b/libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt
@@ -29,6 +29,8 @@ object TestTags {
      * Verification screen.
      */
     val recoveryKey = TestTag("verification-recovery_key")
+    val customRecoveryPassphrase = TestTag("verification-custom_recovery_passphrase")
+    val customRecoveryPassphraseConfirm = TestTag("verification-custom_recovery_passphrase_confirm")
 
     /**
      * Sign out screen.
@@ -98,6 +100,12 @@ object TestTags {
      */
     val floatingActionButton = TestTag("floating-action-button")
 
+    /**
+     * Timeline jump-to-position buttons (long-press exposes "Mark as read").
+     */
+    val jumpToUnreadButton = TestTag("jump-to-unread-button")
+    val jumpToBottomButton = TestTag("jump-to-bottom-button")
+
     /**
      * Timeline.
      */
@@ -124,4 +132,6 @@ object TestTags {
      *
      */
     val roomAddressField = TestTag("room_address_field")
+
+    val confirmInviteUnknown = TestTag("confirm_invite_unknown")
 }
diff --git a/libraries/textcomposer/impl/build.gradle.kts b/libraries/textcomposer/impl/build.gradle.kts
index a339890201..41e20582e0 100644
--- a/libraries/textcomposer/impl/build.gradle.kts
+++ b/libraries/textcomposer/impl/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiUtils)
+    implementation(projects.libraries.slashcommands.api)
 
     releaseApi(libs.matrix.richtexteditor)
     releaseApi(libs.matrix.richtexteditor.compose)
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/CaptionWarningBottomSheet.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/CaptionWarningBottomSheet.kt
index 23b4fae3a9..f9348dcdcf 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/CaptionWarningBottomSheet.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/CaptionWarningBottomSheet.kt
@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -37,11 +39,13 @@ fun CaptionWarningBottomSheet(
     ModalBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismiss,
+        scrollable = false,
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 16.dp),
+                .padding(horizontal = 16.dp)
+                .verticalScroll(rememberScrollState()),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
@@ -67,7 +71,7 @@ fun CaptionWarningBottomSheet(
 
 @PreviewsDayNight
 @Composable
-internal fun CaptionWarningBottomSheetPreview() = ElementPreview {
+internal fun CaptionWarningBottomSheetPreview() = ElementPreview(fillMaxSize = true) {
     CaptionWarningBottomSheet(
         onDismiss = {},
     )
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
index ac64245668..9b2260d441 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ComposerModeView.kt
@@ -9,21 +9,24 @@
 package io.element.android.libraries.textcomposer
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -34,8 +37,11 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.ui.media.contentvalidation.collectOverallState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.rememberEventContentValidationState
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToView
+import io.element.android.libraries.matrix.ui.messages.reply.eventId
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -64,7 +70,7 @@ internal fun ComposerModeView(
         }
         is MessageComposerMode.Reply -> {
             ReplyToModeView(
-                modifier = modifier.padding(8.dp),
+                modifier = modifier.padding(top = 8.dp, start = 8.dp, end = 8.dp),
                 replyToDetails = composerMode.replyToDetails,
                 hideImage = composerMode.hideImage,
                 onResetComposerMode = onResetComposerMode,
@@ -120,6 +126,12 @@ private fun EditingModeView(
     }
 }
 
+// This combination of density DPI and font scale is an approximation to a screen with little space to display the content
+private const val MAX_SCALING_VALUE = 3.5f
+
+/**
+ * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2019-6286
+ */
 @Composable
 private fun ReplyToModeView(
     replyToDetails: InReplyToDetails,
@@ -127,22 +139,44 @@ private fun ReplyToModeView(
     onResetComposerMode: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Row(
+    val shape = RoundedCornerShape(6.dp)
+    val contentValidationState = rememberEventContentValidationState(replyToDetails.eventId(), (replyToDetails as? InReplyToDetails.Ready)?.eventContent)
+    val currentValidationState by contentValidationState.collectOverallState()
+
+    val contentHasErrors = currentValidationState.hasError()
+
+    Box(
         modifier
-            .clip(RoundedCornerShape(13.dp))
-            .background(MaterialTheme.colorScheme.surface)
+            .clip(shape)
+            .background(
+                color = if (contentHasErrors) ElementTheme.colors.bgCriticalSubtle else ElementTheme.colors.bgCanvasDefault,
+                shape = shape,
+            )
+            .border(
+                width = 1.dp,
+                color = if (contentHasErrors) ElementTheme.colors.borderCriticalSubtle else ElementTheme.colors.separatorPrimary,
+                shape = shape,
+            )
             .padding(4.dp)
     ) {
+        // Larger density DPI and font scale means less space to display the content, so we limit it to 1 line to avoid overflow issues
+        val currentDensity = LocalDensity.current
+        val hasLowResolution = currentDensity.density * currentDensity.fontScale >= MAX_SCALING_VALUE
+        val maxReplyContentLines = if (hasLowResolution) 1 else 2
+
         InReplyToView(
             inReplyTo = replyToDetails,
             hideImage = hideImage,
-            modifier = Modifier.weight(1f),
+            contentValidationValue = currentValidationState,
+            maxLines = maxReplyContentLines,
+            modifier = Modifier.fillMaxWidth(),
         )
         Icon(
             imageVector = CompoundIcons.Close(),
             contentDescription = stringResource(CommonStrings.action_close),
-            tint = ElementTheme.colors.iconSecondary,
+            tint = if (contentHasErrors) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconSecondary,
             modifier = Modifier
+                .align(Alignment.TopEnd)
                 .padding(end = 4.dp, top = 4.dp, start = 8.dp, bottom = 16.dp)
                 .size(16.dp)
                 .clickable(
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ElementRichTextEditorStyle.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ElementRichTextEditorStyle.kt
index 8f6421b654..7300430c41 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ElementRichTextEditorStyle.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/ElementRichTextEditorStyle.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.designsystem.theme.bgSubtleTertiary
 import io.element.android.wysiwyg.compose.RichTextEditorDefaults
 import io.element.android.wysiwyg.compose.RichTextEditorStyle
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
index bdaed4e402..0f62eb5234 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
@@ -29,8 +29,10 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -40,6 +42,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
@@ -50,6 +53,7 @@ import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -66,10 +70,14 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.IconColorButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsProvider
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.textcomposer.components.SendButtonIcon
@@ -181,7 +189,7 @@ fun TextComposer(
                             placeholder = placeholder,
                             registerStateUpdates = true,
                             modifier = Modifier
-                                .padding(top = 6.dp, bottom = 6.dp)
+                                .padding(top = 4.dp, bottom = 6.dp)
                                 .fillMaxWidth(),
                             style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.richTextEditorState.hasFocus),
                             resolveMentionDisplay = resolveMentionDisplay,
@@ -400,6 +408,7 @@ fun TextComposer(
             onAddAttachment = onAddAttachment,
             onDeleteVoiceMessage = onDeleteVoiceMessage,
             onVoiceRecorderEvent = onVoiceRecorderEvent,
+            onResetComposerMode = onResetComposerMode,
         )
     }
 
@@ -409,6 +418,15 @@ fun TextComposer(
 
     SoftKeyboardEffect(showTextFormatting, onRequestFocus) { it }
 
+    // Re-focus the text input when voice recording ends so the user can continue typing
+    var previousVoiceMessageState by remember { mutableStateOf(voiceMessageState) }
+    LaunchedEffect(voiceMessageState, onRequestFocus) {
+        if (voiceMessageState is VoiceMessageState.Idle && previousVoiceMessageState !is VoiceMessageState.Idle) {
+            onRequestFocus()
+        }
+        previousVoiceMessageState = voiceMessageState
+    }
+
     val latestOnReceiveSuggestion by rememberUpdatedState(onReceiveSuggestion)
     if (state is TextEditorState.Rich) {
         val menuAction = state.richTextEditorState.menuAction
@@ -440,6 +458,7 @@ private fun StandardLayout(
     onAddAttachment: () -> Unit,
     onDeleteVoiceMessage: () -> Unit,
     onVoiceRecorderEvent: (VoiceMessageRecorderEvent) -> Unit,
+    onResetComposerMode: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {
@@ -504,10 +523,19 @@ private fun StandardLayout(
                     .padding(bottom = 8.dp, top = 8.dp)
                     .weight(1f)
             ) {
+                val movableVoiceRecording = remember { movableContentOf { voiceRecording() } }
                 if (voiceMessageState is VoiceMessageState.Idle) {
                     textInput()
+                } else if (composerMode is MessageComposerMode.Special) {
+                    TextInputBox(
+                        composerMode = composerMode,
+                        onResetComposerMode = onResetComposerMode,
+                        isTextEmpty = true,
+                    ) {
+                        movableVoiceRecording()
+                    }
                 } else {
-                    voiceRecording()
+                    movableVoiceRecording()
                 }
             }
             // To avoid loosing keyboard focus, the IconButton has to be defined here and has to be always enabled.
@@ -632,10 +660,14 @@ private fun TextInputBox(
                 composerMode = composerMode,
                 onResetComposerMode = onResetComposerMode,
             )
+        } else {
+            // Top padding for the message composer box
+            Spacer(Modifier.height(4.dp))
         }
+
         Box(
             modifier = Modifier
-                .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
+                .padding(top = 1.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
                 .then(Modifier.testTag(TestTags.textEditor)),
             contentAlignment = Alignment.CenterStart,
         ) {
@@ -645,11 +677,11 @@ private fun TextInputBox(
                 Icon(
                     modifier = Modifier
                         .clickable { showBottomSheet = true }
-                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                        .padding(start = 8.dp, end = 8.dp, top = 4.dp, bottom = 4.dp)
                         .align(Alignment.CenterEnd),
                     imageVector = CompoundIcons.InfoSolid(),
                     tint = ElementTheme.colors.iconCriticalPrimary,
-                    contentDescription = null,
+                    contentDescription = stringResource(CommonStrings.a11y_info),
                 )
                 if (showBottomSheet) {
                     CaptionWarningBottomSheet(
@@ -964,6 +996,40 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {
     }
 }
 
+@Preview
+@Composable
+internal fun TextComposerScaledDensityWithReplyPreview() {
+    ElementPreview {
+        CompositionLocalProvider(
+            LocalDensity provides Density(
+                density = 3f,
+                fontScale = 1.25f,
+            ),
+        ) {
+            val replyToDetails = InReplyToDetails.Ready(
+                eventId = EventId("\$1234"),
+                senderId = UserId("@alice:example.com"),
+                senderProfile = aProfileDetailsReady(),
+                eventContent = MessageContent(
+                    body = "Message which are being replied, and which was long enough to be displayed on two lines (only!).",
+                    inReplyTo = null,
+                    isEdited = false,
+                    threadInfo = null,
+                    type = TextMessageType("Message which are being replied, and which was long enough to be displayed on two lines (only!).", null)
+                ),
+                textContent = "Message which are being replied, and which was long enough to be displayed on two lines (only!).",
+            )
+            Box(modifier = Modifier.width(480.dp).height(120.dp)) {
+                ATextComposer(
+                    state = aTextEditorStateMarkdown(initialText = "", initialFocus = true),
+                    voiceMessageState = VoiceMessageState.Idle,
+                    composerMode = MessageComposerMode.Reply(replyToDetails, hideImage = false),
+                )
+            }
+        }
+    }
+}
+
 @Composable
 private fun <T> PreviewColumn(
     items: ImmutableList<T>,
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
index 3ee191d724..9932dbaea1 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
@@ -179,7 +179,7 @@ private fun EditLinkDialog(
         }
         item {
             ListItem(
-                headlineContent = {
+                content = {
                     Text(
                         text = stringResource(R.string.rich_text_editor_remove_link),
                         color = ElementTheme.colors.textCriticalPrimary
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
index db133a9a09..6afec35dfe 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt
@@ -23,14 +23,17 @@ 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.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 internal fun FormattingOption(
@@ -52,6 +55,8 @@ internal fun FormattingOption(
         FormattingOptionState.Default -> ElementTheme.colors.iconSecondary
         FormattingOptionState.Disabled -> ElementTheme.colors.iconDisabled
     }
+    val activeStateDescription = stringResource(CommonStrings.a11y_active)
+    val inactiveStateDescription = stringResource(CommonStrings.a11y_inactive)
     Box(
         modifier = modifier
             .clickable(
@@ -77,6 +82,13 @@ internal fun FormattingOption(
             )
             .clearAndSetSemantics {
                 this.contentDescription = contentDescription
+                if (toggleable) {
+                    this.stateDescription = if (state == FormattingOptionState.Selected) {
+                        activeStateDescription
+                    } else {
+                        inactiveStateDescription
+                    }
+                }
             }
     ) {
         Box(
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
index b3c60b69d7..064ef03106 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
@@ -82,7 +82,7 @@ fun MarkdownTextInput(
 
     AndroidView(
         modifier = Modifier
-            .padding(top = 6.dp, bottom = 6.dp)
+            .padding(top = 5.dp, bottom = 6.dp)
             .fillMaxWidth(),
         factory = { context ->
             MarkdownEditText(context).apply {
@@ -93,6 +93,7 @@ fun MarkdownTextInput(
                 setText(text)
                 setHint(placeholder)
                 setHintTextColor(ColorStateList.valueOf(placeholderColor.toArgb()))
+                contentDescription = placeholder
                 inputType = InputType.TYPE_CLASS_TEXT or
                     InputType.TYPE_TEXT_FLAG_CAP_SENTENCES or
                     InputType.TYPE_TEXT_FLAG_MULTI_LINE or
@@ -129,6 +130,7 @@ fun MarkdownTextInput(
             }
         },
         update = { editText ->
+            editText.contentDescription = placeholder
             editText.applyStyleInCompose(richTextEditorStyle)
             val text = state.text.value()
             mentionSpanUpdater.updateMentionSpans(text)
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpan.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpan.kt
index b0f973b6b9..937561e2a5 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpan.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpan.kt
@@ -39,11 +39,15 @@ class MentionSpan(
     private var typeface: Typeface = Typeface.DEFAULT
 
     private var measuredTextWidth = 0
+    private var measuredTrailingWidth = 0
 
     // The formatted display text, will be set by the formatter
     var displayText: CharSequence = ""
         private set
 
+    var trailingText: String? = null
+        private set
+
     /**
      * Updates the visual properties of this span.
      */
@@ -80,6 +84,10 @@ class MentionSpan(
         displayText = formatter.formatDisplayText(type)
     }
 
+    fun updateTrailingText(trailingText: String?) {
+        this.trailingText = trailingText
+    }
+
     override fun getSize(
         paint: Paint,
         text: CharSequence?,
@@ -91,7 +99,8 @@ class MentionSpan(
         textPaint.typeface = typeface
         // Measure the full text width without truncation
         measuredTextWidth = textPaint.measureText(displayText, 0, displayText.length).roundToInt()
-        return measuredTextWidth + startPadding + endPadding
+        measuredTrailingWidth = trailingText?.let { textPaint.measureText(" $it").roundToInt() } ?: 0
+        return measuredTextWidth + measuredTrailingWidth + startPadding + endPadding
     }
 
     override fun draw(
@@ -105,15 +114,13 @@ class MentionSpan(
         bottom: Int,
         paint: Paint
     ) {
-        // Extra vertical space to add below the baseline (y). This helps us center the span vertically
-        val extraVerticalSpace = y + paint.ascent() + paint.descent() - top
-
         val availableWidth = (canvas.width - x).coerceAtLeast(0f)
-        val measuredWidth = measuredTextWidth + startPadding + endPadding
+
+        val measuredWidth = measuredTextWidth + measuredTrailingWidth + startPadding + endPadding
         val pillWidth = minOf(availableWidth, measuredWidth.toFloat())
 
         backgroundPaint.color = backgroundColor
-        val rect = RectF(x, top.toFloat(), x + pillWidth, y.toFloat() + extraVerticalSpace)
+        val rect = RectF(x, top.toFloat(), x + pillWidth, bottom.toFloat())
         val radius = rect.height() / 2
         canvas.drawRoundRect(rect, radius, radius, backgroundPaint)
 
@@ -121,18 +128,18 @@ class MentionSpan(
         textPaint.color = textColor
         textPaint.typeface = typeface
 
-        val availableWidthForText = availableWidth - startPadding - endPadding
+        val availableWidthForText = availableWidth - startPadding - endPadding - measuredTrailingWidth
         val textToDraw = if (measuredTextWidth > availableWidthForText) {
-            TextUtils.ellipsize(
-                displayText,
-                textPaint,
-                availableWidthForText,
-                TextUtils.TruncateAt.END
-            )
+            TextUtils.ellipsize(displayText, textPaint, availableWidthForText, TextUtils.TruncateAt.END)
         } else {
             displayText
         }
         canvas.drawText(textToDraw, 0, textToDraw.length, x + startPadding, y.toFloat(), textPaint)
+
+        trailingText?.let {
+            val drawnTextWidth = minOf(availableWidthForText, measuredTextWidth.toFloat())
+            canvas.drawText(" $it", x + startPadding + drawnTextWidth, y.toFloat(), textPaint)
+        }
     }
 }
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanUpdater.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanUpdater.kt
index a530d64437..2142220e24 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanUpdater.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/MentionSpanUpdater.kt
@@ -18,6 +18,7 @@ import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.ui.messages.RoomMemberProfilesCache
 import io.element.android.libraries.matrix.ui.messages.RoomNamesCache
+import io.element.android.libraries.matrix.ui.model.toEmojiText
 
 interface MentionSpanUpdater {
     fun updateMentionSpans(text: CharSequence): CharSequence
@@ -48,6 +49,13 @@ class DefaultMentionSpanUpdater(
         for (mentionSpan in text.getMentionSpans()) {
             mentionSpan.updateTheme(theme)
             mentionSpan.updateDisplayText(formatter)
+            mentionSpan.updateTrailingText(
+                if (mentionSpan.type is MentionType.User) {
+                    roomMemberProfilesCache.getDisplayedStatus(mentionSpan.type.userId)?.toEmojiText()
+                } else {
+                    null
+                }
+            )
         }
         return text
     }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt
index d91735fb83..f9fd6a2b6d 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt
@@ -14,6 +14,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
 
 @Immutable
 sealed interface ResolvedSuggestion {
@@ -32,4 +33,8 @@ sealed interface ResolvedSuggestion {
             size = size,
         )
     }
+
+    data class Command(
+        val command: SlashCommandSuggestion,
+    ) : ResolvedSuggestion
 }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt
index ba7e3c50c0..90e5368951 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/model/MarkdownTextEditorState.kt
@@ -61,21 +61,29 @@ class MarkdownTextEditorState(
             }
             is ResolvedSuggestion.Member -> {
                 val currentText = SpannableStringBuilder(text.value())
-                val mentionSpan = mentionSpanProvider.createUserMentionSpan(resolvedSuggestion.roomMember.userId)
+                val userId = resolvedSuggestion.roomMember.userId
+                val mentionSpan = mentionSpanProvider.createUserMentionSpan(userId)
                 currentText.replace(suggestion.start, suggestion.end, "@ ")
                 val end = suggestion.start + 1
                 currentText.setSpan(mentionSpan, suggestion.start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                this.text.update(currentText, true)
-                this.selection = IntRange(end + 1, end + 1)
+                text.update(currentText, true)
+                selection = IntRange(end + 1, end + 1)
             }
             is ResolvedSuggestion.Alias -> {
                 val currentText = SpannableStringBuilder(text.value())
-                val mentionSpan = mentionSpanProvider.createRoomMentionSpan(resolvedSuggestion.roomAlias.toRoomIdOrAlias())
+                val roomAlias = resolvedSuggestion.roomAlias
+                val mentionSpan = mentionSpanProvider.createRoomMentionSpan(roomAlias.toRoomIdOrAlias())
                 currentText.replace(suggestion.start, suggestion.end, "# ")
                 val end = suggestion.start + 1
                 currentText.setSpan(mentionSpan, suggestion.start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-                this.text.update(currentText, true)
-                this.selection = IntRange(end + 1, end + 1)
+                text.update(currentText, true)
+                selection = IntRange(end + 1, end + 1)
+            }
+            is ResolvedSuggestion.Command -> {
+                // Just insert the command text
+                text.update("${resolvedSuggestion.command.command} ", true)
+                val length = resolvedSuggestion.command.command.length + 1
+                selection = IntRange(length, length)
             }
         }
     }
diff --git a/libraries/textcomposer/impl/src/main/res/values-be/translations.xml b/libraries/textcomposer/impl/src/main/res/values-be/translations.xml
index 7f5693b0a4..dae17ce795 100644
--- a/libraries/textcomposer/impl/src/main/res/values-be/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-be/translations.xml
@@ -4,7 +4,9 @@
   <string name="rich_text_editor_bullet_list">"Пераключыць маркіраваны спіс"</string>
   <string name="rich_text_editor_close_formatting_options">"Закрыць параметры фарматавання"</string>
   <string name="rich_text_editor_code_block">"Пераключыць блок кода"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Зашыфраванае паведамленне…"</string>
   <string name="rich_text_editor_composer_placeholder">"Паведамленне…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Незашыфраванае паведамленне…"</string>
   <string name="rich_text_editor_create_link">"Стварыць спасылку"</string>
   <string name="rich_text_editor_edit_link">"Рэдагаваць спасылку"</string>
   <string name="rich_text_editor_format_bold">"Ужыць тоўсты шрыфт"</string>
diff --git a/libraries/textcomposer/impl/src/main/res/values-ca/translations.xml b/libraries/textcomposer/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..f3b78b9dd2
--- /dev/null
+++ b/libraries/textcomposer/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rich_text_editor_a11y_add_attachment">"Afegeix fitxer adjunt"</string>
+  <string name="rich_text_editor_bullet_list">"Activa/desactiva la llista amb punts"</string>
+  <string name="rich_text_editor_close_formatting_options">"Cancel·la i tanca el format de text"</string>
+  <string name="rich_text_editor_code_block">"Activa/desactiva bloc de codi"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"Afegeix llegenda"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Missatge xifrat…"</string>
+  <string name="rich_text_editor_composer_placeholder">"Missatge…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Missatge no xifrat…"</string>
+  <string name="rich_text_editor_create_link">"Crea enllaç"</string>
+  <string name="rich_text_editor_edit_link">"Edita enllaç"</string>
+  <string name="rich_text_editor_format_action">"%1$s, estat: %2$s"</string>
+  <string name="rich_text_editor_format_bold">"Aplica el format negreta"</string>
+  <string name="rich_text_editor_format_italic">"Aplica el format cursiva"</string>
+  <string name="rich_text_editor_format_state_disabled">"desactivat"</string>
+  <string name="rich_text_editor_format_strikethrough">"Aplica el format ratllat"</string>
+  <string name="rich_text_editor_format_underline">"Aplica el format subratllat"</string>
+  <string name="rich_text_editor_full_screen_toggle">"Activa/desactiva mode pantalla completa"</string>
+  <string name="rich_text_editor_indent">"Sagnia"</string>
+  <string name="rich_text_editor_inline_code">"Aplica format de codi"</string>
+  <string name="rich_text_editor_link">"Estableix enllaç"</string>
+  <string name="rich_text_editor_numbered_list">"Activa/desactiva llista numerada"</string>
+  <string name="rich_text_editor_open_compose_options">"Obre les opcions de redacció"</string>
+  <string name="rich_text_editor_quote">"Activa/desactiva cometes"</string>
+  <string name="rich_text_editor_remove_link">"Elimina enllaç"</string>
+  <string name="rich_text_editor_unindent">"Treu sagnia"</string>
+  <string name="rich_text_editor_url_placeholder">"Enllaç"</string>
+  <string name="screen_media_upload_preview_caption_warning">"És possible que les llegendes no siguin visibles pels que utilitzin aplicacions antigues."</string>
+  <string name="screen_room_voice_message_tooltip">"Mantén premut per gravar."</string>
+</resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-ja/translations.xml b/libraries/textcomposer/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..6dea90b306
--- /dev/null
+++ b/libraries/textcomposer/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rich_text_editor_a11y_add_attachment">"添付ファイルを追加"</string>
+  <string name="rich_text_editor_bullet_list">"箇条リスト"</string>
+  <string name="rich_text_editor_close_formatting_options">"書式設定を中止して閉じる"</string>
+  <string name="rich_text_editor_code_block">"コードブロックを切替"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"キャプションを追加"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"暗号化されたメッセージ…"</string>
+  <string name="rich_text_editor_composer_placeholder">"メッセージ…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"暗号化されていないメッセージ…"</string>
+  <string name="rich_text_editor_create_link">"リンクを作成"</string>
+  <string name="rich_text_editor_edit_link">"リンクを編集"</string>
+  <string name="rich_text_editor_format_action">"%1$s の状態: %2$s"</string>
+  <string name="rich_text_editor_format_bold">"太字"</string>
+  <string name="rich_text_editor_format_italic">"斜体"</string>
+  <string name="rich_text_editor_format_state_disabled">"無効"</string>
+  <string name="rich_text_editor_format_state_off">"オフ"</string>
+  <string name="rich_text_editor_format_state_on">"オン"</string>
+  <string name="rich_text_editor_format_strikethrough">"取り消し線を追加"</string>
+  <string name="rich_text_editor_format_underline">"下線を追加"</string>
+  <string name="rich_text_editor_full_screen_toggle">"全画面モードの切替"</string>
+  <string name="rich_text_editor_indent">"インデント"</string>
+  <string name="rich_text_editor_inline_code">"コード部の書式"</string>
+  <string name="rich_text_editor_link">"リンクを設定"</string>
+  <string name="rich_text_editor_numbered_list">"番号リスト"</string>
+  <string name="rich_text_editor_open_compose_options">"記述設定を開く"</string>
+  <string name="rich_text_editor_quote">"引用の表示切替"</string>
+  <string name="rich_text_editor_remove_link">"リンクを削除"</string>
+  <string name="rich_text_editor_unindent">"インデントを削除"</string>
+  <string name="rich_text_editor_url_placeholder">"リンク"</string>
+  <string name="screen_media_upload_preview_caption_warning">"古いアプリケーションを使用しているユーザーはキャプションを見られない可能性があります。"</string>
+  <string name="screen_room_voice_message_tooltip">"長押しで録音"</string>
+</resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-vi/translations.xml b/libraries/textcomposer/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..5395221a6d
--- /dev/null
+++ b/libraries/textcomposer/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rich_text_editor_a11y_add_attachment">"Thêm tệp đính kèm"</string>
+  <string name="rich_text_editor_bullet_list">"Chuyển đổi danh sách dấu đầu dòng"</string>
+  <string name="rich_text_editor_close_formatting_options">"Hủy và đóng định dạng văn bản"</string>
+  <string name="rich_text_editor_code_block">"Bật/tắt khối mã"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"Thêm chú thích"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Tin nhắn được mã hóa…"</string>
+  <string name="rich_text_editor_composer_placeholder">"Tin nhắn…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Tin nhắn chưa được mã hóa…"</string>
+  <string name="rich_text_editor_create_link">"Tạo liên kết"</string>
+  <string name="rich_text_editor_edit_link">"Sửa liên kết"</string>
+  <string name="rich_text_editor_format_action">"%1$s, tình trạng: %2$s"</string>
+  <string name="rich_text_editor_format_bold">"Áp dụng định dạng in đậm"</string>
+  <string name="rich_text_editor_format_italic">"Áp dụng định dạng in nghiêng"</string>
+  <string name="rich_text_editor_format_state_disabled">"Đã tắt"</string>
+  <string name="rich_text_editor_format_state_off">"tắt"</string>
+  <string name="rich_text_editor_format_state_on">"bật"</string>
+  <string name="rich_text_editor_format_strikethrough">"Áp dụng định dạng gạch ngang"</string>
+  <string name="rich_text_editor_format_underline">"Áp dụng định dạng gạch chân"</string>
+  <string name="rich_text_editor_full_screen_toggle">"Bật/tắt chế độ toàn màn hình"</string>
+  <string name="rich_text_editor_indent">"Thụt lề"</string>
+  <string name="rich_text_editor_inline_code">"Áp dụng định dạng mã trong dòng"</string>
+  <string name="rich_text_editor_link">"Đặt liên kết"</string>
+  <string name="rich_text_editor_numbered_list">"Chuyển đổi danh sách được đánh số"</string>
+  <string name="rich_text_editor_open_compose_options">"Mở tùy chọn soạn tin"</string>
+  <string name="rich_text_editor_quote">"Chuyển sang Trích dẫn"</string>
+  <string name="rich_text_editor_remove_link">"Xóa liên kết"</string>
+  <string name="rich_text_editor_unindent">"Bỏ thụt lề"</string>
+  <string name="rich_text_editor_url_placeholder">"Liên kết"</string>
+  <string name="screen_room_voice_message_tooltip">"Nhấn giữ để ghi âm"</string>
+</resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml b/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
index 8db2b9c767..f79cb2f30c 100644
--- a/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
@@ -4,8 +4,8 @@
   <string name="rich_text_editor_bullet_list">"切换符号列表"</string>
   <string name="rich_text_editor_close_formatting_options">"取消并关闭文本格式"</string>
   <string name="rich_text_editor_code_block">"切换代码块"</string>
-  <string name="rich_text_editor_composer_caption_placeholder">"可选的标题……"</string>
-  <string name="rich_text_editor_composer_encrypted_placeholder">"加密信息…"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"添加标题…"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"已加密的消息…"</string>
   <string name="rich_text_editor_composer_placeholder">"消息…"</string>
   <string name="rich_text_editor_composer_unencrypted_placeholder">"未加密的消息…"</string>
   <string name="rich_text_editor_create_link">"创建链接"</string>
@@ -20,7 +20,7 @@
   <string name="rich_text_editor_format_underline">"应用下划线格式"</string>
   <string name="rich_text_editor_full_screen_toggle">"切换全屏模式"</string>
   <string name="rich_text_editor_indent">"缩进"</string>
-  <string name="rich_text_editor_inline_code">"应用行内代码格式"</string>
+  <string name="rich_text_editor_inline_code">"应用内联代码格式"</string>
   <string name="rich_text_editor_link">"设置链接"</string>
   <string name="rich_text_editor_numbered_list">"切换编号列表"</string>
   <string name="rich_text_editor_open_compose_options">"打开撰写选项"</string>
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
index 9a65ca0ad5..ba49428cae 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
@@ -6,14 +6,16 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.textcomposer.impl.components.markdown
 
 import android.widget.EditText
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import androidx.core.text.getSpans
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
@@ -32,66 +34,53 @@ import io.element.android.libraries.textcomposer.model.SuggestionType
 import io.element.android.libraries.textcomposer.model.aMarkdownTextEditorState
 import io.element.android.tests.testutils.EnsureCalledOnceWithParam
 import io.element.android.tests.testutils.EventsRecorder
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MarkdownTextInputTest {
-    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
+class MarkdownTextInputTest : RobolectricTest() {
     @Test
-    fun `when user types onTyping is triggered with value 'true'`() = runTest {
+    fun `when user types onTyping is triggered with value 'true'`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialFocus = true)
         val onTyping = EnsureCalledOnceWithParam(expectedParam = true, result = Unit)
-        rule.setMarkdownTextInput(state = state, onTyping = onTyping)
-        rule.activityRule.scenario.onActivity {
-            it.findEditor().setText("Test")
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state, onTyping = onTyping)
+        activity!!.findEditor().setText("Test")
+        awaitIdle()
         onTyping.assertSuccess()
     }
 
     @Test
-    fun `when user removes text onTyping is triggered with value 'false'`() = runTest {
+    fun `when user removes text onTyping is triggered with value 'false'`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialFocus = true)
         val onTyping = EventsRecorder<Boolean>()
-        rule.setMarkdownTextInput(state = state, onTyping = onTyping)
-        rule.activityRule.scenario.onActivity {
-            val editText = it.findEditor()
-            editText.setText("Test")
-            editText.setText("")
-            editText.setText(null)
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state, onTyping = onTyping)
+        val editText = activity!!.findEditor()
+        editText.setText("Test")
+        editText.setText("")
+        editText.setText(null)
+        awaitIdle()
         onTyping.assertList(listOf(true, false, false))
     }
 
     @Test
-    fun `when user types something that's not a mention onSuggestionReceived is triggered with 'null'`() = runTest {
+    fun `when user types something that's not a mention onSuggestionReceived is triggered with 'null'`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialFocus = true)
         val onSuggestionReceived = EventsRecorder<Suggestion?>()
-        rule.setMarkdownTextInput(state = state, onSuggestionReceived = onSuggestionReceived)
-        rule.activityRule.scenario.onActivity {
-            it.findEditor().setText("Test")
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state, onSuggestionReceived = onSuggestionReceived)
+        activity!!.findEditor().setText("Test")
+        awaitIdle()
         onSuggestionReceived.assertSingle(null)
     }
 
     @Test
-    fun `when user types something that's a mention onSuggestionReceived is triggered a real value`() = runTest {
+    fun `when user types something that's a mention onSuggestionReceived is triggered a real value`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialFocus = true)
         val onSuggestionReceived = EventsRecorder<Suggestion?>()
-        rule.setMarkdownTextInput(state = state, onSuggestionReceived = onSuggestionReceived)
-        rule.activityRule.scenario.onActivity {
-            it.findEditor().setText("@")
-            it.findEditor().setText("#")
-            it.findEditor().setText("/")
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state, onSuggestionReceived = onSuggestionReceived)
+        val editor = activity!!.findEditor()
+        editor.setText("@")
+        editor.setText("#")
+        editor.setText("/")
+        awaitIdle()
         onSuggestionReceived.assertList(
             listOf(
                 // User mention suggestion
@@ -105,69 +94,59 @@ class MarkdownTextInputTest {
     }
 
     @Test
-    fun `when the selection changes in the UI the state is updated`() = runTest {
+    fun `when the selection changes in the UI the state is updated`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialText = "Test", initialFocus = true)
-        rule.setMarkdownTextInput(state = state)
-        rule.activityRule.scenario.onActivity {
-            val editor = it.findEditor()
-            editor.setSelection(2)
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state)
+        val editor = activity!!.findEditor()
+        editor.setSelection(2)
+        awaitIdle()
         // Selection is updated
         assertThat(state.selection).isEqualTo(2..2)
     }
 
     @Test
-    fun `when the selection state changes in the view is updated`() = runTest {
+    fun `when the selection state changes in the view is updated`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialText = "Test", initialFocus = true)
-        rule.setMarkdownTextInput(state = state)
-        var editor: EditText? = null
-        rule.activityRule.scenario.onActivity {
-            editor = it.findEditor()
-            state.selection = 2..2
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state)
+        val editor = activity!!.findEditor()
+        state.selection = 2..2
+        awaitIdle()
         // Selection state is updated
-        assertThat(editor?.selectionStart).isEqualTo(2)
-        assertThat(editor?.selectionEnd).isEqualTo(2)
+        assertThat(editor.selectionStart).isEqualTo(2)
+        assertThat(editor.selectionEnd).isEqualTo(2)
     }
 
     @Test
-    fun `when the view focus changes the state is updated`() = runTest {
+    fun `when the view focus changes the state is updated`() = runAndroidComposeUiTest {
         val state = aMarkdownTextEditorState(initialText = "Test", initialFocus = false)
-        rule.setMarkdownTextInput(state = state)
-        rule.activityRule.scenario.onActivity {
-            val editor = it.findEditor()
-            editor.requestFocus()
-        }
+        setMarkdownTextInput(state = state)
+        val editor = activity!!.findEditor()
+        editor.requestFocus()
         // Focus state is updated
         assertThat(state.hasFocus).isTrue()
     }
 
     @Test
-    fun `inserting a mention replaces the existing text with a span`() = runTest {
+    fun `inserting a mention replaces the existing text with a span`() = runAndroidComposeUiTest {
         val permalinkParser = FakePermalinkParser(result = { PermalinkData.UserLink(A_SESSION_ID) })
         val state = aMarkdownTextEditorState(initialText = "@", initialFocus = true)
         state.currentSuggestion = Suggestion(0, 1, SuggestionType.Mention, "")
-        rule.setMarkdownTextInput(state = state)
-        var editor: EditText? = null
-        rule.activityRule.scenario.onActivity {
-            editor = it.findEditor()
-            state.insertSuggestion(
-                ResolvedSuggestion.Member(roomMember = aRoomMember()),
-                aMentionSpanProvider(permalinkParser),
-            )
-        }
-        rule.awaitIdle()
+        setMarkdownTextInput(state = state)
+        val editor = activity!!.findEditor()
+        state.insertSuggestion(
+            ResolvedSuggestion.Member(roomMember = aRoomMember()),
+            aMentionSpanProvider(permalinkParser),
+        )
+        awaitIdle()
 
         // Text is replaced with a placeholder
-        assertThat(editor?.editableText.toString()).isEqualTo("@ ")
+        assertThat(editor.editableText.toString()).isEqualTo("@ ")
         // The placeholder contains a MentionSpan
-        val mentionSpans = editor?.editableText?.getSpans<MentionSpan>(0, 2).orEmpty()
+        val mentionSpans = editor.editableText?.getSpans<MentionSpan>(0, 2).orEmpty()
         assertThat(mentionSpans).isNotEmpty()
     }
 
-    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMarkdownTextInput(
+    private fun AndroidComposeUiTest<ComponentActivity>.setMarkdownTextInput(
         state: MarkdownTextEditorState = aMarkdownTextEditorState(),
         onTyping: (Boolean) -> Unit = {},
         onSuggestionReceived: (Suggestion?) -> Unit = {},
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/IntentionalMentionSpanProviderTest.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/IntentionalMentionSpanProviderTest.kt
index 7bac75cc75..0eec4805a9 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/IntentionalMentionSpanProviderTest.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/mentions/IntentionalMentionSpanProviderTest.kt
@@ -17,13 +17,11 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.textcomposer.mentions.MentionType
 import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
 
-@RunWith(RobolectricTestRunner::class)
-class IntentionalMentionSpanProviderTest {
+class IntentionalMentionSpanProviderTest : RobolectricTest() {
     @JvmField @Rule
     val warmUpRule = WarmUpRule()
 
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/model/MarkdownTextEditorStateTest.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/model/MarkdownTextEditorStateTest.kt
index 04b700925e..247a74a0eb 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/model/MarkdownTextEditorStateTest.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/model/MarkdownTextEditorStateTest.kt
@@ -11,7 +11,6 @@ package io.element.android.libraries.textcomposer.impl.model
 import android.net.Uri
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.UserId
@@ -23,6 +22,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.matrix.test.room.aRoomMember
+import io.element.android.libraries.slashcommands.api.SlashCommandSuggestion
 import io.element.android.libraries.textcomposer.impl.mentions.aMentionSpanProvider
 import io.element.android.libraries.textcomposer.mentions.MentionSpan
 import io.element.android.libraries.textcomposer.mentions.MentionType
@@ -30,11 +30,10 @@ import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
 import io.element.android.libraries.textcomposer.model.Suggestion
 import io.element.android.libraries.textcomposer.model.SuggestionType
 import io.element.android.libraries.textcomposer.model.aMarkdownTextEditorState
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class MarkdownTextEditorStateTest {
+class MarkdownTextEditorStateTest : RobolectricTest() {
     @Test
     fun `insertMention - room alias - getMentions return empty list`() {
         val state = aMarkdownTextEditorState(initialText = "Hello @", initialFocus = true)
@@ -42,6 +41,7 @@ class MarkdownTextEditorStateTest {
         val mentionSpanProvider = aMentionSpanProvider()
         state.insertSuggestion(suggestion, mentionSpanProvider)
         assertThat(state.getMentions()).isEmpty()
+        assertThat(state.text.value().toString()).isEqualTo("Hello @")
     }
 
     @Test
@@ -53,6 +53,7 @@ class MarkdownTextEditorStateTest {
         val permalinkParser = FakePermalinkParser(result = { PermalinkData.RoomLink(A_ROOM_ALIAS.toRoomIdOrAlias()) })
         val mentionSpanProvider = aMentionSpanProvider(permalinkParser = permalinkParser)
         state.insertSuggestion(suggestion, mentionSpanProvider)
+        assertThat(state.text.value().toString()).isEqualTo("Hello # ")
     }
 
     @Test
@@ -64,6 +65,19 @@ class MarkdownTextEditorStateTest {
         val permalinkParser = FakePermalinkParser(result = { PermalinkData.RoomLink(A_ROOM_ALIAS.toRoomIdOrAlias()) })
         val mentionSpanProvider = aMentionSpanProvider(permalinkParser = permalinkParser)
         state.insertSuggestion(suggestion, mentionSpanProvider)
+        assertThat(state.text.value().toString()).isEqualTo("Hello # ")
+    }
+
+    @Test
+    fun `insertSuggestion - command`() {
+        val state = aMarkdownTextEditorState(initialText = "/rai", initialFocus = true).apply {
+            currentSuggestion = Suggestion(start = 0, end = 3, type = SuggestionType.Command, text = "/rainbow")
+        }
+        val suggestion = aSlashCommandSuggestion()
+        val permalinkParser = FakePermalinkParser(result = { PermalinkData.RoomLink(A_ROOM_ALIAS.toRoomIdOrAlias()) })
+        val mentionSpanProvider = aMentionSpanProvider(permalinkParser = permalinkParser)
+        state.insertSuggestion(suggestion, mentionSpanProvider)
+        assertThat(state.text.value().toString()).isEqualTo("/rainbow ")
     }
 
     @Test
@@ -74,6 +88,7 @@ class MarkdownTextEditorStateTest {
         val mentionSpanProvider = aMentionSpanProvider()
         state.insertSuggestion(mention, mentionSpanProvider)
         assertThat(state.getMentions()).isEmpty()
+        assertThat(state.text.value().toString()).isEqualTo("Hello @")
     }
 
     @Test
@@ -91,6 +106,7 @@ class MarkdownTextEditorStateTest {
         val mentions = state.getMentions()
         assertThat(mentions).isNotEmpty()
         assertThat((mentions.firstOrNull() as? IntentionalMention.User)?.userId).isEqualTo(member.userId)
+        assertThat(state.text.value().toString()).isEqualTo("Hello @ ")
     }
 
     @Test
@@ -107,15 +123,14 @@ class MarkdownTextEditorStateTest {
         val mentions = state.getMentions()
         assertThat(mentions).isNotEmpty()
         assertThat(mentions.firstOrNull()).isInstanceOf(IntentionalMention.Room::class.java)
+        assertThat(state.text.value().toString()).isEqualTo("Hello @ ")
     }
 
     @Test
     fun `getMessageMarkdown - when there are no MentionSpans returns the same text`() {
         val text = "No mentions here"
         val state = aMarkdownTextEditorState(initialText = text, initialFocus = true)
-
         val markdown = state.getMessageMarkdown(FakePermalinkBuilder())
-
         assertThat(markdown).isEqualTo(text)
     }
 
@@ -128,19 +143,17 @@ class MarkdownTextEditorStateTest {
         )
         val state = aMarkdownTextEditorState(initialText = text, initialFocus = true)
         state.text.update(aMarkdownTextWithMentions(), needsDisplaying = false)
-
         val markdown = state.getMessageMarkdown(permalinkBuilder = permalinkBuilder)
-
         assertThat(markdown).isEqualTo(
             "Hello [@alice:matrix.org](https://matrix.to/#/@alice:matrix.org) and everyone in @room" +
                 " and a room [#room:domain.org](https://matrix.to/#/#room:domain.org)"
         )
+        assertThat(state.text.value().toString()).isEqualTo("Hello @ and everyone in @ and a room #room:domain.org")
     }
 
     @Test
     fun `getMentions - when there are no MentionSpans returns empty list of mentions`() {
         val state = aMarkdownTextEditorState(initialText = "Hello @", initialFocus = true)
-
         assertThat(state.getMentions()).isEmpty()
     }
 
@@ -148,9 +161,7 @@ class MarkdownTextEditorStateTest {
     fun `getMentions - when there are MentionSpans returns a list of mentions`() {
         val state = aMarkdownTextEditorState(initialText = "Hello @", initialFocus = true)
         state.text.update(aMarkdownTextWithMentions(), needsDisplaying = false)
-
         val mentions = state.getMentions()
-
         assertThat(mentions).isNotEmpty()
         assertThat((mentions.firstOrNull() as? IntentionalMention.User)?.userId?.value).isEqualTo("@alice:matrix.org")
         assertThat(mentions.lastOrNull()).isInstanceOf(IntentionalMention.Room::class.java)
@@ -184,4 +195,14 @@ class MarkdownTextEditorStateTest {
             roomAvatarUrl = null
         )
     }
+
+    private fun aSlashCommandSuggestion(): ResolvedSuggestion.Command {
+        return ResolvedSuggestion.Command(
+            command = SlashCommandSuggestion(
+                command = "/rainbow",
+                parameters = "param",
+                description = "Make the text colorful 🌈",
+            ),
+        )
+    }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
index fa5e7078d2..4e0f89155d 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
@@ -68,7 +68,7 @@ private fun ColumnScope.TroubleshootTestView(
     val status = testState.status
     if ((status as? Status.Idle)?.visible == false) return
     ListItem(
-        headlineContent = { Text(text = testState.name) },
+        content = { Text(text = testState.name) },
         supportingContent = { Text(text = testState.description) },
         trailingContent = when (status) {
             is Status.Idle -> null
@@ -108,7 +108,7 @@ private fun ColumnScope.TroubleshootTestView(
     )
     if (status is Status.Failure && status.hasQuickFix) {
         ListItem(
-            headlineContent = { },
+            content = { },
             trailingContent = ListItemContent.Custom {
                 Button(
                     text = status.quickFixButtonString ?: stringResource(id = R.string.troubleshoot_notifications_screen_quick_fix_action),
@@ -137,7 +137,7 @@ private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNoti
     }
     when (state.testSuiteState.mainState) {
         AsyncAction.Uninitialized -> {
-            ListItem(headlineContent = {
+            ListItem(content = {
                 Text(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_notice)
                 )
@@ -146,20 +146,20 @@ private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNoti
         }
         AsyncAction.Loading -> Unit
         is AsyncAction.Failure -> {
-            ListItem(headlineContent = {
+            ListItem(content = {
                 Text(text = stringResource(id = R.string.troubleshoot_notifications_screen_failure))
             })
             RunTestButton(state = state)
         }
         is AsyncAction.Confirming -> {
-            ListItem(headlineContent = {
+            ListItem(content = {
                 Text(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_waiting)
                 )
             })
         }
         is AsyncAction.Success -> {
-            ListItem(headlineContent = {
+            ListItem(content = {
                 Text(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_success)
                 )
@@ -171,7 +171,7 @@ private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNoti
 @Composable
 private fun RunTestButton(state: TroubleshootNotificationsState) {
     ListItem(
-        headlineContent = {
+        content = {
             Button(
                 text = stringResource(
                     id = if (state.testSuiteState.mainState is AsyncAction.Failure) {
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt
index 9ae748d03a..21e9c64139 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt
@@ -11,19 +11,16 @@ package io.element.android.libraries.troubleshoot.impl.history
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -44,12 +41,14 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.DropdownMenu
 import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.designsystem.utils.scaffoldScrollableContentInsets
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.troubleshoot.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -68,7 +67,7 @@ fun PushHistoryView(
             .fillMaxSize()
             .systemBarsPadding()
             .imePadding(),
-        contentWindowInsets = WindowInsets.statusBars,
+        contentWindowInsets = scaffoldScrollableContentInsets,
         topBar = {
             TopAppBar(
                 navigationIcon = {
@@ -157,7 +156,7 @@ private fun PushHistoryContent(
         modifier = modifier.fillMaxWidth()
     ) {
         ListItem(
-            headlineContent = { Text("Total number of received push") },
+            content = { Text("Total number of received push") },
             trailingContent = ListItemContent.Text(state.pushCounter.toString()),
         )
         LazyColumn(
diff --git a/libraries/troubleshoot/impl/src/main/res/values-ca/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..fe85dadb55
--- /dev/null
+++ b/libraries/troubleshoot/impl/src/main/res/values-ca/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_screen_action">"Executa tests"</string>
+  <string name="troubleshoot_notifications_screen_action_again">"Torna a executar tests"</string>
+  <string name="troubleshoot_notifications_screen_failure">"Alguns tests han fallat. Comprova\'n els detalls."</string>
+  <string name="troubleshoot_notifications_screen_notice">"Executa els tests per detectar qualsevol problema a la configuració que pugui fer que les notificacions no es comportin com s\'espera."</string>
+  <string name="troubleshoot_notifications_screen_quick_fix_action">"Intenta solucionar"</string>
+  <string name="troubleshoot_notifications_screen_success">"Tots els tests s\'han superat amb èxit."</string>
+  <string name="troubleshoot_notifications_screen_title">"Resolució de problemes de notificacions"</string>
+  <string name="troubleshoot_notifications_screen_waiting">"Alguns tests necessiten la teva atenció. Comprova\'n els detalls."</string>
+</resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
index 59f9ca6af6..14b52331c0 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
@@ -4,7 +4,9 @@
   <string name="troubleshoot_notifications_screen_action">"اجرای آزمون‌ها"</string>
   <string name="troubleshoot_notifications_screen_action_again">"اجرای دوبارهٔ آزمون‌ها"</string>
   <string name="troubleshoot_notifications_screen_failure">"برخی آزمون‌ها شکست خوردند. بررسی جزییات."</string>
+  <string name="troubleshoot_notifications_screen_notice">"اجرای آزمون‌ها برای تشخیص مشکلات در پیکربندیتان که می‌تواند باعث شود آگاهی آن‌گونه که انتظار می‌رود رفتار نکنند."</string>
   <string name="troubleshoot_notifications_screen_quick_fix_action">"تلاش برای تعمیر"</string>
   <string name="troubleshoot_notifications_screen_success">"همهٔ آزمون‌ها با موفّقیت گذرانده شدند."</string>
   <string name="troubleshoot_notifications_screen_title">"رفع‌اشکال آگاهی‌ها"</string>
+  <string name="troubleshoot_notifications_screen_waiting">"برخی آزم.ن‌ها نیازمند توجّهتانند. لطفاُ جزییات را بررسی کنید."</string>
 </resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-ja/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..a7357d7aae
--- /dev/null
+++ b/libraries/troubleshoot/impl/src/main/res/values-ja/translations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_push_history_title">"プッシュ履歴"</string>
+  <string name="troubleshoot_notifications_screen_action">"テストを実行"</string>
+  <string name="troubleshoot_notifications_screen_action_again">"再度テスト"</string>
+  <string name="troubleshoot_notifications_screen_failure">"一部のテストで失敗しました。詳細を確認してください。"</string>
+  <string name="troubleshoot_notifications_screen_notice">"テストを実行することで、不安定な通知を生じさせる設定の問題を特定できます。"</string>
+  <string name="troubleshoot_notifications_screen_quick_fix_action">"修正を試行"</string>
+  <string name="troubleshoot_notifications_screen_success">"テストは問題なく完了しました。"</string>
+  <string name="troubleshoot_notifications_screen_title">"通知のトラブルシューティング"</string>
+  <string name="troubleshoot_notifications_screen_waiting">"一部のテストはあなたの操作が必要です。詳細を確認してください。"</string>
+</resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-lt/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-lt/translations.xml
new file mode 100644
index 0000000000..2befbbf398
--- /dev/null
+++ b/libraries/troubleshoot/impl/src/main/res/values-lt/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_screen_action">"Vykdyti testus"</string>
+  <string name="troubleshoot_notifications_screen_action_again">"Vykdyti testus dar kartą"</string>
+</resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-ru/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-ru/translations.xml
index ff9e80f687..876811c861 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-ru/translations.xml
@@ -7,6 +7,6 @@
   <string name="troubleshoot_notifications_screen_notice">"Выполните тесты, чтобы выявить проблемы в конфигурации, из-за которой уведомления могут работать не так, как ожидалось."</string>
   <string name="troubleshoot_notifications_screen_quick_fix_action">"Попытаться исправить"</string>
   <string name="troubleshoot_notifications_screen_success">"Все тесты прошли успешно."</string>
-  <string name="troubleshoot_notifications_screen_title">"Уведомления об устранении неполадок"</string>
+  <string name="troubleshoot_notifications_screen_title">"Устранение неполадок с уведомлениями"</string>
   <string name="troubleshoot_notifications_screen_waiting">"Некоторые тесты требуют вашего внимания. Пожалуйста, проверьте подробности."</string>
 </resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-vi/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..977938afab
--- /dev/null
+++ b/libraries/troubleshoot/impl/src/main/res/values-vi/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_screen_action">"Chạy thử nghiệm"</string>
+  <string name="troubleshoot_notifications_screen_notice">"Chạy các bài kiểm tra để phát hiện vấn đề trong cấu hình có thể khiến thông báo không hoạt động như mong đợi."</string>
+  <string name="troubleshoot_notifications_screen_title">"Khắc phục sự cố thông báo"</string>
+</resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-zh/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-zh/translations.xml
index 2375580f2c..e451d82a9b 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-zh/translations.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_push_history_title">"推送历史记录"</string>
+  <string name="screen_push_history_title">"推送历史"</string>
   <string name="troubleshoot_notifications_screen_action">"运行测试"</string>
   <string name="troubleshoot_notifications_screen_action_again">"再次运行测试"</string>
   <string name="troubleshoot_notifications_screen_failure">"一些测试失败了。请查看详情。"</string>
-  <string name="troubleshoot_notifications_screen_notice">"运行测试以检测您的配置中可能导致通知无法按预期运行的问题。"</string>
+  <string name="troubleshoot_notifications_screen_notice">"运行测试以检测配置中可能导致通知行为异常的问题。"</string>
   <string name="troubleshoot_notifications_screen_quick_fix_action">"尝试修复"</string>
   <string name="troubleshoot_notifications_screen_success">"所有测试均成功通过。"</string>
   <string name="troubleshoot_notifications_screen_title">"排查通知问题"</string>
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
index 0ba6c22710..ea98aeabc6 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
@@ -6,60 +6,56 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.troubleshoot.impl
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
-@RunWith(AndroidJUnit4::class)
-class TroubleshootNotificationsViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
+class TroubleshootNotificationsViewTest : RobolectricTest() {
     @Test
-    fun `press menu back invokes the expected callback`() {
+    fun `press menu back invokes the expected callback`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TroubleshootNotificationsEvents>(expectEvents = false)
         ensureCalledOnce {
-            rule.setTroubleshootNotificationsView(
+            setTroubleshootNotificationsView(
                 state = aTroubleshootNotificationsState(
                     eventSink = eventsRecorder
                 ),
                 onBackClick = it,
             )
-            rule.pressBack()
+            pressBack()
         }
     }
 
     @Test
-    fun `clicking on run test emits the expected Event`() {
+    fun `clicking on run test emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TroubleshootNotificationsEvents>()
-        rule.setTroubleshootNotificationsView(
+        setTroubleshootNotificationsView(
             aTroubleshootNotificationsState(
                 eventSink = eventsRecorder
             ),
         )
-        rule.onNodeWithText("Run tests").performClick()
+        onNodeWithText("Run tests").performClick()
         eventsRecorder.assertSingle(TroubleshootNotificationsEvents.StartTests)
     }
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on run test again emits the expected Event`() {
+    fun `clicking on run test again emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TroubleshootNotificationsEvents>()
-        rule.setTroubleshootNotificationsView(
+        setTroubleshootNotificationsView(
             aTroubleshootNotificationsState(
                 tests = listOf(
                     aTroubleshootTestStateFailure(
@@ -69,7 +65,7 @@ class TroubleshootNotificationsViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.onNodeWithText("Run tests again").performClick()
+        onNodeWithText("Run tests again").performClick()
         eventsRecorder.assertList(
             listOf(
                 TroubleshootNotificationsEvents.RetryFailedTests,
@@ -80,9 +76,9 @@ class TroubleshootNotificationsViewTest {
 
     @Config(qualifiers = "h1024dp")
     @Test
-    fun `clicking on quick fix emits the expected Event`() {
+    fun `clicking on quick fix emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<TroubleshootNotificationsEvents>()
-        rule.setTroubleshootNotificationsView(
+        setTroubleshootNotificationsView(
             aTroubleshootNotificationsState(
                 tests = listOf(
                     aTroubleshootTestStateFailure(
@@ -92,7 +88,7 @@ class TroubleshootNotificationsViewTest {
                 eventSink = eventsRecorder
             ),
         )
-        rule.onNodeWithText("Attempt to fix").performClick()
+        onNodeWithText("Attempt to fix").performClick()
         eventsRecorder.assertList(
             listOf(
                 TroubleshootNotificationsEvents.RetryFailedTests,
@@ -102,7 +98,7 @@ class TroubleshootNotificationsViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTroubleshootNotificationsView(
+private fun AndroidComposeUiTest<ComponentActivity>.setTroubleshootNotificationsView(
     state: TroubleshootNotificationsState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryViewTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryViewTest.kt
index fa4e65ad9a..b9f615d68e 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryViewTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryViewTest.kt
@@ -6,15 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.libraries.troubleshoot.impl.history
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_FORMATTED_DATE
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -23,67 +25,61 @@ import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.clickOn
-import org.junit.Rule
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class PushHistoryViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
 
+class PushHistoryViewTest : RobolectricTest() {
     @Test
-    fun `clicking on Reset sends a PushHistoryEvents`() {
+    fun `clicking on Reset sends a PushHistoryEvents`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PushHistoryEvents>()
-        rule.setPushHistoryView(
+        setPushHistoryView(
             aPushHistoryState(
                 pushCounter = 123,
                 eventSink = eventsRecorder,
             ),
         )
-        val menuContentDescription = rule.activity.getString(CommonStrings.a11y_user_menu)
-        rule.onNodeWithContentDescription(menuContentDescription).performClick()
-        rule.clickOn(CommonStrings.action_reset)
+        val menuContentDescription = activity!!.getString(CommonStrings.a11y_user_menu)
+        onNodeWithContentDescription(menuContentDescription).performClick()
+        clickOn(CommonStrings.action_reset)
         eventsRecorder.assertSingle(PushHistoryEvents.Reset(requiresConfirmation = true))
         // Also check that the push counter is rendered
-        rule.onNodeWithText("123").assertExists()
+        onNodeWithText("123").assertExists()
     }
 
     @Test
-    fun `clicking on show only errors sends a PushHistoryEvents(true)`() {
+    fun `clicking on show only errors sends a PushHistoryEvents(true)`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PushHistoryEvents>()
-        rule.setPushHistoryView(
+        setPushHistoryView(
             aPushHistoryState(
                 showOnlyErrors = false,
                 eventSink = eventsRecorder,
             ),
         )
-        val menuContentDescription = rule.activity.getString(CommonStrings.a11y_user_menu)
-        rule.onNodeWithContentDescription(menuContentDescription).performClick()
-        rule.onNodeWithText("Show only errors").performClick()
+        val menuContentDescription = activity!!.getString(CommonStrings.a11y_user_menu)
+        onNodeWithContentDescription(menuContentDescription).performClick()
+        onNodeWithText("Show only errors").performClick()
         eventsRecorder.assertSingle(PushHistoryEvents.SetShowOnlyErrors(showOnlyErrors = true))
     }
 
     @Test
-    fun `clicking on show only errors sends a PushHistoryEvents(false)`() {
+    fun `clicking on show only errors sends a PushHistoryEvents(false)`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PushHistoryEvents>()
-        rule.setPushHistoryView(
+        setPushHistoryView(
             aPushHistoryState(
                 showOnlyErrors = true,
                 eventSink = eventsRecorder,
             ),
         )
-        val menuContentDescription = rule.activity.getString(CommonStrings.a11y_user_menu)
-        rule.onNodeWithContentDescription(menuContentDescription).performClick()
-        rule.onNodeWithText("Show only errors").performClick()
+        val menuContentDescription = activity!!.getString(CommonStrings.a11y_user_menu)
+        onNodeWithContentDescription(menuContentDescription).performClick()
+        onNodeWithText("Show only errors").performClick()
         eventsRecorder.assertSingle(PushHistoryEvents.SetShowOnlyErrors(showOnlyErrors = false))
     }
 
     @Test
-    fun `clicking on an invalid event has no effect`() {
+    fun `clicking on an invalid event has no effect`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PushHistoryEvents>(expectEvents = false)
-        rule.setPushHistoryView(
+        setPushHistoryView(
             aPushHistoryState(
                 pushHistoryItems = listOf(
                     aPushHistoryItem(
@@ -93,14 +89,14 @@ class PushHistoryViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithText(A_FORMATTED_DATE).performClick()
+        onNodeWithText(A_FORMATTED_DATE).performClick()
         // No callback invoked
     }
 
     @Test
-    fun `clicking on a valid event emits the expected Event`() {
+    fun `clicking on a valid event emits the expected Event`() = runAndroidComposeUiTest {
         val eventsRecorder = EventsRecorder<PushHistoryEvents>()
-        rule.setPushHistoryView(
+        setPushHistoryView(
             aPushHistoryState(
                 pushHistoryItems = listOf(
                     aPushHistoryItem(
@@ -113,7 +109,7 @@ class PushHistoryViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithText(A_FORMATTED_DATE).performClick()
+        onNodeWithText(A_FORMATTED_DATE).performClick()
         eventsRecorder.assertSingle(
             PushHistoryEvents.NavigateTo(
                 sessionId = A_SESSION_ID,
@@ -124,7 +120,7 @@ class PushHistoryViewTest {
     }
 }
 
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setPushHistoryView(
+private fun AndroidComposeUiTest<ComponentActivity>.setPushHistoryView(
     state: PushHistoryState,
     onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
diff --git a/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/Strings.kt b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/Strings.kt
new file mode 100644
index 0000000000..c4566a5db2
--- /dev/null
+++ b/libraries/ui-strings/src/main/kotlin/io/element/android/libraries/ui/strings/Strings.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.strings
+
+object Strings {
+    const val NICE_SEPARATOR = " • "
+}
diff --git a/libraries/ui-strings/src/main/res/values-be/translations.xml b/libraries/ui-strings/src/main/res/values-be/translations.xml
index 6e2374a5aa..ed250ea8fb 100644
--- a/libraries/ui-strings/src/main/res/values-be/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-be/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_reaction">"Дадаць рэакцыю: %1$s"</string>
   <string name="a11y_address">"Адрас"</string>
   <string name="a11y_avatar">"Аватар"</string>
   <string name="a11y_delete">"Выдаліць"</string>
@@ -8,15 +9,22 @@
     <item quantity="few">"Уведзена %1$d лічбы"</item>
     <item quantity="many">"Уведзена %1$d лічб"</item>
   </plurals>
+  <string name="a11y_edit_avatar">"Змяніць аватар"</string>
+  <string name="a11y_edit_room_address_hint">"Поўны адрас будзе %1$s"</string>
+  <string name="a11y_encryption_details">"Дэталі шыфравання"</string>
   <string name="a11y_hide_password">"Схаваць пароль"</string>
+  <string name="a11y_info">"Інфармацыя"</string>
   <string name="a11y_join_call">"Далучыцца да выкліку"</string>
   <string name="a11y_jump_to_bottom">"Перайсці ўніз"</string>
   <string name="a11y_notifications_mentions_only">"Толькі згадкі"</string>
   <string name="a11y_notifications_muted">"Гук адключаны"</string>
+  <string name="a11y_notifications_new_mentions">"Новыя згадкі"</string>
+  <string name="a11y_notifications_new_messages">"Новыя паведамленні"</string>
   <string name="a11y_page_n">"Старонка %1$d"</string>
   <string name="a11y_pause">"Паўза"</string>
   <string name="a11y_pin_field">"Поле PIN-кода"</string>
   <string name="a11y_play">"Прайграць"</string>
+  <string name="a11y_playback_speed">"Хуткасць прайгравання"</string>
   <string name="a11y_poll">"Апытанне"</string>
   <string name="a11y_poll_end">"Апытанне скончана"</string>
   <string name="a11y_qr_code">"QR-код"</string>
@@ -29,16 +37,18 @@
     <item quantity="many">"Прачытана %1$s і %2$d іншымі"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Прачытана %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Націсніце, каб паказаць усе"</string>
   <string name="a11y_remove_reaction">"Выдаліць рэакцыю з %1$s"</string>
   <string name="a11y_send_files">"Адправіць файлы"</string>
   <string name="a11y_show_password">"Паказаць пароль"</string>
   <string name="a11y_start_call">"Пазваніць"</string>
+  <string name="a11y_user_avatar">"Аватар карыстальніка"</string>
   <string name="a11y_user_menu">"Меню карыстальніка"</string>
   <string name="a11y_view_details">"Паглядзець падрабязнасці"</string>
   <string name="a11y_voice_message_record">"Запісаць галасавое паведамленне."</string>
   <string name="a11y_voice_message_stop_recording">"Спыніць запіс"</string>
+  <string name="a11y_your_avatar">"Ваш аватар"</string>
   <string name="action_accept">"Прыняць"</string>
+  <string name="action_add_caption">"Дадаць подпіс"</string>
   <string name="action_add_to_timeline">"Дадаць у хроніку"</string>
   <string name="action_back">"Назад"</string>
   <string name="action_call">"Званок"</string>
@@ -52,26 +62,40 @@
   <string name="action_confirm_password">"Пацвердзіць пароль"</string>
   <string name="action_continue">"Працягнуць"</string>
   <string name="action_copy">"Капіраваць"</string>
+  <string name="action_copy_caption">"Скапіяваць подпіс"</string>
   <string name="action_copy_link">"Скапіраваць спасылку"</string>
   <string name="action_copy_link_to_message">"Скапіраваць спасылку на паведамленне"</string>
+  <string name="action_copy_text">"Скапіяваць тэкст"</string>
   <string name="action_create">"Стварыць"</string>
   <string name="action_create_room">"Стварыце пакой"</string>
   <string name="action_deactivate">"Дэактываваць"</string>
   <string name="action_deactivate_account">"Дэактываваць уліковы запіс"</string>
   <string name="action_decline">"Адхіліць"</string>
+  <string name="action_decline_and_block">"Адхіліць і заблакіраваць"</string>
+  <string name="action_delete">"Выдаліць"</string>
+  <string name="action_delete_account">"Выдаліць уліковы запіс"</string>
+  <string name="action_delete_file">"Выдаліць файл"</string>
   <string name="action_delete_poll">"Выдаліць апытанне"</string>
+  <string name="action_deselect_all">"Зняць выбар з усіх"</string>
   <string name="action_disable">"Адключыць"</string>
   <string name="action_discard">"Адмяніць"</string>
   <string name="action_dismiss">"Aдхіліць"</string>
   <string name="action_done">"Гатова"</string>
+  <string name="action_download">"Спампаваць"</string>
   <string name="action_edit">"Рэдагаваць"</string>
+  <string name="action_edit_caption">"Рэдагаваць подпіс"</string>
   <string name="action_edit_poll">"Рэдагаваць апытанне"</string>
   <string name="action_enable">"Уключыць"</string>
   <string name="action_end_poll">"Скончыць апытанне"</string>
   <string name="action_enter_pin">"Увядзіце PIN-код"</string>
+  <string name="action_explore_public_spaces">"Даследаваць публічныя прасторы"</string>
+  <string name="action_finish">"Завяршыць"</string>
   <string name="action_forgot_password">"Забылі пароль?"</string>
   <string name="action_forward">"Пераслаць"</string>
   <string name="action_go_back">"Вярнуцца"</string>
+  <string name="action_go_to_roles_and_permissions">"Перайсці да роляў і дазволаў"</string>
+  <string name="action_go_to_settings">"Перайсці ў Налады"</string>
+  <string name="action_ignore">"Ігнараваць"</string>
   <string name="action_invite">"Запрасіць"</string>
   <string name="action_invite_friends">"Запрасіць карыстальнікаў"</string>
   <string name="action_invite_friends_to_app">"Запрасіць карыстальнікаў у %1$s"</string>
@@ -82,6 +106,7 @@
   <string name="action_leave">"Пакінуць"</string>
   <string name="action_leave_conversation">"Пакінуць размову"</string>
   <string name="action_leave_room">"Пакінуць пакой"</string>
+  <string name="action_leave_space">"Пакінуць прастору"</string>
   <string name="action_load_more">"Загрузіць больш"</string>
   <string name="action_manage_account">"Кіраванне ўліковым запісам"</string>
   <string name="action_manage_devices">"Кіраванне прыладамі"</string>
@@ -98,6 +123,7 @@
   <string name="action_react">"Рэакцыя"</string>
   <string name="action_reject">"Адхіліць"</string>
   <string name="action_remove">"Выдаліць"</string>
+  <string name="action_remove_message">"Выдаліць паведамленне"</string>
   <string name="action_reply">"Адказаць"</string>
   <string name="action_reply_in_thread">"Адказаць у гутаркі"</string>
   <string name="action_report">"Паскардзіцца"</string>
@@ -112,7 +138,7 @@
   <string name="action_select_all">"Выбраць усё"</string>
   <string name="action_send">"Адправіць"</string>
   <string name="action_send_message">"Адправіць паведамленне"</string>
-  <string name="action_share">"Падзяліцца"</string>
+  <string name="action_share">"Абагуліць"</string>
   <string name="action_share_link">"Абагуліць спасылку"</string>
   <string name="action_show">"Паказаць"</string>
   <string name="action_sign_in_again">"Увайдзіце яшчэ раз"</string>
@@ -149,7 +175,6 @@
   <string name="common_copyright">"Аўтарскае права"</string>
   <string name="common_creating_room">"Стварэнне пакоя…"</string>
   <string name="common_current_user_left_room">"Выйшаў з пакоя"</string>
-  <string name="common_dark">"Цёмная"</string>
   <string name="common_decryption_error">"Памылка расшыфроўкі"</string>
   <string name="common_developer_options">"Параметры распрацоўшчыка"</string>
   <string name="common_direct_chat">"Прамы чат"</string>
@@ -176,7 +201,6 @@
   <string name="common_install_apk_android">"Усталяваць APK"</string>
   <string name="common_invite_unknown_profile">"Гэты Matrix ID не знойдзены, таму запрашэнне можа быць не атрымана."</string>
   <string name="common_leaving_room">"Пакінуць пакой"</string>
-  <string name="common_light">"Светлая"</string>
   <string name="common_link_copied_to_clipboard">"Спасылка скапіравана ў буфер абмену"</string>
   <string name="common_loading">"Загрузка…"</string>
   <plurals name="common_many_members">
@@ -195,8 +219,10 @@
   <string name="common_message_removed">"Паведамленне выдалена"</string>
   <string name="common_modern">"Сучасны"</string>
   <string name="common_mute">"Адкл. гук"</string>
+  <string name="common_name">"Імя"</string>
   <string name="common_no_results">"Вынікаў няма"</string>
   <string name="common_no_room_name">"Няма назвы пакоя"</string>
+  <string name="common_not_encrypted">"Не зашыфравана"</string>
   <string name="common_offline">"Па-за сеткай"</string>
   <string name="common_open_source_licenses">"Ліцэнзіі з адкрытым зыходным кодам"</string>
   <string name="common_or">"або"</string>
@@ -208,6 +234,7 @@
   <string name="common_please_wait">"Калі ласка, пачакайце…"</string>
   <string name="common_poll_end_confirmation">"Вы ўпэўнены, што хочаце скончыць гэтае апытанне?"</string>
   <string name="common_poll_summary">"Апытанне: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Апытанне"</string>
   <string name="common_poll_total_votes">"Усяго галасоў: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Вынікі будуць паказаны пасля завяршэння апытання"</string>
   <plurals name="common_poll_votes_count">
@@ -222,8 +249,8 @@
   <string name="common_reactions">"Рэакцыі"</string>
   <string name="common_recovery_key">"Ключ аднаўлення"</string>
   <string name="common_refreshing">"Абнаўленне…"</string>
+  <string name="common_removing">"Выдаленне…"</string>
   <string name="common_replying_to">"Адказвае на %1$s"</string>
-  <string name="common_report_a_bug">"Паведаміць пра памылку"</string>
   <string name="common_report_a_problem">"Паведаміць аб праблеме"</string>
   <string name="common_report_submitted">"Скарга прынята"</string>
   <string name="common_rich_text_editor">"Рэдактар фарматаванага тэксту"</string>
@@ -244,6 +271,7 @@
   <string name="common_server_not_supported">"Сервер не падтрымліваецца"</string>
   <string name="common_server_url">"URL-адрас сервера"</string>
   <string name="common_settings">"Налады"</string>
+  <string name="common_share_space">"Абагуліць прастору"</string>
   <string name="common_shared_location">"Абагулена месцазнаходжанне"</string>
   <string name="common_signing_out">"Выхад"</string>
   <string name="common_something_went_wrong">"Нешта пайшло не так"</string>
@@ -252,7 +280,6 @@
   <string name="common_success">"Поспех"</string>
   <string name="common_suggestions">"Прапановы"</string>
   <string name="common_syncing">"Сінхранізацыя"</string>
-  <string name="common_system">"Сістэмная"</string>
   <string name="common_text">"Тэкст"</string>
   <string name="common_third_party_notices">"Паведамленні трэціх асоб"</string>
   <string name="common_thread">"Гутарка"</string>
@@ -298,6 +325,11 @@
   <string name="invite_friends_text">"Гэй, пагавары са мной у %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Паведаміць аб памылцы з дапамогай Rageshake"</string>
+  <string name="screen_bug_report_a11y_screenshot">"Здымак экрана"</string>
+  <string name="screen_create_poll_option_accessibility_label">"%1$s: %2$s"</string>
+  <string name="screen_create_poll_options_section_title">"Параметры"</string>
+  <string name="screen_create_poll_remove_accessibility_label">"Выдаліць %1$s"</string>
+  <string name="screen_create_poll_settings_section_title">"Налады"</string>
   <string name="screen_media_picker_error_failed_selection">"Не ўдалося выбраць носьбіт, паўтарыце спробу."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Націсніце на паведамленне і абярыце «%1$s », каб уключыць сюды."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Замацуеце важныя паведамленні, каб іх можна было лёгка знайсці"</string>
@@ -318,8 +350,8 @@
   <string name="screen_room_pinned_banner_loading_description">"Загрузка паведамлення…"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"Паглядзець усе"</string>
   <string name="screen_room_title">"Чат"</string>
-  <string name="screen_share_location_title">"Падзяліцца месцазнаходжаннем"</string>
-  <string name="screen_share_my_location_action">"Падзяліцца маім месцазнаходжаннем"</string>
+  <string name="screen_share_location_title">"Абагуліць месцазнаходжанне"</string>
+  <string name="screen_share_my_location_action">"Абагуліць мае месцазнаходжанне"</string>
   <string name="screen_share_open_apple_maps">"Адкрыць у Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Адкрыць у Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Адкрыць у OpenStreetMap"</string>
diff --git a/libraries/ui-strings/src/main/res/values-bg/translations.xml b/libraries/ui-strings/src/main/res/values-bg/translations.xml
index 94e050727d..3f38b1991f 100644
--- a/libraries/ui-strings/src/main/res/values-bg/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-bg/translations.xml
@@ -145,7 +145,6 @@
   <string name="common_creating_room">"Създаване на стая…"</string>
   <string name="common_current_user_left_room">"Стаята е напусната"</string>
   <string name="common_current_user_left_space">"Пространството е напуснато"</string>
-  <string name="common_dark">"Тъмен"</string>
   <string name="common_decryption_error">"Грешка при разшифроване"</string>
   <string name="common_description">"Описание"</string>
   <string name="common_developer_options">"Опции за разработчици"</string>
@@ -176,7 +175,6 @@
   <string name="common_invite_unknown_profile">"Този Matrix ID не може да бъде намерен, така че поканата може да не бъде получена."</string>
   <string name="common_leaving_room">"Стаята се напуска"</string>
   <string name="common_leaving_space">"Пространството се напуска"</string>
-  <string name="common_light">"Светъл"</string>
   <string name="common_link_copied_to_clipboard">"Връзката е копирана в клипборда"</string>
   <string name="common_loading">"Зарежда се…"</string>
   <string name="common_loading_more">"Зарежда се още…"</string>
@@ -231,7 +229,6 @@
     <item quantity="other">"%1$d отговора"</item>
   </plurals>
   <string name="common_replying_to">"В отговор на %1$s"</string>
-  <string name="common_report_a_bug">"Съобщаване за грешка"</string>
   <string name="common_report_a_problem">"Съобщаване за проблем"</string>
   <string name="common_report_submitted">"Докладът е изпратен"</string>
   <string name="common_rich_text_editor">"Редактор на богат текст"</string>
@@ -270,7 +267,6 @@
   <string name="common_success">"Успешно"</string>
   <string name="common_suggestions">"Предложения"</string>
   <string name="common_syncing">"Синхронизиране"</string>
-  <string name="common_system">"Система"</string>
   <string name="common_text">"Текст"</string>
   <string name="common_third_party_notices">"Уведомления от трети страни"</string>
   <string name="common_thread">"Нишка"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ca/translations.xml b/libraries/ui-strings/src/main/res/values-ca/translations.xml
new file mode 100644
index 0000000000..f7798cd008
--- /dev/null
+++ b/libraries/ui-strings/src/main/res/values-ca/translations.xml
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_delete">"Elimina"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="one">"%1$d dígit introduït"</item>
+    <item quantity="other">"%1$d dígits introduïts"</item>
+  </plurals>
+  <string name="a11y_hide_password">"Amaga contrasenya"</string>
+  <string name="a11y_join_call">"Uneix-te a la trucada"</string>
+  <string name="a11y_jump_to_bottom">"Vés al final"</string>
+  <string name="a11y_notifications_mentions_only">"Només mencions"</string>
+  <string name="a11y_notifications_muted">"Silenciat"</string>
+  <string name="a11y_notifications_new_mentions">"Noves mencions"</string>
+  <string name="a11y_page_n">"Pàgina %1$d"</string>
+  <string name="a11y_pause">"Pausa"</string>
+  <string name="a11y_paused_voice_message">"Missatge de veu, durada: %1$s, posició actual: %2$s"</string>
+  <string name="a11y_pin_field">"Camp de PIN"</string>
+  <string name="a11y_play">"Reprodueix"</string>
+  <string name="a11y_poll">"Votació"</string>
+  <string name="a11y_poll_end">"Votació finalitzada"</string>
+  <string name="a11y_react_with">"Reacciona amb %1$s"</string>
+  <string name="a11y_react_with_other_emojis">"Reacciona amb altres emoticones"</string>
+  <string name="a11y_read_receipts_multiple">"Llegit per %1$s i %2$s"</string>
+  <plurals name="a11y_read_receipts_multiple_with_others">
+    <item quantity="one">"Llegit per %1$s i %2$d més"</item>
+    <item quantity="other">"Llegit per %1$s i %2$d més"</item>
+  </plurals>
+  <string name="a11y_read_receipts_single">"Llegit per %1$s"</string>
+  <string name="a11y_remove_reaction">"Elimina la reacció: %1$s"</string>
+  <string name="a11y_send_files">"Envia fitxers"</string>
+  <string name="a11y_show_password">"Mostra contrasenya"</string>
+  <string name="a11y_start_call">"Inicia trucada"</string>
+  <string name="a11y_user_menu">"Menú d\'usuari"</string>
+  <string name="a11y_view_details">"Mostra els detalls"</string>
+  <string name="a11y_voice_message">"Missatge de veu, durada: %1$s"</string>
+  <string name="a11y_voice_message_record">"Grava un missatge de veu."</string>
+  <string name="a11y_voice_message_stop_recording">"Atura gravació"</string>
+  <string name="action_accept">"Accepta"</string>
+  <string name="action_add_caption">"Afegeix llegenda"</string>
+  <string name="action_add_to_timeline">"Afegeix a la cronologia"</string>
+  <string name="action_back">"Tornar"</string>
+  <string name="action_call">"Truca"</string>
+  <string name="action_cancel">"Cancel·la"</string>
+  <string name="action_cancel_for_now">"Cancel·la per ara"</string>
+  <string name="action_choose_photo">"Tria una foto"</string>
+  <string name="action_clear">"Esborra"</string>
+  <string name="action_close">"Tanca"</string>
+  <string name="action_complete_verification">"Completa la verificació"</string>
+  <string name="action_confirm">"Confirma"</string>
+  <string name="action_confirm_password">"Confirma la contrasenya"</string>
+  <string name="action_continue">"Continua"</string>
+  <string name="action_copy">"Copia"</string>
+  <string name="action_copy_caption">"Copia llegenda"</string>
+  <string name="action_copy_link">"Copia l\'enllaç"</string>
+  <string name="action_copy_link_to_message">"Copia l\'enllaç al missatge"</string>
+  <string name="action_copy_text">"Copia text"</string>
+  <string name="action_create">"Crea"</string>
+  <string name="action_create_room">"Crea sala"</string>
+  <string name="action_deactivate">"Desactiva"</string>
+  <string name="action_deactivate_account">"Desactiva el compte"</string>
+  <string name="action_decline">"Declina"</string>
+  <string name="action_decline_and_block">"Rebutja i bloqueja"</string>
+  <string name="action_delete_poll">"Elimina votació"</string>
+  <string name="action_disable">"Desactiva"</string>
+  <string name="action_discard">"Descarta"</string>
+  <string name="action_dismiss">"Omet"</string>
+  <string name="action_done">"Fet"</string>
+  <string name="action_edit">"Edita"</string>
+  <string name="action_edit_caption">"Edita llegenda"</string>
+  <string name="action_edit_poll">"Edita votació"</string>
+  <string name="action_enable">"Activa"</string>
+  <string name="action_end_poll">"Finalitza votació"</string>
+  <string name="action_enter_pin">"Introdueix PIN"</string>
+  <string name="action_forgot_password">"Has oblidat la contrasenya?"</string>
+  <string name="action_forward">"Reenvia"</string>
+  <string name="action_go_back">"Enrere"</string>
+  <string name="action_ignore">"Ignora"</string>
+  <string name="action_invite">"Convida"</string>
+  <string name="action_invite_friends">"Convida persones"</string>
+  <string name="action_invite_friends_to_app">"Convida gent a %1$s"</string>
+  <string name="action_invite_people_to_app">"Convida a la gent a %1$s"</string>
+  <string name="action_invites_list">"Invitacions"</string>
+  <string name="action_join">"Uneix-te"</string>
+  <string name="action_learn_more">"Més informació"</string>
+  <string name="action_leave">"Surt"</string>
+  <string name="action_leave_conversation">"Surt del xat"</string>
+  <string name="action_leave_room">"Surt de la sala"</string>
+  <string name="action_load_more">"Carrega més"</string>
+  <string name="action_manage_account">"Gestiona compte"</string>
+  <string name="action_manage_devices">"Gestiona dispositius"</string>
+  <string name="action_message">"Envia missatge"</string>
+  <string name="action_next">"Següent"</string>
+  <string name="action_no">"No"</string>
+  <string name="action_not_now">"Ara no"</string>
+  <string name="action_ok">"D\'acord"</string>
+  <string name="action_open_settings">"Configuració"</string>
+  <string name="action_open_with">"Obre amb"</string>
+  <string name="action_pin">"Fixa"</string>
+  <string name="action_quick_reply">"Resposta ràpida"</string>
+  <string name="action_quote">"Cita"</string>
+  <string name="action_react">"Reacciona"</string>
+  <string name="action_reject">"Rebutja"</string>
+  <string name="action_remove">"Elimina"</string>
+  <string name="action_remove_caption">"Elimina llegenda"</string>
+  <string name="action_remove_message">"Elimina missatge"</string>
+  <string name="action_reply">"Respon"</string>
+  <string name="action_reply_in_thread">"Respon al fil"</string>
+  <string name="action_report">"Denuncia"</string>
+  <string name="action_report_bug">"Informa d\'un error"</string>
+  <string name="action_report_content">"Denuncia contingut"</string>
+  <string name="action_report_dm">"Denuncia la conversa"</string>
+  <string name="action_report_room">"Denuncia sala"</string>
+  <string name="action_reset">"Restableix"</string>
+  <string name="action_reset_identity">"Restableix identitat"</string>
+  <string name="action_retry">"Torna-ho a provar"</string>
+  <string name="action_retry_decryption">"Torna a intentar desxifrar"</string>
+  <string name="action_save">"Desa"</string>
+  <string name="action_search">"Cerca"</string>
+  <string name="action_send">"Envia"</string>
+  <string name="action_send_message">"Envia missatge"</string>
+  <string name="action_share">"Comparteix"</string>
+  <string name="action_share_link">"Comparteix enllaç"</string>
+  <string name="action_show">"Mostra"</string>
+  <string name="action_sign_in_again">"Torna a iniciar sessió"</string>
+  <string name="action_signout">"Tanca sessió"</string>
+  <string name="action_signout_anyway">"Tanca sessió igualment"</string>
+  <string name="action_skip">"Omet"</string>
+  <string name="action_start">"Comença"</string>
+  <string name="action_start_chat">"Inicia un xat"</string>
+  <string name="action_start_over">"Torna a començar"</string>
+  <string name="action_start_verification">"Inicia verificació"</string>
+  <string name="action_static_map_load">"Toca per carregar el mapa"</string>
+  <string name="action_take_photo">"Fes una foto"</string>
+  <string name="action_tap_for_options">"Toca per veure opcions"</string>
+  <string name="action_try_again">"Torna-ho a intentar"</string>
+  <string name="action_unpin">"No fixis"</string>
+  <string name="action_view_in_timeline">"Mostra a la cronologia"</string>
+  <string name="action_view_source">"Mostra font"</string>
+  <string name="action_yes">"Sí"</string>
+  <string name="action_yes_try_again">"Sí, torna-ho a intentar"</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"El servidor utilizat admet un nou protocol més ràpid. Tanca la sessió i torna-la a iniciar per actualitzar-lo. Si ho fas ara, evitaràs un tancament de sessió forçat quan s\'elimini l\'antic protocol (més endavant)."</string>
+  <string name="banner_migrate_to_native_sliding_sync_title">"Actualització disponible"</string>
+  <string name="common_about">"Sobre l\'aplicació"</string>
+  <string name="common_acceptable_use_policy">"Política d\'ús a acceptar"</string>
+  <string name="common_adding_caption">"Afegint llegenda"</string>
+  <string name="common_advanced_settings">"Configuració avançada"</string>
+  <string name="common_analytics">"Analítiques"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Has sortit de la sala"</string>
+  <string name="common_appearance">"Aspecte"</string>
+  <string name="common_audio">"Àudio"</string>
+  <string name="common_blocked_users">"Usuaris bloquejats"</string>
+  <string name="common_bubbles">"Bombolles"</string>
+  <string name="common_call_started">"Trucada iniciada"</string>
+  <string name="common_chat_backup">"Còpia de seguretat de xat"</string>
+  <string name="common_copied_to_clipboard">"Copiat al porta-retalls"</string>
+  <string name="common_copyright">"Drets d\'autor"</string>
+  <string name="common_creating_room">"Creant sala…"</string>
+  <string name="common_current_user_canceled_knock">"Sol·licitud cancel·lada"</string>
+  <string name="common_current_user_left_room">"Ha sortit de la sala"</string>
+  <string name="common_current_user_rejected_invite">"Invitació rebutjada"</string>
+  <string name="common_decryption_error">"Error de desxifrat"</string>
+  <string name="common_developer_options">"Opcions per a desenvolupadors"</string>
+  <string name="common_device_id">"ID de dispositiu"</string>
+  <string name="common_direct_chat">"Xat directe"</string>
+  <string name="common_do_not_show_this_again">"No ho tornis a mostrar"</string>
+  <string name="common_download_failed">"No s\'ha pogut baixar"</string>
+  <string name="common_downloading">"Baixant"</string>
+  <string name="common_edited_suffix">"(editat)"</string>
+  <string name="common_editing">"Editant"</string>
+  <string name="common_editing_caption">"Editant llegenda"</string>
+  <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"Fitxer buit"</string>
+  <string name="common_encryption">"Xifrat"</string>
+  <string name="common_encryption_enabled">"Xifrat activat"</string>
+  <string name="common_enter_your_pin">"Introdueix PIN"</string>
+  <string name="common_error">"Error"</string>
+  <string name="common_error_registering_pusher_android">"S\'ha produït un error i és possible que no rebis notificacions dels missatges nous. Pots resoldre els problemes de notificacions des de la configuració.
+
+Motiu: %1$s."</string>
+  <string name="common_everyone">"Tothom"</string>
+  <string name="common_failed">"Ha fallat"</string>
+  <string name="common_favourite">"Preferit"</string>
+  <string name="common_favourited">"Afegit a preferits"</string>
+  <string name="common_file">"Fitxer"</string>
+  <string name="common_file_deleted">"Fitxer eliminat"</string>
+  <string name="common_file_saved">"Fitxer desat"</string>
+  <string name="common_file_saved_on_disk_android">"Fitxer desat a Descàrregues"</string>
+  <string name="common_forward_message">"Reenvia missatge"</string>
+  <string name="common_frequently_used">"Utilitzats freqüentment"</string>
+  <string name="common_gif">"GIF"</string>
+  <string name="common_image">"Imatge"</string>
+  <string name="common_in_reply_to">"En resposta a %1$s"</string>
+  <string name="common_install_apk_android">"Instal·la APK"</string>
+  <string name="common_invite_unknown_profile">"No s\'ha trobat l\'ID de Matrix, és possible que la invitació no s\'hagi rebut."</string>
+  <string name="common_leaving_room">"Sortint de la sala"</string>
+  <string name="common_line_copied_to_clipboard">"Línia copiada al porta-retalls"</string>
+  <string name="common_link_copied_to_clipboard">"Enllaç copiat al porta-retalls"</string>
+  <string name="common_loading">"S\'està carregant…"</string>
+  <string name="common_loading_more">"Carregant més…"</string>
+  <plurals name="common_many_members">
+    <item quantity="one">"%d més"</item>
+    <item quantity="other">"%d més"</item>
+  </plurals>
+  <plurals name="common_member_count">
+    <item quantity="one">"%1$d membre"</item>
+    <item quantity="other">"%1$d membres"</item>
+  </plurals>
+  <string name="common_message">"Missatge"</string>
+  <string name="common_message_actions">"Accions de missatge"</string>
+  <string name="common_message_layout">"Estil dels missatges"</string>
+  <string name="common_message_removed">"Missatge eliminat"</string>
+  <string name="common_modern">"Modern"</string>
+  <string name="common_mute">"Silencia"</string>
+  <string name="common_name_and_id">"%1$s (%2$s)"</string>
+  <string name="common_no_results">"Sense resultats"</string>
+  <string name="common_no_room_name">"Sala sense nom"</string>
+  <string name="common_not_encrypted">"Sense xifrar"</string>
+  <string name="common_offline">"Fora de línia"</string>
+  <string name="common_open_source_licenses">"Llicències de codi obert"</string>
+  <string name="common_or">"o"</string>
+  <string name="common_password">"Contrasenya"</string>
+  <string name="common_people">"Persones"</string>
+  <string name="common_permalink">"Enllaç permanent"</string>
+  <string name="common_permission">"Permís"</string>
+  <string name="common_pinned">"Fixat"</string>
+  <string name="common_please_check_internet_connection">"Comprova la connexió a Internet"</string>
+  <string name="common_please_wait">"Si us plau, espera…"</string>
+  <string name="common_poll_end_confirmation">"Segur que vols finalitzar aquesta votació?"</string>
+  <string name="common_poll_summary">"Votació: %1$s"</string>
+  <string name="common_poll_total_votes">"Vots totals: %1$s"</string>
+  <string name="common_poll_undisclosed_text">"Els resultats es mostraran quan hagi finalitzat la votació"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="one">"%d vot"</item>
+    <item quantity="other">"%d vots"</item>
+  </plurals>
+  <string name="common_privacy_policy">"Política de privadesa"</string>
+  <string name="common_private_room">"Sala privada"</string>
+  <string name="common_public_room">"Sala pública"</string>
+  <string name="common_reaction">"Reacció"</string>
+  <string name="common_reactions">"Reaccions"</string>
+  <string name="common_reason">"Motiu"</string>
+  <string name="common_recovery_key">"Clau de recuperació"</string>
+  <string name="common_refreshing">"Actualitzant…"</string>
+  <plurals name="common_replies">
+    <item quantity="one">"%1$d resposta"</item>
+    <item quantity="other">"%1$d respostes"</item>
+  </plurals>
+  <string name="common_replying_to">"Responent a %1$s"</string>
+  <string name="common_report_a_problem">"Informa d\'un problema"</string>
+  <string name="common_report_submitted">"S\'ha enviat"</string>
+  <string name="common_rich_text_editor">"Editor de text enriquit"</string>
+  <string name="common_room">"Sala"</string>
+  <string name="common_room_name">"Nom de sala"</string>
+  <string name="common_room_name_placeholder">"p. ex. el nom d\'un projecte o grup"</string>
+  <string name="common_saved_changes">"Canvis desats"</string>
+  <string name="common_saving">"Desant"</string>
+  <string name="common_screen_lock">"Bloqueig de pantalla"</string>
+  <string name="common_search_for_someone">"Cerca persones"</string>
+  <string name="common_search_results">"Resultats de la cerca"</string>
+  <string name="common_security">"Seguretat"</string>
+  <string name="common_seen_by">"Vist per"</string>
+  <string name="common_send_to">"Envia a"</string>
+  <string name="common_sending">"S\'està enviant…"</string>
+  <string name="common_sending_failed">"Ha fallat l\'enviament"</string>
+  <string name="common_sent">"Enviat"</string>
+  <string name="common_server_not_supported">"Servidor no compatible"</string>
+  <string name="common_server_url">"URL del servidor"</string>
+  <string name="common_settings">"Configuració"</string>
+  <string name="common_shared_location">"Ubicació compartida"</string>
+  <string name="common_signing_out">"Tancant sessió"</string>
+  <string name="common_something_went_wrong">"Alguna cosa ha anat malament"</string>
+  <string name="common_something_went_wrong_message">"S\'ha produït un problema. Torna-ho a intentar."</string>
+  <string name="common_starting_chat">"Iniciant xat…"</string>
+  <string name="common_sticker">"Adhesiu"</string>
+  <string name="common_success">"Correcte"</string>
+  <string name="common_suggestions">"Suggeriments"</string>
+  <string name="common_syncing">"Sincronitzant"</string>
+  <string name="common_text">"Text"</string>
+  <string name="common_third_party_notices">"Avisos de tercers"</string>
+  <string name="common_thread">"Fil"</string>
+  <string name="common_topic">"Tema"</string>
+  <string name="common_topic_placeholder">"De què tracta aquesta sala?"</string>
+  <string name="common_unable_to_decrypt">"No s\'ha pogut desxifrar"</string>
+  <string name="common_unable_to_decrypt_insecure_device">"Enviat des d\'un dispositiu insegur"</string>
+  <string name="common_unable_to_decrypt_no_access">"No tens accés al missatge"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"La identitat verificada del remitent s\'ha restablert"</string>
+  <string name="common_unable_to_invite_message">"No s\'han pogut enviar invitacions a un o més usuaris."</string>
+  <string name="common_unable_to_invite_title">"No s\'han pogut enviar les invitacions"</string>
+  <string name="common_unlock">"Desbloqueja"</string>
+  <string name="common_unmute">"No silenciïs"</string>
+  <string name="common_unsupported_call">"Trucada no compatible"</string>
+  <string name="common_unsupported_event">"Esdeveniment no compatible"</string>
+  <string name="common_username">"Nom d\'usuari"</string>
+  <string name="common_verification_cancelled">"Verificació cancel·lada"</string>
+  <string name="common_verification_complete">"Verificació completada"</string>
+  <string name="common_verification_failed">"Error de verificació"</string>
+  <string name="common_verified">"Verificat"</string>
+  <string name="common_verify_device">"Verifica dispositiu"</string>
+  <string name="common_verify_identity">"Verifica identitat"</string>
+  <string name="common_verify_user">"Verifica usuari"</string>
+  <string name="common_video">"Vídeo"</string>
+  <string name="common_voice_message">"Missatge de veu"</string>
+  <string name="common_waiting">"Esperant…"</string>
+  <string name="common_waiting_for_decryption_key">"Esperant missatge"</string>
+  <string name="common_you">"Tu"</string>
+  <string name="crypto_identity_change_pin_violation">"La identitat de %1$s s\'ha restablert. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"La identitat de %1$s %2$s s\'ha restablert. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s ha restablert la identitat."</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"Omet la verificació"</string>
+  <string name="dialog_confirm_link_message">"L\'enllaç %1$s et portarà a un altre lloc %2$s
+
+Segur que vols continuar?"</string>
+  <string name="dialog_confirm_link_title">"Revisa aquest enllaç"</string>
+  <string name="dialog_room_reported">"Sala denunciada"</string>
+  <string name="dialog_room_reported_and_left">"S\'ha denunciat i abandonat la sala."</string>
+  <string name="dialog_title_confirmation">"Confirmació"</string>
+  <string name="dialog_title_error">"Error"</string>
+  <string name="dialog_title_success">"Correcte"</string>
+  <string name="dialog_title_warning">"Avís"</string>
+  <string name="dialog_unsaved_changes_description">"Hi ha canvis sense desar."</string>
+  <string name="dialog_unsaved_changes_description_android">"Els canvis no s\'han desat. Segur que vols tornar enrere?"</string>
+  <string name="dialog_unsaved_changes_title">"Desar canvis?"</string>
+  <string name="error_account_creation_not_possible">"El servidor utilitzat s\'ha d\'actualitzar per admetre el servei d\'autenticació de Matrix i la creació de comptes."</string>
+  <string name="error_failed_creating_the_permalink">"No s\'ha pogut crear l\'enllaç permanent"</string>
+  <string name="error_failed_loading_map">"%1$s no ha pogut carregar el mapa. Torna-ho a provar més tard."</string>
+  <string name="error_failed_loading_messages">"No s\'han pogut carregar els missatges"</string>
+  <string name="error_failed_locating_user">"%1$s no ha pogut accedir a la teva ubicació. Torna-ho a provar més tard."</string>
+  <string name="error_failed_uploading_voice_message">"No s\'ha pogut pujar el missatge de veu."</string>
+  <string name="error_message_not_found">"Missatge no trobat"</string>
+  <string name="error_missing_location_auth_android">"%1$s no té permís per accedir a la teva ubicació. Pots activar l\'accés a Configuració."</string>
+  <string name="error_missing_location_rationale_android">"%1$s no té permís per accedir a la teva ubicació. Activa l\'accés a sota."</string>
+  <string name="error_missing_microphone_voice_rationale_android">"%1$s no té permís per accedir al micròfon. Activa\'n l\'accés per poder gravar missatges de veu."</string>
+  <string name="error_network_or_server_issue">"Això pot ser degut a problemes de xarxa o del servidor."</string>
+  <string name="error_room_address_already_exists">"Aquesta adreça de sala ja existeix. Prova d\'editar el camp d\'adreça o de canviar el nom de sala"</string>
+  <string name="error_room_address_invalid_symbols">"Alguns caràcters no estan permesos. Només s\'admeten lletres, dígits i els símbols següents: ! $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _"</string>
+  <string name="error_some_messages_have_not_been_sent">"Alguns missatges no s\'han enviat"</string>
+  <string name="error_unknown">"S\'ha produït un error"</string>
+  <string name="invite_friends_rich_title">"🔐️ Uneix-te a %1$s"</string>
+  <string name="invite_friends_text">"Ei, xateja amb mi a %1$s: %2$s"</string>
+  <string name="login_initial_device_name_android">"%1$s Android"</string>
+  <string name="preference_rageshake">"Sacseja per informar d\'errors"</string>
+  <string name="screen_media_picker_error_failed_selection">"No s\'ha pogut seleccionar el contingut. Torna-ho a provar."</string>
+  <string name="screen_pinned_timeline_empty_state_description">"Prem un missatge i selecciona “%1$s“ per incloure\'l aquí."</string>
+  <string name="screen_pinned_timeline_empty_state_headline">"Fixa els missatges importants perquè es puguin trobar fàcilment"</string>
+  <plurals name="screen_pinned_timeline_screen_title">
+    <item quantity="one">"%1$d missatge fixat"</item>
+    <item quantity="other">"%1$d missatges fixats"</item>
+  </plurals>
+  <string name="screen_pinned_timeline_screen_title_empty">"Missatges fixats"</string>
+  <string name="screen_reset_identity_confirmation_title">"No pots confirmar-la? Ves al teu compte per restablir la identitat."</string>
+  <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Omet la verificació i envia"</string>
+  <string name="screen_resolve_send_failure_changed_identity_subtitle">"Pots ometre la verificació i enviar el missatge igualment o pots cancel·lar i tornar-ho a intentar més tard, quan s\'hagi tornat a verificar %1$s."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"El teu missatge no s\'ha enviat perquè la identitat verificada de %1$s s\'ha reiniciat"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Envia el missatge igualment"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s està utilitzant un o més dispositius no verificats. Pots enviar el missatge igualment o pots cancel·lar-lo i tornar-ho a provar més tard quan %2$s hagi verificat tots els seus dispositius."</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"El teu missatge no s\'ha enviat perquè %1$s no ha verificat tots els dispositius"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Un o més dels teus dispositius no estan verificats. Pots enviar el missatge igualment o cancel·lar-lo i tornar-ho a intentar més tard després d\'haver verificat tots els dispositius."</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_title">"El missatge no s\'ha enviat perquè no has verificat un o més dels teus dispositius."</string>
+  <string name="screen_room_error_failed_processing_media">"No s\'ha pogut processar el contingut que s\'havia de pujar. Torna-ho a provar."</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"No s\'han pogut obtenir els detalls d\'usuari"</string>
+  <string name="screen_room_event_pill">"Missatge a %1$s"</string>
+  <string name="screen_room_pinned_banner_indicator">"%1$s de %2$s"</string>
+  <string name="screen_room_pinned_banner_indicator_description">"%1$s missatges fixats"</string>
+  <string name="screen_room_pinned_banner_loading_description">"Crregant missatge…"</string>
+  <string name="screen_room_pinned_banner_view_all_button_title">"Veure-ho tot"</string>
+  <string name="screen_room_title">"Xat"</string>
+  <string name="screen_share_location_title">"Comparteix ubicació"</string>
+  <string name="screen_share_my_location_action">"Comparteix la meva ubicació"</string>
+  <string name="screen_share_open_apple_maps">"Obre a Apple Maps"</string>
+  <string name="screen_share_open_google_maps">"Obre a Google Maps"</string>
+  <string name="screen_share_open_osm_maps">"Obre a OpenStreetMap"</string>
+  <string name="screen_share_this_location_action">"Comparteix aquesta ubicació"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Missatge no enviat perquè %1$s ha restablert la seva identitat verificada."</string>
+  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Missatge no enviat perquè %1$s no ha verificat tots els dispositius."</string>
+  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Missatge no enviat perquè no has verificat un o més dels teus dispositius."</string>
+  <string name="screen_view_location_title">"Ubicació"</string>
+  <string name="settings_version_number">"Versió: %1$s (%2$s)"</string>
+  <string name="test_language_identifier">"en"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"L\'històric de missatges no està disponible en aquest dispositiu"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Has de verificar aquest dispositiu per accedir a l\'històric de missatges"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"No tens accés al missatge"</string>
+  <string name="timeline_decryption_failure_unable_to_decrypt">"No s\'ha pogut desxifrar el missatge"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Aquest missatge s\'ha bloquejat perquè no has verificat el teu dispositiu o perquè el remitent a de verificar la teva identitat."</string>
+</resources>
diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml
index f343571f1e..11ded645d7 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -15,6 +15,7 @@
   <string name="a11y_encryption_details">"Podrobnosti o šifrování"</string>
   <string name="a11y_expand_message_text_field">"Rozbalit textové pole zprávy"</string>
   <string name="a11y_hide_password">"Skrýt heslo"</string>
+  <string name="a11y_info">"Informace"</string>
   <string name="a11y_join_call">"Připojit se k hovoru"</string>
   <string name="a11y_jump_to_bottom">"Přejít dolů"</string>
   <string name="a11y_move_the_map_to_my_location">"Přesunout mapu na mou polohu"</string>
@@ -43,16 +44,20 @@
     <item quantity="other">"Přečetl(a) %1$s a %2$d dalších"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"%1$s přečetl(a)"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Klepnutím zobrazíte vše"</string>
   <string name="a11y_remove_reaction">"Odstraňit reakci s %1$s"</string>
   <string name="a11y_remove_reaction_with">"Odstranit reakci pomocí %1$s"</string>
   <string name="a11y_room_avatar">"Avatar místnosti"</string>
   <string name="a11y_send_files">"Odeslat soubory"</string>
   <string name="a11y_sender_location">"Poloha odesílatele"</string>
+  <string name="a11y_sent_by_sender_at_date">"Odesláno %1$s v %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Vyžaduje se časově omezená akce, na ověření máte jednu minutu"</string>
+  <string name="a11y_settings_with_required_action">"Nastavení, vyžaduje akci"</string>
   <string name="a11y_show_password">"Zobrazit heslo"</string>
   <string name="a11y_start_call">"Zahájit hovor"</string>
+  <string name="a11y_start_video_call">"Zahájit videohovor"</string>
   <string name="a11y_start_voice_call">"Zahájit hlasový hovor"</string>
+  <string name="a11y_thread_in_room">"Vlákno v %1$s"</string>
+  <string name="a11y_threads_in_room">"Vlákna v %1$s"</string>
   <string name="a11y_tombstoned_room">"Místnost s náhrobkem"</string>
   <string name="a11y_user_avatar">"Avatar uživatele"</string>
   <string name="a11y_user_menu">"Uživatelské menu"</string>
@@ -70,6 +75,7 @@
   <string name="action_call">"Hovor"</string>
   <string name="action_cancel">"Zrušit"</string>
   <string name="action_cancel_for_now">"Prozatím zrušit"</string>
+  <string name="action_choose_file">"Vyberte soubor"</string>
   <string name="action_choose_photo">"Vybrat fotku"</string>
   <string name="action_clear">"Vymazat"</string>
   <string name="action_close">"Zavřít"</string>
@@ -89,12 +95,15 @@
   <string name="action_deactivate_account">"Deaktivovat účet"</string>
   <string name="action_decline">"Odmítnout"</string>
   <string name="action_decline_and_block">"Odmítnout a zablokovat"</string>
+  <string name="action_delete">"Smazat"</string>
+  <string name="action_delete_account">"Smazat účet"</string>
   <string name="action_delete_poll">"Odstranit hlasování"</string>
   <string name="action_deselect_all">"Odznačit vše"</string>
   <string name="action_disable">"Zakázat"</string>
   <string name="action_discard">"Vyřadit"</string>
   <string name="action_dismiss">"Zavřít"</string>
   <string name="action_done">"Hotovo"</string>
+  <string name="action_download">"Stáhnout"</string>
   <string name="action_edit">"Upravit"</string>
   <string name="action_edit_caption">"Upravit titulek"</string>
   <string name="action_edit_poll">"Upravit hlasování"</string>
@@ -122,6 +131,7 @@
   <string name="action_leave_space">"Opustit prostor"</string>
   <string name="action_load_more">"Načíst více"</string>
   <string name="action_manage_account">"Spravovat účet"</string>
+  <string name="action_manage_account_and_devices">"Správa účtu a zařízení"</string>
   <string name="action_manage_devices">"Spravovat zařízení"</string>
   <string name="action_manage_rooms">"Spravovat místnosti"</string>
   <string name="action_message">"Zpráva"</string>
@@ -164,14 +174,15 @@
   <string name="action_share_live_location">"Sdílet aktuální polohu"</string>
   <string name="action_show">"Zobrazit"</string>
   <string name="action_sign_in_again">"Přihlásit se znovu"</string>
-  <string name="action_signout">"Odhlásit se"</string>
-  <string name="action_signout_anyway">"Přesto se odhlásit"</string>
+  <string name="action_signout">"Odebrat toto zařízení"</string>
+  <string name="action_signout_anyway">"Přesto toto zařízení odebrat"</string>
   <string name="action_skip">"Přeskočit"</string>
   <string name="action_start">"Začít"</string>
   <string name="action_start_chat">"Zahájit chat"</string>
   <string name="action_start_over">"Začít znovu"</string>
   <string name="action_start_verification">"Zahájit ověření"</string>
   <string name="action_static_map_load">"Klepnutím načtete mapu"</string>
+  <string name="action_stop">"Zastavit"</string>
   <string name="action_take_photo">"Vyfotit"</string>
   <string name="action_tap_for_options">"Klepnutím zobrazíte možnosti"</string>
   <string name="action_translate">"Přeložit"</string>
@@ -199,7 +210,9 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blokovaní uživatelé"</string>
   <string name="common_bubbles">"Bubliny"</string>
+  <string name="common_call_declined">"Hovor odmítnut"</string>
   <string name="common_call_started">"Hovor zahájen"</string>
+  <string name="common_call_you_declined">"Odmítli jste hovor"</string>
   <string name="common_chat_backup">"Záloha chatu"</string>
   <string name="common_copied_to_clipboard">"Zkopírováno do schránky"</string>
   <string name="common_copyright">"Autorská práva"</string>
@@ -209,7 +222,6 @@
   <string name="common_current_user_left_room">"Místnost opuštěna"</string>
   <string name="common_current_user_left_space">"Opustit prostor"</string>
   <string name="common_current_user_rejected_invite">"Pozvánka odmítnuta"</string>
-  <string name="common_dark">"Tmavé"</string>
   <string name="common_decryption_error">"Chyba dešifrování"</string>
   <string name="common_description">"Popis"</string>
   <string name="common_developer_options">"Možnosti pro vývojáře"</string>
@@ -225,6 +237,7 @@
   <string name="common_empty_file">"Prázdný soubor"</string>
   <string name="common_encryption">"Šifrování"</string>
   <string name="common_encryption_enabled">"Šifrování povoleno"</string>
+  <string name="common_ends_at">"Končí v %1$s"</string>
   <string name="common_enter_your_pin">"Zadejte svůj PIN"</string>
   <string name="common_error">"Chyba"</string>
   <string name="common_error_registering_pusher_android">"Došlo k chybě, nemusíte dostávat oznámení o nových zprávách. Vyřešte prosím problémy s oznámeními z nastavení.
@@ -234,6 +247,7 @@ Důvod: %1$s."</string>
   <string name="common_failed">"Selhalo"</string>
   <string name="common_favourite">"Oblíbené"</string>
   <string name="common_favourited">"Oblíbené"</string>
+  <string name="common_fetching_notifications_title_android">"Synchronizace oznámení…"</string>
   <string name="common_file">"Soubor"</string>
   <string name="common_file_deleted">"Soubor smazán"</string>
   <string name="common_file_saved">"Soubor uložen"</string>
@@ -247,10 +261,11 @@ Důvod: %1$s."</string>
   <string name="common_invite_unknown_profile">"Tento Matrix identifikátor nelze najít, takže pozvánka nemusí být přijata."</string>
   <string name="common_leaving_room">"Opuštění místnosti"</string>
   <string name="common_leaving_space">"Opuštění prostoru"</string>
-  <string name="common_light">"Světlý"</string>
   <string name="common_line_copied_to_clipboard">"Řádek zkopírován do schránky"</string>
   <string name="common_link_copied_to_clipboard">"Odkaz zkopírován do schránky"</string>
   <string name="common_link_new_device">"Připojit nové zařízení"</string>
+  <string name="common_live_location">"Aktuální poloha"</string>
+  <string name="common_live_location_ended">"Sdílení aktuální polohy skončilo"</string>
   <string name="common_loading">"Načítání…"</string>
   <string name="common_loading_more">"Načítání dalších…"</string>
   <plurals name="common_many_members">
@@ -314,7 +329,6 @@ Důvod: %1$s."</string>
     <item quantity="other">"%1$d odpovědí"</item>
   </plurals>
   <string name="common_replying_to">"Odpověď na %1$s"</string>
-  <string name="common_report_a_bug">"Nahlásit chybu"</string>
   <string name="common_report_a_problem">"Nahlásit problém"</string>
   <string name="common_report_submitted">"Zpráva odeslána"</string>
   <string name="common_rich_text_editor">"Editor formátovaného textu"</string>
@@ -351,9 +365,10 @@ Důvod: %1$s."</string>
   <string name="common_settings">"Nastavení"</string>
   <string name="common_share_space">"Sdílet prostor"</string>
   <string name="common_shared_history">"Noví členové vidí historii"</string>
+  <string name="common_shared_live_location">"Sdílená aktuální poloha"</string>
   <string name="common_shared_location">"Sdílená poloha"</string>
   <string name="common_shared_space">"Sdílený prostor"</string>
-  <string name="common_signing_out">"Odhlašování"</string>
+  <string name="common_signing_out">"Odebrání zařízení"</string>
   <string name="common_something_went_wrong">"Něco se nepovedlo"</string>
   <string name="common_something_went_wrong_message">"Narazili jsme na problém. Zkuste to prosím znovu."</string>
   <string name="common_space">"Prostor"</string>
@@ -370,16 +385,16 @@ Důvod: %1$s."</string>
   <string name="common_suggested">"Doporučeno"</string>
   <string name="common_suggestions">"Návrhy"</string>
   <string name="common_syncing">"Synchronizace"</string>
-  <string name="common_system">"Systém"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Oznámení třetích stran"</string>
   <string name="common_thread">"Vlákno"</string>
+  <string name="common_threads">"Vlákna"</string>
   <string name="common_topic">"Téma"</string>
   <string name="common_topic_placeholder">"O čem je tato místnost?"</string>
   <string name="common_unable_to_decrypt">"Nelze dešifrovat"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Šifrováno nezabezpečeným zařízením"</string>
   <string name="common_unable_to_decrypt_no_access">"Nemáte přístup k této zprávě"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Ověřená identita odesílatele se změnila"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Ověřená digitální identita odesílatele byla resetována"</string>
   <string name="common_unable_to_invite_message">"Pozvánky nebylo možné odeslat jednomu nebo více uživatelům."</string>
   <string name="common_unable_to_invite_title">"Nelze odeslat pozvánky"</string>
   <string name="common_unlock">"Odemknout"</string>
@@ -404,16 +419,17 @@ Důvod: %1$s."</string>
   <string name="common_voice_message">"Hlasová zpráva"</string>
   <string name="common_waiting">"Čekání…"</string>
   <string name="common_waiting_for_decryption_key">"Čekání na dešifrovací klíč"</string>
+  <string name="common_waiting_live_location">"Čekání na aktuální polohu…"</string>
   <string name="common_world_readable_history">"Kdokoli může vidět historii"</string>
   <string name="common_you">"Vy"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) sdílel(a) tuto zprávu v době, kdy jste nebyli v místnosti."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s sdílel(a) tuto zprávu v době, kdy jste nebyli v místnosti."</string>
   <string name="crypto_history_visible">"Tato místnost byla nastavena tak, aby noví členové mohli číst historii. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"Identita uživatele %1$s se změnila. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"Identita uživatele %1$s %2$s se změnila. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Identita uživatele %1$s byla resetována. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Identita uživatele %1$s %2$s byla resetována. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"Identita uživatele %1$s se změnila."</string>
-  <string name="crypto_identity_change_verification_violation_new">"Identita uživatele %1$s %2$s se změnila. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Identita uživatele %1$s byla resetována."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Identita uživatele %1$s %2$s byla resetována. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Zrušit ověření"</string>
   <string name="dialog_allow_access">"Povolit přístup"</string>
   <string name="dialog_confirm_link_message">"Odkaz %1$s vás přesměruje na jinou stránku %2$s
@@ -436,7 +452,6 @@ Opravdu chcete pokračovat?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maximální povolená velikost souboru je: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Vyberte kvalitu videa, které chcete nahrát."</string>
   <string name="dialog_video_quality_selector_title">"Vyberte kvalitu nahrávání videa"</string>
-  <string name="emoji_picker_search_placeholder">"Hledat emotikony"</string>
   <string name="error_account_already_logged_in">"Na tomto zařízení jste již přihlášeni jako %1$s."</string>
   <string name="error_account_creation_not_possible">"Váš domovský server je třeba upgradovat, aby podporoval službu Matrix Authentication Service a vytváření účtu."</string>
   <string name="error_failed_creating_the_permalink">"Vytvoření trvalého odkazu se nezdařilo"</string>
@@ -445,6 +460,7 @@ Opravdu chcete pokračovat?"</string>
   <string name="error_failed_locating_user">"%1$s nemá přístup k vaší poloze. Zkuste to prosím později."</string>
   <string name="error_failed_uploading_voice_message">"Nepodařilo se nahrát hlasovou zprávu."</string>
   <string name="error_invalid_invite">"Místnost již neexistuje nebo pozvánka již není platná."</string>
+  <string name="error_location_service_disabled_android">"Pro přístup k funkcím založeným na poloze prosím povolte GPS."</string>
   <string name="error_message_not_found">"Zpráva nebyla nalezena"</string>
   <string name="error_missing_location_auth_android">"%1$s nemá oprávnění k přístupu k vaší poloze. Přístup můžete povolit v Nastavení."</string>
   <string name="error_missing_location_rationale_android">"%1$s nemá oprávnění k přístupu k vaší poloze. Povolit přístup níže."</string>
@@ -456,6 +472,9 @@ Opravdu chcete pokračovat?"</string>
   <string name="error_unknown">"Omlouváme se, došlo k chybě"</string>
   <string name="invite_friends_rich_title">"🔐️ Připojte se ke mně na %1$s"</string>
   <string name="invite_friends_text">"Ahoj, ozvi se mi na %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Sdílení polohy v reálném čase"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Probíhá sdílení polohy"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Aktuální poloha"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Zatřeste zařízením pro nahlášení chyby"</string>
   <string name="screen_bug_report_a11y_screenshot">"Snímek obrazovky"</string>
@@ -463,8 +482,15 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_create_poll_options_section_title">"Možnosti"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Odstranit %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Nastavení"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nikdo nesdílí svou polohu"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Sdílení aktuální polohy"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d osoba"</item>
+    <item quantity="few">"%1$d osoby"</item>
+    <item quantity="other">"%1$d lidí"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Na mapě"</string>
   <string name="screen_media_picker_error_failed_selection">"Výběr média se nezdařil, zkuste to prosím znovu."</string>
-  <string name="screen_onboarding_welcome_back">"Vítejte zpět"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Přidržte zprávu a vyberte „%1$s“, kterou chcete zahrnout sem."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Připněte důležité zprávy, aby je bylo možné snadno najít"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -473,11 +499,11 @@ Opravdu chcete pokračovat?"</string>
     <item quantity="other">"%1$d Připnutých zpráv"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Připnuté zprávy"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Chystáte se přejít na svůj %1$s účet a obnovit svou identitu. Poté budete přesměrováni zpět do aplikace."</string>
-  <string name="screen_reset_identity_confirmation_title">"Nemůžete to potvrdit? Přejděte na svůj účet a resetujte svou identitu."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Chystáte se přejít na svůj účet %1$s, abyste resetovali svou digitální identitu. Poté budete přesměrováni zpět do aplikace."</string>
+  <string name="screen_reset_identity_confirmation_title">"Nemůžete to potvrdit? Přejděte do svého účtu a resetujte svou digitální identitu."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Zrušit ověření a odeslat"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Ověření můžete zrušit a přesto odeslat tuto zprávu, nebo můžete prozatím zrušit a zkusit to znovu později po opětovném ověření %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Vaše zpráva nebyla odeslána, protože ověřená identita uživatele %1$s se změnila"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Vaše zpráva nebyla odeslána, protože byla resetována ověřená digitální identita %1$s"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Přesto odeslat zprávu"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s používá jedno nebo více neověřených zařízení. Zprávu můžete přesto odeslat, nebo můžete prozatím zrušit a zkusit to znovu později poté, co %2$s ověří všechna svá zařízení."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Vaše zpráva nebyla odeslána, protože%1$s neověřil(a) všechna zařízení"</string>
@@ -489,6 +515,7 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_room_event_pill">"Zpráva v %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Rozbalit"</string>
   <string name="screen_room_grouped_state_events_reduce">"Zmenšit"</string>
+  <string name="screen_room_live_location_banner">"Sdílení aktuální polohy"</string>
   <string name="screen_room_permalink_same_room_android">"Již si prohlížíte tuto místnost!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s z %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Připnuté zprávy"</string>
@@ -509,7 +536,7 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_space_list_title">"Prostory"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Sdíleno %1$s"</string>
   <string name="screen_static_location_sheet_title">"Na mapě"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Zpráva nebyla odeslána, protože ověřená identita uživatele %1$s se změnila."</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Zpráva nebyla odeslána, protože byla resetována ověřená digitální identita %1$s."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Zpráva nebyla odeslána, protože%1$s neověřil(a) všechna zařízení."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Zpráva nebyla odeslána, protože jste neověřili jedno nebo více zařízení."</string>
   <string name="screen_view_location_title">"Poloha"</string>
@@ -519,5 +546,5 @@ Opravdu chcete pokračovat?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Pro přístup k historickým zprávám musíte toto zařízení ověřit"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Nemáte přístup k této zprávě"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nelze dešifrovat zprávu"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Tato zpráva byla zablokována buď proto, že jste neověřili své zařízení, nebo proto, že odesílatel potřebuje ověřit vaši identitu."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Tato zpráva byla zablokována buď proto, že jste neověřili své zařízení, nebo proto, že odesílatel musí ověřit vaši digitální identitu."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-cy/translations.xml b/libraries/ui-strings/src/main/res/values-cy/translations.xml
index 9c4b04b9d5..f2fb860515 100644
--- a/libraries/ui-strings/src/main/res/values-cy/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cy/translations.xml
@@ -45,7 +45,6 @@
     <item quantity="other">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Wedi\'i ddarllen gan %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tapio i ddangos y cyfan"</string>
   <string name="a11y_remove_reaction">"Wedi dileu adwaith gyda %1$s"</string>
   <string name="a11y_remove_reaction_with">"Wedi dileu adwaith gyda %1$s"</string>
   <string name="a11y_room_avatar">"Afatar ystafell"</string>
@@ -198,7 +197,6 @@
   <string name="common_current_user_left_room">"Wedi gadael yr ystafell"</string>
   <string name="common_current_user_left_space">"Gofod chwith"</string>
   <string name="common_current_user_rejected_invite">"Wedi gwrthod y gwahoddiad"</string>
-  <string name="common_dark">"Tywyll"</string>
   <string name="common_decryption_error">"Gwall dadgryptio"</string>
   <string name="common_description">"Disgrifiad"</string>
   <string name="common_developer_options">"Dewisiadau datblygwr"</string>
@@ -235,7 +233,6 @@ Rheswm: %1$s."</string>
   <string name="common_install_apk_android">"Gosod APK"</string>
   <string name="common_invite_unknown_profile">"Nid oes modd dod o hyd i\'r ID Matrics hwn, felly mae\'n bosibl na fydd y gwahoddiad yn cael ei dderbyn."</string>
   <string name="common_leaving_room">"Gadael ystafell"</string>
-  <string name="common_light">"Golau"</string>
   <string name="common_line_copied_to_clipboard">"Llinell wedi\'i chopïo i\'r clipfwrdd"</string>
   <string name="common_link_copied_to_clipboard">"Dolen wedi\'i chopïo i\'r clipfwrdd"</string>
   <string name="common_loading">"Yn Llwytho…"</string>
@@ -309,7 +306,6 @@ Rheswm: %1$s."</string>
     <item quantity="other">"%1$d ateb"</item>
   </plurals>
   <string name="common_replying_to">"Yn ymateb i %1$s"</string>
-  <string name="common_report_a_bug">"Adrodd ar wall"</string>
   <string name="common_report_a_problem">"Adrodd am broblem"</string>
   <string name="common_report_submitted">"Adroddiad wedi ei gyflwyno"</string>
   <string name="common_rich_text_editor">"Golygydd testun cyfoethog"</string>
@@ -360,7 +356,6 @@ Rheswm: %1$s."</string>
   <string name="common_success">"Llwyddiant"</string>
   <string name="common_suggestions">"Awgrymiadau"</string>
   <string name="common_syncing">"Cydweddu"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Testun"</string>
   <string name="common_third_party_notices">"Hysbysiadau trydydd parti"</string>
   <string name="common_thread">"Edefyn"</string>
@@ -421,7 +416,6 @@ Ydych chi\'n siŵr eich bod am barhau?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Y maint ffeil mwyaf sy\'n cael ei ganiatáu yw: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Dewiswch ansawdd y fideo rydych chi am ei llwytho."</string>
   <string name="dialog_video_quality_selector_title">"Dewiswch ansawdd llwytho fideo"</string>
-  <string name="emoji_picker_search_placeholder">"Chwilio emojis"</string>
   <string name="error_account_already_logged_in">"Rydych chi eisoes wedi mewngofnodi ar y ddyfais hon fel %1$s ."</string>
   <string name="error_account_creation_not_possible">"Mae angen uwchraddio eich gweinydd cartref i gefnogi Gwasanaeth Dilysu Matrix a chreu cyfrif."</string>
   <string name="error_failed_creating_the_permalink">"Wedi methu creu\'r ddolen barhaol"</string>
diff --git a/libraries/ui-strings/src/main/res/values-da/translations.xml b/libraries/ui-strings/src/main/res/values-da/translations.xml
index 5d1a08a727..614cec39cf 100644
--- a/libraries/ui-strings/src/main/res/values-da/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-da/translations.xml
@@ -14,9 +14,10 @@
   <string name="a11y_encryption_details">"Krypteringsoplysninger"</string>
   <string name="a11y_expand_message_text_field">"Udvid tekstfeltet for beskeder"</string>
   <string name="a11y_hide_password">"Skjul adgangskode"</string>
+  <string name="a11y_info">"Info"</string>
   <string name="a11y_join_call">"Deltag i opkald"</string>
   <string name="a11y_jump_to_bottom">"Hop til bunden"</string>
-  <string name="a11y_move_the_map_to_my_location">"Flyt kortet til min lokation"</string>
+  <string name="a11y_move_the_map_to_my_location">"Flyt kortet til min placering"</string>
   <string name="a11y_notifications_mentions_only">"Kun omtaler"</string>
   <string name="a11y_notifications_muted">"Lyd slået fra"</string>
   <string name="a11y_notifications_new_mentions">"Nye omtaler"</string>
@@ -41,15 +42,16 @@
     <item quantity="other">"Læst af %1$s og %2$d andre"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Læst af%1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tryk for at vise alle"</string>
   <string name="a11y_remove_reaction">"Fjern reaktion med%1$s"</string>
   <string name="a11y_remove_reaction_with">"Fjern reaktion med %1$s"</string>
   <string name="a11y_room_avatar">"Avatar for rummet"</string>
   <string name="a11y_send_files">"Send filer"</string>
   <string name="a11y_sender_location">"Afsenderens placering"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Tidsbegrænset handling påkrævet, du har et minut til at bekræfte"</string>
+  <string name="a11y_settings_with_required_action">"Indstillinger, handling påkrævet"</string>
   <string name="a11y_show_password">"Vis adgangskode"</string>
   <string name="a11y_start_call">"Start et opkald"</string>
+  <string name="a11y_start_video_call">"Start et videoopkald"</string>
   <string name="a11y_start_voice_call">"Start et taleopkald"</string>
   <string name="a11y_tombstoned_room">"Deaktiveret rum"</string>
   <string name="a11y_user_avatar">"Avatar for bruger"</string>
@@ -87,12 +89,15 @@
   <string name="action_deactivate_account">"Deaktiver konto"</string>
   <string name="action_decline">"Afvis"</string>
   <string name="action_decline_and_block">"Afvis og blokér"</string>
+  <string name="action_delete">"Slet"</string>
+  <string name="action_delete_account">"Slet konto"</string>
   <string name="action_delete_poll">"Slet afstemning"</string>
   <string name="action_deselect_all">"Fravælg alle"</string>
   <string name="action_disable">"Deaktiver"</string>
   <string name="action_discard">"Kassér"</string>
   <string name="action_dismiss">"Afvis"</string>
   <string name="action_done">"Færdig"</string>
+  <string name="action_download">"Hent"</string>
   <string name="action_edit">"Redigér"</string>
   <string name="action_edit_caption">"Rediger billedtekst"</string>
   <string name="action_edit_poll">"Redigér afstemning"</string>
@@ -120,6 +125,7 @@
   <string name="action_leave_space">"Forlad klynge"</string>
   <string name="action_load_more">"Indlæs mere"</string>
   <string name="action_manage_account">"Administrer konto"</string>
+  <string name="action_manage_account_and_devices">"Administrer konto og enheder"</string>
   <string name="action_manage_devices">"Administrer enheder"</string>
   <string name="action_manage_rooms">"Administrer rum"</string>
   <string name="action_message">"Besked"</string>
@@ -159,17 +165,18 @@
   <string name="action_send_voice_message">"Send talebesked"</string>
   <string name="action_share">"Del"</string>
   <string name="action_share_link">"Del link"</string>
-  <string name="action_share_live_location">"Del liveplacering"</string>
+  <string name="action_share_live_location">"Del placering live"</string>
   <string name="action_show">"Vis"</string>
   <string name="action_sign_in_again">"Log ind igen"</string>
-  <string name="action_signout">"Log ud"</string>
-  <string name="action_signout_anyway">"Log ud alligevel"</string>
+  <string name="action_signout">"Fjern denne enhed"</string>
+  <string name="action_signout_anyway">"Fjern denne enhed alligevel"</string>
   <string name="action_skip">"Spring over"</string>
   <string name="action_start">"Start"</string>
   <string name="action_start_chat">"Start samtale"</string>
   <string name="action_start_over">"Begynd forfra"</string>
   <string name="action_start_verification">"Begynd verifikation"</string>
   <string name="action_static_map_load">"Tryk for at indlæse kort"</string>
+  <string name="action_stop">"Stop"</string>
   <string name="action_take_photo">"Tag billede"</string>
   <string name="action_tap_for_options">"Tryk for indstillinger"</string>
   <string name="action_translate">"Oversæt"</string>
@@ -197,7 +204,9 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blokerede brugere"</string>
   <string name="common_bubbles">"Bobler"</string>
+  <string name="common_call_declined">"Opkald afvist"</string>
   <string name="common_call_started">"Opkald startet"</string>
+  <string name="common_call_you_declined">"Du afviste et opkald"</string>
   <string name="common_chat_backup">"Backup af samtale"</string>
   <string name="common_copied_to_clipboard">"Kopieret til udklipsholder"</string>
   <string name="common_copyright">"Ophavsret"</string>
@@ -207,7 +216,6 @@
   <string name="common_current_user_left_room">"Forlod rummet"</string>
   <string name="common_current_user_left_space">"Forlod klynge"</string>
   <string name="common_current_user_rejected_invite">"Invitationen blev afvist"</string>
-  <string name="common_dark">"Mørkt tema"</string>
   <string name="common_decryption_error">"Fejl under dekryptering"</string>
   <string name="common_description">"Beskrivelse"</string>
   <string name="common_developer_options">"Indstillinger for udviklere"</string>
@@ -223,6 +231,7 @@
   <string name="common_empty_file">"Tom fil"</string>
   <string name="common_encryption">"Kryptering"</string>
   <string name="common_encryption_enabled">"Kryptering aktiveret"</string>
+  <string name="common_ends_at">"Slutter kl.%1$s"</string>
   <string name="common_enter_your_pin">"Indtast din PIN-kode"</string>
   <string name="common_error">"Fejl"</string>
   <string name="common_error_registering_pusher_android">"Der opstod en fejl, du modtager muligvis ikke meddelelser om nye meddelelser. Fejlfinding af meddelelser fra indstillingerne.
@@ -232,6 +241,7 @@
   <string name="common_failed">"Mislykkedes"</string>
   <string name="common_favourite">"Favorit"</string>
   <string name="common_favourited">"Favoritmarkeret"</string>
+  <string name="common_fetching_notifications_title_android">"Synkroniserer notifikationer…"</string>
   <string name="common_file">"Fil"</string>
   <string name="common_file_deleted">"Fil slettet"</string>
   <string name="common_file_saved">"Fil gemt"</string>
@@ -245,10 +255,11 @@
   <string name="common_invite_unknown_profile">"Dette Matrix-ID kan ikke findes, så invitationen modtages muligvis ikke."</string>
   <string name="common_leaving_room">"Forlader rummet"</string>
   <string name="common_leaving_space">"Forlader klynge"</string>
-  <string name="common_light">"Lyst tema"</string>
   <string name="common_line_copied_to_clipboard">"Linje kopieret til udklipsholder"</string>
   <string name="common_link_copied_to_clipboard">"Linket er kopieret til udklipsholderen"</string>
   <string name="common_link_new_device">"Forbind ny enhed"</string>
+  <string name="common_live_location">"Aktuel position"</string>
+  <string name="common_live_location_ended">"Aktuel position afsluttet"</string>
   <string name="common_loading">"Indlæser…"</string>
   <string name="common_loading_more">"Indlæser flere…"</string>
   <plurals name="common_many_members">
@@ -309,7 +320,6 @@
     <item quantity="other">"%1$d svar"</item>
   </plurals>
   <string name="common_replying_to">"Svarer til %1$s"</string>
-  <string name="common_report_a_bug">"Rapportér en fejl"</string>
   <string name="common_report_a_problem">"Anmeld et problem"</string>
   <string name="common_report_submitted">"Anmeldelsen er indsendt"</string>
   <string name="common_rich_text_editor">"Rich text editor"</string>
@@ -344,13 +354,14 @@
   <string name="common_settings">"Indstillinger"</string>
   <string name="common_share_space">"Del klynge"</string>
   <string name="common_shared_history">"Nye medlemmer ser historik"</string>
+  <string name="common_shared_live_location">"Deling af aktuel position"</string>
   <string name="common_shared_location">"Delt placering"</string>
   <string name="common_shared_space">"Delt klynge"</string>
-  <string name="common_signing_out">"Logger ud"</string>
+  <string name="common_signing_out">"Fjerner enhed"</string>
   <string name="common_something_went_wrong">"Noget gik galt"</string>
   <string name="common_something_went_wrong_message">"Vi stødte på et problem. Prøv venligst igen."</string>
   <string name="common_space">"Klynge"</string>
-  <string name="common_space_members">"Medlemmer af rummet"</string>
+  <string name="common_space_members">"Medlemmer af klyngen"</string>
   <string name="common_space_topic_placeholder">"Hvad handler denne klynge om?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Klynge"</item>
@@ -362,16 +373,16 @@
   <string name="common_suggested">"Forslag"</string>
   <string name="common_suggestions">"Forslag"</string>
   <string name="common_syncing">"Synkroniserer"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Tredjepartsmeddelelser"</string>
   <string name="common_thread">"Tråd"</string>
+  <string name="common_threads">"Tråde"</string>
   <string name="common_topic">"Emne"</string>
   <string name="common_topic_placeholder">"Hvad handler det her rum om?"</string>
   <string name="common_unable_to_decrypt">"Ude af stand til at dekryptere"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Sendt fra en usikker enhed"</string>
   <string name="common_unable_to_decrypt_no_access">"Du har ikke adgang til denne meddelelse"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Afsenderens verificerede identitet blev nulstillet"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Afsenderens verificerede digitale identitet blev nulstillet"</string>
   <string name="common_unable_to_invite_message">"Invitationer kunne ikke sendes til en eller flere brugere."</string>
   <string name="common_unable_to_invite_title">"Kan ikke sende invitation(er)"</string>
   <string name="common_unlock">"Lås op"</string>
@@ -396,16 +407,17 @@
   <string name="common_voice_message">"Talebesked"</string>
   <string name="common_waiting">"Venter…"</string>
   <string name="common_waiting_for_decryption_key">"Venter på denne besked"</string>
+  <string name="common_waiting_live_location">"Venter på aktuel position…"</string>
   <string name="common_world_readable_history">"Alle kan se historikken"</string>
   <string name="common_you">"Dig"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s(%2$s ) har delt denne besked siden du ikke var i rummet da den blev sendt."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s delte denne besked, siden du ikke var i rummet da den blev sendt."</string>
   <string name="crypto_history_visible">"Dette rum er konfigureret, så nye medlemmer kan læse historikken.%1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$ss identitet blev nulstillet. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$ss %2$s identitet blev nulstillet. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$ss digitale identitet blev nulstillet. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$ss %2$s digitale identitet blev nulstillet. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$ss identitet blev nulstillet."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$ss %2$s identitet blev nulstillet. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$ss digitale identitet blev nulstillet."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$ss %2$s digitale identitet blev nulstillet. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Tilbagetræk verifikation"</string>
   <string name="dialog_allow_access">"Tillad adgang"</string>
   <string name="dialog_confirm_link_message">"Linket %1$s fører dig til et andet websted %2$s
@@ -428,7 +440,6 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Den maksimalt tilladte filstørrelse er: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Vælg den kvalitet, du ønsker at uploade videoen i."</string>
   <string name="dialog_video_quality_selector_title">"Vælg kvalitet for video-overførsel"</string>
-  <string name="emoji_picker_search_placeholder">"Søg emojis"</string>
   <string name="error_account_already_logged_in">"Du er allerede logget ind på denne enhed som %1$s."</string>
   <string name="error_account_creation_not_possible">"Din hjemmeserver skal opgraderes for at understøtte Matrix Authentication Service og kontooprettelse."</string>
   <string name="error_failed_creating_the_permalink">"Oprettelse af permalink mislykkedes"</string>
@@ -437,6 +448,7 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="error_failed_locating_user">"%1$s kunne ikke få adgang til din placering. Prøv igen senere."</string>
   <string name="error_failed_uploading_voice_message">"Kunne ikke uploade din talebesked."</string>
   <string name="error_invalid_invite">"Rummet findes ikke længere, eller invitationen er ikke længere gyldig."</string>
+  <string name="error_location_service_disabled_android">"Aktiver venligst din GPS for at få adgang til lokationsbaserede funktioner."</string>
   <string name="error_message_not_found">"Meddelelsen blev ikke fundet"</string>
   <string name="error_missing_location_auth_android">"%1$s har ikke tilladelse til at få adgang til din placering. Du kan aktivere adgang i Indstillinger."</string>
   <string name="error_missing_location_rationale_android">"%1$s har ikke tilladelse til at se din placering. Aktivér adgang nedenfor."</string>
@@ -455,8 +467,14 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="screen_create_poll_options_section_title">"Valgmuligheder"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Fjern %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Indstillinger"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Ingen deler deres placering"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Deler placering live"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d person"</item>
+    <item quantity="other">"%1$d personer"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"På kortet"</string>
   <string name="screen_media_picker_error_failed_selection">"Det lykkedes ikke at vælge medie. Prøv igen."</string>
-  <string name="screen_onboarding_welcome_back">"Velkommen tilbage"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Tryk på en besked og vælg \"%1$s\" for at inkludere den her."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fastgør vigtige beskeder, så de let kan opdages"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -464,11 +482,11 @@ Er du sikker på, at du vil fortsætte?"</string>
     <item quantity="other">"%1$d Fastgjorte beskeder"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Fastgjorte beskeder"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Du er ved at gå til din %1$s konto for at nulstille din identitet. Derefter vil du blive ført tilbage til appen."</string>
-  <string name="screen_reset_identity_confirmation_title">"Kan du ikke bekræfte? Gå til din konto for at nulstille din identitet."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Du er ved at gå til din %1$s konto for at nulstille din digitale identitet. Derefter vil du blive ført tilbage til appen."</string>
+  <string name="screen_reset_identity_confirmation_title">"Kan du ikke bekræfte? Gå til din konto for at nulstille din digitale identitet."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Træk verifikationen tilbage og send"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Du kan trække din verifikation tilbage og sende denne meddelelse alligevel, eller du kan annullere for nu og prøve igen senere efter at have gen-verificeret. %1$s"</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Din besked blev ikke sendt, fordi %1$s\'s verificerede identitet er blevet nulstillet"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Din besked blev ikke sendt, fordi %1$s\'s verificerede digitale identitet er blevet nulstillet"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Send besked alligevel"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s bruger en eller flere uverificerede enheder. Du kan sende beskeden alligevel, eller du kan annullere for nu og prøve igen senere, når %2$s har bekræftet alle deres enheder."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Din besked blev ikke sendt, fordi %1$s ikke har bekræftet alle enheder"</string>
@@ -480,14 +498,15 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="screen_room_event_pill">"Besked i %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Udvid"</string>
   <string name="screen_room_grouped_state_events_reduce">"Reducér"</string>
+  <string name="screen_room_live_location_banner">"Deler placering live"</string>
   <string name="screen_room_permalink_same_room_android">"Du ser allerede dette rum!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s af %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Fastgjorte beskeder"</string>
   <string name="screen_room_pinned_banner_loading_description">"Indlæser besked…"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"Se alle"</string>
   <string name="screen_room_title">"Samtale"</string>
-  <string name="screen_share_location_title">"Del lokation"</string>
-  <string name="screen_share_my_location_action">"Del min lokation"</string>
+  <string name="screen_share_location_title">"Del placering"</string>
+  <string name="screen_share_my_location_action">"Del min placering"</string>
   <string name="screen_share_open_apple_maps">"Åbn i Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Åbn i Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Åbn i OpenStreetMap"</string>
@@ -500,15 +519,15 @@ Er du sikker på, at du vil fortsætte?"</string>
   <string name="screen_space_list_title">"Klynger"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Delt %1$s"</string>
   <string name="screen_static_location_sheet_title">"På kortet"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Beskeden blev ikke sendt fordi %1$s s bekræftede identitet blev nulstillet."</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Beskeden blev ikke sendt fordi %1$s s bekræftede digitale identitet blev nulstillet."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Meddelelsen er ikke sendt, fordi %1$s ikke har bekræftet alle enheder."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Beskeden er ikke sendt, fordi du ikke har verificeret en eller flere af dine enheder."</string>
-  <string name="screen_view_location_title">"Lokation"</string>
+  <string name="screen_view_location_title">"Placering"</string>
   <string name="settings_version_number">"Version: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"da"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Historiske beskeder er ikke tilgængelige på denne enhed"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Du skal verificere denne enhed for at få adgang til historiske beskeder"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Du har ikke adgang til denne meddelelse"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Kan ikke dekryptere beskeden"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Denne besked blev blokeret, enten fordi du ikke verificerede din enhed, eller fordi afsenderen skal have verificeret din identitet."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Denne besked blev blokeret, enten fordi du ikke verificerede din enhed, eller fordi afsenderen endnu ikke har bekræftet din digitale identitet."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml
index 1d0f26085e..d83fb1ee64 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Reaktion hinzufügen: %1$s"</string>
+  <string name="a11y_address">"Adresse"</string>
   <string name="a11y_avatar">"Avatar"</string>
   <string name="a11y_collapse_message_text_field">"Nachrichtentextfeld minimieren"</string>
   <string name="a11y_delete">"Löschen"</string>
@@ -26,9 +27,12 @@
   <string name="a11y_pause">"Pausieren"</string>
   <string name="a11y_paused_voice_message">"Sprachnachricht, Dauer:%1$s, aktuelle Position: %2$s"</string>
   <string name="a11y_pin_field">"PIN-Feld"</string>
+  <string name="a11y_pinned_location">"Fixierter Standort"</string>
   <string name="a11y_play">"Abspielen"</string>
+  <string name="a11y_playback_speed">"Wiedergabegeschwindigkeit"</string>
   <string name="a11y_poll">"Umfrage"</string>
   <string name="a11y_poll_end">"Umfrage beendet"</string>
+  <string name="a11y_qr_code">"QR-Code"</string>
   <string name="a11y_react_with">"Reagiere mit %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Mit anderen Emojis reagieren"</string>
   <string name="a11y_read_receipts_multiple">"Gelesen von %1$s und %2$s"</string>
@@ -37,14 +41,15 @@
     <item quantity="other">"Gelesen von %1$s und %2$d weiteren"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Gelesen von %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tippe, um alle anzuzeigen"</string>
   <string name="a11y_remove_reaction">"Reaktion mit %1$s entfernen"</string>
   <string name="a11y_remove_reaction_with">"Entferne Reaktionen mit %1$s"</string>
   <string name="a11y_room_avatar">"Avatar"</string>
   <string name="a11y_send_files">"Dateien senden"</string>
+  <string name="a11y_sender_location">"Standort des Absenders"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Zeitlich begrenzte Handlung erforderlich, du hast eine Minute Zeit zur Verifizierung"</string>
   <string name="a11y_show_password">"Passwort anzeigen"</string>
   <string name="a11y_start_call">"Anruf starten"</string>
+  <string name="a11y_start_voice_call">"Sprachanruf starten"</string>
   <string name="a11y_tombstoned_room">"Stillgelegter Chat"</string>
   <string name="a11y_user_avatar">"Nutzer-Avatar"</string>
   <string name="a11y_user_menu">"Nutzer-Menü"</string>
@@ -114,6 +119,7 @@
   <string name="action_leave_space">"Space verlassen"</string>
   <string name="action_load_more">"Mehr laden…"</string>
   <string name="action_manage_account">"Konto verwalten"</string>
+  <string name="action_manage_account_and_devices">"Konto &amp; Geräte verwalten"</string>
   <string name="action_manage_devices">"Geräte verwalten"</string>
   <string name="action_manage_rooms">"Chats und Gruppen konfigurieren"</string>
   <string name="action_message">"Nachricht"</string>
@@ -153,16 +159,18 @@
   <string name="action_send_voice_message">"Sprachnachricht senden"</string>
   <string name="action_share">"Teilen"</string>
   <string name="action_share_link">"Link teilen"</string>
+  <string name="action_share_live_location">"Live-Standort teilen"</string>
   <string name="action_show">"Zeige"</string>
   <string name="action_sign_in_again">"Erneut anmelden"</string>
-  <string name="action_signout">"Abmelden"</string>
-  <string name="action_signout_anyway">"Trotzdem abmelden"</string>
+  <string name="action_signout">"Dieses Gerät entfernen"</string>
+  <string name="action_signout_anyway">"Dieses Gerät trotzdem entfernen"</string>
   <string name="action_skip">"Überspringen"</string>
   <string name="action_start">"Start"</string>
   <string name="action_start_chat">"Chat starten"</string>
   <string name="action_start_over">"Neu beginnen"</string>
   <string name="action_start_verification">"Verifizierung starten"</string>
   <string name="action_static_map_load">"Tippe, um die Karte zu laden"</string>
+  <string name="action_stop">"Beenden"</string>
   <string name="action_take_photo">"Foto aufnehmen"</string>
   <string name="action_tap_for_options">"Für Optionen tippen"</string>
   <string name="action_translate">"Übersetzen"</string>
@@ -200,7 +208,6 @@
   <string name="common_current_user_left_room">"Hat den Chat verlassen"</string>
   <string name="common_current_user_left_space">"Space verlassen"</string>
   <string name="common_current_user_rejected_invite">"Einladung abgelehnt"</string>
-  <string name="common_dark">"Dunkel"</string>
   <string name="common_decryption_error">"Dekodierungsfehler"</string>
   <string name="common_description">"Beschreibung"</string>
   <string name="common_developer_options">"Entwickleroptionen"</string>
@@ -216,6 +223,7 @@
   <string name="common_empty_file">"Leere Datei"</string>
   <string name="common_encryption">"Verschlüsselung"</string>
   <string name="common_encryption_enabled">"Verschlüsselung aktiviert"</string>
+  <string name="common_ends_at">"Endet um %1$s"</string>
   <string name="common_enter_your_pin">"PIN eingeben"</string>
   <string name="common_error">"Fehler"</string>
   <string name="common_error_registering_pusher_android">"Es ist ein Fehler aufgetreten. Du erhältst eventuell keine Benachrichtigungen für neue Nachrichten. Bitte behebe den Fehler in den Einstellungen.
@@ -225,6 +233,7 @@ Grund: %1$s."</string>
   <string name="common_failed">"Fehlgeschlagen"</string>
   <string name="common_favourite">"Favorit"</string>
   <string name="common_favourited">"Favorisiert"</string>
+  <string name="common_fetching_notifications_title_android">"Benachrichtigungen werden synchronisiert…"</string>
   <string name="common_file">"Datei"</string>
   <string name="common_file_deleted">"Datei wurde gelöscht"</string>
   <string name="common_file_saved">"Datei gespeichert"</string>
@@ -238,10 +247,11 @@ Grund: %1$s."</string>
   <string name="common_invite_unknown_profile">"Diese Matrix Kennung wurde nicht gefunden, daher wird die Einladung möglicherweise nicht empfangen."</string>
   <string name="common_leaving_room">"Chat verlassen"</string>
   <string name="common_leaving_space">"Space wird verlassen"</string>
-  <string name="common_light">"Hell"</string>
   <string name="common_line_copied_to_clipboard">"Zeile in die Zwischenablage kopiert"</string>
   <string name="common_link_copied_to_clipboard">"Link in die Zwischenablage kopiert"</string>
   <string name="common_link_new_device">"Neues Gerät verknüpfen"</string>
+  <string name="common_live_location">"Live-Standort"</string>
+  <string name="common_live_location_ended">"Live-Standort teilen beendet"</string>
   <string name="common_loading">"Laden…"</string>
   <string name="common_loading_more">"Mehr wird geladen…"</string>
   <plurals name="common_many_members">
@@ -268,6 +278,7 @@ Grund: %1$s."</string>
   <string name="common_offline">"Offline"</string>
   <string name="common_open_source_licenses">"Open-Source-Lizenzen"</string>
   <string name="common_or">"oder"</string>
+  <string name="common_other_options">"Weitere Optionen"</string>
   <string name="common_password">"Passwort"</string>
   <string name="common_people">"Personen"</string>
   <string name="common_permalink">"Permalink"</string>
@@ -285,8 +296,10 @@ Grund: %1$s."</string>
   </plurals>
   <string name="common_preparing">"Vorbereitung läuft …"</string>
   <string name="common_privacy_policy">"Datenschutz­erklärung"</string>
+  <string name="common_private">"Privat"</string>
   <string name="common_private_room">"Privater Chat"</string>
   <string name="common_private_space">"Privater Space"</string>
+  <string name="common_public">"Öffentlich"</string>
   <string name="common_public_room">"Öffentlicher Chat"</string>
   <string name="common_public_space">"Öffentlicher Space"</string>
   <string name="common_reaction">"Reaktion"</string>
@@ -300,7 +313,6 @@ Grund: %1$s."</string>
     <item quantity="other">"%1$d Antworten"</item>
   </plurals>
   <string name="common_replying_to">"%1$s antworten"</string>
-  <string name="common_report_a_bug">"Einen Fehler melden"</string>
   <string name="common_report_a_problem">"Ein Problem melden"</string>
   <string name="common_report_submitted">"Bericht eingereicht"</string>
   <string name="common_rich_text_editor">"Rich-Text-Editor"</string>
@@ -335,12 +347,14 @@ Grund: %1$s."</string>
   <string name="common_settings">"Einstellungen"</string>
   <string name="common_share_space">"Space teilen"</string>
   <string name="common_shared_history">"Neue Mitglieder sehen den Nachrichtenverlauf"</string>
+  <string name="common_shared_live_location">"Geteilter Live-Standort"</string>
   <string name="common_shared_location">"Geteilter Standort"</string>
   <string name="common_shared_space">"Gemeinsamer Space"</string>
-  <string name="common_signing_out">"Abmelden"</string>
+  <string name="common_signing_out">"Gerät entfernen"</string>
   <string name="common_something_went_wrong">"Es ist ein Fehler aufgetreten."</string>
   <string name="common_something_went_wrong_message">"Wir haben ein Problem festgestellt. Bitte versuch es erneut."</string>
   <string name="common_space">"Space"</string>
+  <string name="common_space_members">"Space Mitglieder"</string>
   <string name="common_space_topic_placeholder">"Worum geht es hier?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Space"</item>
@@ -352,16 +366,16 @@ Grund: %1$s."</string>
   <string name="common_suggested">"Empfohlen"</string>
   <string name="common_suggestions">"Vorschläge"</string>
   <string name="common_syncing">"Synchronisieren"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Hinweise von Drittanbietern"</string>
   <string name="common_thread">"Thread"</string>
+  <string name="common_threads">"Threads"</string>
   <string name="common_topic">"Thema"</string>
   <string name="common_topic_placeholder">"Worum geht is in diesem Chat?"</string>
   <string name="common_unable_to_decrypt">"Entschlüsselung nicht möglich"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Von einem ungesicherten Gerät gesendet"</string>
   <string name="common_unable_to_decrypt_no_access">"Du hast keinen Zugriff auf diese Nachricht."</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Die verifizierte Identität des Senders hat sich geändert"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Die verifizierte Identität des Senders wurde zurückgesetzt"</string>
   <string name="common_unable_to_invite_message">"Einladungen konnten nicht an einen oder mehrere Nutzer gesendet werden."</string>
   <string name="common_unable_to_invite_title">"Einladung(en) konnte(n) nicht gesendet werden"</string>
   <string name="common_unlock">"Entsperren"</string>
@@ -386,17 +400,19 @@ Grund: %1$s."</string>
   <string name="common_voice_message">"Sprachnachricht"</string>
   <string name="common_waiting">"Warten…"</string>
   <string name="common_waiting_for_decryption_key">"Warte auf diese Nachricht"</string>
+  <string name="common_waiting_live_location">"Warten auf Live-Standort…"</string>
   <string name="common_world_readable_history">"Jeder kann den Nachrichtenverlauf sehen"</string>
   <string name="common_you">"Du"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) hat diese Nachricht geteilt, weil du nicht im Chat warst, als sie verschickt wurde."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"Diese Nachricht wurde von %1$s weitergeleitet, da du zum Zeitpunkt des Versands kein Mitglied der Gruppe warst."</string>
   <string name="crypto_history_visible">"Diese Gruppe wurde so konfiguriert, dass neue Mitglieder den vergangenen Nachrichtenverlauf lesen können. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s\'s Identität has sich geändert. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$s\'s %2$s Identität hat sich geändert. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Die Identität von %1$s wurde zurückgesetzt. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Die Identität von %1$s %2$s wurde zurückgesetzt. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"Die Identität von %1$s hat sich geändert."</string>
-  <string name="crypto_identity_change_verification_violation_new">"Die Identität von %1$s\'s %2$s hat sich geändert. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Die Identität von %1$s wurde zurückgesetzt."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Die Identität von %1$s %2$s wurde zurückgesetzt. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Verifizierung zurückziehen"</string>
+  <string name="dialog_allow_access">"Zugriff erlauben"</string>
   <string name="dialog_confirm_link_message">"Der Link %1$s führt dich zu einer anderen Seite %2$s. 
 
 Möchtest du wirklich fortfahren?"</string>
@@ -417,7 +433,6 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Die maximal erlaubte Dateigröße ist: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Wähle die Qualität des Videos, das du hochladen möchtest."</string>
   <string name="dialog_video_quality_selector_title">"Wähle die Video-Upload-Qualität"</string>
-  <string name="emoji_picker_search_placeholder">"Emojis suchen"</string>
   <string name="error_account_already_logged_in">"Du bist auf diesem Gerät bereits als %1$s angemeldet."</string>
   <string name="error_account_creation_not_possible">"Dein Homeserver muss aktualisiert werden, um den Matrix Authentication Services und die Erstellung von Konten zu unterstützen."</string>
   <string name="error_failed_creating_the_permalink">"Fehler beim Erstellen des Permalinks"</string>
@@ -426,6 +441,7 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="error_failed_locating_user">"%1$s konnte nicht auf deinen Standort zugreifen. Bitte versuche es später erneut."</string>
   <string name="error_failed_uploading_voice_message">"Fehler beim Hochladen der Sprachnachricht."</string>
   <string name="error_invalid_invite">"Der Chat existiert nicht mehr oder die Einladung ist nicht mehr gültig."</string>
+  <string name="error_location_service_disabled_android">"Bitte aktiviere dein GPS, um auf standortbezogene Funktionen zugreifen zu können."</string>
   <string name="error_message_not_found">"Nachricht nicht gefunden"</string>
   <string name="error_missing_location_auth_android">"%1$s hat keine Berechtigung, auf deinen Standort zuzugreifen. Du kannst den Zugriff in den Einstellungen aktivieren."</string>
   <string name="error_missing_location_rationale_android">"%1$s hat keine Berechtigung, auf deinen Standort zuzugreifen. Erlaube unten den Zugriff."</string>
@@ -452,8 +468,8 @@ Möchtest du wirklich fortfahren?"</string>
     <item quantity="other">"%1$d fixierte Nachrichten"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Fixierte Nachrichten"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Du wirst jetzt zu deinem %1$s Konto geleitet, um deine Identität zurückzusetzen. Danach wirst du zur App zurückgebracht."</string>
-  <string name="screen_reset_identity_confirmation_title">"Kannst du das nicht bestätigen? Gehe zu deinem Konto, um deine Identität zurückzusetzen."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Du wirst gleich zu deinem %1$s Konto weitergeleitet, um deine digitale Identität zurückzusetzen. Danach kehrst du zur App zurück."</string>
+  <string name="screen_reset_identity_confirmation_title">"Bestätigung nicht möglich? Rufe dein Konto auf, um deine digitale Identität zurückzusetzen."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Verifizierung zurückziehen und senden"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Du kannst deine Verifizierung zurückziehen und diese Nachricht trotzdem senden, oder du kannst vorerst abbrechen und es später noch einmal versuchen, nachdem du %1$s erneut verifiziert hast."</string>
   <string name="screen_resolve_send_failure_changed_identity_title">"Deine Nachricht wurde nicht gesendet, da die verifizierte Identität von %1$s zurückgesetzt wurde"</string>
@@ -480,12 +496,15 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="screen_share_open_google_maps">"In Google Maps öffnen"</string>
   <string name="screen_share_open_osm_maps">"In OpenStreetMap öffnen"</string>
   <string name="screen_share_this_location_action">"Diesen Standort teilen"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Optionen zum Teilen"</string>
   <string name="screen_space_list_description">"Von dir erstellte oder beigetretene Spaces."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_empty_state_title">"Erstelle einen Space, um Chats zu organisieren"</string>
   <string name="screen_space_list_parent_space">"%1$s Space"</string>
   <string name="screen_space_list_title">"Spaces"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Nachricht nicht gesendet, weil sich die verifizierte Identität von %1$s geändert hat."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Geteilt %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Auf der Karte"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Die Nachricht wurde nicht gesendet, da die verifizierte digitale Identität von %1$s zurückgesetzt wurde."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Die Nachricht wurde nicht gesendet, weil %1$s nicht alle Geräte verifiziert hat."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Die Nachricht wurde nicht gesendet, weil du eines oder mehrere deiner Geräte nicht verifiziert hast."</string>
   <string name="screen_view_location_title">"Standort"</string>
@@ -495,5 +514,5 @@ Möchtest du wirklich fortfahren?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Für den Zugriff auf den Nachrichtenverlauf musst du dieses Gerät verifizieren"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Du hast keinen Zugriff auf diese Nachricht."</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nachricht kann nicht entschlüsselt werden"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Diese Nachricht wurde entweder blockiert, weil du dein Gerät nicht verifiziert hast oder weil der Absender deine Identität verifizieren muss."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Diese Nachricht wurde entweder blockiert, weil du dein Gerät nicht verifiziert hast, oder weil der Absender deine digitale Identität verifizieren muss."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-el/translations.xml b/libraries/ui-strings/src/main/res/values-el/translations.xml
index ee4d782595..1b69bb001f 100644
--- a/libraries/ui-strings/src/main/res/values-el/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-el/translations.xml
@@ -41,7 +41,6 @@
     <item quantity="other">"Διαβάστηκε από %1$s και %2$d ακόμη"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Διαβάστηκε από %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Πάτα για εμφάνιση όλων"</string>
   <string name="a11y_remove_reaction">"Αφαίρεση αντίδρασης με %1$s"</string>
   <string name="a11y_remove_reaction_with">"Αφαιρέστε την αντίδραση με %1$s"</string>
   <string name="a11y_room_avatar">"Άβαταρ αίθουσας"</string>
@@ -50,6 +49,7 @@
   <string name="a11y_session_verification_time_limited_action_required">"Απαιτείται ενέργεια περιορισμένης χρονικής διάρκειας, έχετε ένα λεπτό για επαλήθευση."</string>
   <string name="a11y_show_password">"Εμφάνιση κωδικού πρόσβασης"</string>
   <string name="a11y_start_call">"Ξεκίνησε μια κλήση"</string>
+  <string name="a11y_start_video_call">"Ξεκινήστε μια βιντεοκλήση"</string>
   <string name="a11y_start_voice_call">"Έναρξη φωνητικής κλήσης"</string>
   <string name="a11y_tombstoned_room">"Θαμένη αίθουσα"</string>
   <string name="a11y_user_avatar">"Άβαταρ χρήστη"</string>
@@ -120,6 +120,7 @@
   <string name="action_leave_space">"Αποχώρηση από τον χώρο"</string>
   <string name="action_load_more">"Φόρτωσε περισσότερα"</string>
   <string name="action_manage_account">"Διαχείριση λογαριασμού"</string>
+  <string name="action_manage_account_and_devices">"Διαχείριση λογαριασμού και συσκευών"</string>
   <string name="action_manage_devices">"Διαχείριση συσκευών"</string>
   <string name="action_manage_rooms">"Διαχείριση αίθουσών"</string>
   <string name="action_message">"Στείλε"</string>
@@ -170,6 +171,7 @@
   <string name="action_start_over">"Ξανά από την αρχή"</string>
   <string name="action_start_verification">"Έναρξη επαλήθευσης"</string>
   <string name="action_static_map_load">"Πάτα για φόρτωση χάρτη"</string>
+  <string name="action_stop">"Διακοπή"</string>
   <string name="action_take_photo">"Τράβηξε φωτογραφία"</string>
   <string name="action_tap_for_options">"Πάτα για επιλογές"</string>
   <string name="action_translate">"Μετάφραση"</string>
@@ -190,7 +192,6 @@
   <string name="common_advanced_settings">"Ρυθμίσεις για προχωρημένους"</string>
   <string name="common_an_image">"μια εικόνα"</string>
   <string name="common_analytics">"Στατιστικά στοιχεία"</string>
-  <string name="common_android_fetching_notifications_title">"Συγχρονισμός ειδοποιήσεων…"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Αποχωρήσατε από την αίθουσα"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Αποσυνδεθήκατε από την περίοδο λειτουργίας"</string>
   <string name="common_appearance">"Εμφάνιση"</string>
@@ -208,7 +209,6 @@
   <string name="common_current_user_left_room">"Αποχώρησε από την αίθουσα"</string>
   <string name="common_current_user_left_space">"Αποχωρήσατε από τον χώρο"</string>
   <string name="common_current_user_rejected_invite">"Η πρόσκληση απορρίφθηκε"</string>
-  <string name="common_dark">"Σκοτεινό"</string>
   <string name="common_decryption_error">"Σφάλμα αποκρυπτογράφησης"</string>
   <string name="common_description">"Περιγραφή"</string>
   <string name="common_developer_options">"Επιλογές προγραμματιστή"</string>
@@ -224,6 +224,7 @@
   <string name="common_empty_file">"Κενό αρχείο"</string>
   <string name="common_encryption">"Κρυπτογράφηση"</string>
   <string name="common_encryption_enabled">"Η κρυπτογράφηση ενεργοποιήθηκε"</string>
+  <string name="common_ends_at">"Τελειώνει στις %1$s"</string>
   <string name="common_enter_your_pin">"Εισήγαγε το PIN σου"</string>
   <string name="common_error">"Σφάλμα"</string>
   <string name="common_error_registering_pusher_android">"Παρουσιάστηκε σφάλμα, ενδέχεται να μην λαμβάνεις ειδοποιήσεις για νέα μηνύματα. Αντιμετώπισε το πρόβλημα με τις ειδοποιήσεις από τις ρυθμίσεις.
@@ -233,6 +234,7 @@
   <string name="common_failed">"Απέτυχε"</string>
   <string name="common_favourite">"Αγαπημένο"</string>
   <string name="common_favourited">"Είναι αγαπημένο"</string>
+  <string name="common_fetching_notifications_title_android">"Συγχρονισμός ειδοποιήσεων…"</string>
   <string name="common_file">"Αρχείο"</string>
   <string name="common_file_deleted">"Το αρχείο διαγράφηκε"</string>
   <string name="common_file_saved">"Το αρχείο αποθηκεύτηκε"</string>
@@ -246,10 +248,11 @@
   <string name="common_invite_unknown_profile">"Αυτό το Matrix ID δεν μπορεί να βρεθεί, επομένως η πρόσκληση ενδέχεται να μην ληφθεί."</string>
   <string name="common_leaving_room">"Αποχώρηση από την αίθουσα"</string>
   <string name="common_leaving_space">"Αποχωρείτε από τον χώρο"</string>
-  <string name="common_light">"Φωτεινό"</string>
   <string name="common_line_copied_to_clipboard">"Η γραμμή αντιγράφηκε στο πρόχειρο"</string>
   <string name="common_link_copied_to_clipboard">"Ο σύνδεσμος αντιγράφηκε στο πρόχειρο"</string>
   <string name="common_link_new_device">"Σύνδεση νέας συσκευής"</string>
+  <string name="common_live_location">"Ζωντανή τοποθεσία"</string>
+  <string name="common_live_location_ended">"Η ζωντανή τοποθεσία έληξε"</string>
   <string name="common_loading">"Φόρτωση…"</string>
   <string name="common_loading_more">"Φόρτωση περισσότερων…"</string>
   <plurals name="common_many_members">
@@ -311,7 +314,6 @@
     <item quantity="other">"%1$d απαντήσεις"</item>
   </plurals>
   <string name="common_replying_to">"Απάντηση σε %1$s"</string>
-  <string name="common_report_a_bug">"Αναφορά σφάλματος"</string>
   <string name="common_report_a_problem">"Αναφορά προβλήματος"</string>
   <string name="common_report_submitted">"Η αναφορά υποβλήθηκε"</string>
   <string name="common_rich_text_editor">"Επεξεργαστής εμπλουτισμένου κειμένου"</string>
@@ -346,6 +348,7 @@
   <string name="common_settings">"Ρυθμίσεις"</string>
   <string name="common_share_space">"Κοινή χρήση χώρου"</string>
   <string name="common_shared_history">"Τα νέα μέλη βλέπουν το ιστορικό"</string>
+  <string name="common_shared_live_location">"Κοινόχρηστη ζωντανή τοποθεσία"</string>
   <string name="common_shared_location">"Κοινόχρηστη τοποθεσία"</string>
   <string name="common_shared_space">"Κοινόχρηστος χώρος"</string>
   <string name="common_signing_out">"Αφαίρεση συσκευής"</string>
@@ -364,10 +367,10 @@
   <string name="common_suggested">"Προτεινόμενο"</string>
   <string name="common_suggestions">"Προτάσεις"</string>
   <string name="common_syncing">"Συγχρονισμός"</string>
-  <string name="common_system">"Σύστημα"</string>
   <string name="common_text">"Κείμενο"</string>
   <string name="common_third_party_notices">"Ειδοποιήσεις τρίτων"</string>
   <string name="common_thread">"Νήμα"</string>
+  <string name="common_threads">"Νήματα"</string>
   <string name="common_topic">"Θέμα"</string>
   <string name="common_topic_placeholder">"Τι αφορά αυτή η αίθουσα;"</string>
   <string name="common_unable_to_decrypt">"Δεν είναι δυνατή η αποκρυπτογράφηση"</string>
@@ -398,6 +401,7 @@
   <string name="common_voice_message">"Φωνητικό μήνυμα"</string>
   <string name="common_waiting">"Αναμονή…"</string>
   <string name="common_waiting_for_decryption_key">"Αναμονή για αυτό το μήνυμα"</string>
+  <string name="common_waiting_live_location">"Αναμονή για ζωντανή τοποθεσία…"</string>
   <string name="common_world_readable_history">"Οποιοσδήποτε μπορεί να δει το ιστορικό"</string>
   <string name="common_you">"Εσύ"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) μοιράστηκε αυτό το μήνυμα, καθώς δεν ήσασταν στην αίθουσα όταν στάλθηκε."</string>
@@ -430,7 +434,6 @@
   <string name="dialog_video_quality_selector_subtitle_file_size">"Το μέγιστο επιτρεπόμενο μέγεθος αρχείου είναι: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Επιλέξτε την ποιότητα του βίντεο που θέλετε να ανεβάσετε."</string>
   <string name="dialog_video_quality_selector_title">"Επιλέξτε την ποιότητα μεταφόρτωσης βίντεο"</string>
-  <string name="emoji_picker_search_placeholder">"Αναζήτηση emoji"</string>
   <string name="error_account_already_logged_in">"Έχετε ήδη συνδεθεί σε αυτή τη συσκευή ως %1$s."</string>
   <string name="error_account_creation_not_possible">"Ο οικιακός διακομιστής σου πρέπει να αναβαθμιστεί για να υποστηρίζει το Matrix Authentication Service και τη δημιουργία λογαριασμού."</string>
   <string name="error_failed_creating_the_permalink">"Αποτυχία δημιουργίας του μόνιμου συνδέσμου"</string>
@@ -458,8 +461,14 @@
   <string name="screen_create_poll_options_section_title">"Επιλογές"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Αφαίρεση %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Ρυθμίσεις"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Κανείς δεν μοιράζεται την τοποθεσία του"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Κοινοποιείς την τοποθεσία σε πραγματικό χρόνο"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d άτομο"</item>
+    <item quantity="other">"%1$d άτομα"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Στον χάρτη"</string>
   <string name="screen_media_picker_error_failed_selection">"Αποτυχία επιλογής πολυμέσου, δοκίμασε ξανά."</string>
-  <string name="screen_onboarding_welcome_back">"Καλώς ήρθατε ξανά"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Πάτα σε ένα μήνυμα και επέλεξε «%1$s» για να συμπεριληφθεί εδώ."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Καρφίτσωσε σημαντικά μηνύματα, ώστε να μπορούν να εντοπιστούν εύκολα"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -483,6 +492,7 @@
   <string name="screen_room_event_pill">"Μήνυμα στο %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Επέκταση"</string>
   <string name="screen_room_grouped_state_events_reduce">"Μείωση"</string>
+  <string name="screen_room_live_location_banner">"Κοινοποιείς την τοποθεσία σε πραγματικό χρόνο"</string>
   <string name="screen_room_permalink_same_room_android">"Βλέπετε ήδη αυτήν την αίθουσα!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s από %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Καρφιτσωμένα μηνύματα"</string>
diff --git a/libraries/ui-strings/src/main/res/values-es/translations.xml b/libraries/ui-strings/src/main/res/values-es/translations.xml
index fa0bc700cb..c068e23d6c 100644
--- a/libraries/ui-strings/src/main/res/values-es/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-es/translations.xml
@@ -27,7 +27,6 @@
     <item quantity="other">"Leído por %1$s y %2$d otros"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Leído por %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Pulsa para mostrar todo"</string>
   <string name="a11y_remove_reaction">"Elimina la reacción con %1$s"</string>
   <string name="a11y_remove_reaction_with">"Retirar la reacción con %1$s"</string>
   <string name="a11y_room_avatar">"Avatar de la sala"</string>
@@ -165,7 +164,6 @@
   <string name="common_current_user_canceled_knock">"Solicitud cancelada"</string>
   <string name="common_current_user_left_room">"Saliste de la sala"</string>
   <string name="common_current_user_rejected_invite">"Invitación rechazada"</string>
-  <string name="common_dark">"Oscuro"</string>
   <string name="common_decryption_error">"Error de descifrado"</string>
   <string name="common_developer_options">"Opciones de desarrollador"</string>
   <string name="common_device_id">"ID de dispositivo"</string>
@@ -201,7 +199,6 @@ Motivo: %1$s."</string>
   <string name="common_install_apk_android">"Instalar APK"</string>
   <string name="common_invite_unknown_profile">"No se encontró este ID de Matrix, por lo que es posible que no se reciba la invitación."</string>
   <string name="common_leaving_room">"Saliendo de la sala"</string>
-  <string name="common_light">"Claro"</string>
   <string name="common_line_copied_to_clipboard">"Línea copiada al portapapeles"</string>
   <string name="common_link_copied_to_clipboard">"Enlace copiado al portapapeles"</string>
   <string name="common_loading">"Cargando…"</string>
@@ -251,7 +248,6 @@ Motivo: %1$s."</string>
   <string name="common_recovery_key">"Clave de recuperación"</string>
   <string name="common_refreshing">"Recargando…"</string>
   <string name="common_replying_to">"Respondiendo a %1$s"</string>
-  <string name="common_report_a_bug">"Informar de un error"</string>
   <string name="common_report_a_problem">"Informar de un problema"</string>
   <string name="common_report_submitted">"Informe enviado"</string>
   <string name="common_rich_text_editor">"Editor de texto enriquecido"</string>
@@ -281,7 +277,6 @@ Motivo: %1$s."</string>
   <string name="common_success">"Terminado"</string>
   <string name="common_suggestions">"Sugerencias"</string>
   <string name="common_syncing">"Sincronizando"</string>
-  <string name="common_system">"Sistema"</string>
   <string name="common_text">"Texto"</string>
   <string name="common_third_party_notices">"Avisos de terceros"</string>
   <string name="common_thread">"Hilo"</string>
diff --git a/libraries/ui-strings/src/main/res/values-et/translations.xml b/libraries/ui-strings/src/main/res/values-et/translations.xml
index 53f2178a1a..c24e8652f6 100644
--- a/libraries/ui-strings/src/main/res/values-et/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-et/translations.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Lisa tunnuspilt"</string>
   <string name="a11y_add_reaction">"Reageeri: %1$s"</string>
   <string name="a11y_address">"Aadress"</string>
   <string name="a11y_avatar">"Tunnuspilt"</string>
+  <string name="a11y_clear_search_field">"Tühjenda otsinguväli"</string>
   <string name="a11y_collapse_message_text_field">"Vähenda tekstivälja"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Vähenda kasutaja kohta lubatud hääletuskordi"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Suurenda kasutaja kohta lubatud hääletuskordi"</string>
+  <string name="a11y_custom_emoji">"Sinu lisatud emoji"</string>
   <string name="a11y_delete">"Kustuta"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d number sisestatud"</item>
     <item quantity="other">"%1$d numbrit sisestatud"</item>
   </plurals>
+  <string name="a11y_duration">"Kestus: %1$s"</string>
   <string name="a11y_edit_avatar">"Muuda tunnuspilti"</string>
   <string name="a11y_edit_room_address_hint">"Täisaadress saab olema %1$s"</string>
   <string name="a11y_encryption_details">"Krüptimise üksikasjad"</string>
   <string name="a11y_expand_message_text_field">"Laienda tekstivälja"</string>
   <string name="a11y_hide_password">"Peida salasõna"</string>
+  <string name="a11y_info">"Teave"</string>
   <string name="a11y_join_call">"Liitu kõnega"</string>
   <string name="a11y_jump_to_bottom">"Mine lõppu"</string>
+  <string name="a11y_jump_to_unread">"Mine lugemata sõnumite juurde"</string>
+  <string name="a11y_jump_to_unread_messages">"Suundu esimese lugemata sõnumi juurde"</string>
   <string name="a11y_move_the_map_to_my_location">"Nihuta kaart minu asukohta"</string>
   <string name="a11y_notifications_mentions_only">"Ainult mainimised"</string>
   <string name="a11y_notifications_muted">"Summutatud"</string>
@@ -26,31 +35,43 @@
   <string name="a11y_page_n">"%1$d. lehekülg"</string>
   <string name="a11y_pause">"Peata"</string>
   <string name="a11y_paused_voice_message">"Häälsõnum, kestus:%1$s, praegune asukoht: %2$s"</string>
+  <string name="a11y_photo_preview">"Foto eelvaade"</string>
   <string name="a11y_pin_field">"PIN-koodi väli"</string>
+  <string name="a11y_pinned_location">"Esiletõstetud asukoht"</string>
   <string name="a11y_play">"Esita"</string>
   <string name="a11y_playback_speed">"Taasesituse kiirus"</string>
   <string name="a11y_poll">"Küsitlus"</string>
   <string name="a11y_poll_end">"Lõppenud küsitlus"</string>
+  <string name="a11y_position">"Asukoht: %1$s"</string>
   <string name="a11y_qr_code">"QR-kood"</string>
   <string name="a11y_react_with">"Reageeri emotikoniga %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reageeri mõne muu emotikoniga"</string>
-  <string name="a11y_read_receipts_multiple">"Seda lugesid %1$s ja %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Eelmist sõnumit lugesid %1$s ja %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Seda lugesid %1$s ja veel %2$d kasutaja"</item>
-    <item quantity="other">"Seda lugesid %1$s ja veel %2$d kasutajat"</item>
+    <item quantity="one">"Eelmist sõnumit luges %1$s ja veel %2$d kasutaja"</item>
+    <item quantity="other">"Eelmist sõnumit lugesid %1$s ja veel %2$d kasutajat"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Seda luges %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Vaata kõiki"</string>
+  <string name="a11y_read_receipts_single">"Eelmist sõnumit luges %1$s inimest"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"näita kõiki lugemiskinnitusi"</string>
   <string name="a11y_remove_reaction">"Eemalda reageerimine %1$s emotikoniga"</string>
   <string name="a11y_remove_reaction_with">"Eemalda reageerimine: %1$s"</string>
   <string name="a11y_room_avatar">"Jututoa tunnuspilt"</string>
   <string name="a11y_send_files">"Saada faile"</string>
+  <string name="a11y_sender_location">"Saatja asukoht"</string>
+  <string name="a11y_sent_by_sender_at_date">"%1$s saatis selle %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Palun tee see ajapiiranguga toiming, sul on aega üks minut"</string>
+  <string name="a11y_settings_with_required_action">"Seaded, vajalik on tegevus"</string>
   <string name="a11y_show_password">"Näita salasõna"</string>
   <string name="a11y_start_call">"Helista"</string>
+  <string name="a11y_start_video_call">"Alusta videokõnet"</string>
+  <string name="a11y_start_voice_call">"Helista"</string>
+  <string name="a11y_status">"Olek"</string>
+  <string name="a11y_thread_in_room">"Jutulõng „%1$s“ jututoas"</string>
+  <string name="a11y_threads_in_room">"Jutulõngad „%1$s“ jututoas"</string>
   <string name="a11y_tombstoned_room">"Lõpetatuks märgitud jututuba"</string>
   <string name="a11y_user_avatar">"Kasutaja tunnuspilt"</string>
   <string name="a11y_user_menu">"Kasutajamenüü"</string>
+  <string name="a11y_video_preview">"Video eelvaade"</string>
   <string name="a11y_view_avatar">"Vaata tunnuspilti"</string>
   <string name="a11y_view_details">"Vaata üksikasju"</string>
   <string name="a11y_voice_message">"Häälsõnum, kestus:%1$s"</string>
@@ -65,6 +86,7 @@
   <string name="action_call">"Helista"</string>
   <string name="action_cancel">"Loobu"</string>
   <string name="action_cancel_for_now">"Hetkel jäta tegemata"</string>
+  <string name="action_choose_file">"Vali fail"</string>
   <string name="action_choose_photo">"Vali foto"</string>
   <string name="action_clear">"Selge"</string>
   <string name="action_close">"Sulge"</string>
@@ -84,12 +106,16 @@
   <string name="action_deactivate_account">"Eemalda konto kasutusest"</string>
   <string name="action_decline">"Keeldu"</string>
   <string name="action_decline_and_block">"Keeldu ja blokeeri"</string>
+  <string name="action_delete">"Kustuta"</string>
+  <string name="action_delete_account">"Kustuta kasutajakonto"</string>
+  <string name="action_delete_file">"Kustuta fail"</string>
   <string name="action_delete_poll">"Kustuta küsitlus"</string>
   <string name="action_deselect_all">"Eemalda kõik valikud"</string>
   <string name="action_disable">"Lülita välja"</string>
   <string name="action_discard">"Loobu"</string>
   <string name="action_dismiss">"Lõpeta"</string>
   <string name="action_done">"Valmis"</string>
+  <string name="action_download">"Laadi alla"</string>
   <string name="action_edit">"Muuda"</string>
   <string name="action_edit_caption">"Muuda selgitust"</string>
   <string name="action_edit_poll">"Muuda küsitlust"</string>
@@ -117,8 +143,10 @@
   <string name="action_leave_space">"Lahku kogukonnast"</string>
   <string name="action_load_more">"Näita veel"</string>
   <string name="action_manage_account">"Halda kasutajakontot"</string>
+  <string name="action_manage_account_and_devices">"Halda kasutajakontosid ja seadmeid"</string>
   <string name="action_manage_devices">"Halda seadmeid"</string>
   <string name="action_manage_rooms">"Halda jututuba"</string>
+  <string name="action_mark_as_read">"Märgi loetuks"</string>
   <string name="action_message">"Saada sõnum"</string>
   <string name="action_minimize">"Minimeeri"</string>
   <string name="action_next">"Edasi"</string>
@@ -156,24 +184,28 @@
   <string name="action_send_voice_message">"Saada häälsõnum"</string>
   <string name="action_share">"Jaga"</string>
   <string name="action_share_link">"Jaga linki"</string>
+  <string name="action_share_live_location">"Jaga asukohta reaalajas"</string>
   <string name="action_show">"Näita"</string>
   <string name="action_sign_in_again">"Logi uuesti sisse"</string>
-  <string name="action_signout">"Logi välja"</string>
-  <string name="action_signout_anyway">"Ikkagi logi välja"</string>
+  <string name="action_signout">"Eemalda see seade"</string>
+  <string name="action_signout_anyway">"Eemalda see seade ikkagi"</string>
   <string name="action_skip">"Jäta vahele"</string>
   <string name="action_start">"Alusta"</string>
   <string name="action_start_chat">"Alusta vestlust"</string>
   <string name="action_start_over">"Alusta uuesti"</string>
   <string name="action_start_verification">"Alusta verifitseerimist"</string>
   <string name="action_static_map_load">"Kaardi laadimiseks klõpsa"</string>
+  <string name="action_stop">"Lõpeta"</string>
   <string name="action_take_photo">"Pildista"</string>
   <string name="action_tap_for_options">"Valikuteks klõpsa"</string>
   <string name="action_translate">"Tõlgi"</string>
   <string name="action_try_again">"Proovi uuesti"</string>
   <string name="action_unpin">"Eemalda esiletõstmine"</string>
+  <string name="action_video_call">"Videokõne"</string>
   <string name="action_view">"Vaata"</string>
   <string name="action_view_in_timeline">"Vaata ajajoonel"</string>
   <string name="action_view_source">"Vaata lähtekoodi"</string>
+  <string name="action_voice_call">"Häälkõne"</string>
   <string name="action_yes">"Jah"</string>
   <string name="action_yes_try_again">"Jah, proovi uuesti"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Sinu koduserver toetab uut ja kiiremat protokolli. Uuendamiseks logi korraks rakendusest välja ja siis tagasi. Mingil hetkel tulevikus vana protokoll eemaldatakse kasutusest ja tehes uuenduse nüüd, väldid hilisemat sundkorras uuendust."</string>
@@ -193,7 +225,10 @@
   <string name="common_beta">"Beetaversioon"</string>
   <string name="common_blocked_users">"Blokeeritud kasutajad"</string>
   <string name="common_bubbles">"Mullid"</string>
+  <string name="common_call_declined">"Osapool keeldus kõnest"</string>
+  <string name="common_call_in_progress">"Kõne on pooleli"</string>
   <string name="common_call_started">"Kõne algas"</string>
+  <string name="common_call_you_declined">"Sa keeldusid kõnest"</string>
   <string name="common_chat_backup">"Vestluse varukoopia"</string>
   <string name="common_copied_to_clipboard">"Kopeeritud lõikelauale"</string>
   <string name="common_copyright">"Autoriõigused"</string>
@@ -203,7 +238,6 @@
   <string name="common_current_user_left_room">"Lahkus jututoast"</string>
   <string name="common_current_user_left_space">"Lahkus kogukonnast"</string>
   <string name="common_current_user_rejected_invite">"Keeldusid kutsest"</string>
-  <string name="common_dark">"Tume"</string>
   <string name="common_decryption_error">"Dekrüptimisviga"</string>
   <string name="common_description">"Kirjeldus"</string>
   <string name="common_developer_options">"Arendaja valikud"</string>
@@ -219,6 +253,7 @@
   <string name="common_empty_file">"Tühi fail"</string>
   <string name="common_encryption">"Krüptimine"</string>
   <string name="common_encryption_enabled">"Krüptimine on kasutusel"</string>
+  <string name="common_ends_at">"Lõpeb kell %1$s"</string>
   <string name="common_enter_your_pin">"Sisesta oma PIN-kood"</string>
   <string name="common_error">"Viga"</string>
   <string name="common_error_registering_pusher_android">"Tekkis viga ja sa ei pruugi enam saada uute sõnumite kohta teavitusi. Palun kontrolli teavituste seadistusi ja proovi viga tuvastada.
@@ -228,23 +263,35 @@ Põhjus: %1$s."</string>
   <string name="common_failed">"Ei õnnestunud"</string>
   <string name="common_favourite">"Lemmik"</string>
   <string name="common_favourited">"Märgitud lemmikuks"</string>
+  <string name="common_fetching_notifications_title_android">"Sünkroonin teavitusi…"</string>
   <string name="common_file">"Fail"</string>
   <string name="common_file_deleted">"Fail on kustutatud"</string>
   <string name="common_file_saved">"Fail on salvestatud"</string>
   <string name="common_file_saved_on_disk_android">"Fail on salvestatud kausta Allalaadimised"</string>
   <string name="common_forward_message">"Edasta sõnum"</string>
   <string name="common_frequently_used">"Sagedasti kasutatud"</string>
+  <string name="common_gallery">"Galerii"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d manus…"</item>
+    <item quantity="other">"%1$d manust…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d multimeediaobjekt…"</item>
+    <item quantity="other">"%1$d multimeediaobjekti…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Rühmakõne on pooleli"</string>
   <string name="common_image">"Pilt"</string>
   <string name="common_in_reply_to">"Vastuseks kasutajale %1$s"</string>
   <string name="common_install_apk_android">"Paigalda APK-failist"</string>
   <string name="common_invite_unknown_profile">"Sellist Matrix\'i kasutajatunnust ei õnnestu leida, seega sõnumit ilmselt keegi kätte ei saa."</string>
   <string name="common_leaving_room">"Oled lahkumas jututoast"</string>
   <string name="common_leaving_space">"Oled lahkumas kogukonnast"</string>
-  <string name="common_light">"Hele"</string>
   <string name="common_line_copied_to_clipboard">"Rida on kopeeritud lõikelauale"</string>
   <string name="common_link_copied_to_clipboard">"Link on kopeeritud lõikelauale"</string>
   <string name="common_link_new_device">"Seo uus seade"</string>
+  <string name="common_live_location">"Asukoha jagamine reaalajas"</string>
+  <string name="common_live_location_ended">"Reaalajas asukoha jagamine on lõppenud"</string>
   <string name="common_loading">"Laadime…"</string>
   <string name="common_loading_more">"Laadime veel…"</string>
   <plurals name="common_many_members">
@@ -269,8 +316,10 @@ Põhjus: %1$s."</string>
   <string name="common_no_space_name">"Kogukonnal pole nime"</string>
   <string name="common_not_encrypted">"Krüptimata"</string>
   <string name="common_offline">"Võrgust väljas"</string>
+  <string name="common_on_a_call">"Kõne on pooleli"</string>
   <string name="common_open_source_licenses">"Avatud lähtekoodiga litsentsid"</string>
   <string name="common_or">"või"</string>
+  <string name="common_other_options">"Muud valikud"</string>
   <string name="common_password">"Salasõna"</string>
   <string name="common_people">"Inimesed"</string>
   <string name="common_permalink">"Püsilink"</string>
@@ -280,6 +329,7 @@ Põhjus: %1$s."</string>
   <string name="common_please_wait">"Palun oota…"</string>
   <string name="common_poll_end_confirmation">"Kas oled kindel, et soovid selle küsitluse lõpetada?"</string>
   <string name="common_poll_summary">"Küsitlus: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Küsitlus"</string>
   <string name="common_poll_total_votes">"Hääli kokku: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Tulemused on näha peale küsitluse lõppemist"</string>
   <plurals name="common_poll_votes_count">
@@ -305,7 +355,6 @@ Põhjus: %1$s."</string>
     <item quantity="other">"%1$d vastust"</item>
   </plurals>
   <string name="common_replying_to">"Vastates kasutajale %1$s"</string>
-  <string name="common_report_a_bug">"Teata veast"</string>
   <string name="common_report_a_problem">"Teata veast"</string>
   <string name="common_report_submitted">"Veateade on saadetud"</string>
   <string name="common_rich_text_editor">"Vormindatud teksti toimeti"</string>
@@ -340,9 +389,10 @@ Põhjus: %1$s."</string>
   <string name="common_settings">"Seadistused"</string>
   <string name="common_share_space">"Jaga kogukonda"</string>
   <string name="common_shared_history">"Uued liikmed näevad ajalugu"</string>
+  <string name="common_shared_live_location">"Reaalajas jagatud asukoht"</string>
   <string name="common_shared_location">"Jagatud asukoht"</string>
   <string name="common_shared_space">"Jagatud kogukond"</string>
-  <string name="common_signing_out">"Logime välja"</string>
+  <string name="common_signing_out">"Seade on eemaldamisel"</string>
   <string name="common_something_went_wrong">"Midagi läks valesti"</string>
   <string name="common_something_went_wrong_message">"Tekkis viga. Palun proovi uuesti."</string>
   <string name="common_space">"Kogukond"</string>
@@ -358,22 +408,23 @@ Põhjus: %1$s."</string>
   <string name="common_suggested">"Soovitatud"</string>
   <string name="common_suggestions">"Soovitused"</string>
   <string name="common_syncing">"Sünkroniseerime"</string>
-  <string name="common_system">"Süsteem"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Kolmandate osapoolte teatised"</string>
   <string name="common_thread">"Jutulõng"</string>
+  <string name="common_threads">"Jutulõngad"</string>
   <string name="common_topic">"Teema"</string>
   <string name="common_topic_placeholder">"Mis on selle jututoa mõte?"</string>
   <string name="common_unable_to_decrypt">"Dekrüptimine ei olnud võimalik"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Saadetud ebaturvalisest seadmest"</string>
   <string name="common_unable_to_decrypt_no_access">"Sul pole ligipääsu antud sõnumile"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Saatja verifitseeritud identiteet on lähtestatud"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Saatja digitaalse identiteet on lähtestatud"</string>
   <string name="common_unable_to_invite_message">"Kutset polnud võimalik saata ühele või enamale kasutajale."</string>
   <string name="common_unable_to_invite_title">"Kutse(te) saatmine ei õnnestunud"</string>
   <string name="common_unlock">"Eemalda lukustus"</string>
   <string name="common_unmute">"Lõpeta summutamine"</string>
   <string name="common_unsupported_call">"See kõne pole toetatud"</string>
   <string name="common_unsupported_event">"Toetamata sündmus"</string>
+  <string name="common_user_started_a_call">"%1$s helistas"</string>
   <string name="common_username">"Kasutajanimi"</string>
   <string name="common_verification_cancelled">"Verifitseerimine on katkestatud"</string>
   <string name="common_verification_complete">"Verifitseerimine on tehtud"</string>
@@ -392,17 +443,24 @@ Põhjus: %1$s."</string>
   <string name="common_voice_message">"Häälsõnum"</string>
   <string name="common_waiting">"Ootame…"</string>
   <string name="common_waiting_for_decryption_key">"Ootame selle sõnumi dekrüptimisvõtit"</string>
+  <string name="common_waiting_live_location">"Ootan asukoha jagamist reaalajas…"</string>
   <string name="common_world_readable_history">"Kõik võivad ajalugu näha"</string>
   <string name="common_you">"Sina"</string>
+  <string name="content_scanner_not_found">"Allalaadimist pole saadaval."</string>
+  <string name="content_scanner_not_found_title">"Faili ei leidu"</string>
+  <string name="content_scanner_scanning">"Skaneerin…"</string>
+  <string name="content_scanner_unsafe_message">"Eelvaade ja allalaadimine on lülitatud välja."</string>
+  <string name="content_scanner_unsafe_title">"See fail pole ohutu"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"Kuna sind polnud saatmise ajal jututoas, siis %1$s (%2$s) jagas seda sõnumit sinuga."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s jagas seda sõnumit, kuna sind ei olnud selle algse saatmise ajal jututoas."</string>
   <string name="crypto_history_visible">"See jututuba on seadistatud sedaviisi, et ka uued liikmed saavad lugeda varasemat ajalugu. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"Kasutaja %1$s võrguidentiteet on lähtestatud. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"Kasutaja %1$s %2$s võrguidentiteet on lähtestatud. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Kasutaja %1$s digitaalse identiteet on lähtestatud. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Kasutaja %1$s %2$s digitaalse identiteet on lähtestatud. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s kasutaja verifitseeritud identiteet on lähtestatud."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s kasutaja (%2$s kasutajanimi) verifitseeritud identiteet on lähtestatud. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s kasutaja digitaalse identiteet on lähtestatud."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s kasutaja (ksutajanimega %2$s) digitaalse identiteet on lähtestatud. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Võta verifitseerimine tagasi"</string>
+  <string name="dialog_allow_access">"Luba juurdepääs"</string>
   <string name="dialog_confirm_link_message">"%1$s link viib sind teise veebisaiti %2$s
 
 Kas sa oled kindel, et soovid jätkata?"</string>
@@ -423,7 +481,6 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Suurim lubatud failisuurus on: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Vali üleslaaditava video kvaliteet."</string>
   <string name="dialog_video_quality_selector_title">"Vali video kvaliteet."</string>
-  <string name="emoji_picker_search_placeholder">"Otsi emojisid"</string>
   <string name="error_account_already_logged_in">"Sa juba oled sellesse seadmesse sisseloginud kasutajana %1$s."</string>
   <string name="error_account_creation_not_possible">"Selleks et koos kasutajakonto loomisega toimiks Matrix Authentication Service\'i tugi, vajab sinu koduserver uuendamist."</string>
   <string name="error_failed_creating_the_permalink">"Püsilingi loomine ei õnnestumud"</string>
@@ -432,6 +489,7 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="error_failed_locating_user">"Rakendus %1$s ei suutnud tuvastada sinu asukohta. Palun proovi hiljem uuesti."</string>
   <string name="error_failed_uploading_voice_message">"Sinu häälsõnumi üleslaadimine ei õnnestunud."</string>
   <string name="error_invalid_invite">"Seda jututuba pole enam olemas või pole see kutse enam kehtiv."</string>
+  <string name="error_location_service_disabled_android">"Asukohapõhise funktsionaalsuse kasutamiseks palun lülita nutiseadmes GPS sisse."</string>
   <string name="error_message_not_found">"Sõnumit ei leidu"</string>
   <string name="error_missing_location_auth_android">"Rakendusel %1$s puudub õigus sinu asukohta tuvastada. Sa saad seda lubada süsteemi seadistustest."</string>
   <string name="error_missing_location_rationale_android">"Rakendusel %1$s puudub õigus sinu asukohta tuvastada. Järgnevalt anna vastavad õigused."</string>
@@ -443,6 +501,9 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="error_unknown">"Vabandust, ilmnes viga"</string>
   <string name="invite_friends_rich_title">"🔐️ Liitu minuga rakenduses %1$s"</string>
   <string name="invite_friends_text">"Hei, suhtle minuga %1$s võrgus: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Asukoha jagamine reaalajas"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Asukoha jagamine käimas"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"Asukoht reaalajas: %1$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Veast teatamiseks raputa nutiseadet ägedalt"</string>
   <string name="screen_bug_report_a11y_screenshot">"Ekraanitõmmis"</string>
@@ -450,6 +511,16 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_create_poll_options_section_title">"Valikud"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Kustuta: %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Seadistused"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Hääletuskordi kasutaja kohta"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Mitte keegi ei jaga oma asukohta"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Asukoht on jagamisel reaalajas"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d isik"</item>
+    <item quantity="other">"%1$d isikut"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Kaardil"</string>
+  <string name="screen_local_network_opt_in_subtitle">"Sinu koduserver asub sinu kohalikus võrgus. Ühendamiseks vajab %1$s luba selle võrgu seadmetega ühenduse loomiseks."</string>
+  <string name="screen_local_network_opt_in_title">"Luba juurdepääs kohtvõrgule"</string>
   <string name="screen_media_picker_error_failed_selection">"Meediafaili valimine ei õnnestunud. Palun proovi uuesti."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Siia lisamiseks vajuta sõnumil ja vali „%1$s“."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Et olulisi sõnumeid oleks lihtsam leida, tõsta nad esile"</string>
@@ -458,11 +529,11 @@ Kas sa oled kindel, et soovid jätkata?"</string>
     <item quantity="other">"%1$d esiletõstetud sõnumit"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Esiletõstetud sõnumid"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Oma võrguidentiteedi lähtestamiseks suuname sind %1$s kasutajakonto halduse lehele. Hiljem suunatakse sind tagasi sama rakenduse juurde."</string>
-  <string name="screen_reset_identity_confirmation_title">"Sa ei saa seda kinnitada? Ava oma kasutajakonto haldus ja lähtesta oma võrguidentiteet."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Oma digitaalse identiteedi lähtestamiseks suuname sind %1$s kasutajakonto halduse lehele. Hiljem suunatakse sind tagasi sama rakenduse juurde."</string>
+  <string name="screen_reset_identity_confirmation_title">"Sa ei saa seda kinnitada? Ava oma kasutajakonto haldus ja lähtesta oma digitaalne identiteet."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Unusta verifitseerimine ja saada ikkagi"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Sa võid jätta verifitseerimisvea tähelepanuta ja sõnumi ikkagi saata või katkestad saatmise ja peale kasutaja %1$s verifitseerimist proovid seda uuesti."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Sinu sõnum on saatmata, kuna kasutaja %1$s verifitseeritud identiteet on lähtestatud."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Sinu sõnum on saatmata, kuna kasutaja %1$s digitaalse identiteet on lähtestatud."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Saada sõnum ikkagi"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s kasutab ühte või enamat verifitseerimata seadet. Sa võid sõnumi ikkagi saata või katkestad selle ning ootad kuni %2$s on kõik oma seadmed verifitseerinud ning proovid seejärel uuesti."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Sinu sõnum on saatmata, kuna %1$s pole verifitseerinud kõiki oma seadmeid"</string>
@@ -474,6 +545,7 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_room_event_pill">"Sõnum jututoas %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Näita rohkem"</string>
   <string name="screen_room_grouped_state_events_reduce">"Näita vähem"</string>
+  <string name="screen_room_live_location_banner">"Asukoht on jagamisel reaalajas"</string>
   <string name="screen_room_permalink_same_room_android">"Sa juba vaatad seda jututuba!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s / %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s esiletõstetud sõnumit"</string>
@@ -485,13 +557,20 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_share_open_apple_maps">"Ava Apple Mapsis"</string>
   <string name="screen_share_open_google_maps">"Ava Google Mapsis"</string>
   <string name="screen_share_open_osm_maps">"Ava OpenStreetMapis"</string>
-  <string name="screen_share_this_location_action">"Jaga seda asukohta"</string>
+  <string name="screen_share_this_location_action">"Jaga valitud asukohta"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Jagamise valikud"</string>
   <string name="screen_space_list_description">"Sinu loodud kogukonnad ning need, millega oled liitunud."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_empty_state_title">"Jututubade haldamiseks võid luua kogukondi"</string>
   <string name="screen_space_list_parent_space">"Kogukond: %1$s"</string>
   <string name="screen_space_list_title">"Kogukonnad"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Sõnum on saatmata, kuna kasutaja %1$s verifitseeritud identiteet on lähtestatud."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Jagatud %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Kaardil"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d liitus"</item>
+    <item quantity="other">"%1$d liitusid"</item>
+  </plurals>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Sõnum on saatmata, kuna kasutaja %1$s digitaalse identiteet on lähtestatud."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Sõnum on saatmata, kuna %1$s pole verifitseerinud kõiki oma seadmeid."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Kuna sa pole üks või enamgi oma seadet verifitseerinud, siis sinu sõnum on saatmata."</string>
   <string name="screen_view_location_title">"Asukoht"</string>
@@ -501,5 +580,7 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Ligipääsuks vanadele sõnumitele pead selle seadme verifitseerima"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Sul pole ligipääsu antud sõnumile"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Sõnumi dekrüptimine ei õnnestu"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Kuna seade on verifitseerimata või saatja pole sind verifitseerinud, siis sõnumi näitamine on blokeeritud."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Kuna seade on verifitseerimata või saatja pole sinu digitaalset identiteeti verifitseerinud, siis sõnumi näitamine on blokeeritud."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Sinu nutiseadme tarkvara on liiga vana, vajalik on Android 8 või uuem."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Kaartide joonistamine pole toetatud"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-eu/translations.xml b/libraries/ui-strings/src/main/res/values-eu/translations.xml
index bef5f1a4b5..a8e101cbf8 100644
--- a/libraries/ui-strings/src/main/res/values-eu/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-eu/translations.xml
@@ -28,7 +28,6 @@
     <item quantity="other">"%1$s(e)k eta beste %2$d(e)k irakurri dute"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"%1$s(e)k irakurri du"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Egin tap guztiak ikusteko"</string>
   <string name="a11y_remove_reaction">"Kendu %1$s erreakzioa"</string>
   <string name="a11y_room_avatar">"Gelaren abatarra"</string>
   <string name="a11y_send_files">"Bidali fitxategiak"</string>
@@ -169,7 +168,6 @@
   <string name="common_current_user_canceled_knock">"Eskaera bertan behera utzi da"</string>
   <string name="common_current_user_left_room">"Gelatik atera da"</string>
   <string name="common_current_user_rejected_invite">"Gonbidapenari uko egin zaio"</string>
-  <string name="common_dark">"Iluna"</string>
   <string name="common_decryption_error">"Deszifratze-errorea"</string>
   <string name="common_developer_options">"Garapen aukerak"</string>
   <string name="common_device_id">"Gailuaren IDa"</string>
@@ -204,7 +202,6 @@ Arrazoia: %1$s."</string>
   <string name="common_install_apk_android">"Instalatu APK"</string>
   <string name="common_invite_unknown_profile">"Matrix IDa ezin da topatu eta, beraz, litekeena da gonbidapena ez jasotzea."</string>
   <string name="common_leaving_room">"Gelatik ateratzen"</string>
-  <string name="common_light">"Argia"</string>
   <string name="common_line_copied_to_clipboard">"Lerroa arbelean kopiatu da"</string>
   <string name="common_link_copied_to_clipboard">"Esteka arbelean kopiatu da"</string>
   <string name="common_loading">"Kargatzen…"</string>
@@ -256,7 +253,6 @@ Arrazoia: %1$s."</string>
   <string name="common_recovery_key">"Berreskuratze-gakoa"</string>
   <string name="common_refreshing">"Freskatzen…"</string>
   <string name="common_replying_to">"%1$s(r)i erantzuten"</string>
-  <string name="common_report_a_bug">"Eman akats baten berri"</string>
   <string name="common_report_a_problem">"Eman arazo baten berri"</string>
   <string name="common_report_submitted">"Salaketa bidali da"</string>
   <string name="common_rich_text_editor">"Testu aberatsaren editorea"</string>
@@ -288,7 +284,6 @@ Arrazoia: %1$s."</string>
   <string name="common_success">"Arrakasta"</string>
   <string name="common_suggestions">"Iradokizunak"</string>
   <string name="common_syncing">"Sinkronizatzen"</string>
-  <string name="common_system">"Sistema"</string>
   <string name="common_text">"Testua"</string>
   <string name="common_third_party_notices">"Hirugarrenei buruzko oharrak"</string>
   <string name="common_thread">"Haria"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fa/translations.xml b/libraries/ui-strings/src/main/res/values-fa/translations.xml
index fbe716bc49..03d1172040 100644
--- a/libraries/ui-strings/src/main/res/values-fa/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fa/translations.xml
@@ -29,13 +29,12 @@
   <string name="a11y_poll_end">"نظرسنجی پایان یافته"</string>
   <string name="a11y_react_with">"واکنش با %1$s"</string>
   <string name="a11y_react_with_other_emojis">"واکنش با شکلک‌های دیگر"</string>
-  <string name="a11y_read_receipts_multiple">"خوانده به دست %1$s و %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"پیام پیشین به دست %1$s و %2$s خوانده شد"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"خوانده شده توسط%1$s و%2$d نفر دیگر"</item>
-    <item quantity="other">"خوانده شده توسط%1$s و%2$d نفر دیگر"</item>
+    <item quantity="one">"پیام پیشین به دست %1$s و %2$d دیگر خوانده شد"</item>
+    <item quantity="other">"پیام پیشین به دست %1$s و %2$d دیگر خوانده شد"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"خوانده به دست %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"زدن برای نمایش همه"</string>
+  <string name="a11y_read_receipts_single">"پیام قبلی به دست %1$s خوانده شد"</string>
   <string name="a11y_remove_reaction">"برداشتن واکنش با %1$s"</string>
   <string name="a11y_remove_reaction_with">"برداشتن واکنش با %1$s"</string>
   <string name="a11y_room_avatar">"چهرک اتاق"</string>
@@ -145,8 +144,8 @@
   <string name="action_share_link">"هم‌رسانی پیوند"</string>
   <string name="action_show">"نمایش"</string>
   <string name="action_sign_in_again">"ورود دوباره"</string>
-  <string name="action_signout">"خروج"</string>
-  <string name="action_signout_anyway">"خروج به هر صورت"</string>
+  <string name="action_signout">"برداشتن این افزاره"</string>
+  <string name="action_signout_anyway">"به هر حال این دستگاه را حذف کنید"</string>
   <string name="action_skip">"پرش"</string>
   <string name="action_start">"آغاز"</string>
   <string name="action_start_chat">"آغاز گپ"</string>
@@ -185,7 +184,6 @@
   <string name="common_current_user_left_room">"اتاق را ترک کرد"</string>
   <string name="common_current_user_left_space">"فضا را ترک کرد"</string>
   <string name="common_current_user_rejected_invite">"دعوت لغو شد"</string>
-  <string name="common_dark">"تیره"</string>
   <string name="common_decryption_error">"خطای رمزگشایی"</string>
   <string name="common_description">"توضیح"</string>
   <string name="common_developer_options">"گزینه‌های توسعه دهنده"</string>
@@ -220,11 +218,14 @@
   <string name="common_invite_unknown_profile">"شناسهٔ ماتریکس نتوانست پیدا شود. ممکن است دعوت نرسیده باشد."</string>
   <string name="common_leaving_room">"ترک کردن اتاق"</string>
   <string name="common_leaving_space">"ترک کردن فضا"</string>
-  <string name="common_light">"روشن"</string>
   <string name="common_line_copied_to_clipboard">"خط در تخته‌گیره رونوشت شد"</string>
   <string name="common_link_copied_to_clipboard">"پیوند در تخته‌گیره رونوشت شد"</string>
   <string name="common_loading">"بار کردن…"</string>
   <string name="common_loading_more">"بار کردن بیش‌تر…"</string>
+  <plurals name="common_many_members">
+    <item quantity="one">"%d دیگر"</item>
+    <item quantity="other">"%d دیگران"</item>
+  </plurals>
   <plurals name="common_member_count">
     <item quantity="one">"%1$d عضو"</item>
     <item quantity="other">"%1$d عضو"</item>
@@ -270,7 +271,6 @@
   <string name="common_recovery_key">"کلید بازیابی"</string>
   <string name="common_refreshing">"تازه سازی…"</string>
   <string name="common_replying_to">"پاسخ دادن به %1$s"</string>
-  <string name="common_report_a_bug">"گزارش یک اشکال"</string>
   <string name="common_report_a_problem">"گزارش مشکل"</string>
   <string name="common_report_submitted">"گزارش ثبت شد"</string>
   <string name="common_rich_text_editor">"ویرایشگر متن غنی"</string>
@@ -305,7 +305,6 @@
   <string name="common_success">"موفّقیت"</string>
   <string name="common_suggestions">"پیشنهادها"</string>
   <string name="common_syncing">"هم‌گام ساختن"</string>
-  <string name="common_system">"سامانه"</string>
   <string name="common_text">"متن"</string>
   <string name="common_third_party_notices">"تذکّرهای سوم‌شخص"</string>
   <string name="common_thread">"رشته"</string>
@@ -349,7 +348,6 @@
   <string name="dialog_unsaved_changes_description">"تغییراتی ذخیره نشده دارید."</string>
   <string name="dialog_unsaved_changes_description_android">"تغییراتتان ذخیره نشده‌اند. مطمئنید که می‌خواهید برگردید؟"</string>
   <string name="dialog_unsaved_changes_title">"ذخیرهٔ تغییرات؟"</string>
-  <string name="emoji_picker_search_placeholder">"حست‌وجوی شکلک‌ها"</string>
   <string name="error_failed_creating_the_permalink">"شکست در ایجاد پایاپیوند"</string>
   <string name="error_failed_loading_map">"%1$s نتوانست نقشه را بارگیری کند. لطفا بعدا دوباره امتحان کنید."</string>
   <string name="error_failed_loading_messages">"شکست در بار کردن پیام‌ها"</string>
@@ -389,7 +387,7 @@
   <string name="screen_share_open_apple_maps">"گشودن در نقشه‌های اپل"</string>
   <string name="screen_share_open_google_maps">"گشودن در نقشه‌های گوگل"</string>
   <string name="screen_share_open_osm_maps">"گشودن در اوپن‌استریت‌مپ"</string>
-  <string name="screen_share_this_location_action">"هم‌رسانی این مکان"</string>
+  <string name="screen_share_this_location_action">"هم‌رسانی مکان گزیده"</string>
   <string name="screen_space_list_description">"فضاهایی که ساخته یا پیوسته‌اید."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"‏%1$s فضا"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fi/translations.xml b/libraries/ui-strings/src/main/res/values-fi/translations.xml
index 182f403140..52d3bf16e5 100644
--- a/libraries/ui-strings/src/main/res/values-fi/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fi/translations.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Lisää avatar"</string>
   <string name="a11y_add_reaction">"Lisää reaktio: %1$s"</string>
   <string name="a11y_address">"Osoite"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_clear_search_field">"Tyhjennä hakukenttä"</string>
   <string name="a11y_collapse_message_text_field">"Pienennä viestin tekstikenttä"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Vähennä sallittujen äänien määrää per henkilö"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Lisää sallittujen äänien määrää per henkilö"</string>
   <string name="a11y_delete">"Poista"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d numero syötetty"</item>
     <item quantity="other">"%1$d numeroa syötetty"</item>
   </plurals>
+  <string name="a11y_duration">"Kesto: %1$s"</string>
   <string name="a11y_edit_avatar">"Muokkaa avataria"</string>
   <string name="a11y_edit_room_address_hint">"Täysi osoite tulee olemaan %1$s"</string>
   <string name="a11y_encryption_details">"Salauksen tiedot"</string>
   <string name="a11y_expand_message_text_field">"Laajenna viestin tekstikenttä"</string>
   <string name="a11y_hide_password">"Piilota salasana"</string>
+  <string name="a11y_info">"Tiedot"</string>
   <string name="a11y_join_call">"Liity puheluun"</string>
   <string name="a11y_jump_to_bottom">"Siirry loppuun"</string>
+  <string name="a11y_jump_to_unread">"Siirry lukemattomiin"</string>
   <string name="a11y_move_the_map_to_my_location">"Siirrä kartta sijaintiini"</string>
   <string name="a11y_notifications_mentions_only">"Vain maininnat"</string>
   <string name="a11y_notifications_muted">"Mykistetty"</string>
@@ -26,34 +33,42 @@
   <string name="a11y_page_n">"Sivu %1$d"</string>
   <string name="a11y_pause">"Keskeytä"</string>
   <string name="a11y_paused_voice_message">"Ääniviesti, kesto: %1$s, nykyinen sijainti: %2$s"</string>
+  <string name="a11y_photo_preview">"Kuvan esikatselu"</string>
   <string name="a11y_pin_field">"PIN-kenttä"</string>
   <string name="a11y_pinned_location">"Kiinnitetty sijainti"</string>
   <string name="a11y_play">"Toista"</string>
   <string name="a11y_playback_speed">"Toistonopeus"</string>
   <string name="a11y_poll">"Kysely"</string>
   <string name="a11y_poll_end">"Päättynyt kysely"</string>
+  <string name="a11y_position">"Sijainti: %1$s"</string>
   <string name="a11y_qr_code">"QR-koodi"</string>
   <string name="a11y_react_with">"Lisää reaktio: %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reagoi muilla emojeilla"</string>
-  <string name="a11y_read_receipts_multiple">"%1$s ja %2$s on lukenut viestin"</string>
+  <string name="a11y_read_receipts_multiple">"%1$s ja %2$s ovat lukeneet edellisen viestin"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"%1$s ja %2$d muu on lukenut viestin"</item>
-    <item quantity="other">"%1$s ja %2$d muuta on lukenut viestin"</item>
+    <item quantity="one">"%1$s ja %2$d muu ovat lukeneet edellisen viestin"</item>
+    <item quantity="other">"%1$s ja %2$d muuta ovat lukeneet edellisen viestin"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"%1$s on lukenut viestin"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Näytä kaikki napauttamalla"</string>
+  <string name="a11y_read_receipts_single">"%1$s on lukenut edellisen viestin"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"näytä kaikki lukukuittaukset"</string>
   <string name="a11y_remove_reaction">"Poista reaktio: %1$s"</string>
   <string name="a11y_remove_reaction_with">"Poista reaktio: %1$s"</string>
   <string name="a11y_room_avatar">"Huoneen avatar"</string>
   <string name="a11y_send_files">"Lähetä tiedostoja"</string>
   <string name="a11y_sender_location">"Lähettäjän sijainti"</string>
+  <string name="a11y_sent_by_sender_at_date">"Lähettänyt %1$s aikaan %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Aikarajoitettu toimenpide vaaditaan, sinulla on yksi minuutti aikaa vahvistaa"</string>
+  <string name="a11y_settings_with_required_action">"Asetukset, toimenpide vaaditaan"</string>
   <string name="a11y_show_password">"Näytä salasana"</string>
   <string name="a11y_start_call">"Aloita puhelu"</string>
+  <string name="a11y_start_video_call">"Aloita videopuhelu"</string>
   <string name="a11y_start_voice_call">"Aloita äänipuhelu"</string>
+  <string name="a11y_thread_in_room">"Viestiketju huoneessa %1$s"</string>
+  <string name="a11y_threads_in_room">"Viestiketjut huoneessa %1$s"</string>
   <string name="a11y_tombstoned_room">"Haudattu huone"</string>
   <string name="a11y_user_avatar">"Käyttäjän avatar"</string>
   <string name="a11y_user_menu">"Käyttäjävalikko"</string>
+  <string name="a11y_video_preview">"Videon esikatselu"</string>
   <string name="a11y_view_avatar">"Näytä avatar"</string>
   <string name="a11y_view_details">"Näytä tiedot"</string>
   <string name="a11y_voice_message">"Ääniviesti, kesto: %1$s"</string>
@@ -68,6 +83,7 @@
   <string name="action_call">"Soita"</string>
   <string name="action_cancel">"Peruuta"</string>
   <string name="action_cancel_for_now">"Peruuta toistaiseksi"</string>
+  <string name="action_choose_file">"Valitse tiedosto"</string>
   <string name="action_choose_photo">"Valitse kuva"</string>
   <string name="action_clear">"Tyhjennä"</string>
   <string name="action_close">"Sulje"</string>
@@ -87,12 +103,16 @@
   <string name="action_deactivate_account">"Deaktivoi tili"</string>
   <string name="action_decline">"Hylkää"</string>
   <string name="action_decline_and_block">"Hylkää ja estä"</string>
+  <string name="action_delete">"Poista"</string>
+  <string name="action_delete_account">"Poista tili"</string>
+  <string name="action_delete_file">"Poista tiedosto"</string>
   <string name="action_delete_poll">"Poista kysely"</string>
   <string name="action_deselect_all">"Poista kaikki valinnat"</string>
   <string name="action_disable">"Poista käytöstä"</string>
   <string name="action_discard">"Hylkää"</string>
   <string name="action_dismiss">"Sulje"</string>
   <string name="action_done">"Valmis"</string>
+  <string name="action_download">"Lataa"</string>
   <string name="action_edit">"Muokkaa"</string>
   <string name="action_edit_caption">"Muokkaa kuvatekstiä"</string>
   <string name="action_edit_poll">"Muokkaa kyselyä"</string>
@@ -177,9 +197,11 @@
   <string name="action_translate">"Käännä"</string>
   <string name="action_try_again">"Yritä uudelleen"</string>
   <string name="action_unpin">"Poista kiinnitys"</string>
+  <string name="action_video_call">"Videopuhelu"</string>
   <string name="action_view">"Näytä"</string>
   <string name="action_view_in_timeline">"Näytä aikajanalla"</string>
   <string name="action_view_source">"Näytä lähde"</string>
+  <string name="action_voice_call">"Äänipuhelu"</string>
   <string name="action_yes">"Kyllä"</string>
   <string name="action_yes_try_again">"Kyllä, yritä uudelleen"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Palvelimesi tukee nyt uutta, nopeampaa protokollaa. Kirjaudu ulos ja takaisin sisään päivittääksesi nyt. Jos teet tämän nyt, voit välttää pakotetun uloskirjautumisen, kun vanha protokolla poistetaan myöhemmin."</string>
@@ -192,7 +214,6 @@
   <string name="common_advanced_settings">"Edistyneet asetukset"</string>
   <string name="common_an_image">"kuva"</string>
   <string name="common_analytics">"Analytiikka"</string>
-  <string name="common_android_fetching_notifications_title">"Synkronoidaan ilmoituksia…"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Poistuit huoneesta"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Sinut kirjattiin ulos istunnosta"</string>
   <string name="common_appearance">"Ulkoasu"</string>
@@ -200,7 +221,10 @@
   <string name="common_beta">"Beeta"</string>
   <string name="common_blocked_users">"Estetyt käyttäjät"</string>
   <string name="common_bubbles">"Kuplat"</string>
+  <string name="common_call_declined">"Puhelu hylätty"</string>
+  <string name="common_call_in_progress">"Puhelu käynnissä"</string>
   <string name="common_call_started">"Puhelu alkoi"</string>
+  <string name="common_call_you_declined">"Hylkäsit puhelun"</string>
   <string name="common_chat_backup">"Keskustelujen varmuuskopiointi"</string>
   <string name="common_copied_to_clipboard">"Kopioitu leikepöydälle"</string>
   <string name="common_copyright">"Tekijänoikeudet"</string>
@@ -210,7 +234,6 @@
   <string name="common_current_user_left_room">"Poistuit huoneesta"</string>
   <string name="common_current_user_left_space">"Poistuit tilasta"</string>
   <string name="common_current_user_rejected_invite">"Kutsu hylätty"</string>
-  <string name="common_dark">"Tumma"</string>
   <string name="common_decryption_error">"Salauksen purkuvirhe"</string>
   <string name="common_description">"Kuvaus"</string>
   <string name="common_developer_options">"Kehittäjän asetukset"</string>
@@ -236,20 +259,30 @@ Syy: %1$s."</string>
   <string name="common_failed">"Epäonnistui"</string>
   <string name="common_favourite">"Lisää suosikkeihin"</string>
   <string name="common_favourited">"Lisätty suosikkeihin"</string>
+  <string name="common_fetching_notifications_title_android">"Synkronoidaan ilmoituksia…"</string>
   <string name="common_file">"Tiedosto"</string>
   <string name="common_file_deleted">"Tiedosto poistettu"</string>
   <string name="common_file_saved">"Tiedosto tallennettu"</string>
   <string name="common_file_saved_on_disk_android">"Tiedosto tallennettu Lataukset-kansioon"</string>
   <string name="common_forward_message">"Välitä viesti"</string>
   <string name="common_frequently_used">"Usein käytetyt"</string>
+  <string name="common_gallery">"Galleria"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d liite…"</item>
+    <item quantity="other">"%1$d liitettä…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d mediakohde…"</item>
+    <item quantity="other">"%1$d mediakohdetta…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Ryhmäpuhelu käynnissä"</string>
   <string name="common_image">"Kuva"</string>
   <string name="common_in_reply_to">"Vastauksena käyttäjälle %1$s"</string>
   <string name="common_install_apk_android">"Asenna APK"</string>
   <string name="common_invite_unknown_profile">"Tätä Matrix-tunnusta ei löytynyt, joten kutsu ei välttämättä mene perille."</string>
   <string name="common_leaving_room">"Poistutaan huoneesta"</string>
   <string name="common_leaving_space">"Poistutaan tilasta"</string>
-  <string name="common_light">"Vaalea"</string>
   <string name="common_line_copied_to_clipboard">"Rivi kopioitu leikepöydälle"</string>
   <string name="common_link_copied_to_clipboard">"Linkki kopioitu leikepöydälle"</string>
   <string name="common_link_new_device">"Yhdistä uusi laite"</string>
@@ -279,6 +312,7 @@ Syy: %1$s."</string>
   <string name="common_no_space_name">"Nimetön tila"</string>
   <string name="common_not_encrypted">"Ei salattu"</string>
   <string name="common_offline">"Ei yhteyttä"</string>
+  <string name="common_on_a_call">"Puhelussa"</string>
   <string name="common_open_source_licenses">"Avoimen lähdekoodin lisenssit"</string>
   <string name="common_or">"tai"</string>
   <string name="common_other_options">"Muut vaihtoehdot"</string>
@@ -291,6 +325,7 @@ Syy: %1$s."</string>
   <string name="common_please_wait">"Odota hetki…"</string>
   <string name="common_poll_end_confirmation">"Haluatko varmasti lopettaa tämän kyselyn?"</string>
   <string name="common_poll_summary">"Kysely: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Kysely"</string>
   <string name="common_poll_total_votes">"Ääniä yhteensä: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Tulokset näkyvät kyselyn päätyttyä"</string>
   <plurals name="common_poll_votes_count">
@@ -316,7 +351,6 @@ Syy: %1$s."</string>
     <item quantity="other">"%1$d vastausta"</item>
   </plurals>
   <string name="common_replying_to">"Vastataan käyttäjälle %1$s"</string>
-  <string name="common_report_a_bug">"Ilmoita virheestä"</string>
   <string name="common_report_a_problem">"Ilmoita ongelmasta"</string>
   <string name="common_report_submitted">"Ilmoitus lähetetty"</string>
   <string name="common_rich_text_editor">"Rikastettu tekstieditori"</string>
@@ -370,10 +404,10 @@ Syy: %1$s."</string>
   <string name="common_suggested">"Ehdotettu"</string>
   <string name="common_suggestions">"Ehdotukset"</string>
   <string name="common_syncing">"Synkronoidaan"</string>
-  <string name="common_system">"Järjestelmän oletus"</string>
   <string name="common_text">"Teksti"</string>
   <string name="common_third_party_notices">"Kolmannen osapuolen ilmoitukset"</string>
   <string name="common_thread">"Viestiketju"</string>
+  <string name="common_threads">"Viestiketjut"</string>
   <string name="common_topic">"Aihe"</string>
   <string name="common_topic_placeholder">"Mistä tässä huoneessa on kyse?"</string>
   <string name="common_unable_to_decrypt">"Salauksen purkaminen ei onnistunut"</string>
@@ -386,6 +420,7 @@ Syy: %1$s."</string>
   <string name="common_unmute">"Poista mykistys"</string>
   <string name="common_unsupported_call">"Puhelu, jota ei tueta"</string>
   <string name="common_unsupported_event">"Tapahtumaa ei tueta"</string>
+  <string name="common_user_started_a_call">"%1$s aloitti puhelun"</string>
   <string name="common_username">"Käyttäjänimi"</string>
   <string name="common_verification_cancelled">"Vahvistus peruttu"</string>
   <string name="common_verification_complete">"Vahvistus suoritettu"</string>
@@ -407,6 +442,11 @@ Syy: %1$s."</string>
   <string name="common_waiting_live_location">"Odotetaan reaaliaikaista sijaintia…"</string>
   <string name="common_world_readable_history">"Kuka tahansa voi nähdä historian"</string>
   <string name="common_you">"Sinä"</string>
+  <string name="content_scanner_not_found">"Lataus ei ole saatavilla."</string>
+  <string name="content_scanner_not_found_title">"Tiedostoa ei löytynyt"</string>
+  <string name="content_scanner_scanning">"Skannataan…"</string>
+  <string name="content_scanner_unsafe_message">"Esikatselu ja lataus on poistettu käytöstä."</string>
+  <string name="content_scanner_unsafe_title">"Tiedosto ei ole turvallinen"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) jakoi tämän viestin, koska et ollut huoneessa, kun se lähetettiin."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s jakoi tämän viestin, koska et ollut huoneessa, kun se lähetettiin."</string>
   <string name="crypto_history_visible">"Tämä huone on määritetty niin, että uudet jäsenet voivat lukea historiaa. %1$s"</string>
@@ -437,7 +477,6 @@ Haluatko varmasti jatkaa?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Suurin sallittu tiedostokoko on: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Valitse lähetettävän videon laatu."</string>
   <string name="dialog_video_quality_selector_title">"Valitse videon lähetyslaatu"</string>
-  <string name="emoji_picker_search_placeholder">"Etsi emojeja"</string>
   <string name="error_account_already_logged_in">"Olet jo kirjautuneena tälle laitteelle käyttäjällä %1$s."</string>
   <string name="error_account_creation_not_possible">"Kotipalvelimesi on päivitettävä tukemaan Matrix Authentication Serviceä ja tilin luomista."</string>
   <string name="error_failed_creating_the_permalink">"Pysyvän linkin luominen epäonnistui"</string>
@@ -458,6 +497,9 @@ Haluatko varmasti jatkaa?"</string>
   <string name="error_unknown">"Anteeksi, tapahtui virhe"</string>
   <string name="invite_friends_rich_title">"🔐️ Liity seuraani %1$s -sovelluksessa"</string>
   <string name="invite_friends_text">"Hei, keskustele kanssani %1$s -sovelluksessa: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Reaaliaikaisen sijainnin jakaminen"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Sijainnin jakaminen käynnissä"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Reaaliaikainen sijainti"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Raivostunut ravistaminen ilmoittaa virheestä"</string>
   <string name="screen_bug_report_a11y_screenshot">"Näyttökuva"</string>
@@ -465,8 +507,15 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_create_poll_options_section_title">"Vaihtoehdot"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Poista %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Asetukset"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Sallitut äänet per henkilö"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Kukaan ei jaa sijaintiaan"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Jaetaan reaaliaikaista sijaintia"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d henkilö"</item>
+    <item quantity="other">"%1$d henkilöä"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Kartalla"</string>
   <string name="screen_media_picker_error_failed_selection">"Median valinta epäonnistui, yritä uudelleen."</string>
-  <string name="screen_onboarding_welcome_back">"Tervetuloa takaisin"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Paina viestiä ja valitse “%1$s” lisätäksesi sen tänne."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Kiinnitä tärkeät viestit, jotta ne löytyvät helposti."</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -490,6 +539,7 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_room_event_pill">"Viesti huoneessa %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Laajenna"</string>
   <string name="screen_room_grouped_state_events_reduce">"Pienennä"</string>
+  <string name="screen_room_live_location_banner">"Jaetaan reaaliaikaista sijaintia"</string>
   <string name="screen_room_permalink_same_room_android">"Katselet jo tätä huonetta!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s / %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"Kiinnitetty viesti %1$s"</string>
@@ -510,6 +560,10 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_space_list_title">"Tilat"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Jaettu %1$s"</string>
   <string name="screen_static_location_sheet_title">"Kartalla"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d osallistujaa"</item>
+    <item quantity="other">"%1$d osallistujaa"</item>
+  </plurals>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Viestiä ei lähetetty, koska käyttäjän %1$s vahvistettu digitaalinen identiteetti nollattiin."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Viestiä ei lähetetty, koska %1$s ei ole vahvistanut kaikkia laitteitaan."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Viestiä ei lähetetty, koska et ole vahvistanut yhtä tai useampaa laitettasi."</string>
@@ -521,4 +575,6 @@ Haluatko varmasti jatkaa?"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Sinulla ei ole oikeutta lukea tätä viestiä"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Viestin salauksen purkaminen ei onnistu"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Tämä viesti estettiin, koska et ole vahvistanut laitettasi tai koska lähettäjän on vahvistettava diigitaalinen identiteettisi."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Laitteesi on liian vanha, tarvitset laitteen, jossa on Android 8 tai uudempi."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Karttojen renderöintiä ei tueta"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml
index 1dad21ff65..8d550ae51e 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Ajouter un avatar"</string>
   <string name="a11y_add_reaction">"Ajouter une réaction: %1$s"</string>
   <string name="a11y_address">"Adresse"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_clear_search_field">"Effacer le champ de recherche"</string>
   <string name="a11y_collapse_message_text_field">"Réduire la taille du composeur"</string>
   <string name="a11y_delete">"Supprimer"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d chiffre saisi"</item>
     <item quantity="other">"%1$d chiffres saisis"</item>
   </plurals>
+  <string name="a11y_duration">"Durée: %1$s"</string>
   <string name="a11y_edit_avatar">"Modifier l’avatar"</string>
   <string name="a11y_edit_room_address_hint">"L’adresse complète sera %1$s"</string>
   <string name="a11y_encryption_details">"Détails du chiffrement"</string>
   <string name="a11y_expand_message_text_field">"Augmenter la taille du composeur"</string>
   <string name="a11y_hide_password">"Masquer le mot de passe"</string>
+  <string name="a11y_info">"Info"</string>
   <string name="a11y_join_call">"Rejoindre l’appel"</string>
   <string name="a11y_jump_to_bottom">"Retourner à la fin de la conversation"</string>
+  <string name="a11y_jump_to_unread">"Aller aux messages non lus"</string>
   <string name="a11y_move_the_map_to_my_location">"Déplacer la carte vers ma position"</string>
   <string name="a11y_notifications_mentions_only">"Mentions uniquement"</string>
   <string name="a11y_notifications_muted">"En sourdine"</string>
@@ -32,6 +37,7 @@
   <string name="a11y_playback_speed">"Vitesse de lecture"</string>
   <string name="a11y_poll">"Sondage"</string>
   <string name="a11y_poll_end">"Sondage terminé"</string>
+  <string name="a11y_position">"Position: %1$s"</string>
   <string name="a11y_qr_code">"Code QR"</string>
   <string name="a11y_react_with">"Réagir avec %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Réagir avec d’autres émojis"</string>
@@ -41,16 +47,20 @@
     <item quantity="other">"Lu par %1$s et %2$d autres"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Lu par %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Taper pour voir toute la liste"</string>
   <string name="a11y_remove_reaction">"Supprimer la réaction avec %1$s"</string>
   <string name="a11y_remove_reaction_with">"Supprimer la réaction avec %1$s"</string>
   <string name="a11y_room_avatar">"Avatar du salon"</string>
   <string name="a11y_send_files">"Envoyer des fichiers"</string>
   <string name="a11y_sender_location">"Position de l’expéditeur"</string>
+  <string name="a11y_sent_by_sender_at_date">"Envoyé par %1$s à %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Action limitée dans le temps requise, vous avez une minute pour effectuer la vérification"</string>
+  <string name="a11y_settings_with_required_action">"Paramètres, action requise"</string>
   <string name="a11y_show_password">"Afficher le mot de passe"</string>
   <string name="a11y_start_call">"Démarrer un appel"</string>
+  <string name="a11y_start_video_call">"Passer un appel vidéo"</string>
   <string name="a11y_start_voice_call">"Lancer un appel vocal"</string>
+  <string name="a11y_thread_in_room">"Discussion dans %1$s"</string>
+  <string name="a11y_threads_in_room">"Discussions dans %1$s"</string>
   <string name="a11y_tombstoned_room">"Salon clôturé"</string>
   <string name="a11y_user_avatar">"Avatar de l’utilisateur"</string>
   <string name="a11y_user_menu">"Menu utilisateur"</string>
@@ -68,6 +78,7 @@
   <string name="action_call">"Appel"</string>
   <string name="action_cancel">"Annuler"</string>
   <string name="action_cancel_for_now">"Annuler pour l’instant"</string>
+  <string name="action_choose_file">"Choisir un fichier"</string>
   <string name="action_choose_photo">"Choisir une photo"</string>
   <string name="action_clear">"Effacer"</string>
   <string name="action_close">"Fermer"</string>
@@ -87,12 +98,16 @@
   <string name="action_deactivate_account">"Désactiver le compte"</string>
   <string name="action_decline">"Refuser"</string>
   <string name="action_decline_and_block">"Refuser et bloquer"</string>
+  <string name="action_delete">"Supprimer"</string>
+  <string name="action_delete_account">"Supprimer le compte"</string>
+  <string name="action_delete_file">"Supprimer le fichier"</string>
   <string name="action_delete_poll">"Supprimer le sondage"</string>
   <string name="action_deselect_all">"Tout désélectionner"</string>
   <string name="action_disable">"Désactiver"</string>
   <string name="action_discard">"Annuler"</string>
   <string name="action_dismiss">"Ignorer"</string>
   <string name="action_done">"Terminé"</string>
+  <string name="action_download">"Télécharger"</string>
   <string name="action_edit">"Modifier"</string>
   <string name="action_edit_caption">"Modifier la légende"</string>
   <string name="action_edit_poll">"Modifier le sondage"</string>
@@ -192,7 +207,6 @@
   <string name="common_advanced_settings">"Paramètres avancés"</string>
   <string name="common_an_image">"une image"</string>
   <string name="common_analytics">"Statistiques d’utilisation"</string>
-  <string name="common_android_fetching_notifications_title">"Synchronisation des notifications…"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Vous avez quitté le salon"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Vous avez été déconnecté de la session"</string>
   <string name="common_appearance">"Apparence"</string>
@@ -200,7 +214,9 @@
   <string name="common_beta">"Bêta"</string>
   <string name="common_blocked_users">"Utilisateurs bloqués"</string>
   <string name="common_bubbles">"Bulles"</string>
+  <string name="common_call_declined">"Appel rejeté"</string>
   <string name="common_call_started">"Appel démarré"</string>
+  <string name="common_call_you_declined">"Vous avez rejeté un appel"</string>
   <string name="common_chat_backup">"Sauvegarde des discussions"</string>
   <string name="common_copied_to_clipboard">"Copié dans le presse-papiers"</string>
   <string name="common_copyright">"Droits d’auteur"</string>
@@ -210,7 +226,6 @@
   <string name="common_current_user_left_room">"Vous avez quitté le salon"</string>
   <string name="common_current_user_left_space">"Vous avez quitté l’espace"</string>
   <string name="common_current_user_rejected_invite">"Invitation refusée"</string>
-  <string name="common_dark">"Sombre"</string>
   <string name="common_decryption_error">"Erreur de déchiffrement"</string>
   <string name="common_description">"Description"</string>
   <string name="common_developer_options">"Options pour les développeurs"</string>
@@ -236,6 +251,7 @@ Raison : %1$s."</string>
   <string name="common_failed">"Échec"</string>
   <string name="common_favourite">"Favori"</string>
   <string name="common_favourited">"Ajouté aux favoris"</string>
+  <string name="common_fetching_notifications_title_android">"Synchronisation des notifications…"</string>
   <string name="common_file">"Fichier"</string>
   <string name="common_file_deleted">"Fichier supprimé"</string>
   <string name="common_file_saved">"Fichier enregistré"</string>
@@ -249,7 +265,6 @@ Raison : %1$s."</string>
   <string name="common_invite_unknown_profile">"Cet identifiant Matrix est introuvable, il est donc possible que l’invitation ne soit pas reçue."</string>
   <string name="common_leaving_room">"Quitter le salon…"</string>
   <string name="common_leaving_space">"En train de quitter l’espace"</string>
-  <string name="common_light">"Clair"</string>
   <string name="common_line_copied_to_clipboard">"Ligne copiée dans le presse-papiers"</string>
   <string name="common_link_copied_to_clipboard">"Lien copié dans le presse-papiers"</string>
   <string name="common_link_new_device">"Associer un nouvel appareil"</string>
@@ -291,6 +306,7 @@ Raison : %1$s."</string>
   <string name="common_please_wait">"Veuillez patienter…"</string>
   <string name="common_poll_end_confirmation">"Êtes-vous sûr de vouloir mettre fin à ce sondage ?"</string>
   <string name="common_poll_summary">"Sondage : %1$s"</string>
+  <string name="common_poll_summary_prefix">"Sondage"</string>
   <string name="common_poll_total_votes">"Nombre total de votes : %1$s"</string>
   <string name="common_poll_undisclosed_text">"Les résultats s’afficheront une fois le sondage terminé"</string>
   <plurals name="common_poll_votes_count">
@@ -316,7 +332,6 @@ Raison : %1$s."</string>
     <item quantity="other">"%1$d réponses"</item>
   </plurals>
   <string name="common_replying_to">"En réponse à %1$s"</string>
-  <string name="common_report_a_bug">"Signaler un problème"</string>
   <string name="common_report_a_problem">"Remonter un problème"</string>
   <string name="common_report_submitted">"Rapport soumis"</string>
   <string name="common_rich_text_editor">"Éditeur de texte enrichi"</string>
@@ -370,10 +385,10 @@ Raison : %1$s."</string>
   <string name="common_suggested">"Recommandé"</string>
   <string name="common_suggestions">"Suggestions"</string>
   <string name="common_syncing">"Synchronisation"</string>
-  <string name="common_system">"Système"</string>
   <string name="common_text">"Texte"</string>
   <string name="common_third_party_notices">"Avis de tiers"</string>
   <string name="common_thread">"Fil de discussion"</string>
+  <string name="common_threads">"Fils de discussion"</string>
   <string name="common_topic">"Sujet"</string>
   <string name="common_topic_placeholder">"De quoi s’agit-il dans ce salon ?"</string>
   <string name="common_unable_to_decrypt">"Échec de déchiffrement"</string>
@@ -437,7 +452,6 @@ Raison : %1$s."</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"La taille maximale de fichier autorisée est: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Sélectionnez la qualité des vidéos que vous souhaitez envoyer."</string>
   <string name="dialog_video_quality_selector_title">"Sélectionnez la qualité d’envoi des vidéos"</string>
-  <string name="emoji_picker_search_placeholder">"Chercher des emojis"</string>
   <string name="error_account_already_logged_in">"Vous êtes déjà connecté sur cet appareil en tant que %1$s."</string>
   <string name="error_account_creation_not_possible">"Votre serveur d’accueil doit être mis à jour pour prendre en charge le protocole MAS (Matrix Authentication Service) et la création de compte."</string>
   <string name="error_failed_creating_the_permalink">"Échec de la création du permalien"</string>
@@ -458,6 +472,9 @@ Raison : %1$s."</string>
   <string name="error_unknown">"Désolé, une erreur s’est produite"</string>
   <string name="invite_friends_rich_title">"🔐️ Rejoignez-moi sur %1$s"</string>
   <string name="invite_friends_text">"Salut, parle-moi sur %1$s : %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Partage de position en continu"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Partage de position en cours"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s position en temps réel"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake pour signaler un problème"</string>
   <string name="screen_bug_report_a11y_screenshot">"Capture d’écran"</string>
@@ -465,8 +482,14 @@ Raison : %1$s."</string>
   <string name="screen_create_poll_options_section_title">"Options"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Supprimer %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Paramètres"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Personne ne partage sa position"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Partage de la position en direct"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d personne"</item>
+    <item quantity="other">"%1$d personnes"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Sur la carte"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</string>
-  <string name="screen_onboarding_welcome_back">"Bon retour parmi nous"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Cliquez (clic long) sur un message et choisissez « %1$s » pour qu‘il apparaisse ici."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Épinglez les messages importants pour leur donner plus de visibilité"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -490,6 +513,7 @@ Raison : %1$s."</string>
   <string name="screen_room_event_pill">"Message dans %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Développer"</string>
   <string name="screen_room_grouped_state_events_reduce">"Réduire"</string>
+  <string name="screen_room_live_location_banner">"Partage de la position en direct"</string>
   <string name="screen_room_permalink_same_room_android">"Vous êtes déjà dans ce salon!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s sur %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Messages épinglés"</string>
@@ -521,4 +545,6 @@ Raison : %1$s."</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Vous ne pouvez pas voir ce message"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Impossible de déchiffrer le message"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Ce message a été bloqué soit parce que vous n’avez pas vérifié votre session, soit parce que l’expéditeur doit vérifier votre identité numérique."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Votre appareil est trop ancien, un appareil fonctionnant sous Android 8 ou une version plus récente est requis."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Affichage des cartes non supporté"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-hr/translations.xml b/libraries/ui-strings/src/main/res/values-hr/translations.xml
index 1bb8ceb426..3c02673a22 100644
--- a/libraries/ui-strings/src/main/res/values-hr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-hr/translations.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Dodaj avatara"</string>
   <string name="a11y_add_reaction">"Dodaj reakciju: %1$s"</string>
+  <string name="a11y_address">"Adresa"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_clear_search_field">"Izbriši polje za pretragu"</string>
   <string name="a11y_collapse_message_text_field">"Minimiziraj tekstno polje poruke"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Smanjenje dopuštenih glasova po osobi"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Povećanje broja dopuštenih glasova po osobi"</string>
   <string name="a11y_delete">"Izbriši"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d unesena znamenka"</item>
     <item quantity="few">"%1$d unesene znamenke"</item>
     <item quantity="other">"%1$d unesenih znamenaka"</item>
   </plurals>
+  <string name="a11y_duration">"Trajanje: %1$s"</string>
   <string name="a11y_edit_avatar">"Uredi avatar"</string>
   <string name="a11y_edit_room_address_hint">"Potpuna adresa bit će %1$s"</string>
   <string name="a11y_encryption_details">"Pojedinosti o šifriranju"</string>
   <string name="a11y_expand_message_text_field">"Proširi tekstno polje poruke"</string>
   <string name="a11y_hide_password">"Sakrij zaporku"</string>
+  <string name="a11y_info">"Informacije"</string>
   <string name="a11y_join_call">"Pridruži se pozivu"</string>
   <string name="a11y_jump_to_bottom">"Idi na dno"</string>
+  <string name="a11y_jump_to_unread">"Skoči na nepročitano"</string>
+  <string name="a11y_jump_to_unread_messages">"Skoči na prvu nepročitanu poruku."</string>
   <string name="a11y_move_the_map_to_my_location">"Pomakni kartu na moju lokaciju"</string>
   <string name="a11y_notifications_mentions_only">"Samo spominjanja"</string>
   <string name="a11y_notifications_muted">"Bez zvuka"</string>
@@ -26,30 +35,42 @@
   <string name="a11y_page_n">"Stranica %1$d"</string>
   <string name="a11y_pause">"Pauziraj"</string>
   <string name="a11y_paused_voice_message">"Glasovna poruka, trajanje: %1$s, trenutačno zaustavljeno na: %2$s"</string>
+  <string name="a11y_photo_preview">"Pregled fotografije"</string>
   <string name="a11y_pin_field">"Polje za PIN"</string>
+  <string name="a11y_pinned_location">"Prikvačena lokacija"</string>
   <string name="a11y_play">"Reproduciraj"</string>
+  <string name="a11y_playback_speed">"Brzina reprodukcije"</string>
   <string name="a11y_poll">"Anketa"</string>
   <string name="a11y_poll_end">"Završena anketa"</string>
+  <string name="a11y_position">"Pozicija: %1$s"</string>
+  <string name="a11y_qr_code">"QR kod"</string>
   <string name="a11y_react_with">"Reagiraj s %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reagiraj s drugim emotikonima"</string>
   <string name="a11y_read_receipts_multiple">"Pročitali %1$s i %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Pročitao %1$s i ostalih %2$d"</item>
-    <item quantity="few">"Pročitala %1$s i ostala %2$d"</item>
-    <item quantity="other">"Pročitalo %1$s i ostalih %2$d"</item>
+    <item quantity="one">"Prethodnu poruku pročitali su %1$s i %2$d"</item>
+    <item quantity="other">"Prethodnu poruku pročitali su %1$s i %2$d drugi"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Pročitao korisnik %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Dodirnite za prikaz svih"</string>
+  <string name="a11y_read_receipts_single">"Prethodnu poruku pročitao/la %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"prikaži sve potvrde o čitanju"</string>
   <string name="a11y_remove_reaction">"Ukloni reakciju: %1$s"</string>
   <string name="a11y_remove_reaction_with">"Ukloni reakciju s %1$s"</string>
   <string name="a11y_room_avatar">"Avatar sobe"</string>
   <string name="a11y_send_files">"Pošalji datoteke"</string>
+  <string name="a11y_sender_location">"Lokacija pošiljatelja"</string>
+  <string name="a11y_sent_by_sender_at_date">"Poslao %1$s u %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Potrebna je vremenski ograničena radnja, imate jednu minutu za potvrdu"</string>
+  <string name="a11y_settings_with_required_action">"Postavke, potrebna je radnja"</string>
   <string name="a11y_show_password">"Prikaži zaporku"</string>
   <string name="a11y_start_call">"Započni poziv"</string>
+  <string name="a11y_start_video_call">"Započni videopoziv"</string>
+  <string name="a11y_start_voice_call">"Započni glasovni poziv"</string>
+  <string name="a11y_thread_in_room">"Nit u %1$s"</string>
+  <string name="a11y_threads_in_room">"Teme u %1$s"</string>
   <string name="a11y_tombstoned_room">"Soba označena za uklanjanje"</string>
   <string name="a11y_user_avatar">"Korisnički avatar"</string>
   <string name="a11y_user_menu">"Korisnički izbornik"</string>
+  <string name="a11y_video_preview">"Pretpregled videozapisa"</string>
   <string name="a11y_view_avatar">"Prikaži avatar"</string>
   <string name="a11y_view_details">"Prikaži pojedinosti"</string>
   <string name="a11y_voice_message">"Glasovna poruka, trajanje: %1$s"</string>
@@ -58,11 +79,13 @@
   <string name="a11y_your_avatar">"Vaš avatar"</string>
   <string name="action_accept">"Prihvati"</string>
   <string name="action_add_caption">"Dodaj opis"</string>
+  <string name="action_add_existing_rooms">"Dodaj postojeće sobe"</string>
   <string name="action_add_to_timeline">"Dodaj na vremensku traku"</string>
   <string name="action_back">"Natrag"</string>
   <string name="action_call">"Poziv"</string>
   <string name="action_cancel">"Odustani"</string>
   <string name="action_cancel_for_now">"Otkaži za sada"</string>
+  <string name="action_choose_file">"Odaberite datoteku"</string>
   <string name="action_choose_photo">"Odaberi fotografiju"</string>
   <string name="action_clear">"Očisti"</string>
   <string name="action_close">"Zatvori"</string>
@@ -76,23 +99,29 @@
   <string name="action_copy_link_to_message">"Kopiraj poveznicu u poruku"</string>
   <string name="action_copy_text">"Kopiraj tekst"</string>
   <string name="action_create">"Stvori"</string>
-  <string name="action_create_room">"Stvori sobu"</string>
+  <string name="action_create_room">"Napravi sobu"</string>
+  <string name="action_create_space">"Stvori prostor"</string>
   <string name="action_deactivate">"Deaktiviraj"</string>
   <string name="action_deactivate_account">"Deaktiviraj račun"</string>
   <string name="action_decline">"Odbij"</string>
   <string name="action_decline_and_block">"Odbij i blokiraj"</string>
+  <string name="action_delete">"Izbriši"</string>
+  <string name="action_delete_account">"Izbriši račun"</string>
+  <string name="action_delete_file">"Izbriši datoteku"</string>
   <string name="action_delete_poll">"Izbriši anketu"</string>
   <string name="action_deselect_all">"Poništi sve odabire"</string>
   <string name="action_disable">"Onemogući"</string>
   <string name="action_discard">"Odbaci"</string>
   <string name="action_dismiss">"Odbaci"</string>
   <string name="action_done">"Gotovo"</string>
+  <string name="action_download">"Preuzmi"</string>
   <string name="action_edit">"Uredi"</string>
   <string name="action_edit_caption">"Uredi opis"</string>
   <string name="action_edit_poll">"Uredi anketu"</string>
   <string name="action_enable">"Omogući"</string>
   <string name="action_end_poll">"Završi anketu"</string>
   <string name="action_enter_pin">"Unesite PIN"</string>
+  <string name="action_explore_public_spaces">"Istražite javne prostore"</string>
   <string name="action_finish">"Završi"</string>
   <string name="action_forgot_password">"Zaboravili ste zaporku?"</string>
   <string name="action_forward">"Proslijedi"</string>
@@ -113,8 +142,10 @@
   <string name="action_leave_space">"Napusti prostor"</string>
   <string name="action_load_more">"Učitaj više"</string>
   <string name="action_manage_account">"Upravljanje računom"</string>
+  <string name="action_manage_account_and_devices">"Upravljanje računom i uređajima"</string>
   <string name="action_manage_devices">"Upravljanje uređajima"</string>
   <string name="action_manage_rooms">"Upravljaj sobama"</string>
+  <string name="action_mark_as_read">"Označi kao pročitano"</string>
   <string name="action_message">"Poruka"</string>
   <string name="action_minimize">"Minimiziraj"</string>
   <string name="action_next">"Dalje"</string>
@@ -152,24 +183,28 @@
   <string name="action_send_voice_message">"Pošalji glasovnu poruku"</string>
   <string name="action_share">"Podijeli"</string>
   <string name="action_share_link">"Podijeli poveznicu"</string>
+  <string name="action_share_live_location">"Dijeljenje lokacije uživo"</string>
   <string name="action_show">"Prikaži"</string>
   <string name="action_sign_in_again">"Ponovno se prijavite"</string>
-  <string name="action_signout">"Odjava"</string>
-  <string name="action_signout_anyway">"Svejedno se odjavi"</string>
+  <string name="action_signout">"Ukloni ovaj uređaj"</string>
+  <string name="action_signout_anyway">"Ukloni ovaj uređaj svejedno"</string>
   <string name="action_skip">"Preskoči"</string>
   <string name="action_start">"Započni"</string>
   <string name="action_start_chat">"Započni razgovor"</string>
   <string name="action_start_over">"Kreni ispočetka"</string>
   <string name="action_start_verification">"Započni provjeru"</string>
   <string name="action_static_map_load">"Dodirnite za učitavanje karte"</string>
+  <string name="action_stop">"Zaustavi"</string>
   <string name="action_take_photo">"Uslikaj"</string>
   <string name="action_tap_for_options">"Dodirnite za mogućnosti"</string>
   <string name="action_translate">"Prevedi"</string>
   <string name="action_try_again">"Pokušajte ponovno"</string>
   <string name="action_unpin">"Otkvači"</string>
+  <string name="action_video_call">"Videopoziv"</string>
   <string name="action_view">"Prikaz"</string>
   <string name="action_view_in_timeline">"Prikaži na vremenskoj traci"</string>
   <string name="action_view_source">"Prikaži izvor"</string>
+  <string name="action_voice_call">"Glasovni poziv"</string>
   <string name="action_yes">"Da"</string>
   <string name="action_yes_try_again">"Da, pokušaj ponovno"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Vaš poslužitelj sada podržava novi, brži protokol. Odjavite se i ponovno prijavite da biste odmah izvršili nadogradnju. Ako to sada napravite, izbjeći ćete prisilnu odjavu kada se poslije ukloni stari protokol."</string>
@@ -189,16 +224,19 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blokirani korisnici"</string>
   <string name="common_bubbles">"Mjehurići"</string>
+  <string name="common_call_declined">"Poziv je odbijen"</string>
+  <string name="common_call_in_progress">"Poziv je u tijeku"</string>
   <string name="common_call_started">"Poziv je započeo"</string>
+  <string name="common_call_you_declined">"Odbili ste poziv"</string>
   <string name="common_chat_backup">"Sigurnosna kopija razgovora"</string>
   <string name="common_copied_to_clipboard">"Kopirano u međuspremnik"</string>
   <string name="common_copyright">"Autorsko pravo"</string>
   <string name="common_creating_room">"Stvaranje sobe…"</string>
+  <string name="common_creating_space">"Stvaranje prostora…"</string>
   <string name="common_current_user_canceled_knock">"Zahtjev je otkazan"</string>
   <string name="common_current_user_left_room">"Napustio/la je sobu"</string>
   <string name="common_current_user_left_space">"Napušteni prostor"</string>
   <string name="common_current_user_rejected_invite">"Poziv je odbijen"</string>
-  <string name="common_dark">"Tamno"</string>
   <string name="common_decryption_error">"Pogreška kod dešifriranja"</string>
   <string name="common_description">"Opis"</string>
   <string name="common_developer_options">"Mogućnosti za razvojne inženjere"</string>
@@ -214,6 +252,7 @@
   <string name="common_empty_file">"Prazna datoteka"</string>
   <string name="common_encryption">"Šifriranje"</string>
   <string name="common_encryption_enabled">"Šifriranje je omogućeno"</string>
+  <string name="common_ends_at">"Završava u %1$s"</string>
   <string name="common_enter_your_pin">"Unesite svoj PIN"</string>
   <string name="common_error">"Pogreška"</string>
   <string name="common_error_registering_pusher_android">"Došlo je do pogreške; možda nećete primati obavijesti za nove poruke. Riješite problem s obavijestima u postavkama.
@@ -223,23 +262,35 @@ Razlog: %1$s ."</string>
   <string name="common_failed">"Nije uspjelo"</string>
   <string name="common_favourite">"Favorit"</string>
   <string name="common_favourited">"Označeno kao favorit"</string>
+  <string name="common_fetching_notifications_title_android">"Sinkronizacija obavijesti…"</string>
   <string name="common_file">"Datoteka"</string>
   <string name="common_file_deleted">"Datoteka je izbrisana"</string>
   <string name="common_file_saved">"Datoteka je spremljena"</string>
   <string name="common_file_saved_on_disk_android">"Datoteka je spremljena u preuzimanja"</string>
   <string name="common_forward_message">"Proslijedi poruku"</string>
   <string name="common_frequently_used">"Često korišteno"</string>
+  <string name="common_gallery">"Galerija"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d prilog…"</item>
+    <item quantity="other">"%1$d prilozi…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d medijska stavka…"</item>
+    <item quantity="other">"%1$d medijske stavke…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Grupni poziv u tijeku"</string>
   <string name="common_image">"Slika"</string>
   <string name="common_in_reply_to">"Kao odgovor osobi %1$s"</string>
   <string name="common_install_apk_android">"Instaliraj APK"</string>
   <string name="common_invite_unknown_profile">"Ovaj Matrix ID nije moguće pronaći, pa se pozivnica možda neće primiti."</string>
   <string name="common_leaving_room">"Izlazak iz sobe"</string>
   <string name="common_leaving_space">"Napuštanje prostora"</string>
-  <string name="common_light">"Svijetlo"</string>
   <string name="common_line_copied_to_clipboard">"Redak je kopiran u međuspremnik"</string>
   <string name="common_link_copied_to_clipboard">"Poveznica je kopirana u međuspremnik."</string>
   <string name="common_link_new_device">"Poveži novi uređaj"</string>
+  <string name="common_live_location">"Lokacija uživo"</string>
+  <string name="common_live_location_ended">"Prikaz lokacije uživo je završio"</string>
   <string name="common_loading">"Učitavanje…"</string>
   <string name="common_loading_more">"Učitava se još…"</string>
   <plurals name="common_many_members">
@@ -266,8 +317,10 @@ Razlog: %1$s ."</string>
   <string name="common_no_space_name">"Nema naziva prostora"</string>
   <string name="common_not_encrypted">"Nije šifrirano"</string>
   <string name="common_offline">"Izvan mreže"</string>
+  <string name="common_on_a_call">"Na pozivu"</string>
   <string name="common_open_source_licenses">"Licencije otvorenog koda"</string>
   <string name="common_or">"ili"</string>
+  <string name="common_other_options">"Ostale opcije"</string>
   <string name="common_password">"Zaporka"</string>
   <string name="common_people">"Osobe"</string>
   <string name="common_permalink">"Stalna poveznica"</string>
@@ -277,6 +330,7 @@ Razlog: %1$s ."</string>
   <string name="common_please_wait">"Pričekajte…"</string>
   <string name="common_poll_end_confirmation">"Jeste li sigurni da želite završiti ovu anketu?"</string>
   <string name="common_poll_summary">"Anketa: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Anketa"</string>
   <string name="common_poll_total_votes">"Ukupno glasova: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Rezultati će se objaviti nakon što završi anketa"</string>
   <plurals name="common_poll_votes_count">
@@ -286,8 +340,10 @@ Razlog: %1$s ."</string>
   </plurals>
   <string name="common_preparing">"Priprema…"</string>
   <string name="common_privacy_policy">"Pravilnik o zaštiti privatnosti"</string>
+  <string name="common_private">"Privatno"</string>
   <string name="common_private_room">"Privatna soba"</string>
   <string name="common_private_space">"Privatni prostor"</string>
+  <string name="common_public">"Javno"</string>
   <string name="common_public_room">"Javna soba"</string>
   <string name="common_public_space">"Javni prostor"</string>
   <string name="common_reaction">"Reakcija"</string>
@@ -295,16 +351,17 @@ Razlog: %1$s ."</string>
   <string name="common_reason">"Razlog"</string>
   <string name="common_recovery_key">"Ključ za oporavak"</string>
   <string name="common_refreshing">"Osvježavanje…"</string>
+  <string name="common_removing">"U tijeku je uklanjanje…"</string>
   <plurals name="common_replies">
     <item quantity="one">"%1$d odgovor"</item>
     <item quantity="few">"%1$d odgovora"</item>
     <item quantity="other">"%1$d odgovora"</item>
   </plurals>
   <string name="common_replying_to">"Odgovara korisniku %1$s"</string>
-  <string name="common_report_a_bug">"Prijavi pogrešku"</string>
   <string name="common_report_a_problem">"Prijavi problem"</string>
   <string name="common_report_submitted">"Prijava je podnesena"</string>
   <string name="common_rich_text_editor">"Uređivač obogaćenog teksta"</string>
+  <string name="common_role">"Uloga"</string>
   <string name="common_room">"Soba"</string>
   <string name="common_room_name">"Naziv sobe"</string>
   <string name="common_room_name_placeholder">"npr. naziv vašeg projekta"</string>
@@ -321,6 +378,10 @@ Razlog: %1$s ."</string>
   <string name="common_security">"Sigurnost"</string>
   <string name="common_seen_by">"Vidio/la"</string>
   <string name="common_select_account">"Odaberi račun"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d odabrano"</item>
+    <item quantity="other">"%1$d odabrano"</item>
+  </plurals>
   <string name="common_send_to">"Pošalji"</string>
   <string name="common_sending">"Slanje…"</string>
   <string name="common_sending_failed">"Slanje nije uspjelo"</string>
@@ -331,12 +392,15 @@ Razlog: %1$s ."</string>
   <string name="common_server_url">"URL poslužitelja"</string>
   <string name="common_settings">"Postavke"</string>
   <string name="common_share_space">"Podijeli prostor"</string>
+  <string name="common_shared_history">"Novi članovi vide povijest"</string>
+  <string name="common_shared_live_location">"Dijeljena lokacija uživo"</string>
   <string name="common_shared_location">"Podijeljena lokacija"</string>
   <string name="common_shared_space">"Zajednički prostor"</string>
-  <string name="common_signing_out">"Odjava je u tijeku"</string>
+  <string name="common_signing_out">"Uklanjanje uređaja"</string>
   <string name="common_something_went_wrong">"Nešto je pošlo po zlu"</string>
   <string name="common_something_went_wrong_message">"Naišli smo na problem. Pokušajte ponovno."</string>
   <string name="common_space">"Prostor"</string>
+  <string name="common_space_members">"Članovi prostora"</string>
   <string name="common_space_topic_placeholder">"O čemu se radi u ovom prostoru?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d prostor"</item>
@@ -346,12 +410,13 @@ Razlog: %1$s ."</string>
   <string name="common_starting_chat">"Započinjanje razgovora…"</string>
   <string name="common_sticker">"Naljepnica"</string>
   <string name="common_success">"Uspjeh"</string>
+  <string name="common_suggested">"Preporučeno"</string>
   <string name="common_suggestions">"Prijedlozi"</string>
   <string name="common_syncing">"Sinkronizacija"</string>
-  <string name="common_system">"Sustav"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Obavijesti trećih strana"</string>
   <string name="common_thread">"Nit"</string>
+  <string name="common_threads">"Niti"</string>
   <string name="common_topic">"Tema"</string>
   <string name="common_topic_placeholder">"O čemu je ova soba?"</string>
   <string name="common_unable_to_decrypt">"Nije moguće dešifrirati"</string>
@@ -364,6 +429,7 @@ Razlog: %1$s ."</string>
   <string name="common_unmute">"Uključi zvuk"</string>
   <string name="common_unsupported_call">"Nepodržani poziv"</string>
   <string name="common_unsupported_event">"Nepodržani događaj"</string>
+  <string name="common_user_started_a_call">"%1$s je započeo poziv"</string>
   <string name="common_username">"Korisničko ime"</string>
   <string name="common_verification_cancelled">"Provjera je otkazana"</string>
   <string name="common_verification_complete">"Provjera je dovršena"</string>
@@ -382,7 +448,16 @@ Razlog: %1$s ."</string>
   <string name="common_voice_message">"Glasovna poruka"</string>
   <string name="common_waiting">"Čekanje…"</string>
   <string name="common_waiting_for_decryption_key">"Čekam ovu poruku"</string>
+  <string name="common_waiting_live_location">"Čekanje lokacije uživo…"</string>
+  <string name="common_world_readable_history">"Svatko može vidjeti povijest"</string>
   <string name="common_you">"Vi"</string>
+  <string name="content_scanner_not_found">"Preuzimanje nije dostupno."</string>
+  <string name="content_scanner_not_found_title">"Datoteka nije pronađena"</string>
+  <string name="content_scanner_scanning">"Skeniranje…"</string>
+  <string name="content_scanner_unsafe_message">"Pregled i preuzimanje su onemogućeni."</string>
+  <string name="content_scanner_unsafe_title">"Datoteka nije sigurna"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s(%2$s ) je podijelio/la ovu poruku jer niste bili u sobi kada je poslana."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$spodijelio/la je ovu poruku jer nisi bio/la u sobi kada je poslana."</string>
   <string name="crypto_history_visible">"Ova je soba konfigurirana tako da novi članovi mogu čitati stare poruke. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"Identitet korisnika %1$s je poništen. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Identitet korisnika %1$s %2$s je poništen. %3$s"</string>
@@ -390,6 +465,7 @@ Razlog: %1$s ."</string>
   <string name="crypto_identity_change_profile_pin_violation">"Identitet korisnika %1$s je poništen."</string>
   <string name="crypto_identity_change_verification_violation_new">"Identitet korisnika %1$s %2$s je poništen. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Povuci provjeru"</string>
+  <string name="dialog_allow_access">"Dopusti pristup"</string>
   <string name="dialog_confirm_link_message">"Poveznica %1$s vodi vas na drugo mrežno mjesto %2$s
 
 Jeste li sigurni da želite nastaviti?"</string>
@@ -410,7 +486,6 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maksimalna dopuštena veličina datoteke je: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Odaberite kvalitetu videozapisa koji želite prenijeti."</string>
   <string name="dialog_video_quality_selector_title">"Odaberi kvalitetu prijenosa videozapisa"</string>
-  <string name="emoji_picker_search_placeholder">"Pretraživanje emotikona"</string>
   <string name="error_account_already_logged_in">"Već ste prijavljeni na ovom uređaju kao %1$s."</string>
   <string name="error_account_creation_not_possible">"Vaš matični poslužitelj potrebno je nadograditi kako bi podržavao uslugu Matrix Authentication Service i stvaranje računa."</string>
   <string name="error_failed_creating_the_permalink">"Nije uspjelo stvaranje trajne poveznice"</string>
@@ -419,6 +494,7 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="error_failed_locating_user">"%1$s nije mogao pristupiti vašoj lokaciji. Pokušajte ponovno poslije."</string>
   <string name="error_failed_uploading_voice_message">"Prijenos vaše glasovne poruke nije uspio."</string>
   <string name="error_invalid_invite">"Soba više ne postoji ili pozivnica više ne vrijedi."</string>
+  <string name="error_location_service_disabled_android">"Omogućite GPS za pristup značajkama temeljenim na lokaciji."</string>
   <string name="error_message_not_found">"Poruka nije pronađena"</string>
   <string name="error_missing_location_auth_android">"%1$s nema dopuštenje za pristup vašoj lokaciji. Pristup možete omogućiti u postavkama."</string>
   <string name="error_missing_location_rationale_android">"%1$s nema dopuštenje za pristup vašoj lokaciji. Omogućite pristup u nastavku."</string>
@@ -430,6 +506,9 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="error_unknown">"Žao nam je, došlo je do pogreške"</string>
   <string name="invite_friends_rich_title">"🔐️ Pridruži mi se u %1$s"</string>
   <string name="invite_friends_text">"Hej, razgovaraj sa mnom u aplikaciji %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Dijeljenje lokacije uživo"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Dijeljenje lokacije u tijeku"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Lokacija uživo"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Snažno protresi za prijavu pogreške"</string>
   <string name="screen_bug_report_a11y_screenshot">"Snimka zaslona"</string>
@@ -437,6 +516,17 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="screen_create_poll_options_section_title">"Mogućnosti"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Ukloni %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Postavke"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Dozvoljeni glasovi po osobi"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nitko ne dijeli svoju lokaciju"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Dijeljenje lokacije uživo"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d osoba"</item>
+    <item quantity="few">"%1$d osoba"</item>
+    <item quantity="other">"%1$d ljudi"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Na karti"</string>
+  <string name="screen_local_network_opt_in_subtitle">"Vaš kućni poslužitelj je na vašoj lokalnoj mreži. Za povezivanje, %1$s je potrebno dopuštenje za pristup uređajima na ovoj mreži."</string>
+  <string name="screen_local_network_opt_in_title">"Dopusti pristup lokalnoj mreži"</string>
   <string name="screen_media_picker_error_failed_selection">"Odabir medija nije uspio, pokušajte ponovno."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Pritisnite poruku i odaberite “%1$s” kako biste uključili ovdje."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Prikvačite važne poruke kako bi ih se lakše moglo pronaći"</string>
@@ -462,6 +552,7 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="screen_room_event_pill">"Poruka u sobi %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Proširi"</string>
   <string name="screen_room_grouped_state_events_reduce">"Smanji"</string>
+  <string name="screen_room_live_location_banner">"Dijeljenje lokacije uživo"</string>
   <string name="screen_room_permalink_same_room_android">"Već gledam ovu sobu!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s od %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Prikvačene poruke"</string>
@@ -474,10 +565,18 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="screen_share_open_google_maps">"Otvori u Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Otvori u OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Podijeli ovu lokaciju"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Opcije dijeljenja"</string>
   <string name="screen_space_list_description">"Prostori koje ste stvorili ili kojima ste se pridružili."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Stvorite prostore za organizaciju soba"</string>
   <string name="screen_space_list_parent_space">"Prostor %1$s"</string>
   <string name="screen_space_list_title">"Prostori"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Dijeljeno %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Na karti"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d se pridružio"</item>
+    <item quantity="other">"%1$d se pridružio"</item>
+  </plurals>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Poruka nije poslana jer je poništen potvrđeni identitet korisnika %1$s."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Poruka nije poslana jer %1$s nije potvrdio sve uređaje."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Poruka nije poslana jer niste potvrdili jedan svoj uređaj ili više njih."</string>
@@ -489,4 +588,6 @@ Jeste li sigurni da želite nastaviti?"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Nemate pristup ovoj poruci"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nije moguće dešifrirati poruku"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Ova je poruka blokirana jer niste potvrdili svoj uređaj ili zato što pošiljatelj treba potvrditi vaš identitet."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Vaš je uređaj prestar, potreban je uređaj s Androidom 8 ili novijim."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Renderiranje mapa nije podržano"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-hu/translations.xml b/libraries/ui-strings/src/main/res/values-hu/translations.xml
index bc4535dda1..0a37baf199 100644
--- a/libraries/ui-strings/src/main/res/values-hu/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-hu/translations.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Profilkép hozzáadása"</string>
   <string name="a11y_add_reaction">"Reakció hozzáadása: %1$s"</string>
   <string name="a11y_address">"Cím"</string>
   <string name="a11y_avatar">"Profilkép"</string>
+  <string name="a11y_clear_search_field">"Keresőmező törlése"</string>
   <string name="a11y_collapse_message_text_field">"Üzenet szövegmezőjének minimalizálása"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Személyenként engedélyezett szavazatok számának csökkentése"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Személyenként engedélyezett szavazatok számának növelése"</string>
   <string name="a11y_delete">"Törlés"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d megadott számjegy"</item>
     <item quantity="other">"%1$d megadott számjegy"</item>
   </plurals>
+  <string name="a11y_duration">"Időtartam: %1$s"</string>
   <string name="a11y_edit_avatar">"Profilkép szerkesztése"</string>
   <string name="a11y_edit_room_address_hint">"A teljes cím ez lesz: %1$s"</string>
   <string name="a11y_encryption_details">"Titkosítás részletei"</string>
   <string name="a11y_expand_message_text_field">"Üzenet szövegmezőjének kibontása"</string>
   <string name="a11y_hide_password">"Jelszó elrejtése"</string>
+  <string name="a11y_info">"Információ"</string>
   <string name="a11y_join_call">"Csatlakozás a híváshoz"</string>
   <string name="a11y_jump_to_bottom">"Ugrás az aljára"</string>
+  <string name="a11y_jump_to_unread">"Ugrás az olvasatlanhoz"</string>
   <string name="a11y_move_the_map_to_my_location">"Térkép áthelyezése a jelenlegi helyre"</string>
   <string name="a11y_notifications_mentions_only">"Csak megemlítések"</string>
   <string name="a11y_notifications_muted">"Némítva"</string>
@@ -26,34 +33,42 @@
   <string name="a11y_page_n">"%1$d. oldal"</string>
   <string name="a11y_pause">"Szüneteltetés"</string>
   <string name="a11y_paused_voice_message">"Hangüzenet, időtartam:%1$s, jelenlegi pozíció:%2$s"</string>
+  <string name="a11y_photo_preview">"Fénykép előnézete"</string>
   <string name="a11y_pin_field">"PIN-mező"</string>
   <string name="a11y_pinned_location">"Rögzített hely"</string>
   <string name="a11y_play">"Lejátszás"</string>
   <string name="a11y_playback_speed">"Lejátszási sebesség"</string>
   <string name="a11y_poll">"Szavazás"</string>
   <string name="a11y_poll_end">"Befejezett szavazás"</string>
+  <string name="a11y_position">"Pozíció: %1$s"</string>
   <string name="a11y_qr_code">"QR-kód"</string>
   <string name="a11y_react_with">"Reagálás a következővel: %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reagálás más emodzsikkal"</string>
-  <string name="a11y_read_receipts_multiple">"Olvasta: %1$s és %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Az előző üzenetet olvasta: %1$s és %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Olvasta: %1$s és még %2$d felhasználó"</item>
-    <item quantity="other">"Olvasta: %1$s és még %2$d felhasználó"</item>
+    <item quantity="one">"Az előző üzenetet olvasta: %1$s és még %2$d felhasználó"</item>
+    <item quantity="other">"Az előző üzenetet olvasta: %1$s és még %2$d felhasználó"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Olvasta: %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Koppintson az összes megjelenítéséhez"</string>
+  <string name="a11y_read_receipts_single">"Az előző üzenetet olvasta: %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"összes olvasási visszajelzés megjelenítése"</string>
   <string name="a11y_remove_reaction">"Reakció eltávolítása: %1$s"</string>
   <string name="a11y_remove_reaction_with">"Reakció eltávolítása: %1$s"</string>
   <string name="a11y_room_avatar">"Szoba profilképe"</string>
   <string name="a11y_send_files">"Fájlküldés"</string>
   <string name="a11y_sender_location">"Felhasználó tartózkodási helye"</string>
+  <string name="a11y_sent_by_sender_at_date">"%1$s küldte ekkor: %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Időkorlátos művelet szükséges, egy perce van az ellenőrzésre"</string>
+  <string name="a11y_settings_with_required_action">"Beállítások, beavatkozás szükséges"</string>
   <string name="a11y_show_password">"Jelszó megjelenítése"</string>
   <string name="a11y_start_call">"Hanghívás indítása"</string>
+  <string name="a11y_start_video_call">"Videohívás indítása"</string>
   <string name="a11y_start_voice_call">"Hanghívás indítása"</string>
+  <string name="a11y_thread_in_room">"Üzenetszál itt: %1$s"</string>
+  <string name="a11y_threads_in_room">"Üzenetszálak itt: %1$s"</string>
   <string name="a11y_tombstoned_room">"Elévült szoba"</string>
   <string name="a11y_user_avatar">"Felhasználói profilkép"</string>
   <string name="a11y_user_menu">"Felhasználói menü"</string>
+  <string name="a11y_video_preview">"Videó előnézete"</string>
   <string name="a11y_view_avatar">"Profilkép megtekintése"</string>
   <string name="a11y_view_details">"Részletek megtekintése"</string>
   <string name="a11y_voice_message">"Hangüzenet, időtartam: %1$s"</string>
@@ -68,6 +83,7 @@
   <string name="action_call">"Hívás"</string>
   <string name="action_cancel">"Mégse"</string>
   <string name="action_cancel_for_now">"Egyelőre nem"</string>
+  <string name="action_choose_file">"Fájl kiválasztása"</string>
   <string name="action_choose_photo">"Fénykép kiválasztása"</string>
   <string name="action_clear">"Törlés"</string>
   <string name="action_close">"Bezárás"</string>
@@ -87,12 +103,16 @@
   <string name="action_deactivate_account">"Fiók deaktiválása"</string>
   <string name="action_decline">"Elutasítás"</string>
   <string name="action_decline_and_block">"Elutasítás és letiltás"</string>
+  <string name="action_delete">"Törlés"</string>
+  <string name="action_delete_account">"Fiók törlése"</string>
+  <string name="action_delete_file">"Fájl törlése"</string>
   <string name="action_delete_poll">"Szavazás törlése"</string>
   <string name="action_deselect_all">"Kijelölés megszüntetése"</string>
   <string name="action_disable">"Letiltás"</string>
   <string name="action_discard">"Elvetés"</string>
   <string name="action_dismiss">"Eltüntetés"</string>
   <string name="action_done">"Kész"</string>
+  <string name="action_download">"Letöltés"</string>
   <string name="action_edit">"Szerkesztés"</string>
   <string name="action_edit_caption">"Felirat szerkesztése"</string>
   <string name="action_edit_poll">"Szavazás szerkesztése"</string>
@@ -120,6 +140,7 @@
   <string name="action_leave_space">"Tér elhagyása"</string>
   <string name="action_load_more">"Továbbiak betöltése"</string>
   <string name="action_manage_account">"Fiók kezelése"</string>
+  <string name="action_manage_account_and_devices">"Fiók és eszközök kezelése"</string>
   <string name="action_manage_devices">"Eszközök kezelése"</string>
   <string name="action_manage_rooms">"Szobák kezelése"</string>
   <string name="action_message">"Üzenet"</string>
@@ -162,22 +183,25 @@
   <string name="action_share_live_location">"Valós idejű hely megosztása"</string>
   <string name="action_show">"Megjelenítés"</string>
   <string name="action_sign_in_again">"Jelentkezzen be újra"</string>
-  <string name="action_signout">"Kijelentkezés"</string>
-  <string name="action_signout_anyway">"Kijelentkezés mindenképp"</string>
+  <string name="action_signout">"Eszköz eltávolítása"</string>
+  <string name="action_signout_anyway">"Eszköz eltávolítása mindenképpen"</string>
   <string name="action_skip">"Kihagyás"</string>
   <string name="action_start">"Indítás"</string>
   <string name="action_start_chat">"Csevegés indítása"</string>
   <string name="action_start_over">"Újrakezdés"</string>
   <string name="action_start_verification">"Ellenőrzés elindítása"</string>
   <string name="action_static_map_load">"Koppintson a térkép betöltéséhez"</string>
+  <string name="action_stop">"Leállítás"</string>
   <string name="action_take_photo">"Fénykép készítése"</string>
   <string name="action_tap_for_options">"Koppintson a beállításokért"</string>
   <string name="action_translate">"Fordítás"</string>
   <string name="action_try_again">"Próbálja újra"</string>
   <string name="action_unpin">"Kitűzés feloldása"</string>
+  <string name="action_video_call">"Videóhívás"</string>
   <string name="action_view">"Megtekintés"</string>
   <string name="action_view_in_timeline">"Megtekintés az idővonalon"</string>
   <string name="action_view_source">"Forrás megtekintése"</string>
+  <string name="action_voice_call">"Hanghívás"</string>
   <string name="action_yes">"Igen"</string>
   <string name="action_yes_try_again">"Igen, újrapróbálkozás"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"A kiszolgálója mostantól egy új, gyorsabb protokollt támogat. A frissítéshez jelentkezzen ki, majd jelentkezzen be újra. Ha ezt most megteszi, elkerülheti a kényszerített kijelentkeztetést a régi protokollt eltávolításakor."</string>
@@ -197,7 +221,10 @@
   <string name="common_beta">"Béta"</string>
   <string name="common_blocked_users">"Letiltott felhasználók"</string>
   <string name="common_bubbles">"Buborékok"</string>
+  <string name="common_call_declined">"Hívás elutasítva"</string>
+  <string name="common_call_in_progress">"Hívás folyamatban"</string>
   <string name="common_call_started">"A hívás elindult"</string>
+  <string name="common_call_you_declined">"Elutasított egy hívást"</string>
   <string name="common_chat_backup">"Csevegés biztonsági mentése"</string>
   <string name="common_copied_to_clipboard">"A vágólapra másolva"</string>
   <string name="common_copyright">"Szerzői jogok"</string>
@@ -207,7 +234,6 @@
   <string name="common_current_user_left_room">"Elhagyta a szobát"</string>
   <string name="common_current_user_left_space">"Tér elhagyva"</string>
   <string name="common_current_user_rejected_invite">"Meghívás elutasítva"</string>
-  <string name="common_dark">"Sötét"</string>
   <string name="common_decryption_error">"Visszafejtési hiba"</string>
   <string name="common_description">"Leírás"</string>
   <string name="common_developer_options">"Fejlesztői beállítások"</string>
@@ -223,6 +249,7 @@
   <string name="common_empty_file">"Üres fájl"</string>
   <string name="common_encryption">"Titkosítás"</string>
   <string name="common_encryption_enabled">"Titkosítás engedélyezve"</string>
+  <string name="common_ends_at">"Vége: %1$s"</string>
   <string name="common_enter_your_pin">"Adja meg a PIN-kódját"</string>
   <string name="common_error">"Hiba"</string>
   <string name="common_error_registering_pusher_android">"Hiba történt, előfordulhat, hogy nem kap értesítést az új üzenetekről. Az értesítések hibaelhárítása a beállításokban található.
@@ -232,23 +259,27 @@ Ok: %1$s."</string>
   <string name="common_failed">"Sikertelen"</string>
   <string name="common_favourite">"Kedvenc"</string>
   <string name="common_favourited">"Kedvencnek jelölve"</string>
+  <string name="common_fetching_notifications_title_android">"Értesítések szinkronizálása…"</string>
   <string name="common_file">"Fájl"</string>
   <string name="common_file_deleted">"Fájl törölve"</string>
   <string name="common_file_saved">"A fájl mentve"</string>
   <string name="common_file_saved_on_disk_android">"A fájl a Letöltések mappába mentve"</string>
   <string name="common_forward_message">"Üzenet továbbítása"</string>
   <string name="common_frequently_used">"Gyakran használt"</string>
+  <string name="common_gallery">"Galéria"</string>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Csoportos hívás folyamatban"</string>
   <string name="common_image">"Kép"</string>
   <string name="common_in_reply_to">"Válasz erre: %1$s"</string>
   <string name="common_install_apk_android">"APK telepítése"</string>
   <string name="common_invite_unknown_profile">"Ez a Matrix-azonosító nem található, ezért előfordulhat, hogy a meghívó nem érkezik meg."</string>
   <string name="common_leaving_room">"Szoba elhagyása"</string>
   <string name="common_leaving_space">"Tér elhagyása"</string>
-  <string name="common_light">"Világos"</string>
   <string name="common_line_copied_to_clipboard">"A sor a vágólapra másolva"</string>
   <string name="common_link_copied_to_clipboard">"Hivatkozás a vágólapra másolva"</string>
   <string name="common_link_new_device">"Új eszköz összekapcsolása"</string>
+  <string name="common_live_location">"Élő helymeghatározás"</string>
+  <string name="common_live_location_ended">"Élő pozíciómegosztás befejezve"</string>
   <string name="common_loading">"Betöltés…"</string>
   <string name="common_loading_more">"Továbbiak betöltése…"</string>
   <plurals name="common_many_members">
@@ -285,6 +316,7 @@ Ok: %1$s."</string>
   <string name="common_please_wait">"Kis türelmet…"</string>
   <string name="common_poll_end_confirmation">"Biztos, hogy befejezi ezt a szavazást?"</string>
   <string name="common_poll_summary">"Szavazás: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Szavazás"</string>
   <string name="common_poll_total_votes">"Összes szavazat: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Az eredmények a szavazás befejezése után jelennek meg"</string>
   <plurals name="common_poll_votes_count">
@@ -309,7 +341,6 @@ Ok: %1$s."</string>
     <item quantity="other">"%1$d válasz"</item>
   </plurals>
   <string name="common_replying_to">"Válasz %1$s számára"</string>
-  <string name="common_report_a_bug">"Hiba jelentése"</string>
   <string name="common_report_a_problem">"Probléma jelentése"</string>
   <string name="common_report_submitted">"A jelentés elküldve"</string>
   <string name="common_rich_text_editor">"Formázott szöveges szerkesztő"</string>
@@ -344,9 +375,10 @@ Ok: %1$s."</string>
   <string name="common_settings">"Beállítások"</string>
   <string name="common_share_space">"Tér megosztása"</string>
   <string name="common_shared_history">"Az új tagok látják az előzményeket"</string>
+  <string name="common_shared_live_location">"Megosztott élő helymeghatározás"</string>
   <string name="common_shared_location">"Megosztott tartózkodási hely"</string>
   <string name="common_shared_space">"Megosztott tér"</string>
-  <string name="common_signing_out">"Kijelentkezés"</string>
+  <string name="common_signing_out">"Eszköz eltávolítása"</string>
   <string name="common_something_went_wrong">"Valamilyen hiba történt"</string>
   <string name="common_something_went_wrong_message">"Problémába ütköztünk. Próbálja újra."</string>
   <string name="common_space">"Tér"</string>
@@ -362,10 +394,10 @@ Ok: %1$s."</string>
   <string name="common_suggested">"Javaslat"</string>
   <string name="common_suggestions">"Javaslatok"</string>
   <string name="common_syncing">"Szinkronizálás"</string>
-  <string name="common_system">"Rendszer"</string>
   <string name="common_text">"Szöveg"</string>
   <string name="common_third_party_notices">"Harmadik felek nyilatkozatai"</string>
   <string name="common_thread">"Üzenetszál"</string>
+  <string name="common_threads">"Üzenetszálak"</string>
   <string name="common_topic">"Téma"</string>
   <string name="common_topic_placeholder">"Miről szól ez a szoba?"</string>
   <string name="common_unable_to_decrypt">"Nem lehet visszafejteni"</string>
@@ -378,6 +410,7 @@ Ok: %1$s."</string>
   <string name="common_unmute">"Némítás feloldása"</string>
   <string name="common_unsupported_call">"Nem támogatott hívás"</string>
   <string name="common_unsupported_event">"Nem támogatott esemény"</string>
+  <string name="common_user_started_a_call">"%1$s hívást indított"</string>
   <string name="common_username">"Felhasználónév"</string>
   <string name="common_verification_cancelled">"Az ellenőrzés megszakítva"</string>
   <string name="common_verification_complete">"Az ellenőrzés befejeződött"</string>
@@ -396,8 +429,14 @@ Ok: %1$s."</string>
   <string name="common_voice_message">"Hangüzenet"</string>
   <string name="common_waiting">"Várakozás…"</string>
   <string name="common_waiting_for_decryption_key">"Várakozás erre az üzenetre"</string>
+  <string name="common_waiting_live_location">"Várakozás az élő helymeghatározásra…"</string>
   <string name="common_world_readable_history">"Bárki láthatja az előzményeket"</string>
   <string name="common_you">"Ön"</string>
+  <string name="content_scanner_not_found">"A letöltés nem érhető el."</string>
+  <string name="content_scanner_not_found_title">"A fájl nem található"</string>
+  <string name="content_scanner_scanning">"Keresés…"</string>
+  <string name="content_scanner_unsafe_message">"Az előnézet és a letöltés le van tiltva."</string>
+  <string name="content_scanner_unsafe_title">"A fájl nem biztonságos"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) megosztotta ezt az üzenetet, mivel Ön nem volt a szobában, amikor elküldték."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s megosztotta ezt az üzenetet, mivel Ön nem volt a szobában, amikor elküldték."</string>
   <string name="crypto_history_visible">"Az elküldött üzenetek megosztásra kerülnek a szobába meghívott új tagokkal.%1$s"</string>
@@ -428,7 +467,6 @@ Biztos, hogy folytatja?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"A legnagyobb megengedett fájlméret: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Válassza ki a feltöltendő videó minőségét."</string>
   <string name="dialog_video_quality_selector_title">"Feltöltött videó minőségének kiválasztása"</string>
-  <string name="emoji_picker_search_placeholder">"Emodzsik keresése"</string>
   <string name="error_account_already_logged_in">"Már bejelentkezett erre az eszközre, mint %1$s."</string>
   <string name="error_account_creation_not_possible">"A Matrix-kiszolgálót frissíteni kell a Matrix Authentication Service és a fióklétrehozás támogatásához."</string>
   <string name="error_failed_creating_the_permalink">"Nem sikerült létrehozni az állandó hivatkozást"</string>
@@ -449,6 +487,9 @@ Biztos, hogy folytatja?"</string>
   <string name="error_unknown">"Elnézést, hiba történt"</string>
   <string name="invite_friends_rich_title">"🔐️ Csatlakozz hozzám itt: %1$s"</string>
   <string name="invite_friends_text">"Beszélgessünk itt: %1$s, %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Élő földrajzi hely megosztása"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Helymegosztás folyamatban"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"Élő hely: %1$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Az eszköz rázása a hibajelentéshez"</string>
   <string name="screen_bug_report_a11y_screenshot">"Képernyőkép"</string>
@@ -456,8 +497,15 @@ Biztos, hogy folytatja?"</string>
   <string name="screen_create_poll_options_section_title">"Lehetőségek"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Eltávolítás: %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Beállítások"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Személyenként engedélyezett szavazatok száma"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Senki sem osztja meg a tartózkodási helyét"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Élő helymegosztás"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d személy"</item>
+    <item quantity="other">"%1$d személy"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"A térképen"</string>
   <string name="screen_media_picker_error_failed_selection">"Nem sikerült kiválasztani a médiát, próbálja újra."</string>
-  <string name="screen_onboarding_welcome_back">"Üdvözöljük újra!"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Nyomjon hosszan az üzenetre, és válassza a „%1$s” lehetőséget, hogy itt szerepeljen."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Tűzze ki a fontos üzeneteket, hogy könnyen felfedezhetők legyenek"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -481,6 +529,7 @@ Biztos, hogy folytatja?"</string>
   <string name="screen_room_event_pill">"Üzenet a következőben: %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Kibontás"</string>
   <string name="screen_room_grouped_state_events_reduce">"Csökkentés"</string>
+  <string name="screen_room_live_location_banner">"Élő helymegosztás"</string>
   <string name="screen_room_permalink_same_room_android">"Már ezt a szobát nézi!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s. / %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s kitűzött üzenet"</string>
@@ -501,6 +550,10 @@ Biztos, hogy folytatja?"</string>
   <string name="screen_space_list_title">"Terek"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Megosztva %1$s"</string>
   <string name="screen_static_location_sheet_title">"A térképen"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d csatlakozott"</item>
+    <item quantity="other">"%1$d csatlakozott"</item>
+  </plurals>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Az üzenet nem lett elküldve, mert %1$s ellenőrzött digitális személyazonossága alaphelyzetbe lett állítva."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Az üzenet nem lett elküldve, mert %1$s nem ellenőrizte az összes eszközét."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Az üzenet nem lett elküldve, mert egy vagy több eszközét nem ellenőrizte."</string>
@@ -512,4 +565,6 @@ Biztos, hogy folytatja?"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Nincs hozzáférése ehhez az üzenethez"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nem sikerült visszafejteni az üzenetet"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Ez az üzenet azért lett blokkolva, mert vagy nem ellenőrizte az eszközt, vagy a feladónak ellenőriznie kell az Ön digitális személyazonosságát."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Az Ön eszköze túl régi, Android 8 vagy újabb verziójú eszközre van szükség."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"A térképek megjelenítése nem támogatott"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-in/translations.xml b/libraries/ui-strings/src/main/res/values-in/translations.xml
index 5a095a074f..5527a10802 100644
--- a/libraries/ui-strings/src/main/res/values-in/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-in/translations.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Tambahkan reaksi: %1$s"</string>
+  <string name="a11y_address">"Alamat"</string>
   <string name="a11y_avatar">"Avatar"</string>
   <string name="a11y_collapse_message_text_field">"Minimalkan bidang teks message"</string>
   <string name="a11y_delete">"Hapus"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="other">"%1$d digit dimasukkan"</item>
   </plurals>
+  <string name="a11y_duration">"Durasi: %1$s"</string>
   <string name="a11y_edit_avatar">"Sunting Avatar"</string>
   <string name="a11y_edit_room_address_hint">"Alamat lengkapnya adalah%1$s"</string>
   <string name="a11y_encryption_details">"Detail enkripsi"</string>
   <string name="a11y_expand_message_text_field">"Perluas kolom teks pesan"</string>
   <string name="a11y_hide_password">"Sembunyikan kata sandi"</string>
+  <string name="a11y_info">"Informasi"</string>
   <string name="a11y_join_call">"Bergabung dalam panggilan"</string>
   <string name="a11y_jump_to_bottom">"Lompat ke bawah"</string>
+  <string name="a11y_jump_to_unread">"Lompat ke pesan yang belum dibaca"</string>
   <string name="a11y_move_the_map_to_my_location">"Geser peta ke lokasi saya"</string>
   <string name="a11y_notifications_mentions_only">"Hanya sebutan"</string>
   <string name="a11y_notifications_muted">"Dibisukan"</string>
@@ -25,24 +29,34 @@
   <string name="a11y_pause">"Jeda"</string>
   <string name="a11y_paused_voice_message">"Pesan suara, durasi: %1$s, posisi saat ini: %2$s"</string>
   <string name="a11y_pin_field">"Kolom PIN"</string>
+  <string name="a11y_pinned_location">"Lokasi yang ditandai"</string>
   <string name="a11y_play">"Putar"</string>
+  <string name="a11y_playback_speed">"Kecepatan pemutaran"</string>
   <string name="a11y_poll">"Jajak pendapat"</string>
   <string name="a11y_poll_end">"Jajak pendapat berakhir"</string>
+  <string name="a11y_position">"Posisi: %1$s"</string>
+  <string name="a11y_qr_code">"Kode QR"</string>
   <string name="a11y_react_with">"Bereaksi dengan %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reaksi dengan emoji lain"</string>
-  <string name="a11y_read_receipts_multiple">"Dibaca oleh %1$s dan %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Pesan sebelumnya dibaca oleh %1$s dan %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="other">"Dibaca oleh %1$s dan %2$d lainnya"</item>
+    <item quantity="other">"Pesan sebelumnya telah dibaca oleh %1$s dan %2$d orang lainnya"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Dibaca oleh %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Ketuk untuk melihat semua"</string>
+  <string name="a11y_read_receipts_single">"Pesan sebelumnya dibaca oleh %1$s"</string>
   <string name="a11y_remove_reaction">"Hapus reaksi dengan %1$s"</string>
   <string name="a11y_remove_reaction_with">"Hapus reaksi dengan %1$s"</string>
   <string name="a11y_room_avatar">"Avatar ruangan"</string>
   <string name="a11y_send_files">"Kirim berkas"</string>
+  <string name="a11y_sender_location">"Lokasi pengirim"</string>
+  <string name="a11y_sent_by_sender_at_date">"Dikirim oleh %1$s pada %2$s."</string>
   <string name="a11y_session_verification_time_limited_action_required">"Tindakan terbatas waktu diperlukan, Anda memiliki satu menit untuk memverifikasi"</string>
+  <string name="a11y_settings_with_required_action">"Pengaturan, tindakan yang diperlukan"</string>
   <string name="a11y_show_password">"Tampilkan kata sandi"</string>
   <string name="a11y_start_call">"Mulai panggilan"</string>
+  <string name="a11y_start_video_call">"Mulai panggilan video"</string>
+  <string name="a11y_start_voice_call">"Mulai panggilan suara"</string>
+  <string name="a11y_thread_in_room">"Diskusi di %1$s"</string>
+  <string name="a11y_threads_in_room">"Utas di %1$s"</string>
   <string name="a11y_tombstoned_room">"Ruangan yang ditandai"</string>
   <string name="a11y_user_avatar">"Avatar pengguna"</string>
   <string name="a11y_user_menu">"Menu pengguna"</string>
@@ -54,11 +68,13 @@
   <string name="a11y_your_avatar">"Avatar Anda"</string>
   <string name="action_accept">"Terima"</string>
   <string name="action_add_caption">"Tambahkan keterangan"</string>
+  <string name="action_add_existing_rooms">"Tambahkan ruangan yang sudah ada"</string>
   <string name="action_add_to_timeline">"Tambahkan ke lini masa"</string>
   <string name="action_back">"Kembali"</string>
   <string name="action_call">"Panggil"</string>
   <string name="action_cancel">"Batal"</string>
   <string name="action_cancel_for_now">"Batalkan untuk saat ini"</string>
+  <string name="action_choose_file">"Pilih Berkas"</string>
   <string name="action_choose_photo">"Pilih foto"</string>
   <string name="action_clear">"Hapus"</string>
   <string name="action_close">"Tutup"</string>
@@ -73,25 +89,33 @@
   <string name="action_copy_text">"Salin teks"</string>
   <string name="action_create">"Buat"</string>
   <string name="action_create_room">"Buat room"</string>
+  <string name="action_create_space">"Ciptakan ruang"</string>
   <string name="action_deactivate">"Nonaktifkan"</string>
   <string name="action_deactivate_account">"Nonaktifkan akun"</string>
   <string name="action_decline">"Tolak"</string>
   <string name="action_decline_and_block">"Tolak dan blokir"</string>
+  <string name="action_delete">"Hapus"</string>
+  <string name="action_delete_account">"Hapus akun"</string>
   <string name="action_delete_poll">"Hapus jajak pendapat"</string>
+  <string name="action_deselect_all">"Batalkan semua pilihan"</string>
   <string name="action_disable">"Nonaktifkan"</string>
   <string name="action_discard">"Abaikan"</string>
   <string name="action_dismiss">"Abaikan"</string>
   <string name="action_done">"Selesai"</string>
+  <string name="action_download">"Unduh"</string>
   <string name="action_edit">"Edit"</string>
   <string name="action_edit_caption">"Edit keterangan"</string>
   <string name="action_edit_poll">"Edit jajak pendapat"</string>
   <string name="action_enable">"Aktifkan"</string>
   <string name="action_end_poll">"Akhiri jajak pendapat"</string>
   <string name="action_enter_pin">"Masukkan PIN"</string>
+  <string name="action_explore_public_spaces">"Jelajahi ruang publik"</string>
   <string name="action_finish">"Selesai"</string>
   <string name="action_forgot_password">"Lupa kata sandi?"</string>
   <string name="action_forward">"Teruskan"</string>
   <string name="action_go_back">"Kembali"</string>
+  <string name="action_go_to_roles_and_permissions">"Buka role &amp;amp; permission"</string>
+  <string name="action_go_to_settings">"Buka Pengaturan"</string>
   <string name="action_ignore">"Abaikan"</string>
   <string name="action_invite">"Undang"</string>
   <string name="action_invite_friends">"Undang orang-orang"</string>
@@ -106,8 +130,11 @@
   <string name="action_leave_space">"Tinggalkan space"</string>
   <string name="action_load_more">"Muat lainnya"</string>
   <string name="action_manage_account">"Kelola akun"</string>
+  <string name="action_manage_account_and_devices">"Kelola akun &amp;amp; perangkat"</string>
   <string name="action_manage_devices">"Kelola perangkat"</string>
+  <string name="action_manage_rooms">"Kelola ruangan"</string>
   <string name="action_message">"Kirim pesan"</string>
+  <string name="action_minimize">"Perkecil"</string>
   <string name="action_next">"Berikutnya"</string>
   <string name="action_no">"Tidak"</string>
   <string name="action_not_now">"Jangan sekarang"</string>
@@ -136,24 +163,28 @@
   <string name="action_retry_decryption">"Coba dekripsi ulang"</string>
   <string name="action_save">"Simpan"</string>
   <string name="action_search">"Cari"</string>
+  <string name="action_select_all">"Pilih semua"</string>
   <string name="action_send">"Kirim"</string>
   <string name="action_send_edited_message">"Kirim pesan tersunting"</string>
   <string name="action_send_message">"Kirim pesan"</string>
   <string name="action_send_voice_message">"Kirim pesan suara"</string>
   <string name="action_share">"Bagikan"</string>
   <string name="action_share_link">"Bagikan tautan"</string>
+  <string name="action_share_live_location">"Bagikan lokasi secara langsung"</string>
   <string name="action_show">"Tampilkan"</string>
   <string name="action_sign_in_again">"Masuk lagi"</string>
-  <string name="action_signout">"Keluar dari akun"</string>
-  <string name="action_signout_anyway">"Keluar saja"</string>
+  <string name="action_signout">"Hapus device dari akun"</string>
+  <string name="action_signout_anyway">"Hapus Perangkat ini"</string>
   <string name="action_skip">"Lewati"</string>
   <string name="action_start">"Mulai"</string>
   <string name="action_start_chat">"Mulai obrolan"</string>
   <string name="action_start_over">"Mulai dari awal"</string>
   <string name="action_start_verification">"Mulai verifikasi"</string>
   <string name="action_static_map_load">"Ketuk untuk memuat peta"</string>
+  <string name="action_stop">"Berhenti"</string>
   <string name="action_take_photo">"Ambil foto"</string>
   <string name="action_tap_for_options">"Ketuk untuk opsi"</string>
+  <string name="action_translate">"Terjemahkan"</string>
   <string name="action_try_again">"Coba lagi"</string>
   <string name="action_unpin">"Lepaskan sematan"</string>
   <string name="action_view">"Lihat"</string>
@@ -175,17 +206,21 @@
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Anda telah keluar dari sesi."</string>
   <string name="common_appearance">"Penampilan"</string>
   <string name="common_audio">"Audio"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Pengguna yang diblokir"</string>
   <string name="common_bubbles">"Gelembung"</string>
+  <string name="common_call_declined">"Panggilan ditolak"</string>
   <string name="common_call_started">"Panggilan dimulai"</string>
+  <string name="common_call_you_declined">"Anda menolak panggilan"</string>
   <string name="common_chat_backup">"Pencadangan percakapan"</string>
   <string name="common_copied_to_clipboard">"Disalin ke papan klip"</string>
   <string name="common_copyright">"Hak cipta"</string>
   <string name="common_creating_room">"Membuat ruangan…"</string>
+  <string name="common_creating_space">"Menciptakan ruang…"</string>
   <string name="common_current_user_canceled_knock">"Permintaan dibatalkan"</string>
   <string name="common_current_user_left_room">"Keluar dari ruangan"</string>
+  <string name="common_current_user_left_space">"Ruang tersisa"</string>
   <string name="common_current_user_rejected_invite">"Undangan ditolak"</string>
-  <string name="common_dark">"Gelap"</string>
   <string name="common_decryption_error">"Kesalahan dekripsi"</string>
   <string name="common_description">"Deskripsi"</string>
   <string name="common_developer_options">"Opsi pengembang"</string>
@@ -201,6 +236,7 @@
   <string name="common_empty_file">"Berkas kosong"</string>
   <string name="common_encryption">"Enkripsi"</string>
   <string name="common_encryption_enabled">"Enkripsi diaktifkan"</string>
+  <string name="common_ends_at">"Berakhir pada %1$s"</string>
   <string name="common_enter_your_pin">"Masukkan PIN Anda"</string>
   <string name="common_error">"Eror"</string>
   <string name="common_error_registering_pusher_android">"Terjadi kesalahan, Anda mungkin tidak menerima notifikasi pesan baru. Silakan memecahkan masalah notifikasi dari pengaturan.
@@ -210,6 +246,7 @@ Alasan: %1$s."</string>
   <string name="common_failed">"Gagal"</string>
   <string name="common_favourite">"Favorit"</string>
   <string name="common_favourited">"Difavoritkan"</string>
+  <string name="common_fetching_notifications_title_android">"Menyinkronkan notifikasi"</string>
   <string name="common_file">"Berkas"</string>
   <string name="common_file_deleted">"Berkas dihapus"</string>
   <string name="common_file_saved">"Berkas disimpan"</string>
@@ -222,9 +259,12 @@ Alasan: %1$s."</string>
   <string name="common_install_apk_android">"Pasang APK"</string>
   <string name="common_invite_unknown_profile">"ID Matrix ini tidak dapat ditemukan, sehingga undangan mungkin tidak diterima."</string>
   <string name="common_leaving_room">"Meninggalkan ruangan"</string>
-  <string name="common_light">"Terang"</string>
+  <string name="common_leaving_space">"Meninggalkan ruang"</string>
   <string name="common_line_copied_to_clipboard">"Baris disalin ke papan klip"</string>
   <string name="common_link_copied_to_clipboard">"Tautan disalin ke papan klip"</string>
+  <string name="common_link_new_device">"Tautkan perangkat baru"</string>
+  <string name="common_live_location">"Lokasi langsung"</string>
+  <string name="common_live_location_ended">"Lokasi langsung berakhir"</string>
   <string name="common_loading">"Memuat…"</string>
   <string name="common_loading_more">"Memuat lebih banyak…"</string>
   <plurals name="common_many_members">
@@ -235,17 +275,21 @@ Alasan: %1$s."</string>
   </plurals>
   <string name="common_message">"Pesan"</string>
   <string name="common_message_actions">"Tindakan pesan"</string>
+  <string name="common_message_failed_to_send">"Pesan Gagal Terkitim"</string>
   <string name="common_message_layout">"Tata letak pesan"</string>
   <string name="common_message_removed">"Pesan dihapus"</string>
   <string name="common_modern">"Modern"</string>
   <string name="common_mute">"Bisukan"</string>
+  <string name="common_name">"Nama"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Tidak ada hasil"</string>
   <string name="common_no_room_name">"Tidak ada nama ruangan"</string>
+  <string name="common_no_space_name">"Tidak ada nama ruang"</string>
   <string name="common_not_encrypted">"Tidak terenkripsi"</string>
   <string name="common_offline">"Luring"</string>
   <string name="common_open_source_licenses">"Lisensi sumber terbuka"</string>
   <string name="common_or">"atau"</string>
+  <string name="common_other_options">"Pilihan lain"</string>
   <string name="common_password">"Kata sandi"</string>
   <string name="common_people">"Orang"</string>
   <string name="common_permalink">"Tautan Permanen"</string>
@@ -262,8 +306,10 @@ Alasan: %1$s."</string>
   </plurals>
   <string name="common_preparing">"Menyiapkan…"</string>
   <string name="common_privacy_policy">"Kebijakan privasi"</string>
+  <string name="common_private">"Pribadi"</string>
   <string name="common_private_room">"Ruangan pribadi"</string>
   <string name="common_private_space">"Space pribadi"</string>
+  <string name="common_public">"Umum"</string>
   <string name="common_public_room">"Ruangan publik"</string>
   <string name="common_public_space">"Space publik"</string>
   <string name="common_reaction">"Reaksi"</string>
@@ -271,17 +317,21 @@ Alasan: %1$s."</string>
   <string name="common_reason">"Alasan"</string>
   <string name="common_recovery_key">"Kunci pemulihan"</string>
   <string name="common_refreshing">"Menyegarkan…"</string>
+  <string name="common_removing">"Menghapus…"</string>
   <plurals name="common_replies">
     <item quantity="other">"%1$d balasan"</item>
   </plurals>
   <string name="common_replying_to">"Membalas %1$s"</string>
-  <string name="common_report_a_bug">"Laporkan kutu"</string>
   <string name="common_report_a_problem">"Laporkan masalah"</string>
   <string name="common_report_submitted">"Laporan terkirim"</string>
   <string name="common_rich_text_editor">"Penyunting teks kaya"</string>
+  <string name="common_role">"Peran"</string>
   <string name="common_room">"Ruangan"</string>
   <string name="common_room_name">"Nama ruangan"</string>
   <string name="common_room_name_placeholder">"misalnya, nama proyek Anda"</string>
+  <plurals name="common_rooms">
+    <item quantity="other">"Ruangan %1$d"</item>
+  </plurals>
   <string name="common_saved_changes">"Perubahan disimpan"</string>
   <string name="common_saving">"Menyimpan"</string>
   <string name="common_screen_lock">"Layar kunci"</string>
@@ -290,6 +340,9 @@ Alasan: %1$s."</string>
   <string name="common_security">"Keamanan"</string>
   <string name="common_seen_by">"Dilihat oleh"</string>
   <string name="common_select_account">"Pilih akun"</string>
+  <plurals name="common_selected_count">
+    <item quantity="other">"%1$d terpilih"</item>
+  </plurals>
   <string name="common_send_to">"Kirim ke"</string>
   <string name="common_sending">"Mengirim…"</string>
   <string name="common_sending_failed">"Pengiriman gagal"</string>
@@ -299,20 +352,30 @@ Alasan: %1$s."</string>
   <string name="common_server_unreachable">"Server tidak dapat dijangkau"</string>
   <string name="common_server_url">"URL Server"</string>
   <string name="common_settings">"Pengaturan"</string>
+  <string name="common_share_space">"Berbagi ruang"</string>
+  <string name="common_shared_history">"Anggota baru dapat melihat riwayat"</string>
+  <string name="common_shared_live_location">"Lokasi langsung yang dibagikan"</string>
   <string name="common_shared_location">"Lokasi terbagi"</string>
-  <string name="common_signing_out">"Mengeluarkan dari akun"</string>
+  <string name="common_shared_space">"Ruang bersama"</string>
+  <string name="common_signing_out">"Melepaskan perangkat"</string>
   <string name="common_something_went_wrong">"Ada yang salah"</string>
   <string name="common_something_went_wrong_message">"Kami mengalami masalah. Silakan coba lagi."</string>
   <string name="common_space">"Space"</string>
+  <string name="common_space_members">"Anggota space"</string>
+  <string name="common_space_topic_placeholder">"Ruang ini tentang apa?"</string>
+  <plurals name="common_spaces">
+    <item quantity="other">"Ruang %1$d"</item>
+  </plurals>
   <string name="common_starting_chat">"Memulai obrolan…"</string>
   <string name="common_sticker">"Stiker"</string>
   <string name="common_success">"Berhasil"</string>
+  <string name="common_suggested">"Disarankan"</string>
   <string name="common_suggestions">"Saran"</string>
   <string name="common_syncing">"Menyinkronkan"</string>
-  <string name="common_system">"Sistem"</string>
   <string name="common_text">"Teks"</string>
   <string name="common_third_party_notices">"Pemberitahuan pihak ketiga"</string>
   <string name="common_thread">"Utas"</string>
+  <string name="common_threads">"Utas"</string>
   <string name="common_topic">"Topik"</string>
   <string name="common_topic_placeholder">"Apa yang dibahas di room ini?"</string>
   <string name="common_unable_to_decrypt">"Tidak dapat mendekripsi"</string>
@@ -343,13 +406,19 @@ Alasan: %1$s."</string>
   <string name="common_voice_message">"Pesan suara"</string>
   <string name="common_waiting">"Menunggu…"</string>
   <string name="common_waiting_for_decryption_key">"Menunggu pesan ini"</string>
+  <string name="common_waiting_live_location">"Menunggu lokasi real-time…"</string>
+  <string name="common_world_readable_history">"Siapa pun dapat melihat riwayat"</string>
   <string name="common_you">"Anda"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) membagikan pesan ini karena Anda tidak berada di ruangan saat pesan ini dikirim."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s membagikan pesan ini karena Anda tidak berada di ruangan saat pesan ini dikirim."</string>
+  <string name="crypto_history_visible">"Ruangan ini telah dikonfigurasi agar anggota baru dapat membaca riwayat. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"Identitas %1$s telah diatur ulang. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Identitas %2$s %1$s telah diatur ulang. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
   <string name="crypto_identity_change_profile_pin_violation">"Identitasnya %1$s sudah diatur ulang."</string>
   <string name="crypto_identity_change_verification_violation_new">"Identitas %2$s %1$s telah diatur ulang. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Tolak verifikasi"</string>
+  <string name="dialog_allow_access">"Izinkan akses"</string>
   <string name="dialog_confirm_link_message">"Tautan %1$s membawa Anda ke situs lain %2$s
 
 Apakah Anda yakin ingin melanjutkan?"</string>
@@ -370,7 +439,6 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Ukuran file maksimum yang diizinkan adalah: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Pilih kualitas video yang ingin Anda unggah."</string>
   <string name="dialog_video_quality_selector_title">"Pilih kualitas unggahan video"</string>
-  <string name="emoji_picker_search_placeholder">"Cari emoji"</string>
   <string name="error_account_already_logged_in">"Anda sudah masuk ke akun di perangkat ini sebagai%1$s ."</string>
   <string name="error_account_creation_not_possible">"Homeserver Anda perlu ditingkatkan untuk mendukung Matrix Authentication Service dan pembuatan akun."</string>
   <string name="error_failed_creating_the_permalink">"Gagal membuat tautan permanen"</string>
@@ -379,6 +447,7 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="error_failed_locating_user">"%1$s tidak dapat mengakses lokasi Anda. Silakan coba lagi nanti."</string>
   <string name="error_failed_uploading_voice_message">"Gagal mengunggah pesan suara Anda."</string>
   <string name="error_invalid_invite">"Ruangan tidak ada lagi atau undangan tidak lagi valid."</string>
+  <string name="error_location_service_disabled_android">"Silakan aktifkan GPS Anda untuk mengakses fitur berbasis lokasi."</string>
   <string name="error_message_not_found">"Pesan tidak ditemukan"</string>
   <string name="error_missing_location_auth_android">"%1$s tidak memiliki izin untuk mengakses lokasi Anda. Anda dapat mengaktifkan akses di Pengaturan."</string>
   <string name="error_missing_location_rationale_android">"%1$s tidak memiliki izin untuk mengakses lokasi Anda. Aktifkan akses di bawah ini."</string>
@@ -390,6 +459,9 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="error_unknown">"Maaf, terjadi kesalahan"</string>
   <string name="invite_friends_rich_title">"🔐️ Bergabunglah dengan saya di %1$s"</string>
   <string name="invite_friends_text">"Hai, bicaralah dengan saya di %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Pembagian lokasi langsung"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Sedang berbagi lokasi"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"Lokasi Langsung %1$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake untuk melaporkan kutu"</string>
   <string name="screen_bug_report_a11y_screenshot">"Tangkapan layar"</string>
@@ -397,6 +469,12 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="screen_create_poll_options_section_title">"Opsi"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Hapus %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Pengaturan"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Tidak ada yang membagikan lokasinya"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Berbagi lokasi secara langsung"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="other">"%1$d orang"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Di peta"</string>
   <string name="screen_media_picker_error_failed_selection">"Gagal memilih media, silakan coba lagi."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Tekan pesan dan pilih “%1$s” untuk disertakan di sini."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Sematkan pesan penting agar mudah ditemukan"</string>
@@ -420,6 +498,7 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="screen_room_event_pill">"Pesan dalam %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Buka"</string>
   <string name="screen_room_grouped_state_events_reduce">"Kurangi"</string>
+  <string name="screen_room_live_location_banner">"Berbagi lokasi secara langsung"</string>
   <string name="screen_room_permalink_same_room_android">"Sudah melihat ruangan ini!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s dari %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Pesan yang disematkan"</string>
@@ -432,9 +511,14 @@ Apakah Anda yakin ingin melanjutkan?"</string>
   <string name="screen_share_open_google_maps">"Buka di Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Buka di OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Bagikan lokasi ini"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Opsi Berbagi"</string>
   <string name="screen_space_list_description">"Space yang Anda buat atau ikuti."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Ciptakan ruang untuk menata ruangan."</string>
+  <string name="screen_space_list_parent_space">"Ruang %1$s"</string>
   <string name="screen_space_list_title">"Space"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Dibagikan %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Di peta"</string>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Pesan tidak terkirim karena identitas terverifikasi %1$s telah diatur ulang."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Pesan tidak terkirim karena %1$s belum memverifikasi semua perangkat."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Pesan tidak terkirim karena Anda belum memverifikasi satu atau beberapa perangkat Anda."</string>
diff --git a/libraries/ui-strings/src/main/res/values-it/translations.xml b/libraries/ui-strings/src/main/res/values-it/translations.xml
index 99c5db6077..3b47c41665 100644
--- a/libraries/ui-strings/src/main/res/values-it/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-it/translations.xml
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Aggiungi avatar"</string>
   <string name="a11y_add_reaction">"Aggiungi reazione: %1$s"</string>
+  <string name="a11y_address">"Indirizzo"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_clear_search_field">"Cancella campo di ricerca"</string>
   <string name="a11y_collapse_message_text_field">"Riduci al minimo il campo di testo del messaggio"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Riduci il numero di voti consentiti per persona"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Aumenta il numero di voti consentiti per persona"</string>
   <string name="a11y_delete">"Elimina"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d cifra inserita"</item>
     <item quantity="other">"%1$d cifre inserite"</item>
   </plurals>
+  <string name="a11y_duration">"Durata: %1$s"</string>
   <string name="a11y_edit_avatar">"Modifica avatar"</string>
   <string name="a11y_edit_room_address_hint">"L\'indirizzo completo sarà %1$s"</string>
   <string name="a11y_encryption_details">"Dettagli sulla crittografia"</string>
   <string name="a11y_expand_message_text_field">"Allarga il campo di testo del messaggio"</string>
   <string name="a11y_hide_password">"Nascondi password"</string>
+  <string name="a11y_info">"Info"</string>
   <string name="a11y_join_call">"Entra in chiamata"</string>
   <string name="a11y_jump_to_bottom">"Vai alla fine"</string>
+  <string name="a11y_jump_to_unread">"Vai ai messaggi non letti"</string>
   <string name="a11y_move_the_map_to_my_location">"Sposta la mappa sulla mia posizione"</string>
   <string name="a11y_notifications_mentions_only">"Solo menzioni"</string>
   <string name="a11y_notifications_muted">"Silenziato"</string>
@@ -25,29 +33,42 @@
   <string name="a11y_page_n">"Pagina %1$d"</string>
   <string name="a11y_pause">"Pausa"</string>
   <string name="a11y_paused_voice_message">"Messaggio vocale, durata: %1$s, posizione attuale: %2$s"</string>
+  <string name="a11y_photo_preview">"Anteprima foto"</string>
   <string name="a11y_pin_field">"Campo del PIN"</string>
+  <string name="a11y_pinned_location">"Posizione fissata"</string>
   <string name="a11y_play">"Riproduci"</string>
+  <string name="a11y_playback_speed">"Velocità di riproduzione"</string>
   <string name="a11y_poll">"Sondaggio"</string>
   <string name="a11y_poll_end">"Sondaggio terminato"</string>
+  <string name="a11y_position">"Posizione: %1$s"</string>
+  <string name="a11y_qr_code">"Codice QR"</string>
   <string name="a11y_react_with">"Reagisci con %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reagisci con altri emoji"</string>
-  <string name="a11y_read_receipts_multiple">"Visualizzato da %1$s e %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Messaggio precedente letto da %1$s e %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Visualizzato da %1$s e %2$d altro"</item>
-    <item quantity="other">"Visualizzato da %1$s e altri %2$d"</item>
+    <item quantity="one">"Messaggio precedente letto da %1$s e %2$d altro"</item>
+    <item quantity="other">"Messaggio precedente letto da %1$s e %2$d altri"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Visualizzato da %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tocca per mostrare tutti"</string>
+  <string name="a11y_read_receipts_single">"Messaggio precedente letto da %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"mostra tutte le conferme di lettura"</string>
   <string name="a11y_remove_reaction">"Rimuovi la reazione con %1$s"</string>
   <string name="a11y_remove_reaction_with">"Rimuovere la reazione con %1$s"</string>
   <string name="a11y_room_avatar">"Avatar della stanza"</string>
   <string name="a11y_send_files">"Invia file"</string>
+  <string name="a11y_sender_location">"Posizione del mittente"</string>
+  <string name="a11y_sent_by_sender_at_date">"Inviato da %1$s alle %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Azione richiesta a tempo limitato, hai un minuto per la verifica"</string>
+  <string name="a11y_settings_with_required_action">"Impostazioni, azione richiesta"</string>
   <string name="a11y_show_password">"Mostra password"</string>
   <string name="a11y_start_call">"Avvia una chiamata"</string>
+  <string name="a11y_start_video_call">"Avvia una videochiamata"</string>
+  <string name="a11y_start_voice_call">"Avvia una chiamata vocale"</string>
+  <string name="a11y_thread_in_room">"Discussione in %1$s"</string>
+  <string name="a11y_threads_in_room">"Discussioni in %1$s"</string>
   <string name="a11y_tombstoned_room">"Stanza obsoleta"</string>
   <string name="a11y_user_avatar">"Avatar utente"</string>
   <string name="a11y_user_menu">"Menu utente"</string>
+  <string name="a11y_video_preview">"Anteprima video"</string>
   <string name="a11y_view_avatar">"Visualizza avatar"</string>
   <string name="a11y_view_details">"Visualizza dettagli"</string>
   <string name="a11y_voice_message">"Messaggio vocale, durata: %1$s"</string>
@@ -56,11 +77,13 @@
   <string name="a11y_your_avatar">"Il tuo avatar"</string>
   <string name="action_accept">"Accetta"</string>
   <string name="action_add_caption">"Aggiungi didascalia"</string>
+  <string name="action_add_existing_rooms">"Aggiungi stanze esistenti"</string>
   <string name="action_add_to_timeline">"Aggiungi alla conversazione"</string>
   <string name="action_back">"Indietro"</string>
   <string name="action_call">"Chiama"</string>
   <string name="action_cancel">"Annulla"</string>
   <string name="action_cancel_for_now">"Annulla per ora"</string>
+  <string name="action_choose_file">"Scegli il file"</string>
   <string name="action_choose_photo">"Scegli foto"</string>
   <string name="action_clear">"Cancella"</string>
   <string name="action_close">"Chiudi"</string>
@@ -75,22 +98,28 @@
   <string name="action_copy_text">"Copia testo"</string>
   <string name="action_create">"Crea"</string>
   <string name="action_create_room">"Crea stanza"</string>
+  <string name="action_create_space">"Crea spazio"</string>
   <string name="action_deactivate">"Disattiva"</string>
   <string name="action_deactivate_account">"Disattiva account"</string>
   <string name="action_decline">"Rifiuta"</string>
   <string name="action_decline_and_block">"Rifiuta e blocca"</string>
+  <string name="action_delete">"Elimina"</string>
+  <string name="action_delete_account">"Elimina account"</string>
+  <string name="action_delete_file">"Elimina file"</string>
   <string name="action_delete_poll">"Elimina sondaggio"</string>
   <string name="action_deselect_all">"Deseleziona tutti"</string>
   <string name="action_disable">"Disabilita"</string>
   <string name="action_discard">"Annulla"</string>
   <string name="action_dismiss">"Chiudi"</string>
   <string name="action_done">"Fine"</string>
+  <string name="action_download">"Scarica"</string>
   <string name="action_edit">"Modifica"</string>
   <string name="action_edit_caption">"Modifica didascalia"</string>
   <string name="action_edit_poll">"Modifica sondaggio"</string>
   <string name="action_enable">"Attiva"</string>
   <string name="action_end_poll">"Termina sondaggio"</string>
   <string name="action_enter_pin">"Inserisci PIN"</string>
+  <string name="action_explore_public_spaces">"Esplora gli spazi pubblici"</string>
   <string name="action_finish">"Fine"</string>
   <string name="action_forgot_password">"Password dimenticata?"</string>
   <string name="action_forward">"Inoltra"</string>
@@ -111,6 +140,7 @@
   <string name="action_leave_space">"Esci dallo spazio"</string>
   <string name="action_load_more">"Carica altro"</string>
   <string name="action_manage_account">"Gestisci account"</string>
+  <string name="action_manage_account_and_devices">"Gestisci account &amp; dispositivi"</string>
   <string name="action_manage_devices">"Gestisci dispositivi"</string>
   <string name="action_manage_rooms">"Gestisci le stanze"</string>
   <string name="action_message">"Invia messaggio"</string>
@@ -150,23 +180,28 @@
   <string name="action_send_voice_message">"Invia messaggio vocale"</string>
   <string name="action_share">"Condividi"</string>
   <string name="action_share_link">"Condividi collegamento"</string>
+  <string name="action_share_live_location">"Condividi la posizione in tempo reale"</string>
   <string name="action_show">"Mostra"</string>
   <string name="action_sign_in_again">"Accedi di nuovo"</string>
-  <string name="action_signout">"Disconnetti"</string>
-  <string name="action_signout_anyway">"Disconnetti comunque"</string>
+  <string name="action_signout">"Rimuovi questo dispositivo"</string>
+  <string name="action_signout_anyway">"Rimuovi comunque questo dispositivo"</string>
   <string name="action_skip">"Salta"</string>
   <string name="action_start">"Inizia"</string>
   <string name="action_start_chat">"Avvia conversazione"</string>
   <string name="action_start_over">"Ricomincia"</string>
   <string name="action_start_verification">"Avvia la verifica"</string>
   <string name="action_static_map_load">"Tocca per caricare la mappa"</string>
+  <string name="action_stop">"Ferma"</string>
   <string name="action_take_photo">"Scatta foto"</string>
   <string name="action_tap_for_options">"Tocca per le opzioni"</string>
+  <string name="action_translate">"Traduci"</string>
   <string name="action_try_again">"Riprova"</string>
   <string name="action_unpin">"Rimuovi dai fissati"</string>
+  <string name="action_video_call">"Videochiamata"</string>
   <string name="action_view">"Visualizza"</string>
   <string name="action_view_in_timeline">"Visualizza nella conversazione"</string>
   <string name="action_view_source">"Vedi codice sorgente"</string>
+  <string name="action_voice_call">"Chiamata vocale"</string>
   <string name="action_yes">"Sì"</string>
   <string name="action_yes_try_again">"Sì, riprova"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Il tuo server ora supporta un nuovo protocollo più veloce. Esci e rientra per effettuare l\'aggiornamento. Se lo fai ora, eviterai una disconnessione forzata quando il vecchio protocollo verrà rimosso in seguito."</string>
@@ -186,16 +221,19 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Utenti bloccati"</string>
   <string name="common_bubbles">"Fumetti"</string>
+  <string name="common_call_declined">"Chiamata rifiutata"</string>
+  <string name="common_call_in_progress">"Chiamata in corso"</string>
   <string name="common_call_started">"Chiamata avviata"</string>
+  <string name="common_call_you_declined">"Hai rifiutato una chiamata"</string>
   <string name="common_chat_backup">"Backup della chat"</string>
   <string name="common_copied_to_clipboard">"Copiato negli appunti"</string>
   <string name="common_copyright">"Copyright"</string>
   <string name="common_creating_room">"Creazione stanza…"</string>
+  <string name="common_creating_space">"Creazione spazio…"</string>
   <string name="common_current_user_canceled_knock">"Richiesta annullata"</string>
   <string name="common_current_user_left_room">"Hai lasciato la stanza"</string>
   <string name="common_current_user_left_space">"Hai lasciato lo spazio"</string>
   <string name="common_current_user_rejected_invite">"Invito rifiutato"</string>
-  <string name="common_dark">"Scuro"</string>
   <string name="common_decryption_error">"Errore di decrittazione"</string>
   <string name="common_description">"Descrizione"</string>
   <string name="common_developer_options">"Opzioni sviluppatore"</string>
@@ -211,6 +249,7 @@
   <string name="common_empty_file">"File vuoto"</string>
   <string name="common_encryption">"Crittografia"</string>
   <string name="common_encryption_enabled">"Crittografia abilitata"</string>
+  <string name="common_ends_at">"Termina alle %1$s"</string>
   <string name="common_enter_your_pin">"Inserisci il PIN"</string>
   <string name="common_error">"Errore"</string>
   <string name="common_error_registering_pusher_android">"Si è verificato un errore, potresti non ricevere notifiche per nuovi messaggi. Risolvi i problemi relativi alle notifiche dalle impostazioni.
@@ -220,22 +259,27 @@ Motivo:. %1$s"</string>
   <string name="common_failed">"Fallito"</string>
   <string name="common_favourite">"Preferiti"</string>
   <string name="common_favourited">"Preferita"</string>
+  <string name="common_fetching_notifications_title_android">"Sincronizzazione delle notifiche…"</string>
   <string name="common_file">"File"</string>
   <string name="common_file_deleted">"File eliminato"</string>
   <string name="common_file_saved">"File salvato"</string>
   <string name="common_file_saved_on_disk_android">"File salvato"</string>
   <string name="common_forward_message">"Inoltra messaggio"</string>
   <string name="common_frequently_used">"Usati di frequente"</string>
+  <string name="common_gallery">"Galleria"</string>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Chiamata di gruppo in corso"</string>
   <string name="common_image">"Immagine"</string>
   <string name="common_in_reply_to">"In risposta a %1$s"</string>
   <string name="common_install_apk_android">"Installa APK"</string>
   <string name="common_invite_unknown_profile">"Questo ID Matrix non può essere trovato, quindi l\'invito potrebbe non essere ricevuto."</string>
   <string name="common_leaving_room">"Lascio la stanza"</string>
   <string name="common_leaving_space">"Uscendo dallo spazio"</string>
-  <string name="common_light">"Chiaro"</string>
   <string name="common_line_copied_to_clipboard">"Riga copiata negli appunti"</string>
   <string name="common_link_copied_to_clipboard">"Collegamento copiato negli appunti"</string>
+  <string name="common_link_new_device">"Collega un nuovo dispositivo"</string>
+  <string name="common_live_location">"Posizione in tempo reale"</string>
+  <string name="common_live_location_ended">"Posizione in tempo reale terminata"</string>
   <string name="common_loading">"Caricamento…"</string>
   <string name="common_loading_more">"Caricamento in corso…"</string>
   <plurals name="common_many_members">
@@ -248,10 +292,12 @@ Motivo:. %1$s"</string>
   </plurals>
   <string name="common_message">"Messaggio"</string>
   <string name="common_message_actions">"Azioni messaggio"</string>
+  <string name="common_message_failed_to_send">"Impossibile inviare il messaggio"</string>
   <string name="common_message_layout">"Impaginazione del messaggio"</string>
   <string name="common_message_removed">"Messaggio rimosso"</string>
   <string name="common_modern">"Moderno"</string>
   <string name="common_mute">"Silenzia"</string>
+  <string name="common_name">"Nome"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Nessun risultato"</string>
   <string name="common_no_room_name">"Nessun nome della stanza"</string>
@@ -260,6 +306,7 @@ Motivo:. %1$s"</string>
   <string name="common_offline">"Non in linea"</string>
   <string name="common_open_source_licenses">"Licenze open source"</string>
   <string name="common_or">"o"</string>
+  <string name="common_other_options">"Altre opzioni"</string>
   <string name="common_password">"Password"</string>
   <string name="common_people">"Persone"</string>
   <string name="common_permalink">"Collegamento permanente"</string>
@@ -269,6 +316,7 @@ Motivo:. %1$s"</string>
   <string name="common_please_wait">"Attendere prego…"</string>
   <string name="common_poll_end_confirmation">"Vuoi davvero terminare questo sondaggio?"</string>
   <string name="common_poll_summary">"Sondaggio: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Sondaggio"</string>
   <string name="common_poll_total_votes">"Voti totali: %1$s"</string>
   <string name="common_poll_undisclosed_text">"I risultati verranno mostrati al termine del sondaggio"</string>
   <plurals name="common_poll_votes_count">
@@ -277,8 +325,10 @@ Motivo:. %1$s"</string>
   </plurals>
   <string name="common_preparing">"Preparazione…"</string>
   <string name="common_privacy_policy">"Informativa sulla privacy"</string>
+  <string name="common_private">"Privato"</string>
   <string name="common_private_room">"Stanza privata"</string>
   <string name="common_private_space">"Spazio privato"</string>
+  <string name="common_public">"Pubblico"</string>
   <string name="common_public_room">"Stanza pubblica"</string>
   <string name="common_public_space">"Spazio pubblico"</string>
   <string name="common_reaction">"Reazione"</string>
@@ -286,15 +336,16 @@ Motivo:. %1$s"</string>
   <string name="common_reason">"Motivo"</string>
   <string name="common_recovery_key">"Chiave di recupero"</string>
   <string name="common_refreshing">"Aggiornamento…"</string>
+  <string name="common_removing">"Rimozione…"</string>
   <plurals name="common_replies">
     <item quantity="one">"%1$d risposta"</item>
     <item quantity="other">"%1$d risposte"</item>
   </plurals>
   <string name="common_replying_to">"Risposta a %1$s"</string>
-  <string name="common_report_a_bug">"Segnala un problema"</string>
   <string name="common_report_a_problem">"Segnala un problema"</string>
   <string name="common_report_submitted">"Segnalazione inviata"</string>
   <string name="common_rich_text_editor">"Editor di testo avanzato"</string>
+  <string name="common_role">"Ruolo"</string>
   <string name="common_room">"Stanza"</string>
   <string name="common_room_name">"Nome stanza"</string>
   <string name="common_room_name_placeholder">"ad es. il nome del tuo progetto"</string>
@@ -310,6 +361,10 @@ Motivo:. %1$s"</string>
   <string name="common_security">"Sicurezza"</string>
   <string name="common_seen_by">"Visto da"</string>
   <string name="common_select_account">"Seleziona un account"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d selezionato"</item>
+    <item quantity="other">"%1$d selezionati"</item>
+  </plurals>
   <string name="common_send_to">"Invia a"</string>
   <string name="common_sending">"Invio in corso…"</string>
   <string name="common_sending_failed">"Invio fallito"</string>
@@ -320,12 +375,16 @@ Motivo:. %1$s"</string>
   <string name="common_server_url">"URL del server"</string>
   <string name="common_settings">"Impostazioni"</string>
   <string name="common_share_space">"Condividi lo spazio"</string>
+  <string name="common_shared_history">"I nuovi membri vedono la cronologia"</string>
+  <string name="common_shared_live_location">"Posizione in tempo reale condivisa"</string>
   <string name="common_shared_location">"Posizione condivisa"</string>
   <string name="common_shared_space">"Spazio condiviso"</string>
-  <string name="common_signing_out">"Disconnessione"</string>
+  <string name="common_signing_out">"Rimozione del dispositivo"</string>
   <string name="common_something_went_wrong">"Qualcosa è andato storto"</string>
   <string name="common_something_went_wrong_message">"Abbiamo riscontrato un problema. Per favore riprova."</string>
   <string name="common_space">"Spazio"</string>
+  <string name="common_space_members">"Membri dello spazio"</string>
+  <string name="common_space_topic_placeholder">"Di cosa tratta questo spazio?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Spazio"</item>
     <item quantity="other">"%1$d Spazi"</item>
@@ -333,24 +392,26 @@ Motivo:. %1$s"</string>
   <string name="common_starting_chat">"Avvio della conversazione…"</string>
   <string name="common_sticker">"Adesivo"</string>
   <string name="common_success">"Operazione riuscita"</string>
+  <string name="common_suggested">"Suggeriti"</string>
   <string name="common_suggestions">"Suggerimenti"</string>
   <string name="common_syncing">"Sincronizzazione"</string>
-  <string name="common_system">"Sistema"</string>
   <string name="common_text">"Testo"</string>
   <string name="common_third_party_notices">"Comunicazioni di terze parti"</string>
   <string name="common_thread">"Discussione"</string>
+  <string name="common_threads">"Discussioni"</string>
   <string name="common_topic">"Argomento"</string>
-  <string name="common_topic_placeholder">"Di cosa parla questa stanza?"</string>
+  <string name="common_topic_placeholder">"Di cosa riguarda questa stanza?"</string>
   <string name="common_unable_to_decrypt">"Impossibile decrittografare"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Inviato da un dispositivo non sicuro"</string>
   <string name="common_unable_to_decrypt_no_access">"Non hai accesso a questo messaggio"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"L\'identità verificata del mittente è stata reimpostata"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"L\'identità digitale verificata del mittente è stata reimpostata"</string>
   <string name="common_unable_to_invite_message">"Non è stato possibile spedire inviti a uno o più utenti."</string>
   <string name="common_unable_to_invite_title">"Impossibile inviare inviti"</string>
   <string name="common_unlock">"Sblocca"</string>
   <string name="common_unmute">"Annulla silenzioso"</string>
   <string name="common_unsupported_call">"Chiamata non supportata"</string>
   <string name="common_unsupported_event">"Evento non supportato"</string>
+  <string name="common_user_started_a_call">"%1$s ha avviato una chiamata"</string>
   <string name="common_username">"Nome utente"</string>
   <string name="common_verification_cancelled">"Verifica annullata"</string>
   <string name="common_verification_complete">"Verifica completata"</string>
@@ -369,13 +430,23 @@ Motivo:. %1$s"</string>
   <string name="common_voice_message">"Messaggio vocale"</string>
   <string name="common_waiting">"In attesa…"</string>
   <string name="common_waiting_for_decryption_key">"In attesa del messaggio"</string>
+  <string name="common_waiting_live_location">"In attesa della posizione in tempo reale…"</string>
+  <string name="common_world_readable_history">"Chiunque può vedere la cronologia"</string>
   <string name="common_you">"Tu"</string>
-  <string name="crypto_identity_change_pin_violation">"L\'identità di %1$s è stata reimpostata. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"L\'identità %2$s di %1$s sembra essere cambiata. %3$s"</string>
+  <string name="content_scanner_not_found">"Download non disponibile."</string>
+  <string name="content_scanner_not_found_title">"File non trovato"</string>
+  <string name="content_scanner_unsafe_message">"L\'anteprima e il download sono stati disabilitati."</string>
+  <string name="content_scanner_unsafe_title">"Il file non è sicuro"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) ha condiviso questo messaggio poiché non eri nella stanza quando è stato inviato."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s ha condiviso questo messaggio poiché non eri nella stanza quando è stato inviato."</string>
+  <string name="crypto_history_visible">"Questa stanza è stata configurata in modo che i nuovi membri possano leggere la cronologia. %1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$sL\'identità digitale di %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$sL\'identità digitale di %2$s è stata reimpostata. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"L\'identità di %1$s è stata reimpostata."</string>
-  <string name="crypto_identity_change_verification_violation_new">"L\'identità %2$s di %1$s è stata reimpostata. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"L\'identità digitale di %1$s è stata reimpostata."</string>
+  <string name="crypto_identity_change_verification_violation_new">"L\'identità digitale %2$s di %1$s è stata reimpostata. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Ritira verifica"</string>
+  <string name="dialog_allow_access">"Consenti l\'accesso"</string>
   <string name="dialog_confirm_link_message">"Il link %1$s ti porta ad un altro sito %2$s
 
 Sei sicuro di voler continuare?"</string>
@@ -396,7 +467,6 @@ Sei sicuro di voler continuare?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"La dimensione massima consentita per il file è: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Seleziona la qualità del video che vuoi caricare."</string>
   <string name="dialog_video_quality_selector_title">"Seleziona la qualità di caricamento del video"</string>
-  <string name="emoji_picker_search_placeholder">"Cerca emoji"</string>
   <string name="error_account_already_logged_in">"Hai già effettuato l\'accesso su questo dispositivo come %1$s ."</string>
   <string name="error_account_creation_not_possible">"Il tuo homeserver deve essere aggiornato per supportare il Matrix Authentication Service e la creazione di account."</string>
   <string name="error_failed_creating_the_permalink">"Impossibile creare il collegamento permanente"</string>
@@ -405,6 +475,7 @@ Sei sicuro di voler continuare?"</string>
   <string name="error_failed_locating_user">"%1$s non è riuscito ad accedere alla tua posizione. Riprova più tardi."</string>
   <string name="error_failed_uploading_voice_message">"Invio del messaggio vocale fallito."</string>
   <string name="error_invalid_invite">"La stanza non esiste più o l\'invito non è più valido."</string>
+  <string name="error_location_service_disabled_android">"Attiva il GPS per accedere alle funzioni basate sulla posizione."</string>
   <string name="error_message_not_found">"Messaggio non trovato"</string>
   <string name="error_missing_location_auth_android">"%1$s non ha l\'autorizzazione di accedere alla tua posizione. Puoi attivare l\'accesso nelle impostazioni."</string>
   <string name="error_missing_location_rationale_android">"%1$s non ha l\'autorizzazione per accedere alla tua posizione. Attiva l\'accesso di seguito."</string>
@@ -416,6 +487,9 @@ Sei sicuro di voler continuare?"</string>
   <string name="error_unknown">"Siamo spiacenti, si è verificato un errore"</string>
   <string name="invite_friends_rich_title">"🔐️ Unisciti a me su %1$s"</string>
   <string name="invite_friends_text">"Ehi, parliamo su %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Condivisione posizione in tempo reale"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Condivisione della posizione in corso"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Posizione in tempo reale"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Scuoti per segnalare un problema"</string>
   <string name="screen_bug_report_a11y_screenshot">"Istantanea schermo"</string>
@@ -423,6 +497,14 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_create_poll_options_section_title">"Risposte"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Rimuovi %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Impostazioni"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Voti consentiti per persona"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nessuno sta condividendo la propria posizione"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Condivisione posizione in tempo reale"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d persona"</item>
+    <item quantity="other">"%1$d persone"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Sulla mappa"</string>
   <string name="screen_media_picker_error_failed_selection">"Selezione del file multimediale fallita, riprova."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Premi su un messaggio e scegli “%1$s” per includerlo qui."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fissa i messaggi importanti così che possano essere trovati facilmente"</string>
@@ -431,11 +513,11 @@ Sei sicuro di voler continuare?"</string>
     <item quantity="other">"%1$d Messaggi fissati"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Messaggi fissati"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Stai per accedere al tuo account di %1$s per ripristinare la tua identità. Dopodiché verrai riportato all\'app."</string>
-  <string name="screen_reset_identity_confirmation_title">"Non riesci a confermare? Vai al tuo account per ripristinare la tua identità."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Stai per accedere al tuo account %1$s per reimpostare la tua identità digitale. Al termine, verrai reindirizzato all\'app."</string>
+  <string name="screen_reset_identity_confirmation_title">"Non riesci a confermare? Vai al tuo account per reimpostare la tua identità digitale."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Ritira la verifica e invia"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Puoi ritirare la tua verifica e inviare comunque questo messaggio, oppure annullarlo per ora e riprovare più tardi dopo aver riverificato %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Il tuo messaggio non è stato inviato perché l\'identità verificata di %1$s è stata reimpostata."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Il tuo messaggio non è stato inviato perché l\'identità digitale verificata di %1$sè stata reimpostata"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Invia comunque il messaggio"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s sta usando uno o più dispositivi non verificati. Puoi inviare il messaggio in ogni caso, oppure annullarlo e riprovare più tardi quando %2$s avrà verificato tutti i suoi dispositivi."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Il tuo messaggio non è stato inviato perché %1$s non ha verificato tutti i dispositivi."</string>
@@ -447,6 +529,7 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_room_event_pill">"Messaggio in %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Espandi"</string>
   <string name="screen_room_grouped_state_events_reduce">"Riduci"</string>
+  <string name="screen_room_live_location_banner">"Condivisione posizione in tempo reale"</string>
   <string name="screen_room_permalink_same_room_android">"Stai già visualizzando questa stanza!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s di %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Messaggi fissati"</string>
@@ -458,12 +541,16 @@ Sei sicuro di voler continuare?"</string>
   <string name="screen_share_open_apple_maps">"Apri in Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Apri in Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Apri in OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Condividi questa posizione"</string>
+  <string name="screen_share_this_location_action">"Condividi la posizione selezionata"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Opzioni di condivisione"</string>
   <string name="screen_space_list_description">"Spazi che hai creato o a cui hai aderito."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Crea spazi per organizzare le stanze"</string>
   <string name="screen_space_list_parent_space">"%1$s spazio"</string>
   <string name="screen_space_list_title">"Spazi"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Messaggio non inviato perché l\'identità verificata di %1$s è stata reimpostata."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Condivisa %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Sulla mappa"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Il messaggio non è stato inviato perché l\'identità digitale verificata di %1$sè stata reimpostata."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Messaggio non inviato perché %1$s non ha verificato tutti i dispositivi."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Messaggio non inviato perché non hai verificato uno o più dispositivi."</string>
   <string name="screen_view_location_title">"Posizione"</string>
@@ -473,5 +560,7 @@ Sei sicuro di voler continuare?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"È necessario verificare questo dispositivo per accedere alla cronologia messaggi"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Non hai accesso a questo messaggio"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Impossibile decifrare il messaggio"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Questo messaggio è stato bloccato perché il dispositivo non è verificato o perché il mittente deve verificare la tua identità."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Questo messaggio è stato bloccato perché non hai verificato il tuo dispositivo o perché il mittente deve verificare la tua identità digitale."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Il tuo dispositivo è troppo vecchio, è necessario un dispositivo con Android 8 o versioni successive."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Il rendering delle mappe non è supportato"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-ja/translations.xml b/libraries/ui-strings/src/main/res/values-ja/translations.xml
new file mode 100644
index 0000000000..7f54e420b8
--- /dev/null
+++ b/libraries/ui-strings/src/main/res/values-ja/translations.xml
@@ -0,0 +1,549 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"アバターを追加"</string>
+  <string name="a11y_add_reaction">"リアクションを追加: %1$s"</string>
+  <string name="a11y_address">"アドレス"</string>
+  <string name="a11y_avatar">"アバター"</string>
+  <string name="a11y_collapse_message_text_field">"入力欄を縮小"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"一人あたりの投票権を減らす"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"一人あたりの投票権を増やす"</string>
+  <string name="a11y_delete">"削除"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="other">"%1$d 桁入力済"</item>
+  </plurals>
+  <string name="a11y_duration">"長さ: %1$s"</string>
+  <string name="a11y_edit_avatar">"アバターを編集"</string>
+  <string name="a11y_edit_room_address_hint">"完全なアドレスは %1$s になります。"</string>
+  <string name="a11y_encryption_details">"暗号化の詳細"</string>
+  <string name="a11y_expand_message_text_field">"入力欄を拡大"</string>
+  <string name="a11y_hide_password">"パスワードを非表示"</string>
+  <string name="a11y_info">"情報"</string>
+  <string name="a11y_join_call">"通話に参加"</string>
+  <string name="a11y_jump_to_bottom">"一番下へ"</string>
+  <string name="a11y_jump_to_unread">"未読に移動"</string>
+  <string name="a11y_move_the_map_to_my_location">"現在地に移動"</string>
+  <string name="a11y_notifications_mentions_only">"メンションのみ"</string>
+  <string name="a11y_notifications_muted">"ミュート有効"</string>
+  <string name="a11y_notifications_new_mentions">"新規メンション"</string>
+  <string name="a11y_notifications_new_messages">"新着メッセージ"</string>
+  <string name="a11y_notifications_ongoing_call">"通話中"</string>
+  <string name="a11y_other_user_avatar">"他のユーザーのアバター"</string>
+  <string name="a11y_page_n">"%1$d ページ"</string>
+  <string name="a11y_pause">"一時停止"</string>
+  <string name="a11y_paused_voice_message">"音声メッセージ 長さ: %1$s 再生位置: %2$s"</string>
+  <string name="a11y_photo_preview">"画像のプレビュー"</string>
+  <string name="a11y_pin_field">"PIN入力欄"</string>
+  <string name="a11y_pinned_location">"ピン留めした位置情報"</string>
+  <string name="a11y_play">"再生"</string>
+  <string name="a11y_playback_speed">"再生速度"</string>
+  <string name="a11y_poll">"投票"</string>
+  <string name="a11y_poll_end">"投票終了"</string>
+  <string name="a11y_position">"位置: %1$s"</string>
+  <string name="a11y_qr_code">"QRコード"</string>
+  <string name="a11y_react_with">"リアクション: %1$s"</string>
+  <string name="a11y_react_with_other_emojis">"他の絵文字でリアクション"</string>
+  <string name="a11y_read_receipts_multiple">"既読: %1$s, %2$s"</string>
+  <plurals name="a11y_read_receipts_multiple_with_others">
+    <item quantity="other">"既読: %1$s ほか %2$d 人"</item>
+  </plurals>
+  <string name="a11y_read_receipts_single">"%1$s 既読"</string>
+  <string name="a11y_remove_reaction">"%1$s リアクションを削除"</string>
+  <string name="a11y_remove_reaction_with">"%1$s リアクションを削除"</string>
+  <string name="a11y_room_avatar">"ルームのアバター"</string>
+  <string name="a11y_send_files">"ファイルを送信"</string>
+  <string name="a11y_sender_location">"送信者の位置情報"</string>
+  <string name="a11y_sent_by_sender_at_date">"%2$s に %1$s が送信"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"1分以内に検証を完了してください"</string>
+  <string name="a11y_settings_with_required_action">"処置が必要な設定"</string>
+  <string name="a11y_show_password">"パスワードを表示"</string>
+  <string name="a11y_start_call">"通話を開始"</string>
+  <string name="a11y_start_video_call">"ビデオ通話を開始"</string>
+  <string name="a11y_start_voice_call">"音声通話を開始"</string>
+  <string name="a11y_thread_in_room">"%1$s のスレッド"</string>
+  <string name="a11y_threads_in_room">"%1$s のスレッド"</string>
+  <string name="a11y_tombstoned_room">"埋没したルーム"</string>
+  <string name="a11y_user_avatar">"ユーザーのアバター"</string>
+  <string name="a11y_user_menu">"ユーザーメニュー"</string>
+  <string name="a11y_video_preview">"動画のプレビュー"</string>
+  <string name="a11y_view_avatar">"アバターを表示"</string>
+  <string name="a11y_view_details">"詳細を表示"</string>
+  <string name="a11y_voice_message">"音声メッセージ 長さ: %1$s"</string>
+  <string name="a11y_voice_message_record">"音声メッセージを録音してください。"</string>
+  <string name="a11y_voice_message_stop_recording">"録音を停止"</string>
+  <string name="a11y_your_avatar">"あなたのアバター"</string>
+  <string name="action_accept">"承諾"</string>
+  <string name="action_add_caption">"キャプションを追加"</string>
+  <string name="action_add_existing_rooms">"既存のルームを追加"</string>
+  <string name="action_add_to_timeline">"タイムラインに追加"</string>
+  <string name="action_back">"戻る"</string>
+  <string name="action_call">"通話"</string>
+  <string name="action_cancel">"キャンセル"</string>
+  <string name="action_cancel_for_now">"今回のみキャンセル"</string>
+  <string name="action_choose_file">"ファイルを選択"</string>
+  <string name="action_choose_photo">"写真を選択"</string>
+  <string name="action_clear">"クリア"</string>
+  <string name="action_close">"閉じる"</string>
+  <string name="action_complete_verification">"検証してください"</string>
+  <string name="action_confirm">"確認"</string>
+  <string name="action_confirm_password">"パスワードを確認"</string>
+  <string name="action_continue">"続行"</string>
+  <string name="action_copy">"コピー"</string>
+  <string name="action_copy_caption">"キャプションをコピー"</string>
+  <string name="action_copy_link">"リンクをコピー"</string>
+  <string name="action_copy_link_to_message">"リンクをメッセージにコピー"</string>
+  <string name="action_copy_text">"テキストをコピー"</string>
+  <string name="action_create">"作成"</string>
+  <string name="action_create_room">"ルームを作成"</string>
+  <string name="action_create_space">"スペースを作成"</string>
+  <string name="action_deactivate">"停止"</string>
+  <string name="action_deactivate_account">"アカウントを無効化"</string>
+  <string name="action_decline">"拒否"</string>
+  <string name="action_decline_and_block">"拒否してブロック"</string>
+  <string name="action_delete">"削除"</string>
+  <string name="action_delete_account">"アカウントを削除"</string>
+  <string name="action_delete_file">"ファイルを削除"</string>
+  <string name="action_delete_poll">"投票を削除"</string>
+  <string name="action_deselect_all">"全ての選択を解除"</string>
+  <string name="action_disable">"無効化"</string>
+  <string name="action_discard">"破棄"</string>
+  <string name="action_dismiss">"無視"</string>
+  <string name="action_done">"完了"</string>
+  <string name="action_download">"ダウンロード"</string>
+  <string name="action_edit">"編集"</string>
+  <string name="action_edit_caption">"キャプションを編集"</string>
+  <string name="action_edit_poll">"投票を編集"</string>
+  <string name="action_enable">"有効化"</string>
+  <string name="action_end_poll">"投票を終了"</string>
+  <string name="action_enter_pin">"PINを入力"</string>
+  <string name="action_explore_public_spaces">"公開スペースを探す"</string>
+  <string name="action_finish">"完了"</string>
+  <string name="action_forgot_password">"パスワードをお忘れですか？"</string>
+  <string name="action_forward">"転送"</string>
+  <string name="action_go_back">"戻る"</string>
+  <string name="action_go_to_roles_and_permissions">"役割と権限に移動"</string>
+  <string name="action_go_to_settings">"設定に移動"</string>
+  <string name="action_ignore">"無視"</string>
+  <string name="action_invite">"招待"</string>
+  <string name="action_invite_friends">"ユーザーを招待"</string>
+  <string name="action_invite_friends_to_app">"%1$s にユーザーを招待"</string>
+  <string name="action_invite_people_to_app">"%1$s にユーザーを招待"</string>
+  <string name="action_invites_list">"招待"</string>
+  <string name="action_join">"参加"</string>
+  <string name="action_learn_more">"詳細"</string>
+  <string name="action_leave">"退出"</string>
+  <string name="action_leave_conversation">"会話を退出"</string>
+  <string name="action_leave_room">"ルームを退出"</string>
+  <string name="action_leave_space">"スペースを退出"</string>
+  <string name="action_load_more">"さらに表示"</string>
+  <string name="action_manage_account">"アカウントを管理"</string>
+  <string name="action_manage_account_and_devices">"アカウントと端末を管理"</string>
+  <string name="action_manage_devices">"端末を管理"</string>
+  <string name="action_manage_rooms">"ルームを管理"</string>
+  <string name="action_message">"メッセージ"</string>
+  <string name="action_minimize">"最小化"</string>
+  <string name="action_next">"次へ"</string>
+  <string name="action_no">"いいえ"</string>
+  <string name="action_not_now">"後で"</string>
+  <string name="action_ok">"OK"</string>
+  <string name="action_open_context_menu">"コンテキストメニューを開く"</string>
+  <string name="action_open_settings">"設定"</string>
+  <string name="action_open_with">"他のアプリで開く"</string>
+  <string name="action_pin">"ピン留め"</string>
+  <string name="action_quick_reply">"クイック返信"</string>
+  <string name="action_quote">"引用"</string>
+  <string name="action_react">"リアクション"</string>
+  <string name="action_reject">"拒否"</string>
+  <string name="action_remove">"削除"</string>
+  <string name="action_remove_caption">"キャプションを削除"</string>
+  <string name="action_remove_message">"メッセージを削除"</string>
+  <string name="action_reply">"返信"</string>
+  <string name="action_reply_in_thread">"スレッドで返信"</string>
+  <string name="action_report">"報告"</string>
+  <string name="action_report_bug">"バグを報告"</string>
+  <string name="action_report_content">"コンテンツを報告"</string>
+  <string name="action_report_dm">"会話を通報"</string>
+  <string name="action_report_room">"ルームを通報"</string>
+  <string name="action_reset">"リセット"</string>
+  <string name="action_reset_identity">"IDをリセット"</string>
+  <string name="action_retry">"再試行"</string>
+  <string name="action_retry_decryption">"復号化を再試行"</string>
+  <string name="action_save">"保存"</string>
+  <string name="action_search">"検索"</string>
+  <string name="action_select_all">"すべて選択"</string>
+  <string name="action_send">"送信"</string>
+  <string name="action_send_edited_message">"編集したメッセージを送信"</string>
+  <string name="action_send_message">"メッセージを送信"</string>
+  <string name="action_send_voice_message">"音声メッセージを送信"</string>
+  <string name="action_share">"共有"</string>
+  <string name="action_share_link">"リンクを共有"</string>
+  <string name="action_share_live_location">"ライブ位置情報を共有"</string>
+  <string name="action_show">"表示"</string>
+  <string name="action_sign_in_again">"再度サインイン"</string>
+  <string name="action_signout">"この端末を削除"</string>
+  <string name="action_signout_anyway">"強制的に削除"</string>
+  <string name="action_skip">"スキップ"</string>
+  <string name="action_start">"開始"</string>
+  <string name="action_start_chat">"チャットを開始"</string>
+  <string name="action_start_over">"やり直す"</string>
+  <string name="action_start_verification">"検証を開始"</string>
+  <string name="action_static_map_load">"タップして地図を読み込む"</string>
+  <string name="action_stop">"停止"</string>
+  <string name="action_take_photo">"写真を撮影"</string>
+  <string name="action_tap_for_options">"タップしてオプションを表示"</string>
+  <string name="action_translate">"翻訳"</string>
+  <string name="action_try_again">"もう一度やり直してください"</string>
+  <string name="action_unpin">"ピン留めを解除"</string>
+  <string name="action_video_call">"ビデオ通話"</string>
+  <string name="action_view">"表示"</string>
+  <string name="action_view_in_timeline">"タイムラインで表示"</string>
+  <string name="action_view_source">"ソースコードを表示"</string>
+  <string name="action_voice_call">"音声通話"</string>
+  <string name="action_yes">"はい"</string>
+  <string name="action_yes_try_again">"再試行する"</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"使用しているサーバーがより高速な新しいプロトコルに対応しました。将来、古いプロトコルへの対応が打ち切られ、強制的にログアウトされる可能性があるため、今すぐにログアウトし、再度ログインし直すことを推奨します。"</string>
+  <string name="banner_migrate_to_native_sliding_sync_title">"アップグレードがあります"</string>
+  <string name="common_about">"アプリケーションについて"</string>
+  <string name="common_acceptable_use_policy">"利用規定"</string>
+  <string name="common_add_account">"アカウントを追加"</string>
+  <string name="common_add_another_account">"別のアカウントを追加"</string>
+  <string name="common_adding_caption">"キャプションを追加"</string>
+  <string name="common_advanced_settings">"高度な設定"</string>
+  <string name="common_an_image">"画像"</string>
+  <string name="common_analytics">"分析"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"あなたがルームを退出"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"セッションからログアウトされました"</string>
+  <string name="common_appearance">"テーマ"</string>
+  <string name="common_audio">"音声"</string>
+  <string name="common_beta">"ベータ版"</string>
+  <string name="common_blocked_users">"ブロックしたユーザー"</string>
+  <string name="common_bubbles">"ふきだし"</string>
+  <string name="common_call_declined">"通話を拒否しました"</string>
+  <string name="common_call_in_progress">"通話が進行中"</string>
+  <string name="common_call_started">"通話を開始しました"</string>
+  <string name="common_call_you_declined">"通話を拒否しました"</string>
+  <string name="common_chat_backup">"チャットをバックアップ"</string>
+  <string name="common_copied_to_clipboard">"クリップボードにコピーしました"</string>
+  <string name="common_copyright">"著作権"</string>
+  <string name="common_creating_room">"ルームを作成中…"</string>
+  <string name="common_creating_space">"スペースを作成中…"</string>
+  <string name="common_current_user_canceled_knock">"リクエストはキャンセルされました"</string>
+  <string name="common_current_user_left_room">"ルームを退出しました"</string>
+  <string name="common_current_user_left_space">"スペースから退出しました"</string>
+  <string name="common_current_user_rejected_invite">"招待は却下されました"</string>
+  <string name="common_decryption_error">"復号化エラー"</string>
+  <string name="common_description">"詳細"</string>
+  <string name="common_developer_options">"開発者向けオプション"</string>
+  <string name="common_device_id">"端末ID"</string>
+  <string name="common_direct_chat">"ダイレクトチャット"</string>
+  <string name="common_do_not_show_this_again">"次回からは表示しない"</string>
+  <string name="common_download_failed">"ダウンロードに失敗しました"</string>
+  <string name="common_downloading">"ダウンロード中"</string>
+  <string name="common_edited_suffix">"(編集済み)"</string>
+  <string name="common_editing">"編集中"</string>
+  <string name="common_editing_caption">"キャプションを編集"</string>
+  <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"空のファイル"</string>
+  <string name="common_encryption">"暗号化"</string>
+  <string name="common_encryption_enabled">"暗号化が有効です"</string>
+  <string name="common_ends_at">"%1$s に終了"</string>
+  <string name="common_enter_your_pin">"PINを入力してください"</string>
+  <string name="common_error">"エラー"</string>
+  <string name="common_error_registering_pusher_android">"問題が発生しました。新着のメッセージの通知を受け取れない可能性があります。設定から通知のトラブルシューティングを行ってください。
+
+理由: %1$s"</string>
+  <string name="common_everyone">"全員"</string>
+  <string name="common_failed">"失敗"</string>
+  <string name="common_favourite">"お気に入り"</string>
+  <string name="common_favourited">"お気に入り"</string>
+  <string name="common_fetching_notifications_title_android">"通知を同期中…"</string>
+  <string name="common_file">"ファイル"</string>
+  <string name="common_file_deleted">"ファイルを削除しました"</string>
+  <string name="common_file_saved">"ファイルを保存しました"</string>
+  <string name="common_file_saved_on_disk_android">"ファイルはダウンロードに保存されました"</string>
+  <string name="common_forward_message">"メッセージを転送"</string>
+  <string name="common_frequently_used">"頻繁に使用"</string>
+  <string name="common_gallery">"ギャラリー"</string>
+  <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"グループ通話が進行中"</string>
+  <string name="common_image">"画像"</string>
+  <string name="common_in_reply_to">"%1$s に返信"</string>
+  <string name="common_install_apk_android">"APK をインストール"</string>
+  <string name="common_invite_unknown_profile">"このMatrix IDは見つからないため、招待が届かない可能性があります。"</string>
+  <string name="common_leaving_room">"ルームを退出しています"</string>
+  <string name="common_leaving_space">"スペースを退出しています"</string>
+  <string name="common_line_copied_to_clipboard">"行をクリップボードにコピーしました"</string>
+  <string name="common_link_copied_to_clipboard">"リンクをクリップボードにコピーしました"</string>
+  <string name="common_link_new_device">"新しい端末から接続"</string>
+  <string name="common_live_location">"ライブ位置情報"</string>
+  <string name="common_live_location_ended">"ライブ位置情報が終了しました"</string>
+  <string name="common_loading">"読み込み中…"</string>
+  <string name="common_loading_more">"読み込み中…"</string>
+  <plurals name="common_many_members">
+    <item quantity="other">"他 %d 人"</item>
+  </plurals>
+  <plurals name="common_member_count">
+    <item quantity="other">"%1$d 人のメンバー"</item>
+  </plurals>
+  <string name="common_message">"メッセージ"</string>
+  <string name="common_message_actions">"メッセージアクション"</string>
+  <string name="common_message_failed_to_send">"メッセージの送信に失敗"</string>
+  <string name="common_message_layout">"メッセージのレイアウト"</string>
+  <string name="common_message_removed">"メッセージが削除されました"</string>
+  <string name="common_modern">"モダン"</string>
+  <string name="common_mute">"ミュート"</string>
+  <string name="common_name">"名前"</string>
+  <string name="common_name_and_id">"%1$s (%2$s)"</string>
+  <string name="common_no_results">"結果なし"</string>
+  <string name="common_no_room_name">"ルーム名なし"</string>
+  <string name="common_no_space_name">"スペース名なし"</string>
+  <string name="common_not_encrypted">"暗号化されていません"</string>
+  <string name="common_offline">"オフライン"</string>
+  <string name="common_open_source_licenses">"オープンソースライセンス"</string>
+  <string name="common_or">"または"</string>
+  <string name="common_other_options">"他のオプション"</string>
+  <string name="common_password">"パスワード"</string>
+  <string name="common_people">"ユーザー"</string>
+  <string name="common_permalink">"固定リンク"</string>
+  <string name="common_permission">"権限"</string>
+  <string name="common_pinned">"ピン留め"</string>
+  <string name="common_please_check_internet_connection">"インターネット接続を確認してください"</string>
+  <string name="common_please_wait">"お待ちください…"</string>
+  <string name="common_poll_end_confirmation">"本当に投票を終了しますか？"</string>
+  <string name="common_poll_summary">"投票: %1$s"</string>
+  <string name="common_poll_summary_prefix">"投票"</string>
+  <string name="common_poll_total_votes">"総投票数:%1$s"</string>
+  <string name="common_poll_undisclosed_text">"結果は投票終了後に表示されます"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="other">"%d 票"</item>
+  </plurals>
+  <string name="common_preparing">"準備中…"</string>
+  <string name="common_privacy_policy">"プライバシーポリシー"</string>
+  <string name="common_private">"非公開"</string>
+  <string name="common_private_room">"非公開ルーム"</string>
+  <string name="common_private_space">"非公開スペース"</string>
+  <string name="common_public">"公開"</string>
+  <string name="common_public_room">"公開ルーム"</string>
+  <string name="common_public_space">"公開スペース"</string>
+  <string name="common_reaction">"リアクション"</string>
+  <string name="common_reactions">"リアクション"</string>
+  <string name="common_reason">"理由"</string>
+  <string name="common_recovery_key">"回復鍵"</string>
+  <string name="common_refreshing">"更新中…"</string>
+  <string name="common_removing">"削除しています…"</string>
+  <plurals name="common_replies">
+    <item quantity="other">"%1$d 件の返信"</item>
+  </plurals>
+  <string name="common_replying_to">"%1$s に返信"</string>
+  <string name="common_report_a_problem">"問題を報告"</string>
+  <string name="common_report_submitted">"報告は送信されました"</string>
+  <string name="common_rich_text_editor">"リッチテキストエディター"</string>
+  <string name="common_role">"役割"</string>
+  <string name="common_room">"ルーム"</string>
+  <string name="common_room_name">"ルーム名"</string>
+  <string name="common_room_name_placeholder">"例: プロジェクトの名称"</string>
+  <plurals name="common_rooms">
+    <item quantity="other">"%1$d 個のルーム"</item>
+  </plurals>
+  <string name="common_saved_changes">"保存された変更"</string>
+  <string name="common_saving">"保存中…"</string>
+  <string name="common_screen_lock">"画面ロック"</string>
+  <string name="common_search_for_someone">"ユーザーを検索"</string>
+  <string name="common_search_results">"検索結果"</string>
+  <string name="common_security">"セキュリティ"</string>
+  <string name="common_seen_by">"既読"</string>
+  <string name="common_select_account">"アカウントを選択"</string>
+  <plurals name="common_selected_count">
+    <item quantity="other">"%1$d 個を選択"</item>
+  </plurals>
+  <string name="common_send_to">"送る:"</string>
+  <string name="common_sending">"送信中…"</string>
+  <string name="common_sending_failed">"送信失敗"</string>
+  <string name="common_sent">"送信済"</string>
+  <string name="common_sentence_delimiter">"。"</string>
+  <string name="common_server_not_supported">"このサーバーには対応していません"</string>
+  <string name="common_server_unreachable">"サーバーに接続できません"</string>
+  <string name="common_server_url">"サーバー URL"</string>
+  <string name="common_settings">"設定"</string>
+  <string name="common_share_space">"スペースを共有"</string>
+  <string name="common_shared_history">"新しいメンバーは履歴を閲覧できます"</string>
+  <string name="common_shared_live_location">"共有したライブ位置情報"</string>
+  <string name="common_shared_location">"共有された位置情報"</string>
+  <string name="common_shared_space">"共有されたスペース"</string>
+  <string name="common_signing_out">"端末を削除中"</string>
+  <string name="common_something_went_wrong">"問題が発生しました"</string>
+  <string name="common_something_went_wrong_message">"問題が発生しました。再度お試しください。"</string>
+  <string name="common_space">"スペース"</string>
+  <string name="common_space_members">"スペースのメンバー"</string>
+  <string name="common_space_topic_placeholder">"このスペースは何についてのものですか?"</string>
+  <plurals name="common_spaces">
+    <item quantity="other">"%1$d 個のスペース"</item>
+  </plurals>
+  <string name="common_starting_chat">"チャットを開始しています…"</string>
+  <string name="common_sticker">"ステッカー"</string>
+  <string name="common_success">"成功"</string>
+  <string name="common_suggested">"推奨される"</string>
+  <string name="common_suggestions">"提案"</string>
+  <string name="common_syncing">"同期中"</string>
+  <string name="common_text">"テキスト"</string>
+  <string name="common_third_party_notices">"第三者に関する通知"</string>
+  <string name="common_thread">"スレッド"</string>
+  <string name="common_threads">"スレッド"</string>
+  <string name="common_topic">"トピック"</string>
+  <string name="common_topic_placeholder">"何についてのルームですか？"</string>
+  <string name="common_unable_to_decrypt">"復号化できません"</string>
+  <string name="common_unable_to_decrypt_insecure_device">"安全でないデバイスから送信されました"</string>
+  <string name="common_unable_to_decrypt_no_access">"このメッセージにアクセスできません"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"送信者の検証済みのデジタルIDがリセットされました"</string>
+  <string name="common_unable_to_invite_message">"1人以上のユーザーに招待を送信できませんでした。"</string>
+  <string name="common_unable_to_invite_title">"招待を送信できません"</string>
+  <string name="common_unlock">"ロック解除"</string>
+  <string name="common_unmute">"ミュート解除"</string>
+  <string name="common_unsupported_call">"非対応の通話"</string>
+  <string name="common_unsupported_event">"非対応のイベント"</string>
+  <string name="common_user_started_a_call">"%1$s が通話を開始"</string>
+  <string name="common_username">"ユーザー名"</string>
+  <string name="common_verification_cancelled">"検証がキャンセルされました"</string>
+  <string name="common_verification_complete">"検証完了"</string>
+  <string name="common_verification_failed">"検証に失敗しました"</string>
+  <string name="common_verified">"検証済み"</string>
+  <string name="common_verify_device">"端末を検証"</string>
+  <string name="common_verify_identity">"IDを検証"</string>
+  <string name="common_verify_user">"ユーザーの検証"</string>
+  <string name="common_video">"動画"</string>
+  <string name="common_video_quality_high">"高画質"</string>
+  <string name="common_video_quality_high_description">"高画質・ファイルサイズ大"</string>
+  <string name="common_video_quality_low">"低画質"</string>
+  <string name="common_video_quality_low_description">"最速アップロード・ファイルサイズ小"</string>
+  <string name="common_video_quality_standard">"標準画質"</string>
+  <string name="common_video_quality_standard_description">"中程度の画質とアップロード速度"</string>
+  <string name="common_voice_message">"音声メッセージ"</string>
+  <string name="common_waiting">"待機中…"</string>
+  <string name="common_waiting_for_decryption_key">"メッセージを待機中"</string>
+  <string name="common_waiting_live_location">"ライブ位置情報を待機中…"</string>
+  <string name="common_world_readable_history">"誰でも履歴を閲覧できます"</string>
+  <string name="common_you">"あなた"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"あなたが参加する以前に送信されたメッセージを、%1$s (%2$s) が共有しました。"</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"あなたが参加する以前に送信されたメッセージを、%1$s が共有しました。"</string>
+  <string name="crypto_history_visible">"このルームは新しいメンバーが過去の内容を確認できるように設定されています。%1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$s のデジタルIDはリセットされました。%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$s の %2$s のデジタルIDはリセットされました。%3$s"</string>
+  <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s のデジタルIDはリセットされました。"</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s %2$s のデジタルIDはリセットされました。%3$s"</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"検証のリクエストを却下"</string>
+  <string name="dialog_allow_access">"アクセスを許可"</string>
+  <string name="dialog_confirm_link_message">"リンク %1$s が別サイト %2$s に遷移しようとしています。
+
+続行しますか？"</string>
+  <string name="dialog_confirm_link_title">"リンクを再度確認してください"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"アップロードする動画のデフォルト画質を選択してください。"</string>
+  <string name="dialog_default_video_quality_selector_title">"動画のアップロード品質"</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"アップロードできる最大サイズは %1$s です。"</string>
+  <string name="dialog_file_too_large_to_upload_title">"アップロードの許容サイズを超えています。"</string>
+  <string name="dialog_room_reported">"ルームを通報しました"</string>
+  <string name="dialog_room_reported_and_left">"ルームを通報し退出"</string>
+  <string name="dialog_title_confirmation">"確認"</string>
+  <string name="dialog_title_error">"エラー"</string>
+  <string name="dialog_title_success">"成功"</string>
+  <string name="dialog_title_warning">"警告"</string>
+  <string name="dialog_unsaved_changes_description">"未保存の変更内容があります。"</string>
+  <string name="dialog_unsaved_changes_description_android">"変更は保存されていません。本当に戻りますか？"</string>
+  <string name="dialog_unsaved_changes_title">"変更を保存しますか？"</string>
+  <string name="dialog_video_quality_selector_subtitle_file_size">"アップロードできる最大サイズは %1$s です。"</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"アップロードする画質を選択してください。"</string>
+  <string name="dialog_video_quality_selector_title">"動画のアップロード品質を選択"</string>
+  <string name="error_account_already_logged_in">"この端末では既に %1$s としてログインしています。"</string>
+  <string name="error_account_creation_not_possible">"Matrix Authentication Service とアカウント作成に対応するため、このホームサーバーはアップグレードが必要です。"</string>
+  <string name="error_failed_creating_the_permalink">"固定リンクの作成に失敗しました"</string>
+  <string name="error_failed_loading_map">"%1$s で地図を読み込めません。時間を置いて再度お試しください。"</string>
+  <string name="error_failed_loading_messages">"メッセージの読み込みに失敗しました"</string>
+  <string name="error_failed_locating_user">"%1$s は現在地にアクセスできませんでした。時間を置いて再度お試しください。"</string>
+  <string name="error_failed_uploading_voice_message">"音声メッセージの送信に失敗しました。"</string>
+  <string name="error_invalid_invite">"このルームは存在しないか、招待が無効です。"</string>
+  <string name="error_location_service_disabled_android">"位置情報に基づく機能を使用するには、GPSを有効化してください。"</string>
+  <string name="error_message_not_found">"メッセージが見つかりません"</string>
+  <string name="error_missing_location_auth_android">"現在地を取得する権限が %1$s にありません。設定で権限を追加できます。"</string>
+  <string name="error_missing_location_rationale_android">"現在地を取得する権限が %1$s にありません。以下から許可してください。"</string>
+  <string name="error_missing_microphone_voice_rationale_android">"%1$s には、マイクの使用が許可されていません。音声メッセージのために、マイクの使用を許可してください。"</string>
+  <string name="error_network_or_server_issue">"ネットワークまたはサーバーの問題である可能性があります。"</string>
+  <string name="error_room_address_already_exists">"このルームアドレスは既に存在しています。ルームの名称を変更するか、アドレスを編集してください。"</string>
+  <string name="error_room_address_invalid_symbols">"一部の文字は使用できません。使用できるのは、英字、数字と記号 ! $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _ です。"</string>
+  <string name="error_some_messages_have_not_been_sent">"送信されていないメッセージがあります。"</string>
+  <string name="error_unknown">"申し訳ありません。エラーが発生しました。"</string>
+  <string name="invite_friends_rich_title">"🔐️ %1$s に参加してください"</string>
+  <string name="invite_friends_text">"%1$s で話しましょう: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"ライブ位置情報共有"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"位置情報を共有しています"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s ライブ位置情報"</string>
+  <string name="login_initial_device_name_android">"%1$s Android"</string>
+  <string name="preference_rageshake">"開発者にバグを報告するには端末を振ってください。"</string>
+  <string name="screen_bug_report_a11y_screenshot">"スクリーンショット"</string>
+  <string name="screen_create_poll_option_accessibility_label">"%1$s: %2$s"</string>
+  <string name="screen_create_poll_options_section_title">"選択肢"</string>
+  <string name="screen_create_poll_remove_accessibility_label">"%1$s を削除"</string>
+  <string name="screen_create_poll_settings_section_title">"設定"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"一人あたりの投票数"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"誰も位置情報を共有していません"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"ライブ位置情報を共有しています"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="other">"%1$d 人"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"地図上"</string>
+  <string name="screen_media_picker_error_failed_selection">"ファイルの選択に失敗しました。再試行してください。"</string>
+  <string name="screen_pinned_timeline_empty_state_description">"メッセージを長押しし \"%1$s\" を選択してください"</string>
+  <string name="screen_pinned_timeline_empty_state_headline">"重要なメッセージをピン留めして容易に見つけられるようにします"</string>
+  <plurals name="screen_pinned_timeline_screen_title">
+    <item quantity="other">"%1$d 個のピン留めされたメッセージ"</item>
+  </plurals>
+  <string name="screen_pinned_timeline_screen_title_empty">"ピン留めされたメッセージ"</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"デジタルIDをリセットするため %1$s のアカウントの設定に移動します。完了後、アプリに遷移します。"</string>
+  <string name="screen_reset_identity_confirmation_title">"認証できませんか？アカウントに移動してデジタルIDをリセットできます。"</string>
+  <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"検証の要求を取り下げて送信"</string>
+  <string name="screen_resolve_send_failure_changed_identity_subtitle">"検証の要求を取り下げてメッセージの送信を続行するか、送信をキャンセルして %1$s の検証が完了した後に再試行することができます。"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"%1$s の検証済みのデジタルIDがリセットされたため、メッセージは送信されませんでした。"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"メッセージを強制送信"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s は未検証の端末を使用しています。メッセージを強制的に送信するか、%2$s がすべての端末を検証した後に送信を再試行することができます。"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"%1$s に未検証の端末が存在するため、メッセージは送信されませんでした。"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"検証の完了していない端末があります。メッセージを強制的に送信するか、すべての端末を検証した後に送信を再試行することができます。"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_title">"未検証の端末が存在するため、メッセージは送信されませんでした。"</string>
+  <string name="screen_room_change_role_administrators_or_owners_title">"管理者または所有者を編集"</string>
+  <string name="screen_room_error_failed_processing_media">"ファイルの処理に失敗しました。再試行してください。"</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"ユーザーの詳細を取得できませんでした"</string>
+  <string name="screen_room_event_pill">"%1$s のメッセージ"</string>
+  <string name="screen_room_grouped_state_events_expand">"展開"</string>
+  <string name="screen_room_grouped_state_events_reduce">"縮小"</string>
+  <string name="screen_room_live_location_banner">"ライブ位置情報を共有中"</string>
+  <string name="screen_room_permalink_same_room_android">"すでにこのルームを表示しています"</string>
+  <string name="screen_room_pinned_banner_indicator">"%2$s 個のうち %1$s"</string>
+  <string name="screen_room_pinned_banner_indicator_description">"%1$s 個のピン留めされたメッセージ"</string>
+  <string name="screen_room_pinned_banner_loading_description">"メッセージを読み込み中…"</string>
+  <string name="screen_room_pinned_banner_view_all_button_title">"すべて表示"</string>
+  <string name="screen_room_title">"チャット"</string>
+  <string name="screen_share_location_title">"場所を共有"</string>
+  <string name="screen_share_my_location_action">"現在地を共有する"</string>
+  <string name="screen_share_open_apple_maps">"Apple Maps で開く"</string>
+  <string name="screen_share_open_google_maps">"Google Maps で開く"</string>
+  <string name="screen_share_open_osm_maps">"OpenStreetMapで開く"</string>
+  <string name="screen_share_this_location_action">"この位置情報を共有する"</string>
+  <string name="screen_sharing_location_option_sheet_title">"共有設定"</string>
+  <string name="screen_space_list_description">"作成または参加したスペースです。"</string>
+  <string name="screen_space_list_details">"%1$s・%2$s"</string>
+  <string name="screen_space_list_empty_state_title">"スペースを作成してルームを整頓しましょう"</string>
+  <string name="screen_space_list_parent_space">"%1$s スペース"</string>
+  <string name="screen_space_list_title">"スペース"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"%1$s 共有"</string>
+  <string name="screen_static_location_sheet_title">"地図上"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"%1$s の検証済みのデジタルIDがリセットされたため、メッセージは送信されませんでした。"</string>
+  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"%1$s に未検証の端末が存在するため、メッセージは送信されませんでした。"</string>
+  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"未検証の端末が存在するため、メッセージは送信されませんでした。"</string>
+  <string name="screen_view_location_title">"位置情報"</string>
+  <string name="settings_version_number">"バージョン: %1$s (%2$s)"</string>
+  <string name="test_language_identifier">"ja"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"この端末で過去のメッセージを表示できません"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"過去のメッセージを表示するには、この端末を検証する必要があります"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"このメッセージにアクセスできません"</string>
+  <string name="timeline_decryption_failure_unable_to_decrypt">"メッセージの復号化に失敗"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"この端末を検証していないか、送信者があなたのデジタルIDを検証していないため、このメッセージはブロックされました。"</string>
+  <string name="vulkan_not_supported_dialog_content_android">"使用している端末が古すぎます。Android 8以上が必要です。"</string>
+  <string name="vulkan_not_supported_dialog_title_android">"地図のレンダリングに対応していません"</string>
+</resources>
diff --git a/libraries/ui-strings/src/main/res/values-ka/translations.xml b/libraries/ui-strings/src/main/res/values-ka/translations.xml
index b7a8819391..fff6af16fd 100644
--- a/libraries/ui-strings/src/main/res/values-ka/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ka/translations.xml
@@ -23,7 +23,6 @@
     <item quantity="other">"წაკითხულია %1$s და %2$d-ს ადამიანის მიერ"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"წაიკითხეს: %s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"შეეხეთ ყველაფრის საჩვენებლად"</string>
   <string name="a11y_remove_reaction">"%1$s რეაქციის წაშლა"</string>
   <string name="a11y_send_files">"ფაილების გაგზავნა"</string>
   <string name="a11y_show_password">"პაროლის ჩვენება"</string>
@@ -122,7 +121,6 @@
   <string name="common_copyright">"საავტორო უფლება"</string>
   <string name="common_creating_room">"ოთახის შექმნა…"</string>
   <string name="common_current_user_left_room">"დატოვა ოთახი"</string>
-  <string name="common_dark">"მუქი"</string>
   <string name="common_decryption_error">"გაშიფვრის შეცდომა"</string>
   <string name="common_developer_options">"დეველოპერის პარამეტრები"</string>
   <string name="common_direct_chat">"პირდაპირი ჩატი"</string>
@@ -145,7 +143,6 @@
   <string name="common_install_apk_android">"დააინსტალირეთ APK"</string>
   <string name="common_invite_unknown_profile">"ეს Matrix ID ვერ მოიძებნა, ამიტომ მოწვევა შეიძლება არ იყოს მიღებული."</string>
   <string name="common_leaving_room">"ოთახის დატოვება"</string>
-  <string name="common_light">"ღია"</string>
   <string name="common_link_copied_to_clipboard">"ბმული კოპირებულია გაცვლის ბუფერში"</string>
   <string name="common_loading">"იტვირთება…"</string>
   <plurals name="common_many_members">
@@ -186,7 +183,6 @@
   </string>
   <string name="common_refreshing">"განახლება…"</string>
   <string name="common_replying_to">"პასუხი %1$s-ს"</string>
-  <string name="common_report_a_bug">"ხარვეზის შეტყობინება"</string>
   <string name="common_report_a_problem">"შეტყობინება პრობლემაზე"</string>
   <string name="common_report_submitted">"რეპორტი გაგზავნილია"</string>
   <string name="common_rich_text_editor">"მდიდარი ტექსტის რედაქტორი"</string>
@@ -213,7 +209,6 @@
   <string name="common_success">"წარმატება"</string>
   <string name="common_suggestions">"შეთავაზებები"</string>
   <string name="common_syncing">"სინქრონიზაცია"</string>
-  <string name="common_system">"სისტემა"</string>
   <string name="common_text">"ტექსტი"</string>
   <string name="common_third_party_notices">"მესამე პირის შენიშვნები"</string>
   <string name="common_thread">"თემა"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ko/translations.xml b/libraries/ui-strings/src/main/res/values-ko/translations.xml
index a9d560b852..e97fe17ca5 100644
--- a/libraries/ui-strings/src/main/res/values-ko/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ko/translations.xml
@@ -8,13 +8,16 @@
   <plurals name="a11y_digits_entered">
     <item quantity="other">"%1$d자리 입력됨"</item>
   </plurals>
+  <string name="a11y_duration">"소요 시간: %1$s"</string>
   <string name="a11y_edit_avatar">"아바타 편집"</string>
   <string name="a11y_edit_room_address_hint">"전체 주소는 다음과 같습니다 %1$s"</string>
   <string name="a11y_encryption_details">"암호화 세부 정보"</string>
   <string name="a11y_expand_message_text_field">"메시지 텍스트 필드 확장"</string>
   <string name="a11y_hide_password">"비밀번호 숨기기"</string>
+  <string name="a11y_info">"정보"</string>
   <string name="a11y_join_call">"통화 참가"</string>
   <string name="a11y_jump_to_bottom">"맨 아래로 이동"</string>
+  <string name="a11y_jump_to_unread">"읽지 않은 항목으로 이동"</string>
   <string name="a11y_move_the_map_to_my_location">"지도를 내 위치로 이동"</string>
   <string name="a11y_notifications_mentions_only">"멘션만"</string>
   <string name="a11y_notifications_muted">"음소거함"</string>
@@ -26,10 +29,12 @@
   <string name="a11y_pause">"일시중지"</string>
   <string name="a11y_paused_voice_message">"음성 메시지, 지속 시간: %1$s, 현재 위치: %2$s"</string>
   <string name="a11y_pin_field">"PIN 필드"</string>
+  <string name="a11y_pinned_location">"고정된 위치"</string>
   <string name="a11y_play">"재생"</string>
   <string name="a11y_playback_speed">"재생 속도"</string>
   <string name="a11y_poll">"투표"</string>
   <string name="a11y_poll_end">"종료된 투표"</string>
+  <string name="a11y_position">"위치: %1$s"</string>
   <string name="a11y_qr_code">"QR 코드"</string>
   <string name="a11y_react_with">"%1$s에 반응하세요"</string>
   <string name="a11y_react_with_other_emojis">"다른 이모지로 반응하세요"</string>
@@ -38,14 +43,20 @@
     <item quantity="other">"읽은 사람 %1$s 그리고 %2$d 다른 사람들"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"%1$s 님이 읽음"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"모두 표시하려면 탭하세요"</string>
   <string name="a11y_remove_reaction">"반응 제거: %1$s"</string>
   <string name="a11y_remove_reaction_with">"%1$s 반응을 제거하세요"</string>
   <string name="a11y_room_avatar">"방 아바타"</string>
   <string name="a11y_send_files">"파일 보내기"</string>
+  <string name="a11y_sender_location">"발신자 위치"</string>
+  <string name="a11y_sent_by_sender_at_date">"%1$s님이 %2$s에 보냈습니다."</string>
   <string name="a11y_session_verification_time_limited_action_required">"제한 시간 내 인증이 필요합니다.1분 안에 확인해 주세요."</string>
+  <string name="a11y_settings_with_required_action">"설정,조치 필요"</string>
   <string name="a11y_show_password">"비밀번호 표시"</string>
   <string name="a11y_start_call">"통화 시작"</string>
+  <string name="a11y_start_video_call">"영상 통화 시작"</string>
+  <string name="a11y_start_voice_call">"음성 통화 시작"</string>
+  <string name="a11y_thread_in_room">"%1$s 내 스레드"</string>
+  <string name="a11y_threads_in_room">"%1$s 내 스레드 목록"</string>
   <string name="a11y_tombstoned_room">"묘비 방"</string>
   <string name="a11y_user_avatar">"사용자 아바타"</string>
   <string name="a11y_user_menu">"사용자 메뉴"</string>
@@ -63,6 +74,7 @@
   <string name="action_call">"통화"</string>
   <string name="action_cancel">"취소"</string>
   <string name="action_cancel_for_now">"현재 취소"</string>
+  <string name="action_choose_file">"파일 선택"</string>
   <string name="action_choose_photo">"사진 선택"</string>
   <string name="action_clear">"지우기"</string>
   <string name="action_close">"닫기"</string>
@@ -82,12 +94,16 @@
   <string name="action_deactivate_account">"계정 비활성화"</string>
   <string name="action_decline">"거절"</string>
   <string name="action_decline_and_block">"거부 및 차단"</string>
+  <string name="action_delete">"삭제"</string>
+  <string name="action_delete_account">"계정 삭제"</string>
+  <string name="action_delete_file">"파일 삭제"</string>
   <string name="action_delete_poll">"투표 삭제"</string>
   <string name="action_deselect_all">"전체 선택 해제"</string>
   <string name="action_disable">"비활성화"</string>
   <string name="action_discard">"취소"</string>
   <string name="action_dismiss">"닫기"</string>
   <string name="action_done">"완료"</string>
+  <string name="action_download">"다운로드"</string>
   <string name="action_edit">"편집"</string>
   <string name="action_edit_caption">"캡션 편집"</string>
   <string name="action_edit_poll">"투표 수정"</string>
@@ -115,6 +131,7 @@
   <string name="action_leave_space">"스페이스 떠나기"</string>
   <string name="action_load_more">"더 불러오기"</string>
   <string name="action_manage_account">"계정 관리"</string>
+  <string name="action_manage_account_and_devices">"계정 및 기기 관리"</string>
   <string name="action_manage_devices">"기기 관리"</string>
   <string name="action_manage_rooms">"방 관리"</string>
   <string name="action_message">"메시지"</string>
@@ -165,6 +182,7 @@
   <string name="action_start_over">"다시 시작하다"</string>
   <string name="action_start_verification">"인증 시작"</string>
   <string name="action_static_map_load">"탭해서 지도 불러오기"</string>
+  <string name="action_stop">"중지"</string>
   <string name="action_take_photo">"사진 찍기"</string>
   <string name="action_tap_for_options">"옵션을 보려면 탭하세요"</string>
   <string name="action_translate">"번역"</string>
@@ -192,7 +210,9 @@
   <string name="common_beta">"베타"</string>
   <string name="common_blocked_users">"차단한 사용자"</string>
   <string name="common_bubbles">"버블"</string>
+  <string name="common_call_declined">"통화 거절"</string>
   <string name="common_call_started">"통화 시작"</string>
+  <string name="common_call_you_declined">"통화를 거절하셨습니다"</string>
   <string name="common_chat_backup">"채팅 백업"</string>
   <string name="common_copied_to_clipboard">"클립보드에 복사됨"</string>
   <string name="common_copyright">"저작권"</string>
@@ -202,7 +222,6 @@
   <string name="common_current_user_left_room">"방 떠남"</string>
   <string name="common_current_user_left_space">"스페이스 떠남"</string>
   <string name="common_current_user_rejected_invite">"초대 거부됨"</string>
-  <string name="common_dark">"다크"</string>
   <string name="common_decryption_error">"복호화 오류"</string>
   <string name="common_description">"설명"</string>
   <string name="common_developer_options">"개발자 설정"</string>
@@ -218,6 +237,7 @@
   <string name="common_empty_file">"빈 파일"</string>
   <string name="common_encryption">"암호화"</string>
   <string name="common_encryption_enabled">"암호화 활성화됨"</string>
+  <string name="common_ends_at">"%1$s에 종료"</string>
   <string name="common_enter_your_pin">"PIN을 입력하세요"</string>
   <string name="common_error">"오류"</string>
   <string name="common_error_registering_pusher_android">"오류가 발생했습니다, 새 메시지 알림을 받지 못할 수 있습니다. 설정에서 알림 문제를 해결하세요.
@@ -227,6 +247,7 @@
   <string name="common_failed">"실패"</string>
   <string name="common_favourite">"즐겨찾기"</string>
   <string name="common_favourited">"즐겨찾기 됨"</string>
+  <string name="common_fetching_notifications_title_android">"알림 동기화 중…"</string>
   <string name="common_file">"파일"</string>
   <string name="common_file_deleted">"파일 삭제됨"</string>
   <string name="common_file_saved">"파일 저장됨"</string>
@@ -240,10 +261,11 @@
   <string name="common_invite_unknown_profile">"Matrix ID를 찾을 수 없기 때문에 초대가 수신되지 않을 수도 있습니다."</string>
   <string name="common_leaving_room">"방을 떠나는 중"</string>
   <string name="common_leaving_space">"스페이스 떠나는 중"</string>
-  <string name="common_light">"라이트"</string>
   <string name="common_line_copied_to_clipboard">"줄이 클립보드에 복사되었습니다."</string>
   <string name="common_link_copied_to_clipboard">"링크가 클립보드에 복사됨"</string>
   <string name="common_link_new_device">"새 기기 연결"</string>
+  <string name="common_live_location">"실시간 위치"</string>
+  <string name="common_live_location_ended">"실시간 위치 공유 종료"</string>
   <string name="common_loading">"로딩 중…"</string>
   <string name="common_loading_more">"더 많은 내용이 로딩 중…"</string>
   <plurals name="common_many_members">
@@ -268,6 +290,7 @@
   <string name="common_offline">"오프라인"</string>
   <string name="common_open_source_licenses">"오픈 소스 라이선스"</string>
   <string name="common_or">"또는"</string>
+  <string name="common_other_options">"기타 옵션"</string>
   <string name="common_password">"비밀번호"</string>
   <string name="common_people">"사람"</string>
   <string name="common_permalink">"퍼머링크"</string>
@@ -277,6 +300,7 @@
   <string name="common_please_wait">"기다려 주세요…"</string>
   <string name="common_poll_end_confirmation">"정말로 이 투표를 종료하시겠어요?"</string>
   <string name="common_poll_summary">"투표: %1$s"</string>
+  <string name="common_poll_summary_prefix">"투표"</string>
   <string name="common_poll_total_votes">"총 투표수: %1$s"</string>
   <string name="common_poll_undisclosed_text">"결과는 투표가 끝난 이후에 공개됨"</string>
   <plurals name="common_poll_votes_count">
@@ -300,7 +324,6 @@
     <item quantity="other">"%1$d 답변"</item>
   </plurals>
   <string name="common_replying_to">"%1$s님에게 답장하는 중"</string>
-  <string name="common_report_a_bug">"버그 보고"</string>
   <string name="common_report_a_problem">"문제 보고"</string>
   <string name="common_report_submitted">"보고 제출됨"</string>
   <string name="common_rich_text_editor">"리치 텍스트 편집기"</string>
@@ -333,6 +356,7 @@
   <string name="common_settings">"설정"</string>
   <string name="common_share_space">"스페이스 공유"</string>
   <string name="common_shared_history">"새 멤버에게 대화 기록 공개"</string>
+  <string name="common_shared_live_location">"공유 중인 실시간 위치"</string>
   <string name="common_shared_location">"공유된 위치"</string>
   <string name="common_shared_space">"공유된 스페이스"</string>
   <string name="common_signing_out">"기기 제거"</string>
@@ -350,16 +374,16 @@
   <string name="common_suggested">"공유된 스페이스"</string>
   <string name="common_suggestions">"제안"</string>
   <string name="common_syncing">"동기화 중"</string>
-  <string name="common_system">"시스템"</string>
   <string name="common_text">"글자"</string>
   <string name="common_third_party_notices">"제3자 고지"</string>
   <string name="common_thread">"스레드"</string>
+  <string name="common_threads">"스레드"</string>
   <string name="common_topic">"주제"</string>
   <string name="common_topic_placeholder">"이 방은 어떤 곳인가요?"</string>
   <string name="common_unable_to_decrypt">"해독 불가"</string>
   <string name="common_unable_to_decrypt_insecure_device">"보안되지 않은 장치에서 전송됨"</string>
   <string name="common_unable_to_decrypt_no_access">"이 메시지에 액세스할 수 없습니다"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"발신자의 검증된 신원이 재설정되었습니다."</string>
+  <string name="common_unable_to_decrypt_verification_violation">"발신자의 인증된 디지털 신원이 재설정되었습니다"</string>
   <string name="common_unable_to_invite_message">"한 명 이상의 사용자에게 초대를 보낼 수 없습니다."</string>
   <string name="common_unable_to_invite_title">"초대를 보낼 수 없음"</string>
   <string name="common_unlock">"잠금 해제"</string>
@@ -384,16 +408,17 @@
   <string name="common_voice_message">"음성 메시지"</string>
   <string name="common_waiting">"대기 중…"</string>
   <string name="common_waiting_for_decryption_key">"이 메시지를 기다리고 있습니다"</string>
+  <string name="common_waiting_live_location">"실시간 위치 정보를 기다리는 중…"</string>
   <string name="common_world_readable_history">"누구나 대화 기록 보기 가능"</string>
   <string name="common_you">"당신"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s(%2$s)님이 이 메시지를 공유했습니다. 메시지 전송 당시 귀하가 방에 참여 중이 아니었기 때문입니다."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s님이 이 메시지를 공유했습니다. 메시지 전송 당시 귀하가 방에 참여 중이 아니었기 때문입니다."</string>
   <string name="crypto_history_visible">"이 방은 새 멤버가 이전 대화 기록을 읽을 수 있도록 설정되었습니다. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s 의 신원이 재설정되었습니다. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$s님의 디지털 신원이 재설정되었습니다. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"%1$s의 %2$s 신원이 재설정되었습니다. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s의 신원이 재설정되었습니다."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s의 %2$s 신원이 재설정되었습니다. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s의 디지털 신원이 재설정되었습니다."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s님의 %2$s 디지털 신원이 재설정되었습니다. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"확인 취소"</string>
   <string name="dialog_allow_access">"액세스 허용"</string>
   <string name="dialog_confirm_link_message">"%1$s 링크는 다른 사이트로 이동합니다 %2$s
@@ -418,7 +443,6 @@
 "</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"업로드할 비디오의 품질을 선택하세요."</string>
   <string name="dialog_video_quality_selector_title">"비디오 업로드 품질 선택"</string>
-  <string name="emoji_picker_search_placeholder">"이모지 검색"</string>
   <string name="error_account_already_logged_in">"이 기기에서 이미 %1$s님으로 로그인되어 있습니다."</string>
   <string name="error_account_creation_not_possible">"Matrix Authentication Service 및 계정 생성을 지원하려면 홈서버를 업그레이드해야 합니다."</string>
   <string name="error_failed_creating_the_permalink">"퍼머링크 생성 실패"</string>
@@ -427,6 +451,7 @@
   <string name="error_failed_locating_user">"%1$s가 위치에 접근할 수 없습니다. 나중에 다시 시도해 주세요."</string>
   <string name="error_failed_uploading_voice_message">"음성 메시지 업로드에 실패했습니다."</string>
   <string name="error_invalid_invite">"해당 방이 더 이상 존재하지 않거나 초대장이 더 이상 유효하지 않습니다."</string>
+  <string name="error_location_service_disabled_android">"위치 기반 기능을 사용하려면 GPS를 켜 주세요."</string>
   <string name="error_message_not_found">"메시지를 찾을 수 없습니다"</string>
   <string name="error_missing_location_auth_android">"%1$s에서 위치에 접근할 수 있는 권한이 없습니다. 설정에서 활성화가 가능합니다."</string>
   <string name="error_missing_location_rationale_android">"%1$s에서 위치에 접근할 수 있는 권한이 없습니다. 아래에서 허용해주세요."</string>
@@ -438,6 +463,9 @@
   <string name="error_unknown">"이런, 오류가 발생했어요"</string>
   <string name="invite_friends_rich_title">"🔐️ %1$s에 참여하기"</string>
   <string name="invite_friends_text">"%1$s에서 대화해요: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"실시간 위치 공유"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"위치 공유 중"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s님의 실시간 위치"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"강하게 흔들어서 오류 보고하기"</string>
   <string name="screen_bug_report_a11y_screenshot">"스크린샷"</string>
@@ -445,6 +473,12 @@
   <string name="screen_create_poll_options_section_title">"옵션"</string>
   <string name="screen_create_poll_remove_accessibility_label">"%1$s 제거"</string>
   <string name="screen_create_poll_settings_section_title">"설정"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"위치를 공유 중인 사용자가 없습니다."</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"실시간 위치 공유 중"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="other">"%1$d명"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"지도 보기"</string>
   <string name="screen_media_picker_error_failed_selection">"미디어 선택에 실패했습니다. 다시 시도해 주세요."</string>
   <string name="screen_pinned_timeline_empty_state_description">"메시지를 누르고 \"%1$s\" 를 선택하여 여기에 포함합니다."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"중요한 메시지를 고정하여 쉽게 찾을 수 있도록 합니다"</string>
@@ -456,7 +490,7 @@
   <string name="screen_reset_identity_confirmation_title">"확인할 수 없나요? 계정 설정으로 이동하여 디지털 신원을 재설정하세요."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"인증 철회 및 전송"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"확인 절차를 철회하고 이 메시지를 보내거나, 지금 취소하고 나중에 %1$s 을 확인한 후 다시 시도할 수 있습니다."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"%1$s의 인증된 신원이 재설정되어 귀하의 메시지가 전송되지 않았습니다."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"%1$s님의 인증된 디지털 신원이 재설정되어 메시지를 전송하지 못했습니다."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"아무튼 메시지 보내기"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s 는 하나 이상의 확인되지 않은 장치를 사용하고 있습니다. 메시지를 보내거나, %2$s 이 모든 장치를 확인한 후에 다시 시도할 수 있습니다."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"%1$s 이(가) 모든 기기를 확인하지 않았기 때문에 귀하의 메시지가 전송되지 않았습니다."</string>
@@ -468,6 +502,7 @@
   <string name="screen_room_event_pill">"메시지 %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"펼치기"</string>
   <string name="screen_room_grouped_state_events_reduce">"줄이다"</string>
+  <string name="screen_room_live_location_banner">"실시간 위치 공유 중"</string>
   <string name="screen_room_permalink_same_room_android">"이 방을 이미 보고 있습니다!"</string>
   <string name="screen_room_pinned_banner_indicator">"%2$s 의 %1$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s 고정된 메시지"</string>
@@ -480,12 +515,15 @@
   <string name="screen_share_open_google_maps">"Google Maps에서 열기"</string>
   <string name="screen_share_open_osm_maps">"OpenStreetMap에서 열기"</string>
   <string name="screen_share_this_location_action">"선택한 위치 공유"</string>
+  <string name="screen_sharing_location_option_sheet_title">"공유 옵션"</string>
   <string name="screen_space_list_description">"당신이 스페이스를 만들거나 가입했습니다."</string>
   <string name="screen_space_list_details">"%1$s•%2$s"</string>
   <string name="screen_space_list_empty_state_title">"스페이스를 생성하여 방을 체계적으로 관리해 보세요."</string>
   <string name="screen_space_list_parent_space">"%1$s 스페이스"</string>
   <string name="screen_space_list_title">"스페이스"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"%1$s의 인증된 신원이 재설정되어 메시지가 전송되지 않았습니다."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"공유된 %1$s"</string>
+  <string name="screen_static_location_sheet_title">"지도에서 보기"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"%1$s님의 인증된 디지털 신원이 재설정되어 메시지를 보내지 못했습니다."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"%1$s 이 모든 장치를 확인하지 않았기 때문에 메시지가 전송되지 않았습니다."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"하나 이상의 기기를 확인하지 않았기 때문에 메시지가 전송되지 않았습니다."</string>
   <string name="screen_view_location_title">"위치"</string>
@@ -495,5 +533,5 @@
   <string name="timeline_decryption_failure_historical_event_unverified_device">"이전 메시지에 액세스하려면 이 장치를 확인해야 합니다."</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"이 메시지에 액세스할 수 없습니다"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"메시지를 해독할 수 없습니다."</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"이 메시지는 귀하가 기기를 확인하지 않았거나 발신자가 귀하의 신원을 확인해야 하기 때문에 차단되었습니다."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"기기가 인증되지 않았거나, 발신자가 귀하의 디지털 신원을 확인해야 하므로 이 메시지가 차단되었습니다."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-lt/translations.xml b/libraries/ui-strings/src/main/res/values-lt/translations.xml
index 18eafdb13c..da5281212e 100644
--- a/libraries/ui-strings/src/main/res/values-lt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-lt/translations.xml
@@ -88,7 +88,7 @@
   <string name="common_developer_options">"Kūrėjo nustatymai"</string>
   <string name="common_direct_chat">"Asmeninis pokalbis"</string>
   <string name="common_edited_suffix">"(redaguota)"</string>
-  <string name="common_editing">"Taisymas"</string>
+  <string name="common_editing">"Redagavimas"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
   <string name="common_encryption_enabled">"Šifravimas įjungtas"</string>
   <string name="common_error">"Klaida"</string>
@@ -96,7 +96,7 @@
   <string name="common_file_saved_on_disk_android">"Failas išsaugotas aplanke Atsisiuntimai"</string>
   <string name="common_forward_message">"Persiųsti žinutę"</string>
   <string name="common_gif">"GIF"</string>
-  <string name="common_image">"Paveikslėlis"</string>
+  <string name="common_image">"Vaizdas"</string>
   <string name="common_invite_unknown_profile">"Šio Matrix ID nepavyksta rasti, todėl kvietimas gali būti negautas."</string>
   <string name="common_leaving_room">"Paliekamas kambarys"</string>
   <string name="common_link_copied_to_clipboard">"Nuoroda nukopijuota į iškarpinę"</string>
@@ -126,7 +126,6 @@
   <string name="common_reactions">"Reakcijos"</string>
   <string name="common_refreshing">"Atnaujinama…"</string>
   <string name="common_replying_to">"Atsakant %1$s"</string>
-  <string name="common_report_a_bug">"Pranešti apie klaidą"</string>
   <string name="common_report_submitted">"Skundas pateiktas"</string>
   <string name="common_room_name">"Kambario pavadinimas"</string>
   <string name="common_room_name_placeholder">"pvz., jūsų projekto pavadinimas"</string>
diff --git a/libraries/ui-strings/src/main/res/values-nb/translations.xml b/libraries/ui-strings/src/main/res/values-nb/translations.xml
index f563a89258..04199986aa 100644
--- a/libraries/ui-strings/src/main/res/values-nb/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-nb/translations.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Legg til avatar"</string>
   <string name="a11y_add_reaction">"Legg til reaksjon: %1$s"</string>
   <string name="a11y_address">"Adresse"</string>
   <string name="a11y_avatar">"Profilbilde"</string>
+  <string name="a11y_clear_search_field">"Tøm søkefeltet"</string>
   <string name="a11y_collapse_message_text_field">"Minimer meldingstekstfeltet"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Reduser antall tillatte stemmer per person"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Øk antall tillatte stemmer per person"</string>
   <string name="a11y_delete">"Slett"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d siffer angitt"</item>
     <item quantity="other">"%1$d sifre angitt"</item>
   </plurals>
+  <string name="a11y_duration">"Varighet: %1$s"</string>
   <string name="a11y_edit_avatar">"Rediger avatar"</string>
   <string name="a11y_edit_room_address_hint">"Den fullstendige adressen vil være %1$s"</string>
   <string name="a11y_encryption_details">"Krypteringsdetaljer"</string>
   <string name="a11y_expand_message_text_field">"Utvid meldingstekstfeltet"</string>
   <string name="a11y_hide_password">"Skjul passord"</string>
+  <string name="a11y_info">"Info"</string>
   <string name="a11y_join_call">"Bli med i samtale"</string>
   <string name="a11y_jump_to_bottom">"Hopp til bunnen"</string>
-  <string name="a11y_move_the_map_to_my_location">"Flytt kartet til min posisjon"</string>
+  <string name="a11y_jump_to_unread">"Gå til uleste"</string>
+  <string name="a11y_jump_to_unread_messages">"Gå til første uleste melding"</string>
+  <string name="a11y_move_the_map_to_my_location">"Flytt kartet til min lokasjon"</string>
   <string name="a11y_notifications_mentions_only">"Bare omtaler"</string>
   <string name="a11y_notifications_muted">"Dempet"</string>
   <string name="a11y_notifications_new_mentions">"Nye omtaler"</string>
@@ -26,6 +34,7 @@
   <string name="a11y_page_n">"Side %1$d"</string>
   <string name="a11y_pause">"Setter på pause"</string>
   <string name="a11y_paused_voice_message">"Talemelding, lengde: %1$s, nåværende posisjon: %2$s"</string>
+  <string name="a11y_photo_preview">"Forhåndsvisning av bilde"</string>
   <string name="a11y_pin_field">"PIN-felt"</string>
   <string name="a11y_pinned_location">"Festet lokasjon"</string>
   <string name="a11y_play">"Spill av"</string>
@@ -35,25 +44,31 @@
   <string name="a11y_qr_code">"QR-kode"</string>
   <string name="a11y_react_with">"Reager med %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reager med andre emojier"</string>
-  <string name="a11y_read_receipts_multiple">"Lest av %1$s og %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Forrige melding lest av %1$s og %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Lest av %1$s og %2$d andre"</item>
-    <item quantity="other">"Lest av %1$s og %2$d andre"</item>
+    <item quantity="one">"Forrige melding lest av %1$s og %2$d annen"</item>
+    <item quantity="other">"Forrige melding lest av %1$s og %2$d andre"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Lest av %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Trykk for å vise alle"</string>
+  <string name="a11y_read_receipts_single">"Forrige melding lest av %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"vis alle lesebekreftelser"</string>
   <string name="a11y_remove_reaction">"Fjern reaksjonen med %1$s"</string>
   <string name="a11y_remove_reaction_with">"Fjern reaksjonen med %1$s"</string>
   <string name="a11y_room_avatar">"Romavatar"</string>
   <string name="a11y_send_files">"Sende filer"</string>
   <string name="a11y_sender_location">"Avsenderens lokasjon"</string>
+  <string name="a11y_sent_by_sender_at_date">"Sendt av %1$s %2$s."</string>
   <string name="a11y_session_verification_time_limited_action_required">"Tidsbegrenset handling kreves, du har ett minutt på deg til å verifisere"</string>
+  <string name="a11y_settings_with_required_action">"Innstillinger, handling kreves"</string>
   <string name="a11y_show_password">"Vis passord"</string>
   <string name="a11y_start_call">"Start en samtale"</string>
+  <string name="a11y_start_video_call">"Start en videosamtale"</string>
   <string name="a11y_start_voice_call">"Start et taleanrop"</string>
+  <string name="a11y_thread_in_room">"Tråd i: %1$s"</string>
+  <string name="a11y_threads_in_room">"Tråder i %1$s"</string>
   <string name="a11y_tombstoned_room">"Deaktivert rom"</string>
   <string name="a11y_user_avatar">"Brukeravatar"</string>
   <string name="a11y_user_menu">"Brukermeny"</string>
+  <string name="a11y_video_preview">"Videoforhåndsvisning"</string>
   <string name="a11y_view_avatar">"Vis avatar"</string>
   <string name="a11y_view_details">"Vis detaljer"</string>
   <string name="a11y_voice_message">"Talemelding, lengde: %1$s"</string>
@@ -68,6 +83,7 @@
   <string name="action_call">"Ring"</string>
   <string name="action_cancel">"Avbryt"</string>
   <string name="action_cancel_for_now">"Avbryt for nå"</string>
+  <string name="action_choose_file">"Velg fil"</string>
   <string name="action_choose_photo">"Velg bilde"</string>
   <string name="action_clear">"Tøm"</string>
   <string name="action_close">"Lukk"</string>
@@ -87,12 +103,16 @@
   <string name="action_deactivate_account">"Deaktiver kontoen"</string>
   <string name="action_decline">"Avslå"</string>
   <string name="action_decline_and_block">"Avslå og blokker"</string>
+  <string name="action_delete">"Slett"</string>
+  <string name="action_delete_account">"Slett konto"</string>
+  <string name="action_delete_file">"Slett fil"</string>
   <string name="action_delete_poll">"Slett avstemning"</string>
   <string name="action_deselect_all">"Velg bort alle"</string>
   <string name="action_disable">"Deaktiver"</string>
   <string name="action_discard">"Forkast"</string>
   <string name="action_dismiss">"Avvis"</string>
   <string name="action_done">"Ferdig"</string>
+  <string name="action_download">"Last ned"</string>
   <string name="action_edit">"Rediger"</string>
   <string name="action_edit_caption">"Rediger bildetekst"</string>
   <string name="action_edit_poll">"Rediger avstemning"</string>
@@ -120,8 +140,10 @@
   <string name="action_leave_space">"Forlat område"</string>
   <string name="action_load_more">"Last inn mer"</string>
   <string name="action_manage_account">"Administrer konto"</string>
+  <string name="action_manage_account_and_devices">"Administrer konto og enheter"</string>
   <string name="action_manage_devices">"Administrer enheter"</string>
   <string name="action_manage_rooms">"Administrer rom"</string>
+  <string name="action_mark_as_read">"Merk som lest"</string>
   <string name="action_message">"Melding"</string>
   <string name="action_minimize">"Minimer"</string>
   <string name="action_next">"Neste"</string>
@@ -159,7 +181,7 @@
   <string name="action_send_voice_message">"Send talemelding"</string>
   <string name="action_share">"Dele"</string>
   <string name="action_share_link">"Dele lenke"</string>
-  <string name="action_share_live_location">"Del posisjon i sanntid"</string>
+  <string name="action_share_live_location">"Del lokasjon i sanntid"</string>
   <string name="action_show">"Vis"</string>
   <string name="action_sign_in_again">"Logg på igjen"</string>
   <string name="action_signout">"Fjern denne enheten"</string>
@@ -170,14 +192,17 @@
   <string name="action_start_over">"Begynn på nytt"</string>
   <string name="action_start_verification">"Start verifisering"</string>
   <string name="action_static_map_load">"Trykk for å laste inn kart"</string>
+  <string name="action_stop">"Stopp"</string>
   <string name="action_take_photo">"Ta bilde"</string>
   <string name="action_tap_for_options">"Trykk for alternativer"</string>
   <string name="action_translate">"Oversett"</string>
   <string name="action_try_again">"Prøv igjen"</string>
   <string name="action_unpin">"Løsne"</string>
+  <string name="action_video_call">"Videosamtale"</string>
   <string name="action_view">"Vis"</string>
   <string name="action_view_in_timeline">"Vis i tidslinjen"</string>
   <string name="action_view_source">"Vis kilde"</string>
+  <string name="action_voice_call">"Taleanrop"</string>
   <string name="action_yes">"Ja"</string>
   <string name="action_yes_try_again">"Ja, prøv igjen"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Serveren din støtter nå en ny, raskere protokoll. Logg ut og logg inn igjen for å oppgradere nå. Ved å gjøre dette nå, unngår du å bli tvunget til å logge ut når den gamle protokollen fjernes senere."</string>
@@ -197,7 +222,10 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blokkerte brukere"</string>
   <string name="common_bubbles">"Bobler"</string>
+  <string name="common_call_declined">"Anrop avvist"</string>
+  <string name="common_call_in_progress">"Samtale pågår"</string>
   <string name="common_call_started">"Samtale startet"</string>
+  <string name="common_call_you_declined">"Du avviste en samtale"</string>
   <string name="common_chat_backup">"Chat backup"</string>
   <string name="common_copied_to_clipboard">"Kopiert til utklippstavlen"</string>
   <string name="common_copyright">"Opphavsrett"</string>
@@ -207,7 +235,6 @@
   <string name="common_current_user_left_room">"Forlot rommet"</string>
   <string name="common_current_user_left_space">"Forlot område"</string>
   <string name="common_current_user_rejected_invite">"Invitasjon avslått"</string>
-  <string name="common_dark">"Mørk"</string>
   <string name="common_decryption_error">"Dekrypteringsfeil"</string>
   <string name="common_description">"Beskrivelse"</string>
   <string name="common_developer_options">"Alternativer for utviklere"</string>
@@ -223,6 +250,7 @@
   <string name="common_empty_file">"Tom fil"</string>
   <string name="common_encryption">"Kryptering"</string>
   <string name="common_encryption_enabled">"Kryptering aktivert"</string>
+  <string name="common_ends_at">"Slutter %1$s"</string>
   <string name="common_enter_your_pin">"Skriv inn PIN-koden din"</string>
   <string name="common_error">"Feil"</string>
   <string name="common_error_registering_pusher_android">"Det har oppstått en feil, og vil kanskje ikke motta varsler om nye meldinger. Vennligst feilsøk varslinger fra innstillingene.
@@ -232,23 +260,35 @@
   <string name="common_failed">"Mislyktes"</string>
   <string name="common_favourite">"Favoritt"</string>
   <string name="common_favourited">"Favoritt"</string>
+  <string name="common_fetching_notifications_title_android">"Synkroniserer varsler …"</string>
   <string name="common_file">"Fil"</string>
   <string name="common_file_deleted">"Fil slettet"</string>
   <string name="common_file_saved">"Fil lagret"</string>
   <string name="common_file_saved_on_disk_android">"Fil lagret i Nedlastinger"</string>
   <string name="common_forward_message">"Videresend melding"</string>
   <string name="common_frequently_used">"Ofte brukt"</string>
+  <string name="common_gallery">"Galleri"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d-vedlegg…"</item>
+    <item quantity="other">"%1$d-vedlegg…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d-mediefil…"</item>
+    <item quantity="other">"%1$d-mediefiler…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Gruppesamtale pågår"</string>
   <string name="common_image">"Bilde"</string>
   <string name="common_in_reply_to">"Som svar på %1$s"</string>
   <string name="common_install_apk_android">"Installer APK"</string>
   <string name="common_invite_unknown_profile">"Finner ikke denne Matrix-IDen, så invitasjonen blir kanskje ikke mottatt."</string>
   <string name="common_leaving_room">"Forlater rommet"</string>
   <string name="common_leaving_space">"Forlater området"</string>
-  <string name="common_light">"Lys"</string>
   <string name="common_line_copied_to_clipboard">"Linje kopiert til utklippstavlen"</string>
   <string name="common_link_copied_to_clipboard">"Lenke kopiert til utklippstavlen"</string>
   <string name="common_link_new_device">"Koble til ny enhet"</string>
+  <string name="common_live_location">"Sanntidslokasjon"</string>
+  <string name="common_live_location_ended">"Sanntidslokasjon er avsluttet"</string>
   <string name="common_loading">"Laster inn…"</string>
   <string name="common_loading_more">"Laster inn mer…"</string>
   <plurals name="common_many_members">
@@ -273,6 +313,7 @@
   <string name="common_no_space_name">"Ikke noe områdenavn"</string>
   <string name="common_not_encrypted">"Ikke kryptert"</string>
   <string name="common_offline">"Frakoblet"</string>
+  <string name="common_on_a_call">"I en samtale"</string>
   <string name="common_open_source_licenses">"Åpen kildekode-lisenser"</string>
   <string name="common_or">"eller"</string>
   <string name="common_other_options">"Andre alternativer"</string>
@@ -285,6 +326,7 @@
   <string name="common_please_wait">"Vennligst vent…"</string>
   <string name="common_poll_end_confirmation">"Er du sikker på at du vil avslutte denne avstemningen?"</string>
   <string name="common_poll_summary">"Avstemning: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Avstemning"</string>
   <string name="common_poll_total_votes">"Totalt antall stemmer: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Resultatene vises etter at avstemningen er avsluttet"</string>
   <plurals name="common_poll_votes_count">
@@ -309,7 +351,6 @@
     <item quantity="other">"%1$d svar"</item>
   </plurals>
   <string name="common_replying_to">"Svar til %1$s"</string>
-  <string name="common_report_a_bug">"Rapporter en feil"</string>
   <string name="common_report_a_problem">"Rapporter et problem"</string>
   <string name="common_report_submitted">"Rapport sendt inn"</string>
   <string name="common_rich_text_editor">"Redigeringsprogram for rik tekst"</string>
@@ -343,7 +384,8 @@
   <string name="common_settings">"Innstillinger"</string>
   <string name="common_share_space">"Del område"</string>
   <string name="common_shared_history">"Nye medlemmer ser historikk"</string>
-  <string name="common_shared_location">"Delt posisjon"</string>
+  <string name="common_shared_live_location">"Delt lokasjon i sanntid"</string>
+  <string name="common_shared_location">"Delt lokasjon"</string>
   <string name="common_shared_space">"Delt område"</string>
   <string name="common_signing_out">"Fjerner enheten"</string>
   <string name="common_something_went_wrong">"Noe gikk galt"</string>
@@ -361,22 +403,23 @@
   <string name="common_suggested">"Foreslått"</string>
   <string name="common_suggestions">"Forslag"</string>
   <string name="common_syncing">"Synkroniserer"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Varsler fra tredjeparter"</string>
   <string name="common_thread">"Tråd"</string>
+  <string name="common_threads">"Tråder"</string>
   <string name="common_topic">"Emne"</string>
   <string name="common_topic_placeholder">"Hva er dette rommet for?"</string>
   <string name="common_unable_to_decrypt">"Kan ikke dekryptere"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Sendt fra en usikker enhet"</string>
   <string name="common_unable_to_decrypt_no_access">"Du har ikke tilgang til denne meldingen"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Avsenderens verifiserte identitet ble tilbakestilt"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Avsenderens verifiserte digitale identitet ble tilbakestilt"</string>
   <string name="common_unable_to_invite_message">"Invitasjoner kunne ikke sendes til en eller flere brukere."</string>
   <string name="common_unable_to_invite_title">"Kunne ikke sende invitasjon(er)"</string>
   <string name="common_unlock">"Lås opp"</string>
   <string name="common_unmute">"Slå på lyden"</string>
   <string name="common_unsupported_call">"Ikke støttet anrop"</string>
   <string name="common_unsupported_event">"Hendelsen er ikke støttet"</string>
+  <string name="common_user_started_a_call">"%1$s startet en samtale"</string>
   <string name="common_username">"Brukernavn"</string>
   <string name="common_verification_cancelled">"Verifisering kansellert"</string>
   <string name="common_verification_complete">"Verifisering fullført"</string>
@@ -395,16 +438,22 @@
   <string name="common_voice_message">"Talemelding"</string>
   <string name="common_waiting">"Venter…"</string>
   <string name="common_waiting_for_decryption_key">"Venter på denne meldingen"</string>
+  <string name="common_waiting_live_location">"Venter på sanntidslokasjon…"</string>
   <string name="common_world_readable_history">"Alle kan se historikk"</string>
   <string name="common_you">"Du"</string>
+  <string name="content_scanner_not_found">"Nedlasting ikke tilgjengelig."</string>
+  <string name="content_scanner_not_found_title">"Filen ble ikke funnet"</string>
+  <string name="content_scanner_scanning">"Skanner…"</string>
+  <string name="content_scanner_unsafe_message">"Forhåndsvisning og nedlasting er deaktivert."</string>
+  <string name="content_scanner_unsafe_title">"Filen er ikke sikker"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) delte denne meldingen siden du ikke var i rommet da den ble sendt."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s delte denne meldingen siden du ikke var i rommet da den ble sendt."</string>
   <string name="crypto_history_visible">"Dette rommet er konfigurert slik at nye medlemmer kan lese historikken.%1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s\'s identitet ble tilbakestilt. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$ss %2$s-identitet ble tilbakestilt. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$ss digitale identitet ble tilbakestilt. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$ss digitale identitet %2$s ble tilbakestilt. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$ss identitet ble tilbakestilt."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$ss %2$s identitet ble tilbakestilt. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$ss digitale identitet ble tilbakestilt."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$ss digitale identitet %2$s ble tilbakestilt. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Trekk tilbake verifisering"</string>
   <string name="dialog_allow_access">"Tillat tilgang"</string>
   <string name="dialog_confirm_link_message">"Lenken %1$s tar deg til et annet nettsted %2$s
@@ -427,18 +476,18 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maksimal tillatt filstørrelse er: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Velg kvaliteten på videoen du vil laste opp."</string>
   <string name="dialog_video_quality_selector_title">"Velg kvalitet for videoopplasting"</string>
-  <string name="emoji_picker_search_placeholder">"Søk etter emojier"</string>
   <string name="error_account_already_logged_in">"Du er allerede logget inn på denne enheten som %1$s."</string>
   <string name="error_account_creation_not_possible">"Hjemmeserveren din må oppgraderes for å støtte Matrix Authentication Service og kontooppretting."</string>
   <string name="error_failed_creating_the_permalink">"Opprettelse av permalenken mislyktes"</string>
   <string name="error_failed_loading_map">"%1$s kunne ikke laste inn kartet. Prøv igjen senere."</string>
   <string name="error_failed_loading_messages">"Kunne ikke laste inn meldinger"</string>
-  <string name="error_failed_locating_user">"%1$s fikk ikke tilgang til posisjonen din. Vennligst prøv igjen senere."</string>
+  <string name="error_failed_locating_user">"%1$s fikk ikke tilgang til lokasjonen din. Vennligst prøv igjen senere."</string>
   <string name="error_failed_uploading_voice_message">"Kunne ikke laste opp talemeldingen din."</string>
   <string name="error_invalid_invite">"Rommet eksisterer ikke lenger, eller invitasjonen er ikke lenger gyldig."</string>
+  <string name="error_location_service_disabled_android">"Vennligst aktiver GPSen din for å få tilgang til stedsbaserte funksjoner."</string>
   <string name="error_message_not_found">"Melding ikke funnet"</string>
-  <string name="error_missing_location_auth_android">"%1$s har ikke tilgang til posisjonen din. Du kan aktivere tilgang i Innstillinger."</string>
-  <string name="error_missing_location_rationale_android">"%1$s har ikke tilgang til posisjonen din. Aktiver tilgang nedenfor."</string>
+  <string name="error_missing_location_auth_android">"%1$s har ikke tilgang til lokasjonen din. Du kan aktivere tilgang i Innstillinger."</string>
+  <string name="error_missing_location_rationale_android">"%1$s har ikke tilgang til lokasjonen din. Aktiver tilgang nedenfor."</string>
   <string name="error_missing_microphone_voice_rationale_android">"%1$s har ikke tilgang til mikrofonen din. Aktiver tilgang til å ta opp en talemelding."</string>
   <string name="error_network_or_server_issue">"Dette kan skyldes nettverks- eller serverproblemer."</string>
   <string name="error_room_address_already_exists">"Denne romadressen finnes allerede. Prøv å redigere romadressefeltet eller endre romnavnet"</string>
@@ -447,6 +496,9 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="error_unknown">"Beklager, det oppstod en feil"</string>
   <string name="invite_friends_rich_title">"🔐️ Bli med meg på %1$s"</string>
   <string name="invite_friends_text">"Hei, snakk med meg på %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Deling av lokasjon i sanntid"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Deling av lokasjon pågår"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s sanntidslokasjon"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake for å rapportere feil"</string>
   <string name="screen_bug_report_a11y_screenshot">"Skjermbilde"</string>
@@ -454,8 +506,16 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="screen_create_poll_options_section_title">"Alternativer"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Fjern %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Innstillinger"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Tillatte stemmer per person"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Ingen deler lokasjonen sin"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Deler lokasjon i sanntid"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d person"</item>
+    <item quantity="other">"%1$d personer"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"På kartet"</string>
+  <string name="screen_local_network_opt_in_title">"Gi tilgang til det lokale nettverket"</string>
   <string name="screen_media_picker_error_failed_selection">"Kunne ikke velge medium, prøv igjen."</string>
-  <string name="screen_onboarding_welcome_back">"Velkommen tilbake"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Trykk på en melding og velg “%1$s” for å inkludere her."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fest viktige meldinger slik at de lett kan ses"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -463,11 +523,11 @@ Er du sikker på at du vil fortsette?"</string>
     <item quantity="other">"%1$d Festede meldinger"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Festede meldinger"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Du er i ferd med å gå til %1$s kontoen din for å tilbakestille identiteten din. Etterpå blir du tatt tilbake til appen."</string>
-  <string name="screen_reset_identity_confirmation_title">"Kan du ikke bekrefte? Gå til kontoen din for å tilbakestille identiteten din."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Du er i ferd med å gå til din %1$s for å tilbakestille din digitale identitet. Etterpå blir du ført tilbake til appen."</string>
+  <string name="screen_reset_identity_confirmation_title">"Kan du ikke bekrefte? Gå til kontoen din for å tilbakestille den digitale identiteten din."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Trekk tilbake verifikasjon og send"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Du kan trekke tilbake verifiseringen og sende denne meldingen likevel, eller du kan avbryte for nå og prøve igjen senere etter at du har reverifisert %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Meldingen din ble ikke sendt fordi %1$ss verifiserte identitet er tilbakestilt"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Meldingen din ble ikke sendt fordi %1$s verifiserte digitale identitet ble tilbakestilt"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Send melding uansett"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s bruker én eller flere uverifiserte enheter. Du kan sende meldingen uansett, eller du kan avbryte foreløpig og prøve igjen senere etter at %2$s har verifisert alle enhetene sine."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Meldingen din ble ikke sendt fordi %1$s ikke har bekreftet alle enhetene"</string>
@@ -479,18 +539,20 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="screen_room_event_pill">"Melding i %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Utvid"</string>
   <string name="screen_room_grouped_state_events_reduce">"Reduser"</string>
+  <string name="screen_room_live_location_banner">"Deler lokasjon i sanntid"</string>
   <string name="screen_room_permalink_same_room_android">"Du ser allerede på dette rommet!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s av %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Festede meldinger"</string>
   <string name="screen_room_pinned_banner_loading_description">"Laster inn melding…"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"Vis alle"</string>
   <string name="screen_room_title">"Chat"</string>
-  <string name="screen_share_location_title">"Del posisjon"</string>
-  <string name="screen_share_my_location_action">"Del min posisjon"</string>
+  <string name="screen_share_location_title">"Del lokasjon"</string>
+  <string name="screen_share_my_location_action">"Del min lokasjon"</string>
   <string name="screen_share_open_apple_maps">"Åpne i Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Åpne i Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Åpne i OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Del valgt lokasjon"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Delingsalternativer"</string>
   <string name="screen_space_list_description">"Områder du har opprettet eller blitt med i."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_empty_state_title">"Opprett område for å organisere rom"</string>
@@ -498,15 +560,21 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="screen_space_list_title">"Områder"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Delt %1$s"</string>
   <string name="screen_static_location_sheet_title">"På kartet"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Meldingen ble ikke sendt fordi %1$ss verifiserte identitet er tilbakestilt."</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d ble med"</item>
+    <item quantity="other">"%1$d ble med"</item>
+  </plurals>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Meldingen ble ikke sendt fordi %1$s verifiserte digitale identitet ble tilbakestilt."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Meldingen ble ikke sendt fordi %1$s ikke har verifisert alle enheter."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Meldingen ble ikke sendt fordi du ikke har verifisert en eller flere av enhetene dine."</string>
-  <string name="screen_view_location_title">"Posisjon"</string>
+  <string name="screen_view_location_title">"Lokasjon"</string>
   <string name="settings_version_number">"Versjon: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"en"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Historiske meldinger er ikke tilgjengelige på denne enheten"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Du må verifisere denne enheten for å få tilgang til historiske meldinger"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Du har ikke tilgang til denne meldingen"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Kan ikke dekryptere meldingen"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Denne meldingen ble blokkert enten fordi du ikke har bekreftet enheten din, eller fordi avsenderen må bekrefte identiteten din."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Denne meldingen ble blokkert enten fordi du ikke verifiserte enheten din, eller fordi avsenderen må verifisere din digitale identitet."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Enheten din er for gammel. Du trenger en enhet med Android 8 eller nyere."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Visning av kart støttes ikke"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-nl/translations.xml b/libraries/ui-strings/src/main/res/values-nl/translations.xml
index 6e136e7d77..e13f4bace4 100644
--- a/libraries/ui-strings/src/main/res/values-nl/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-nl/translations.xml
@@ -34,7 +34,6 @@
     <item quantity="other">"Gelezen door %1$s en %2$d anderen"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Gelezen door %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tik om alles weer te geven"</string>
   <string name="a11y_remove_reaction">"Verwijder reactie met %1$s"</string>
   <string name="a11y_remove_reaction_with">"Reactie met %1$s verwijderen"</string>
   <string name="a11y_room_avatar">"Kamerafbeelding"</string>
@@ -172,7 +171,6 @@
   <string name="common_creating_room">"Kamer maken…"</string>
   <string name="common_current_user_left_room">"Heeft de kamer verlaten"</string>
   <string name="common_current_user_rejected_invite">"Uitnodiging geweigerd"</string>
-  <string name="common_dark">"Donker"</string>
   <string name="common_decryption_error">"Decryptie fout"</string>
   <string name="common_developer_options">"Ontwikkelaarsopties"</string>
   <string name="common_device_id">"Apparaat-ID"</string>
@@ -200,7 +198,6 @@ Reden: %1$s."</string>
   <string name="common_install_apk_android">"APK installeren"</string>
   <string name="common_invite_unknown_profile">"Deze Matrix-ID kan niet worden gevonden, dus de uitnodiging is mogelijk niet ontvangen."</string>
   <string name="common_leaving_room">"De kamer verlaten"</string>
-  <string name="common_light">"Licht"</string>
   <string name="common_link_copied_to_clipboard">"Link gekopieerd naar klembord"</string>
   <string name="common_loading">"Laden…"</string>
   <plurals name="common_many_members">
@@ -250,7 +247,6 @@ Reden: %1$s."</string>
     <item quantity="other">"%1$d antwoorden"</item>
   </plurals>
   <string name="common_replying_to">"Reageren op %1$s"</string>
-  <string name="common_report_a_bug">"Een fout melden"</string>
   <string name="common_report_a_problem">"Meld een probleem"</string>
   <string name="common_report_submitted">"Melding ingediend"</string>
   <string name="common_rich_text_editor">"Uitgebreide tekstverwerker"</string>
@@ -279,7 +275,6 @@ Reden: %1$s."</string>
   <string name="common_success">"Geslaagd"</string>
   <string name="common_suggestions">"Suggesties"</string>
   <string name="common_syncing">"Synchroniseren"</string>
-  <string name="common_system">"Systeem"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Kennisgevingen van derden"</string>
   <string name="common_thread">"Gesprek"</string>
diff --git a/libraries/ui-strings/src/main/res/values-pl/translations.xml b/libraries/ui-strings/src/main/res/values-pl/translations.xml
index bd6eaab990..0234af883a 100644
--- a/libraries/ui-strings/src/main/res/values-pl/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pl/translations.xml
@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Dodaj awatar"</string>
   <string name="a11y_add_reaction">"Dodaj reakcję: %1$s"</string>
+  <string name="a11y_address">"Adres"</string>
   <string name="a11y_avatar">"Awatar"</string>
+  <string name="a11y_clear_search_field">"Wyczyść pole wyszukiwania"</string>
   <string name="a11y_collapse_message_text_field">"Zmniejsz pole tekstowe wiadomości"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Zmniejsz liczbę głosów dozwolonych na osobę"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Zwiększ liczbę głosów dozwolonych na osobę"</string>
+  <string name="a11y_custom_emoji">"Własne emoji"</string>
   <string name="a11y_delete">"Usuń"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"Wprowadzono %1$d cyfrę"</item>
     <item quantity="few">"Wprowadzono %1$d cyfry"</item>
     <item quantity="many">"Wprowadzono %1$d cyfr"</item>
   </plurals>
+  <string name="a11y_duration">"Czas trwania: %1$s"</string>
   <string name="a11y_edit_avatar">"Edytuj awatar"</string>
   <string name="a11y_edit_room_address_hint">"Podgląd pełnego adresu %1$s"</string>
   <string name="a11y_encryption_details">"Szczegóły szyfrowania"</string>
   <string name="a11y_expand_message_text_field">"Powiększ pole tekstowe wiadomości"</string>
   <string name="a11y_hide_password">"Ukryj hasło"</string>
+  <string name="a11y_info">"Informacje"</string>
   <string name="a11y_join_call">"Dołącz do połączenia"</string>
   <string name="a11y_jump_to_bottom">"Przejdź na dół"</string>
+  <string name="a11y_jump_to_unread">"Skocz do nieprzeczytanych"</string>
+  <string name="a11y_jump_to_unread_messages">"Skocz do pierwszej nieprzeczytanej wiadomości"</string>
   <string name="a11y_move_the_map_to_my_location">"Przesuń mapę do mojej lokalizacji"</string>
   <string name="a11y_notifications_mentions_only">"Tylko wzmianki"</string>
   <string name="a11y_notifications_muted">"Wyciszone"</string>
@@ -26,30 +36,44 @@
   <string name="a11y_page_n">"Strona %1$d"</string>
   <string name="a11y_pause">"Wstrzymaj"</string>
   <string name="a11y_paused_voice_message">"Wiadomość głosowa, czas trwania: %1$s, aktualna pozycja: %2$s"</string>
+  <string name="a11y_photo_preview">"Podgląd zdjęcia"</string>
   <string name="a11y_pin_field">"Pole PIN"</string>
+  <string name="a11y_pinned_location">"Przypięta lokalizacja"</string>
   <string name="a11y_play">"Odtwórz"</string>
+  <string name="a11y_playback_speed">"Prędkość odtwarzania"</string>
   <string name="a11y_poll">"Ankieta"</string>
   <string name="a11y_poll_end">"Zakończona ankieta"</string>
+  <string name="a11y_position">"Pozycja: %1$s"</string>
+  <string name="a11y_qr_code">"Kod QR"</string>
   <string name="a11y_react_with">"Zareaguj z %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Zareaguj innym emoji"</string>
-  <string name="a11y_read_receipts_multiple">"Odczytane przez %1$s i %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Poprzednia wiadomość przeczytana przez %1$s i %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Odczytano przez %1$s i %2$d inną"</item>
-    <item quantity="few">"Odczytano przez %1$s i %2$d innych"</item>
-    <item quantity="many">"Odczytano przez %1$s i %2$d innych"</item>
+    <item quantity="one">"Poprzednia wiadomość przeczytana przez %1$s i %2$d inną osobę"</item>
+    <item quantity="few">"Poprzednia wiadomość przeczytana przez %1$s i %2$d inne osoby"</item>
+    <item quantity="many">"Poprzednia wiadomość przeczytana przez %1$s i %2$d innych osób"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Odczytane przez %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Stuknij, aby pokazać wszystkich"</string>
+  <string name="a11y_read_receipts_single">"Poprzednia wiadomość przeczytana przez %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"pokaż wszystkie potwierdzenia odczytu"</string>
   <string name="a11y_remove_reaction">"Usuń reakcję %1$s"</string>
   <string name="a11y_remove_reaction_with">"Usuń reakcję z %1$s"</string>
   <string name="a11y_room_avatar">"Awatar pokoju"</string>
   <string name="a11y_send_files">"Wyślij pliki"</string>
+  <string name="a11y_sender_location">"Lokalizacja nadawcy"</string>
+  <string name="a11y_sent_by_sender_at_date">"Wysłane przez %1$s o %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Wymagane jest działanie ograniczone czasowo, została jedna minuta"</string>
+  <string name="a11y_settings_with_required_action">"Ustawienia, wymagane działanie"</string>
   <string name="a11y_show_password">"Pokaż hasło"</string>
   <string name="a11y_start_call">"Rozpocznij rozmowę"</string>
+  <string name="a11y_start_video_call">"Rozpocznij rozmowę wideo"</string>
+  <string name="a11y_start_voice_call">"Rozpocznij połączenie głosowe"</string>
+  <string name="a11y_status">"Status"</string>
+  <string name="a11y_thread_in_room">"Wątek w %1$s"</string>
+  <string name="a11y_threads_in_room">"Wątki w %1$s"</string>
   <string name="a11y_tombstoned_room">"Pokój nagrobkowy"</string>
   <string name="a11y_user_avatar">"Awatar użytkownika"</string>
   <string name="a11y_user_menu">"Menu użytkownika"</string>
+  <string name="a11y_video_preview">"Podgląd wideo"</string>
   <string name="a11y_view_avatar">"Wyświetl awatar"</string>
   <string name="a11y_view_details">"Wyświetl szczegóły"</string>
   <string name="a11y_voice_message">"Wiadomość głosowa, czas trwania: %1$s"</string>
@@ -58,11 +82,13 @@
   <string name="a11y_your_avatar">"Twój awatar"</string>
   <string name="action_accept">"Akceptuj"</string>
   <string name="action_add_caption">"Dodaj opis"</string>
+  <string name="action_add_existing_rooms">"Dodaj istniejące pokoje"</string>
   <string name="action_add_to_timeline">"Dodaj do osi czasu"</string>
   <string name="action_back">"Wróć"</string>
   <string name="action_call">"Zadzwoń"</string>
   <string name="action_cancel">"Anuluj"</string>
   <string name="action_cancel_for_now">"Anuluj na razie"</string>
+  <string name="action_choose_file">"Wybierz plik"</string>
   <string name="action_choose_photo">"Wybierz zdjęcie"</string>
   <string name="action_clear">"Wyczyść"</string>
   <string name="action_close">"Zamknij"</string>
@@ -77,26 +103,33 @@
   <string name="action_copy_text">"Kopiuj tekst"</string>
   <string name="action_create">"Utwórz"</string>
   <string name="action_create_room">"Utwórz pokój"</string>
+  <string name="action_create_space">"Utwórz przestrzeń"</string>
   <string name="action_deactivate">"Dezaktywuj"</string>
   <string name="action_deactivate_account">"Dezaktywuj konto"</string>
   <string name="action_decline">"Odrzuć"</string>
   <string name="action_decline_and_block">"Odrzuć i zablokuj"</string>
+  <string name="action_delete">"Usuń"</string>
+  <string name="action_delete_account">"Usuń konto"</string>
+  <string name="action_delete_file">"Usuń plik"</string>
   <string name="action_delete_poll">"Usuń ankietę"</string>
   <string name="action_deselect_all">"Odznacz wszystko"</string>
   <string name="action_disable">"Wyłącz"</string>
   <string name="action_discard">"Odrzuć"</string>
   <string name="action_dismiss">"Zamknij"</string>
   <string name="action_done">"Gotowe"</string>
+  <string name="action_download">"Pobierz"</string>
   <string name="action_edit">"Edytuj"</string>
   <string name="action_edit_caption">"Edytuj opis"</string>
   <string name="action_edit_poll">"Edytuj ankietę"</string>
   <string name="action_enable">"Włącz"</string>
   <string name="action_end_poll">"Zakończ ankietę"</string>
   <string name="action_enter_pin">"Wprowadź PIN"</string>
+  <string name="action_explore_public_spaces">"Przeglądaj przestrzenie publiczne"</string>
   <string name="action_finish">"Zakończ"</string>
   <string name="action_forgot_password">"Nie pamiętasz hasła?"</string>
   <string name="action_forward">"Przekaż dalej"</string>
   <string name="action_go_back">"Wróć"</string>
+  <string name="action_go_to_roles_and_permissions">"Przejdź do ról i uprawnień"</string>
   <string name="action_go_to_settings">"Przejdź do ustawień"</string>
   <string name="action_ignore">"Ignoruj"</string>
   <string name="action_invite">"Zaproś"</string>
@@ -112,7 +145,10 @@
   <string name="action_leave_space">"Opuść przestrzeń"</string>
   <string name="action_load_more">"Załaduj więcej"</string>
   <string name="action_manage_account">"Zarządzaj kontem"</string>
+  <string name="action_manage_account_and_devices">"Zarządzaj kontem i urządzeniami"</string>
   <string name="action_manage_devices">"Zarządzaj urządzeniami"</string>
+  <string name="action_manage_rooms">"Zarządzaj pokojami"</string>
+  <string name="action_mark_as_read">"Oznacz jako przeczytane"</string>
   <string name="action_message">"Wiadomość"</string>
   <string name="action_minimize">"Minimalizuj"</string>
   <string name="action_next">"Dalej"</string>
@@ -137,7 +173,7 @@
   <string name="action_report_content">"Zgłoś treść"</string>
   <string name="action_report_dm">"Zgłoś rozmowę"</string>
   <string name="action_report_room">"Zgłoś pokój"</string>
-  <string name="action_reset">"Resetuj"</string>
+  <string name="action_reset">"Zresetuj"</string>
   <string name="action_reset_identity">"Zresetuj tożsamość"</string>
   <string name="action_retry">"Spróbuj ponownie"</string>
   <string name="action_retry_decryption">"Ponów próbę odszyfrowania"</string>
@@ -148,25 +184,30 @@
   <string name="action_send_edited_message">"Wyślij edytowaną wiadomość"</string>
   <string name="action_send_message">"Wyślij wiadomość"</string>
   <string name="action_send_voice_message">"Wyślij wiadomość głosową"</string>
-  <string name="action_share">"Udostępnij"</string>
-  <string name="action_share_link">"Udostępnij link"</string>
+  <string name="action_share">"Wyślij"</string>
+  <string name="action_share_link">"Wyślij link"</string>
+  <string name="action_share_live_location">"Udostępnij lokalizację na żywo"</string>
   <string name="action_show">"Pokaż"</string>
   <string name="action_sign_in_again">"Zaloguj się ponownie"</string>
-  <string name="action_signout">"Wyloguj"</string>
-  <string name="action_signout_anyway">"Wyloguj mimo to"</string>
+  <string name="action_signout">"Usuń to urządzenie"</string>
+  <string name="action_signout_anyway">"Usuń urządzenie mimo to"</string>
   <string name="action_skip">"Pomiń"</string>
   <string name="action_start">"Rozpocznij"</string>
   <string name="action_start_chat">"Rozpocznij chat"</string>
   <string name="action_start_over">"Zacznij od nowa"</string>
   <string name="action_start_verification">"Rozpocznij weryfikację"</string>
   <string name="action_static_map_load">"Stuknij, aby załadować mapę"</string>
+  <string name="action_stop">"Zatrzymaj"</string>
   <string name="action_take_photo">"Zrób zdjęcie"</string>
   <string name="action_tap_for_options">"Stuknij, by wyświetlić opcje"</string>
+  <string name="action_translate">"Przetłumacz"</string>
   <string name="action_try_again">"Spróbuj ponownie"</string>
   <string name="action_unpin">"Odepnij"</string>
+  <string name="action_video_call">"Rozmowa wideo"</string>
   <string name="action_view">"Wyświetl"</string>
   <string name="action_view_in_timeline">"Wyświetl na osi czasu"</string>
   <string name="action_view_source">"Wyświetl źródło"</string>
+  <string name="action_voice_call">"Rozmowa głosowa"</string>
   <string name="action_yes">"Tak"</string>
   <string name="action_yes_try_again">"Tak, spróbuj ponownie"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Twój serwer wspiera teraz nowy, szybszy protokół. Zaloguj się ponownie, aby zaktualizować. Dzięki temu unikniesz wymuszonego wylogowania, gdy stary protokół zostanie usunięty."</string>
@@ -186,16 +227,19 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Zablokowani użytkownicy"</string>
   <string name="common_bubbles">"Bąbelki"</string>
+  <string name="common_call_declined">"Połączenie odrzucone"</string>
+  <string name="common_call_in_progress">"Trwa połączenie"</string>
   <string name="common_call_started">"Rozpoczęto rozmowę"</string>
+  <string name="common_call_you_declined">"Odrzuciłeś połączenie"</string>
   <string name="common_chat_backup">"Backup czatu"</string>
   <string name="common_copied_to_clipboard">"Skopiowano do schowka"</string>
   <string name="common_copyright">"Prawa autorskie"</string>
   <string name="common_creating_room">"Tworzenie pokoju…"</string>
+  <string name="common_creating_space">"Tworzenie przestrzeni…"</string>
   <string name="common_current_user_canceled_knock">"Anulowano żądanie"</string>
   <string name="common_current_user_left_room">"Opuszczono pokój"</string>
   <string name="common_current_user_left_space">"Opuścił przestrzeń"</string>
   <string name="common_current_user_rejected_invite">"Odrzucono zaproszenie"</string>
-  <string name="common_dark">"Ciemny"</string>
   <string name="common_decryption_error">"Błąd deszyfrowania"</string>
   <string name="common_description">"Opis"</string>
   <string name="common_developer_options">"Opcje programisty"</string>
@@ -211,6 +255,7 @@
   <string name="common_empty_file">"Pusty plik"</string>
   <string name="common_encryption">"Szyfrowanie"</string>
   <string name="common_encryption_enabled">"Szyfrowanie włączone"</string>
+  <string name="common_ends_at">"Kończy się o %1$s"</string>
   <string name="common_enter_your_pin">"Wprowadź kod PIN"</string>
   <string name="common_error">"Błąd"</string>
   <string name="common_error_registering_pusher_android">"Wystąpił błąd, możesz nie otrzymać powiadomień nowych wiadomości. Spróbuj naprawić powiadomienia w ustawieniach.
@@ -220,22 +265,37 @@ Powód: %1$s."</string>
   <string name="common_failed">"Niepowodzenie"</string>
   <string name="common_favourite">"Ulubione"</string>
   <string name="common_favourited">"Ulubione"</string>
+  <string name="common_fetching_notifications_title_android">"Synchronizuję powiadomienia…"</string>
   <string name="common_file">"Plik"</string>
   <string name="common_file_deleted">"Plik usunięty"</string>
   <string name="common_file_saved">"Plik zapisany"</string>
   <string name="common_file_saved_on_disk_android">"Plik zapisany do folderu Pobrane"</string>
   <string name="common_forward_message">"Przekaż wiadomość"</string>
   <string name="common_frequently_used">"Często używane"</string>
+  <string name="common_gallery">"Galeria"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d załącznik…"</item>
+    <item quantity="few">"%1$d załączniki…"</item>
+    <item quantity="many">"%1$d załączników…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d przedmiot medialny…"</item>
+    <item quantity="few">"%1$d przedmioty medialne…"</item>
+    <item quantity="many">"%1$d przedmiotów medialnych…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Trwa połączenie grupowe"</string>
   <string name="common_image">"Zdjęcie"</string>
   <string name="common_in_reply_to">"W odpowiedzi do %1$s"</string>
   <string name="common_install_apk_android">"Zainstaluj APK"</string>
   <string name="common_invite_unknown_profile">"Nie można znaleźć identyfikatora Matrix ID, zaproszenie mogło nie dotrzeć."</string>
   <string name="common_leaving_room">"Opuszczanie pokoju"</string>
   <string name="common_leaving_space">"Opuszczam przestrzeń"</string>
-  <string name="common_light">"Jasny"</string>
   <string name="common_line_copied_to_clipboard">"Wiersz skopiowany do schowka"</string>
   <string name="common_link_copied_to_clipboard">"Link został skopiowany do schowka"</string>
+  <string name="common_link_new_device">"Powiąż nowe urządzenie"</string>
+  <string name="common_live_location">"Lokalizacja na żywo"</string>
+  <string name="common_live_location_ended">"Zakończono udostępnianie lokalizacji na żywo"</string>
   <string name="common_loading">"Ładowanie…"</string>
   <string name="common_loading_more">"Ładuję więcej…"</string>
   <plurals name="common_many_members">
@@ -250,18 +310,22 @@ Powód: %1$s."</string>
   </plurals>
   <string name="common_message">"Wiadomość"</string>
   <string name="common_message_actions">"Akcje wiadomości"</string>
+  <string name="common_message_failed_to_send">"Nie udało się wysłać wiadomości"</string>
   <string name="common_message_layout">"Układ wiadomości"</string>
   <string name="common_message_removed">"Wiadomość usunięta"</string>
   <string name="common_modern">"Nowoczesny"</string>
   <string name="common_mute">"Wycisz"</string>
+  <string name="common_name">"Nazwa"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Brak wyników"</string>
   <string name="common_no_room_name">"Brak nazwy pokoju"</string>
   <string name="common_no_space_name">"Brak nazwy przestrzeni"</string>
   <string name="common_not_encrypted">"Nieszyfrowane"</string>
   <string name="common_offline">"Offline"</string>
+  <string name="common_on_a_call">"W trakcie rozmowy"</string>
   <string name="common_open_source_licenses">"Licencje open-source"</string>
   <string name="common_or">"lub"</string>
+  <string name="common_other_options">"Inne opcje"</string>
   <string name="common_password">"Hasło"</string>
   <string name="common_people">"Osoby"</string>
   <string name="common_permalink">"Link bezpośredni"</string>
@@ -269,8 +333,9 @@ Powód: %1$s."</string>
   <string name="common_pinned">"Przypięte"</string>
   <string name="common_please_check_internet_connection">"Sprawdź swoje połączenie internetowe"</string>
   <string name="common_please_wait">"Proszę czekać…"</string>
-  <string name="common_poll_end_confirmation">"Jesteś pewien, że chcesz zakończyć tę ankietę?"</string>
+  <string name="common_poll_end_confirmation">"Czy na pewno chcesz zakończyć tę ankietę?"</string>
   <string name="common_poll_summary">"Ankieta: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Ankieta"</string>
   <string name="common_poll_total_votes">"Łączna liczba głosów: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Wyniki zostaną wyświetlone po zakończeniu ankiety"</string>
   <plurals name="common_poll_votes_count">
@@ -280,8 +345,10 @@ Powód: %1$s."</string>
   </plurals>
   <string name="common_preparing">"Przygotowuję…"</string>
   <string name="common_privacy_policy">"Polityka prywatności"</string>
+  <string name="common_private">"Prywatny"</string>
   <string name="common_private_room">"Pokój prywatny"</string>
   <string name="common_private_space">"Prywatna przestrzeń"</string>
+  <string name="common_public">"Publiczny"</string>
   <string name="common_public_room">"Pokój publiczny"</string>
   <string name="common_public_space">"Przestrzeń publiczna"</string>
   <string name="common_reaction">"Reakcja"</string>
@@ -289,19 +356,20 @@ Powód: %1$s."</string>
   <string name="common_reason">"Powód"</string>
   <string name="common_recovery_key">"Klucz przywracania"</string>
   <string name="common_refreshing">"Odświeżanie…"</string>
+  <string name="common_removing">"Usuwanie…"</string>
   <plurals name="common_replies">
     <item quantity="one">"%1$d odpowiedź"</item>
     <item quantity="few">"%1$d odpowiedzi"</item>
     <item quantity="many">"%1$d odpowiedzi"</item>
   </plurals>
   <string name="common_replying_to">"Odpowiadanie do %1$s"</string>
-  <string name="common_report_a_bug">"Zgłoś błąd"</string>
   <string name="common_report_a_problem">"Zgłoś problem"</string>
   <string name="common_report_submitted">"Zgłoszenie wysłane"</string>
   <string name="common_rich_text_editor">"Bogaty edytor tekstu"</string>
+  <string name="common_role">"Rola"</string>
   <string name="common_room">"Pokój"</string>
   <string name="common_room_name">"Nazwa pokoju"</string>
-  <string name="common_room_name_placeholder">"np. nazwa projektu"</string>
+  <string name="common_room_name_placeholder">"np. nazwa twojego projektu"</string>
   <plurals name="common_rooms">
     <item quantity="one">"%1$d Pokój"</item>
     <item quantity="few">"%1$d Pokoje"</item>
@@ -315,6 +383,11 @@ Powód: %1$s."</string>
   <string name="common_security">"Bezpieczeństwo"</string>
   <string name="common_seen_by">"Wyświetlone przez"</string>
   <string name="common_select_account">"Wybierz konto"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d zaznaczony"</item>
+    <item quantity="few">"%1$d zaznaczone"</item>
+    <item quantity="many">"%1$d zaznaczonych"</item>
+  </plurals>
   <string name="common_send_to">"Wyślij do"</string>
   <string name="common_sending">"Wysyłanie…"</string>
   <string name="common_sending_failed">"Błąd wysyłania"</string>
@@ -325,12 +398,16 @@ Powód: %1$s."</string>
   <string name="common_server_url">"Adres URL serwera"</string>
   <string name="common_settings">"Ustawienia"</string>
   <string name="common_share_space">"Udostępnij przestrzeń"</string>
+  <string name="common_shared_history">"Nowi członkowie widzą historię"</string>
+  <string name="common_shared_live_location">"Udostępniona lokalizacja na żywo"</string>
   <string name="common_shared_location">"Udostępniona lokalizacja"</string>
   <string name="common_shared_space">"Udostępniona przestrzeń"</string>
-  <string name="common_signing_out">"Wylogowywanie"</string>
+  <string name="common_signing_out">"Usuwanie urządzenia"</string>
   <string name="common_something_went_wrong">"Coś poszło nie tak"</string>
   <string name="common_something_went_wrong_message">"Napotkaliśmy problem. Spróbuj ponownie."</string>
   <string name="common_space">"Przestrzeń"</string>
+  <string name="common_space_members">"Członkowie przestrzeni"</string>
+  <string name="common_space_topic_placeholder">"O czym jest ta przestrzeń?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Przestrzeń"</item>
     <item quantity="few">"%1$d Przestrzenie"</item>
@@ -339,12 +416,13 @@ Powód: %1$s."</string>
   <string name="common_starting_chat">"Rozpoczynanie czatu…"</string>
   <string name="common_sticker">"Naklejka"</string>
   <string name="common_success">"Sukces"</string>
+  <string name="common_suggested">"Polecane"</string>
   <string name="common_suggestions">"Sugestie"</string>
   <string name="common_syncing">"Synchronizuję"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Tekst"</string>
   <string name="common_third_party_notices">"Informacje stron trzecich"</string>
   <string name="common_thread">"Wątek"</string>
+  <string name="common_threads">"Wątki"</string>
   <string name="common_topic">"Temat"</string>
   <string name="common_topic_placeholder">"O czym jest ten pokój?"</string>
   <string name="common_unable_to_decrypt">"Nie można odszyfrować"</string>
@@ -357,6 +435,7 @@ Powód: %1$s."</string>
   <string name="common_unmute">"Wyłącz wyciszenie"</string>
   <string name="common_unsupported_call">"Nieobsługiwane połączenie"</string>
   <string name="common_unsupported_event">"Nieobsługiwane zdarzenie"</string>
+  <string name="common_user_started_a_call">"%1$s rozpoczął połączenie"</string>
   <string name="common_username">"Nazwa użytkownika"</string>
   <string name="common_verification_cancelled">"Weryfikacja anulowana"</string>
   <string name="common_verification_complete">"Weryfikacja zakończona"</string>
@@ -365,7 +444,7 @@ Powód: %1$s."</string>
   <string name="common_verify_device">"Zweryfikuj urządzenie"</string>
   <string name="common_verify_identity">"Zweryfikuj tożsamość"</string>
   <string name="common_verify_user">"Zweryfikuj użytkownika"</string>
-  <string name="common_video">"Film"</string>
+  <string name="common_video">"Wideo"</string>
   <string name="common_video_quality_high">"Wysoka jakość"</string>
   <string name="common_video_quality_high_description">"Najlepsza jakość, większy rozmiar pliku"</string>
   <string name="common_video_quality_low">"Niska jakość"</string>
@@ -374,14 +453,25 @@ Powód: %1$s."</string>
   <string name="common_video_quality_standard_description">"Balans między jakością a szybkością przesyłania"</string>
   <string name="common_voice_message">"Wiadomość głosowa"</string>
   <string name="common_waiting">"Oczekiwanie…"</string>
-  <string name="common_waiting_for_decryption_key">"Oczekiwanie na tę wiadomość"</string>
+  <string name="common_waiting_for_decryption_key">"Oczekiwanie wiadomości"</string>
+  <string name="common_waiting_live_location">"Czekam na lokalizację na żywo…"</string>
+  <string name="common_world_readable_history">"Każdy może zobaczyć historię"</string>
   <string name="common_you">"Ty"</string>
-  <string name="crypto_identity_change_pin_violation">"Tożsamość %1$s została zresetowana. %2$s"</string>
+  <string name="content_scanner_not_found">"Pobieranie niedostępne."</string>
+  <string name="content_scanner_not_found_title">"Nie znaleziono pliku"</string>
+  <string name="content_scanner_scanning">"Skanuję…"</string>
+  <string name="content_scanner_unsafe_message">"Podgląd i pobieranie zostały wyłączone."</string>
+  <string name="content_scanner_unsafe_title">"Ten plik nie jest bezpieczny"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) udostępnił tę wiadomość, kiedy nie było Cię w pokoju, gdy została wysłana."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s udostępnił tę wiadomość, kiedy nie było Cię w pokoju, gdy została wysłana."</string>
+  <string name="crypto_history_visible">"Ten pokój został skonfigurowany tak, aby nowi członkowie mogli czytać historię czatu. %1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Tożsamość cyfrowa %1$s została zresetowana. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Tożsamość %1$s %2$s została zresetowana. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"Tożsamość %1$s została zresetowana"</string>
-  <string name="crypto_identity_change_verification_violation_new">"Tożsamość %1$s %2$s została zresetowana.  %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Tożsamość %1$s została zresetowana."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Tożsamość %1$s %2$s została zresetowana. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Wycofaj weryfikację"</string>
+  <string name="dialog_allow_access">"Zezwól na dostęp"</string>
   <string name="dialog_confirm_link_message">"Link %1$s prowadzi Cię do innej witryny %2$s
 
 Czy na pewno chcesz kontynuować?"</string>
@@ -402,7 +492,6 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maksymalny dozwolony rozmiar pliku to: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Wybierz jakość filmu, który chcesz przesłać."</string>
   <string name="dialog_video_quality_selector_title">"Wybierz jakość przesyłania wideo"</string>
-  <string name="emoji_picker_search_placeholder">"Wyszukaj emoji"</string>
   <string name="error_account_already_logged_in">"Jesteś już zalogowany na tym urządzeniu jako %1$s."</string>
   <string name="error_account_creation_not_possible">"Twój serwer domowy wymaga aktualizacji, aby uzyskać wsparcie usługi Matrix Authentication Service i tworzenia kont."</string>
   <string name="error_failed_creating_the_permalink">"Nie udało się utworzyć linku bezpośredniego"</string>
@@ -411,6 +500,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="error_failed_locating_user">"%1$s nie mógł uzyskać dostępu do Twojej lokalizacji. Spróbuj ponownie później."</string>
   <string name="error_failed_uploading_voice_message">"Nie udało się przesłać Twojej wiadomości głosowej."</string>
   <string name="error_invalid_invite">"Pokój już nie istnieje lub zaproszenie nie jest już ważne."</string>
+  <string name="error_location_service_disabled_android">"Włącz GPS, aby uzyskać dostęp do funkcji opartych na lokalizacji."</string>
   <string name="error_message_not_found">"Nie znaleziono wiadomości"</string>
   <string name="error_missing_location_auth_android">"%1$s nie uzyskało uprawnienia do dostępu do twojej lokalizacji. Możesz włączyć dostęp w Ustawieniach."</string>
   <string name="error_missing_location_rationale_android">"%1$s nie ma uprawnień dostępu do Twojej lokalizacji. Włącz dostęp poniżej."</string>
@@ -422,6 +512,9 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="error_unknown">"Przepraszamy, wystąpił błąd"</string>
   <string name="invite_friends_rich_title">"🔐️ Dołącz do mnie na %1$s"</string>
   <string name="invite_friends_text">"Hej, porozmawiajmy na %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Udostępnianie lokalizacji na żywo"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Udostępnianie lokalizacji w toku"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"Lokalizacja na żywo %1$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Wstrząśnij gniewnie, aby zgłosić błąd"</string>
   <string name="screen_bug_report_a11y_screenshot">"Zrzut ekranu"</string>
@@ -429,9 +522,20 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_create_poll_options_section_title">"Opcje"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Usuń %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Ustawienia"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Liczba głosów na osobę"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nikt nie udostępnia swojej lokalizacji"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Udostępnianie lokalizacji na żywo"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d osoba"</item>
+    <item quantity="few">"%1$d osoby"</item>
+    <item quantity="many">"%1$d osób"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Na mapie"</string>
+  <string name="screen_local_network_opt_in_subtitle">"Twój serwer domowy znajduje się w sieci lokalnej. Aby się połączyć, %1$s potrzebuje uprawnień dostępu do urządzeń w tej sieci."</string>
+  <string name="screen_local_network_opt_in_title">"Zezwól na dostęp do sieci lokalnej"</string>
   <string name="screen_media_picker_error_failed_selection">"Nie udało się wybrać multimediów. Spróbuj ponownie."</string>
-  <string name="screen_pinned_timeline_empty_state_description">"Naciśnij wiadomość i wybierz “%1$s”, aby dołączyć tutaj."</string>
-  <string name="screen_pinned_timeline_empty_state_headline">"Przypinaj ważne wiadomości, aby można było je łatwo znaleźć"</string>
+  <string name="screen_pinned_timeline_empty_state_description">"Przytrzymaj wiadomość i wybierz “%1$s”, aby umieścić ją tutaj."</string>
+  <string name="screen_pinned_timeline_empty_state_headline">"Przypinaj ważne wiadomości, by łatwo je później odnaleźć"</string>
   <plurals name="screen_pinned_timeline_screen_title">
     <item quantity="one">"%1$d przypięta wiadomość"</item>
     <item quantity="few">"%1$d przypięte wiadomości"</item>
@@ -454,6 +558,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_room_event_pill">"Wiadomość w %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Rozwiń"</string>
   <string name="screen_room_grouped_state_events_reduce">"Zmniejsz"</string>
+  <string name="screen_room_live_location_banner">"Udostępnianie lokalizacji na żywo"</string>
   <string name="screen_room_permalink_same_room_android">"Już oglądasz ten pokój!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s z %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s przypiętych wiadomości"</string>
@@ -465,11 +570,20 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_share_open_apple_maps">"Otwórz w Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Otwórz w Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Otwórz w OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Udostępnij tę lokalizację"</string>
+  <string name="screen_share_this_location_action">"Udostępnij wybraną lokalizację"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Opcje udostępniania"</string>
   <string name="screen_space_list_description">"Przestrzenie, które stworzyłeś lub do których dołączyłeś."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Utwórz przestrzeń, aby organizować pokoje"</string>
   <string name="screen_space_list_parent_space">"Przestrzeń %1$s"</string>
   <string name="screen_space_list_title">"Przestrzenie"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Udostępnianie %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Na mapie"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d dołączyła"</item>
+    <item quantity="few">"%1$d dołączyły"</item>
+    <item quantity="many">"%1$d dołączyło"</item>
+  </plurals>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Wiadomość nie została wysłana, ponieważ tożsamość %1$s została zresetowana."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Wiadomość nie została wysłana, ponieważ %1$s nie zweryfikował wszystkich urządzeń."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Wiadomość nie została wysłana, ponieważ nie zweryfikowałeś jednego lub więcej swoich urządzeń."</string>
@@ -480,5 +594,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Musisz zweryfikować to urządzenie, aby uzyskać dostęp do historii wiadomości"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Nie masz uprawnień do tej wiadomości"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nie można odszyfrować wiadomości"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Wiadomość została zablokowana, ponieważ urządzenie nie zostało zweryfikowane lub nadawca musi zweryfikować Twoją tożsamość."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Ta wiadomość została zablokowana, ponieważ urządzenie nie zostało zweryfikowane lub nadawca musi zweryfikować Twoją tożsamość."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Twoje urządzenie jest przestarzałe, wymagany system Android 8 lub nowszy."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Renderowanie map nie jest obsługiwane"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
index 49351c6b64..49decfa49b 100644
--- a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
@@ -37,7 +37,6 @@
     <item quantity="other">"Lido por %1$s e outros %2$d"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Lido por %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Toque para mostrar tudo"</string>
   <string name="a11y_remove_reaction">"Remover reação com %1$s"</string>
   <string name="a11y_remove_reaction_with">"Remover reação com %1$s"</string>
   <string name="a11y_room_avatar">"Avatar da sala"</string>
@@ -155,8 +154,8 @@
   <string name="action_share_link">"Compartilhar link"</string>
   <string name="action_show">"Mostrar"</string>
   <string name="action_sign_in_again">"Entrar novamente"</string>
-  <string name="action_signout">"Sair"</string>
-  <string name="action_signout_anyway">"Sair mesmo assim"</string>
+  <string name="action_signout">"Remover este dispositivo"</string>
+  <string name="action_signout_anyway">"Remover este dispositivo mesmo assim"</string>
   <string name="action_skip">"Pular"</string>
   <string name="action_start">"Iniciar"</string>
   <string name="action_start_chat">"Iniciar conversa"</string>
@@ -200,7 +199,6 @@
   <string name="common_current_user_left_room">"Saiu da sala"</string>
   <string name="common_current_user_left_space">"Saiu do espaço"</string>
   <string name="common_current_user_rejected_invite">"Convite recusado"</string>
-  <string name="common_dark">"Escuro"</string>
   <string name="common_decryption_error">"Erro de descriptografia"</string>
   <string name="common_description">"Descrição"</string>
   <string name="common_developer_options">"Opções de desenvolvedor"</string>
@@ -238,7 +236,6 @@ Motivo:​ %1$s."</string>
   <string name="common_invite_unknown_profile">"Este ID Matrix não foi encontrado, então o convite pode não ser recebido"</string>
   <string name="common_leaving_room">"Saindo da sala"</string>
   <string name="common_leaving_space">"Saindo do espaço"</string>
-  <string name="common_light">"Claro"</string>
   <string name="common_line_copied_to_clipboard">"Linha copiada para a área de transferência"</string>
   <string name="common_link_copied_to_clipboard">"Link copiado para área de transferência"</string>
   <string name="common_link_new_device">"Vincular novo dispositivo"</string>
@@ -300,7 +297,6 @@ Motivo:​ %1$s."</string>
     <item quantity="other">"%1$d respostas"</item>
   </plurals>
   <string name="common_replying_to">"Respondendo a %1$s"</string>
-  <string name="common_report_a_bug">"Denunciar um bug"</string>
   <string name="common_report_a_problem">"Relatar um problema"</string>
   <string name="common_report_submitted">"Relatório enviado"</string>
   <string name="common_rich_text_editor">"Editor de rich text"</string>
@@ -351,7 +347,6 @@ Motivo:​ %1$s."</string>
   <string name="common_suggested">"Sugerido"</string>
   <string name="common_suggestions">"Sugestões"</string>
   <string name="common_syncing">"Sincronizando"</string>
-  <string name="common_system">"Sistema"</string>
   <string name="common_text">"Texto"</string>
   <string name="common_third_party_notices">"Comunicados de terceiros"</string>
   <string name="common_thread">"Tópico"</string>
@@ -415,7 +410,6 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"O tamanho máximo permitido de arquivos é: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Selecione a qualidade do video que quer enviar."</string>
   <string name="dialog_video_quality_selector_title">"Selecione a qualidade de envio dos vídeos"</string>
-  <string name="emoji_picker_search_placeholder">"Pesquisar emojis"</string>
   <string name="error_account_already_logged_in">"Você já está conectado neste dispositivo como %1$s ."</string>
   <string name="error_account_creation_not_possible">"Seu servidor-casa precisa ser atualizado para oferecer suporte ao Matrix Authentication Service e à criação de contas."</string>
   <string name="error_failed_creating_the_permalink">"Falha ao criar o link permanente"</string>
@@ -477,7 +471,7 @@ Você tem certeza de que deseja continuar?"</string>
   <string name="screen_share_open_apple_maps">"Abrir no Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Abrir no Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Abrir no OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Compartilhar esta localização"</string>
+  <string name="screen_share_this_location_action">"Compartilhar localização selecionada"</string>
   <string name="screen_space_list_description">"Os espaços que você criou ou entrou."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_empty_state_title">"Crie espaços para organizar salas"</string>
diff --git a/libraries/ui-strings/src/main/res/values-pt/translations.xml b/libraries/ui-strings/src/main/res/values-pt/translations.xml
index 56346fe1ac..617ecad2db 100644
--- a/libraries/ui-strings/src/main/res/values-pt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt/translations.xml
@@ -37,7 +37,6 @@
     <item quantity="other">"Lida por %1$s e %2$d outros"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Lida por %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Toca para mostrar tudo"</string>
   <string name="a11y_remove_reaction">"Remover reação com %1$s"</string>
   <string name="a11y_remove_reaction_with">"Remover reação com %1$s"</string>
   <string name="a11y_room_avatar">"Ícone da sala"</string>
@@ -152,8 +151,8 @@
   <string name="action_share_link">"Partilhar ligação"</string>
   <string name="action_show">"Mostrar"</string>
   <string name="action_sign_in_again">"Iniciar sessão novamente"</string>
-  <string name="action_signout">"Terminar sessão"</string>
-  <string name="action_signout_anyway">"Terminar mesmo assim"</string>
+  <string name="action_signout">"Remover este dispositivo"</string>
+  <string name="action_signout_anyway">"Remover mesmo assim"</string>
   <string name="action_skip">"Saltar"</string>
   <string name="action_start">"Iniciar"</string>
   <string name="action_start_chat">"Iniciar conversa"</string>
@@ -195,7 +194,6 @@
   <string name="common_current_user_left_room">"Saíste da sala"</string>
   <string name="common_current_user_left_space">"Saíste do espaço"</string>
   <string name="common_current_user_rejected_invite">"Convite rejeitado"</string>
-  <string name="common_dark">"Escuro"</string>
   <string name="common_decryption_error">"Erro de decifragem"</string>
   <string name="common_description">"Descrição"</string>
   <string name="common_developer_options">"Opções de programador"</string>
@@ -233,7 +231,6 @@ Razão: %1$s."</string>
   <string name="common_invite_unknown_profile">"Não foi possível encontrar este ID Matrix, portanto o convite pode não ser recebido."</string>
   <string name="common_leaving_room">"A sair da sala"</string>
   <string name="common_leaving_space">"A sair do espaço"</string>
-  <string name="common_light">"Claro"</string>
   <string name="common_line_copied_to_clipboard">"Linha copiada para a área de transferência"</string>
   <string name="common_link_copied_to_clipboard">"Ligação copiada para a área de transferência"</string>
   <string name="common_loading">"A carregar…"</string>
@@ -291,7 +288,6 @@ Razão: %1$s."</string>
     <item quantity="other">"%1$d respostas"</item>
   </plurals>
   <string name="common_replying_to">"Em resposta a %1$s"</string>
-  <string name="common_report_a_bug">"Comunicar falha"</string>
   <string name="common_report_a_problem">"Comunicar um problema"</string>
   <string name="common_report_submitted">"Denúncia submetida"</string>
   <string name="common_rich_text_editor">"Editor de texto rico"</string>
@@ -322,7 +318,7 @@ Razão: %1$s."</string>
   <string name="common_share_space">"Partilhar espaço"</string>
   <string name="common_shared_location">"Localização partilhada"</string>
   <string name="common_shared_space">"Espaço partilhado"</string>
-  <string name="common_signing_out">"A terminar sessão"</string>
+  <string name="common_signing_out">"A remover dispositivo"</string>
   <string name="common_something_went_wrong">"Algo correu mal"</string>
   <string name="common_something_went_wrong_message">"Encontramos um erro. Por favor, tenta novamente."</string>
   <string name="common_space">"Espaço"</string>
@@ -335,7 +331,6 @@ Razão: %1$s."</string>
   <string name="common_success">"Sucesso"</string>
   <string name="common_suggestions">"Sugestões"</string>
   <string name="common_syncing">"A sincronizar…"</string>
-  <string name="common_system">"Sistema"</string>
   <string name="common_text">"Texto"</string>
   <string name="common_third_party_notices">"Avisos de terceiros"</string>
   <string name="common_thread">"Tópico"</string>
@@ -396,7 +391,6 @@ Tens a certeza de que queres continuar?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"O tamanho máximo de ficheiro permitido é: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Seleciona a qualidade do vídeo que pretendes carregar."</string>
   <string name="dialog_video_quality_selector_title">"Seleciona a qualidade de carregamento do vídeo"</string>
-  <string name="emoji_picker_search_placeholder">"Pesquisar emojis"</string>
   <string name="error_account_already_logged_in">"Já tens sessão iniciada como %1$s neste dispositivo."</string>
   <string name="error_account_creation_not_possible">"Seu homeserver precisa ser atualizado para suportar o Matrix Authentication Service e a criação de conta."</string>
   <string name="error_failed_creating_the_permalink">"Falha ao criar ligação permanente"</string>
@@ -458,7 +452,7 @@ Tens a certeza de que queres continuar?"</string>
   <string name="screen_share_open_apple_maps">"Abrir no Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Abrir no Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Abrir no OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Partilhar este local"</string>
+  <string name="screen_share_this_location_action">"Partilhar local selecionado"</string>
   <string name="screen_space_list_description">"Espaços que criaste ou nos quais entraste."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_parent_space">"Espaço %1$s"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ro/translations.xml b/libraries/ui-strings/src/main/res/values-ro/translations.xml
index 652a285961..4eba83312b 100644
--- a/libraries/ui-strings/src/main/res/values-ro/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Adăugați o reacție: %1$s"</string>
+  <string name="a11y_address">"Adresă"</string>
   <string name="a11y_avatar">"Imagine de profil"</string>
   <string name="a11y_collapse_message_text_field">"Micșorați câmpul mesajului"</string>
   <string name="a11y_delete">"Ștergere"</string>
@@ -14,6 +15,7 @@
   <string name="a11y_encryption_details">"Detalii privind criptarea"</string>
   <string name="a11y_expand_message_text_field">"Extindeți câmpul mesajului"</string>
   <string name="a11y_hide_password">"Ascundeți parola"</string>
+  <string name="a11y_info">"Informații"</string>
   <string name="a11y_join_call">"Alăturați-vă apelului"</string>
   <string name="a11y_jump_to_bottom">"Mergeți în jos"</string>
   <string name="a11y_move_the_map_to_my_location">"Mutați harta la locația mea"</string>
@@ -27,9 +29,12 @@
   <string name="a11y_pause">"Pauză"</string>
   <string name="a11y_paused_voice_message">"Mesaj vocal, durată:%1$s, poziție curentă: %2$s"</string>
   <string name="a11y_pin_field">"Câmp PIN"</string>
+  <string name="a11y_pinned_location">"Locație fixată"</string>
   <string name="a11y_play">"Redați"</string>
+  <string name="a11y_playback_speed">"Viteză de redare"</string>
   <string name="a11y_poll">"Sondaj"</string>
   <string name="a11y_poll_end">"Sondaj încheiat"</string>
+  <string name="a11y_qr_code">"Cod QR"</string>
   <string name="a11y_react_with">"Reacționați cu %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Reacționați cu alte emoji-uri"</string>
   <string name="a11y_read_receipts_multiple">"Citit de %1$s și %2$s"</string>
@@ -39,14 +44,17 @@
     <item quantity="other">"Citit de %1$s și incă %2$d"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Citit de %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Atingeți pentru a le afișa pe toate"</string>
   <string name="a11y_remove_reaction">"Îndepărtați reacția cu %1$s"</string>
   <string name="a11y_remove_reaction_with">"Îndepărtați reacția %1$s"</string>
   <string name="a11y_room_avatar">"Avatarul camerei"</string>
   <string name="a11y_send_files">"Trimiteți fișiere"</string>
+  <string name="a11y_sender_location">"Locația expeditorului"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Acțiune limitată în timp necesară, aveți un minut pentru a verifica"</string>
+  <string name="a11y_settings_with_required_action">"Setări, acțiune necesară"</string>
   <string name="a11y_show_password">"Afișați parola"</string>
   <string name="a11y_start_call">"Începeți un apel"</string>
+  <string name="a11y_start_video_call">"Inițiați un apel video"</string>
+  <string name="a11y_start_voice_call">"Inițiați un apel vocal"</string>
   <string name="a11y_tombstoned_room">"Cameră terminată"</string>
   <string name="a11y_user_avatar">"Avatar utilizator"</string>
   <string name="a11y_user_menu">"Meniu utilizator"</string>
@@ -58,15 +66,17 @@
   <string name="a11y_your_avatar">"Avatarul dumneavoastră"</string>
   <string name="action_accept">"Acceptați"</string>
   <string name="action_add_caption">"Adăugați o descriere"</string>
+  <string name="action_add_existing_rooms">"Adăugați camere existente"</string>
   <string name="action_add_to_timeline">"Adăugați listei de mesaje"</string>
   <string name="action_back">"Înapoi"</string>
-  <string name="action_call">"Apel"</string>
+  <string name="action_call">"Apelați"</string>
   <string name="action_cancel">"Anulați"</string>
   <string name="action_cancel_for_now">"Anulați pentru moment"</string>
+  <string name="action_choose_file">"Alegeți fișierul"</string>
   <string name="action_choose_photo">"Alegeți o fotografie"</string>
   <string name="action_clear">"Ștergeți"</string>
   <string name="action_close">"Închideți"</string>
-  <string name="action_complete_verification">"Verificare completă"</string>
+  <string name="action_complete_verification">"Finalizați verificarea"</string>
   <string name="action_confirm">"Confirmați"</string>
   <string name="action_confirm_password">"Confirmați parola"</string>
   <string name="action_continue">"Continuați"</string>
@@ -77,22 +87,27 @@
   <string name="action_copy_text">"Copiați textul"</string>
   <string name="action_create">"Creați"</string>
   <string name="action_create_room">"Creați o cameră"</string>
+  <string name="action_create_space">"Creeați spațiu"</string>
   <string name="action_deactivate">"Dezactivați"</string>
   <string name="action_deactivate_account">"Dezactivați contul"</string>
   <string name="action_decline">"Refuzați"</string>
   <string name="action_decline_and_block">"Refuzați și blocați"</string>
+  <string name="action_delete">"Ștergere"</string>
+  <string name="action_delete_account">"Ștergeți contul"</string>
   <string name="action_delete_poll">"Ștergeți sondajul"</string>
   <string name="action_deselect_all">"Deselectați tot"</string>
   <string name="action_disable">"Dezactivați"</string>
   <string name="action_discard">"Renunţare"</string>
   <string name="action_dismiss">"Renunțați"</string>
-  <string name="action_done">"Efectuat"</string>
+  <string name="action_done">"Terminat"</string>
+  <string name="action_download">"Descărcare"</string>
   <string name="action_edit">"Editați"</string>
   <string name="action_edit_caption">"Editați descrierea"</string>
   <string name="action_edit_poll">"Editați sondajul"</string>
   <string name="action_enable">"Activați"</string>
   <string name="action_end_poll">"Închideți sondajul"</string>
   <string name="action_enter_pin">"Introduceți PIN-ul"</string>
+  <string name="action_explore_public_spaces">"Explorați spațiile publice"</string>
   <string name="action_finish">"Finalizați"</string>
   <string name="action_forgot_password">"Ați uitat parola?"</string>
   <string name="action_forward">"Redirecționați"</string>
@@ -112,10 +127,11 @@
   <string name="action_leave_room">"Părăsiți camera"</string>
   <string name="action_leave_space">"Părăsiți spațiul"</string>
   <string name="action_load_more">"Încărcați mai mult"</string>
-  <string name="action_manage_account">"Administrare cont"</string>
-  <string name="action_manage_devices">"Gestionare dispozitive"</string>
+  <string name="action_manage_account">"Gestionați contul"</string>
+  <string name="action_manage_account_and_devices">"Gestionați contul și dispozitivele"</string>
+  <string name="action_manage_devices">"Gestionați dispozitivele"</string>
   <string name="action_manage_rooms">"Gestionați camerele"</string>
-  <string name="action_message">"Mesaj"</string>
+  <string name="action_message">"Contactați"</string>
   <string name="action_minimize">"Minimizați"</string>
   <string name="action_next">"Următorul"</string>
   <string name="action_no">"Nu"</string>
@@ -124,11 +140,11 @@
   <string name="action_open_context_menu">"Deschideți meniul contextual"</string>
   <string name="action_open_settings">"Setări"</string>
   <string name="action_open_with">"Deschideți cu"</string>
-  <string name="action_pin">"Fixează"</string>
+  <string name="action_pin">"Fixați"</string>
   <string name="action_quick_reply">"Raspuns rapid"</string>
-  <string name="action_quote">"Citat"</string>
+  <string name="action_quote">"Citați"</string>
   <string name="action_react">"Reacționați"</string>
-  <string name="action_reject">"Respinge"</string>
+  <string name="action_reject">"Respingeți"</string>
   <string name="action_remove">"Indepărtați"</string>
   <string name="action_remove_caption">"Ștergeți descrierea"</string>
   <string name="action_remove_message">"Ștergeți mesajul"</string>
@@ -139,7 +155,7 @@
   <string name="action_report_content">"Raportați conținutul"</string>
   <string name="action_report_dm">"Raportați conversația"</string>
   <string name="action_report_room">"Raportați camera"</string>
-  <string name="action_reset">"Resetare"</string>
+  <string name="action_reset">"Resetați"</string>
   <string name="action_reset_identity">"Resetați identitatea"</string>
   <string name="action_retry">"Reîncercați"</string>
   <string name="action_retry_decryption">"Reîncercați decriptarea"</string>
@@ -152,7 +168,8 @@
   <string name="action_send_voice_message">"Trimiteți un mesaj vocal"</string>
   <string name="action_share">"Partajați"</string>
   <string name="action_share_link">"Partajați linkul"</string>
-  <string name="action_show">"Afișare"</string>
+  <string name="action_share_live_location">"Partajați locația în timp real"</string>
+  <string name="action_show">"Afișați"</string>
   <string name="action_sign_in_again">"Autentificați-vă din nou"</string>
   <string name="action_signout">"Deconectați-vă"</string>
   <string name="action_signout_anyway">"Deconectați-vă oricum"</string>
@@ -162,10 +179,12 @@
   <string name="action_start_over">"Începeți din nou"</string>
   <string name="action_start_verification">"Începeți verificarea"</string>
   <string name="action_static_map_load">"Atingeți pentru a încărca harta"</string>
+  <string name="action_stop">"Opriți"</string>
   <string name="action_take_photo">"Faceți o fotografie"</string>
   <string name="action_tap_for_options">"Atingeți pentru opțiuni"</string>
+  <string name="action_translate">"Traduceți"</string>
   <string name="action_try_again">"Încercați din nou"</string>
-  <string name="action_unpin">"Defixeaza"</string>
+  <string name="action_unpin">"Defixați"</string>
   <string name="action_view">"Vizualizați"</string>
   <string name="action_view_in_timeline">"Vedeți în lista de mesaje"</string>
   <string name="action_view_source">"Vedeți sursă"</string>
@@ -175,8 +194,8 @@
   <string name="banner_migrate_to_native_sliding_sync_title">"Upgrade disponibil"</string>
   <string name="common_about">"Despre"</string>
   <string name="common_acceptable_use_policy">"Politică de utilizare rezonabilă"</string>
-  <string name="common_add_account">"Adăugați un cont"</string>
-  <string name="common_add_another_account">"Adăugați un alt cont"</string>
+  <string name="common_add_account">"Adăugare cont"</string>
+  <string name="common_add_another_account">"Adăugare cont"</string>
   <string name="common_adding_caption">"Adăugare descriere"</string>
   <string name="common_advanced_settings">"Setări avansate"</string>
   <string name="common_an_image">"o imagine"</string>
@@ -188,16 +207,18 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Utilizatori blocați"</string>
   <string name="common_bubbles">"Baloane"</string>
-  <string name="common_call_started">"A început un apel"</string>
+  <string name="common_call_declined">"Apel respins"</string>
+  <string name="common_call_started">"Apel inițiat"</string>
+  <string name="common_call_you_declined">"Ați respins un apel"</string>
   <string name="common_chat_backup">"Backup conversații"</string>
   <string name="common_copied_to_clipboard">"Copiat în clipboard"</string>
   <string name="common_copyright">"Drepturi de autor"</string>
   <string name="common_creating_room">"Se creează camera…"</string>
+  <string name="common_creating_space">"Se crează spațiul"</string>
   <string name="common_current_user_canceled_knock">"Cerere anulată"</string>
-  <string name="common_current_user_left_room">"Ați parăsit camera"</string>
-  <string name="common_current_user_left_space">"S-a părăsit spațiul"</string>
+  <string name="common_current_user_left_room">"Cameră părăsită"</string>
+  <string name="common_current_user_left_space">"Spațiu părăsit"</string>
   <string name="common_current_user_rejected_invite">"Invitația a fost refuzată"</string>
-  <string name="common_dark">"Întunecat"</string>
   <string name="common_decryption_error">"Eroare de decriptare"</string>
   <string name="common_description">"Descriere"</string>
   <string name="common_developer_options">"Opțiuni programator"</string>
@@ -213,6 +234,7 @@
   <string name="common_empty_file">"Fișier gol"</string>
   <string name="common_encryption">"Criptare"</string>
   <string name="common_encryption_enabled">"Criptare activată"</string>
+  <string name="common_ends_at">"Se termină la %1$s"</string>
   <string name="common_enter_your_pin">"Introduceți codul PIN"</string>
   <string name="common_error">"Eroare"</string>
   <string name="common_error_registering_pusher_android">"A apărut o eroare, este posibil să nu primiți notificări pentru mesaje noi. Vă rugăm să depanați notificările din setări.
@@ -222,6 +244,7 @@ Motiv:%1$s."</string>
   <string name="common_failed">"Eșuat"</string>
   <string name="common_favourite">"Favorite"</string>
   <string name="common_favourited">"Favorită"</string>
+  <string name="common_fetching_notifications_title_android">"Se sincronizează notificările…"</string>
   <string name="common_file">"Fişier"</string>
   <string name="common_file_deleted">"Fișier șters"</string>
   <string name="common_file_saved">"Fișier salvat"</string>
@@ -235,10 +258,11 @@ Motiv:%1$s."</string>
   <string name="common_invite_unknown_profile">"Nu am putut valida ID-ul Matrix al acestui utilizator. Este posibil ca invitația să nu fi fost trimisă."</string>
   <string name="common_leaving_room">"Se părăsește conversația"</string>
   <string name="common_leaving_space">"Se părăsește spațiul"</string>
-  <string name="common_light">"Deschis"</string>
   <string name="common_line_copied_to_clipboard">"Linie copiată în clipboard"</string>
   <string name="common_link_copied_to_clipboard">"Linkul a fost copiat în clipboard"</string>
   <string name="common_link_new_device">"Conectați un dispozitiv nou"</string>
+  <string name="common_live_location">"Locație în timp real"</string>
+  <string name="common_live_location_ended">"Locația în timp real s-a încheiat"</string>
   <string name="common_loading">"Se încarcă…"</string>
   <string name="common_loading_more">"Se încarcă…"</string>
   <plurals name="common_many_members">
@@ -257,7 +281,7 @@ Motiv:%1$s."</string>
   <string name="common_message_layout">"Aspectul mesajelor"</string>
   <string name="common_message_removed">"Mesaj șters"</string>
   <string name="common_modern">"Modern"</string>
-  <string name="common_mute">"Dezactivați sunetul"</string>
+  <string name="common_mute">"Dezactivare sunet"</string>
   <string name="common_name">"Nume"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Niciun rezultat"</string>
@@ -267,6 +291,7 @@ Motiv:%1$s."</string>
   <string name="common_offline">"Deconectat"</string>
   <string name="common_open_source_licenses">"Licențe open source"</string>
   <string name="common_or">"sau"</string>
+  <string name="common_other_options">"Alte opțiuni"</string>
   <string name="common_password">"Parola"</string>
   <string name="common_people">"Persoane"</string>
   <string name="common_permalink">"Permalink"</string>
@@ -285,8 +310,10 @@ Motiv:%1$s."</string>
   </plurals>
   <string name="common_preparing">"Se pregăteşte…"</string>
   <string name="common_privacy_policy">"Politica de confidențialitate"</string>
+  <string name="common_private">"Privat"</string>
   <string name="common_private_room">"Cameră privată"</string>
   <string name="common_private_space">"Spațiu privat"</string>
+  <string name="common_public">"Public"</string>
   <string name="common_public_room">"Cameră publică"</string>
   <string name="common_public_space">"Spațiu public"</string>
   <string name="common_reaction">"Reacţie"</string>
@@ -294,19 +321,20 @@ Motiv:%1$s."</string>
   <string name="common_reason">"Motiv"</string>
   <string name="common_recovery_key">"Cheie de recuperare"</string>
   <string name="common_refreshing">"Se actualizează"</string>
+  <string name="common_removing">"Se elimină…"</string>
   <plurals name="common_replies">
     <item quantity="one">"%1$d răspuns"</item>
     <item quantity="few">"%1$d răspunsuri"</item>
     <item quantity="other">"%1$d răspunsuri"</item>
   </plurals>
   <string name="common_replying_to">"Răspuns pentru %1$s"</string>
-  <string name="common_report_a_bug">"Raportați o eroare"</string>
   <string name="common_report_a_problem">"Raportați o problemă"</string>
   <string name="common_report_submitted">"Raport trimis"</string>
   <string name="common_rich_text_editor">"Editor text avansat"</string>
+  <string name="common_role">"Rol"</string>
   <string name="common_room">"Cameră"</string>
   <string name="common_room_name">"Numele camerei"</string>
-  <string name="common_room_name_placeholder">"de exemplu, numele proiectului dvs."</string>
+  <string name="common_room_name_placeholder">"de exemplu, numele proiectului dumneavoastră"</string>
   <plurals name="common_rooms">
     <item quantity="one">"%1$d Camera"</item>
     <item quantity="few">"%1$d Camere"</item>
@@ -320,6 +348,11 @@ Motiv:%1$s."</string>
   <string name="common_security">"Securitate"</string>
   <string name="common_seen_by">"Văzut de"</string>
   <string name="common_select_account">"Selectați un cont"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d selectat"</item>
+    <item quantity="few">"%1$d selectate"</item>
+    <item quantity="other">"%1$d selectate"</item>
+  </plurals>
   <string name="common_send_to">"Trimiteți către"</string>
   <string name="common_sending">"Se trimite…"</string>
   <string name="common_sending_failed">"Trimiterea a eșuat"</string>
@@ -329,13 +362,16 @@ Motiv:%1$s."</string>
   <string name="common_server_unreachable">"Serverul nu poate fi accesat"</string>
   <string name="common_server_url">"Adresa URL a serverului"</string>
   <string name="common_settings">"Setări"</string>
-  <string name="common_share_space">"Partajați spațiul"</string>
+  <string name="common_share_space">"Partajare spațiu"</string>
+  <string name="common_shared_history">"Membrii noi pot vedea istoricul"</string>
+  <string name="common_shared_live_location">"Locație în timp real partajată"</string>
   <string name="common_shared_location">"Locație partajată"</string>
   <string name="common_shared_space">"Spațiu comun"</string>
-  <string name="common_signing_out">"Deconectare în curs"</string>
+  <string name="common_signing_out">"Eliminare în curs"</string>
   <string name="common_something_went_wrong">"Ceva nu a mers bine"</string>
   <string name="common_something_went_wrong_message">"Am întâmpinat o problemă. Vă rugăm să încercați din nou."</string>
   <string name="common_space">"Spațiu"</string>
+  <string name="common_space_members">"Membrii spațiului"</string>
   <string name="common_space_topic_placeholder">"Despre ce este vorba în acest spațiu?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Spațiu"</item>
@@ -345,23 +381,24 @@ Motiv:%1$s."</string>
   <string name="common_starting_chat">"Se începe conversația…"</string>
   <string name="common_sticker">"Autocolant"</string>
   <string name="common_success">"Succes"</string>
+  <string name="common_suggested">"Sugerat"</string>
   <string name="common_suggestions">"Sugestii"</string>
   <string name="common_syncing">"Se sincronizează…"</string>
-  <string name="common_system">"Sistem"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Notificări despre software de la terți"</string>
   <string name="common_thread">"Fir"</string>
+  <string name="common_threads">"Fire"</string>
   <string name="common_topic">"Subiect"</string>
   <string name="common_topic_placeholder">"Despre ce este vorba în această cameră?"</string>
   <string name="common_unable_to_decrypt">"Nu s-a putut decripta"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Trimis de pe un dispozitiv nesigur"</string>
   <string name="common_unable_to_decrypt_no_access">"Nu aveți acces la acest mesaj"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Identitatea verificată a expeditorului a fost resetată"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Identitatea digitala verificată a expeditorului a fost resetată"</string>
   <string name="common_unable_to_invite_message">"Nu am putut trimite invitații unuia sau mai multor utilizatori."</string>
   <string name="common_unable_to_invite_title">"Nu s-a putut trimite invitația (invitațiile)"</string>
   <string name="common_unlock">"Deblocare"</string>
-  <string name="common_unmute">"Activați sunetul"</string>
-  <string name="common_unsupported_call">"Apel nesuportat"</string>
+  <string name="common_unmute">"Activare sunet"</string>
+  <string name="common_unsupported_call">"Apel incompatibil"</string>
   <string name="common_unsupported_event">"Eveniment neacceptat"</string>
   <string name="common_username">"Utilizator"</string>
   <string name="common_verification_cancelled">"Verificare anulată"</string>
@@ -381,14 +418,19 @@ Motiv:%1$s."</string>
   <string name="common_voice_message">"Mesaj vocal"</string>
   <string name="common_waiting">"Se aşteaptă…"</string>
   <string name="common_waiting_for_decryption_key">"Mesaj în așteptare"</string>
+  <string name="common_waiting_live_location">"Se așteptă localizarea în timp real…"</string>
+  <string name="common_world_readable_history">"Oricine poate vedea istoricul"</string>
   <string name="common_you">"Dumneavoastră"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) a distribuit acest mesaj deoarece nu erați în cameră când a fost trimis."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s a distribuit acest mesaj deoarece nu erați în cameră când a fost trimis."</string>
   <string name="crypto_history_visible">"Această cameră a fost configurată astfel încât noii membri să poată citi istoricul. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"Identitatea lui %1$s a fost resetată. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"Identitatea %2$s a lui %1$s a fost resetată. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Identitatea digitala lui %1$s a fost resetată. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Identitatea digitala %2$s a lui %1$s a fost resetată. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
   <string name="crypto_identity_change_profile_pin_violation">"Identitatea lui %1$s a fost resetată."</string>
-  <string name="crypto_identity_change_verification_violation_new">"Identitatea %2$s a lui %1$s a fost resetată. %3$s"</string>
+  <string name="crypto_identity_change_verification_violation_new">"Identitatea digitală %2$s a lui %1$s a fost resetată. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Retrageți verificarea"</string>
+  <string name="dialog_allow_access">"Permiteți accesul"</string>
   <string name="dialog_confirm_link_message">"Linkul %1$s vă redirecționează către un alt site %2$s
 
 Sunteți sigur că doriți să continuați?"</string>
@@ -409,7 +451,6 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Dimensiunea maximă permisă pentru fișiere este: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Selectați calitatea videoclipului pe care doriți să îl încărcați."</string>
   <string name="dialog_video_quality_selector_title">"Selectați calitatea de încărcare a videoclipurilor"</string>
-  <string name="emoji_picker_search_placeholder">"Căutați emoticoane"</string>
   <string name="error_account_already_logged_in">"Sunteți deja conectat pe acest dispozitiv ca %1$s."</string>
   <string name="error_account_creation_not_possible">"Serverul dumneavoastră trebuie actualizat pentru a suporta serviciul de autentificare Matrix și crearea de conturi."</string>
   <string name="error_failed_creating_the_permalink">"Crearea permalink-ului a eșuat"</string>
@@ -418,6 +459,7 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="error_failed_locating_user">"%1$s nu a putut accesa locația dumneavoastră. Vă rugăm să încercați din nou mai târziu."</string>
   <string name="error_failed_uploading_voice_message">"Trimiterea mesajului vocal nu a reușit."</string>
   <string name="error_invalid_invite">"Camera nu mai există sau invitația nu mai este valabilă."</string>
+  <string name="error_location_service_disabled_android">"Vă rugăm să activați GPS-ul pentru a accesa funcțiile bazate pe locație."</string>
   <string name="error_message_not_found">"Mesajul nu a fost găsit"</string>
   <string name="error_missing_location_auth_android">"%1$s nu are permisiuni pentru a accesa locația dumneavoastră. Puteți permite accesul în Setări."</string>
   <string name="error_missing_location_rationale_android">"%1$s nu are permisiuni pentru a accesa locația dumneavoastră. Permiteți accesul mai jos."</string>
@@ -429,6 +471,9 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="error_unknown">"Ne pare rău, a apărut o eroare"</string>
   <string name="invite_friends_rich_title">"🔐️ Alăturați-vă mie în %1$s"</string>
   <string name="invite_friends_text">"Hei, vorbește cu mine pe %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Partajarea locației în timp real"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Partajarea locației este în curs de desfășurare"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Locație în timp real"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake pentru a raporta erori"</string>
   <string name="screen_bug_report_a11y_screenshot">"Captură de ecran"</string>
@@ -436,6 +481,14 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="screen_create_poll_options_section_title">"Opțiuni"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Ștergeți %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Setări"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nimeni nu își partajează locația"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Se partajează locația în timp real"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d persoană"</item>
+    <item quantity="few">"%1$d persoane"</item>
+    <item quantity="other">"%1$d persoane"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Pe hartă"</string>
   <string name="screen_media_picker_error_failed_selection">"Selectarea fișierelor media a eșuat, încercați din nou."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Apăsați pe un mesaj și alegeți \"%1$s\" pentru a-l include aici."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Fixați mesajele importante, astfel încât să poată fi descoperite cu ușurință"</string>
@@ -445,11 +498,11 @@ Sunteți sigur că doriți să continuați?"</string>
     <item quantity="other">"%1$d Mesaje fixate"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Mesaje fixate"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Urmează să accesați contul dvs. %1$s pentru a vă reseta identitatea. După aceea, veți fi redirecționat către aplicație."</string>
-  <string name="screen_reset_identity_confirmation_title">"Nu puteți confirma? Accesați contul dvs. pentru a vă reseta identitatea."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Urmează să accesați contul dvs. %1$s pentru a vă reseta identitatea digitală. După aceea, veți fi redirecționat către aplicație."</string>
+  <string name="screen_reset_identity_confirmation_title">"Nu puteți confirma? Accesați contul dumneavoastră pentru a vă reseta identitatea digitală."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Retrageți verificarea și trimiteți"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Puteți să vă retrageți verificarea și să trimiteți acest mesaj oricum, sau puteți anula pentru moment și să încercați din nou mai târziu după reverificarea lui %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Mesajul dumneavoastră nu a fost trimis deoarece identitatea verificată a lui %1$s s-a schimbat"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Mesajul dumneavoastră nu a fost trimis deoarece identitatea digitala verificată a lui %1$s s-a schimbat"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Trimiteți mesajul oricum"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s utilizează unul sau mai multe dispozitive neverificate. Puteți trimite mesajul oricum sau puteți anula pentru moment și puteți încerca din nou mai târziu, după ce %2$s își va verifica toate dispozitivele."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Mesajul dvs. nu a fost trimis deoarece %1$s nu si-a verificat toate dispozitivele"</string>
@@ -461,6 +514,7 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="screen_room_event_pill">"Mesaj în %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Extindeți"</string>
   <string name="screen_room_grouped_state_events_reduce">"Reduceți"</string>
+  <string name="screen_room_live_location_banner">"Se partajează locația în timp real"</string>
   <string name="screen_room_permalink_same_room_android">"Deja vizualizați această cameră!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s din %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Mesaje fixate"</string>
@@ -472,12 +526,16 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="screen_share_open_apple_maps">"Deschideți în Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Deschideți în Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Deschideți în OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Distribuiți această locație"</string>
+  <string name="screen_share_this_location_action">"Partajați locația selectată"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Opțiuni de partajare"</string>
   <string name="screen_space_list_description">"Spații pe care le-ați creat sau la care v-ați alăturat."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Creați spații pentru a organiza camerele"</string>
   <string name="screen_space_list_parent_space">"Spațiu %1$s"</string>
   <string name="screen_space_list_title">"Spații"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Mesajul nu a fost trimis deoarece identitatea verificată a lui %1$s s-a schimbat."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Partajat %1$s"</string>
+  <string name="screen_static_location_sheet_title">"Pe hartă"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Mesajul nu a fost trimis deoarece identitatea digitala verificată a lui %1$s s-a schimbat."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Mesajul nu a fost trimis deoarece %1$s nu a verificat toate dispozitivele."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Mesajul nu a fost trimis deoarece nu ați verificat unul sau mai multe dispozitive."</string>
   <string name="screen_view_location_title">"Locație"</string>
@@ -487,5 +545,5 @@ Sunteți sigur că doriți să continuați?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Trebuie să verificați acest dispozitiv pentru a avea acces la mesajele anterioare."</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Nu aveți acces la acest mesaj"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Nu s-a putut decripta mesajul"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Acest mesaj a fost blocat fie pentru că nu ați verificat dispozitivul, fie pentru că expeditorul trebuie să vă verifice identitatea."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Acest mesaj a fost blocat fie pentru că nu ați verificat dispozitivul, fie pentru că expeditorul trebuie să vă verifice identitatea digitală."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml
index 4ae92c03ea..892d4348c1 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Добавить аватар"</string>
   <string name="a11y_add_reaction">"Добавить реакцию: %1$s"</string>
   <string name="a11y_address">"Адрес"</string>
   <string name="a11y_avatar">"Аватар"</string>
+  <string name="a11y_clear_search_field">"Очистить поле поиска"</string>
   <string name="a11y_collapse_message_text_field">"Свернуть поле ввода"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Уменьшить количество голосов, разрешенных на одного человека"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Увеличь количество голосов, разрешенных на одного человека"</string>
   <string name="a11y_delete">"Удалить"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"Введена %1$d цифра"</item>
     <item quantity="few">"Введено %1$d цифры"</item>
     <item quantity="many">"Введено %1$d цифр"</item>
   </plurals>
+  <string name="a11y_duration">"Продолжительность: %1$s"</string>
   <string name="a11y_edit_avatar">"Изменить аватар"</string>
   <string name="a11y_edit_room_address_hint">"Полный адрес %1$s"</string>
   <string name="a11y_encryption_details">"Сведения о шифровании"</string>
   <string name="a11y_expand_message_text_field">"Развернуть поле ввода"</string>
   <string name="a11y_hide_password">"Скрыть пароль"</string>
+  <string name="a11y_info">"Информация"</string>
   <string name="a11y_join_call">"Присоединиться к звонку"</string>
   <string name="a11y_jump_to_bottom">"Перейти вниз"</string>
+  <string name="a11y_jump_to_unread">"Перейти к непрочитанным"</string>
   <string name="a11y_move_the_map_to_my_location">"Переместить карту к моему местоположению"</string>
   <string name="a11y_notifications_mentions_only">"Только упоминания"</string>
   <string name="a11y_notifications_muted">"Без звука"</string>
@@ -27,35 +34,43 @@
   <string name="a11y_page_n">"Страница %1$d"</string>
   <string name="a11y_pause">"Приостановить"</string>
   <string name="a11y_paused_voice_message">"Голосовое сообщение, длительность: %1$s, текущая позиция: %2$s"</string>
+  <string name="a11y_photo_preview">"Пред. просмотр фото"</string>
   <string name="a11y_pin_field">"Поле PIN-кода"</string>
   <string name="a11y_pinned_location">"Закреплённое местоположение"</string>
   <string name="a11y_play">"Воспроизвести"</string>
   <string name="a11y_playback_speed">"Скорость воспроизведения"</string>
   <string name="a11y_poll">"Опрос"</string>
   <string name="a11y_poll_end">"Завершённый опрос"</string>
+  <string name="a11y_position">"Позиция: %1$s"</string>
   <string name="a11y_qr_code">"QR-код"</string>
   <string name="a11y_react_with">"Реагировать вместе с %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Реакция с помощью эмодзи"</string>
   <string name="a11y_read_receipts_multiple">"Прочитано %1$s и %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Прочитано %1$s и %2$d другим"</item>
-    <item quantity="few">"Прочитано %1$s и %2$d другими"</item>
-    <item quantity="many">"Прочитано %1$s и %2$d другими"</item>
+    <item quantity="one">"Предыдущее сообщение прочитано пользователями %1$s и %2$d."</item>
+    <item quantity="few">"Предыдущее сообщение прочитано пользователями %1$s и %2$d."</item>
+    <item quantity="many">"Предыдущие сообщения прочитаны пользователями %1$s и %2$d."</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Прочитано %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Нажмите, чтобы показать все"</string>
+  <string name="a11y_read_receipts_single">"Предыдущее сообщение прочитали %1$s человек"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"показать все уведомления о прочтении"</string>
   <string name="a11y_remove_reaction">"Удалить реакцию с %1$s"</string>
   <string name="a11y_remove_reaction_with">"Удалить реакцию %1$s"</string>
   <string name="a11y_room_avatar">"Аватар комнаты"</string>
   <string name="a11y_send_files">"Отправить файлы"</string>
   <string name="a11y_sender_location">"Местоположение отправителя"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Требуется действие, на которое есть ограничение по времени, у вас есть одна минута для проверки"</string>
+  <string name="a11y_sent_by_sender_at_date">"Отправлено пользователем %1$s в %2$s"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Требуется действие, на которое есть ограничение по времени, у Вас есть одна минута для проверки"</string>
+  <string name="a11y_settings_with_required_action">"Настройки, требуется действие"</string>
   <string name="a11y_show_password">"Показать пароль"</string>
   <string name="a11y_start_call">"Начать звонок"</string>
+  <string name="a11y_start_video_call">"Начать видеозвонок"</string>
   <string name="a11y_start_voice_call">"Начать голосовой вызов"</string>
+  <string name="a11y_thread_in_room">"Обсуждение в %1$s"</string>
+  <string name="a11y_threads_in_room">"Обсуждения в %1$s"</string>
   <string name="a11y_tombstoned_room">"Брошенная комната"</string>
   <string name="a11y_user_avatar">"Аватар пользователя"</string>
   <string name="a11y_user_menu">"Меню пользователя"</string>
+  <string name="a11y_video_preview">"Видео-превью"</string>
   <string name="a11y_view_avatar">"Просмотреть аватар"</string>
   <string name="a11y_view_details">"Подробнее"</string>
   <string name="a11y_voice_message">"Голосовое сообщение, продолжительность: %1$s"</string>
@@ -70,6 +85,7 @@
   <string name="action_call">"Позвонить"</string>
   <string name="action_cancel">"Отмена"</string>
   <string name="action_cancel_for_now">"Пока отменить"</string>
+  <string name="action_choose_file">"Выберите файл"</string>
   <string name="action_choose_photo">"Выбрать фото"</string>
   <string name="action_clear">"Очистить"</string>
   <string name="action_close">"Закрыть"</string>
@@ -89,12 +105,16 @@
   <string name="action_deactivate_account">"Отключить учётную запись"</string>
   <string name="action_decline">"Отклонить"</string>
   <string name="action_decline_and_block">"Отклонить и заблокировать"</string>
+  <string name="action_delete">"Удалить"</string>
+  <string name="action_delete_account">"Удалить аккаунт"</string>
+  <string name="action_delete_file">"Удалить файл"</string>
   <string name="action_delete_poll">"Удалить опрос"</string>
   <string name="action_deselect_all">"Отменить выбор"</string>
   <string name="action_disable">"Отключить"</string>
   <string name="action_discard">"Отменить"</string>
   <string name="action_dismiss">"Закрыть"</string>
   <string name="action_done">"Готово"</string>
+  <string name="action_download">"Скачать"</string>
   <string name="action_edit">"Редактировать"</string>
   <string name="action_edit_caption">"Изменить подпись"</string>
   <string name="action_edit_poll">"Редактировать опрос"</string>
@@ -120,8 +140,9 @@
   <string name="action_leave_conversation">"Покинуть беседу"</string>
   <string name="action_leave_room">"Покинуть комнату"</string>
   <string name="action_leave_space">"Покинуть пространство"</string>
-  <string name="action_load_more">"Загрузить еще"</string>
+  <string name="action_load_more">"Загрузить ещё"</string>
   <string name="action_manage_account">"Настройки аккаунта"</string>
+  <string name="action_manage_account_and_devices">"Управление учетной записью и устройствами"</string>
   <string name="action_manage_devices">"Управление устройствами"</string>
   <string name="action_manage_rooms">"Управление комнатами"</string>
   <string name="action_message">"Написать"</string>
@@ -142,7 +163,7 @@
   <string name="action_remove_caption">"Удалить подпись"</string>
   <string name="action_remove_message">"Удалить сообщение"</string>
   <string name="action_reply">"Ответить"</string>
-  <string name="action_reply_in_thread">"Ответить в ветке"</string>
+  <string name="action_reply_in_thread">"Обсудить"</string>
   <string name="action_report">"Пожаловаться"</string>
   <string name="action_report_bug">"Сообщить об ошибке"</string>
   <string name="action_report_content">"Пожаловаться на содержание"</string>
@@ -165,24 +186,27 @@
   <string name="action_show">"Показать"</string>
   <string name="action_sign_in_again">"Повторить вход"</string>
   <string name="action_signout">"Удалить это устройство"</string>
-  <string name="action_signout_anyway">"Все равно удалить это устройство"</string>
+  <string name="action_signout_anyway">"Всё равно удалить это устройство"</string>
   <string name="action_skip">"Пропустить"</string>
   <string name="action_start">"Начать"</string>
   <string name="action_start_chat">"Начать чат"</string>
   <string name="action_start_over">"Начать заново"</string>
   <string name="action_start_verification">"Начать подтверждение"</string>
   <string name="action_static_map_load">"Нажмите, чтобы загрузить карту"</string>
+  <string name="action_stop">"Остановить"</string>
   <string name="action_take_photo">"Сделать фото"</string>
   <string name="action_tap_for_options">"Нажмите для просмотра вариантов"</string>
   <string name="action_translate">"Перевести"</string>
   <string name="action_try_again">"Повторить попытку"</string>
   <string name="action_unpin">"Открепить"</string>
+  <string name="action_video_call">"Видеозвонок"</string>
   <string name="action_view">"Просмотреть"</string>
   <string name="action_view_in_timeline">"Просмотреть в хронологии"</string>
   <string name="action_view_source">"Показать источник"</string>
+  <string name="action_voice_call">"Голосовой звонок"</string>
   <string name="action_yes">"Да"</string>
-  <string name="action_yes_try_again">"Да, попробовать еще раз"</string>
-  <string name="banner_migrate_to_native_sliding_sync_description">"Теперь ваш сервер поддерживает новый, более быстрый протокол. Чтобы обновить его прямо сейчас, выйдите и войдите в свою учётную запись снова. Сделав это сейчас, вы сможете избежать принудительного выхода из системы при последующем удалении старого протокола."</string>
+  <string name="action_yes_try_again">"Да, попробовать ещё раз"</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"Теперь Ваш сервер поддерживает новый, более быстрый протокол. Чтобы обновить его прямо сейчас, выйдите и войдите в свою учётную запись снова. Сделав это сейчас, Вы сможете избежать принудительного выхода из системы при последующем удалении старого протокола."</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"Доступно обновление"</string>
   <string name="common_about">"О приложении"</string>
   <string name="common_acceptable_use_policy">"Политика допустимого использования"</string>
@@ -192,7 +216,6 @@
   <string name="common_advanced_settings">"Расширенные настройки"</string>
   <string name="common_an_image">"изображение"</string>
   <string name="common_analytics">"Аналитика"</string>
-  <string name="common_android_fetching_notifications_title">"Синхронизация уведомлений…"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Вы покинули комнату"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Вы вышли из сессии"</string>
   <string name="common_appearance">"Внешний вид"</string>
@@ -200,7 +223,10 @@
   <string name="common_beta">"Бета-версия"</string>
   <string name="common_blocked_users">"Заблокированные пользователи"</string>
   <string name="common_bubbles">"Пузыри"</string>
+  <string name="common_call_declined">"Вызов отклонен"</string>
+  <string name="common_call_in_progress">"Звонок выполняется"</string>
   <string name="common_call_started">"Звонок начат"</string>
+  <string name="common_call_you_declined">"Ты отклонил звонок"</string>
   <string name="common_chat_backup">"Резервная копия чатов"</string>
   <string name="common_copied_to_clipboard">"Скопировано в буфер обмена"</string>
   <string name="common_copyright">"Авторское право"</string>
@@ -210,7 +236,6 @@
   <string name="common_current_user_left_room">"Покинул комнату"</string>
   <string name="common_current_user_left_space">"Покинуть пространство"</string>
   <string name="common_current_user_rejected_invite">"Приглашение отклонено"</string>
-  <string name="common_dark">"Темная"</string>
   <string name="common_decryption_error">"Ошибка расшифровки"</string>
   <string name="common_description">"Описание"</string>
   <string name="common_developer_options">"Для разработчиков"</string>
@@ -226,6 +251,7 @@
   <string name="common_empty_file">"Пустой файл"</string>
   <string name="common_encryption">"Шифрование"</string>
   <string name="common_encryption_enabled">"Шифрование включено"</string>
+  <string name="common_ends_at">"Время завершения: %1$s"</string>
   <string name="common_enter_your_pin">"Введите свой PIN-код"</string>
   <string name="common_error">"Ошибка"</string>
   <string name="common_error_registering_pusher_android">"Произошла ошибка. Вы можете не получать уведомления о новых сообщениях. Устраните неполадки с уведомлениями в настройках.
@@ -235,20 +261,22 @@
   <string name="common_failed">"Ошибка"</string>
   <string name="common_favourite">"Избранное"</string>
   <string name="common_favourited">"Избранное"</string>
+  <string name="common_fetching_notifications_title_android">"Синхронизация уведомлений…"</string>
   <string name="common_file">"Файл"</string>
   <string name="common_file_deleted">"Файл удалён"</string>
   <string name="common_file_saved">"Файл сохранен"</string>
   <string name="common_file_saved_on_disk_android">"Файл сохранен в «Загрузки»"</string>
   <string name="common_forward_message">"Переслать сообщение"</string>
   <string name="common_frequently_used">"Часто используемые"</string>
+  <string name="common_gallery">"Галерея"</string>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Выполняется групповой звонок"</string>
   <string name="common_image">"Изображение"</string>
   <string name="common_in_reply_to">"В ответ %1$s"</string>
   <string name="common_install_apk_android">"Установить APK"</string>
   <string name="common_invite_unknown_profile">"Идентификатор Matrix ID не найден, приглашение может быть не получено."</string>
   <string name="common_leaving_room">"Покидаем комнату"</string>
   <string name="common_leaving_space">"Покидаем пространство"</string>
-  <string name="common_light">"Светлое"</string>
   <string name="common_line_copied_to_clipboard">"Строка скопирована в буфер обмена"</string>
   <string name="common_link_copied_to_clipboard">"Ссылка скопирована в буфер обмена"</string>
   <string name="common_link_new_device">"Привязать новое устройство"</string>
@@ -292,6 +320,7 @@
   <string name="common_please_wait">"Подождите…"</string>
   <string name="common_poll_end_confirmation">"Вы действительно хотите завершить данный опрос?"</string>
   <string name="common_poll_summary">"Опрос: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Опрос"</string>
   <string name="common_poll_total_votes">"Всего голосов: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Результаты будут показаны после завершения опроса"</string>
   <plurals name="common_poll_votes_count">
@@ -319,7 +348,6 @@
     <item quantity="many">"%1$d ответов"</item>
   </plurals>
   <string name="common_replying_to">"Отвечает %1$s"</string>
-  <string name="common_report_a_bug">"Сообщить об ошибке"</string>
   <string name="common_report_a_problem">"Сообщить о проблеме"</string>
   <string name="common_report_submitted">"Отчет отправлен"</string>
   <string name="common_rich_text_editor">"Форматирование"</string>
@@ -361,7 +389,7 @@
   <string name="common_shared_space">"Общее пространство"</string>
   <string name="common_signing_out">"Удаление устройства"</string>
   <string name="common_something_went_wrong">"Что-то пошло не так"</string>
-  <string name="common_something_went_wrong_message">"Мы столкнулись с проблемой. Пожалуйста, попробуйте еще раз."</string>
+  <string name="common_something_went_wrong_message">"Мы столкнулись с проблемой. Пожалуйста, попробуйте ещё раз."</string>
   <string name="common_space">"Пространство"</string>
   <string name="common_space_members">"Участники пространства"</string>
   <string name="common_space_topic_placeholder">"О чём это пространство?"</string>
@@ -376,10 +404,10 @@
   <string name="common_suggested">"Рекомендуемые"</string>
   <string name="common_suggestions">"Предложения"</string>
   <string name="common_syncing">"Синхронизация"</string>
-  <string name="common_system">"Системное"</string>
   <string name="common_text">"Текст"</string>
   <string name="common_third_party_notices">"Уведомления о третьих лицах"</string>
-  <string name="common_thread">"Ветка"</string>
+  <string name="common_thread">"Обсуждение"</string>
+  <string name="common_threads">"Обсуждения"</string>
   <string name="common_topic">"Тема"</string>
   <string name="common_topic_placeholder">"О чем эта комната?"</string>
   <string name="common_unable_to_decrypt">"Невозможно расшифровать"</string>
@@ -392,6 +420,7 @@
   <string name="common_unmute">"Вкл. звук"</string>
   <string name="common_unsupported_call">"Неподдерживаемый вызов"</string>
   <string name="common_unsupported_event">"Неподдерживаемое событие"</string>
+  <string name="common_user_started_a_call">"%1$s начал звонок"</string>
   <string name="common_username">"Имя пользователя"</string>
   <string name="common_verification_cancelled">"Подтверждение отменено"</string>
   <string name="common_verification_complete">"Подтверждение завершено"</string>
@@ -413,8 +442,12 @@
   <string name="common_waiting_live_location">"Ожидание трансляции местоположения…"</string>
   <string name="common_world_readable_history">"Любой может видеть историю"</string>
   <string name="common_you">"Вы"</string>
-  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) поделился этим сообщением, поскольку вас не было в комнате, когда оно было отправлено."</string>
-  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s поделился этим сообщением, поскольку вас не было в комнате, когда оно было отправлено."</string>
+  <string name="content_scanner_not_found">"Загрузка недоступна."</string>
+  <string name="content_scanner_not_found_title">"Файл не найден"</string>
+  <string name="content_scanner_unsafe_message">"Пред. просмотр и загрузка отключены."</string>
+  <string name="content_scanner_unsafe_title">"Файл небезопасен"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) поделился(ась) этим сообщением, поскольку Вас не было в комнате, когда оно было отправлено."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s поделился(ась) этим сообщением, поскольку Вас не было в комнате, когда оно было отправлено."</string>
   <string name="crypto_history_visible">"Эта комната настроена так, что новые участники могут видеть историю. %1$s"</string>
   <string name="crypto_identity_change_pin_violation">"Личность %1$s была сброшена. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Личность %1$s %2$s была сброшена. %3$s"</string>
@@ -437,13 +470,12 @@
   <string name="dialog_title_error">"Ошибка"</string>
   <string name="dialog_title_success">"Успешно"</string>
   <string name="dialog_title_warning">"Предупреждение"</string>
-  <string name="dialog_unsaved_changes_description">"У вас есть несохраненные изменения."</string>
+  <string name="dialog_unsaved_changes_description">"У Вас есть несохраненные изменения."</string>
   <string name="dialog_unsaved_changes_description_android">"Изменения не сохранены. Вы действительно хотите вернуться?"</string>
   <string name="dialog_unsaved_changes_title">"Сохранить изменения?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Максимально допустимый размер файла: %1$s"</string>
-  <string name="dialog_video_quality_selector_subtitle_no_file_size">"Выберите качество для видео, которое вы хотите загрузить."</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"Выберите качество видео, которое Вы хотите загрузить."</string>
   <string name="dialog_video_quality_selector_title">"Выберите качество загружаемого видео"</string>
-  <string name="emoji_picker_search_placeholder">"Поиск эмодзи"</string>
   <string name="error_account_already_logged_in">"Вы уже вошли на данном устройстве как %1$s."</string>
   <string name="error_account_creation_not_possible">"Домашний сервер необходимо обновить, чтобы он поддерживал Matrix Authentication Service и создание учётных записей."</string>
   <string name="error_failed_creating_the_permalink">"Не удалось создать постоянную ссылку"</string>
@@ -464,6 +496,9 @@
   <string name="error_unknown">"Произошла ошибка"</string>
   <string name="invite_friends_rich_title">"🔐️ Присоединяйтесь ко мне в %1$s"</string>
   <string name="invite_friends_text">"Привет, давай поболтаем в %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Отправка местонахождения в реальном времени"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Определение местоположения в процессе"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"Текущее местоположение %1$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Встряхните устройство, чтобы сообщить об ошибке"</string>
   <string name="screen_bug_report_a11y_screenshot">"Скриншот"</string>
@@ -471,8 +506,16 @@
   <string name="screen_create_poll_options_section_title">"Параметры"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Удалить %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Настройки"</string>
-  <string name="screen_media_picker_error_failed_selection">"Не удалось выбрать медиа, попробуйте еще раз."</string>
-  <string name="screen_onboarding_welcome_back">"С возвращением"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Количество голосов, разрешенных одному человеку"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Никто не делится своим местоположением"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Местоположение отправляется в реальном времени"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d человек"</item>
+    <item quantity="few">"%1$d человек"</item>
+    <item quantity="many">"%1$d людей"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"На карте"</string>
+  <string name="screen_media_picker_error_failed_selection">"Не удалось выбрать медиа, попробуйте ещё раз."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Нажмите на сообщение и выберите «%1$s», чтобы добавить его сюда."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Закрепите важные сообщения, чтобы их можно было легко найти"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -480,28 +523,29 @@
     <item quantity="few">"%1$d закреплённых сообщения"</item>
     <item quantity="many">"%1$d закреплённых сообщений"</item>
   </plurals>
-  <string name="screen_pinned_timeline_screen_title_empty">"Закрепленные сообщения"</string>
+  <string name="screen_pinned_timeline_screen_title_empty">"Закреплённые сообщения"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Вы собираетесь перейти в свой аккаунт %1$s, чтобы сбросить личность. После этого Вы вернётесь в приложение."</string>
   <string name="screen_reset_identity_confirmation_title">"Не можете подтвердить? Перейдите в свой аккаунт, чтобы сбросить свою личность."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Сбросить верификацию и отправить"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Вы можете либо сбросить подтверждение и всё равно отправить это сообщение, либо отменить его сейчас и повторить попытку после повторного подтверждения %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Ваше сообщение не было отправлено, потому что подтвержденная личность %1$s была сброшена"</string>
-  <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Все равно отправить сообщение"</string>
-  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"У %1$s есть одно или несколько неподтвержденных устройств. Вы все равно можете отправить сообщение или отменить его пока и повторить попытку позже, когда %2$s подтвердить все свои устройства."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Ваше сообщение не было отправлено, потому что подтвержденная идентификации %1$s была сброшена"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Всё равно отправить сообщение"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"У %1$s есть одно или несколько неподтвержденных устройств. Вы всё равно можете отправить сообщение или отменить его и повторить попытку позже, когда %2$s подтвердит все свои устройства."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Ваше сообщение не было отправлено, потому что %1$s имеет неподтвержденные устройства"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Одно или несколько ваших устройств не подтверждены. Вы можете отправить сообщение в любом случае или отменить его пока и повторить попытку позже, подтвердив все свои устройства."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Ваше сообщение не было отправлено, поскольку вы не подтвердили одно или несколько своих устройств."</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"Редактировать владельцев и администраторов"</string>
-  <string name="screen_room_error_failed_processing_media">"Не удалось обработать медиафайл для загрузки, попробуйте еще раз."</string>
+  <string name="screen_room_error_failed_processing_media">"Не удалось обработать медиафайл для загрузки, попробуйте ещё раз."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Не удалось получить данные о пользователе"</string>
   <string name="screen_room_event_pill">"Сообщение в %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Развернуть"</string>
   <string name="screen_room_grouped_state_events_reduce">"Уменьшить"</string>
+  <string name="screen_room_live_location_banner">"Поделиться текущим местоположением…"</string>
   <string name="screen_room_permalink_same_room_android">"Эта комната уже просматривается!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s из %2$s"</string>
-  <string name="screen_room_pinned_banner_indicator_description">"%1$s закрепленные сообщения"</string>
+  <string name="screen_room_pinned_banner_indicator_description">"%1$s Закреплённые сообщения"</string>
   <string name="screen_room_pinned_banner_loading_description">"Загрузка сообщения…"</string>
-  <string name="screen_room_pinned_banner_view_all_button_title">"Посмотреть все"</string>
+  <string name="screen_room_pinned_banner_view_all_button_title">"Посмотреть Все"</string>
   <string name="screen_room_title">"Чат"</string>
   <string name="screen_share_location_title">"Поделиться местоположением"</string>
   <string name="screen_share_my_location_action">"Поделиться моим местоположением"</string>
@@ -517,7 +561,7 @@
   <string name="screen_space_list_title">"Пространства"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Поделился %1$s"</string>
   <string name="screen_static_location_sheet_title">"На карте"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Сообщение не отправлено, потому что подтвержденная личность %1$s была сброшена."</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Сообщение не отправлено, так как подтвержденная цифровая идентичность %1$s была сброшена."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Сообщение не отправлено, потому что %1$s не подтвердил(а) все свои устройства."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Сообщение не отправлено, поскольку вы не подтвердили одно или несколько своих устройств."</string>
   <string name="screen_view_location_title">"Местоположение"</string>
@@ -527,5 +571,7 @@
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Вам необходимо подтвердить это устройство чтобы получить доступ к истории сообщений"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Вы не имеете доступа к этому сообщению"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Не удалось расшифровать сообщение"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Это сообщение было заблокировано, так как вы не подтвердили свое устройство, либо отправителю необходимо подтвердить вашу личность."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Это сообщение было заблокировано либо потому, что вы не подтвердили свое устройство, либо потому, что отправителю необходимо подтвердить вашу цифровую личность."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Ваше устройство слишком старое, требуется устройство с Android 8 или более новой версией."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Отображение карт не поддерживается"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml
index e154093ddb..4fdf503c97 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Pridať reakciu: %1$s"</string>
+  <string name="a11y_address">"Adresa"</string>
   <string name="a11y_avatar">"Obrázok"</string>
   <string name="a11y_collapse_message_text_field">"Minimalizovať textové pole správy"</string>
   <string name="a11y_delete">"Vymazať"</string>
@@ -27,6 +28,7 @@
   <string name="a11y_pause">"Pozastaviť"</string>
   <string name="a11y_paused_voice_message">"Hlasová správa, dĺžka:%1$s, aktuálna pozícia: %2$s"</string>
   <string name="a11y_pin_field">"Pole PIN"</string>
+  <string name="a11y_pinned_location">"Pripnuté miesto"</string>
   <string name="a11y_play">"Prehrať"</string>
   <string name="a11y_poll">"Anketa"</string>
   <string name="a11y_poll_end">"Ukončená anketa"</string>
@@ -39,7 +41,6 @@
     <item quantity="other">"Prečítal/a %1$s a %2$d ďalších"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Prečítal/a %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Ťuknutím zobrazíte všetko"</string>
   <string name="a11y_remove_reaction">"Odstrániť reakciu s %1$s"</string>
   <string name="a11y_remove_reaction_with">"Odstrániť reakciu s %1$s"</string>
   <string name="a11y_room_avatar">"Obrázok miestnosti"</string>
@@ -47,6 +48,8 @@
   <string name="a11y_session_verification_time_limited_action_required">"Vyžaduje sa časovo obmedzená akcia, na overenie máte jednu minútu"</string>
   <string name="a11y_show_password">"Zobraziť heslo"</string>
   <string name="a11y_start_call">"Začať hovor"</string>
+  <string name="a11y_start_video_call">"Začať videohovor"</string>
+  <string name="a11y_start_voice_call">"Začať hlasový hovor"</string>
   <string name="a11y_tombstoned_room">"Opustená miestnosť"</string>
   <string name="a11y_user_avatar">"Profilový obrázok"</string>
   <string name="a11y_user_menu">"Používateľské menu"</string>
@@ -157,8 +160,8 @@
   <string name="action_share_link">"Zdieľať odkaz"</string>
   <string name="action_show">"Zobraziť"</string>
   <string name="action_sign_in_again">"Prihláste sa znova"</string>
-  <string name="action_signout">"Odhlásiť sa"</string>
-  <string name="action_signout_anyway">"Napriek tomu sa odhlásiť"</string>
+  <string name="action_signout">"Odstrániť toto zariadenie"</string>
+  <string name="action_signout_anyway">"Napriek tomu odstrániť toto zariadenie"</string>
   <string name="action_skip">"Preskočiť"</string>
   <string name="action_start">"Spustiť"</string>
   <string name="action_start_chat">"Začať konverzáciu"</string>
@@ -202,7 +205,6 @@
   <string name="common_current_user_left_room">"Opustil/a miestnosť"</string>
   <string name="common_current_user_left_space">"Opustil priestor"</string>
   <string name="common_current_user_rejected_invite">"Pozvánka bola odmietnutá"</string>
-  <string name="common_dark">"Tmavý"</string>
   <string name="common_decryption_error">"Chyba dešifrovania"</string>
   <string name="common_description">"Popis"</string>
   <string name="common_developer_options">"Možnosti pre vývojárov"</string>
@@ -240,7 +242,6 @@ Dôvod: %1$s."</string>
   <string name="common_invite_unknown_profile">"Toto Matrix ID sa nedá nájsť, takže pozvánka nemusí byť prijatá."</string>
   <string name="common_leaving_room">"Opustenie miestnosti"</string>
   <string name="common_leaving_space">"Opúšťanie priestoru"</string>
-  <string name="common_light">"Svetlý"</string>
   <string name="common_line_copied_to_clipboard">"Riadok skopírovaný do schránky"</string>
   <string name="common_link_copied_to_clipboard">"Odkaz bol skopírovaný do schránky"</string>
   <string name="common_link_new_device">"Prepojiť nové zariadenie"</string>
@@ -306,7 +307,6 @@ Dôvod: %1$s."</string>
     <item quantity="other">"%1$d odpovedí"</item>
   </plurals>
   <string name="common_replying_to">"Odpoveď na %1$s"</string>
-  <string name="common_report_a_bug">"Nahlásiť chybu"</string>
   <string name="common_report_a_problem">"Nahlásiť problém"</string>
   <string name="common_report_submitted">"Nahlásenie bolo odoslané"</string>
   <string name="common_rich_text_editor">"Rozšírený textový editor"</string>
@@ -360,7 +360,6 @@ Dôvod: %1$s."</string>
   <string name="common_suggested">"Navrhované"</string>
   <string name="common_suggestions">"Návrhy"</string>
   <string name="common_syncing">"Synchronizuje sa"</string>
-  <string name="common_system">"Systém"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Oznámenia tretích strán"</string>
   <string name="common_thread">"Vlákno"</string>
@@ -424,7 +423,6 @@ Naozaj chcete pokračovať?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Maximálna povolená veľkosť súboru je: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Vyberte kvalitu videa, ktoré chcete nahrať."</string>
   <string name="dialog_video_quality_selector_title">"Vyberte kvalitu nahrávania videa"</string>
-  <string name="emoji_picker_search_placeholder">"Hľadať emotikony"</string>
   <string name="error_account_already_logged_in">"Už ste prihlásený/á na tomto zariadení ako %1$s ."</string>
   <string name="error_account_creation_not_possible">"Váš domovský server musí byť aktualizovaný tak, aby podporoval Matrix Authentication Service a vytvorenie účtu."</string>
   <string name="error_failed_creating_the_permalink">"Nepodarilo sa vytvoriť trvalý odkaz"</string>
@@ -487,7 +485,7 @@ Naozaj chcete pokračovať?"</string>
   <string name="screen_share_open_apple_maps">"Otvoriť v Apple Maps"</string>
   <string name="screen_share_open_google_maps">"Otvoriť v Mapách Google"</string>
   <string name="screen_share_open_osm_maps">"Otvoriť v OpenStreetMap"</string>
-  <string name="screen_share_this_location_action">"Zdieľajte túto polohu"</string>
+  <string name="screen_share_this_location_action">"Zdieľajte vybranú polohu"</string>
   <string name="screen_space_list_description">"Priestory, ktoré ste vytvorili alebo ku ktorým ste sa pripojili."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
   <string name="screen_space_list_empty_state_title">"Vytvorte priestory na usporiadanie miestností"</string>
diff --git a/libraries/ui-strings/src/main/res/values-sv/translations.xml b/libraries/ui-strings/src/main/res/values-sv/translations.xml
index 0969270a3c..4e46cd4653 100644
--- a/libraries/ui-strings/src/main/res/values-sv/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sv/translations.xml
@@ -37,7 +37,6 @@
     <item quantity="other">"Läst av %1$s och %2$d andra"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Läst av %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tryck för att visa alla"</string>
   <string name="a11y_remove_reaction">"Ta bort reaktionen med %1$s"</string>
   <string name="a11y_remove_reaction_with">"Ta bort reaktion med %1$s"</string>
   <string name="a11y_room_avatar">"Rumsavatar"</string>
@@ -146,8 +145,8 @@
   <string name="action_share_link">"Dela länk"</string>
   <string name="action_show">"Visa"</string>
   <string name="action_sign_in_again">"Logga in igen"</string>
-  <string name="action_signout">"Logga ut"</string>
-  <string name="action_signout_anyway">"Logga ut ändå"</string>
+  <string name="action_signout">"Ta bort den här enheten"</string>
+  <string name="action_signout_anyway">"Ta bort den här enheten ändå"</string>
   <string name="action_skip">"Hoppa över"</string>
   <string name="action_start">"Starta"</string>
   <string name="action_start_chat">"Starta chat"</string>
@@ -187,7 +186,6 @@
   <string name="common_current_user_canceled_knock">"Begäran avbruten"</string>
   <string name="common_current_user_left_room">"Lämnade rummet"</string>
   <string name="common_current_user_rejected_invite">"Inbjudan avvisad"</string>
-  <string name="common_dark">"Mörkt"</string>
   <string name="common_decryption_error">"Avkrypteringsfel"</string>
   <string name="common_description">"Beskrivning"</string>
   <string name="common_developer_options">"Utvecklaralternativ"</string>
@@ -224,7 +222,6 @@ Anledning:%1$s."</string>
   <string name="common_install_apk_android">"Installera APK"</string>
   <string name="common_invite_unknown_profile">"Det här Matrix-ID:t kan inte hittas, så inbjudan kanske inte tas emot."</string>
   <string name="common_leaving_room">"Lämnar rummet"</string>
-  <string name="common_light">"Ljust"</string>
   <string name="common_line_copied_to_clipboard">"Rad kopierad till klippbordet"</string>
   <string name="common_link_copied_to_clipboard">"Länk kopierad till klippbordet"</string>
   <string name="common_loading">"Laddar …"</string>
@@ -281,7 +278,6 @@ Anledning:%1$s."</string>
     <item quantity="other">"%1$d svar"</item>
   </plurals>
   <string name="common_replying_to">"Svarar till %1$s"</string>
-  <string name="common_report_a_bug">"Rapportera en bugg"</string>
   <string name="common_report_a_problem">"Rapportera ett problem"</string>
   <string name="common_report_submitted">"Rapport inskickad"</string>
   <string name="common_rich_text_editor">"Riktextredigerare"</string>
@@ -323,7 +319,6 @@ Anledning:%1$s."</string>
   <string name="common_success">"Lyckades"</string>
   <string name="common_suggestions">"Förslag"</string>
   <string name="common_syncing">"Synkar"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Meddelanden från tredje part"</string>
   <string name="common_thread">"Tråd"</string>
@@ -384,7 +379,6 @@ Anledning:%1$s."</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Den maximala tillåtna filstorleken är: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Välj kvaliteten på videon du vill ladda upp."</string>
   <string name="dialog_video_quality_selector_title">"Välj videouppladdningskvalitet"</string>
-  <string name="emoji_picker_search_placeholder">"Sök emojier"</string>
   <string name="error_account_already_logged_in">"Du är redan inloggad på den här enheten som %1$s."</string>
   <string name="error_account_creation_not_possible">"Din hemserver måste uppgraderas för att stödja Matrix Authentication Service och skapande av konto."</string>
   <string name="error_failed_creating_the_permalink">"Misslyckades att skapa permalänken"</string>
diff --git a/libraries/ui-strings/src/main/res/values-tr/translations.xml b/libraries/ui-strings/src/main/res/values-tr/translations.xml
index d92daa6527..5bbce8a391 100644
--- a/libraries/ui-strings/src/main/res/values-tr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-tr/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Tepki ekle:%1$s"</string>
+  <string name="a11y_address">"Adres"</string>
   <string name="a11y_avatar">"Profil resmi"</string>
   <string name="a11y_collapse_message_text_field">"Mesaj metin alanını küçült"</string>
   <string name="a11y_delete">"Sil"</string>
@@ -8,13 +9,16 @@
     <item quantity="one">"%1$d basamak girildi"</item>
     <item quantity="other">"%1$d basamak girildi"</item>
   </plurals>
+  <string name="a11y_duration">"Süre: %1$s"</string>
   <string name="a11y_edit_avatar">"Fotoğrafı düzenle"</string>
   <string name="a11y_edit_room_address_hint">"Tam adres %1$s olacaktır"</string>
   <string name="a11y_encryption_details">"Şifreleme ayrıntıları"</string>
   <string name="a11y_expand_message_text_field">"Mesaj metin alanını genişlet"</string>
   <string name="a11y_hide_password">"Şifreyi gizle"</string>
+  <string name="a11y_info">"Bilgi"</string>
   <string name="a11y_join_call">"Aramaya katıl"</string>
   <string name="a11y_jump_to_bottom">"Aşağıya atla"</string>
+  <string name="a11y_jump_to_unread">"Okunmamış olana atla"</string>
   <string name="a11y_move_the_map_to_my_location">"Haritayı konumuma taşı"</string>
   <string name="a11y_notifications_mentions_only">"Yalnızca bahsetmeler"</string>
   <string name="a11y_notifications_muted">"Sessiz"</string>
@@ -37,7 +41,6 @@
     <item quantity="other">"%1$s ve %2$d diğer kişi tarafından okundu"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Okuyan %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tümünü göstermek için dokunun"</string>
   <string name="a11y_remove_reaction">"Tepkimeyi kaldır %1$s"</string>
   <string name="a11y_remove_reaction_with">"%1$s ile verilen tepkiyi kaldır"</string>
   <string name="a11y_room_avatar">"Oda avatarı"</string>
@@ -175,7 +178,6 @@
   <string name="common_current_user_canceled_knock">"İstek iptal edildi"</string>
   <string name="common_current_user_left_room">"Sol oda"</string>
   <string name="common_current_user_rejected_invite">"Davet reddedildi"</string>
-  <string name="common_dark">"Koyu"</string>
   <string name="common_decryption_error">"Şifre çözme hatası"</string>
   <string name="common_developer_options">"Geliştirici seçenekleri"</string>
   <string name="common_device_id">"Cihaz Kimliği"</string>
@@ -211,7 +213,6 @@ Neden: %1$s."</string>
   <string name="common_install_apk_android">"APK\'yı yükleyin"</string>
   <string name="common_invite_unknown_profile">"Bu Matrix Kimliği bulunamıyor, bu nedenle davet alınmayabilir."</string>
   <string name="common_leaving_room">"Odadan ayrılma"</string>
-  <string name="common_light">"Aydınlık"</string>
   <string name="common_line_copied_to_clipboard">"Metin panoya kopyalandı"</string>
   <string name="common_link_copied_to_clipboard">"Bağlantı panoya kopyalandı"</string>
   <string name="common_loading">"Yükleniyor…"</string>
@@ -264,7 +265,6 @@ Neden: %1$s."</string>
   <string name="common_recovery_key">"Kurtarma anahtarı"</string>
   <string name="common_refreshing">"Yenileniyor…"</string>
   <string name="common_replying_to">"Cevaplamak için %1$s"</string>
-  <string name="common_report_a_bug">"Hata bildir"</string>
   <string name="common_report_a_problem">"Sorun bildir"</string>
   <string name="common_report_submitted">"Rapor gönderildi"</string>
   <string name="common_rich_text_editor">"Zengin metin editörü"</string>
@@ -296,7 +296,6 @@ Neden: %1$s."</string>
   <string name="common_success">"Başarılı"</string>
   <string name="common_suggestions">"Öneriler"</string>
   <string name="common_syncing">"Senkronizasyon"</string>
-  <string name="common_system">"Sistem"</string>
   <string name="common_text">"Metin"</string>
   <string name="common_third_party_notices">"Üçüncü taraf bildirimleri"</string>
   <string name="common_thread">"Konu"</string>
diff --git a/libraries/ui-strings/src/main/res/values-uk/translations.xml b/libraries/ui-strings/src/main/res/values-uk/translations.xml
index 835ded33f9..9e93cdb891 100644
--- a/libraries/ui-strings/src/main/res/values-uk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uk/translations.xml
@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Додати аватар"</string>
   <string name="a11y_add_reaction">"Додати реакцію: %1$s"</string>
+  <string name="a11y_address">"Адреса"</string>
   <string name="a11y_avatar">"Аватар"</string>
+  <string name="a11y_clear_search_field">"Очистити поле пошуку"</string>
   <string name="a11y_collapse_message_text_field">"Згорнути поле тексту повідомлення"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Зменшити кількість голосів, дозволених на одну особу"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Збільшити кількість голосів, дозволених на одну особу"</string>
+  <string name="a11y_custom_emoji">"Власні емоджі"</string>
   <string name="a11y_delete">"Видалити"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"Введена %1$d цифра"</item>
     <item quantity="few">"Введено %1$d цифри"</item>
     <item quantity="many">"Введено %1$d цифр"</item>
   </plurals>
+  <string name="a11y_duration">"Тривалість: %1$s"</string>
   <string name="a11y_edit_avatar">"Редагувати аватар"</string>
   <string name="a11y_edit_room_address_hint">"Повна адреса буде %1$s"</string>
   <string name="a11y_encryption_details">"Подробиці шифрування"</string>
   <string name="a11y_expand_message_text_field">"Розгорнути текстове поле повідомлення"</string>
   <string name="a11y_hide_password">"Cховати пароль"</string>
+  <string name="a11y_info">"Інформація"</string>
   <string name="a11y_join_call">"Приєднатися до виклику"</string>
   <string name="a11y_jump_to_bottom">"Перейти вниз"</string>
+  <string name="a11y_jump_to_unread">"Перейти до непрочитаних"</string>
+  <string name="a11y_jump_to_unread_messages">"Перейти до першого непрочитаного повідомлення"</string>
   <string name="a11y_move_the_map_to_my_location">"Перемістити карту до мого місця перебування"</string>
   <string name="a11y_notifications_mentions_only">"Тільки згадки"</string>
   <string name="a11y_notifications_muted">"Звук вимкнено"</string>
@@ -26,30 +36,44 @@
   <string name="a11y_page_n">"Сторінка %1$d"</string>
   <string name="a11y_pause">"Пауза"</string>
   <string name="a11y_paused_voice_message">"Голосове повідомлення, тривалість: %1$s, поточна позиція: %2$s"</string>
+  <string name="a11y_photo_preview">"Попередній перегляд світлин"</string>
   <string name="a11y_pin_field">"Поле PIN-коду"</string>
+  <string name="a11y_pinned_location">"Закріплена локація"</string>
   <string name="a11y_play">"Відтворити"</string>
+  <string name="a11y_playback_speed">"Швидкість програвання"</string>
   <string name="a11y_poll">"Опитування"</string>
   <string name="a11y_poll_end">"Опитування завершено"</string>
+  <string name="a11y_position">"Позиція: %1$s"</string>
+  <string name="a11y_qr_code">"QR-код"</string>
   <string name="a11y_react_with">"Реагувати з%1$s"</string>
   <string name="a11y_react_with_other_emojis">"Відреагувати іншими смайликами"</string>
-  <string name="a11y_read_receipts_multiple">"Прочитано %1$s та %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Попереднє повідомлення прочитали %1$s та %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Прочитано %1$s та %2$d іншим"</item>
-    <item quantity="few">"Прочитано %1$s та %2$d іншими"</item>
-    <item quantity="many">"Прочитано %1$s та %2$d іншими"</item>
+    <item quantity="one">"Попереднє повідомлення прочитали %1$s та ще %2$d користувач"</item>
+    <item quantity="few">"Попереднє повідомлення прочитали %1$s та ще %2$d користувачі"</item>
+    <item quantity="many">"Попереднє повідомлення прочитали %1$s та ще %2$d користувачів"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Прочитано %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Натисніть, щоб показати все"</string>
+  <string name="a11y_read_receipts_single">"Попереднє повідомлення прочитано користувачем %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"показати всі підтвердження прочитання"</string>
   <string name="a11y_remove_reaction">"Видалити реакцію з %1$s"</string>
   <string name="a11y_remove_reaction_with">"Прибрати реакцію %1$s"</string>
   <string name="a11y_room_avatar">"Аватар кімнати"</string>
   <string name="a11y_send_files">"Надіслати файли"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"Необхідно виконати дію, обмежену в часі, у вас є одна хвилина для верифікації"</string>
+  <string name="a11y_sender_location">"Локація відправника"</string>
+  <string name="a11y_sent_by_sender_at_date">"Надіслано %1$s о %2$s"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Необхідно виконати дію, обмежену в часі, ви маєте одну хвилину, щоб звіритись"</string>
+  <string name="a11y_settings_with_required_action">"Налаштування, потрібні дії"</string>
   <string name="a11y_show_password">"Показати пароль"</string>
   <string name="a11y_start_call">"Розпочати виклик"</string>
+  <string name="a11y_start_video_call">"Розпочати відеовиклик"</string>
+  <string name="a11y_start_voice_call">"Розпочати голосовий виклик"</string>
+  <string name="a11y_status">"Статус"</string>
+  <string name="a11y_thread_in_room">"Гілка в %1$s"</string>
+  <string name="a11y_threads_in_room">"Гілки в %1$s"</string>
   <string name="a11y_tombstoned_room">"Кімната більше не використовується"</string>
   <string name="a11y_user_avatar">"Аватар користувача"</string>
   <string name="a11y_user_menu">"Меню користувача"</string>
+  <string name="a11y_video_preview">"Попередній перегляд відео"</string>
   <string name="a11y_view_avatar">"Переглянути аватар"</string>
   <string name="a11y_view_details">"Переглянути подробиці"</string>
   <string name="a11y_voice_message">"Голосове повідомлення, тривалість: %1$s"</string>
@@ -64,10 +88,11 @@
   <string name="action_call">"Зателефонувати"</string>
   <string name="action_cancel">"Скасувати"</string>
   <string name="action_cancel_for_now">"Скасувати наразі"</string>
+  <string name="action_choose_file">"Вибрати файл"</string>
   <string name="action_choose_photo">"Вибрати фото"</string>
   <string name="action_clear">"Очистити"</string>
   <string name="action_close">"Закрити"</string>
-  <string name="action_complete_verification">"Верифікація завершена"</string>
+  <string name="action_complete_verification">"Завершити звіряння"</string>
   <string name="action_confirm">"Підтвердити"</string>
   <string name="action_confirm_password">"Підтвердіть пароль"</string>
   <string name="action_continue">"Продовжити"</string>
@@ -83,18 +108,23 @@
   <string name="action_deactivate_account">"Деактивувати обліковий запис"</string>
   <string name="action_decline">"Відхилити"</string>
   <string name="action_decline_and_block">"Відхилити та заблокувати"</string>
+  <string name="action_delete">"Видалити"</string>
+  <string name="action_delete_account">"Видалити обліковий запис"</string>
+  <string name="action_delete_file">"Видалити файл"</string>
   <string name="action_delete_poll">"Видалити опитування"</string>
   <string name="action_deselect_all">"Скасувати вибір усіх"</string>
   <string name="action_disable">"Вимкнути"</string>
   <string name="action_discard">"Відкинути"</string>
   <string name="action_dismiss">"Відхилити"</string>
   <string name="action_done">"Готово"</string>
+  <string name="action_download">"Завантажити"</string>
   <string name="action_edit">"Редагувати"</string>
   <string name="action_edit_caption">"Редагувати підпис"</string>
   <string name="action_edit_poll">"Редагувати опитування"</string>
   <string name="action_enable">"Увімкнути"</string>
   <string name="action_end_poll">"Завершити опитування"</string>
   <string name="action_enter_pin">"Введіть PIN-код"</string>
+  <string name="action_explore_public_spaces">"Дізнатися про публічні простори"</string>
   <string name="action_finish">"Завершити"</string>
   <string name="action_forgot_password">"Забули пароль?"</string>
   <string name="action_forward">"Переслати"</string>
@@ -115,8 +145,10 @@
   <string name="action_leave_space">"Вийти з простору"</string>
   <string name="action_load_more">"Завантажити ще"</string>
   <string name="action_manage_account">"Керування обліковим записом"</string>
+  <string name="action_manage_account_and_devices">"Керування обліковим записом і пристроями"</string>
   <string name="action_manage_devices">"Керування пристроями"</string>
   <string name="action_manage_rooms">"Керувати кімнатами"</string>
+  <string name="action_mark_as_read">"Позначити прочитаним"</string>
   <string name="action_message">"Написати"</string>
   <string name="action_minimize">"Згорнути"</string>
   <string name="action_next">"Далі"</string>
@@ -154,24 +186,28 @@
   <string name="action_send_voice_message">"Надіслати голосове повідомлення"</string>
   <string name="action_share">"Поділитися"</string>
   <string name="action_share_link">"Поділитися посиланням"</string>
+  <string name="action_share_live_location">"Ділитися місцезнаходженням у реальному часі"</string>
   <string name="action_show">"Показати"</string>
   <string name="action_sign_in_again">"Увійдіть знову"</string>
-  <string name="action_signout">"Вийти"</string>
-  <string name="action_signout_anyway">"Все одно вийти"</string>
+  <string name="action_signout">"Вилучити цей пристрій"</string>
+  <string name="action_signout_anyway">"Усе одно вилучити цей пристрій"</string>
   <string name="action_skip">"Пропустити"</string>
   <string name="action_start">"Розпочати"</string>
   <string name="action_start_chat">"Розпочати бесіду"</string>
   <string name="action_start_over">"Почати спочатку"</string>
-  <string name="action_start_verification">"Почати верифікацію"</string>
+  <string name="action_start_verification">"Розпочати звіряння"</string>
   <string name="action_static_map_load">"Натисніть, щоб завантажити мапу"</string>
+  <string name="action_stop">"Зупинити"</string>
   <string name="action_take_photo">"Зробити фото"</string>
   <string name="action_tap_for_options">"Торкніться, щоб переглянути параметри"</string>
   <string name="action_translate">"Перекласти"</string>
   <string name="action_try_again">"Спробуйте ще раз"</string>
   <string name="action_unpin">"Відкріпити"</string>
+  <string name="action_video_call">"Відеовиклик"</string>
   <string name="action_view">"Переглянути"</string>
   <string name="action_view_in_timeline">"Переглянути на шкалі часу"</string>
   <string name="action_view_source">"Переглянути джерело"</string>
+  <string name="action_voice_call">"Голосовий виклик"</string>
   <string name="action_yes">"Так"</string>
   <string name="action_yes_try_again">"Так, повторити спробу"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Ваш сервер тепер підтримує новий, швидший протокол. Вийдіть із системи та увійдіть знову, щоб оновити систему зараз. Якщо ви зробите це зараз, це допоможе вам уникнути примусового виходу з системи, коли старий протокол буде видалено пізніше."</string>
@@ -186,12 +222,15 @@
   <string name="common_analytics">"Аналітика"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"Ви вийшли з кімнати"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"Ви вийшли з сеансу"</string>
-  <string name="common_appearance">"Тема"</string>
+  <string name="common_appearance">"Вигляд"</string>
   <string name="common_audio">"Аудіо"</string>
   <string name="common_beta">"Бета-версія"</string>
   <string name="common_blocked_users">"Заблоковані користувачі"</string>
   <string name="common_bubbles">"Бульбашки"</string>
+  <string name="common_call_declined">"Виклик відхилено"</string>
+  <string name="common_call_in_progress">"Виклик триває"</string>
   <string name="common_call_started">"Виклик розпочато"</string>
+  <string name="common_call_you_declined">"Ви відхилили виклик"</string>
   <string name="common_chat_backup">"Резервне копіювання бесіди"</string>
   <string name="common_copied_to_clipboard">"Скопійовано до буферу обміну"</string>
   <string name="common_copyright">"Авторське право"</string>
@@ -199,8 +238,8 @@
   <string name="common_creating_space">"Створення простору…"</string>
   <string name="common_current_user_canceled_knock">"Запит скасовано"</string>
   <string name="common_current_user_left_room">"Виходить з кімнати"</string>
+  <string name="common_current_user_left_space">"Вийшов із простору"</string>
   <string name="common_current_user_rejected_invite">"Запрошення відхилено"</string>
-  <string name="common_dark">"Темна"</string>
   <string name="common_decryption_error">"Помилка розшифрування"</string>
   <string name="common_description">"Опис"</string>
   <string name="common_developer_options">"Налаштування розробника"</string>
@@ -216,6 +255,7 @@
   <string name="common_empty_file">"Порожній файл"</string>
   <string name="common_encryption">"Шифрування"</string>
   <string name="common_encryption_enabled">"Шифрування ввімкнено"</string>
+  <string name="common_ends_at">"Завершується о %1$s"</string>
   <string name="common_enter_your_pin">"Введіть свій PIN-код"</string>
   <string name="common_error">"Помилка"</string>
   <string name="common_error_registering_pusher_android">"Сталася помилка, ви можете не отримувати сповіщення про нові повідомлення. Усуньте неполадки зі сповіщеннями в налаштуваннях.
@@ -225,23 +265,37 @@
   <string name="common_failed">"Помилка"</string>
   <string name="common_favourite">"Обране"</string>
   <string name="common_favourited">"Обране"</string>
+  <string name="common_fetching_notifications_title_android">"Синхронізація сповіщень…"</string>
   <string name="common_file">"Файл"</string>
   <string name="common_file_deleted">"Файл видалено"</string>
   <string name="common_file_saved">"Файл збережено"</string>
   <string name="common_file_saved_on_disk_android">"Файл збережений у Завантаження"</string>
   <string name="common_forward_message">"Переслати повідомлення"</string>
   <string name="common_frequently_used">"Частовживані"</string>
+  <string name="common_gallery">"Галерея"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d вкладення…"</item>
+    <item quantity="few">"%1$d вкладення…"</item>
+    <item quantity="many">"%1$d вкладень…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d медіаелемент…"</item>
+    <item quantity="few">"%1$d медіаелементи…"</item>
+    <item quantity="many">"%1$d медіаелементів…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Триває груповий виклик"</string>
   <string name="common_image">"Зображення"</string>
   <string name="common_in_reply_to">"У відповідь на %1$s"</string>
   <string name="common_install_apk_android">"Встановити APK"</string>
   <string name="common_invite_unknown_profile">"Цей Matrix-ID не знайдено, тому запрошення може не бути отримано."</string>
   <string name="common_leaving_room">"Вихід з кімнати"</string>
   <string name="common_leaving_space">"Вихід з простору"</string>
-  <string name="common_light">"Світла"</string>
   <string name="common_line_copied_to_clipboard">"Рядок скопійовано до буфера обміну"</string>
   <string name="common_link_copied_to_clipboard">"Посилання скопійовано в буфер обміну"</string>
   <string name="common_link_new_device">"Під\'єднати новий пристрій"</string>
+  <string name="common_live_location">"Місцезнаходження в реальному часі"</string>
+  <string name="common_live_location_ended">"Показ місцеперебування наживо завершено"</string>
   <string name="common_loading">"Завантаження"</string>
   <string name="common_loading_more">"Завантаження наступних…"</string>
   <plurals name="common_many_members">
@@ -268,8 +322,10 @@
   <string name="common_no_space_name">"Без назви простору"</string>
   <string name="common_not_encrypted">"Не зашифровано"</string>
   <string name="common_offline">"Не в мережі"</string>
+  <string name="common_on_a_call">"Розмовляє"</string>
   <string name="common_open_source_licenses">"Ліцензії відкритого коду"</string>
   <string name="common_or">"або"</string>
+  <string name="common_other_options">"Інші варіанти"</string>
   <string name="common_password">"Пароль"</string>
   <string name="common_people">"Люди"</string>
   <string name="common_permalink">"Постійне посилання"</string>
@@ -279,6 +335,7 @@
   <string name="common_please_wait">"Будь ласка, зачекайте…"</string>
   <string name="common_poll_end_confirmation">"Ви впевнені, що хочете закінчити це опитування?"</string>
   <string name="common_poll_summary">"Опитування: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Опитування"</string>
   <string name="common_poll_total_votes">"Всього голосів: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Результати будуть показані після завершення опитування"</string>
   <plurals name="common_poll_votes_count">
@@ -288,8 +345,10 @@
   </plurals>
   <string name="common_preparing">"Приготування…"</string>
   <string name="common_privacy_policy">"Політика конфіденційності"</string>
+  <string name="common_private">"Приватний"</string>
   <string name="common_private_room">"Приватна кімната (тільки за запрошенням)"</string>
   <string name="common_private_space">"Приватний простір"</string>
+  <string name="common_public">"Публічний"</string>
   <string name="common_public_room">"Загальнодоступна кімната"</string>
   <string name="common_public_space">"Загальнодоступний простір"</string>
   <string name="common_reaction">"Реакція"</string>
@@ -304,7 +363,6 @@
     <item quantity="many">"%1$d відповідей"</item>
   </plurals>
   <string name="common_replying_to">"Відповідь %1$s"</string>
-  <string name="common_report_a_bug">"Повідомити про ваду"</string>
   <string name="common_report_a_problem">"Повідомити про проблему"</string>
   <string name="common_report_submitted">"Звіт подано"</string>
   <string name="common_rich_text_editor">"Багатоформатний текстовий редактор"</string>
@@ -319,12 +377,17 @@
   </plurals>
   <string name="common_saved_changes">"Збережені зміни"</string>
   <string name="common_saving">"Збереження"</string>
-  <string name="common_screen_lock">"Блокування екрану"</string>
+  <string name="common_screen_lock">"Блокування екрана"</string>
   <string name="common_search_for_someone">"Шукати когось"</string>
   <string name="common_search_results">"Результати пошуку"</string>
   <string name="common_security">"Безпека"</string>
   <string name="common_seen_by">"Переглянули"</string>
   <string name="common_select_account">"Вибрати обліковий запис"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d вибраний"</item>
+    <item quantity="few">"%1$d вибрані"</item>
+    <item quantity="many">"%1$d вибрано"</item>
+  </plurals>
   <string name="common_send_to">"Надіслати до"</string>
   <string name="common_sending">"Надсилання…"</string>
   <string name="common_sending_failed">"Не вдалося надіслати"</string>
@@ -334,12 +397,16 @@
   <string name="common_server_unreachable">"Сервер недоступний"</string>
   <string name="common_server_url">"URL-адреса сервера"</string>
   <string name="common_settings">"Налаштування"</string>
+  <string name="common_share_space">"Поділитися простором"</string>
   <string name="common_shared_history">"Нові учасники бачать історію"</string>
+  <string name="common_shared_live_location">"Поділитися місцезнаходженням в реальному часі"</string>
   <string name="common_shared_location">"Поширене розташування"</string>
-  <string name="common_signing_out">"Вихід"</string>
+  <string name="common_shared_space">"Простір спільного користування"</string>
+  <string name="common_signing_out">"Вилучення пристрою"</string>
   <string name="common_something_went_wrong">"Щось пішло не так"</string>
   <string name="common_something_went_wrong_message">"Ми зіткнулися з проблемою. Будь ласка, повторіть спробу."</string>
   <string name="common_space">"Простір"</string>
+  <string name="common_space_members">"Учасники простору"</string>
   <string name="common_space_topic_placeholder">"Про що цей простір?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d простір"</item>
@@ -349,32 +416,34 @@
   <string name="common_starting_chat">"Початок бесіди…"</string>
   <string name="common_sticker">"Наліпка"</string>
   <string name="common_success">"Успіх"</string>
+  <string name="common_suggested">"Запропоновано"</string>
   <string name="common_suggestions">"Пропозиції"</string>
   <string name="common_syncing">"Синхронізація"</string>
-  <string name="common_system">"Системна"</string>
   <string name="common_text">"Текст"</string>
   <string name="common_third_party_notices">"Повідомлення третіх сторін"</string>
   <string name="common_thread">"Гілка"</string>
+  <string name="common_threads">"Гілки"</string>
   <string name="common_topic">"Тема"</string>
   <string name="common_topic_placeholder">"Про що ця кімната?"</string>
   <string name="common_unable_to_decrypt">"Неможливо розшифрувати"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Надіслано з незахищеного пристрою"</string>
   <string name="common_unable_to_decrypt_no_access">"Ви не маєте доступу до цього повідомлення"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Ідентичність відправника скинуто"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Звірена цифрова ідентичність відправника була скинута"</string>
   <string name="common_unable_to_invite_message">"Не вдалося надіслати запрошення одному чи кільком користувачам."</string>
   <string name="common_unable_to_invite_title">"Не вдалося надіслати запрошення"</string>
   <string name="common_unlock">"Розблокувати"</string>
   <string name="common_unmute">"Увімкнути звук"</string>
   <string name="common_unsupported_call">"Непідтриманий виклик"</string>
   <string name="common_unsupported_event">"Непідтримувана подія"</string>
+  <string name="common_user_started_a_call">"%1$s розпочинає виклик"</string>
   <string name="common_username">"Ім\'я користувача"</string>
-  <string name="common_verification_cancelled">"Верифікацію скасовано"</string>
-  <string name="common_verification_complete">"Верифікацію завершено"</string>
-  <string name="common_verification_failed">"Перевірка не вдалася"</string>
-  <string name="common_verified">"Перевірено"</string>
-  <string name="common_verify_device">"Верифікувати пристрій"</string>
-  <string name="common_verify_identity">"Підтвердити особу"</string>
-  <string name="common_verify_user">"Верифікувати користувача"</string>
+  <string name="common_verification_cancelled">"Звіряння скасовано"</string>
+  <string name="common_verification_complete">"Звіряння завершено"</string>
+  <string name="common_verification_failed">"Не вдалося звірити"</string>
+  <string name="common_verified">"Звірено"</string>
+  <string name="common_verify_device">"Звірити пристрій"</string>
+  <string name="common_verify_identity">"Підтвердити ідентичність"</string>
+  <string name="common_verify_user">"Звірити користувача"</string>
   <string name="common_video">"Відео"</string>
   <string name="common_video_quality_high">"Висока якість"</string>
   <string name="common_video_quality_high_description">"Найкраща якість, але більший розмір файлу"</string>
@@ -385,14 +454,24 @@
   <string name="common_voice_message">"Голосове повідомлення"</string>
   <string name="common_waiting">"Очікування…"</string>
   <string name="common_waiting_for_decryption_key">"Чекаємо на це повідомлення"</string>
+  <string name="common_waiting_live_location">"Очікування геолокації…"</string>
   <string name="common_world_readable_history">"Будь-хто може переглянути історію"</string>
   <string name="common_you">"Ви"</string>
-  <string name="crypto_identity_change_pin_violation">"Ідентичність %1$s скинуто. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"Ідентичність %1$s %2$s скинуто. %3$s"</string>
+  <string name="content_scanner_not_found">"Завантаження недоступне."</string>
+  <string name="content_scanner_not_found_title">"Файл не знайдено"</string>
+  <string name="content_scanner_scanning">"Сканування…"</string>
+  <string name="content_scanner_unsafe_message">"Попередній перегляд і завантаження вимкнено."</string>
+  <string name="content_scanner_unsafe_title">"Файл не є безпечним"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) поділився цим повідомленням, оскільки вас не було в кімнаті, коли його надіслали."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s поділився цим повідомленням, оскільки вас не було в кімнаті, коли його надіслали."</string>
+  <string name="crypto_history_visible">"Згідно із налаштувань цієї кімнати, нові учасники можуть переглядати історію. %1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Цифрову ідентичність %1$s скинуто. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Цифрову ідентичність %1$s %2$s скинуто. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"Ідентичність %1$s скинуто."</string>
-  <string name="crypto_identity_change_verification_violation_new">"Ідентичність %1$s %2$s скинуто. %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Цифрову ідентичність %1$s скинуто."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Цифрову ідентичність %1$s %2$s скинуто. %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Відкликати верифікацію"</string>
+  <string name="dialog_allow_access">"Надати доступ"</string>
   <string name="dialog_confirm_link_message">"Посилання %1$s спрямовує вас на інший сайт %2$s
 
 Ви впевнені, що хочете продовжити?"</string>
@@ -413,7 +492,6 @@
   <string name="dialog_video_quality_selector_subtitle_file_size">"Максимально дозволений розмір файлу: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Виберіть якість відео, яке ви хочете вивантажити."</string>
   <string name="dialog_video_quality_selector_title">"Виберіть якість вивантажуваного відео"</string>
-  <string name="emoji_picker_search_placeholder">"Пошук емоджі"</string>
   <string name="error_account_already_logged_in">"Ви вже ввійшли на цьому пристрої як %1$s."</string>
   <string name="error_account_creation_not_possible">"Ваш домашній сервер потрібно оновити, щоб він підтримував службу автентифікації Matrix і створення облікових записів."</string>
   <string name="error_failed_creating_the_permalink">"Не вдалося створити постійне посилання"</string>
@@ -422,6 +500,7 @@
   <string name="error_failed_locating_user">"%1$s не вдалося отримати доступ до вашого розташування. Повторіть спробу пізніше."</string>
   <string name="error_failed_uploading_voice_message">"Не вдалося завантажити голосове повідомлення."</string>
   <string name="error_invalid_invite">"Кімната більше не існує або запрошення не чинне."</string>
+  <string name="error_location_service_disabled_android">"Будь ласка, увімкніть GPS, щоб отримати доступ до функцій, що використовують геолокацію."</string>
   <string name="error_message_not_found">"Повідомлення не знайдено"</string>
   <string name="error_missing_location_auth_android">"%1$s не має дозволу на доступ до вашого розташування. Увімкнути доступ можна в Налаштуваннях."</string>
   <string name="error_missing_location_rationale_android">"%1$s не має дозволу на доступ до вашого розташування. Увімкніть доступ нижче."</string>
@@ -433,13 +512,27 @@
   <string name="error_unknown">"Вибачте, сталася помилка"</string>
   <string name="invite_friends_rich_title">"🔐️ Приєднуйтеся до мене в %1$s"</string>
   <string name="invite_friends_text">"Вітаю, поспілкуйтеся зі мною в %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Обмін місцезнаходженням у реальному часі"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Триває обмін місцезнаходженням"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Місцезнаходження в реальному часі"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
-  <string name="preference_rageshake">"Повідомити про ваду за допомогою Rageshake"</string>
+  <string name="preference_rageshake">"Повідомляти про помилку потрусивши телефон"</string>
   <string name="screen_bug_report_a11y_screenshot">"Знімок екрана"</string>
   <string name="screen_create_poll_option_accessibility_label">"%1$s: %2$s"</string>
   <string name="screen_create_poll_options_section_title">"Варіанти"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Вилучити %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Налаштування"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Кількість голосів, дозволених на одну особу"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Ніхто не ділиться своєю геопозицією"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Обмін геопозицією"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d особа"</item>
+    <item quantity="few">"%1$d осіб"</item>
+    <item quantity="many">"%1$d осіб"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"На карті"</string>
+  <string name="screen_local_network_opt_in_subtitle">"Ваш домашній сервер перебуває у вашій локальній мережі. Щоб приєднатися, %1$s повинен мати право доступу до пристроїв у цій мережі."</string>
+  <string name="screen_local_network_opt_in_title">"Дозволити доступ до локальної мережі"</string>
   <string name="screen_media_picker_error_failed_selection">"Не вдалося вибрати медіафайл, спробуйте ще раз."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Натисніть на повідомлення і виберіть \"%1$s\", щоб додати його сюди."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Закріпіть важливі повідомлення, щоб їх можна було легко знайти"</string>
@@ -449,11 +542,11 @@
     <item quantity="many">"%1$d Закріплених повідомлення"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Закріплені повідомлення"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Ви збираєтеся перейти до свого облікового запису %1$s, щоб скинути свій обліковий запис. Після цього ви повернетесь до програми."</string>
-  <string name="screen_reset_identity_confirmation_title">"Не можете підтвердити? Перейдіть до свого облікового запису, щоб скинути облікові дані."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Ви збираєтеся перейти до свого облікового запису %1$s, щоб скинути свою цифрову ідентичність. Після цього ви повернетеся до застосунку."</string>
+  <string name="screen_reset_identity_confirmation_title">"Не можете підтвердити? Перейдіть до свого облікового запису, щоб скинути цифрову ідентичність."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Відкликати верифікацію та відправити"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Ви все одно можете відкликати підтвердження та надіслати це повідомлення, або ви можете скасувати підписку на даний момент і спробувати пізніше після повторної перевірки %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Ваше повідомлення не надіслано, оскільки підтверджену особистість %1$s скинуто"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Ваше повідомлення не надіслано, оскільки звірена цифрова ідентичність %1$s була скинута"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Надіслати повідомлення в будь-якому випадку"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s використовує один або кілька неперевірених пристроїв. Ви можете відправити повідомлення в будь-якому випадку, або ж скасувати відправку і спробувати пізніше, коли %2$s перевірить всі пристрої."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Ваше повідомлення не було надіслано, тому що %1$s не перевірив усі пристрої"</string>
@@ -465,6 +558,7 @@
   <string name="screen_room_event_pill">"Повідомлення в %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Розгорнути"</string>
   <string name="screen_room_grouped_state_events_reduce">"Згорнути"</string>
+  <string name="screen_room_live_location_banner">"Спільний доступ до місцезнаходження у реальному часі"</string>
   <string name="screen_room_permalink_same_room_android">"Уже переглядаєте цю кімнату!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s із %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s закріплених повідомлень"</string>
@@ -477,19 +571,30 @@
   <string name="screen_share_open_google_maps">"Відкрити в Картах Google"</string>
   <string name="screen_share_open_osm_maps">"Відкрити в OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Поділитися цим місцем перебування"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Налаштування обміну геопозицією"</string>
   <string name="screen_space_list_description">"Простори, які ви створили або до яких приєдналися."</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Створіть простори для організації кімнат"</string>
   <string name="screen_space_list_parent_space">"Простір %1$s"</string>
   <string name="screen_space_list_title">"Простори"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Повідомлення не надіслано, оскільки підтверджену особистість %1$s скинуто."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"Надано доступ %1$s"</string>
+  <string name="screen_static_location_sheet_title">"На карті"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d приєднується"</item>
+    <item quantity="few">"%1$d приєдналися"</item>
+    <item quantity="many">"%1$d приєдналися"</item>
+  </plurals>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Повідомлення не надіслано, оскільки звірена цифрова ідентичність %1$s була скинута."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Повідомлення не надіслано, оскільки %1$s перевірив не всі пристрої."</string>
-  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Повідомлення не надіслано, оскільки ви не підтвердили один або кілька своїх пристроїв."</string>
+  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Повідомлення не надіслано, оскільки ви не звірили один або кілька своїх пристроїв."</string>
   <string name="screen_view_location_title">"Розташування"</string>
   <string name="settings_version_number">"Версія: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"uk"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Історичні повідомлення недоступні на цьому пристрої"</string>
-  <string name="timeline_decryption_failure_historical_event_unverified_device">"Щоб отримати доступ до історичних повідомлень, потрібно верифікувати цей пристрій"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Щоб отримати доступ до історії повідомлень, потрібно звірити цей пристрій"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Ви не маєте доступу до цього повідомлення"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Неможливо розшифрувати повідомлення"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Це повідомлення заблоковано оскільки ви не верифікували свій пристрій, або тому, що відправнику потрібно верифікувати вашу особистість."</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Це повідомлення заблоковано, оскільки ви не звірили свій пристрій або відправник повинен звірити вашу цифрову ідентичність."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Ваш пристрій занадто старий, потрібен пристрій з Android 8 або новіший."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Відтворення карт не підтримується"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-ur/translations.xml b/libraries/ui-strings/src/main/res/values-ur/translations.xml
index 8e9c0fb3be..63a3d7c185 100644
--- a/libraries/ui-strings/src/main/res/values-ur/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ur/translations.xml
@@ -27,7 +27,6 @@
     <item quantity="other">"%1$s اور %2$d دیگر نے لڑھا"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"%1$s نے پڑھا"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"سب دکھانے کے لیے تھپتھپائیں"</string>
   <string name="a11y_remove_reaction">"%1$s کے ساتھ رد عمل ہٹائیں"</string>
   <string name="a11y_send_files">"مسلیں بھیجیں"</string>
   <string name="a11y_show_password">"لفظ عبور دکھائیں"</string>
@@ -141,7 +140,6 @@
   <string name="common_copyright">"حقوقِ طبع و نشر"</string>
   <string name="common_creating_room">"کمرہ تخلیق کررہاہے…"</string>
   <string name="common_current_user_left_room">"کمرہ چھوڑ لیا"</string>
-  <string name="common_dark">"اندھیرا"</string>
   <string name="common_decryption_error">"رمزکشائی کی خرابی"</string>
   <string name="common_developer_options">"مطور اختیارات"</string>
   <string name="common_direct_chat">"براہ راست گفتگو"</string>
@@ -168,7 +166,6 @@
   <string name="common_install_apk_android">"APK تنصیب کریں"</string>
   <string name="common_invite_unknown_profile">"یہ میٹرکس شناخت نہیں مل سکتی، تو ہو سکتا ہے کہ دعوت نامہ موصول نہ ہو۔"</string>
   <string name="common_leaving_room">"کمرہ چھوڑنا"</string>
-  <string name="common_light">"روشنی"</string>
   <string name="common_link_copied_to_clipboard">"ربط تختہ تراشہ پر نقل کردا گیا"</string>
   <string name="common_loading">"لاد رہا ہے…"</string>
   <plurals name="common_many_members">
@@ -212,7 +209,6 @@
   <string name="common_recovery_key">"بازیابی کی کلید"</string>
   <string name="common_refreshing">"تاکہ کر رہا ہے…"</string>
   <string name="common_replying_to">"%1$s کا جواب دے رہے ہیں"</string>
-  <string name="common_report_a_bug">"ایک خطاء کی اطلاع دیں"</string>
   <string name="common_report_a_problem">"کسی مسئلے کی اطلاع دیں"</string>
   <string name="common_report_submitted">"گزارش جمع ہوگئی"</string>
   <string name="common_rich_text_editor">"امیر مدیرِ متن"</string>
@@ -241,7 +237,6 @@
   <string name="common_success">"کامیابی"</string>
   <string name="common_suggestions">"تجاویز"</string>
   <string name="common_syncing">"ہمسات سازی"</string>
-  <string name="common_system">"نظام"</string>
   <string name="common_text">"متن"</string>
   <string name="common_third_party_notices">"فریق ثالث کے اشعارات"</string>
   <string name="common_thread">"دھاگہ"</string>
diff --git a/libraries/ui-strings/src/main/res/values-uz/translations.xml b/libraries/ui-strings/src/main/res/values-uz/translations.xml
index aada6634d2..120de32b66 100644
--- a/libraries/ui-strings/src/main/res/values-uz/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uz/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"Reaksiya qoʻyish: %1$s"</string>
+  <string name="a11y_address">"Manzil"</string>
   <string name="a11y_avatar">"Avatar"</string>
   <string name="a11y_collapse_message_text_field">"Xabar matni maydonini kichraytirish"</string>
   <string name="a11y_delete">"Oʻchirish"</string>
@@ -8,13 +9,16 @@
     <item quantity="one">"%1$d ta raqam kiritildi"</item>
     <item quantity="other">"%1$d ta raqam kiritildi"</item>
   </plurals>
+  <string name="a11y_duration">"Davomiyligi: %1$s"</string>
   <string name="a11y_edit_avatar">"Avatarni tahrirlash"</string>
   <string name="a11y_edit_room_address_hint">"To\'liq manzil %1$s bo\'ladi"</string>
   <string name="a11y_encryption_details">"Shifrlash tafsilotlari"</string>
   <string name="a11y_expand_message_text_field">"Xabar matni maydonini kengaytirish"</string>
   <string name="a11y_hide_password">"Parolni yashirish"</string>
+  <string name="a11y_info">"Maʻlumot"</string>
   <string name="a11y_join_call">"Qoʻngʻiroqga qoʻshilish"</string>
   <string name="a11y_jump_to_bottom">"Pastga o\'tish"</string>
+  <string name="a11y_jump_to_unread">"Oʻqilmaganlarga oʻtish"</string>
   <string name="a11y_move_the_map_to_my_location">"Xaritani mening joylashuvimga o\'tkazish"</string>
   <string name="a11y_notifications_mentions_only">"Faqat eslatmalar"</string>
   <string name="a11y_notifications_muted">"Ovozsiz"</string>
@@ -26,9 +30,13 @@
   <string name="a11y_pause">"Pauza"</string>
   <string name="a11y_paused_voice_message">"Ovoz xabar, davomiyligi: %1$s, joriy holati: %2$s"</string>
   <string name="a11y_pin_field">"PIN-kod maydoni"</string>
+  <string name="a11y_pinned_location">"Belgilangan joylashuv"</string>
   <string name="a11y_play">"O\'ynang"</string>
+  <string name="a11y_playback_speed">"Ijro tezligi"</string>
   <string name="a11y_poll">"So\'ro\'vnoma"</string>
   <string name="a11y_poll_end">"So‘rovnoma yakunlandi"</string>
+  <string name="a11y_position">"Lavozimi: %1$s"</string>
+  <string name="a11y_qr_code">"QR kodi"</string>
   <string name="a11y_react_with">"%1$s bilan munosabat bildiring"</string>
   <string name="a11y_react_with_other_emojis">"Boshqa hisbelgilar bilan munosabat bildiring"</string>
   <string name="a11y_read_receipts_multiple">"%1$s va %2$s bilan oʻqish"</string>
@@ -37,14 +45,20 @@
     <item quantity="other">"%1$s va %2$d boshqa kishilar tomonidan oʻqildi"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"Muallif: %1$s bilan oʻqish"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Hammasini ko\'rsatish uchun bosing"</string>
   <string name="a11y_remove_reaction">"Reaktsiyani olib tashlang: %1$s"</string>
   <string name="a11y_remove_reaction_with">"%1$s bilan reaktsiyani olib tashlang"</string>
   <string name="a11y_room_avatar">"Xona avatari"</string>
   <string name="a11y_send_files">"Fayllarni yuborish"</string>
+  <string name="a11y_sender_location">"Yuboruvchining joylashuvi"</string>
+  <string name="a11y_sent_by_sender_at_date">"%1$s tomonidan %2$s da yuborildi"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Amal bajarish vaqti cheklangan, tasdiqlash uchun bir daqiqa vaqtingiz bor"</string>
+  <string name="a11y_settings_with_required_action">"Sozlamalar, harakat talab qilinadi"</string>
   <string name="a11y_show_password">"Parolni ko\'rsatish"</string>
   <string name="a11y_start_call">"Qoʻngʻiroqni boshlash"</string>
+  <string name="a11y_start_video_call">"Video chaqiruvni boshlash"</string>
+  <string name="a11y_start_voice_call">"Ovozli qo‘ng‘iroq qilish"</string>
+  <string name="a11y_thread_in_room">"%1$s ichidagi mavzu"</string>
+  <string name="a11y_threads_in_room">"%1$s ichidagi mavzular"</string>
   <string name="a11y_tombstoned_room">"Arxivlangan xona"</string>
   <string name="a11y_user_avatar">"Foydalanuvchi avatari"</string>
   <string name="a11y_user_menu">"Foydalanuvchi menyusi"</string>
@@ -56,11 +70,13 @@
   <string name="a11y_your_avatar">"Sizning avataringiz"</string>
   <string name="action_accept">"Qabul qiling"</string>
   <string name="action_add_caption">"Sarlavha qo\'shing"</string>
+  <string name="action_add_existing_rooms">"Mavjud xonalarni qo‘shish"</string>
   <string name="action_add_to_timeline">"Vaqt jadvaliga qo\'shing"</string>
   <string name="action_back">"Orqaga"</string>
   <string name="action_call">"Qoʻngʻiroq"</string>
   <string name="action_cancel">"Bekor qilish"</string>
   <string name="action_cancel_for_now">"Hozircha bekor qilish"</string>
+  <string name="action_choose_file">"Faylni tanlang"</string>
   <string name="action_choose_photo">"Fotosuratni tanlang"</string>
   <string name="action_clear">"Tozalash"</string>
   <string name="action_close">"Yopish"</string>
@@ -75,22 +91,28 @@
   <string name="action_copy_text">"Matnni nusxalash"</string>
   <string name="action_create">"Yaratmoq"</string>
   <string name="action_create_room">"Xonani yaratish"</string>
+  <string name="action_create_space">"Maydon yaratish"</string>
   <string name="action_deactivate">"Faolsizlantirish"</string>
   <string name="action_deactivate_account">"Hisobni faolsizlantirish"</string>
   <string name="action_decline">"Rad etish"</string>
   <string name="action_decline_and_block">"Rad etish va bloklash"</string>
+  <string name="action_delete">"Oʻchirish"</string>
+  <string name="action_delete_account">"Akkauntni oʻchirish"</string>
+  <string name="action_delete_file">"Faylni oʻchirish"</string>
   <string name="action_delete_poll">"So‘rovnomani o‘chirish"</string>
   <string name="action_deselect_all">"Hammasini bekor qilish"</string>
   <string name="action_disable">"Oʻchirish"</string>
   <string name="action_discard">"Bekor qilish"</string>
   <string name="action_dismiss">"Bekor qilish"</string>
   <string name="action_done">"Bajarildi"</string>
+  <string name="action_download">"Yuklab olish"</string>
   <string name="action_edit">"Tahrirlash"</string>
   <string name="action_edit_caption">"Sarlavhani tahrirlash"</string>
   <string name="action_edit_poll">"So‘rovnomani tahrirlash"</string>
   <string name="action_enable">"Yoqish"</string>
   <string name="action_end_poll">"So‘rovnomani tugatish"</string>
   <string name="action_enter_pin">"PIN kodni kiriting"</string>
+  <string name="action_explore_public_spaces">"Jamoat maydonlari o‘rganing"</string>
   <string name="action_finish">"Tugatish"</string>
   <string name="action_forgot_password">"Parolni unutdingizmi?"</string>
   <string name="action_forward">"Oldinga"</string>
@@ -111,6 +133,7 @@
   <string name="action_leave_space">"Maydondan chiqish"</string>
   <string name="action_load_more">"Ko\'proq yuklash"</string>
   <string name="action_manage_account">"Hisobni boshqarish"</string>
+  <string name="action_manage_account_and_devices">"Hisob va qurilmalarni boshqarish"</string>
   <string name="action_manage_devices">"Qurilmalarni boshqarish"</string>
   <string name="action_manage_rooms">"Xonalarni boshqarish"</string>
   <string name="action_message">"Xabar"</string>
@@ -150,18 +173,21 @@
   <string name="action_send_voice_message">"Ovozli xabar yuborish"</string>
   <string name="action_share">"Ulashish"</string>
   <string name="action_share_link">"Havolani ulashing"</string>
+  <string name="action_share_live_location">"Jonli joylashuvni ulashish"</string>
   <string name="action_show">"Koʻrsatish"</string>
   <string name="action_sign_in_again">"Qaytadan kiring"</string>
-  <string name="action_signout">"Tizimdan chiqish"</string>
-  <string name="action_signout_anyway">"Baribir tizimdan chiqing"</string>
+  <string name="action_signout">"Bu qurilmani olib tashlash"</string>
+  <string name="action_signout_anyway">"Bu qurilma baribir olib tashlansin"</string>
   <string name="action_skip">"Oʻtkazib yuborish"</string>
   <string name="action_start">"Boshlash"</string>
   <string name="action_start_chat">"Suhbatni boshlash"</string>
   <string name="action_start_over">"Qaytadan boshlang"</string>
   <string name="action_start_verification">"Tasdiqlashni boshlang"</string>
   <string name="action_static_map_load">"Xaritani yuklash uchun bosing"</string>
+  <string name="action_stop">"To‘xtatish"</string>
   <string name="action_take_photo">"Rasmga olmoq"</string>
   <string name="action_tap_for_options">"Variantlar uchun bosing"</string>
+  <string name="action_translate">"Tarjima"</string>
   <string name="action_try_again">"Qayta urinib ko\'ring"</string>
   <string name="action_unpin">"Olib tashlash"</string>
   <string name="action_view">"Ko\'rish"</string>
@@ -186,16 +212,18 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Bloklangan foydalanuvchilar"</string>
   <string name="common_bubbles">"Pufakchalar"</string>
+  <string name="common_call_declined">"Qoʻngʻiroq rad etildi"</string>
   <string name="common_call_started">"Qoʻngʻiroq boshlandi"</string>
+  <string name="common_call_you_declined">"Siz qoʻngʻiroqni rad etdingiz"</string>
   <string name="common_chat_backup">"Chatning zaxira nusxasi"</string>
   <string name="common_copied_to_clipboard">"Buferga nusxa koʻchirildi"</string>
   <string name="common_copyright">"Mualliflik huquqi"</string>
   <string name="common_creating_room">"Xona yaratilmoqda…"</string>
+  <string name="common_creating_space">"Joy yaratilmoqda…"</string>
   <string name="common_current_user_canceled_knock">"So\'rov bekor qilindi"</string>
   <string name="common_current_user_left_room">"Xonani tark etdi"</string>
   <string name="common_current_user_left_space">"Tar etilgan maydon"</string>
   <string name="common_current_user_rejected_invite">"Taklif rad etildi"</string>
-  <string name="common_dark">"Tungi"</string>
   <string name="common_decryption_error">"Shifrni ochish xatosi"</string>
   <string name="common_description">"Tavsif"</string>
   <string name="common_developer_options">"Dasturchi variantlari"</string>
@@ -211,6 +239,7 @@
   <string name="common_empty_file">"Bo\'sh fayl"</string>
   <string name="common_encryption">"Shifrlash"</string>
   <string name="common_encryption_enabled">"Shifrlash yoqilgan"</string>
+  <string name="common_ends_at">"Tugaydi: %1$s"</string>
   <string name="common_enter_your_pin">"PIN kodini kiriting"</string>
   <string name="common_error">"Xato"</string>
   <string name="common_error_registering_pusher_android">"Xato yuz berdi, siz yangi xabarlar uchun bildirishnomalarni olmasligingiz mumkin. Iltimos, sozlamalardan bildirishnomalarni bartaraf eting.
@@ -220,6 +249,7 @@ Sababi:%1$s."</string>
   <string name="common_failed">"Xatolikka uchradi"</string>
   <string name="common_favourite">"Sevimli"</string>
   <string name="common_favourited">"Sevimli"</string>
+  <string name="common_fetching_notifications_title_android">"Bildirishnomalar sinxronlanmoqda…"</string>
   <string name="common_file">"Fayl"</string>
   <string name="common_file_deleted">"Fayl o\'chirildi"</string>
   <string name="common_file_saved">"Fayl saqlandi"</string>
@@ -233,10 +263,11 @@ Sababi:%1$s."</string>
   <string name="common_invite_unknown_profile">"Ushbu Matrix identifikatori topilmadi, shuning uchun taklif qabul qilinmasligi mumkin."</string>
   <string name="common_leaving_room">"Xonadan chiqish"</string>
   <string name="common_leaving_space">"Maydonni tark etish"</string>
-  <string name="common_light">"Nur"</string>
   <string name="common_line_copied_to_clipboard">"Satr vaqtinchalik xotiraga nusxalandi"</string>
   <string name="common_link_copied_to_clipboard">"Havola vaqtinchalik xotiraga nusxalandi"</string>
   <string name="common_link_new_device">"Yangi qurilmani ulang"</string>
+  <string name="common_live_location">"Jonli joylashuv"</string>
+  <string name="common_live_location_ended">"Jonli joylashuv tugadi"</string>
   <string name="common_loading">"Yuklanmoqda…"</string>
   <string name="common_loading_more">"Batafsil yuklanmoqda…"</string>
   <plurals name="common_many_members">
@@ -263,6 +294,7 @@ Sababi:%1$s."</string>
   <string name="common_offline">"Oflayn"</string>
   <string name="common_open_source_licenses">"Ochiq kodli litsenziyalar"</string>
   <string name="common_or">"yoki"</string>
+  <string name="common_other_options">"Boshqa variantlar"</string>
   <string name="common_password">"Parol"</string>
   <string name="common_people">"Odamlar"</string>
   <string name="common_permalink">"Doimiy havola"</string>
@@ -272,6 +304,7 @@ Sababi:%1$s."</string>
   <string name="common_please_wait">"Iltimos kuting…"</string>
   <string name="common_poll_end_confirmation">"Haqiqatan ham bu soʻrovnomani tugatmoqchimisiz?"</string>
   <string name="common_poll_summary">"So‘rov:%1$s"</string>
+  <string name="common_poll_summary_prefix">"Soʻroʻvnoma"</string>
   <string name="common_poll_total_votes">"Jami ovozlar:%1$s"</string>
   <string name="common_poll_undisclosed_text">"Natijalar soʻrovnoma tugagandan soʻng koʻrsatiladi"</string>
   <plurals name="common_poll_votes_count">
@@ -280,8 +313,10 @@ Sababi:%1$s."</string>
   </plurals>
   <string name="common_preparing">"Tayyorlanmoqda…"</string>
   <string name="common_privacy_policy">"Maxfiylik siyosati"</string>
+  <string name="common_private">"Maxfiy"</string>
   <string name="common_private_room">"Shaxsiy xona"</string>
   <string name="common_private_space">"Shaxsiy guruh"</string>
+  <string name="common_public">"Ommaviy"</string>
   <string name="common_public_room">"Jamoat xonasi"</string>
   <string name="common_public_space">"Jamoat guruhi"</string>
   <string name="common_reaction">"Reaktsiya"</string>
@@ -289,15 +324,16 @@ Sababi:%1$s."</string>
   <string name="common_reason">"Sabab"</string>
   <string name="common_recovery_key">"Qayta tiklash kaliti"</string>
   <string name="common_refreshing">"Yangilanmoqda…"</string>
+  <string name="common_removing">"Olib tashlanmoqda…"</string>
   <plurals name="common_replies">
     <item quantity="one">"%1$d ta javob"</item>
     <item quantity="other">"%1$d ta javob"</item>
   </plurals>
   <string name="common_replying_to">"%1$sga Javob berilmoqda"</string>
-  <string name="common_report_a_bug">"Xato haqida xabar bering"</string>
   <string name="common_report_a_problem">"Muammo haqida xabar bering"</string>
   <string name="common_report_submitted">"Hisobot topshirildi"</string>
   <string name="common_rich_text_editor">"Boy matn muharriri"</string>
+  <string name="common_role">"Rol"</string>
   <string name="common_room">"Xona"</string>
   <string name="common_room_name">"Xona nomi"</string>
   <string name="common_room_name_placeholder">"masalan, loyihangiz nomi"</string>
@@ -313,6 +349,10 @@ Sababi:%1$s."</string>
   <string name="common_security">"Xavfsizlik"</string>
   <string name="common_seen_by">"Tomonidan koʻrilgan"</string>
   <string name="common_select_account">"Hisobni tanlang"</string>
+  <plurals name="common_selected_count">
+    <item quantity="one">"%1$d ta tanlandi"</item>
+    <item quantity="other">"%1$d ta tanlandi"</item>
+  </plurals>
   <string name="common_send_to">"Yubirish"</string>
   <string name="common_sending">"Yuborilmoqda…"</string>
   <string name="common_sending_failed">"Yuborilmadi"</string>
@@ -323,12 +363,15 @@ Sababi:%1$s."</string>
   <string name="common_server_url">"Server URL manzili"</string>
   <string name="common_settings">"Sozlamalar"</string>
   <string name="common_share_space">"Maydonni ulashish"</string>
+  <string name="common_shared_history">"Yangi a’zolar tarixni ko‘radi"</string>
+  <string name="common_shared_live_location">"Ulashilgan jonli joylashuv"</string>
   <string name="common_shared_location">"Joylashuvi ulashildi"</string>
   <string name="common_shared_space">"Umumiy maydon"</string>
-  <string name="common_signing_out">"Chiqish"</string>
+  <string name="common_signing_out">"Qurilma olib tashlanmoqda"</string>
   <string name="common_something_went_wrong">"Nimadir xato ketdi"</string>
   <string name="common_something_went_wrong_message">"Muammoga duch keldik. Iltimos, qayta urinib koʻring."</string>
   <string name="common_space">"Maydon"</string>
+  <string name="common_space_members">"Maydon a’zolari"</string>
   <string name="common_space_topic_placeholder">"Bu maydon nima haqida?"</string>
   <plurals name="common_spaces">
     <item quantity="one">"%1$d Maydon"</item>
@@ -337,12 +380,13 @@ Sababi:%1$s."</string>
   <string name="common_starting_chat">"Chat boshlanmoqda…"</string>
   <string name="common_sticker">"Stiker"</string>
   <string name="common_success">"Muvaffaqiyat"</string>
+  <string name="common_suggested">"Tavsiya etilgan"</string>
   <string name="common_suggestions">"Tavsiyalar"</string>
   <string name="common_syncing">"Sinxronlash"</string>
-  <string name="common_system">"Tizim"</string>
   <string name="common_text">"Matn"</string>
   <string name="common_third_party_notices">"Uchinchi tomon bildirishnomalari"</string>
   <string name="common_thread">"Ip"</string>
+  <string name="common_threads">"Mavzular"</string>
   <string name="common_topic">"Mavzu"</string>
   <string name="common_topic_placeholder">"Bu xona nima haqida?"</string>
   <string name="common_unable_to_decrypt">"Shifrni ochish imkonsiz"</string>
@@ -373,14 +417,19 @@ Sababi:%1$s."</string>
   <string name="common_voice_message">"Ovozli xabar"</string>
   <string name="common_waiting">"Kutilmoqda…"</string>
   <string name="common_waiting_for_decryption_key">"Ushbu xabarni kutilmoqda"</string>
+  <string name="common_waiting_live_location">"Jonli joylashuv kutilmoqda…"</string>
+  <string name="common_world_readable_history">"Tarixni hamma ko‘rishi mumkin"</string>
   <string name="common_you">"Siz"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) bu xabarni ulashdi, chunki u yuborilganda siz xonada emas edingiz."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s bu xabar yuborilgan paytda siz xonada bo‘lmaganingiz uchun uni ulashdi."</string>
   <string name="crypto_history_visible">"Siz yuborgan xabarlar bu xonaga taklif qilingan yangi a’zolarga ulashiladi. %1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$sning shaxsi qayta tiklandi.%2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$sʼning %2$s shaxsiy ma’lumotlari qayta tiklandi.%3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$sning raqamli identifikatori qayta tiklandi.%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$sning%2$s raqamli identifikatsiya qayta tiklandi.%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s )"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$sning shaxsi qayta tiklandi."</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$sʼning %2$s shaxsiy ma’lumotlari qayta o‘rnatildi.%3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s raqamli identifikatori asliga qaytarildi."</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$sning%2$s raqamli identifikatsiya qayta tiklandi.%3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Tasdiqlashni bekor qilish"</string>
+  <string name="dialog_allow_access">"Ruxsat berish"</string>
   <string name="dialog_confirm_link_message">"%1$s havolasi sizni boshqa %2$s saytiga olib boradi
 
 Davom etasizmi?"</string>
@@ -401,7 +450,6 @@ Davom etasizmi?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"Ruxsat etilgan maksimal fayl hajmi: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Yuklanadigan video sifatini tanlang."</string>
   <string name="dialog_video_quality_selector_title">"Video yuklash sifatini tanlang"</string>
-  <string name="emoji_picker_search_placeholder">"Emojilarni qidiring"</string>
   <string name="error_account_already_logged_in">"Bu qurilmada allaqachon %1$s hisobiga kirgansiz."</string>
   <string name="error_account_creation_not_possible">"Matrix autentifikatsiya xizmati va hisob yaratish imkoniyatini qo‘llab-quvvatlash uchun uy serveringizni yangilash talab etiladi."</string>
   <string name="error_failed_creating_the_permalink">"Doimiy havola yaratilmadi"</string>
@@ -410,6 +458,7 @@ Davom etasizmi?"</string>
   <string name="error_failed_locating_user">"%1$sjoylashuvingizga kira olmadi. Iltimos keyinroq qayta urinib ko\'ring."</string>
   <string name="error_failed_uploading_voice_message">"Ovozli xabaringizni yuklashda xatolik roʻy berdi."</string>
   <string name="error_invalid_invite">"Xona endi mavjud emas yoki taklif yaroqsiz."</string>
+  <string name="error_location_service_disabled_android">"Joylashuvga asoslangan funksiyalardan foydalanish uchun GPS funksiyasini yoqing."</string>
   <string name="error_message_not_found">"Xabar topilmadi"</string>
   <string name="error_missing_location_auth_android">"%1$sjoylashuvingizga kirishga ruxsati yo\'q. Sozlamalar orqali kirishni yoqishingiz mumkin."</string>
   <string name="error_missing_location_rationale_android">"%1$sjoylashuvingizga kirishga ruxsati yo\'q. Quyida kirishni yoqing."</string>
@@ -421,6 +470,9 @@ Davom etasizmi?"</string>
   <string name="error_unknown">"Kechirasiz, xatolik yuz berdi"</string>
   <string name="invite_friends_rich_title">"🔐️ Menga qo\'shiling%1$s"</string>
   <string name="invite_friends_text">"Hey, men bilan gaplash%1$s :%2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Jonli joylashuvni ulashish"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Joylashuvni ulashish jarayoni davom etmoqda"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s jonli joylashuvi"</string>
   <string name="login_initial_device_name_android">"%1$sAndroid"</string>
   <string name="preference_rageshake">"Xato haqida xabar berish uchun G\'azablanish"</string>
   <string name="screen_bug_report_a11y_screenshot">"Skrinshot"</string>
@@ -428,6 +480,13 @@ Davom etasizmi?"</string>
   <string name="screen_create_poll_options_section_title">"Parametrlar"</string>
   <string name="screen_create_poll_remove_accessibility_label">"%1$sni olib tashlash"</string>
   <string name="screen_create_poll_settings_section_title">"Sozlamalar"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Hech kim joylashuvini ulashmayapti"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Jonli joylashuvni ulashish"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d kishi"</item>
+    <item quantity="other">"%1$d odamlar"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"Xaritada"</string>
   <string name="screen_media_picker_error_failed_selection">"Media tanlash jarayonida xatolik yuz berdi, qayta urinib ko\'ring"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Xabarni bosib, bu yerga kiritish uchun \"%1$s\"-ni tanlang."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Muhim xabarlarni osongina topish uchun qadang"</string>
@@ -436,11 +495,11 @@ Davom etasizmi?"</string>
     <item quantity="other">"%1$d ta qadalgan xabar"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Qadalgan xabarlar"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"Shaxsingizni qayta o‘rnatish uchun %1$s hisobingizga kirishingiz kerak. Shundan so‘ng, avtomatik ravishda ilovaga qaytarilasiz."</string>
-  <string name="screen_reset_identity_confirmation_title">"Tasdiqlanmadimi? Shaxsingizni tiklash uchun hisobingizga kiring."</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Raqamli identifikatoringizni tiklash uchun %1$s hisobingizga kirmoqchisiz. Shundan keyin ilovaga qaytarilasiz."</string>
+  <string name="screen_reset_identity_confirmation_title">"Tasdiqlay olmayapsizmi? Raqamli identifikatorni tiklash uchun hisobingizga kiring."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Tasdiqlashni olib tashlang va yuboring"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Siz tasdiqlashni bekor qilib, bu xabarni baribir yuborishingiz yoki hozircha to‘xtatib, %1$sʼni qayta tasdiqlagandan so‘ng keyinroq yana urinib ko‘rishingiz mumkin."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"%1$sning tasdiqlangan shaxsiy ma’lumotlari qayta o‘rnatilganligi tufayli xabaringiz jo‘natilmadi"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Xabaringiz yuborilmadi, chunki %1$sning tasdiqlangan raqamli identifikatori asliga qaytarildi"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Baribir xabar yuborilsin"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s tasdiqlanmagan bir yoki bir nechta qurilmadan foydalanmoqda. Siz xabarni baribir yuborishingiz mumkin yoki hozircha bekor qilib, %2$s barcha qurilmalarini tasdiqlagunga qadar kutib, keyinroq qayta urinishingiz mumkin."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"%1$s barcha qurilmalarni tasdiqlamagani uchun xabaringiz yuborilmadi"</string>
@@ -452,6 +511,7 @@ Davom etasizmi?"</string>
   <string name="screen_room_event_pill">"Xabar %1$sda"</string>
   <string name="screen_room_grouped_state_events_expand">"Kengaytirish"</string>
   <string name="screen_room_grouped_state_events_reduce">"Kamaytirish"</string>
+  <string name="screen_room_live_location_banner">"Jonli joylashuvni ulashish"</string>
   <string name="screen_room_permalink_same_room_android">"Bu xona allaqachon ko‘rilmoqda!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$sʼdan %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s ta qadalgan xabar"</string>
@@ -464,11 +524,15 @@ Davom etasizmi?"</string>
   <string name="screen_share_open_google_maps">"Google Mapsda oching"</string>
   <string name="screen_share_open_osm_maps">"OpenStreetMapda oching"</string>
   <string name="screen_share_this_location_action">"Bu joylashuvni ulashing"</string>
+  <string name="screen_sharing_location_option_sheet_title">"Ulashish parametrlari"</string>
   <string name="screen_space_list_description">"Siz yaratgan yoki qo‘shilgan maydonlar."</string>
   <string name="screen_space_list_details">"%1$s•%2$s"</string>
+  <string name="screen_space_list_empty_state_title">"Xonalarni tartibga solish uchun maydon yarating"</string>
   <string name="screen_space_list_parent_space">"%1$s ta maydon"</string>
   <string name="screen_space_list_title">"Maydonlar"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Xabar yuborilmadi, chunki %1$sʼning tasdiqlangan identifikatori asliga qaytarildi."</string>
+  <string name="screen_static_location_sheet_timestamp_description">"%1$s ulashildi"</string>
+  <string name="screen_static_location_sheet_title">"Xaritada"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Xabar yuborilmadi, chunki%1$s ning tasdiqlangan raqamli identifikatsiyasi qayta tiklandi."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Xabar yuborilmadi, chunki %1$s barcha qurilmalarni tasdiqlamagan."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Xabaringiz yuborilmadi, chunki siz bir yoki bir nechta qurilmangizni tasdiqlamagan ekansiz."</string>
   <string name="screen_view_location_title">"Joylashuv"</string>
@@ -478,5 +542,7 @@ Davom etasizmi?"</string>
   <string name="timeline_decryption_failure_historical_event_unverified_device">"Tarixiy xabarlarga kirish uchun bu qurilmani tasdiqlashingiz kerak"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Sizni ushbu xabarga ruxsatingiz yoʻq"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Xabarni shifrini ochib bo‘lmadi"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"Bu xabar bloklandi, chunki siz qurilmangizni tasdiqlamadingiz yoki yuboruvchi shaxsingizni tasdiqlashi kerak bo‘lgani sababli bloklandi"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Qurilmangizni tasdiqlamaganingiz yoki yuboruvchi raqamli shaxsingizni tasdiqlashi kerakligi sababli bu xabar bloklandi."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Qurilmangiz juda eski, Android 8 yoki undan keyingi versiyadagi qurilma talab qilinadi."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Xaritalarni renderlash qoʻllab-quvvatlanmaydi"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-vi/translations.xml b/libraries/ui-strings/src/main/res/values-vi/translations.xml
new file mode 100644
index 0000000000..87baf98c47
--- /dev/null
+++ b/libraries/ui-strings/src/main/res/values-vi/translations.xml
@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_reaction">"Thêm biểu cảm: %1$s"</string>
+  <string name="a11y_address">"Địa chỉ"</string>
+  <string name="a11y_avatar">"Ảnh đại diện"</string>
+  <string name="a11y_collapse_message_text_field">"Thu nhỏ ô nhập tin nhắn"</string>
+  <string name="a11y_delete">"Xóa"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="other">"%1$d các chữ số đã nhập"</item>
+  </plurals>
+  <string name="a11y_edit_avatar">"Đổi ảnh đại diện"</string>
+  <string name="a11y_edit_room_address_hint">"Đường dẫn đầy đủ của phòng là %1$s"</string>
+  <string name="a11y_encryption_details">"Chi tiết mã hóa"</string>
+  <string name="a11y_expand_message_text_field">"Mở rộng ô nhập tin nhắn"</string>
+  <string name="a11y_hide_password">"Ẩn mật khẩu"</string>
+  <string name="a11y_join_call">"Tham gia cuộc gọi"</string>
+  <string name="a11y_jump_to_bottom">"Xuống cuối"</string>
+  <string name="a11y_move_the_map_to_my_location">"Di chuyển bản đồ đến vị trí của tôi"</string>
+  <string name="a11y_notifications_mentions_only">"Chỉ khi được đề cập tới"</string>
+  <string name="a11y_notifications_muted">"Tắt thông báo"</string>
+  <string name="a11y_notifications_new_mentions">"Đề cập mới"</string>
+  <string name="a11y_notifications_new_messages">"Tin nhắn mới"</string>
+  <string name="a11y_notifications_ongoing_call">"Cuộc gọi hiện thời"</string>
+  <string name="a11y_other_user_avatar">"Ảnh đại diện của người dùng khác"</string>
+  <string name="a11y_page_n">"Trang %1$d"</string>
+  <string name="a11y_pause">"Tạm dừng"</string>
+  <string name="a11y_paused_voice_message">"Tin nhắn thoại, thời lượng: %1$s, vị trí hiện tại: %2$s"</string>
+  <string name="a11y_pin_field">"Trường mã PIN"</string>
+  <string name="a11y_pinned_location">"Vị trí được ghim"</string>
+  <string name="a11y_play">"Phát"</string>
+  <string name="a11y_playback_speed">"Tốc độ phát"</string>
+  <string name="a11y_poll">"Bỏ phiếu"</string>
+  <string name="a11y_poll_end">"Đã kết thúc cuộc thăm dò"</string>
+  <string name="a11y_qr_code">"Mã QR"</string>
+  <string name="a11y_react_with">"Phản ứng với %1$s"</string>
+  <string name="a11y_react_with_other_emojis">"Phản ứng với các biểu tượng cảm xúc khác"</string>
+  <string name="a11y_read_receipts_multiple">"Đọc bởi %1$s và %2$s"</string>
+  <plurals name="a11y_read_receipts_multiple_with_others">
+    <item quantity="other">"%1$s và %2$d người khác đã đọc."</item>
+  </plurals>
+  <string name="a11y_read_receipts_single">"Đọc bởi %1$s"</string>
+  <string name="a11y_remove_reaction">"Xóa phản ứng: %1$s"</string>
+  <string name="a11y_remove_reaction_with">"Loại bỏ phản ứng với %1$s"</string>
+  <string name="a11y_room_avatar">"Ảnh đại diện phòng"</string>
+  <string name="a11y_send_files">"Gửi tệp"</string>
+  <string name="a11y_sender_location">"Vị trí người gửi"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"Yêu cầu hành động có giới hạn thời gian, bạn có một phút để xác minh"</string>
+  <string name="a11y_show_password">"Hiện mật khẩu"</string>
+  <string name="a11y_start_call">"Bắt đầu cuộc gọi"</string>
+  <string name="a11y_start_video_call">"Bắt đầu cuộc gọi video"</string>
+  <string name="a11y_start_voice_call">"Bắt đầu cuộc gọi thoại"</string>
+  <string name="a11y_tombstoned_room">"Phòng Tombstone"</string>
+  <string name="a11y_user_avatar">"Ảnh đại diện của người dùng"</string>
+  <string name="a11y_user_menu">"Menu người dùng"</string>
+  <string name="a11y_view_avatar">"Xem ảnh đại diện"</string>
+  <string name="a11y_view_details">"Xem chi tiết"</string>
+  <string name="a11y_voice_message">"Tin nhắn thoại, thời lượng: %1$s"</string>
+  <string name="a11y_voice_message_record">"Ghi âm tin nhắn thoại"</string>
+  <string name="a11y_voice_message_stop_recording">"Dừng ghi"</string>
+  <string name="a11y_your_avatar">"Ảnh đại diện của bạn"</string>
+  <string name="action_accept">"Đồng ý"</string>
+  <string name="action_add_caption">"Thêm chú thích"</string>
+  <string name="action_add_existing_rooms">"Thêm các phòng trò chuyện hiện có"</string>
+  <string name="action_add_to_timeline">"Thêm vào dòng thời gian"</string>
+  <string name="action_back">"Quay lại"</string>
+  <string name="action_call">"Gọi"</string>
+  <string name="action_cancel">"Hủy"</string>
+  <string name="action_cancel_for_now">"Hủy ngay"</string>
+  <string name="action_choose_photo">"Chọn ảnh"</string>
+  <string name="action_clear">"Xoá"</string>
+  <string name="action_close">"Đóng"</string>
+  <string name="action_complete_verification">"Xác minh hoàn tất"</string>
+  <string name="action_confirm">"Xác nhận"</string>
+  <string name="action_confirm_password">"Xác nhận mật khẩu"</string>
+  <string name="action_continue">"Tiếp tục"</string>
+  <string name="action_copy">"Chép"</string>
+  <string name="action_copy_caption">"Sao chép chú thích"</string>
+  <string name="action_copy_link">"Chép liên kết"</string>
+  <string name="action_copy_link_to_message">"Sao chép liên kết đến tin nhắn"</string>
+  <string name="action_copy_text">"Chép văn bản"</string>
+  <string name="action_create">"Tạo"</string>
+  <string name="action_create_room">"Tạo phòng"</string>
+  <string name="action_create_space">"Tạo không gian"</string>
+  <string name="action_deactivate">"Hủy kích hoạt"</string>
+  <string name="action_deactivate_account">"Vô hiệu hóa tài khoản"</string>
+  <string name="action_decline">"Từ chối"</string>
+  <string name="action_decline_and_block">"Từ chối và chặn"</string>
+  <string name="action_delete_poll">"Xóa cuộc thăm dò"</string>
+  <string name="action_deselect_all">"Bỏ chọn tất cả"</string>
+  <string name="action_disable">"Tắt"</string>
+  <string name="action_discard">"Hủy"</string>
+  <string name="action_dismiss">"Bỏ qua"</string>
+  <string name="action_done">"Xong"</string>
+  <string name="action_edit">"Chỉnh sửa"</string>
+  <string name="action_edit_caption">"Chỉnh sửa chú thích"</string>
+  <string name="action_edit_poll">"Sửa cuộc thăm dò"</string>
+  <string name="action_enable">"Bật"</string>
+  <string name="action_end_poll">"Kết thúc cuộc thăm dò"</string>
+  <string name="action_enter_pin">"Nhập mã PIN"</string>
+  <string name="action_explore_public_spaces">"Khám phá các không gian công cộng"</string>
+  <string name="action_finish">"Hoàn tất"</string>
+  <string name="action_forgot_password">"Quên mật khẩu?"</string>
+  <string name="action_forward">"Chuyển tiếp"</string>
+  <string name="action_go_back">"Quay lại"</string>
+  <string name="action_go_to_roles_and_permissions">"Đi tới vai trò và quyền"</string>
+  <string name="action_go_to_settings">"Vào cài đặt"</string>
+  <string name="action_ignore">"Bỏ qua"</string>
+  <string name="action_invite">"Mời"</string>
+  <string name="action_invite_friends">"Mời ai đó"</string>
+  <string name="action_invite_friends_to_app">"Mời ai đó vào %1$s"</string>
+  <string name="action_invite_people_to_app">"Mời ai đó vào %1$s"</string>
+  <string name="action_invites_list">"Lời mời"</string>
+  <string name="action_join">"Tham gia"</string>
+  <string name="action_learn_more">"Tìm hiểu thêm"</string>
+  <string name="action_leave">"Rời"</string>
+  <string name="action_leave_conversation">"Rời khỏi cuộc trò chuyện"</string>
+  <string name="action_leave_room">"Rời phòng"</string>
+  <string name="action_leave_space">"Rời space"</string>
+  <string name="action_load_more">"Tải thêm"</string>
+  <string name="action_manage_account">"Quản lý tài khoản"</string>
+  <string name="action_manage_account_and_devices">"Quản lý tài khoản và thiết bị"</string>
+  <string name="action_manage_devices">"Quản lý thiết bị"</string>
+  <string name="action_manage_rooms">"Quản lý phòng trò chuyện"</string>
+  <string name="action_message">"Tin nhắn"</string>
+  <string name="action_minimize">"Thu nhỏ"</string>
+  <string name="action_next">"Tiếp"</string>
+  <string name="action_no">"Không"</string>
+  <string name="action_not_now">"Không phải lúc này"</string>
+  <string name="action_ok">"OK"</string>
+  <string name="action_open_context_menu">"Mở context menu"</string>
+  <string name="action_open_settings">"Cài đặt"</string>
+  <string name="action_open_with">"Mở bằng"</string>
+  <string name="action_pin">"Ghim"</string>
+  <string name="action_quick_reply">"Trả lời nhanh"</string>
+  <string name="action_quote">"Trích dẫn"</string>
+  <string name="action_react">"Phản ứng"</string>
+  <string name="action_reject">"Từ chối"</string>
+  <string name="action_remove">"Xoá"</string>
+  <string name="action_remove_caption">"Xóa chú thích"</string>
+  <string name="action_remove_message">"Xóa tin nhắn"</string>
+  <string name="action_reply">"Trả lời"</string>
+  <string name="action_reply_in_thread">"Trả lời trong thread"</string>
+  <string name="action_report">"Báo cáo"</string>
+  <string name="action_report_bug">"Báo lỗi"</string>
+  <string name="action_report_content">"Báo cáo nội dung"</string>
+  <string name="action_report_dm">"Báo cáo cuộc trò chuyện"</string>
+  <string name="action_report_room">"Báo cáo phòng"</string>
+  <string name="action_reset">"Đặt lại"</string>
+  <string name="action_reset_identity">"Đặt lại danh tính"</string>
+  <string name="action_retry">"Thử lại"</string>
+  <string name="action_retry_decryption">"Thử giải mã lại"</string>
+  <string name="action_save">"Lưu"</string>
+  <string name="action_search">"Tìm kiếm"</string>
+  <string name="action_select_all">"Chọn tất cả"</string>
+  <string name="action_send">"Gửi"</string>
+  <string name="action_send_edited_message">"Gửi tin nhắn đã chỉnh sửa"</string>
+  <string name="action_send_message">"Gửi tin nhắn"</string>
+  <string name="action_send_voice_message">"Gửi tin nhắn thoại"</string>
+  <string name="action_share">"Chia sẻ"</string>
+  <string name="action_share_link">"Chia sẻ liên kết"</string>
+  <string name="action_share_live_location">"Chia sẻ vị trí trong thời gian thực"</string>
+  <string name="action_show">"Hiện"</string>
+  <string name="action_sign_in_again">"Đăng nhập lại"</string>
+  <string name="action_signout">"Gỡ bỏ thiết bị này"</string>
+  <string name="action_signout_anyway">"Vẫn gỡ bỏ thiết bị này"</string>
+  <string name="action_skip">"Bỏ qua"</string>
+  <string name="action_start">"Bắt đầu"</string>
+  <string name="action_start_chat">"Bắt đầu trò truyện"</string>
+  <string name="action_start_over">"Bắt đầu lại"</string>
+  <string name="action_start_verification">"Bắt đầu xác thực"</string>
+  <string name="action_static_map_load">"Nhấn để tải bản đồ"</string>
+  <string name="action_stop">"Dừng"</string>
+  <string name="action_take_photo">"Chụp ảnh"</string>
+  <string name="action_tap_for_options">"Nhấn để hiện tùy chọn"</string>
+  <string name="action_translate">"Dịch"</string>
+  <string name="action_try_again">"Thử lại"</string>
+  <string name="action_unpin">"Bỏ ghim"</string>
+  <string name="action_view">"Xem"</string>
+  <string name="action_view_in_timeline">"Xem trong dòng thời gian"</string>
+  <string name="action_view_source">"Xem mã nguồn"</string>
+  <string name="action_yes">"Có"</string>
+  <string name="action_yes_try_again">"Có, thử lại"</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"Máy chủ của bạn hiện đã hỗ trợ một giao thức mới, nhanh hơn. Hãy đăng xuất và đăng nhập lại để nâng cấp ngay. Việc này sẽ giúp bạn tránh bị buộc đăng xuất khi giao thức cũ bị loại bỏ sau này."</string>
+  <string name="banner_migrate_to_native_sliding_sync_title">"Có thể nâng cấp"</string>
+  <string name="common_about">"Giới thiệu"</string>
+  <string name="common_acceptable_use_policy">"Quy định sử dụng dịch vụ"</string>
+  <string name="common_add_account">"Thêm tài khoản"</string>
+  <string name="common_add_another_account">"Thêm tài khoản khác"</string>
+  <string name="common_adding_caption">"Thêm chú thích"</string>
+  <string name="common_advanced_settings">"Cài đặt nâng cao"</string>
+  <string name="common_an_image">"một hình ảnh"</string>
+  <string name="common_analytics">"Phân tích"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"Bạn rời phòng"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"Bạn đã bị đăng xuất"</string>
+  <string name="common_appearance">"Giao diện"</string>
+  <string name="common_audio">"Âm thanh"</string>
+  <string name="common_beta">"Thử nghiệm"</string>
+  <string name="common_blocked_users">"Người dùng bị chặn"</string>
+  <string name="common_bubbles">"Bong bóng"</string>
+  <string name="common_call_started">"Cuộc gọi bắt đầu"</string>
+  <string name="common_chat_backup">"Sao lưu cuộc trò chuyện"</string>
+  <string name="common_copied_to_clipboard">"Đã sao chép"</string>
+  <string name="common_copyright">"Bản quyền"</string>
+  <string name="common_creating_room">"Đang tạo phòng…"</string>
+  <string name="common_creating_space">"Tạo không gian…"</string>
+  <string name="common_current_user_canceled_knock">"Yêu cầu bị hủy bỏ"</string>
+  <string name="common_current_user_left_room">"Đã rời khỏi phòng"</string>
+  <string name="common_current_user_left_space">"Rời khỏi không gian"</string>
+  <string name="common_current_user_rejected_invite">"Lời mời bị từ chối"</string>
+  <string name="common_decryption_error">"Lỗi khi giải mã"</string>
+  <string name="common_description">"Mô tả"</string>
+  <string name="common_developer_options">"Tùy chọn nhà phát triển"</string>
+  <string name="common_device_id">"ID thiết bị"</string>
+  <string name="common_direct_chat">"Chat trực tiếp"</string>
+  <string name="common_do_not_show_this_again">"Không hiển thị lại"</string>
+  <string name="common_download_failed">"Tải xuống thất bại"</string>
+  <string name="common_downloading">"Đang tải xuống"</string>
+  <string name="common_edited_suffix">"(đã sửa)"</string>
+  <string name="common_editing">"Đang chỉnh sửa"</string>
+  <string name="common_editing_caption">"Chỉnh sửa chú thích"</string>
+  <string name="common_emote">"*%1$s%2$s"</string>
+  <string name="common_empty_file">"Tệp trống."</string>
+  <string name="common_encryption">"Mã hóa"</string>
+  <string name="common_encryption_enabled">"Đã bật mã hoá"</string>
+  <string name="common_ends_at">"Kết thúc lúc %1$s"</string>
+  <string name="common_enter_your_pin">"Nhập mã PIN của bạn"</string>
+  <string name="common_error">"Lỗi"</string>
+  <string name="common_error_registering_pusher_android">"Đã xảy ra lỗi, bạn có thể không nhận được thông báo cho tin nhắn mới. Vui lòng khắc phục sự cố thông báo trong phần cài đặt.
+
+Lý do: %1$s ."</string>
+  <string name="common_everyone">"Mọi người"</string>
+  <string name="common_failed">"Thất bại"</string>
+  <string name="common_favourite">"Yêu thích"</string>
+  <string name="common_favourited">"Được yêu thích"</string>
+  <string name="common_fetching_notifications_title_android">"Đang đồng bộ thông báo…"</string>
+  <string name="common_file">"Tập tin"</string>
+  <string name="common_file_deleted">"Tệp đã bị xóa"</string>
+  <string name="common_file_saved">"Tệp đã được lưu"</string>
+  <string name="common_file_saved_on_disk_android">"Tệp đã được lưu vào thư mục Tải xuống"</string>
+  <string name="common_forward_message">"Chuyển tiếp tin nhắn"</string>
+  <string name="common_frequently_used">"Thường được sử dụng"</string>
+  <string name="common_gif">"Ảnh động"</string>
+  <string name="common_image">"Ảnh"</string>
+  <string name="common_in_reply_to">"Trả lời %1$s"</string>
+  <string name="common_install_apk_android">"Cài đặt APK"</string>
+  <string name="common_invite_unknown_profile">"Không tìm thấy Matrix ID này, nên lời mời có thể chưa được nhận."</string>
+  <string name="common_leaving_room">"Rời khỏi phòng"</string>
+  <string name="common_leaving_space">"Rời khỏi không gian"</string>
+  <string name="common_line_copied_to_clipboard">"Đã sao chép dòng"</string>
+  <string name="common_link_copied_to_clipboard">"Đã chép liên kết vào bộ nhớ tạm"</string>
+  <string name="common_link_new_device">"Liên kết thiết bị mới"</string>
+  <string name="common_live_location">"Vị trí trong thời gian thực"</string>
+  <string name="common_live_location_ended">"Chia sẻ vị trí trực tiếp đã kết thúc"</string>
+  <string name="common_loading">"Đang tải"</string>
+  <string name="common_loading_more">"Đang tải thêm…"</string>
+  <plurals name="common_many_members">
+    <item quantity="other">"%d người khác"</item>
+  </plurals>
+  <plurals name="common_member_count">
+    <item quantity="other">"%1$d số thành viên"</item>
+  </plurals>
+  <string name="common_message">"Tin nhắn"</string>
+  <string name="common_message_actions">"Thao tác tin nhắn"</string>
+  <string name="common_message_failed_to_send">"Không gửi được tin nhắn"</string>
+  <string name="common_message_layout">"Bố cục tin nhắn"</string>
+  <string name="common_message_removed">"Tin nhắn bị xoá"</string>
+  <string name="common_modern">"Hiện đại"</string>
+  <string name="common_mute">"Tắt tiếng"</string>
+  <string name="common_name">"Tên"</string>
+  <string name="common_no_results">"Không có kết quả"</string>
+  <string name="common_no_room_name">"Không có tên phòng"</string>
+  <string name="common_no_space_name">"Không có tên space"</string>
+  <string name="common_not_encrypted">"Không được mã hóa"</string>
+  <string name="common_offline">"Ngoại tuyến"</string>
+  <string name="common_open_source_licenses">"Giấy phép mã nguồn mở"</string>
+  <string name="common_or">"hoặc"</string>
+  <string name="common_other_options">"Các lựa chọn khác"</string>
+  <string name="common_password">"Mật khẩu"</string>
+  <string name="common_people">"Danh bạ"</string>
+  <string name="common_permalink">"Liên kết cố định"</string>
+  <string name="common_permission">"Quyền truy cập"</string>
+  <string name="common_pinned">"Đã ghim"</string>
+  <string name="common_please_check_internet_connection">"Vui lòng kiểm tra kết nối internet của bạn."</string>
+  <string name="common_please_wait">"Vui lòng chờ…"</string>
+  <string name="common_poll_end_confirmation">"Bạn có chắc chắn muốn kết thúc cuộc thăm dò này không?"</string>
+  <string name="common_poll_summary">"Khảo sát: %1$s"</string>
+  <string name="common_poll_total_votes">"Tổng số phiếu: %1$s"</string>
+  <string name="common_poll_undisclosed_text">"Kết quả sẽ hiển thị sau khi cuộc thăm dò kết thúc"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="other">"%d lượt bình chọn"</item>
+  </plurals>
+  <string name="common_preparing">"Đang chuẩn bị…"</string>
+  <string name="common_privacy_policy">"Chính sách bảo mật"</string>
+  <string name="common_private">"Riêng tư"</string>
+  <string name="common_private_room">"Phòng riêng tư"</string>
+  <string name="common_private_space">"Không gian riêng tư"</string>
+  <string name="common_public">"Công cộng"</string>
+  <string name="common_public_room">"Phòng công cộng"</string>
+  <string name="common_public_space">"Không gian công cộng"</string>
+  <string name="common_reaction">"Biểu cảm"</string>
+  <string name="common_reactions">"Cảm xúc"</string>
+  <string name="common_reason">"Lý do"</string>
+  <string name="common_recovery_key">"Khóa khôi phục."</string>
+  <string name="common_refreshing">"Đang làm mới…"</string>
+  <string name="common_removing">"Đang xóa…"</string>
+  <plurals name="common_replies">
+    <item quantity="other">"%1$d trả lời"</item>
+  </plurals>
+  <string name="common_replying_to">"Đang trả lời cho %1$s"</string>
+  <string name="common_report_a_problem">"Báo cáo sự cố"</string>
+  <string name="common_report_submitted">"Đã gửi báo cáo"</string>
+  <string name="common_rich_text_editor">"Trình soạn thảo văn bản nâng cao"</string>
+  <string name="common_role">"Vai trò"</string>
+  <string name="common_room">"Phòng"</string>
+  <string name="common_room_name">"Tên phòng"</string>
+  <string name="common_room_name_placeholder">"ví dụ: tên dự án của bạn"</string>
+  <plurals name="common_rooms">
+    <item quantity="other">"%1$d Phòng"</item>
+  </plurals>
+  <string name="common_saved_changes">"Đã lưu thay đổi"</string>
+  <string name="common_saving">"Đang lưu"</string>
+  <string name="common_screen_lock">"Khóa màn hình"</string>
+  <string name="common_search_for_someone">"Tìm kiếm ai đó"</string>
+  <string name="common_search_results">"Kết quả tìm kiếm"</string>
+  <string name="common_security">"Bảo mật"</string>
+  <string name="common_seen_by">"Được xem bởi"</string>
+  <string name="common_select_account">"Chọn tài khoản"</string>
+  <plurals name="common_selected_count">
+    <item quantity="other">"%1$d đã chọn"</item>
+  </plurals>
+  <string name="common_send_to">"Gửi đến"</string>
+  <string name="common_sending">"Đang gửi…"</string>
+  <string name="common_sending_failed">"Không gửi được"</string>
+  <string name="common_sent">"Đã gửi"</string>
+  <string name="common_server_not_supported">"Máy chủ không được hỗ trợ"</string>
+  <string name="common_server_unreachable">"Không thể kết nối với máy chủ"</string>
+  <string name="common_server_url">"URL máy chủ"</string>
+  <string name="common_settings">"Cài đặt"</string>
+  <string name="common_share_space">"Chia sẻ không gian"</string>
+  <string name="common_shared_history">"Thành viên mới có thể xem lịch sử."</string>
+  <string name="common_shared_live_location">"Chia sẻ vị trí trực tiếp"</string>
+  <string name="common_shared_location">"Vị trí được chia sẻ"</string>
+  <string name="common_shared_space">"Không gian chung"</string>
+  <string name="common_signing_out">"Đang gỡ thiết bị"</string>
+  <string name="common_something_went_wrong">"Đã xảy ra sự cố"</string>
+  <string name="common_something_went_wrong_message">"Đã xảy ra lỗi. Vui lòng thử lại."</string>
+  <string name="common_space">"Không gian"</string>
+  <string name="common_space_members">"Thành viên không gian"</string>
+  <string name="common_space_topic_placeholder">"Không gian này dùng để làm gì?"</string>
+  <plurals name="common_spaces">
+    <item quantity="other">"%1$d Không gian"</item>
+  </plurals>
+  <string name="common_starting_chat">"Đang bắt đầu cuộc trò chuyện…"</string>
+  <string name="common_sticker">"Sticker"</string>
+  <string name="common_success">"Thành công"</string>
+  <string name="common_suggested">"Gợi ý"</string>
+  <string name="common_suggestions">"Gợi ý"</string>
+  <string name="common_syncing">"Đang đồng bộ"</string>
+  <string name="common_text">"Văn bản"</string>
+  <string name="common_third_party_notices">"Thông báo từ bên thứ ba"</string>
+  <string name="common_thread">"Chủ đề"</string>
+  <string name="common_threads">"Chủ đề"</string>
+  <string name="common_topic">"Chủ đề"</string>
+  <string name="common_topic_placeholder">"Phòng này dùng để làm gì?"</string>
+  <string name="common_unable_to_decrypt">"Không thể giải mã"</string>
+  <string name="common_unable_to_decrypt_insecure_device">"Được gửi từ một thiết bị không an toàn"</string>
+  <string name="common_unable_to_decrypt_no_access">"Bạn không thể xem tin nhắn này"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Danh tính kỹ thuật số đã được xác minh của người gửi đã được đặt lại."</string>
+  <string name="common_unable_to_invite_message">"Không thể gửi lời mời đến một hoặc nhiều người dùng."</string>
+  <string name="common_unable_to_invite_title">"Không thể gửi lời mời"</string>
+  <string name="common_unlock">"Mở khóa"</string>
+  <string name="common_unmute">"Bật tiếng"</string>
+  <string name="common_unsupported_call">"Cuộc gọi không được hỗ trợ"</string>
+  <string name="common_unsupported_event">"Sự kiện không được hỗ trợ"</string>
+  <string name="common_username">"Tên người dùng"</string>
+  <string name="common_verification_cancelled">"Đã hủy xác thực"</string>
+  <string name="common_verification_complete">"Xác minh hoàn tất"</string>
+  <string name="common_verification_failed">"Xác minh thất bại"</string>
+  <string name="common_verified">"Đã xác minh"</string>
+  <string name="common_verify_device">"Xác minh thiết bị"</string>
+  <string name="common_verify_identity">"Xác minh danh tính"</string>
+  <string name="common_verify_user">"Xác minh người dùng"</string>
+  <string name="common_video">"Video"</string>
+  <string name="common_video_quality_high">"Chất lượng cao"</string>
+  <string name="common_video_quality_high_description">"Chất lượng tốt nhất nhưng dung lượng tệp lớn hơn"</string>
+  <string name="common_video_quality_low">"Chất lượng thấp"</string>
+  <string name="common_video_quality_low_description">"Tốc độ tải lên nhanh nhất và kích thước tệp nhỏ nhất"</string>
+  <string name="common_video_quality_standard">"Chất lượng tiêu chuẩn"</string>
+  <string name="common_video_quality_standard_description">"Cân bằng giữa chất lượng và tốc độ tải lên"</string>
+  <string name="common_voice_message">"Tin nhắn thoại"</string>
+  <string name="common_waiting">"Đang chờ…"</string>
+  <string name="common_waiting_for_decryption_key">"Đang chờ tin nhắn này"</string>
+  <string name="common_waiting_live_location">"Đang chờ vị trí trực tiếp…"</string>
+  <string name="common_world_readable_history">"Ai cũng có thể xem lịch sử"</string>
+  <string name="common_you">"Bạn"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) đã chia sẻ tin nhắn này vì bạn không có trong phòng khi nó được gửi."</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s đã chia sẻ tin nhắn này vì bạn không có trong phòng khi nó được gửi."</string>
+  <string name="crypto_history_visible">"Phòng chat này đã được thiết lập để các thành viên mới có thể xem lịch sử trò chuyện. %1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Danh tính số của %1$s đã được đặt lại. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Danh tính số %2$s của %1$s đã được đặt lại. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s )"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Danh tính số của %1$s đã được đặt lại."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Danh tính số %2$s của %1$s đã được đặt lại. %3$s"</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"Hủy xác minh"</string>
+  <string name="dialog_allow_access">"Cho phép truy cập"</string>
+  <string name="dialog_confirm_link_message">"Liên kết %1$s sẽ đưa bạn đến một trang khác %2$s
+
+Bạn có chắc muốn tiếp tục không?"</string>
+  <string name="dialog_confirm_link_title">"Kiểm tra lại liên kết này"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"Chọn chất lượng mặc định cho video bạn tải lên."</string>
+  <string name="dialog_file_too_large_to_upload_subtitle">"Kích thước tệp tối đa cho phép là: %1$s"</string>
+  <string name="dialog_file_too_large_to_upload_title">"Kích thước tệp quá lớn để tải lên"</string>
+  <string name="dialog_room_reported">"Phòng đã được báo cáo"</string>
+  <string name="dialog_room_reported_and_left">"Đã báo cáo và rời khỏi phòng."</string>
+  <string name="dialog_title_confirmation">"Xác nhận"</string>
+  <string name="dialog_title_error">"Lỗi"</string>
+  <string name="dialog_title_success">"Thành công"</string>
+  <string name="dialog_title_warning">"Cảnh báo"</string>
+  <string name="dialog_unsaved_changes_description">"Bạn có thay đổi chưa được lưu."</string>
+  <string name="dialog_unsaved_changes_description_android">"Các thay đổi của bạn chưa được lưu. Bạn có chắc muốn quay lại không?"</string>
+  <string name="dialog_unsaved_changes_title">"Lưu thay đổi?"</string>
+  <string name="dialog_video_quality_selector_subtitle_file_size">"Kích thước tệp tối đa cho phép là: %1$s"</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"Chọn chất lượng video bạn muốn tải lên."</string>
+  <string name="dialog_video_quality_selector_title">"Chọn chất lượng tải lên video"</string>
+  <string name="error_account_already_logged_in">"Bạn đã đăng nhập trên thiết bị này với tư cách là%1$s ."</string>
+  <string name="error_account_creation_not_possible">"Máy chủ  của bạn cần được nâng cấp để hỗ trợ Dịch vụ Xác thực và tạo tài khoản."</string>
+  <string name="error_failed_creating_the_permalink">"Không tạo được liên kết cố định"</string>
+  <string name="error_failed_loading_map">"%1$s không thể tải bản đồ. Vui lòng thử lại sau."</string>
+  <string name="error_failed_loading_messages">"Không tải được tin nhắn"</string>
+  <string name="error_failed_locating_user">"%1$s không thể truy cập vị trí của bạn. Vui lòng thử lại sau."</string>
+  <string name="error_failed_uploading_voice_message">"Không thể tải lên tin nhắn thoại của bạn."</string>
+  <string name="error_invalid_invite">"Phòng đó không còn tồn tại hoặc lời mời không còn hiệu lực."</string>
+  <string name="error_location_service_disabled_android">"Vui lòng bật GPS để truy cập các tính năng dựa trên vị trí."</string>
+  <string name="error_message_not_found">"Không tìm thấy tin nhắn"</string>
+  <string name="error_missing_location_auth_android">"%1$s không có quyền truy cập vị trí của bạn. Bạn có thể bật quyền trong Cài đặt."</string>
+  <string name="error_missing_location_rationale_android">"%1$s chưa được phép truy cập vị trí. Bật quyền dưới đây."</string>
+  <string name="error_missing_microphone_voice_rationale_android">"%1$s không có quyền truy cập micro của bạn. Hãy bật quyền để ghi tin nhắn thoại."</string>
+  <string name="error_network_or_server_issue">"Nguyên nhân có thể là do sự cố mạng hoặc máy chủ."</string>
+  <string name="error_room_address_already_exists">"Địa chỉ phòng này đã tồn tại. Vui lòng thử chỉnh sửa trường địa chỉ phòng hoặc thay đổi tên phòng."</string>
+  <string name="error_room_address_invalid_symbols">"Một số ký tự không được phép. Chỉ các chữ cái, chữ số và các ký hiệu sau được hỗ trợ: ! $ &amp;amp; ' ( ) * + / ; = ? @ [ ] - . _"</string>
+  <string name="error_some_messages_have_not_been_sent">"Một số tin nhắn chưa được gửi"</string>
+  <string name="error_unknown">"Rất tiếc, đã có lỗi xảy ra."</string>
+  <string name="invite_friends_rich_title">"🔐️ Tham gia cùng tôi trên %1$s"</string>
+  <string name="invite_friends_text">"Xin chào, hãy trò chuyện với tôi trên %1$s bằng đường liên kết sau: %2$s"</string>
+  <string name="login_initial_device_name_android">"%1$s Android"</string>
+  <string name="preference_rageshake">"Lắc điện thoại để báo cáo lỗi"</string>
+  <string name="screen_media_picker_error_failed_selection">"Không thể chọn tệp phương tiện. Vui lòng thử lại."</string>
+  <plurals name="screen_pinned_timeline_screen_title">
+    <item quantity="other">"%1$d tin nhắn được ghim"</item>
+  </plurals>
+  <string name="screen_pinned_timeline_screen_title_empty">"Tin nhắn được ghim"</string>
+  <string name="screen_room_error_failed_processing_media">"Xử lý phương tiện tải lên không thành công, vui lòng thử lại."</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"Không thể lấy thông tin người dùng"</string>
+  <string name="screen_room_pinned_banner_indicator_description">"%1$s Tin nhắn được ghim"</string>
+  <string name="screen_share_location_title">"Chia sẻ vị trí"</string>
+  <string name="screen_share_my_location_action">"Chia sẻ vị trí của tôi"</string>
+  <string name="screen_share_open_apple_maps">"Mở trong Apple Maps"</string>
+  <string name="screen_share_open_google_maps">"Mở trong Google Maps"</string>
+  <string name="screen_share_open_osm_maps">"Mở trong OpenStreetMap"</string>
+  <string name="screen_share_this_location_action">"Chia sẻ vị trí đã chọn"</string>
+  <string name="screen_view_location_title">"Vị trí"</string>
+  <string name="settings_version_number">"Phiên bản: %1$s (%2$s )"</string>
+  <string name="test_language_identifier">"en"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"Bạn không thể xem tin nhắn này"</string>
+</resources>
diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
index 2b12c212a7..c2ff955eac 100644
--- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_add_reaction">"新增反應：%1$s"</string>
+  <string name="a11y_address">"地址"</string>
   <string name="a11y_avatar">"大頭貼"</string>
   <string name="a11y_collapse_message_text_field">"最小化訊息文字欄位"</string>
   <string name="a11y_delete">"刪除"</string>
@@ -25,9 +26,12 @@
   <string name="a11y_pause">"暫停"</string>
   <string name="a11y_paused_voice_message">"語音訊息，時長：%1$s，目前位置：%2$s"</string>
   <string name="a11y_pin_field">"PIN 碼欄位"</string>
+  <string name="a11y_pinned_location">"固定位置"</string>
   <string name="a11y_play">"播放"</string>
+  <string name="a11y_playback_speed">"播放速度"</string>
   <string name="a11y_poll">"投票"</string>
   <string name="a11y_poll_end">"投票已結束"</string>
+  <string name="a11y_qr_code">"QR Code"</string>
   <string name="a11y_react_with">"使用 %1$s 回應"</string>
   <string name="a11y_react_with_other_emojis">"用其他表情符號回應"</string>
   <string name="a11y_read_receipts_multiple">"%1$s 和 %2$s 已讀"</string>
@@ -35,14 +39,16 @@
     <item quantity="other">"%1$s 與其他 %2$d 個人已讀"</item>
   </plurals>
   <string name="a11y_read_receipts_single">"%1$s 已讀"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"點擊以顯示全部"</string>
   <string name="a11y_remove_reaction">"移除 %1$s 的反應"</string>
   <string name="a11y_remove_reaction_with">"移除反應 %1$s"</string>
   <string name="a11y_room_avatar">"聊天室大頭照"</string>
   <string name="a11y_send_files">"傳送檔案"</string>
+  <string name="a11y_sender_location">"傳送者位置"</string>
   <string name="a11y_session_verification_time_limited_action_required">"需要限時動作，您有一分鐘可以驗證"</string>
   <string name="a11y_show_password">"顯示密碼"</string>
   <string name="a11y_start_call">"開始通話"</string>
+  <string name="a11y_start_video_call">"開始視訊通話"</string>
+  <string name="a11y_start_voice_call">"開始語音通話"</string>
   <string name="a11y_tombstoned_room">"墓碑聊天室"</string>
   <string name="a11y_user_avatar">"使用者大頭照"</string>
   <string name="a11y_user_menu">"使用者選單"</string>
@@ -54,6 +60,7 @@
   <string name="a11y_your_avatar">"您的大頭照"</string>
   <string name="action_accept">"接受"</string>
   <string name="action_add_caption">"新增標題"</string>
+  <string name="action_add_existing_rooms">"新增既有聊天室"</string>
   <string name="action_add_to_timeline">"新增至時間軸"</string>
   <string name="action_back">"返回"</string>
   <string name="action_call">"通話"</string>
@@ -73,6 +80,7 @@
   <string name="action_copy_text">"複製文字"</string>
   <string name="action_create">"建立"</string>
   <string name="action_create_room">"建立聊天室"</string>
+  <string name="action_create_space">"建立空間"</string>
   <string name="action_deactivate">"停用"</string>
   <string name="action_deactivate_account">"停用帳號"</string>
   <string name="action_decline">"拒絕"</string>
@@ -89,6 +97,7 @@
   <string name="action_enable">"啟用"</string>
   <string name="action_end_poll">"結束投票"</string>
   <string name="action_enter_pin">"輸入 PIN 碼"</string>
+  <string name="action_explore_public_spaces">"探索公開空間"</string>
   <string name="action_finish">"結束"</string>
   <string name="action_forgot_password">"忘記密碼？"</string>
   <string name="action_forward">"轉寄"</string>
@@ -109,6 +118,7 @@
   <string name="action_leave_space">"離開空間"</string>
   <string name="action_load_more">"載入更多"</string>
   <string name="action_manage_account">"管理帳號"</string>
+  <string name="action_manage_account_and_devices">"管理帳號與裝置"</string>
   <string name="action_manage_devices">"管理裝置"</string>
   <string name="action_manage_rooms">"管理聊天室"</string>
   <string name="action_message">"聊天"</string>
@@ -148,16 +158,18 @@
   <string name="action_send_voice_message">"傳送語音訊息"</string>
   <string name="action_share">"分享"</string>
   <string name="action_share_link">"分享連結"</string>
+  <string name="action_share_live_location">"分享即時位置"</string>
   <string name="action_show">"顯示"</string>
   <string name="action_sign_in_again">"再登入一次"</string>
-  <string name="action_signout">"登出"</string>
-  <string name="action_signout_anyway">"直接登出"</string>
+  <string name="action_signout">"移除此裝置"</string>
+  <string name="action_signout_anyway">"仍要移除此裝置"</string>
   <string name="action_skip">"略過"</string>
   <string name="action_start">"開始"</string>
   <string name="action_start_chat">"開始聊天"</string>
   <string name="action_start_over">"重新開始"</string>
   <string name="action_start_verification">"開始驗證"</string>
   <string name="action_static_map_load">"點擊以載入地圖"</string>
+  <string name="action_stop">"停止"</string>
   <string name="action_take_photo">"拍照"</string>
   <string name="action_tap_for_options">"點擊以查看選項"</string>
   <string name="action_translate">"翻譯"</string>
@@ -190,11 +202,11 @@
   <string name="common_copied_to_clipboard">"已複製到剪貼簿"</string>
   <string name="common_copyright">"著作權"</string>
   <string name="common_creating_room">"正在建立聊天室…"</string>
+  <string name="common_creating_space">"正在建立空間……"</string>
   <string name="common_current_user_canceled_knock">"請求已取消"</string>
   <string name="common_current_user_left_room">"已離開聊天室"</string>
   <string name="common_current_user_left_space">"離開空間"</string>
   <string name="common_current_user_rejected_invite">"邀請被拒絕"</string>
-  <string name="common_dark">"深色"</string>
   <string name="common_decryption_error">"解密錯誤"</string>
   <string name="common_description">"描述"</string>
   <string name="common_developer_options">"開發者選項"</string>
@@ -210,6 +222,7 @@
   <string name="common_empty_file">"空檔案"</string>
   <string name="common_encryption">"加密"</string>
   <string name="common_encryption_enabled">"已啟用加密"</string>
+  <string name="common_ends_at">"結束於 %1$s"</string>
   <string name="common_enter_your_pin">"輸入您的 PIN 碼"</string>
   <string name="common_error">"錯誤"</string>
   <string name="common_error_registering_pusher_android">"發生錯誤，您可能無法收到新訊息的通知。請從設定中進行通知疑難排解。
@@ -219,6 +232,7 @@
   <string name="common_failed">"失敗"</string>
   <string name="common_favourite">"我的最愛"</string>
   <string name="common_favourited">"我的最愛"</string>
+  <string name="common_fetching_notifications_title_android">"正在同步通知……"</string>
   <string name="common_file">"檔案"</string>
   <string name="common_file_deleted">"檔案已刪除"</string>
   <string name="common_file_saved">"檔案已儲存"</string>
@@ -232,9 +246,11 @@
   <string name="common_invite_unknown_profile">"找不到此 Matrix ID，因此可能沒有人會收到邀請。"</string>
   <string name="common_leaving_room">"正在離開聊天室"</string>
   <string name="common_leaving_space">"離開空間"</string>
-  <string name="common_light">"淺色"</string>
   <string name="common_line_copied_to_clipboard">"行已複製到剪貼簿"</string>
   <string name="common_link_copied_to_clipboard">"連結已複製到剪貼簿"</string>
+  <string name="common_link_new_device">"連結新裝置"</string>
+  <string name="common_live_location">"即時位置"</string>
+  <string name="common_live_location_ended">"即時位置已結束"</string>
   <string name="common_loading">"載入中…"</string>
   <string name="common_loading_more">"載入更多……"</string>
   <plurals name="common_many_members">
@@ -245,10 +261,12 @@
   </plurals>
   <string name="common_message">"訊息"</string>
   <string name="common_message_actions">"訊息動作"</string>
+  <string name="common_message_failed_to_send">"訊息傳送失敗"</string>
   <string name="common_message_layout">"訊息佈局"</string>
   <string name="common_message_removed">"訊息已移除"</string>
   <string name="common_modern">"現代"</string>
   <string name="common_mute">"關閉通知"</string>
+  <string name="common_name">"名稱"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"查無結果"</string>
   <string name="common_no_room_name">"無聊天室名稱"</string>
@@ -257,6 +275,7 @@
   <string name="common_offline">"離線"</string>
   <string name="common_open_source_licenses">"開放原始碼授權條款"</string>
   <string name="common_or">"或"</string>
+  <string name="common_other_options">"其他選項"</string>
   <string name="common_password">"密碼"</string>
   <string name="common_people">"夥伴"</string>
   <string name="common_permalink">"永久連結"</string>
@@ -273,8 +292,10 @@
   </plurals>
   <string name="common_preparing">"正在準備……"</string>
   <string name="common_privacy_policy">"隱私權政策"</string>
+  <string name="common_private">"私人"</string>
   <string name="common_private_room">"私密聊天室"</string>
   <string name="common_private_space">"私人空間"</string>
+  <string name="common_public">"公開"</string>
   <string name="common_public_room">"公開的聊天室"</string>
   <string name="common_public_space">"公開空間"</string>
   <string name="common_reaction">"回應"</string>
@@ -282,17 +303,18 @@
   <string name="common_reason">"理由"</string>
   <string name="common_recovery_key">"復原金鑰"</string>
   <string name="common_refreshing">"重新整理中…"</string>
+  <string name="common_removing">"正在移除……"</string>
   <plurals name="common_replies">
     <item quantity="other">"%1$d 個回覆"</item>
   </plurals>
   <string name="common_replying_to">"正在回覆%1$s"</string>
-  <string name="common_report_a_bug">"回報程式錯誤"</string>
   <string name="common_report_a_problem">"回報問題"</string>
   <string name="common_report_submitted">"已遞交報告"</string>
   <string name="common_rich_text_editor">"格式化文字編輯器"</string>
+  <string name="common_role">"角色"</string>
   <string name="common_room">"聊天室"</string>
   <string name="common_room_name">"聊天室名稱"</string>
-  <string name="common_room_name_placeholder">"範例：您的計畫名稱"</string>
+  <string name="common_room_name_placeholder">"範例：您的專案名稱"</string>
   <plurals name="common_rooms">
     <item quantity="other">"%1$d 個聊天室"</item>
   </plurals>
@@ -304,6 +326,9 @@
   <string name="common_security">"安全性"</string>
   <string name="common_seen_by">"已讀"</string>
   <string name="common_select_account">"選取帳號"</string>
+  <plurals name="common_selected_count">
+    <item quantity="other">"已選取 %1$d 個"</item>
+  </plurals>
   <string name="common_send_to">"傳送給"</string>
   <string name="common_sending">"傳送中…"</string>
   <string name="common_sending_failed">"傳送失敗"</string>
@@ -314,30 +339,35 @@
   <string name="common_server_url">"伺服器 URL"</string>
   <string name="common_settings">"設定"</string>
   <string name="common_share_space">"分享空間"</string>
+  <string name="common_shared_history">"新成員可以檢視歷史"</string>
+  <string name="common_shared_live_location">"分享即時位置"</string>
   <string name="common_shared_location">"位置分享"</string>
   <string name="common_shared_space">"共享空間"</string>
-  <string name="common_signing_out">"正在登出"</string>
+  <string name="common_signing_out">"正在移除裝置"</string>
   <string name="common_something_went_wrong">"有錯誤發生"</string>
   <string name="common_something_went_wrong_message">"我們了遇到了問題。請再試一次。"</string>
   <string name="common_space">"空間"</string>
+  <string name="common_space_members">"空間成員"</string>
+  <string name="common_space_topic_placeholder">"此空間的用途是？"</string>
   <plurals name="common_spaces">
     <item quantity="other">"%1$d 個空間"</item>
   </plurals>
   <string name="common_starting_chat">"開始聊天…"</string>
   <string name="common_sticker">"貼圖"</string>
   <string name="common_success">"成功"</string>
+  <string name="common_suggested">"已建議"</string>
   <string name="common_suggestions">"建議"</string>
   <string name="common_syncing">"同步中"</string>
-  <string name="common_system">"系統"</string>
   <string name="common_text">"文字"</string>
   <string name="common_third_party_notices">"第三方通知"</string>
   <string name="common_thread">"討論串"</string>
+  <string name="common_threads">"討論串"</string>
   <string name="common_topic">"主題"</string>
-  <string name="common_topic_placeholder">"這個聊天室是做什麼用的？"</string>
+  <string name="common_topic_placeholder">"此聊天室的用途是？"</string>
   <string name="common_unable_to_decrypt">"無法解密"</string>
   <string name="common_unable_to_decrypt_insecure_device">"從不安全的裝置傳送"</string>
   <string name="common_unable_to_decrypt_no_access">"您無法存取此則訊息"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"傳送者的驗證身份已重設"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"傳送者的驗證數位身份已重設"</string>
   <string name="common_unable_to_invite_message">"無法發送邀請給一或多個使用者。"</string>
   <string name="common_unable_to_invite_title">"無法發送邀請"</string>
   <string name="common_unlock">"解鎖"</string>
@@ -362,13 +392,19 @@
   <string name="common_voice_message">"語音訊息"</string>
   <string name="common_waiting">"等待中…"</string>
   <string name="common_waiting_for_decryption_key">"等待此則訊息"</string>
+  <string name="common_waiting_live_location">"正在等待即時位置……"</string>
+  <string name="common_world_readable_history">"任何人都可以檢視歷史"</string>
   <string name="common_you">"您"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s 的身份似乎已重設。%2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$s 的 %2$s 身份似乎已重設。%3$s"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"因為您當時不在聊天室內，所以 %1$s (%2$s) 分享了此訊息。"</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"因為您當時不在聊天室裡面，因此 %1$s 分享了此訊息。"</string>
+  <string name="crypto_history_visible">"此聊天室被設定為方便新成員閱讀歷史紀錄。%1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$s 的數位身份似乎已重設。%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$s 的 %2$s 數位身份似乎已重設。%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"（%1$s）"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的已驗證身份被重設。"</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s 的 %2$s 驗證身份已重設。  %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的數位身份被重設。"</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s 的 %2$s 數位身份已重設。%3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"撤回驗證"</string>
+  <string name="dialog_allow_access">"允許存取"</string>
   <string name="dialog_confirm_link_message">"連結 %1$s 會將您帶往其他網站 %2$s
 
 您確定您想要繼續嗎？"</string>
@@ -389,7 +425,6 @@
   <string name="dialog_video_quality_selector_subtitle_file_size">"最大允許的檔案大小為：%1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"選取您要上傳的視訊的品質。"</string>
   <string name="dialog_video_quality_selector_title">"選取視訊上傳品質"</string>
-  <string name="emoji_picker_search_placeholder">"搜尋表情符號"</string>
   <string name="error_account_already_logged_in">"您已在此裝置上以 %1$s 的身份登入。"</string>
   <string name="error_account_creation_not_possible">"您的家伺服器需要升級才能支援 Matrix Authentication Service 與帳號建立。"</string>
   <string name="error_failed_creating_the_permalink">"無法建立永久連結"</string>
@@ -398,6 +433,7 @@
   <string name="error_failed_locating_user">"%1$s 無法取得您的位置。請稍後再試。"</string>
   <string name="error_failed_uploading_voice_message">"無法上傳語音訊息。"</string>
   <string name="error_invalid_invite">"此聊天室不再存在或邀請不再有效。"</string>
+  <string name="error_location_service_disabled_android">"請啟用您的 GPS 以存取以位置為基礎的功能。"</string>
   <string name="error_message_not_found">"找不到訊息"</string>
   <string name="error_missing_location_auth_android">"%1$s 沒有權限存取您的位置。您可以到設定中開啟權限。"</string>
   <string name="error_missing_location_rationale_android">"%1$s 沒有權限存取您的位置。請在下方開啟權限。"</string>
@@ -423,11 +459,11 @@
     <item quantity="other">"%1$d 則釘選的訊息"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"釘選訊息"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"您將要前往您的 %1$s 帳號重設身份。然後您將會被帶回應用程式。"</string>
-  <string name="screen_reset_identity_confirmation_title">"無法確認？前往您的帳號以重設您的身份。"</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"您將要前往您的 %1$s 帳號重設數位身份。然後您將會被帶回應用程式。"</string>
+  <string name="screen_reset_identity_confirmation_title">"無法確認？前往您的帳號以重設您的數位身份。"</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"撤回驗證並傳送"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"您可以撤回您的驗證並仍傳送此訊息，或者您也可以立刻取消並在重新驗證 %1$s 後再試一次。"</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"因為 %1$s 的驗證身份已重設，因此未傳送您的訊息。"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"因為 %1$s 的驗證數位身份已重設，因此未傳送您的訊息。"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"仍要傳送訊息"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s 正在使用一個或多個未經驗證的裝置。您仍然可以傳送訊息，也可以立刻取消並在 %2$s 驗證其所有裝置後再試一次。"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"未傳送您的訊息，因為 %1$s 尚未驗證所有裝置。"</string>
@@ -439,6 +475,7 @@
   <string name="screen_room_event_pill">"%1$s 中的訊息"</string>
   <string name="screen_room_grouped_state_events_expand">"展開"</string>
   <string name="screen_room_grouped_state_events_reduce">"減少"</string>
+  <string name="screen_room_live_location_banner">"分享即時位置"</string>
   <string name="screen_room_permalink_same_room_android">"已檢視此聊天室！"</string>
   <string name="screen_room_pinned_banner_indicator">"第 %1$s 個，共 %2$s 個"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s 個釘選訊息"</string>
@@ -450,12 +487,16 @@
   <string name="screen_share_open_apple_maps">"在 Apple Maps 中開啟"</string>
   <string name="screen_share_open_google_maps">"在 Google Maps 中開啟"</string>
   <string name="screen_share_open_osm_maps">"在開放街圖（OpenStreetMap） 中開啟"</string>
-  <string name="screen_share_this_location_action">"分享這個位置"</string>
+  <string name="screen_share_this_location_action">"分享選定的位置"</string>
+  <string name="screen_sharing_location_option_sheet_title">"分享選項"</string>
   <string name="screen_space_list_description">"您建立或加入的空間"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
+  <string name="screen_space_list_empty_state_title">"建立空間以整理聊天室"</string>
   <string name="screen_space_list_parent_space">"%1$s 空間"</string>
   <string name="screen_space_list_title">"空間"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"因為 %1$s 的驗證身份已重設，因此未傳送訊息。"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"已分享 %1$s"</string>
+  <string name="screen_static_location_sheet_title">"在地圖上"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"因為 %1$s 的驗證數位身份已重設，因此未傳送訊息。"</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"訊息未傳送，因為 %1$s 尚未驗證所有裝置。"</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"因為您尚未驗證一個或多個裝置，因此未傳送訊息"</string>
   <string name="screen_view_location_title">"位置"</string>
@@ -465,5 +506,5 @@
   <string name="timeline_decryption_failure_historical_event_unverified_device">"您必須驗證此裝置才能存取歷史訊息"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"您無法存取此則訊息"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"無法解密訊息"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"此訊息被封鎖是因為您沒有驗證您的裝置，或是因為傳送者需要驗證您的身份而被封鎖。"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"此訊息被封鎖，原因可能是您尚未驗證裝置，或是寄件者需要驗證您的數位身分。"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-zh/translations.xml b/libraries/ui-strings/src/main/res/values-zh/translations.xml
index 44f7c1c1e6..0ecd99f6c8 100644
--- a/libraries/ui-strings/src/main/res/values-zh/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh/translations.xml
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="a11y_add_reaction">"添加表情符号：%1$s"</string>
+  <string name="a11y_add_avatar">"添加头像"</string>
+  <string name="a11y_add_reaction">"添加反应：%1$s"</string>
   <string name="a11y_address">"地址"</string>
   <string name="a11y_avatar">"头像"</string>
+  <string name="a11y_clear_search_field">"清除搜索框"</string>
   <string name="a11y_collapse_message_text_field">"最小化消息文本框"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"减少每人允许的投票数"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"增加每人允许的投票数"</string>
+  <string name="a11y_custom_emoji">"自定义 Emoji"</string>
   <string name="a11y_delete">"删除"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="other">"已输入 %1$d 个数字"</item>
   </plurals>
+  <string name="a11y_duration">"持续时间：%1$s"</string>
   <string name="a11y_edit_avatar">"编辑头像"</string>
-  <string name="a11y_edit_room_address_hint">"完整地址为%1$s"</string>
+  <string name="a11y_edit_room_address_hint">"完整地址为 %1$s"</string>
   <string name="a11y_encryption_details">"加密详情"</string>
   <string name="a11y_expand_message_text_field">"展开消息文本框"</string>
   <string name="a11y_hide_password">"隐藏密码"</string>
+  <string name="a11y_info">"信息"</string>
   <string name="a11y_join_call">"加入通话"</string>
   <string name="a11y_jump_to_bottom">"跳转到底部"</string>
+  <string name="a11y_jump_to_unread">"跳转到未读"</string>
+  <string name="a11y_jump_to_unread_messages">"跳转到首个未读消息"</string>
   <string name="a11y_move_the_map_to_my_location">"将地图移动到我的位置"</string>
   <string name="a11y_notifications_mentions_only">"仅提及"</string>
   <string name="a11y_notifications_muted">"通知已关闭"</string>
@@ -25,44 +34,57 @@
   <string name="a11y_page_n">"第 %1$d 页"</string>
   <string name="a11y_pause">"暂停"</string>
   <string name="a11y_paused_voice_message">"语音消息，时长：%1$s，当前位置：%2$s"</string>
+  <string name="a11y_photo_preview">"照片预览"</string>
   <string name="a11y_pin_field">"PIN 字段"</string>
+  <string name="a11y_pinned_location">"已钉住的位置"</string>
   <string name="a11y_play">"播放"</string>
   <string name="a11y_playback_speed">"播放速度"</string>
   <string name="a11y_poll">"投票"</string>
   <string name="a11y_poll_end">"投票已结束"</string>
-  <string name="a11y_qr_code">"QR 码"</string>
-  <string name="a11y_react_with">"使用 %1$s 回应"</string>
-  <string name="a11y_react_with_other_emojis">"使用其他表情符号回应"</string>
-  <string name="a11y_read_receipts_multiple">"%1$s 和 %2$s 已读"</string>
+  <string name="a11y_position">"位置：%1$s"</string>
+  <string name="a11y_qr_code">"二维码"</string>
+  <string name="a11y_react_with">"使用 %1$s 反应"</string>
+  <string name="a11y_react_with_other_emojis">"使用其它 Emoji 做出反应"</string>
+  <string name="a11y_read_receipts_multiple">"上一个消息已被 %1$s 与 %2$s 阅读"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="other">"%1$s 及其他 %2$d 人已读"</item>
+    <item quantity="other">"上一个消息已被 %1$s 与 %2$d 及其他人阅读"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"%1$s 已读"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"点击以显示全部"</string>
-  <string name="a11y_remove_reaction">"撤回反应 %1$s"</string>
-  <string name="a11y_remove_reaction_with">"移除表情符号%1$s"</string>
+  <string name="a11y_read_receipts_single">"上一个消息已被 %1$s 阅读"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"显示所有已读回执"</string>
+  <string name="a11y_remove_reaction">"移除反应：%1$s"</string>
+  <string name="a11y_remove_reaction_with">"移除反应：%1$s"</string>
   <string name="a11y_room_avatar">"房间头像"</string>
   <string name="a11y_send_files">"发送文件"</string>
-  <string name="a11y_session_verification_time_limited_action_required">"限时操作，您有一分钟的时间来验证"</string>
+  <string name="a11y_sender_location">"发送方位置"</string>
+  <string name="a11y_sent_by_sender_at_date">"由 %1$s 发送于 %2$s"</string>
+  <string name="a11y_session_verification_time_limited_action_required">"请求的操作有时间限制，你有 1 分钟的时间来验证"</string>
+  <string name="a11y_settings_with_required_action">"设置，需要操作"</string>
   <string name="a11y_show_password">"显示密码"</string>
   <string name="a11y_start_call">"开始通话"</string>
-  <string name="a11y_tombstoned_room">"墓碑聊天室"</string>
+  <string name="a11y_start_video_call">"开始视频通话"</string>
+  <string name="a11y_start_voice_call">"开始语音通话"</string>
+  <string name="a11y_status">"状态"</string>
+  <string name="a11y_thread_in_room">"位于 %1$s 中的消息列"</string>
+  <string name="a11y_threads_in_room">"位于 %1$s 中的消息列"</string>
+  <string name="a11y_tombstoned_room">"已封存的房间"</string>
   <string name="a11y_user_avatar">"用户头像"</string>
   <string name="a11y_user_menu">"用户菜单"</string>
+  <string name="a11y_video_preview">"视频预览"</string>
   <string name="a11y_view_avatar">"查看头像"</string>
   <string name="a11y_view_details">"查看详情"</string>
   <string name="a11y_voice_message">"语音消息，时长：%1$s"</string>
   <string name="a11y_voice_message_record">"录制语音消息"</string>
   <string name="a11y_voice_message_stop_recording">"停止录制"</string>
-  <string name="a11y_your_avatar">"您的头像"</string>
+  <string name="a11y_your_avatar">"你的头像"</string>
   <string name="action_accept">"接受"</string>
   <string name="action_add_caption">"添加标题"</string>
-  <string name="action_add_existing_rooms">"添加现有聊天室"</string>
+  <string name="action_add_existing_rooms">"添加现有房间"</string>
   <string name="action_add_to_timeline">"添加到时间线"</string>
   <string name="action_back">"返回"</string>
-  <string name="action_call">"呼叫"</string>
+  <string name="action_call">"通话"</string>
   <string name="action_cancel">"取消"</string>
   <string name="action_cancel_for_now">"暂时取消"</string>
+  <string name="action_choose_file">"选择文件"</string>
   <string name="action_choose_photo">"选择照片"</string>
   <string name="action_clear">"清除"</string>
   <string name="action_close">"关闭"</string>
@@ -76,18 +98,22 @@
   <string name="action_copy_link_to_message">"复制消息链接"</string>
   <string name="action_copy_text">"复制文本"</string>
   <string name="action_create">"创建"</string>
-  <string name="action_create_room">"创建聊天室"</string>
+  <string name="action_create_room">"创建房间"</string>
   <string name="action_create_space">"创建空间"</string>
   <string name="action_deactivate">"停用"</string>
   <string name="action_deactivate_account">"停用账户"</string>
   <string name="action_decline">"拒绝"</string>
   <string name="action_decline_and_block">"拒绝并屏蔽"</string>
+  <string name="action_delete">"删除"</string>
+  <string name="action_delete_account">"删除账户"</string>
+  <string name="action_delete_file">"删除文件"</string>
   <string name="action_delete_poll">"删除投票"</string>
   <string name="action_deselect_all">"取消全选"</string>
   <string name="action_disable">"禁用"</string>
   <string name="action_discard">"丢弃"</string>
   <string name="action_dismiss">"关闭"</string>
   <string name="action_done">"完成"</string>
+  <string name="action_download">"下载"</string>
   <string name="action_edit">"编辑"</string>
   <string name="action_edit_caption">"编辑标题"</string>
   <string name="action_edit_poll">"编辑投票"</string>
@@ -103,33 +129,35 @@
   <string name="action_go_to_settings">"前往设置"</string>
   <string name="action_ignore">"忽略"</string>
   <string name="action_invite">"邀请"</string>
-  <string name="action_invite_friends">"邀请朋友"</string>
-  <string name="action_invite_friends_to_app">"邀请别人加入 %1$s"</string>
-  <string name="action_invite_people_to_app">"邀请别人加入 %1$s"</string>
+  <string name="action_invite_friends">"邀请人员"</string>
+  <string name="action_invite_friends_to_app">"邀请人员加入 %1$s"</string>
+  <string name="action_invite_people_to_app">"邀请人员加入 %1$s"</string>
   <string name="action_invites_list">"邀请"</string>
   <string name="action_join">"加入"</string>
   <string name="action_learn_more">"了解更多"</string>
   <string name="action_leave">"离开"</string>
   <string name="action_leave_conversation">"离开聊天"</string>
-  <string name="action_leave_room">"离开聊天室"</string>
+  <string name="action_leave_room">"离开房间"</string>
   <string name="action_leave_space">"离开空间"</string>
   <string name="action_load_more">"载入更多"</string>
   <string name="action_manage_account">"管理账户"</string>
+  <string name="action_manage_account_and_devices">"管理账户与设备"</string>
   <string name="action_manage_devices">"管理设备"</string>
-  <string name="action_manage_rooms">"管理聊天室"</string>
-  <string name="action_message">"发送消息给"</string>
+  <string name="action_manage_rooms">"管理房间"</string>
+  <string name="action_mark_as_read">"设为已读"</string>
+  <string name="action_message">"发送消息"</string>
   <string name="action_minimize">"最小化"</string>
   <string name="action_next">"下一步"</string>
   <string name="action_no">"否"</string>
-  <string name="action_not_now">"以后再说"</string>
-  <string name="action_ok">"好"</string>
+  <string name="action_not_now">"暂不"</string>
+  <string name="action_ok">"确定"</string>
   <string name="action_open_context_menu">"打开上下文菜单"</string>
-  <string name="action_open_settings">"打开设置"</string>
-  <string name="action_open_with">"用其他方式打开"</string>
+  <string name="action_open_settings">"设置"</string>
+  <string name="action_open_with">"使用其它方式打开"</string>
   <string name="action_pin">"置顶"</string>
   <string name="action_quick_reply">"快速回复"</string>
   <string name="action_quote">"引用"</string>
-  <string name="action_react">"回应"</string>
+  <string name="action_react">"反应"</string>
   <string name="action_reject">"拒绝"</string>
   <string name="action_remove">"移除"</string>
   <string name="action_remove_caption">"删除标题"</string>
@@ -137,7 +165,7 @@
   <string name="action_reply">"回复"</string>
   <string name="action_reply_in_thread">"在消息列中回复"</string>
   <string name="action_report">"举报"</string>
-  <string name="action_report_bug">"报告错误"</string>
+  <string name="action_report_bug">"报告 bug"</string>
   <string name="action_report_content">"举报内容"</string>
   <string name="action_report_dm">"举报对话"</string>
   <string name="action_report_room">"举报房间"</string>
@@ -154,54 +182,60 @@
   <string name="action_send_voice_message">"发送语音消息"</string>
   <string name="action_share">"分享"</string>
   <string name="action_share_link">"分享链接"</string>
+  <string name="action_share_live_location">"共享实时位置"</string>
   <string name="action_show">"显示"</string>
   <string name="action_sign_in_again">"再次登录"</string>
-  <string name="action_signout">"登出"</string>
-  <string name="action_signout_anyway">"仍然登出"</string>
+  <string name="action_signout">"移除此设备"</string>
+  <string name="action_signout_anyway">"仍要移除此设备"</string>
   <string name="action_skip">"跳过"</string>
   <string name="action_start">"开始"</string>
   <string name="action_start_chat">"开始聊天"</string>
   <string name="action_start_over">"重新开始"</string>
   <string name="action_start_verification">"开始验证"</string>
   <string name="action_static_map_load">"点击以加载地图"</string>
+  <string name="action_stop">"停止"</string>
   <string name="action_take_photo">"拍摄照片"</string>
   <string name="action_tap_for_options">"点按查看选项"</string>
   <string name="action_translate">"翻译"</string>
-  <string name="action_try_again">"再试一次"</string>
+  <string name="action_try_again">"重试"</string>
   <string name="action_unpin">"取消置顶"</string>
+  <string name="action_video_call">"视频通话"</string>
   <string name="action_view">"查看"</string>
-  <string name="action_view_in_timeline">"在时间轴中查看"</string>
+  <string name="action_view_in_timeline">"在时间线上查看"</string>
   <string name="action_view_source">"查看源码"</string>
+  <string name="action_voice_call">"语音通话"</string>
   <string name="action_yes">"是"</string>
-  <string name="action_yes_try_again">"是的，再试一次"</string>
-  <string name="banner_migrate_to_native_sliding_sync_description">"您的服务器现在支持更快的新协议。现在登出并重新登录以进行升级。现在这样做可以帮助您避免在以后删除旧协议时被强制登出。"</string>
+  <string name="action_yes_try_again">"是，重试"</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"你的服务器现在支持更快的新协议。现在注销并重新登录以升级。立即这样做可以避免你在以后删除旧协议时被强制注销。"</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"有可用升级"</string>
   <string name="common_about">"关于"</string>
   <string name="common_acceptable_use_policy">"可接受的使用政策"</string>
   <string name="common_add_account">"添加账户"</string>
-  <string name="common_add_another_account">"添加另一个账户"</string>
-  <string name="common_adding_caption">"添加标题"</string>
+  <string name="common_add_another_account">"添加账户"</string>
+  <string name="common_adding_caption">"正在添加标题"</string>
   <string name="common_advanced_settings">"高级设置"</string>
   <string name="common_an_image">"一张图片"</string>
   <string name="common_analytics">"分析"</string>
-  <string name="common_android_shortcuts_remove_reason_left_room">"你离开了聊天室"</string>
-  <string name="common_android_shortcuts_remove_reason_session_logged_out">"您已被注销当前会话"</string>
+  <string name="common_android_shortcuts_remove_reason_left_room">"你离开了房间"</string>
+  <string name="common_android_shortcuts_remove_reason_session_logged_out">"你已注销会话"</string>
   <string name="common_appearance">"外观"</string>
   <string name="common_audio">"音频"</string>
-  <string name="common_beta">"测试版"</string>
+  <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"已屏蔽用户"</string>
   <string name="common_bubbles">"气泡"</string>
+  <string name="common_call_declined">"来电被拒接"</string>
+  <string name="common_call_in_progress">"通话进行中"</string>
   <string name="common_call_started">"通话已开始"</string>
+  <string name="common_call_you_declined">"你已拒接来电"</string>
   <string name="common_chat_backup">"聊天记录备份"</string>
   <string name="common_copied_to_clipboard">"已复制到剪贴板"</string>
   <string name="common_copyright">"版权"</string>
-  <string name="common_creating_room">"正在创建聊天室…"</string>
-  <string name="common_creating_space">"正在创建空间……"</string>
-  <string name="common_current_user_canceled_knock">"请求已取消"</string>
-  <string name="common_current_user_left_room">"离开聊天室"</string>
+  <string name="common_creating_room">"正在创建房间…"</string>
+  <string name="common_creating_space">"正在创建空间…"</string>
+  <string name="common_current_user_canceled_knock">"申请已取消"</string>
+  <string name="common_current_user_left_room">"已离开房间"</string>
   <string name="common_current_user_left_space">"离开空间"</string>
   <string name="common_current_user_rejected_invite">"邀请已拒绝"</string>
-  <string name="common_dark">"深色"</string>
   <string name="common_decryption_error">"解密错误"</string>
   <string name="common_description">"描述"</string>
   <string name="common_developer_options">"开发者选项"</string>
@@ -211,12 +245,13 @@
   <string name="common_download_failed">"下载失败"</string>
   <string name="common_downloading">"正在下载"</string>
   <string name="common_edited_suffix">"（已编辑）"</string>
-  <string name="common_editing">"编辑中"</string>
-  <string name="common_editing_caption">"编辑标题"</string>
+  <string name="common_editing">"正在编辑"</string>
+  <string name="common_editing_caption">"正在编辑标题"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
   <string name="common_empty_file">"空文件"</string>
   <string name="common_encryption">"加密"</string>
   <string name="common_encryption_enabled">"已启用加密"</string>
+  <string name="common_ends_at">"于 %1$s 结束"</string>
   <string name="common_enter_your_pin">"输入 PIN 码"</string>
   <string name="common_error">"错误"</string>
   <string name="common_error_registering_pusher_android">"发生错误，可能无法收到新消息通知。请在设置中对通知进行故障排除。
@@ -226,30 +261,40 @@
   <string name="common_failed">"失败"</string>
   <string name="common_favourite">"收藏"</string>
   <string name="common_favourited">"已收藏"</string>
+  <string name="common_fetching_notifications_title_android">"正在同步通知…"</string>
   <string name="common_file">"文件"</string>
   <string name="common_file_deleted">"文件已删除"</string>
   <string name="common_file_saved">"文件已保存"</string>
   <string name="common_file_saved_on_disk_android">"文件已保存到“下载”"</string>
   <string name="common_forward_message">"转发消息"</string>
   <string name="common_frequently_used">"常用"</string>
+  <string name="common_gallery">"图库"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="other">"%1$d 个附件…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="other">"%1$d 个媒体项目…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"群组通话进行中"</string>
   <string name="common_image">"图片"</string>
   <string name="common_in_reply_to">"回复 %1$s"</string>
   <string name="common_install_apk_android">"安装 APK"</string>
   <string name="common_invite_unknown_profile">"找不到此 Matrix ID，因此可能无法收到邀请。"</string>
-  <string name="common_leaving_room">"正在离开聊天室"</string>
+  <string name="common_leaving_room">"正在离开房间"</string>
   <string name="common_leaving_space">"正在离开空间"</string>
-  <string name="common_light">"浅色"</string>
   <string name="common_line_copied_to_clipboard">"链接已复制到剪贴板"</string>
   <string name="common_link_copied_to_clipboard">"链接已复制到剪贴板"</string>
   <string name="common_link_new_device">"关联新设备"</string>
+  <string name="common_live_location">"实时位置"</string>
+  <string name="common_live_location_ended">"实时位置已结束"</string>
   <string name="common_loading">"正在加载…"</string>
-  <string name="common_loading_more">"正在加载更多……"</string>
+  <string name="common_loading_more">"正在加载更多…"</string>
   <plurals name="common_many_members">
     <item quantity="other">"其他 %d 人"</item>
   </plurals>
   <plurals name="common_member_count">
-    <item quantity="other">"%1$d个成员"</item>
+    <item quantity="other">"%1$d 个成员"</item>
   </plurals>
   <string name="common_message">"消息"</string>
   <string name="common_message_actions">"消息操作"</string>
@@ -261,22 +306,25 @@
   <string name="common_name">"名称"</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"没有结果"</string>
-  <string name="common_no_room_name">"无聊天室名"</string>
+  <string name="common_no_room_name">"无房间名称"</string>
   <string name="common_no_space_name">"未命名空间"</string>
   <string name="common_not_encrypted">"未加密"</string>
   <string name="common_offline">"离线"</string>
+  <string name="common_on_a_call">"通话中"</string>
   <string name="common_open_source_licenses">"开源许可证"</string>
   <string name="common_or">"或"</string>
+  <string name="common_other_options">"其它选项"</string>
   <string name="common_password">"密码"</string>
-  <string name="common_people">"用户"</string>
-  <string name="common_permalink">"固定链接"</string>
+  <string name="common_people">"人员"</string>
+  <string name="common_permalink">"永久链接"</string>
   <string name="common_permission">"权限"</string>
   <string name="common_pinned">"已置顶"</string>
   <string name="common_please_check_internet_connection">"请检查 Internet 连接"</string>
-  <string name="common_please_wait">"请稍候……"</string>
+  <string name="common_please_wait">"请稍候…"</string>
   <string name="common_poll_end_confirmation">"确定要结束这个投票吗？"</string>
   <string name="common_poll_summary">"投票：%1$s"</string>
-  <string name="common_poll_total_votes">"总票数: %1$s"</string>
+  <string name="common_poll_summary_prefix">"投票"</string>
+  <string name="common_poll_total_votes">"总票数：%1$s"</string>
   <string name="common_poll_undisclosed_text">"结果将在投票结束后显示"</string>
   <plurals name="common_poll_votes_count">
     <item quantity="other">"%d 票"</item>
@@ -284,13 +332,13 @@
   <string name="common_preparing">"正在准备…"</string>
   <string name="common_privacy_policy">"隐私政策"</string>
   <string name="common_private">"私密"</string>
-  <string name="common_private_room">"私有聊天室"</string>
+  <string name="common_private_room">"私有房间"</string>
   <string name="common_private_space">"私有空间"</string>
   <string name="common_public">"公共"</string>
-  <string name="common_public_room">"公共聊天室"</string>
-  <string name="common_public_space">"公开空间"</string>
-  <string name="common_reaction">"回应"</string>
-  <string name="common_reactions">"回应"</string>
+  <string name="common_public_room">"公共房间"</string>
+  <string name="common_public_space">"公共空间"</string>
+  <string name="common_reaction">"反应"</string>
+  <string name="common_reactions">"反应"</string>
   <string name="common_reason">"理由"</string>
   <string name="common_recovery_key">"恢复密钥"</string>
   <string name="common_refreshing">"正在刷新…"</string>
@@ -299,16 +347,15 @@
     <item quantity="other">"%1$d 个回复"</item>
   </plurals>
   <string name="common_replying_to">"正在回复 %1$s"</string>
-  <string name="common_report_a_bug">"报告错误"</string>
   <string name="common_report_a_problem">"报告问题"</string>
   <string name="common_report_submitted">"报告已提交"</string>
   <string name="common_rich_text_editor">"富文本编辑器"</string>
   <string name="common_role">"角色"</string>
-  <string name="common_room">"聊天室"</string>
-  <string name="common_room_name">"聊天室名称"</string>
-  <string name="common_room_name_placeholder">"例如：您的项目名称"</string>
+  <string name="common_room">"房间"</string>
+  <string name="common_room_name">"房间名称"</string>
+  <string name="common_room_name_placeholder">"例如：你的项目名称"</string>
   <plurals name="common_rooms">
-    <item quantity="other">"%1$d 房间"</item>
+    <item quantity="other">"%1$d 个房间"</item>
   </plurals>
   <string name="common_saved_changes">"保存的更改"</string>
   <string name="common_saving">"正在保存"</string>
@@ -319,7 +366,7 @@
   <string name="common_seen_by">"已读"</string>
   <string name="common_select_account">"选择账户"</string>
   <plurals name="common_selected_count">
-    <item quantity="other">"%1$d 已选中"</item>
+    <item quantity="other">"已选中 %1$d 个"</item>
   </plurals>
   <string name="common_send_to">"发送至"</string>
   <string name="common_sending">"正在发送…"</string>
@@ -331,40 +378,42 @@
   <string name="common_server_url">"服务器 URL"</string>
   <string name="common_settings">"设置"</string>
   <string name="common_share_space">"共享空间"</string>
-  <string name="common_shared_history">"新成员可见历史记录"</string>
+  <string name="common_shared_history">"新成员可以看到历史"</string>
+  <string name="common_shared_live_location">"已共享实时位置"</string>
   <string name="common_shared_location">"共享位置"</string>
-  <string name="common_shared_space">"共享空间"</string>
-  <string name="common_signing_out">"正在登出"</string>
+  <string name="common_shared_space">"已共享的空间"</string>
+  <string name="common_signing_out">"正在移除设备"</string>
   <string name="common_something_went_wrong">"发生了一些错误"</string>
   <string name="common_something_went_wrong_message">"我们遇到了一个问题。请重试。"</string>
   <string name="common_space">"空间"</string>
   <string name="common_space_members">"空间成员"</string>
   <string name="common_space_topic_placeholder">"该空间的主题是什么？"</string>
   <plurals name="common_spaces">
-    <item quantity="other">"%1$d 空间"</item>
+    <item quantity="other">"%1$d 个空间"</item>
   </plurals>
   <string name="common_starting_chat">"开始聊天…"</string>
   <string name="common_sticker">"贴纸"</string>
   <string name="common_success">"成功"</string>
-  <string name="common_suggested">"推荐"</string>
+  <string name="common_suggested">"建议"</string>
   <string name="common_suggestions">"建议"</string>
   <string name="common_syncing">"正在同步"</string>
-  <string name="common_system">"系统"</string>
   <string name="common_text">"文本"</string>
   <string name="common_third_party_notices">"第三方通知"</string>
   <string name="common_thread">"消息列"</string>
+  <string name="common_threads">"消息列"</string>
   <string name="common_topic">"主题"</string>
-  <string name="common_topic_placeholder">"该聊天室的主题是什么？"</string>
+  <string name="common_topic_placeholder">"该房间的主题是什么？"</string>
   <string name="common_unable_to_decrypt">"无法解密"</string>
   <string name="common_unable_to_decrypt_insecure_device">"从不安全的设备发送"</string>
   <string name="common_unable_to_decrypt_no_access">"无权访问此消息"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"发送者的已验证身份已重置"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"发送者的已验证数字身份已重置"</string>
   <string name="common_unable_to_invite_message">"无法向部分用户发送邀请。"</string>
   <string name="common_unable_to_invite_title">"无法发送邀请"</string>
   <string name="common_unlock">"解锁"</string>
   <string name="common_unmute">"解除静音"</string>
-  <string name="common_unsupported_call">"不支持的呼叫"</string>
+  <string name="common_unsupported_call">"不受支持的通话"</string>
   <string name="common_unsupported_event">"不支持的事件"</string>
+  <string name="common_user_started_a_call">"%1$s 已开始通话"</string>
   <string name="common_username">"用户名"</string>
   <string name="common_verification_cancelled">"验证已取消"</string>
   <string name="common_verification_complete">"验证完成"</string>
@@ -381,115 +430,143 @@
   <string name="common_video_quality_standard">"标准质量"</string>
   <string name="common_video_quality_standard_description">"质量与上传速度的平衡"</string>
   <string name="common_voice_message">"语音消息"</string>
-  <string name="common_waiting">"等待…"</string>
-  <string name="common_waiting_for_decryption_key">"正在等待解密密钥"</string>
-  <string name="common_world_readable_history">"任何人都可查看历史记录"</string>
-  <string name="common_you">"您"</string>
-  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) 由于您当时不在聊天室内，系统已将消息共享给您。"</string>
-  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s 由于您当时不在聊天室内，系统已将此消息共享给您。"</string>
-  <string name="crypto_history_visible">"本聊天室已配置为允许新成员阅读历史记录。%1$s"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s的身份已重置。%2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$s %2$s 的身份已重置。%3$s"</string>
+  <string name="common_waiting">"正在等待…"</string>
+  <string name="common_waiting_for_decryption_key">"正在等待此消息"</string>
+  <string name="common_waiting_live_location">"正在等待实时位置…"</string>
+  <string name="common_world_readable_history">"任何人都可以看到历史"</string>
+  <string name="common_you">"你"</string>
+  <string name="content_scanner_not_found">"无法下载。"</string>
+  <string name="content_scanner_not_found_title">"文件未找到"</string>
+  <string name="content_scanner_scanning">"正在扫描…"</string>
+  <string name="content_scanner_unsafe_message">"预览与下载功能已被禁用。"</string>
+  <string name="content_scanner_unsafe_title">"此文件不安全"</string>
+  <string name="crypto_event_key_forwarded_known_profile_dialog_content">"由于你当时不在房间内，%1$s（%2$s）已将消息向你共享。"</string>
+  <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"由于你当时不在房间内，%1$s 已将消息向你共享。"</string>
+  <string name="crypto_history_visible">"此房间已配置为允许新成员阅读历史。%1$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$s 的数字身份已重置。%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$s（%2$s）的数字身份已重置。%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的身份已重置。"</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s %2$s 的身份已重置。%3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的数字身份已重置。"</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s（%2$s）的数字身份已重置。%3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"撤回验证"</string>
+  <string name="dialog_allow_access">"允许访问"</string>
   <string name="dialog_confirm_link_message">"链接 %1$s 将跳转至外部网站 %2$s
 
 确定要继续吗？"</string>
   <string name="dialog_confirm_link_title">"请再次确认链接"</string>
-  <string name="dialog_default_video_quality_selector_subtitle">"选择您上传的视频的默认质量。"</string>
+  <string name="dialog_default_video_quality_selector_subtitle">"选择你上传的视频的默认质量。"</string>
   <string name="dialog_default_video_quality_selector_title">"视频上传质量"</string>
   <string name="dialog_file_too_large_to_upload_subtitle">"允许的最大文件大小为：%1$s"</string>
   <string name="dialog_file_too_large_to_upload_title">"文件太大，无法上传"</string>
   <string name="dialog_room_reported">"已举报房间"</string>
-  <string name="dialog_room_reported_and_left">"举报并离开房间"</string>
+  <string name="dialog_room_reported_and_left">"已举报并离开房间"</string>
   <string name="dialog_title_confirmation">"确认"</string>
   <string name="dialog_title_error">"错误"</string>
   <string name="dialog_title_success">"成功"</string>
   <string name="dialog_title_warning">"警告"</string>
-  <string name="dialog_unsaved_changes_description">"您有未保存的更改。"</string>
+  <string name="dialog_unsaved_changes_description">"你有未保存的更改。"</string>
   <string name="dialog_unsaved_changes_description_android">"更改尚未保存，确定要返回吗？"</string>
   <string name="dialog_unsaved_changes_title">"保存更改？"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"允许的最大文件大小为：%1$s"</string>
-  <string name="dialog_video_quality_selector_subtitle_no_file_size">"选择您要上传的视频的质量。"</string>
+  <string name="dialog_video_quality_selector_subtitle_no_file_size">"选择你要上传的视频的质量。"</string>
   <string name="dialog_video_quality_selector_title">"选择视频上传质量"</string>
-  <string name="emoji_picker_search_placeholder">"搜索表情符号"</string>
-  <string name="error_account_already_logged_in">"您已在此设备以%1$s 身份登录。"</string>
-  <string name="error_account_creation_not_possible">"您的服务器需要升级，以支持 Matrix 鉴权服务和账户创建。"</string>
-  <string name="error_failed_creating_the_permalink">"创建固定链接失败"</string>
+  <string name="error_account_already_logged_in">"你已在此设备以 %1$s 的身份登录。"</string>
+  <string name="error_account_creation_not_possible">"你的主服务器需要升级，以支持 Matrix 认证服务和账户创建。"</string>
+  <string name="error_failed_creating_the_permalink">"永久链接创建失败"</string>
   <string name="error_failed_loading_map">"%1$s 无法加载地图，请稍后再试。"</string>
-  <string name="error_failed_loading_messages">"加载消息失败"</string>
-  <string name="error_failed_locating_user">"%1$s 无法访问您的位置，请稍后再试。"</string>
+  <string name="error_failed_loading_messages">"消息加载失败"</string>
+  <string name="error_failed_locating_user">"%1$s 无法访问你的位置，请稍后再试。"</string>
   <string name="error_failed_uploading_voice_message">"无法上传语音消息。"</string>
   <string name="error_invalid_invite">"该房间已不存在或邀请已失效。"</string>
-  <string name="error_message_not_found">"找不到消息"</string>
-  <string name="error_missing_location_auth_android">"%1$s 没有权限访问您的位置。您可以在设置中启用位置权限。"</string>
-  <string name="error_missing_location_rationale_android">"%1$s 没有权限访问您的位置。在下方启用位置权限。"</string>
-  <string name="error_missing_microphone_voice_rationale_android">"%1$s 没有权限访问您的麦克风。启用录制语音消息的权限。"</string>
+  <string name="error_location_service_disabled_android">"请开启 GPS 以使用基于位置的功能。"</string>
+  <string name="error_message_not_found">"未找到消息"</string>
+  <string name="error_missing_location_auth_android">"%1$s 无权访问你的位置。你可以在“设置”中启用位置权限。"</string>
+  <string name="error_missing_location_rationale_android">"%1$s 无权访问你的位置。在下方启用访问权限。"</string>
+  <string name="error_missing_microphone_voice_rationale_android">"%1$s 无权访问你的麦克风。启用访问权以录制语音消息。"</string>
   <string name="error_network_or_server_issue">"这可能是由于网络或服务器问题导致"</string>
   <string name="error_room_address_already_exists">"此房间地址已存在。请尝试编辑房间地址字段或更改房间名称"</string>
   <string name="error_room_address_invalid_symbols">"不允许使用某些字符。仅支持字母、数字和以下符号 $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _"</string>
-  <string name="error_some_messages_have_not_been_sent">"某些信息尚未发送"</string>
+  <string name="error_some_messages_have_not_been_sent">"某些消息尚未发送"</string>
   <string name="error_unknown">"抱歉，发生了错误"</string>
-  <string name="invite_friends_rich_title">"🔐️ 加入我 %1$s"</string>
+  <string name="invite_friends_rich_title">"🔐️ 在 %1$s 中与我一起"</string>
   <string name="invite_friends_text">"嗨！请通过 %1$s 与我联系：%2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"实时位置共享"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"位置共享正在进行"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s 实时位置"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
-  <string name="preference_rageshake">"摇一摇以报错"</string>
+  <string name="preference_rageshake">"摇一摇以报告 bug"</string>
   <string name="screen_bug_report_a11y_screenshot">"屏幕截图"</string>
   <string name="screen_create_poll_option_accessibility_label">"%1$s：%2$s"</string>
   <string name="screen_create_poll_options_section_title">"选项"</string>
-  <string name="screen_create_poll_remove_accessibility_label">"移除%1$s"</string>
+  <string name="screen_create_poll_remove_accessibility_label">"移除 %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"设置"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"每人允许的投票数"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"目前无人分享其位置"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"正在共享实时位置"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="other">"%1$d 个人"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"在地图上"</string>
+  <string name="screen_local_network_opt_in_subtitle">"你的主服务器位于本地网络。%1$s 需要获得此网络上设备的访问权才能连接。"</string>
+  <string name="screen_local_network_opt_in_title">"允许访问本地网络"</string>
   <string name="screen_media_picker_error_failed_selection">"选择媒体失败，请重试。"</string>
   <string name="screen_pinned_timeline_empty_state_description">"按下消息并选择 “%1$s” 将其包含在此处。"</string>
-  <string name="screen_pinned_timeline_empty_state_headline">"固定重要消息，以便轻松发现它们"</string>
+  <string name="screen_pinned_timeline_empty_state_headline">"置顶重要的消息以便于发现"</string>
   <plurals name="screen_pinned_timeline_screen_title">
-    <item quantity="other">"%1$d 置顶消息"</item>
+    <item quantity="other">"%1$d 个已置顶的消息"</item>
   </plurals>
-  <string name="screen_pinned_timeline_screen_title_empty">"置顶消息"</string>
-  <string name="screen_reset_identity_confirmation_subtitle">"您将要转到您的%1$s帐户来重置您的身份信息。之后，您将被带回该应用。"</string>
-  <string name="screen_reset_identity_confirmation_title">"无法确认？请前往您的帐户重置您的身份。"</string>
+  <string name="screen_pinned_timeline_screen_title_empty">"已置顶的消息"</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"你即将被重定向到你在 %1$s 上的账户以重置数字身份。之后将被带回 app。"</string>
+  <string name="screen_reset_identity_confirmation_title">"无法确认？请转到你的账户重置数字身份。"</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"撤回验证并发送"</string>
-  <string name="screen_resolve_send_failure_changed_identity_subtitle">"您可以撤回验证并仍然发送此消息；也可以暂时取消验证，在重新验证 %1$s 后重试。"</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"您的消息未发送，因为%1$s的已验证身份已被重置"</string>
+  <string name="screen_resolve_send_failure_changed_identity_subtitle">"你可以撤回验证并照常发送此消息，也可以暂时取消验证，并于重新验证 %1$s 后重试。"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"你的消息未能发送，因为 %1$s 的已验证数字身份已被重置"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"仍然发送消息"</string>
-  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s 正在使用一个或多个未经验证的设备。您还是可以继续发送信息；也可以暂时取消，等 %2$s 验证了所有设备后重试。"</string>
-  <string name="screen_resolve_send_failure_unsigned_device_title">"您的消息未发送，因为%1$s尚未验证所有设备"</string>
-  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"您有未验证的设备。您仍然可以发送消息；也可以暂时取消，并在验证所有设备后稍后重试。"</string>
-  <string name="screen_resolve_send_failure_you_unsigned_device_title">"您的消息未发送，因为您有尚未验证的设备。"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s 正在使用至少 1 个未经验证的设备。你可以照常发送消息，也可以暂时取消，直到 %2$s 验证所有设备后重试。"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"你的消息未能发送，因为 %1$s 尚未验证所有设备"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"你有至少 1 个未经验证的设备。你可以照常发送消息，也可以暂时取消，并在验证所有设备后重试。"</string>
+  <string name="screen_resolve_send_failure_you_unsigned_device_title">"你的消息未能发送，因为你有尚未验证的设备。"</string>
   <string name="screen_room_change_role_administrators_or_owners_title">"编辑管理员或所有者"</string>
   <string name="screen_room_error_failed_processing_media">"处理要上传的媒体失败，请重试。"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"无法获取用户信息"</string>
   <string name="screen_room_event_pill">"%1$s 中的消息"</string>
   <string name="screen_room_grouped_state_events_expand">"展开"</string>
   <string name="screen_room_grouped_state_events_reduce">"折叠"</string>
-  <string name="screen_room_permalink_same_room_android">"已经在此房间了！"</string>
+  <string name="screen_room_live_location_banner">"正在共享实时位置"</string>
+  <string name="screen_room_permalink_same_room_android">"已经位于此房间！"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s / %2$s"</string>
-  <string name="screen_room_pinned_banner_indicator_description">"置顶消息 %1$s"</string>
+  <string name="screen_room_pinned_banner_indicator_description">"%1$s 个已置顶的消息"</string>
   <string name="screen_room_pinned_banner_loading_description">"正在加载消息…"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"查看全部"</string>
   <string name="screen_room_title">"聊天"</string>
-  <string name="screen_share_location_title">"分享位置"</string>
-  <string name="screen_share_my_location_action">"分享我的位置"</string>
+  <string name="screen_share_location_title">"共享位置"</string>
+  <string name="screen_share_my_location_action">"共享我的位置"</string>
   <string name="screen_share_open_apple_maps">"在 Apple Maps 中打开"</string>
   <string name="screen_share_open_google_maps">"在 Google Maps 中打开"</string>
   <string name="screen_share_open_osm_maps">"在 OpenStreetMap 中打开"</string>
-  <string name="screen_share_this_location_action">"分享这个位置"</string>
-  <string name="screen_space_list_description">"您创建或加入的空间。"</string>
+  <string name="screen_share_this_location_action">"分享选定的位置"</string>
+  <string name="screen_sharing_location_option_sheet_title">"共享选项"</string>
+  <string name="screen_space_list_description">"你创建或加入的空间。"</string>
   <string name="screen_space_list_details">"%1$s • %2$s"</string>
-  <string name="screen_space_list_empty_state_title">"创建空间以组织聊天室"</string>
-  <string name="screen_space_list_parent_space">"%1$s空间"</string>
+  <string name="screen_space_list_empty_state_title">"创建空间以组织房间"</string>
+  <string name="screen_space_list_parent_space">"空间 %1$s"</string>
   <string name="screen_space_list_title">"空间"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"消息未发送，因为%1$s的已验证身份已被重置。"</string>
-  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"消息未发送，因为%1$s尚未验证所有设备。"</string>
-  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"消息未发送，因为您有尚未验证的设备。"</string>
+  <string name="screen_static_location_sheet_timestamp_description">"已共享 %1$s"</string>
+  <string name="screen_static_location_sheet_title">"在地图上"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="other">"%1$d 已加入"</item>
+  </plurals>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"消息未能发送，因为 %1$s 的已验证数字身份已被重置。"</string>
+  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"消息未能发送，因为 %1$s 尚未验证所有设备。"</string>
+  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"消息未能发送，因为你有尚未验证的设备。"</string>
   <string name="screen_view_location_title">"位置"</string>
-  <string name="settings_version_number">"版本：%1$s (%2$s)"</string>
+  <string name="settings_version_number">"版本：%1$s（%2$s）"</string>
   <string name="test_language_identifier">"zh-Hans"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"历史消息在此设备上不可用"</string>
-  <string name="timeline_decryption_failure_historical_event_unverified_device">"您需要验证此设备才能访问历史消息"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"你需要验证此设备才能访问历史消息"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"无权访问此消息"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"无法解密消息"</string>
-  <string name="timeline_decryption_failure_withheld_unverified">"此消息已被阻止，因为您未验证您的设备，或者发件人需要验证您的身份。"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"此消息已被阻止，因为你未验证你的设备，或发送者需要验证你的数字身份。"</string>
+  <string name="vulkan_not_supported_dialog_content_android">"你的设备过旧，需要 Android 8 或更高版本的设备。"</string>
+  <string name="vulkan_not_supported_dialog_title_android">"地图渲染不受支持。"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 98a8aa1862..49dedb49e1 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_add_avatar">"Add avatar"</string>
   <string name="a11y_add_reaction">"Add reaction: %1$s"</string>
   <string name="a11y_address">"Address"</string>
   <string name="a11y_avatar">"Avatar"</string>
+  <string name="a11y_clear_search_field">"Clear search field"</string>
   <string name="a11y_collapse_message_text_field">"Minimise message text field"</string>
+  <string name="a11y_create_poll_votes_allowed_decrease">"Decrease votes allowed per person"</string>
+  <string name="a11y_create_poll_votes_allowed_increase">"Increase votes allowed per person"</string>
+  <string name="a11y_custom_emoji">"Custom emoji"</string>
   <string name="a11y_delete">"Delete"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d digit entered"</item>
     <item quantity="other">"%1$d digits entered"</item>
   </plurals>
+  <string name="a11y_duration">"Duration: %1$s"</string>
   <string name="a11y_edit_avatar">"Edit avatar"</string>
   <string name="a11y_edit_room_address_hint">"The full address will be %1$s"</string>
   <string name="a11y_encryption_details">"Encryption details"</string>
   <string name="a11y_expand_message_text_field">"Expand message text field"</string>
   <string name="a11y_hide_password">"Hide password"</string>
+  <string name="a11y_info">"Info"</string>
   <string name="a11y_join_call">"Join call"</string>
   <string name="a11y_jump_to_bottom">"Jump to bottom"</string>
+  <string name="a11y_jump_to_unread">"Jump to unread"</string>
+  <string name="a11y_jump_to_unread_messages">"Jump to first unread message"</string>
   <string name="a11y_move_the_map_to_my_location">"Move the map to my location"</string>
   <string name="a11y_notifications_mentions_only">"Mentions only"</string>
   <string name="a11y_notifications_muted">"Muted"</string>
@@ -26,34 +35,43 @@
   <string name="a11y_page_n">"Page %1$d"</string>
   <string name="a11y_pause">"Pause"</string>
   <string name="a11y_paused_voice_message">"Voice message, duration: %1$s, current position: %2$s"</string>
+  <string name="a11y_photo_preview">"Photo preview"</string>
   <string name="a11y_pin_field">"PIN field"</string>
   <string name="a11y_pinned_location">"Pinned location"</string>
   <string name="a11y_play">"Play"</string>
   <string name="a11y_playback_speed">"Playback speed"</string>
   <string name="a11y_poll">"Poll"</string>
   <string name="a11y_poll_end">"Ended poll"</string>
+  <string name="a11y_position">"Position: %1$s"</string>
   <string name="a11y_qr_code">"QR Code"</string>
   <string name="a11y_react_with">"React with %1$s"</string>
   <string name="a11y_react_with_other_emojis">"React with other emojis"</string>
-  <string name="a11y_read_receipts_multiple">"Read by %1$s and %2$s"</string>
+  <string name="a11y_read_receipts_multiple">"Previous message read by %1$s and %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
-    <item quantity="one">"Read by %1$s and %2$d other"</item>
-    <item quantity="other">"Read by %1$s and %2$d others"</item>
+    <item quantity="one">"Previous message read by %1$s and %2$d other"</item>
+    <item quantity="other">"Previous message read by %1$s and %2$d others"</item>
   </plurals>
-  <string name="a11y_read_receipts_single">"Read by %1$s"</string>
-  <string name="a11y_read_receipts_tap_to_show_all">"Tap to show all"</string>
+  <string name="a11y_read_receipts_single">"Previous message read by %1$s"</string>
+  <string name="a11y_read_receipts_tap_to_show_all_android">"show all read receipts"</string>
   <string name="a11y_remove_reaction">"Remove reaction: %1$s"</string>
   <string name="a11y_remove_reaction_with">"Remove reaction with %1$s"</string>
   <string name="a11y_room_avatar">"Room avatar"</string>
   <string name="a11y_send_files">"Send files"</string>
   <string name="a11y_sender_location">"Sender location"</string>
+  <string name="a11y_sent_by_sender_at_date">"Sent by %1$s at %2$s"</string>
   <string name="a11y_session_verification_time_limited_action_required">"Time limited action required, you have one minute to verify"</string>
+  <string name="a11y_settings_with_required_action">"Settings, action required"</string>
   <string name="a11y_show_password">"Show password"</string>
   <string name="a11y_start_call">"Start a call"</string>
+  <string name="a11y_start_video_call">"Start a video call"</string>
   <string name="a11y_start_voice_call">"Start a voice call"</string>
+  <string name="a11y_status">"Status"</string>
+  <string name="a11y_thread_in_room">"Thread in %1$s"</string>
+  <string name="a11y_threads_in_room">"Threads in %1$s"</string>
   <string name="a11y_tombstoned_room">"Tombstoned room"</string>
   <string name="a11y_user_avatar">"User avatar"</string>
   <string name="a11y_user_menu">"User menu"</string>
+  <string name="a11y_video_preview">"Video preview"</string>
   <string name="a11y_view_avatar">"View avatar"</string>
   <string name="a11y_view_details">"View details"</string>
   <string name="a11y_voice_message">"Voice message, duration: %1$s"</string>
@@ -68,6 +86,7 @@
   <string name="action_call">"Call"</string>
   <string name="action_cancel">"Cancel"</string>
   <string name="action_cancel_for_now">"Cancel for now"</string>
+  <string name="action_choose_file">"Choose file"</string>
   <string name="action_choose_photo">"Choose photo"</string>
   <string name="action_clear">"Clear"</string>
   <string name="action_close">"Close"</string>
@@ -87,12 +106,16 @@
   <string name="action_deactivate_account">"Deactivate account"</string>
   <string name="action_decline">"Decline"</string>
   <string name="action_decline_and_block">"Decline and block"</string>
+  <string name="action_delete">"Delete"</string>
+  <string name="action_delete_account">"Delete account"</string>
+  <string name="action_delete_file">"Delete file"</string>
   <string name="action_delete_poll">"Delete Poll"</string>
   <string name="action_deselect_all">"Deselect all"</string>
   <string name="action_disable">"Disable"</string>
   <string name="action_discard">"Discard"</string>
   <string name="action_dismiss">"Dismiss"</string>
   <string name="action_done">"Done"</string>
+  <string name="action_download">"Download"</string>
   <string name="action_edit">"Edit"</string>
   <string name="action_edit_caption">"Edit caption"</string>
   <string name="action_edit_poll">"Edit poll"</string>
@@ -123,6 +146,7 @@
   <string name="action_manage_account_and_devices">"Manage account &amp; devices"</string>
   <string name="action_manage_devices">"Manage devices"</string>
   <string name="action_manage_rooms">"Manage rooms"</string>
+  <string name="action_mark_as_read">"Mark as read"</string>
   <string name="action_message">"Message"</string>
   <string name="action_minimize">"Minimise"</string>
   <string name="action_next">"Next"</string>
@@ -177,9 +201,11 @@
   <string name="action_translate">"Translate"</string>
   <string name="action_try_again">"Try again"</string>
   <string name="action_unpin">"Unpin"</string>
+  <string name="action_video_call">"Video call"</string>
   <string name="action_view">"View"</string>
   <string name="action_view_in_timeline">"View in timeline"</string>
   <string name="action_view_source">"View source"</string>
+  <string name="action_voice_call">"Voice call"</string>
   <string name="action_yes">"Yes"</string>
   <string name="action_yes_try_again">"Yes, try again"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Your server now supports a new, faster protocol. Log out and log back in to upgrade now. Doing this now will help you avoid a forced logout when the old protocol is removed later."</string>
@@ -187,12 +213,11 @@
   <string name="common_about">"About"</string>
   <string name="common_acceptable_use_policy">"Acceptable use policy"</string>
   <string name="common_add_account">"Add an account"</string>
-  <string name="common_add_another_account">"Add another account"</string>
+  <string name="common_add_another_account">"Add account"</string>
   <string name="common_adding_caption">"Adding caption"</string>
   <string name="common_advanced_settings">"Advanced settings"</string>
   <string name="common_an_image">"an image"</string>
   <string name="common_analytics">"Analytics"</string>
-  <string name="common_android_fetching_notifications_title">"Syncing notifications…"</string>
   <string name="common_android_shortcuts_remove_reason_left_room">"You left the room"</string>
   <string name="common_android_shortcuts_remove_reason_session_logged_out">"You were logged out of the session"</string>
   <string name="common_appearance">"Appearance"</string>
@@ -200,7 +225,10 @@
   <string name="common_beta">"Beta"</string>
   <string name="common_blocked_users">"Blocked users"</string>
   <string name="common_bubbles">"Bubbles"</string>
+  <string name="common_call_declined">"Call declined"</string>
+  <string name="common_call_in_progress">"Call in progress"</string>
   <string name="common_call_started">"Call started"</string>
+  <string name="common_call_you_declined">"You declined a call"</string>
   <string name="common_chat_backup">"Chat backup"</string>
   <string name="common_copied_to_clipboard">"Copied to clipboard"</string>
   <string name="common_copyright">"Copyright"</string>
@@ -210,7 +238,6 @@
   <string name="common_current_user_left_room">"Left room"</string>
   <string name="common_current_user_left_space">"Left space"</string>
   <string name="common_current_user_rejected_invite">"Invite declined"</string>
-  <string name="common_dark">"Dark"</string>
   <string name="common_decryption_error">"Decryption error"</string>
   <string name="common_description">"Description"</string>
   <string name="common_developer_options">"Developer options"</string>
@@ -236,20 +263,30 @@ Reason: %1$s."</string>
   <string name="common_failed">"Failed"</string>
   <string name="common_favourite">"Favourite"</string>
   <string name="common_favourited">"Favourited"</string>
+  <string name="common_fetching_notifications_title_android">"Syncing notifications…"</string>
   <string name="common_file">"File"</string>
   <string name="common_file_deleted">"File deleted"</string>
   <string name="common_file_saved">"File saved"</string>
   <string name="common_file_saved_on_disk_android">"File saved to Downloads"</string>
   <string name="common_forward_message">"Forward message"</string>
   <string name="common_frequently_used">"Frequently used"</string>
+  <string name="common_gallery">"Gallery"</string>
+  <plurals name="common_gallery_reply_attachments">
+    <item quantity="one">"%1$d attachment…"</item>
+    <item quantity="other">"%1$d attachments…"</item>
+  </plurals>
+  <plurals name="common_gallery_reply_media_items">
+    <item quantity="one">"%1$d media item…"</item>
+    <item quantity="other">"%1$d media items…"</item>
+  </plurals>
   <string name="common_gif">"GIF"</string>
+  <string name="common_group_call_in_progress">"Group call in progress"</string>
   <string name="common_image">"Image"</string>
   <string name="common_in_reply_to">"In reply to %1$s"</string>
   <string name="common_install_apk_android">"Install APK"</string>
   <string name="common_invite_unknown_profile">"This Matrix ID can\'t be found, so the invite might not be received."</string>
   <string name="common_leaving_room">"Leaving room"</string>
   <string name="common_leaving_space">"Leaving space"</string>
-  <string name="common_light">"Light"</string>
   <string name="common_line_copied_to_clipboard">"Line copied to clipboard"</string>
   <string name="common_link_copied_to_clipboard">"Link copied to clipboard"</string>
   <string name="common_link_new_device">"Link new device"</string>
@@ -279,6 +316,7 @@ Reason: %1$s."</string>
   <string name="common_no_space_name">"No space name"</string>
   <string name="common_not_encrypted">"Not encrypted"</string>
   <string name="common_offline">"Offline"</string>
+  <string name="common_on_a_call">"On a call"</string>
   <string name="common_open_source_licenses">"Open source licenses"</string>
   <string name="common_or">"or"</string>
   <string name="common_other_options">"Other options"</string>
@@ -291,6 +329,7 @@ Reason: %1$s."</string>
   <string name="common_please_wait">"Please wait…"</string>
   <string name="common_poll_end_confirmation">"Are you sure you want to end this poll?"</string>
   <string name="common_poll_summary">"Poll: %1$s"</string>
+  <string name="common_poll_summary_prefix">"Poll"</string>
   <string name="common_poll_total_votes">"Total votes: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Results will show after the poll has ended"</string>
   <plurals name="common_poll_votes_count">
@@ -316,7 +355,6 @@ Reason: %1$s."</string>
     <item quantity="other">"%1$d replies"</item>
   </plurals>
   <string name="common_replying_to">"Replying to %1$s"</string>
-  <string name="common_report_a_bug">"Report a bug"</string>
   <string name="common_report_a_problem">"Report a problem"</string>
   <string name="common_report_submitted">"Report submitted"</string>
   <string name="common_rich_text_editor">"Rich text editor"</string>
@@ -370,10 +408,10 @@ Reason: %1$s."</string>
   <string name="common_suggested">"Suggested"</string>
   <string name="common_suggestions">"Suggestions"</string>
   <string name="common_syncing">"Syncing"</string>
-  <string name="common_system">"System"</string>
   <string name="common_text">"Text"</string>
   <string name="common_third_party_notices">"Third-party notices"</string>
   <string name="common_thread">"Thread"</string>
+  <string name="common_threads">"Threads"</string>
   <string name="common_topic">"Topic"</string>
   <string name="common_topic_placeholder">"What is this room about?"</string>
   <string name="common_unable_to_decrypt">"Unable to decrypt"</string>
@@ -386,6 +424,7 @@ Reason: %1$s."</string>
   <string name="common_unmute">"Unmute"</string>
   <string name="common_unsupported_call">"Unsupported call"</string>
   <string name="common_unsupported_event">"Unsupported event"</string>
+  <string name="common_user_started_a_call">"%1$s started a call"</string>
   <string name="common_username">"Username"</string>
   <string name="common_verification_cancelled">"Verification cancelled"</string>
   <string name="common_verification_complete">"Verification complete"</string>
@@ -407,6 +446,11 @@ Reason: %1$s."</string>
   <string name="common_waiting_live_location">"Waiting for live location…"</string>
   <string name="common_world_readable_history">"Anyone can see history"</string>
   <string name="common_you">"You"</string>
+  <string name="content_scanner_not_found">"Download not available."</string>
+  <string name="content_scanner_not_found_title">"Something went wrong"</string>
+  <string name="content_scanner_scanning">"Scanning…"</string>
+  <string name="content_scanner_unsafe_message">"Preview and download have been disabled."</string>
+  <string name="content_scanner_unsafe_title">"The file is not safe"</string>
   <string name="crypto_event_key_forwarded_known_profile_dialog_content">"%1$s (%2$s) shared this message since you were not in the room when it was sent."</string>
   <string name="crypto_event_key_forwarded_unknown_profile_dialog_content">"%1$s shared this message since you were not in the room when it was sent."</string>
   <string name="crypto_history_visible">"This room has been configured so that new members can read history. %1$s"</string>
@@ -437,7 +481,6 @@ Are you sure you want to continue?"</string>
   <string name="dialog_video_quality_selector_subtitle_file_size">"The max file size allowed is: %1$s"</string>
   <string name="dialog_video_quality_selector_subtitle_no_file_size">"Select the quality of the video you want to upload."</string>
   <string name="dialog_video_quality_selector_title">"Select video upload quality"</string>
-  <string name="emoji_picker_search_placeholder">"Search emojis"</string>
   <string name="error_account_already_logged_in">"You\'re already logged in on this device as %1$s."</string>
   <string name="error_account_creation_not_possible">"Your homeserver needs to be upgraded to support Matrix Authentication Service and account creation."</string>
   <string name="error_failed_creating_the_permalink">"Failed creating the permalink"</string>
@@ -458,6 +501,9 @@ Are you sure you want to continue?"</string>
   <string name="error_unknown">"Sorry, an error occurred"</string>
   <string name="invite_friends_rich_title">"🔐️ Join me on %1$s"</string>
   <string name="invite_friends_text">"Hey, talk to me on %1$s: %2$s"</string>
+  <string name="live_location_sharing_foreground_service_channel_title_android">"Live Location Sharing"</string>
+  <string name="live_location_sharing_foreground_service_message_android">"Location sharing in progress"</string>
+  <string name="live_location_sharing_foreground_service_title_android">"%1$s Live Location"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake to report bug"</string>
   <string name="screen_bug_report_a11y_screenshot">"Screenshot"</string>
@@ -465,8 +511,17 @@ Are you sure you want to continue?"</string>
   <string name="screen_create_poll_options_section_title">"Options"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remove %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Settings"</string>
+  <string name="screen_create_poll_votes_allowed_per_person">"Votes allowed per person"</string>
+  <string name="screen_live_location_sheet_nobody_sharing">"Nobody is sharing their location"</string>
+  <string name="screen_live_location_sheet_sharing_live_location">"Sharing live location"</string>
+  <plurals name="screen_live_location_sheet_subtitle">
+    <item quantity="one">"%1$d person"</item>
+    <item quantity="other">"%1$d people"</item>
+  </plurals>
+  <string name="screen_live_location_sheet_title">"On the map"</string>
+  <string name="screen_local_network_opt_in_subtitle">"Your homeserver is on your local network. To connect, %1$s needs permission to reach devices on this network."</string>
+  <string name="screen_local_network_opt_in_title">"Allow access to local network"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
-  <string name="screen_onboarding_welcome_back">"Welcome back"</string>
   <string name="screen_pinned_timeline_empty_state_description">"Press on a message and choose “%1$s” to include here."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pin important messages so that they can be easily discovered"</string>
   <plurals name="screen_pinned_timeline_screen_title">
@@ -490,6 +545,7 @@ Are you sure you want to continue?"</string>
   <string name="screen_room_event_pill">"Message in %1$s"</string>
   <string name="screen_room_grouped_state_events_expand">"Expand"</string>
   <string name="screen_room_grouped_state_events_reduce">"Reduce"</string>
+  <string name="screen_room_live_location_banner">"Sharing live location"</string>
   <string name="screen_room_permalink_same_room_android">"Already viewing this room!"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s of %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Pinned messages"</string>
@@ -510,6 +566,10 @@ Are you sure you want to continue?"</string>
   <string name="screen_space_list_title">"Spaces"</string>
   <string name="screen_static_location_sheet_timestamp_description">"Shared %1$s"</string>
   <string name="screen_static_location_sheet_title">"On the map"</string>
+  <plurals name="screen_timeline_active_call_joined_count">
+    <item quantity="one">"%1$d joined"</item>
+    <item quantity="other">"%1$d joined"</item>
+  </plurals>
   <string name="screen_timeline_item_menu_send_failure_changed_identity">"Message not sent because %1$s’s verified digital identity was reset."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Message not sent because %1$s has not verified all devices."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Message not sent because you have not verified one or more of your devices."</string>
@@ -522,4 +582,6 @@ Are you sure you want to continue?"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"You don\'t have access to this message"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Unable to decrypt message"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"This message was blocked either because you did not verify your device or because the sender needs to verify your digital identity."</string>
+  <string name="vulkan_not_supported_dialog_content_android">"Your device is too old, a device with Android 8 or newer is required."</string>
+  <string name="vulkan_not_supported_dialog_title_android">"Rendering maps is not supported"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values/temporary.xml b/libraries/ui-strings/src/main/res/values/temporary.xml
new file mode 100644
index 0000000000..c704e811ff
--- /dev/null
+++ b/libraries/ui-strings/src/main/res/values/temporary.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2026 Element Creations Ltd.
+  ~
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+  ~ Please see LICENSE files in the repository root for full details.
+  -->
+
+<resources>
+    <string name="a11y_state_expanded">"Expanded"</string>
+    <string name="a11y_state_collapsed">"Collapsed"</string>
+    <string name="a11y_active">Active</string>
+    <string name="a11y_inactive">Inactive</string>
+</resources>
diff --git a/libraries/ui-utils/build.gradle.kts b/libraries/ui-utils/build.gradle.kts
index a0144fbc27..f1423107db 100644
--- a/libraries/ui-utils/build.gradle.kts
+++ b/libraries/ui-utils/build.gradle.kts
@@ -19,6 +19,7 @@ android {
 dependencies {
     implementation(projects.libraries.androidutils)
     implementation(projects.services.toolbox.impl)
+    implementation(libs.androidx.compose.ui.text)
 
     testCommonDependencies(libs)
 }
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/HasExternalKeyboard.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/HasExternalKeyboard.kt
new file mode 100644
index 0000000000..ed35cfbc3e
--- /dev/null
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/HasExternalKeyboard.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.utils.a11y
+
+import android.app.Activity
+import android.app.Application
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+
+@Composable
+fun hasExternalKeyboard(): Boolean {
+    val activity = requireNotNull(LocalActivity.current)
+    var hasExternalKeyboard by remember { mutableStateOf(activity.resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS) }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        DisposableEffect(Unit) {
+            val callback = object : Application.ActivityLifecycleCallbacks {
+                override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+                override fun onActivityStarted(activity: Activity) {}
+                override fun onActivityResumed(activity: Activity) {
+                    // We do not have access to onActivityConfigurationChanged, so update the value when tha Activity is resumed
+                    hasExternalKeyboard = activity.resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS
+                }
+
+                override fun onActivityPaused(activity: Activity) {}
+                override fun onActivityStopped(activity: Activity) {}
+                override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+                override fun onActivityDestroyed(activity: Activity) {}
+            }
+            activity.registerActivityLifecycleCallbacks(callback)
+            onDispose {
+                activity.unregisterActivityLifecycleCallbacks(callback)
+            }
+        }
+    }
+    return hasExternalKeyboard
+}
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/IsTalkbackEnabled.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/IsTalkbackEnabled.kt
similarity index 96%
rename from libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/IsTalkbackEnabled.kt
rename to libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/IsTalkbackEnabled.kt
index 60ac1887c6..938a774355 100644
--- a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/time/IsTalkbackEnabled.kt
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/a11y/IsTalkbackEnabled.kt
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.ui.utils.time
+package io.element.android.libraries.ui.utils.a11y
 
 import android.view.accessibility.AccessibilityManager
 import androidx.compose.runtime.Composable
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/strings/Plurals.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/strings/Plurals.kt
new file mode 100644
index 0000000000..fe927e725d
--- /dev/null
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/strings/Plurals.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.utils.strings
+
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.res.stringResource
+
+/**
+ * Similar to [androidx.compose.ui.res.pluralStringResource] but with separate resource ids for singular and plural values.
+ * Useful when we want to use different strings for singular and plural forms but not mentioning the actual quantity in the string.
+ * In this case, we cannot use getQuantityString, because some locales have more than two plural forms, and require the quantity to
+ * be part of the resulting strings.
+ * @param resIdForOne Resource id for the case when [count] is 1.
+ * @param resIdForOthers Resource id for the other cases ([count] is not 1).
+ * @param count The quantity to determine whether to use singular or plural form. Must be greater than or equal to 1.
+ * @param formatArgs The format arguments that will be used for substitution in the resulting string. Will be applied to either
+ * the singular or plural string depending on the quantity.
+ * @return The localized string corresponding to the given quantity.
+ */
+@Composable
+@ReadOnlyComposable
+fun simplePluralStringResource(
+    @StringRes resIdForOne: Int,
+    @StringRes resIdForOthers: Int,
+    count: Int,
+    vararg formatArgs: Any,
+): String {
+    val resId = if (count == 1) resIdForOne else resIdForOthers
+    return stringResource(resId, *formatArgs)
+}
diff --git a/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/text/TextDirection.kt b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/text/TextDirection.kt
new file mode 100644
index 0000000000..33c01cb8ff
--- /dev/null
+++ b/libraries/ui-utils/src/main/kotlin/io/element/android/libraries/ui/utils/text/TextDirection.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.utils.text
+
+import androidx.compose.ui.text.style.TextDirection
+
+/**
+ * Detect if a text is RTL or not, based on its content.
+ */
+fun TextDirection.Companion.detect(text: String): TextDirection {
+    return if (text.any(::isRtlChar)) TextDirection.Rtl else TextDirection.Ltr
+}
+
+/**
+ * Detect if a character is an RTL character or not, based on its Unicode directionality.
+ */
+fun isRtlChar(char: Char): Boolean = when (Character.getDirectionality(char)) {
+    Character.DIRECTIONALITY_RIGHT_TO_LEFT,
+    Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC,
+    Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING,
+    Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE -> true
+    else -> false
+}
diff --git a/libraries/voiceplayer/api/build.gradle.kts b/libraries/voiceplayer/api/build.gradle.kts
index f37c263d83..e058210b7d 100644
--- a/libraries/voiceplayer/api/build.gradle.kts
+++ b/libraries/voiceplayer/api/build.gradle.kts
@@ -16,5 +16,6 @@ android {
 dependencies {
     implementation(libs.androidx.annotationjvm)
     implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
 }
diff --git a/libraries/voiceplayer/impl/build.gradle.kts b/libraries/voiceplayer/impl/build.gradle.kts
index 4aa00e188b..8fe79fb774 100644
--- a/libraries/voiceplayer/impl/build.gradle.kts
+++ b/libraries/voiceplayer/impl/build.gradle.kts
@@ -21,6 +21,7 @@ setupDependencyInjection()
 dependencies {
     api(projects.libraries.voiceplayer.api)
 
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.audio.api)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
diff --git a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessageMediaRepoTest.kt b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessageMediaRepoTest.kt
index 5df259fb5b..fad530a3e8 100644
--- a/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessageMediaRepoTest.kt
+++ b/libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessageMediaRepoTest.kt
@@ -32,6 +32,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -76,6 +79,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -98,6 +104,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -128,10 +137,13 @@ class DefaultVoiceMessageMediaRepoTest {
 private fun createDefaultVoiceMessageMediaRepo(
     temporaryFolder: TemporaryFolder,
     matrixMediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
+    mxcUri2FilePathResult: (String) -> String? = { null },
     mxcUri: String = MXC_URI,
 ) = DefaultVoiceMessageMediaRepo(
     cacheDir = temporaryFolder.root,
-    mxcTools = FakeMxcTools(),
+    mxcTools = FakeMxcTools(
+        mxcUri2FilePathResult = mxcUri2FilePathResult,
+    ),
     matrixMediaLoader = matrixMediaLoader,
     mediaSource = MediaSource(
         url = mxcUri,
diff --git a/libraries/matrix/api/src/main/AndroidManifest.xml b/libraries/voicerecorder/impl/src/main/AndroidManifest.xml
similarity index 75%
rename from libraries/matrix/api/src/main/AndroidManifest.xml
rename to libraries/voicerecorder/impl/src/main/AndroidManifest.xml
index 608f16cc36..ed135aef7a 100644
--- a/libraries/matrix/api/src/main/AndroidManifest.xml
+++ b/libraries/voicerecorder/impl/src/main/AndroidManifest.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2025 Element Creations Ltd.
-  ~ Copyright 2022 New Vector Ltd.
+  ~ Copyright 2023 New Vector Ltd.
   ~
   ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 </manifest>
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt
index 9d471f7a6d..9d41b0da92 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt
@@ -9,7 +9,6 @@
 package io.element.android.libraries.voicerecorder.impl.audio
 
 import dev.zacsweers.metro.ContributesBinding
-import dev.zacsweers.metro.Provider
 import io.element.android.libraries.di.RoomScope
 import io.element.android.opusencoder.OggOpusEncoder
 import timber.log.Timber
@@ -20,7 +19,7 @@ import java.io.File
  */
 @ContributesBinding(RoomScope::class)
 class DefaultEncoder(
-    private val encoderProvider: Provider<OggOpusEncoder>,
+    private val encoderProvider: () -> OggOpusEncoder,
     config: AudioConfig,
 ) : Encoder {
     private val bitRate = config.bitRate
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphrase.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphrase.kt
new file mode 100644
index 0000000000..c7bc602dde
--- /dev/null
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphrase.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.api
+
+/**
+ * Server-driven settings for a user-chosen recovery passphrase, advertised under the well-known
+ * `custom_recovery_passphrase` key. Today the only rule is a minimum character count; additional
+ * settings can be added here as the schema grows.
+ */
+data class CustomRecoveryPassphrase(
+    val minCharacterCount: Int,
+) {
+    /** True when [input] meets every active rule. */
+    fun isSatisfiedBy(input: String): Boolean = isSatisfiedBy(input.length)
+
+    /** True when an input of [length] characters meets every active rule. */
+    fun isSatisfiedBy(length: Int): Boolean = length >= minCharacterCount
+}
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnown.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnown.kt
index 134a9bcdb5..a9c42b7121 100644
--- a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnown.kt
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnown.kt
@@ -14,4 +14,8 @@ data class ElementWellKnown(
     val rageshakeUrl: String?,
     val brandColor: String?,
     val notificationSound: String?,
+    val identityProviderAppScheme: String?,
+    val customRecoveryPassphrase: CustomRecoveryPassphrase?,
+    val contentScannerUrl: String?,
+    val forceDisableE2EE: Boolean?,
 )
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnownParser.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnownParser.kt
new file mode 100644
index 0000000000..db0a323a5f
--- /dev/null
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellKnownParser.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.api
+
+fun interface ElementWellKnownParser {
+    fun parse(json: String): Result<ElementWellKnown>
+}
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellknownStore.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellknownStore.kt
new file mode 100644
index 0000000000..80b2ab4c5e
--- /dev/null
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/ElementWellknownStore.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.api
+
+interface ElementWellknownStore {
+    suspend fun get(domain: String): WellknownRetrieverResult<ElementWellKnown>
+    suspend fun update(domain: String, wellknown: String): Result<Unit>
+    suspend fun delete(domain: String): Result<Unit>
+}
diff --git a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetrieverResult.kt b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetrieverResult.kt
index 3236f18660..fcc54df0b5 100644
--- a/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetrieverResult.kt
+++ b/libraries/wellknown/api/src/main/kotlin/io/element/android/libraries/wellknown/api/WellknownRetrieverResult.kt
@@ -14,6 +14,11 @@ sealed interface WellknownRetrieverResult<out T> {
      */
     data class Success<out T>(val data: T) : WellknownRetrieverResult<T>
 
+    /**
+     * Well-known data has been retrieved from the local cache but is outdated and a manual refresh has been launched.
+     */
+    data class Outdated<out T>(val data: T) : WellknownRetrieverResult<T>
+
     /**
      * Well-known data is not found (file does not exist server side, we got a 404).
      */
@@ -26,6 +31,7 @@ sealed interface WellknownRetrieverResult<out T> {
 
     fun dataOrNull(): T? = when (this) {
         is Success<T> -> data
+        is Outdated<T> -> data
         is Error -> null
         NotFound -> null
     }
diff --git a/libraries/wellknown/impl/build.gradle.kts b/libraries/wellknown/impl/build.gradle.kts
index f803eeec3c..6e7cc5ef1c 100644
--- a/libraries/wellknown/impl/build.gradle.kts
+++ b/libraries/wellknown/impl/build.gradle.kts
@@ -33,9 +33,15 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.network)
+    implementation(projects.libraries.cachestore.api)
+    implementation(projects.features.enterprise.api)
+    implementation(projects.services.toolbox.api)
 
     testCommonDependencies(libs)
     testImplementation(libs.coroutines.core)
+    testImplementation(projects.libraries.cachestore.test)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.wellknown.test)
+    testImplementation(projects.features.enterprise.test)
     testImplementation(projects.services.toolbox.test)
 }
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultElementWellKnownParser.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultElementWellKnownParser.kt
new file mode 100644
index 0000000000..4cf72366e0
--- /dev/null
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultElementWellKnownParser.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellKnownParser
+
+@ContributesBinding(AppScope::class)
+class DefaultElementWellKnownParser(
+    private val jsonProvider: JsonProvider,
+) : ElementWellKnownParser {
+    override fun parse(json: String): Result<ElementWellKnown> {
+        return runCatchingExceptions {
+            val decoder = jsonProvider()
+            decoder.decodeFromString<InternalElementWellKnown>(json).map()
+        }
+    }
+}
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
index 3bcf9bf573..66654dd228 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetriever.kt
@@ -9,30 +9,81 @@
 package io.element.android.libraries.wellknown.impl
 
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.core.extensions.mapCatchingExceptions
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellKnownParser
+import io.element.android.libraries.wellknown.api.ElementWellknownStore
 import io.element.android.libraries.wellknown.api.SessionWellknownRetriever
 import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @ContributesBinding(SessionScope::class)
 class DefaultSessionWellknownRetriever(
     private val matrixClient: MatrixClient,
-    private val json: JsonProvider,
+    @SessionCoroutineScope
+    private val sessionCoroutineScope: CoroutineScope,
+    private val elementWellknownStore: ElementWellknownStore,
+    private val elementWellKnownParser: ElementWellKnownParser,
+    private val enterpriseService: EnterpriseService,
 ) : SessionWellknownRetriever {
     private val domain by lazy { matrixClient.userIdServerName() }
 
     override suspend fun getElementWellKnown(): WellknownRetrieverResult<ElementWellKnown> {
-        val url = "https://$domain/.well-known/element/element.json"
+        val overriddenElementWellKnown = enterpriseService.overriddenElementWellKnown()
+        if (overriddenElementWellKnown != null) {
+            return WellknownRetrieverResult.Success(overriddenElementWellKnown)
+        }
+
+        val cacheData = elementWellknownStore.get(domain)
+        return when (cacheData) {
+            is WellknownRetrieverResult.Success -> {
+                Timber.d("Using cached well-known for domain $domain")
+                cacheData
+            }
+            is WellknownRetrieverResult.Outdated -> {
+                // Return the outdated data but refresh in the background
+                // If the cache is missing or outdated, trigger a refresh in background but still return the cached value
+                Timber.d("Outdated cached well-known for domain $domain, returning existing value and fetching new one from network")
+                sessionCoroutineScope.launch {
+                    val url = "https://$domain/.well-known/element/element.json"
+                    fetchElementWellKnown(url)
+                }
+                cacheData
+            }
+            is WellknownRetrieverResult.NotFound -> {
+                // Try to fetch from the server
+                Timber.d("No cached well-known for domain $domain, fetching from network")
+                val url = "https://$domain/.well-known/element/element.json"
+                fetchElementWellKnown(url)
+            }
+            is WellknownRetrieverResult.Error -> {
+                // Return the error
+                Timber.e(cacheData.exception, "Error retrieving well-known for domain $domain")
+                cacheData.exception.toWellknownRetrieverResult()
+            }
+        }
+    }
+
+    private suspend fun fetchElementWellKnown(url: String): WellknownRetrieverResult<ElementWellKnown> {
         return matrixClient
             .getUrl(url)
             .mapCatchingExceptions {
                 val data = String(it)
-                json().decodeFromString<InternalElementWellKnown>(data).map()
+                val parsed = elementWellKnownParser.parse(data).getOrThrow()
+                // Also store in cache, if valid
+                elementWellknownStore.update(domain, data)
+                    .onFailure { exception ->
+                        Timber.e(exception, "Failed to parse cached Element .well-known data for $domain, deleting cache")
+                        elementWellknownStore.delete(domain)
+                    }
+                parsed
             }
             .toWellknownRetrieverResult()
     }
@@ -44,11 +95,15 @@ class DefaultSessionWellknownRetriever(
         onFailure = {
             Timber.e(it, "Failed to retrieve Element .well-known from $domain")
             // This check on message value is not ideal but this is what we got from the SDK.
-            if ((it as? ClientException.Generic)?.message?.contains("404") == true) {
-                WellknownRetrieverResult.NotFound
-            } else {
-                WellknownRetrieverResult.Error(it as Exception)
-            }
+            it.toWellknownRetrieverResult()
         }
     )
+
+    private fun <T> Throwable.toWellknownRetrieverResult(): WellknownRetrieverResult<T> {
+        return if ((this as? ClientException.Generic)?.message?.contains("404") == true) {
+            WellknownRetrieverResult.NotFound
+        } else {
+            WellknownRetrieverResult.Error(this as Exception)
+        }
+    }
 }
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStore.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStore.kt
new file mode 100644
index 0000000000..50c8caeafc
--- /dev/null
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStore.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.impl
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.cachestore.api.CacheStore
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellKnownParser
+import io.element.android.libraries.wellknown.api.ElementWellknownStore
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import io.element.android.services.toolbox.api.systemclock.SystemClock
+
+@ContributesBinding(AppScope::class)
+class DefaultWellKnownStore(
+    private val cacheStore: CacheStore,
+    private val elementWellKnownParser: ElementWellKnownParser,
+    private val systemClock: SystemClock,
+) : ElementWellknownStore {
+    override suspend fun get(domain: String): WellknownRetrieverResult<ElementWellKnown> {
+        return runCatchingExceptions {
+            val cachedData = cacheStore.getData(key(domain))
+            if (cachedData != null) {
+                val data = elementWellKnownParser.parse(cachedData.value).getOrThrow()
+                if (systemClock.epochMillis() > cachedData.updatedAt + CACHE_VALIDITY_MILLIS) {
+                    WellknownRetrieverResult.Outdated(data)
+                } else {
+                    WellknownRetrieverResult.Success(data)
+                }
+            } else {
+                WellknownRetrieverResult.NotFound
+            }
+        }.recover {
+            WellknownRetrieverResult.Error(it as Exception)
+        }.getOrThrow()
+    }
+
+    override suspend fun update(domain: String, wellknown: String): Result<Unit> {
+        return runCatchingExceptions {
+            cacheStore.storeData(key(domain), CacheData(wellknown, systemClock.epochMillis()))
+        }
+    }
+
+    override suspend fun delete(domain: String): Result<Unit> {
+        return runCatchingExceptions {
+            cacheStore.deleteData(key(domain))
+        }
+    }
+
+    private fun key(domain: String): String = "https://$domain/.well-known/element/element.json"
+
+    companion object {
+        // 1 day
+        private const val CACHE_VALIDITY_MILLIS = 1 * 24 * 60 * 60 * 1000L
+    }
+}
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetriever.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetriever.kt
index 02dae72a43..10f668cfb0 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetriever.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetriever.kt
@@ -10,26 +10,41 @@ package io.element.android.libraries.wellknown.impl
 
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
+import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.libraries.androidutils.json.JsonProvider
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.network.RetrofitFactory
 import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellknownStore
 import io.element.android.libraries.wellknown.api.WellknownRetriever
 import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
 import retrofit2.HttpException
 import timber.log.Timber
 import java.net.HttpURLConnection
+import java.net.URL
 
 @ContributesBinding(AppScope::class)
 class DefaultWellknownRetriever(
     private val retrofitFactory: RetrofitFactory,
+    private val elementWellknownStore: ElementWellknownStore,
+    private val jsonProvider: JsonProvider,
+    private val enterpriseService: EnterpriseService,
 ) : WellknownRetriever {
     override suspend fun getElementWellKnown(baseUrl: String): WellknownRetrieverResult<ElementWellKnown> {
+        val overriddenElementWellKnown = enterpriseService.overriddenElementWellKnown()
+        if (overriddenElementWellKnown != null) {
+            return WellknownRetrieverResult.Success(overriddenElementWellKnown)
+        }
+
+        val domain = URL(baseUrl).host
         return buildWellknownApi(baseUrl)
             .map { wellknownApi ->
                 try {
-                    val result = wellknownApi.getElementWellKnown().map()
-                    WellknownRetrieverResult.Success(result)
+                    val json = jsonProvider()
+                    val result = wellknownApi.getElementWellKnown()
+                    elementWellknownStore.update(domain, json.encodeToString(result))
+                    WellknownRetrieverResult.Success(result.map())
                 } catch (e: Exception) {
                     // Is it a 404?
                     Timber.e(e, "Failed to retrieve Element well-known data for $baseUrl")
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalElementWellKnown.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalElementWellKnown.kt
index d4661d1be0..c585264f55 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalElementWellKnown.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/InternalElementWellKnown.kt
@@ -15,7 +15,15 @@ import kotlinx.serialization.Serializable
  * Example:
  * <pre>
  * {
- *     "registration_helper_url": "https://element.io"
+ *     "registration_helper_url": "https://element.io",
+ *     "enforce_element_pro": true,
+ *     "rageshake_url": "https://example.org/rageshake",
+ *     "brand_color": "#FF0000",
+ *     "notification_sound": "ring.flac",
+ *     "idp_app_scheme": "io.element.app",
+ *     "custom_recovery_passphrase": {
+ *         "min_character_count": 8
+ *     }
  * }
  * </pre>
  * .
@@ -32,4 +40,18 @@ data class InternalElementWellKnown(
     val brandColor: String? = null,
     @SerialName("notification_sound")
     val notificationSound: String? = null,
+    @SerialName("idp_app_scheme")
+    val identityProviderAppScheme: String? = null,
+    @SerialName("custom_recovery_passphrase")
+    val customRecoveryPassphrase: InternalCustomRecoveryPassphrase? = null,
+    @SerialName("content_scanner_url")
+    val contentScannerUrl: String? = null,
+    @SerialName("force_disable_e2ee")
+    val forceDisableE2EE: Boolean? = null,
+)
+
+@Serializable
+data class InternalCustomRecoveryPassphrase(
+    @SerialName("min_character_count")
+    val minCharacterCount: Int? = null,
 )
diff --git a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/Mapper.kt b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/Mapper.kt
index c7ca088e68..c4d15e7325 100644
--- a/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/Mapper.kt
+++ b/libraries/wellknown/impl/src/main/kotlin/io/element/android/libraries/wellknown/impl/Mapper.kt
@@ -8,12 +8,43 @@
 
 package io.element.android.libraries.wellknown.impl
 
+import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.wellknown.api.CustomRecoveryPassphrase
 import io.element.android.libraries.wellknown.api.ElementWellKnown
+import timber.log.Timber
 
-internal fun InternalElementWellKnown.map() = ElementWellKnown(
+private val loggerTag = LoggerTag("Wellknown")
+
+/**
+ * Floor for the recovery passphrase minimum length. A value of 1 guarantees the derived passphrase is
+ * never empty (an empty passphrase derives a recoverable but effectively unprotected secret-storage
+ * key). Anything stronger than non-empty is left to the homeserver operator's configuration.
+ */
+private const val MINIMUM_PASSPHRASE_CHARACTER_COUNT = 1
+
+fun InternalElementWellKnown.map() = ElementWellKnown(
     registrationHelperUrl = registrationHelperUrl,
     enforceElementPro = enforceElementPro,
     rageshakeUrl = rageshakeUrl,
     brandColor = brandColor,
     notificationSound = notificationSound,
+    identityProviderAppScheme = identityProviderAppScheme,
+    customRecoveryPassphrase = customRecoveryPassphrase?.toPublic(),
+    contentScannerUrl = contentScannerUrl,
+    forceDisableE2EE = forceDisableE2EE,
 )
+
+private fun InternalCustomRecoveryPassphrase.toPublic(): CustomRecoveryPassphrase {
+    // Whenever the homeserver advertises the settings block we run the custom passphrase flow, flooring
+    // the minimum at 1 so the passphrase can never be empty even if the server omits min_character_count
+    // or advertises a non-positive value. The operator owns any stronger minimum.
+    val min = (minCharacterCount ?: MINIMUM_PASSPHRASE_CHARACTER_COUNT).coerceAtLeast(MINIMUM_PASSPHRASE_CHARACTER_COUNT)
+    if (min != minCharacterCount) {
+        Timber.tag(loggerTag.value).w(
+            "custom_recovery_passphrase.min_character_count was %s; flooring to %d",
+            minCharacterCount,
+            min,
+        )
+    }
+    return CustomRecoveryPassphrase(minCharacterCount = min)
+}
diff --git a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphraseTest.kt b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphraseTest.kt
new file mode 100644
index 0000000000..d4e7ac112e
--- /dev/null
+++ b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/api/CustomRecoveryPassphraseTest.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.api
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class CustomRecoveryPassphraseTest {
+    @Test
+    fun `empty input never satisfies a positive minimum`() {
+        assertThat(CustomRecoveryPassphrase(minCharacterCount = 1).isSatisfiedBy("")).isFalse()
+    }
+
+    @Test
+    fun `input shorter than minimum is not satisfied`() {
+        assertThat(CustomRecoveryPassphrase(minCharacterCount = 8).isSatisfiedBy("abc")).isFalse()
+    }
+
+    @Test
+    fun `input exactly at minimum is satisfied`() {
+        assertThat(CustomRecoveryPassphrase(minCharacterCount = 8).isSatisfiedBy("abcdefgh")).isTrue()
+    }
+
+    @Test
+    fun `input longer than minimum is satisfied`() {
+        assertThat(CustomRecoveryPassphrase(minCharacterCount = 4).isSatisfiedBy("abcdefgh")).isTrue()
+    }
+}
diff --git a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
index faad139a36..f54cf919d9 100644
--- a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
+++ b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultSessionWellknownRetrieverTest.kt
@@ -6,16 +6,28 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
 package io.element.android.libraries.wellknown.impl
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.features.wellknown.test.FakeElementWellknownStore
+import io.element.android.features.wellknown.test.anElementWellKnown
 import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.wellknown.api.CustomRecoveryPassphrase
 import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellKnownParser
 import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -36,6 +48,10 @@ class DefaultSessionWellknownRetrieverTest {
                     rageshakeUrl = null,
                     brandColor = null,
                     notificationSound = null,
+                    identityProviderAppScheme = null,
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = null,
+                    forceDisableE2EE = null,
                 )
             )
         )
@@ -48,13 +64,7 @@ class DefaultSessionWellknownRetrieverTest {
         val sut = createDefaultSessionWellknownRetriever(
             getUrlLambda = {
                 Result.success(
-                    """{
-                    "registration_helper_url": "a_registration_url",
-                    "enforce_element_pro": true,
-                    "rageshake_url": "a_rageshake_url",
-                    "brand_color": "#FF0000",
-                    "notification_sound": "a_notification_sound.flac"
-                }""".trimIndent().toByteArray()
+                    WELLKNOWN_CONTENT.toByteArray()
                 )
             }
         )
@@ -66,6 +76,10 @@ class DefaultSessionWellknownRetrieverTest {
                     rageshakeUrl = "a_rageshake_url",
                     brandColor = "#FF0000",
                     notificationSound = "a_notification_sound.flac",
+                    identityProviderAppScheme = "an_app_scheme",
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = "https://content-scanner.example.com",
+                    forceDisableE2EE = false,
                 )
             )
         )
@@ -80,7 +94,8 @@ class DefaultSessionWellknownRetrieverTest {
                     "registration_helper_url": "a_registration_url",
                     "enforce_element_pro": true,
                     "rageshake_url": "a_rageshake_url",
-                    "other": true
+                    // Note the trailing comma, and the comment!
+                    "other": true,
                 }""".trimIndent().toByteArray()
                 )
             },
@@ -93,6 +108,96 @@ class DefaultSessionWellknownRetrieverTest {
                     rageshakeUrl = "a_rageshake_url",
                     brandColor = null,
                     notificationSound = null,
+                    identityProviderAppScheme = null,
+                    contentScannerUrl = null,
+                    customRecoveryPassphrase = null,
+                    forceDisableE2EE = null,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with custom recovery passphrase settings`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success(
+                    """{
+                    "custom_recovery_passphrase": {
+                        "min_character_count": 8
+                    }
+                }""".trimIndent().toByteArray()
+                )
+            },
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 8)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with custom recovery passphrase settings missing min character count floors to 1`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success(
+                    """{
+                    "custom_recovery_passphrase": {}
+                }""".trimIndent().toByteArray()
+                )
+            },
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with zero min character count floors to 1`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success(
+                    """{
+                    "custom_recovery_passphrase": {
+                        "min_character_count": 0
+                    }
+                }""".trimIndent().toByteArray()
+                )
+            },
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with negative min character count floors to 1`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success(
+                    """{
+                    "custom_recovery_passphrase": {
+                        "min_character_count": -5
+                    }
+                }""".trimIndent().toByteArray()
+                )
+            },
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
                 )
             )
         )
@@ -123,13 +228,149 @@ class DefaultSessionWellknownRetrieverTest {
         assertThat(sut.getElementWellKnown()).isInstanceOf(WellknownRetrieverResult.Error::class.java)
     }
 
-    private fun createDefaultSessionWellknownRetriever(
+    @Test
+    fun `get element wellknown 404 http error counts as not found`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.failure(ClientException.Generic("Not Found: 404 status code", "The file could not be found"))
+            }
+        )
+        assertThat(sut.getElementWellKnown()).isInstanceOf(WellknownRetrieverResult.NotFound::class.java)
+    }
+
+    @Test
+    fun `get element wellknown hitting cache`() = runTest {
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = { lambdaError() },
+            cacheStore = FakeElementWellknownStore(
+                initialData = mapOf(
+                    WELLKNOWN_URL to WellknownRetrieverResult.Success(parsedWellKnownContent())
+                )
+            )
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = "#FF0000",
+                    notificationSound = "a_notification_sound.flac",
+                    identityProviderAppScheme = "an_app_scheme",
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = "https://content-scanner.example.com",
+                    forceDisableE2EE = false,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown hitting cache containing invalid json`() = runTest {
+        val cacheStore = FakeElementWellknownStore(
+            initialData = mapOf(
+                WELLKNOWN_URL to WellknownRetrieverResult.Error(IllegalStateException("Invalid JSON"))
+            )
+        )
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success("{}".toByteArray())
+            },
+            cacheStore = cacheStore,
+            elementWellKnownParser = { Result.failure(IllegalStateException("Failed to parse JSON")) }
+        )
+        assertThat(sut.getElementWellKnown()).isInstanceOf(WellknownRetrieverResult.Error::class.java)
+        // Ensure that the cache is deleted after the failure to parse it
+        assertThat(cacheStore.get(WELLKNOWN_URL)).isEqualTo(WellknownRetrieverResult.NotFound)
+    }
+
+    @Test
+    fun `get element wellknown hitting outdated cache`() = runTest {
+        val cacheStore = FakeElementWellknownStore(
+            initialData = mapOf(
+                WELLKNOWN_URL to WellknownRetrieverResult.Outdated(parsedWellKnownContent()),
+            )
+        )
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = {
+                Result.success("{}".toByteArray())
+            },
+            cacheStore = cacheStore,
+        )
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Outdated(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = "#FF0000",
+                    notificationSound = "a_notification_sound.flac",
+                    identityProviderAppScheme = "an_app_scheme",
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = "https://content-scanner.example.com",
+                    forceDisableE2EE = false,
+                )
+            )
+        )
+        // Next call returns the updated value
+        runCurrent()
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown()
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown was overridden`() = runTest {
+        val getLambda = lambdaRecorder<String, Result<ByteArray>> { Result.failure(IllegalStateException("BOOM")) }
+        val wellKnown = anElementWellKnown()
+
+        val sut = createDefaultSessionWellknownRetriever(
+            getUrlLambda = getLambda,
+            enterpriseService = FakeEnterpriseService(
+                overrideWellKnownResult = { wellKnown }
+            )
+        )
+
+        // The overridden value is returned
+        assertThat(sut.getElementWellKnown()).isEqualTo(
+            WellknownRetrieverResult.Success(wellKnown)
+        )
+
+        // And the endpoint is never hit
+        getLambda.assertions().isNeverCalled()
+    }
+
+    private fun parsedWellKnownContent() = DefaultJsonProvider().invoke().decodeFromString<InternalElementWellKnown>(WELLKNOWN_CONTENT).map()
+
+    private fun TestScope.createDefaultSessionWellknownRetriever(
+        cacheStore: FakeElementWellknownStore = FakeElementWellknownStore(),
         getUrlLambda: (String) -> Result<ByteArray>,
+        elementWellKnownParser: ElementWellKnownParser = DefaultElementWellKnownParser(DefaultJsonProvider()),
+        enterpriseService: FakeEnterpriseService = FakeEnterpriseService(overrideWellKnownResult = { null }),
     ) = DefaultSessionWellknownRetriever(
         matrixClient = FakeMatrixClient(
             userIdServerNameLambda = { "user.domain.org" },
             getUrlLambda = getUrlLambda,
         ),
-        json = DefaultJsonProvider(),
+        sessionCoroutineScope = backgroundScope,
+        elementWellknownStore = cacheStore,
+        elementWellKnownParser = elementWellKnownParser,
+        enterpriseService = enterpriseService,
     )
+
+    companion object {
+        private const val WELLKNOWN_URL = "https://user.domain.org/.well-known/element/element.json"
+        private const val WELLKNOWN_CONTENT = """{
+                "registration_helper_url": "a_registration_url",
+                "enforce_element_pro": true,
+                "rageshake_url": "a_rageshake_url",
+                "brand_color": "#FF0000",
+                "notification_sound": "a_notification_sound.flac",
+                "idp_app_scheme": "an_app_scheme",
+                "content_scanner_url": "https://content-scanner.example.com",
+                "force_disable_e2ee": false,
+            }"""
+    }
 }
diff --git a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStoreTest.kt b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStoreTest.kt
new file mode 100644
index 0000000000..b53041faf8
--- /dev/null
+++ b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellKnownStoreTest.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.wellknown.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.wellknown.test.anElementWellKnown
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.cachestore.api.CacheData
+import io.element.android.libraries.sessionstorage.test.InMemoryCacheStore
+import io.element.android.libraries.wellknown.api.CustomRecoveryPassphrase
+import io.element.android.libraries.wellknown.api.ElementWellKnownParser
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
+import io.element.android.services.toolbox.test.systemclock.FakeSystemClock
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+private const val A_DOMAIN = "matrix.example.com"
+private const val A_CACHE_KEY = "https://$A_DOMAIN/.well-known/element/element.json"
+
+// 1 day in millis
+private const val CACHE_VALIDITY_MILLIS = 1 * 24 * 60 * 60 * 1000L
+
+class DefaultWellKnownStoreTest {
+    private val jsonProvider = DefaultJsonProvider()
+
+    @Test
+    fun `get returns NotFound when cache is empty`() = runTest {
+        val sut = createDefaultWellKnownStore()
+        assertThat(sut.get(A_DOMAIN)).isEqualTo(WellknownRetrieverResult.NotFound)
+    }
+
+    @Test
+    fun `get returns Success when cache has fresh data`() = runTest {
+        val wellKnown = InternalElementWellKnown(rageshakeUrl = "https://rageshake.example.com")
+        val jsonString = jsonProvider().encodeToString(wellKnown)
+        val clock = FakeSystemClock(epochMillisResult = A_FAKE_TIMESTAMP)
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf(A_CACHE_KEY to CacheData(jsonString, A_FAKE_TIMESTAMP))
+        )
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore, systemClock = clock)
+
+        val result = sut.get(A_DOMAIN)
+
+        assertThat(result).isEqualTo(WellknownRetrieverResult.Success(wellKnown.map()))
+    }
+
+    @Test
+    fun `get returns Outdated when cached data has expired`() = runTest {
+        val wellKnown = InternalElementWellKnown(rageshakeUrl = "https://rageshake.example.com")
+        val jsonString = jsonProvider().encodeToString(wellKnown)
+        // Store data at timestamp 0, but clock is past the validity window
+        val expiredTimestamp = 0L
+        val nowTimestamp = expiredTimestamp + CACHE_VALIDITY_MILLIS + 1
+        val clock = FakeSystemClock(epochMillisResult = nowTimestamp)
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf(A_CACHE_KEY to CacheData(jsonString, expiredTimestamp))
+        )
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore, systemClock = clock)
+
+        val result = sut.get(A_DOMAIN)
+
+        assertThat(result).isEqualTo(WellknownRetrieverResult.Outdated(wellKnown.map()))
+    }
+
+    @Test
+    fun `get returns Error when cached data is invalid JSON`() = runTest {
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf(A_CACHE_KEY to CacheData("not valid json at all", A_FAKE_TIMESTAMP))
+        )
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore)
+
+        val result = sut.get(A_DOMAIN)
+
+        assertThat(result).isInstanceOf(WellknownRetrieverResult.Error::class.java)
+    }
+
+    @Test
+    fun `update stores data and get returns Success`() = runTest {
+        val wellKnown = """
+            {
+                "registration_helper_url": "https://element.io",
+                "enforce_element_pro": true,
+                "rageshake_url": "https://example.org/rageshake",
+                "brand_color": "#FF0000",
+                "notification_sound": "ring.flac",
+                "idp_app_scheme": "io.element.app",
+                "custom_recovery_passphrase": {
+                    "min_character_count": 8
+                }
+            }
+        """.trimIndent()
+        val clock = FakeSystemClock(epochMillisResult = A_FAKE_TIMESTAMP)
+        val cacheStore = InMemoryCacheStore()
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore, systemClock = clock)
+
+        val updateResult = sut.update(A_DOMAIN, wellKnown)
+        assertThat(updateResult.isSuccess).isTrue()
+
+        val result = sut.get(A_DOMAIN)
+        assertThat(result).isEqualTo(WellknownRetrieverResult.Success(anElementWellKnown(
+            registrationHelperUrl = "https://element.io",
+            enforceElementPro = true,
+            rageshakeUrl = "https://example.org/rageshake",
+            brandColor = "#FF0000",
+            notificationSound = "ring.flac",
+            identityProviderAppScheme = "io.element.app",
+            customRecoveryPassphrase = CustomRecoveryPassphrase(8),
+        )))
+    }
+
+    @Test
+    fun `delete removes data and get returns NotFound`() = runTest {
+        val wellKnown = InternalElementWellKnown(rageshakeUrl = "https://rageshake.example.com")
+        val jsonString = jsonProvider().encodeToString(wellKnown)
+        val clock = FakeSystemClock(epochMillisResult = A_FAKE_TIMESTAMP)
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf(A_CACHE_KEY to CacheData(jsonString, A_FAKE_TIMESTAMP))
+        )
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore, systemClock = clock)
+
+        val deleteResult = sut.delete(A_DOMAIN)
+        assertThat(deleteResult.isSuccess).isTrue()
+
+        assertThat(sut.get(A_DOMAIN)).isEqualTo(WellknownRetrieverResult.NotFound)
+    }
+
+    @Test
+    fun `get returns data at the exact cache validity boundary as Success`() = runTest {
+        val wellKnown = InternalElementWellKnown(notificationSound = "ping.flac")
+        val jsonString = jsonProvider().encodeToString(wellKnown)
+        // Exactly at the boundary: epochMillis == updatedAt + CACHE_VALIDITY_MILLIS → not expired
+        val storedAt = 1000L
+        val nowAtBoundary = storedAt + CACHE_VALIDITY_MILLIS
+        val clock = FakeSystemClock(epochMillisResult = nowAtBoundary)
+        val cacheStore = InMemoryCacheStore(
+            initialData = mapOf(A_CACHE_KEY to CacheData(jsonString, storedAt))
+        )
+        val sut = createDefaultWellKnownStore(cacheStore = cacheStore, systemClock = clock)
+
+        val result = sut.get(A_DOMAIN)
+
+        assertThat(result).isEqualTo(WellknownRetrieverResult.Success(wellKnown.map()))
+    }
+
+    private fun createDefaultWellKnownStore(
+        cacheStore: InMemoryCacheStore = InMemoryCacheStore(),
+        systemClock: FakeSystemClock = FakeSystemClock(),
+        elementWellKnownParser: ElementWellKnownParser = DefaultElementWellKnownParser(jsonProvider),
+    ) = DefaultWellKnownStore(
+        cacheStore = cacheStore,
+        systemClock = systemClock,
+        elementWellKnownParser = elementWellKnownParser,
+    )
+}
diff --git a/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetrieverTest.kt b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetrieverTest.kt
new file mode 100644
index 0000000000..96ae4c2b17
--- /dev/null
+++ b/libraries/wellknown/impl/src/test/kotlin/io/element/android/libraries/wellknown/impl/DefaultWellknownRetrieverTest.kt
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalCoroutinesApi::class)
+
+package io.element.android.libraries.wellknown.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.features.wellknown.test.FakeElementWellknownStore
+import io.element.android.features.wellknown.test.anElementWellKnown
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.libraries.network.RetrofitFactory
+import io.element.android.libraries.wellknown.api.CustomRecoveryPassphrase
+import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import okhttp3.Call
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.toResponseBody
+import okio.IOException
+import org.junit.Test
+import java.net.PortUnreachableException
+
+class DefaultWellknownRetrieverTest {
+    @Test
+    fun `get empty element wellknown`() = runTest {
+        val mockCall = mockCall(defaultResponse(body = "{}"))
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall },
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = null,
+                    enforceElementPro = null,
+                    rageshakeUrl = null,
+                    brandColor = null,
+                    notificationSound = null,
+                    identityProviderAppScheme = null,
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = null,
+                    forceDisableE2EE = null,
+                )
+            )
+        )
+        verify(exactly = 1) { mockCall.enqueue(any()) }
+    }
+
+    @Test
+    fun `get element wellknown with full content`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall(defaultResponse()) }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = "#FF0000",
+                    notificationSound = "a_notification_sound.flac",
+                    identityProviderAppScheme = "an_app_scheme",
+                    customRecoveryPassphrase = null,
+                    contentScannerUrl = "https://content-scanner.example.com",
+                    forceDisableE2EE = false,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with unknown key`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = {
+                mockCall(defaultResponse(body = """{
+                    "registration_helper_url": "a_registration_url",
+                    "enforce_element_pro": true,
+                    "rageshake_url": "a_rageshake_url",
+                    // Note the trailing comma, and the comment!
+                    "other": true,
+                }""".trimIndent()))
+            }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                ElementWellKnown(
+                    registrationHelperUrl = "a_registration_url",
+                    enforceElementPro = true,
+                    rageshakeUrl = "a_rageshake_url",
+                    brandColor = null,
+                    notificationSound = null,
+                    identityProviderAppScheme = null,
+                    contentScannerUrl = null,
+                    customRecoveryPassphrase = null,
+                    forceDisableE2EE = null,
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with custom recovery passphrase settings`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = {
+                mockCall(defaultResponse(body = """{
+                    "custom_recovery_passphrase": {
+                        "min_character_count": 8
+                    }
+                }""".trimIndent()))
+            }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 8)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with custom recovery passphrase settings missing min character count floors to 1`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = {
+                mockCall(defaultResponse(body = """{
+                    "custom_recovery_passphrase": {}
+                }""".trimIndent()))
+            }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with zero min character count floors to 1`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = {
+                mockCall(
+                    defaultResponse(
+                        body = """{
+                            "custom_recovery_passphrase": {
+                                "min_character_count": 0
+                            }
+                        }""".trimIndent()
+                    )
+                )
+            }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown with negative min character count floors to 1`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = {
+                mockCall(
+                    defaultResponse(
+                        body = """{
+                            "custom_recovery_passphrase": {
+                                "min_character_count": -5
+                            }
+                        }""".trimIndent()
+                    )
+                )
+            }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(
+                anElementWellKnown(
+                    customRecoveryPassphrase = CustomRecoveryPassphrase(minCharacterCount = 1)
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `get element wellknown json error`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall(defaultResponse(status = 500)) }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isInstanceOf(WellknownRetrieverResult.Error::class.java)
+    }
+
+    @Test
+    fun `get element wellknown network error`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall(error = PortUnreachableException()) }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isInstanceOf(WellknownRetrieverResult.Error::class.java)
+    }
+
+    @Test
+    fun `get element wellknown 404 http error counts as not found`() = runTest {
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall(defaultResponse(status = 404)) }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isInstanceOf(WellknownRetrieverResult.NotFound::class.java)
+    }
+
+    @Test
+    fun `get element wellknown hitting cache containing invalid json`() = runTest {
+        val cacheStore = FakeElementWellknownStore(
+            initialData = mapOf(
+                WELLKNOWN_URL to WellknownRetrieverResult.Error(IllegalStateException("Invalid JSON"))
+            )
+        )
+        val sut = createDefaultWellknownRetriever(
+            callFactory = { mockCall(defaultResponse(body = "invalid json")) },
+            cacheStore = cacheStore,
+            jsonProvider = JsonProvider { error("Failed to parse JSON") }
+        )
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isInstanceOf(WellknownRetrieverResult.Error::class.java)
+        // Ensure that the cache is deleted after the failure to parse it
+        assertThat(cacheStore.get(WELLKNOWN_URL)).isEqualTo(WellknownRetrieverResult.NotFound)
+    }
+
+    @Test
+    fun `get element wellknown was overridden`() = runTest {
+        val getLambda = lambdaRecorder<Request, Call> { mockCall() }
+        val wellKnown = anElementWellKnown()
+
+        val sut = createDefaultWellknownRetriever(
+            callFactory = getLambda,
+            enterpriseService = FakeEnterpriseService(
+                overrideWellKnownResult = { wellKnown }
+            )
+        )
+
+        // The overridden value is returned
+        assertThat(sut.getElementWellKnown(WELLKNOWN_URL)).isEqualTo(
+            WellknownRetrieverResult.Success(wellKnown)
+        )
+
+        // And the endpoint is never hit
+        getLambda.assertions().isNeverCalled()
+    }
+
+    private fun defaultResponse(
+        body: String = WELLKNOWN_CONTENT,
+        status: Int = 200,
+    ) = Response.Builder()
+        .code(status)
+        .message("OK")
+        .protocol(okhttp3.Protocol.HTTP_1_1)
+        .request(Request.Builder().url(WELLKNOWN_URL).build())
+        .body(body.toByteArray().toResponseBody())
+        .build()
+
+    private fun createDefaultWellknownRetriever(
+        callFactory: Call.Factory = Call.Factory { _: Request -> mockCall(defaultResponse()) },
+        cacheStore: FakeElementWellknownStore = FakeElementWellknownStore(),
+        jsonProvider: JsonProvider = DefaultJsonProvider(),
+        enterpriseService: FakeEnterpriseService = FakeEnterpriseService(overrideWellKnownResult = { null }),
+    ) = DefaultWellknownRetriever(
+        retrofitFactory = RetrofitFactory(
+            callFactory = { callFactory },
+            json = { jsonProvider }
+        ),
+        jsonProvider = jsonProvider,
+        elementWellknownStore = cacheStore,
+        enterpriseService = enterpriseService,
+    )
+
+    companion object {
+        private const val WELLKNOWN_URL = "https://user.domain.org/.well-known/element/element.json"
+        private const val WELLKNOWN_CONTENT = """{
+                "registration_helper_url": "a_registration_url",
+                "enforce_element_pro": true,
+                "rageshake_url": "a_rageshake_url",
+                "brand_color": "#FF0000",
+                "notification_sound": "a_notification_sound.flac",
+                "idp_app_scheme": "an_app_scheme",
+                "content_scanner_url": "https://content-scanner.example.com",
+                "force_disable_e2ee": false
+            }"""
+    }
+}
+
+private fun mockCall(
+    response: Response? = null,
+    error: IOException? = null,
+): Call = mockk<Call> {
+    if (error != null) {
+        every { enqueue(any()) } answers {
+            val callback = firstArg<okhttp3.Callback>()
+            callback.onFailure(this@mockk, error)
+        }
+    } else if (response != null) {
+        every { enqueue(any()) } answers {
+            val callback = firstArg<okhttp3.Callback>()
+            callback.onResponse(this@mockk, response)
+        }
+    } else {
+        error("Either response or error must be provided")
+    }
+}
diff --git a/libraries/wellknown/test/build.gradle.kts b/libraries/wellknown/test/build.gradle.kts
index 0ce22348b3..8eb47ef5ca 100644
--- a/libraries/wellknown/test/build.gradle.kts
+++ b/libraries/wellknown/test/build.gradle.kts
@@ -15,6 +15,9 @@ android {
 }
 
 dependencies {
+    implementation(libs.serialization.json)
+    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.wellknown.api)
+    implementation(projects.libraries.wellknown.impl)
     implementation(projects.tests.testutils)
 }
diff --git a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeElementWellknownStore.kt b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeElementWellknownStore.kt
new file mode 100644
index 0000000000..c5e2d2ae5b
--- /dev/null
+++ b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/FakeElementWellknownStore.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.wellknown.test
+
+import io.element.android.libraries.androidutils.json.DefaultJsonProvider
+import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.libraries.wellknown.api.ElementWellKnown
+import io.element.android.libraries.wellknown.api.ElementWellknownStore
+import io.element.android.libraries.wellknown.api.WellknownRetrieverResult
+import io.element.android.libraries.wellknown.impl.InternalElementWellKnown
+import io.element.android.libraries.wellknown.impl.map
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.json.JsonDecodingException
+import java.net.URL
+
+class FakeElementWellknownStore(
+    initialData: Map<String, WellknownRetrieverResult<ElementWellKnown>> = emptyMap(),
+    private val jsonProvider: JsonProvider = DefaultJsonProvider(),
+) : ElementWellknownStore {
+    private val cachedData = mutableMapOf<String, WellknownRetrieverResult<ElementWellKnown>>()
+
+    init {
+        initialData.forEach { (url, result) ->
+            cachedData[URL(url).host] = result
+        }
+    }
+
+    override suspend fun get(domain: String): WellknownRetrieverResult<ElementWellKnown> {
+        return cachedData[domain] ?: WellknownRetrieverResult.NotFound
+    }
+
+    @OptIn(ExperimentalSerializationApi::class)
+    override suspend fun update(domain: String, wellknown: String): Result<Unit> {
+        val json = jsonProvider()
+        val mapped = try {
+            json.decodeFromString<InternalElementWellKnown>(wellknown).map()
+        } catch (e: JsonDecodingException) {
+            return Result.failure(e)
+        }
+        cachedData[domain] = WellknownRetrieverResult.Success(mapped)
+        return Result.success(Unit)
+    }
+
+    override suspend fun delete(domain: String): Result<Unit> {
+        cachedData.remove(domain)
+        return Result.success(Unit)
+    }
+}
diff --git a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/Fixtures.kt b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/Fixtures.kt
index 7457aafc98..941e5f4cc7 100644
--- a/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/Fixtures.kt
+++ b/libraries/wellknown/test/src/main/kotlin/io/element/android/features/wellknown/test/Fixtures.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.features.wellknown.test
 
+import io.element.android.libraries.wellknown.api.CustomRecoveryPassphrase
 import io.element.android.libraries.wellknown.api.ElementWellKnown
 
 fun anElementWellKnown(
@@ -16,10 +17,24 @@ fun anElementWellKnown(
     rageshakeUrl: String? = null,
     brandColor: String? = null,
     notificationSound: String? = null,
+    identityProviderAppScheme: String? = null,
+    customRecoveryPassphrase: CustomRecoveryPassphrase? = null,
+    contentScannerUrl: String? = null,
+    forceDisableE2EE: Boolean? = null,
 ) = ElementWellKnown(
     registrationHelperUrl = registrationHelperUrl,
     enforceElementPro = enforceElementPro,
     rageshakeUrl = rageshakeUrl,
     brandColor = brandColor,
     notificationSound = notificationSound,
+    identityProviderAppScheme = identityProviderAppScheme,
+    customRecoveryPassphrase = customRecoveryPassphrase,
+    contentScannerUrl = contentScannerUrl,
+    forceDisableE2EE = forceDisableE2EE,
+)
+
+fun aCustomRecoveryPassphrase(
+    minCharacterCount: Int = 8,
+) = CustomRecoveryPassphrase(
+    minCharacterCount = minCharacterCount,
 )
diff --git a/libraries/workmanager/api/build.gradle.kts b/libraries/workmanager/api/build.gradle.kts
index b53ed40394..238dc57664 100644
--- a/libraries/workmanager/api/build.gradle.kts
+++ b/libraries/workmanager/api/build.gradle.kts
@@ -15,6 +15,6 @@ android {
 
 dependencies {
     api(libs.androidx.workmanager.runtime)
-
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
 }
diff --git a/libraries/workmanager/impl/build.gradle.kts b/libraries/workmanager/impl/build.gradle.kts
index 878edb6fe2..c1874bfa74 100644
--- a/libraries/workmanager/impl/build.gradle.kts
+++ b/libraries/workmanager/impl/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.di)
+    implementation(projects.libraries.sessionStorage.api)
 
     testCommonDependencies(libs, false)
     testImplementation(projects.libraries.sessionStorage.test)
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 618587d2bd..179ff7ac90 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -39,13 +39,13 @@ private const val versionYear = 26
  * Month of the version on 2 digits. Value must be in [1,12].
  * Do not update this value. it is updated by the release script.
  */
-private const val versionMonth = 3
+private const val versionMonth = 8
 
 /**
  * Release number in the month. Value must be in [0,99].
  * Do not update this value. it is updated by the release script.
  */
-private const val versionReleaseNumber = 4
+private const val versionReleaseNumber = 0
 
 object Versions {
     /**
@@ -61,19 +61,19 @@ object Versions {
      * Compile SDK version. Must be updated when a new Android version is released.
      * When updating COMPILE_SDK, please also update BUILD_TOOLS_VERSION.
      */
-    const val COMPILE_SDK = 36
+    const val COMPILE_SDK = 37
 
     /**
      * Build tools version. Must be kept in sync with COMPILE_SDK.
      * The value is used by the release script.
      */
     @Suppress("unused")
-    private const val BUILD_TOOLS_VERSION = "36.0.0"
+    private const val BUILD_TOOLS_VERSION = "37.0.0"
 
     /**
      * Target SDK version. Should be kept up to date with COMPILE_SDK.
      */
-    const val TARGET_SDK = 36
+    const val TARGET_SDK = 37
 
     /**
      * Minimum SDK version for FOSS builds.
diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
index 8cfa533609..9c8c5c986a 100644
--- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt
+++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
@@ -22,6 +22,7 @@ object BuildTimeConfig {
     val URL_ACCEPTABLE_USE: String? = null
     val URL_PRIVACY: String? = null
     val URL_POLICY: String? = null
+    val OAUTH_CLIENT_URL_PATH: String? = null
     val SERVICES_MAPTILER_BASE_URL: String? = null
     val SERVICES_MAPTILER_APIKEY: String? = null
     val SERVICES_MAPTILER_LIGHT_MAPID: String? = null
diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt
index 5f243f4319..1f24473f8e 100644
--- a/plugins/src/main/kotlin/extension/CommonExtension.kt
+++ b/plugins/src/main/kotlin/extension/CommonExtension.kt
@@ -9,67 +9,111 @@
 package extension
 
 import Versions
-import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ApplicationDefaultConfig
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CompileOptions
+import com.android.build.api.dsl.LibraryDefaultConfig
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.dsl.Lint
 import isEnterpriseBuild
 import org.gradle.api.Project
 import java.io.File
 
-fun CommonExtension<*, *, *, *, *, *>.androidConfig(project: Project) {
-    defaultConfig {
-        compileSdk = Versions.COMPILE_SDK
-        minSdk = Versions.minSdk
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+fun ApplicationExtension.androidAppConfig(project: Project) {
+    compileSdk = Versions.COMPILE_SDK
 
-        vectorDrawables {
-            useSupportLibrary = true
-            generatedDensities()
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = Versions.javaVersion
-        targetCompatibility = Versions.javaVersion
-    }
-
-    testOptions {
-        unitTests.isReturnDefaultValues = true
-    }
+    defaultConfig(::defaultApplicationConfig)
+    compileOptions(::defaultCompileOptions)
+    testOptions(::defaultTestOptions)
 
     lint {
-        lintConfig = File("${project.rootDir}/tools/lint/lint.xml")
-        if (isEnterpriseBuild) {
-            // Disable check on ObsoleteSdkInt for Enterprise builds
-            // since the min sdk is higher for Enterprise builds
-            disable.add("ObsoleteSdkInt")
-        }
-        checkDependencies = false
-        abortOnError = true
-        ignoreTestSources = true
-        ignoreTestFixturesSources = true
-        checkGeneratedSources = false
+        project.defaultLintOptions(this)
     }
 }
 
-fun CommonExtension<*, *, *, *, *, *>.composeConfig() {
+fun LibraryExtension.androidLibraryConfig(project: Project) {
+    compileSdk = Versions.COMPILE_SDK
 
-    buildFeatures {
-        compose = true
-    }
-
-    packaging {
-        resources.excludes.apply {
-            add("META-INF/AL2.0")
-            add("META-INF/LGPL2.1")
-        }
-    }
+    defaultConfig(::defaultLibraryConfig)
+    compileOptions(::defaultCompileOptions)
+    testOptions(::defaultTestOptions)
 
     lint {
-        // Extra rules for compose
-        // Disabled until lint stops inspecting generated ksp files...
-        // error.add("ComposableLambdaParameterNaming")
-        error.add("ComposableLambdaParameterPosition")
-        ignoreTestFixturesSources = true
-        checkGeneratedSources = false
+        project.defaultLintOptions(this)
     }
 }
 
+fun ApplicationExtension.composeAppConfig() {
+    buildFeatures(::defaultComposeBuildFeatures)
+    packaging(::defaultPackagingOptions)
+    lint(::defaultComposeLintOptions)
+}
+
+fun LibraryExtension.composeLibraryConfig() {
+    buildFeatures(::defaultComposeBuildFeatures)
+    packaging(::defaultPackagingOptions)
+    lint(::defaultComposeLintOptions)
+}
+
+fun defaultApplicationConfig(applicationDefaultConfig: ApplicationDefaultConfig) = applicationDefaultConfig.apply {
+    minSdk = Versions.minSdk
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+    vectorDrawables {
+        useSupportLibrary = true
+        generatedDensities()
+    }
+}
+
+fun defaultLibraryConfig(libraryDefaultConfig: LibraryDefaultConfig) = libraryDefaultConfig.apply {
+    minSdk = Versions.minSdk
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+    vectorDrawables {
+        useSupportLibrary = true
+        generatedDensities()
+    }
+}
+
+fun defaultCompileOptions(compileOptions: CompileOptions) = compileOptions.apply {
+    sourceCompatibility = Versions.javaVersion
+    targetCompatibility = Versions.javaVersion
+}
+
+fun defaultTestOptions(testOptions: com.android.build.api.dsl.TestOptions) = testOptions.apply {
+    unitTests.isReturnDefaultValues = true
+}
+
+fun defaultComposeBuildFeatures(buildFeatures: com.android.build.api.dsl.BuildFeatures) = buildFeatures.apply {
+    compose = true
+}
+
+fun defaultPackagingOptions(packagingOptions: com.android.build.api.dsl.Packaging) = packagingOptions.apply {
+    resources.excludes.apply {
+        add("META-INF/AL2.0")
+        add("META-INF/LGPL2.1")
+    }
+}
+
+fun defaultComposeLintOptions(lint: Lint) = lint.apply {
+    // Extra rules for compose
+    // Disabled until lint stops inspecting generated ksp files...
+    // error.add("ComposableLambdaParameterNaming")
+    error.add("ComposableLambdaParameterPosition")
+    ignoreTestFixturesSources = true
+    checkGeneratedSources = false
+}
+
+fun Project.defaultLintOptions(lint: Lint) = lint.apply {
+    lintConfig = File("${project.rootDir}/tools/lint/lint.xml")
+    if (isEnterpriseBuild) {
+        // Disable check on ObsoleteSdkInt for Enterprise builds
+        // since the min sdk is higher for Enterprise builds
+        disable.add("ObsoleteSdkInt")
+    }
+    checkDependencies = false
+    abortOnError = true
+    ignoreTestSources = true
+    ignoreTestFixturesSources = true
+    checkGeneratedSources = false
+}
diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
index e7cc47d7b8..babd9f27ff 100644
--- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
+++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
@@ -49,6 +49,7 @@ fun DependencyHandlerScope.testCommonDependencies(
     testImplementation(libs.test.arch.core)
     testImplementation(libs.test.junit)
     testImplementation(libs.test.mockk)
+    testImplementation(libs.test.parameter.injector)
     testImplementation(libs.test.robolectric)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
@@ -103,9 +104,11 @@ fun DependencyHandlerScope.allLibrariesImpl() {
     implementation(project(":libraries:architecture"))
     implementation(project(":libraries:dateformatter:impl"))
     implementation(project(":libraries:di"))
+    implementation(project(":libraries:cachestore:impl"))
     implementation(project(":libraries:session-storage:impl"))
     implementation(project(":libraries:mediapickers:impl"))
     implementation(project(":libraries:mediaupload:impl"))
+    implementation(project(":libraries:slashcommands:impl"))
     implementation(project(":libraries:usersearch:impl"))
     implementation(project(":libraries:textcomposer:impl"))
     implementation(project(":libraries:accountselect:impl"))
@@ -118,9 +121,9 @@ fun DependencyHandlerScope.allLibrariesImpl() {
     implementation(project(":libraries:troubleshoot:impl"))
     implementation(project(":libraries:fullscreenintent:impl"))
     implementation(project(":libraries:wellknown:impl"))
-    implementation(project(":libraries:oidc:impl"))
+    implementation(project(":libraries:oauth:impl"))
     implementation(project(":libraries:workmanager:impl"))
-    implementation(project(":libraries:recentemojis:impl"))
+    implementation(project(":libraries:emoji:impl"))
 }
 
 fun DependencyHandlerScope.allServicesImpl() {
diff --git a/plugins/src/main/kotlin/extension/KoverExtension.kt b/plugins/src/main/kotlin/extension/KoverExtension.kt
index 27e44e31b9..610562ce6a 100644
--- a/plugins/src/main/kotlin/extension/KoverExtension.kt
+++ b/plugins/src/main/kotlin/extension/KoverExtension.kt
@@ -43,6 +43,7 @@ val excludedKoverSubProjects = listOf(
     ":libraries:core",
     ":libraries:coroutines",
     ":libraries:di",
+    ":libraries:rustls-tls",
     ":tests:detekt-rules",
     ":tests:konsist",
     ":tests:testutils",
@@ -63,8 +64,7 @@ fun Project.setupKover() {
     tasks.register("koverVerifyAll") {
         group = "verification"
         description = "Verifies the code coverage of all subprojects."
-        val dependencies = listOf(":koverVerifyMerged") + koverVariants.map { ":app:koverVerify${it.replaceFirstChar(Char::titlecase)}" }
-        dependsOn(dependencies)
+        dependsOn(":koverVerifyMerged")
     }
     // https://kotlin.github.io/kotlinx-kover/
     // Run `./gradlew :app:koverHtmlReport` to get report at ./app/build/reports/kover
@@ -125,6 +125,14 @@ fun Project.setupKover() {
                         "io.element.android.tests.konsist.failures",
                         // Copied from Appyx
                         "io.element.android.libraries.architecture.appyx.SafeChildrenTransitionScope",
+                        // DI-generated classes
+                        "io.element.android.x.di.*Impl",
+                        "io.element.android.x.di.*Impls",
+                        "io.element.android.x.di.*Mirror",
+                        "io.element.android.x.di.*Factory",
+                        $$"io.element.android.*$Metro*",
+                        $$"io.element.android.*$Factory*",
+                        $$"io.element.android.*$Impl*",
                     )
                     annotatedBy(
                         "androidx.compose.ui.tooling.preview.Preview",
diff --git a/plugins/src/main/kotlin/extension/locales.kt b/plugins/src/main/kotlin/extension/locales.kt
index 1af7146681..2774b078b5 100644
--- a/plugins/src/main/kotlin/extension/locales.kt
+++ b/plugins/src/main/kotlin/extension/locales.kt
@@ -5,6 +5,7 @@ package extension
 val locales = setOf(
     "be",
     "bg",
+    "ca",
     "cs",
     "cy",
     "da",
@@ -22,6 +23,7 @@ val locales = setOf(
     "hu",
     "in",
     "it",
+    "ja",
     "ka",
     "ko",
     "lt",
@@ -38,6 +40,7 @@ val locales = setOf(
     "uk",
     "ur",
     "uz",
+    "vi",
     "zh-rCN",
     "zh-rTW",
 )
diff --git a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
index a489884df5..4683ee1b5f 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
@@ -9,9 +9,9 @@
 /**
  * This will generate the plugin "io.element.android-compose-application" to use by app
  */
-import extension.androidConfig
+import extension.androidAppConfig
 import extension.commonDependencies
-import extension.composeConfig
+import extension.composeAppConfig
 import extension.composeDependencies
 import extension.setupKover
 import org.gradle.accessors.dm.LibrariesForLibs
@@ -19,14 +19,13 @@ import org.gradle.accessors.dm.LibrariesForLibs
 val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.autonomousapps.dependency-analysis")
     id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
-    androidConfig(project)
-    composeConfig()
+    androidAppConfig(project)
+    composeAppConfig()
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
diff --git a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
index 26b1a1f122..1fd697806d 100644
--- a/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
@@ -9,9 +9,9 @@
 /**
  * This will generate the plugin "io.element.android-compose-library", used in android library with compose modules.
  */
-import extension.androidConfig
+import extension.androidLibraryConfig
 import extension.commonDependencies
-import extension.composeConfig
+import extension.composeLibraryConfig
 import extension.composeDependencies
 import extension.setupKover
 import org.gradle.accessors.dm.LibrariesForLibs
@@ -19,14 +19,13 @@ import org.gradle.accessors.dm.LibrariesForLibs
 val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.library")
-    id("kotlin-android")
     id("com.autonomousapps.dependency-analysis")
     id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
-    androidConfig(project)
-    composeConfig()
+    androidLibraryConfig(project)
+    composeLibraryConfig()
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
diff --git a/plugins/src/main/kotlin/io.element.android-library.gradle.kts b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
index c10c1bb3d7..18b1e1d3f8 100644
--- a/plugins/src/main/kotlin/io.element.android-library.gradle.kts
+++ b/plugins/src/main/kotlin/io.element.android-library.gradle.kts
@@ -9,7 +9,7 @@
 /**
  * This will generate the plugin "io.element.android-library", used in android library without compose modules.
  */
-import extension.androidConfig
+import extension.androidLibraryConfig
 import extension.commonDependencies
 import extension.setupKover
 import org.gradle.accessors.dm.LibrariesForLibs
@@ -17,12 +17,11 @@ import org.gradle.accessors.dm.LibrariesForLibs
 val libs = the<LibrariesForLibs>()
 plugins {
     id("com.android.library")
-    id("kotlin-android")
     id("com.autonomousapps.dependency-analysis")
 }
 
 android {
-    androidConfig(project)
+    androidLibraryConfig(project)
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
     }
diff --git a/screenshots/de/appnav.loggedin_LoggedInView_Day_4_de.png b/screenshots/de/appnav.loggedin_LoggedInView_Day_4_de.png
new file mode 100644
index 0000000000..d0563d236e
--- /dev/null
+++ b/screenshots/de/appnav.loggedin_LoggedInView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d5342cd7d81f6394ec127163668864dc9e14e05cc26999c8a9381e787067f70
+size 33738
diff --git a/screenshots/de/appnav.loggedin_LoggedInView_Day_5_de.png b/screenshots/de/appnav.loggedin_LoggedInView_Day_5_de.png
new file mode 100644
index 0000000000..dd36ce4cc0
--- /dev/null
+++ b/screenshots/de/appnav.loggedin_LoggedInView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c3b46bd15055a52ef9c92b49e75a042345d83826574e4bea82f6c981c8903df
+size 34726
diff --git a/screenshots/de/appnav.root_RootView_Day_0_de.png b/screenshots/de/appnav.root_RootView_Day_0_de.png
index 7f70b90751..2d0d9fab03 100644
--- a/screenshots/de/appnav.root_RootView_Day_0_de.png
+++ b/screenshots/de/appnav.root_RootView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa11b2165af4a12cd518fb3f9a06b91d9ce87b468705efc7a962bf34a8278fac
-size 26284
+oid sha256:c3082552bf96131ddba157697bb254e22d6277537759c32dfabb56a2e99a9138
+size 27116
diff --git a/screenshots/de/appnav.root_RootView_Day_1_de.png b/screenshots/de/appnav.root_RootView_Day_1_de.png
index e1796d211b..6d1c994b27 100644
--- a/screenshots/de/appnav.root_RootView_Day_1_de.png
+++ b/screenshots/de/appnav.root_RootView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35a9ac561c2546fd94121cb0c80e1f5be1fe147f425be4d087b647ae0f204afd
-size 29986
+oid sha256:f9231272736124f1e54a3422310d2dd5c7ad81e850548886062df61de36165c4
+size 30868
diff --git a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
index 53d0163f0c..e01a6c204f 100644
--- a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
+++ b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0513d6133ff6ea84f83ac90c00aa2a91d054106b5ba52401cec345b0e1da1749
-size 85066
+oid sha256:2f97140e7b2253fc19655ec678b2181a3ceb16d1b7d45c99f8c6ad227fe4309d
+size 83803
diff --git a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_1_de.png b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_1_de.png
index 95b3686f95..b088635a2f 100644
--- a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_1_de.png
+++ b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f81637ebfbee865dd0740ea8e5158042371dd05b8e98663c2b2a88062ffb5cb
-size 86660
+oid sha256:3b9ba02266f44a4e73dfed54bd429aad8c9a8ee3813075d643a906cab0951d56
+size 85850
diff --git a/screenshots/de/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_de.png b/screenshots/de/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_de.png
new file mode 100644
index 0000000000..89470baf5e
--- /dev/null
+++ b/screenshots/de/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3169a975fd8dc050f28c46d273d1d766b7b829ead7217171dc8693e99febfbfd
+size 62340
diff --git a/screenshots/de/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_de.png b/screenshots/de/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_de.png
deleted file mode 100644
index 4bedce8ba9..0000000000
--- a/screenshots/de/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:869749d64cb3836b99a132685a2411b56c3d93c6db1e2adddf669cf75ab90187
-size 68410
diff --git a/screenshots/de/features.call.impl.ui_CallScreenView_Day_3_de.png b/screenshots/de/features.call.impl.ui_CallScreenView_Day_3_de.png
index bfa7251296..0996d18bf0 100644
--- a/screenshots/de/features.call.impl.ui_CallScreenView_Day_3_de.png
+++ b/screenshots/de/features.call.impl.ui_CallScreenView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5988ca59d9fcfaccbf4bc2929d7c135f67be0852e739caeb566b0518fac7f75
-size 19021
+oid sha256:bc9627a6288987e446206dc54abb8e1319ba6996674f0b588decd5418eeafc1b
+size 18688
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_de.png
index 6c0d8d5eaa..f41f849449 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c1196cd5631cae5cb944cd0cc6903c4758a8e331983b2bbd93500473733f004
-size 34294
+oid sha256:25753de5e78f127478e94ca29354a0ef057a20b795b302a911748b724b206c17
+size 33753
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_de.png
index fc9aeb0fa7..94b18f3f19 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b724d4087e37920bcb0ecf7812248f1dc31294da738866fed3000c63a4ec329
-size 36263
+oid sha256:4cac82fe268df0631f766e69030e1dc1bdb09d869db18e62d15c563e9ff81260
+size 36237
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_de.png
index 6722d77789..a8937dbed9 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c609a2f5a80242c1fa9fc20d6f6295a85a23e1795a2603c64bce035abc8da05
-size 45651
+oid sha256:88eab769270bf7492cfbafbd537392348b76780bc93c2b4b858f1fecbc8e8af2
+size 45264
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_de.png
index c1910fa5ae..f7d745f184 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:831db915b860b285a9548e6469faa4d33445d7f79b28f6b54029bfdf2d61b4c8
-size 46567
+oid sha256:d94c8697c49e36f4275860e6a1825815738f1c8263ae7e129cd4139b2544b3e7
+size 46286
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_de.png
index 9a66f5b538..41b1a4e9cf 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0c96581bc29034a47a345b5c5f215853ab5d5545b2d64124031fb930bbd9f64
-size 48063
+oid sha256:919e66822097fe71920c70c4923bcb61b332fb0766dd0bfd4e662081854151c3
+size 47732
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_de.png
index 6722d77789..a8937dbed9 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c609a2f5a80242c1fa9fc20d6f6295a85a23e1795a2603c64bce035abc8da05
-size 45651
+oid sha256:88eab769270bf7492cfbafbd537392348b76780bc93c2b4b858f1fecbc8e8af2
+size 45264
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_de.png
index 7dc00e9c6e..d8196828b8 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b79450f73b04b2cb5a6cb674f303bba6326303ecca06f6a065112bc3b3e01db
-size 46700
+oid sha256:ce9fbcbf082cf07edbb271870818e74782cbc5ed6c71624e1297b9af10a3c130
+size 46273
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_de.png
index ce5528cf17..f98071e4d3 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44fa3cfedf5f3b943fbc7ccb8a7e88163dd97d7a314f1a38e339658bfd84f741
-size 39853
+oid sha256:42d004e1086f2224bb9ab8b41568d4e7f60a9f4c5b7a3e75394ef0f623f8bebf
+size 41247
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_de.png
index 4a0d1f93b2..866b224b68 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60f136a8ac494703edfe2f727e22befd07ffced587621ceb8b39136c3025fc4c
-size 41511
+oid sha256:df105a3030abbf1760d5c1ee580664349f745d08023ad0f5da784ff7a6a3a1db
+size 40619
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_de.png
index da5814af23..b8bf1e9d18 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0c93f1419921ce124a015b3e6ca8dbed714f0e8eb7aa55d2e33e5fde2396ef7
-size 35296
+oid sha256:cc1d720d39e352d815fe20759dae937f87a50e89cf9de4aa998d20e2408417dc
+size 34846
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_de.png
index b3f0b141e5..99923dc3af 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:297914ef0da135e7294bb7bc476f581f2f28cb8cf4d8756b6d1379d1893b5c6c
-size 37563
+oid sha256:ff909aab1190f8d9eff5b3c100df6d2a5cad0513955a1ab09351b2ac6fd9a021
+size 37618
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_de.png
index 8aa5a5b419..d5ea39c88e 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e2bfad23495d22ef4ccc316efb4af24de9ee26731a39dc1cb665bfa7b1900de
-size 47303
+oid sha256:7d10e5c062dee14e0775ac72884ebbed0fe41aae4d1bb9a0892d8fa456d8c296
+size 47067
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_de.png
index d1cc642217..5c2eb9e1e6 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aec7bbe40f667e33c901290a357c0bdd35042b165e202f9f865d67587b38cde3
-size 48289
+oid sha256:44fd0dd695a9e059ab54b2e6c628a6ac24625ec7c9c92c651c6626a228bd541c
+size 48101
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_de.png
index b261d63af0..0863a13d18 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68cf296625cf15e2fcef1a02fced8e68e3357af7211d66b7731ea198fa4c3440
-size 49863
+oid sha256:fe8b585c1bca2036160cac128233b0899c091bbc30fd087a72e4b1191ee5eef9
+size 49666
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_de.png
index 8aa5a5b419..d5ea39c88e 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e2bfad23495d22ef4ccc316efb4af24de9ee26731a39dc1cb665bfa7b1900de
-size 47303
+oid sha256:7d10e5c062dee14e0775ac72884ebbed0fe41aae4d1bb9a0892d8fa456d8c296
+size 47067
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_de.png
index 1e693e765d..5b794372ed 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e41f2e18d265c3ba444041b286dca3e1973e861469d53f3f0933ccbfcdea5c5d
-size 48394
+oid sha256:0d56402d64dc752d4cccc3a1e0642a69ca244225cce346aa842fdf3cc492f8d1
+size 48121
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_de.png
index 5f5d5a50f7..9495d79405 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b3e812737af7688f1cc3ac6e251a0fc56b631754888760f960be8cf1174c24b
-size 41186
+oid sha256:55e147811154db2ce5de206693057fedf11b38ce6fcf23ef7ef4ac9ee00d4f7d
+size 42888
diff --git a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_de.png b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_de.png
index c5c4572551..c393b6bc0e 100644
--- a/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:454047441aedaf4eb85fd379acdbd0b9618ed348bc2ab876d92b963bc6ea34f0
-size 43106
+oid sha256:807efc10c7d97dcfcbbaa2c696996c9ffe3c69f3f21d992fee0635f5c1dd623b
+size 42289
diff --git a/screenshots/de/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_de.png b/screenshots/de/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_de.png
index 21c6405a77..1cc92bddf4 100644
--- a/screenshots/de/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_de.png
+++ b/screenshots/de/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22e0fb8867a616d7d575f9262996f66730cb61f8b0e9c2c74fffbb92b3a1fd06
-size 25852
+oid sha256:ac79f05488afb65d5675a8068ac1c70c7cddc81b1db5445f1314ce53a1da8ba1
+size 27143
diff --git a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_de.png b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_de.png
index 062623eb08..5edce6541b 100644
--- a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_de.png
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c629821f33feb647b508b7f6bea584f807bd0e46162784d1ac764f97b050e9c5
-size 36461
+oid sha256:9c1602858c58d4f05c5c3d816cde905af8cd888ae9337215119902b0dbdf1cbc
+size 43609
diff --git a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_de.png b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_de.png
index afc83cfdd2..641671bf3f 100644
--- a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_de.png
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:003c99b1a807edd7a143bb5329d544a1519bfea1efbcd29c275d9b1bd0031a6f
-size 29954
+oid sha256:1acc89193300b0ea268c127c98c7d46b8e23841933750d99d597a8713e1698ed
+size 36762
diff --git a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_de.png b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_de.png
index dae5be9d78..b9ce42a450 100644
--- a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_de.png
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04a3913f1c1e74f6a78706dac9e1aa33e2520bd9c37857bf58a7e5a58f12ec17
-size 42559
+oid sha256:0f5bddbb812e5fd0863a8c1308349f627f0e8fd865ee36f995a29666e0816b0d
+size 49843
diff --git a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_de.png b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_de.png
index 2da29be9b1..f8be736047 100644
--- a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_de.png
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06df3ed8524a4ff0d1ea12c43b624dd4f977ac591632d6062dc116aab53111fd
-size 36195
+oid sha256:5e141bd8ca4767ded168a1e7cb574df8d33797e05ced6615287469b282d985b1
+size 43319
diff --git a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_de.png b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_de.png
index 61fb494655..5697209279 100644
--- a/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_de.png
+++ b/screenshots/de/features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2e33198cfde05a0f48bded09ad60108993678ce6a84da6394cb0cca4df66edd
-size 26295
+oid sha256:15bba5407bbda9070cf2109165e4fb9455450c8d6dd504dea7b521640fcfa48d
+size 33229
diff --git a/screenshots/de/features.home.impl.components_RoomListContentView_Day_0_de.png b/screenshots/de/features.home.impl.components_RoomListContentView_Day_0_de.png
index 05106c3ac1..dd7ef2cf63 100644
--- a/screenshots/de/features.home.impl.components_RoomListContentView_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_RoomListContentView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2f2b452d5f951c917841eacea002106c353f1236a63450498a7cb3cab948ab1
-size 43627
+oid sha256:ab2ea24bf2c91529674d2d3d582137ec195c6d28f10d65d46c1851716c1d1408
+size 43842
diff --git a/screenshots/de/features.home.impl.components_RoomListContentView_Day_4_de.png b/screenshots/de/features.home.impl.components_RoomListContentView_Day_4_de.png
index 114c133d28..eecc5692c4 100644
--- a/screenshots/de/features.home.impl.components_RoomListContentView_Day_4_de.png
+++ b/screenshots/de/features.home.impl.components_RoomListContentView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2574ac92d1424f5224beab9ac060d731a763cdc95a4550f07fb22bd4bd393105
-size 55716
+oid sha256:3d80e64f2206d9d21b3467ea4a7d5b06a33391cd56b5d899f944e7bd501b1743
+size 64430
diff --git a/screenshots/de/features.home.impl.components_RoomListContentView_Day_5_de.png b/screenshots/de/features.home.impl.components_RoomListContentView_Day_5_de.png
index 944aa69386..1a9997ccbd 100644
--- a/screenshots/de/features.home.impl.components_RoomListContentView_Day_5_de.png
+++ b/screenshots/de/features.home.impl.components_RoomListContentView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6708f52e140fb8a5e2697a221182d36048671063ae3fdca96a49c131a129cc0
-size 63960
+oid sha256:5eee6d3b3040f3144e4785aa1b14fdf2057ef9a43a758317f4d59a47c8fbc2fb
+size 63817
diff --git a/screenshots/de/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_de.png b/screenshots/de/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_de.png
index 5e1b3d5040..34f49e1141 100644
--- a/screenshots/de/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_de.png
+++ b/screenshots/de/features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea704578dfaea8ab3a4dd6eb42e45b40e4037819fe83586947136252a39855f2
-size 38819
+oid sha256:a8bb68b889c934425bb53b0b923ddd86c5a6e9309dfb7d06505b986521ab75e7
+size 52580
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_0_de.png b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_0_de.png
new file mode 100644
index 0000000000..1db3060b52
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7763b052961efdb42fbae39e078ffb00c0f62b084b477862d07f0ec5be5d2f2d
+size 23815
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_1_de.png b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_1_de.png
new file mode 100644
index 0000000000..aa7855c162
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20528ffe999003d019f3d1484f12cbb1c37b3d0fea363c423cec0033ebeaf732
+size 25622
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_2_de.png b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_2_de.png
new file mode 100644
index 0000000000..2270819756
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListContextMenu_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c307ff5d16e3f24467d068711fdbeb39b0623201cfa2562ae47b0c954133ae63
+size 27662
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_de.png b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_de.png
deleted file mode 100644
index b51bbdbfc7..0000000000
--- a/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf13adc113fe7b1127eedde7ed659ac11afb25b25be22f757dfd22c363e011f5
-size 29190
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_de.png b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_de.png
new file mode 100644
index 0000000000..67b0361c5c
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26a5736c3ce48028bde69a7f029ffaed5d18e490b32fbb455d35d89f90f7e169
+size 30385
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_de.png b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_de.png
new file mode 100644
index 0000000000..c39d87d73c
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9caedf891866305599b0cc1887f46fc2ae7e0c6ca903860df247eb48eadf3708
+size 45796
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_de.png b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_de.png
new file mode 100644
index 0000000000..950a33e731
--- /dev/null
+++ b/screenshots/de/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:469c3186032dae6ed8d4203277b9a45d5c5f648e7688a5a6804231ac648daef4
+size 30940
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_de.png b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_de.png
deleted file mode 100644
index 097191f4f2..0000000000
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba628bba3efe736cbfd164d8c5a403ef042cefd29fef6307fc2c2694798b0e18
-size 23407
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_de.png b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_de.png
deleted file mode 100644
index d9912fb3e0..0000000000
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:811bc09258019248f5cd94ee8cfeb070b1471f510ba4ad16b427e4c574db46a9
-size 23660
diff --git a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_de.png b/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_de.png
deleted file mode 100644
index cc6b3c7a57..0000000000
--- a/screenshots/de/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7dada5eb605d5558baea8b01101bfbb8cc31338b2ce76035a8fcb449cdd8e77b
-size 25776
diff --git a/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_0_de.png b/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_0_de.png
index e1e8184d83..eb7173e6c0 100644
--- a/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_0_de.png
+++ b/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c3a74c4106a32d6493c3589376668e5d3fef84e53281eb22d38f74ffe29af76
-size 32359
+oid sha256:1a314cfc59b86daa7dcde11117b8769f763e8b668771d42aadd7c54314e4b097
+size 32246
diff --git a/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_1_de.png b/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_1_de.png
index 083edaa450..a916eaabaa 100644
--- a/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_1_de.png
+++ b/screenshots/de/features.home.impl.spacefilters_SpaceFiltersView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96f48988c05ddb25b0a5cbc9eb5c8ac82ae54ef61c0e50081d148140f819ce1d
-size 18842
+oid sha256:626c9fa9f44a69dbbc4aaf8b12782e7311f458440837d3d5bee811b2eb3b2e11
+size 18732
diff --git a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_0_de.png b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_0_de.png
index 57b0b95a3b..9114db106e 100644
--- a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_0_de.png
+++ b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77959d24fd7c52c4d63090e51d189bd6c41c9c350c1a4c97a2260c05b226c119
-size 86868
+oid sha256:ed39d041acd3bb008f20f567b93fa01217dbbe075d198a213b9058351d198118
+size 85682
diff --git a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_1_de.png b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_1_de.png
index 5b2f0bbb1f..1a7a7bfa89 100644
--- a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_1_de.png
+++ b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53a21b0c20ed1fb442fdb8d860805ee8f476cb2f527d571b07084751b58c762b
-size 39239
+oid sha256:1fe768ccb0272e435f42ba94c6b15ed3b6703f32385a307def2040f703b3ba0a
+size 38119
diff --git a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_2_de.png b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_2_de.png
index 5b2f0bbb1f..f0e44135ec 100644
--- a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_2_de.png
+++ b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53a21b0c20ed1fb442fdb8d860805ee8f476cb2f527d571b07084751b58c762b
-size 39239
+oid sha256:c7f97df762e010742fb2627a83e0939f4e190195200c53004412e01c6361cb43
+size 28480
diff --git a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_3_de.png b/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_3_de.png
deleted file mode 100644
index f0e44135ec..0000000000
--- a/screenshots/de/features.home.impl.spaces_HomeSpacesView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7f97df762e010742fb2627a83e0939f4e190195200c53004412e01c6361cb43
-size 28480
diff --git a/screenshots/de/features.home.impl_HomeView_Day_0_de.png b/screenshots/de/features.home.impl_HomeView_Day_0_de.png
index 3f4ea30f5c..7a78ab01dc 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_0_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ffc6ec59463b5047e28186f2e0628dcd10391ce51515f2ffbbca150fe590cf4
-size 69561
+oid sha256:b9c0e16d5506092e20da1413016148110a5509b4f1a906d22967a59171770443
+size 69777
diff --git a/screenshots/de/features.home.impl_HomeView_Day_13_de.png b/screenshots/de/features.home.impl_HomeView_Day_13_de.png
index 1f5c8972bc..53e115bc5a 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_13_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3f9c61cbe5f80b7574765bfcc6a1bef06b434d35666ee4fa2b0ba6f09078352
-size 97503
+oid sha256:53d6acbc84bc668a38789626e17f9ffa288b3ef9b4911a18dfd93d24d5ec5b35
+size 99809
diff --git a/screenshots/de/features.home.impl_HomeView_Day_14_de.png b/screenshots/de/features.home.impl_HomeView_Day_14_de.png
index 7476615fc3..f845f2e13f 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_14_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36a222231a7399ffa88190117f82db0f96b3a3aef4c939988e8f862c75d1fa52
-size 91989
+oid sha256:64771726d8c2436f1478c503991176d2f675b21fa36c9228bf18976f73034b7c
+size 91946
diff --git a/screenshots/de/features.home.impl_HomeView_Day_1_de.png b/screenshots/de/features.home.impl_HomeView_Day_1_de.png
index 3f4ea30f5c..7a78ab01dc 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_1_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ffc6ec59463b5047e28186f2e0628dcd10391ce51515f2ffbbca150fe590cf4
-size 69561
+oid sha256:b9c0e16d5506092e20da1413016148110a5509b4f1a906d22967a59171770443
+size 69777
diff --git a/screenshots/de/features.home.impl_HomeView_Day_2_de.png b/screenshots/de/features.home.impl_HomeView_Day_2_de.png
index 3f4ea30f5c..7a78ab01dc 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_2_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ffc6ec59463b5047e28186f2e0628dcd10391ce51515f2ffbbca150fe590cf4
-size 69561
+oid sha256:b9c0e16d5506092e20da1413016148110a5509b4f1a906d22967a59171770443
+size 69777
diff --git a/screenshots/de/features.home.impl_HomeView_Day_3_de.png b/screenshots/de/features.home.impl_HomeView_Day_3_de.png
index f4adeb4894..9520da70ed 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_3_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7a3316558a8b352adc4bfc18030e8cf30e06fd5f3e78524c46e3cdbdd2c5907
-size 65168
+oid sha256:1a025368b62aa4bd6fb915a7f52b42acee43e73a0291126eb52440c29e9d8162
+size 64511
diff --git a/screenshots/de/features.home.impl_HomeView_Day_4_de.png b/screenshots/de/features.home.impl_HomeView_Day_4_de.png
index f200461dc7..22c21d8384 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_4_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19266c73ca346e8a290c9eb4091cd5088b5569710a31d06353782be071c03fcb
-size 58359
+oid sha256:eaa2cf678000a055ecb900430c4c7986af97e365df42ac17682b6525febbbe25
+size 57680
diff --git a/screenshots/de/features.home.impl_HomeView_Day_5_de.png b/screenshots/de/features.home.impl_HomeView_Day_5_de.png
index 3f4ea30f5c..7a78ab01dc 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_5_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ffc6ec59463b5047e28186f2e0628dcd10391ce51515f2ffbbca150fe590cf4
-size 69561
+oid sha256:b9c0e16d5506092e20da1413016148110a5509b4f1a906d22967a59171770443
+size 69777
diff --git a/screenshots/de/features.home.impl_HomeView_Day_6_de.png b/screenshots/de/features.home.impl_HomeView_Day_6_de.png
index 467350fe56..1aa91d8732 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_6_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cc8182e0e5413cc51f0df6d2724efae8af4101f9ac6cf21ca9260c2a2aa245a
-size 57989
+oid sha256:da970271201eb9d665400d1ef5791d5e3ae5f770c8bec9c07bd25275ac5fe942
+size 58273
diff --git a/screenshots/de/features.home.impl_HomeView_Day_7_de.png b/screenshots/de/features.home.impl_HomeView_Day_7_de.png
index 774818bd57..cae7125417 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_7_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f235995960c6237f4e03e7b0736cb280e1627590b0761a334c7a969491a12da8
-size 57321
+oid sha256:d11e27bd7446de6523449ce5f718df71f89a7d68ddb17f84ae7cc055273db655
+size 57593
diff --git a/screenshots/de/features.home.impl_HomeView_Day_8_de.png b/screenshots/de/features.home.impl_HomeView_Day_8_de.png
index e644082cae..ee515055c9 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_8_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba1fbfc866d6de2cafae55b6da0721f12a1acb25163ad31ae2995f6ff9016856
-size 56039
+oid sha256:2adf95b28da91bdc7bee8a34d035dea6fd7980970e16143727677b72cd238ec4
+size 56339
diff --git a/screenshots/de/features.home.impl_HomeView_Day_9_de.png b/screenshots/de/features.home.impl_HomeView_Day_9_de.png
index 3a5002ae42..6465fe66b3 100644
--- a/screenshots/de/features.home.impl_HomeView_Day_9_de.png
+++ b/screenshots/de/features.home.impl_HomeView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fef5908ddd4fba551a21710e5558089d8b22af459b8024ec0e49489e44a9409c
-size 93092
+oid sha256:35b33bec36e7731a2aea269b1a3c1b3e1506855f4f75fcf0ef0745a9165d140a
+size 93077
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png
index 79a282bf32..5fb0408a49 100644
--- a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:141bf23853b7ba97cffd4d54e9e0a48843d0a49e7f6d6a91c41f110d2df1c7dd
-size 24180
+oid sha256:d20416987d2485431b66ebb29af1f03efa2e04da7ef5875eda62d7c5e187052b
+size 24828
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png
index bc89b471f2..4aa0388c8a 100644
--- a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a39d0a1c752533bfb097ad1d2c59978123545ee76259e26efe6e3fbae209db69
-size 31441
+oid sha256:62d531d6b01266019e2fa686321e93d64bcffd5b1786f7ad4efac83fcc2a2fc5
+size 32141
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_0_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_0_de.png
index 94bf3f406b..f032ae2d3c 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_0_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbd1cef03d962c679705a6a7f54fb78c504360df94c1734eef8435e5122b834a
-size 37265
+oid sha256:7007f01f29c880ae8019beab2d2314b93fae26a90c6359f287098314632cab99
+size 37291
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_10_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_10_de.png
new file mode 100644
index 0000000000..4bf78594db
--- /dev/null
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27a5bb5482628162bc6da9caf59fd0bf62f8bec661f30896f11c3442ced3e471
+size 54950
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_1_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_1_de.png
index ff371dc689..553eccad81 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_1_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1269f6fa16bb38ea55ed98b502c3fb350fde867e31b18cb6a61b2306f75ca6cb
-size 50323
+oid sha256:445fab1f219d05b107836780070ac6b91c02b4cc0f289e0b30145f1cefea757d
+size 50657
diff --git a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_9_de.png b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_9_de.png
index ff371dc689..553eccad81 100644
--- a/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_9_de.png
+++ b/screenshots/de/features.invitepeople.impl_InvitePeopleView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1269f6fa16bb38ea55ed98b502c3fb350fde867e31b18cb6a61b2306f75ca6cb
-size 50323
+oid sha256:445fab1f219d05b107836780070ac6b91c02b4cc0f289e0b30145f1cefea757d
+size 50657
diff --git a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_9_de.png b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_9_de.png
index 3730e14b8c..cab79d8a48 100644
--- a/screenshots/de/features.joinroom.impl_JoinRoomView_Day_9_de.png
+++ b/screenshots/de/features.joinroom.impl_JoinRoomView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f80183fc0e3b5b06b51bcf58f4547111d3df1f800aec777fbab41d9d7eb51a24
-size 42252
+oid sha256:57454100c496cbf21eeb0dd858678a4e8c793d6d3ea8de908dd0878821046efa
+size 41785
diff --git a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_4_de.png b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_4_de.png
index 107aa2698a..823bf7c844 100644
--- a/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_4_de.png
+++ b/screenshots/de/features.knockrequests.impl.list_KnockRequestsListView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e75d1447ac2e3a46a57488300f582d050e7494ec280fb52eee2b15bbe2a3774
-size 57121
+oid sha256:0e7e18df03c83c7a0d5d1074677a121fdf7177de86b74811533aff21d34234d0
+size 57197
diff --git a/screenshots/de/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_de.png
new file mode 100644
index 0000000000..630aee04c5
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:495afd76bb17398747975e89e5dadb28e7b8c20309725264be293420b8518ec8
+size 38456
diff --git a/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_de.png
index f78c2b0313..3b08016d6e 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2a85215f1eaffe17c1a32f7067bd1af2d206e554cf027e2d2393c809743debd
-size 49236
+oid sha256:223554d39d768b58789951c63a7cc0fe644f618f493e5d71ae5f8e3b21fb8431
+size 61267
diff --git a/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_de.png
index 098dce745b..c4bacde16d 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da10fc1098c476b5f9d26ce4dd73310274cc48fd68899a7677623e63a539ea4b
-size 44374
+oid sha256:f317b8fb7f924ed6b3f583f316663cac038887720038c560e5d4ba8db45d80d1
+size 53414
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_2_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_2_de.png
index 92ffd71139..308abe5a72 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_2_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf9aea8bd7c9f6d7eb7f31a71ec412ae0f143c60bc6834a1f2ad99e538d87875
-size 33758
+oid sha256:a1e6cd137958c6f3cd9ddad7cdf9dcd35c9b9963cdab164c232ebefa50b7a81b
+size 33815
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_3_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_3_de.png
index 0f07d0568c..fbcb03812f 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_3_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:968c091419c902a4c135a4498ebe2422566d0f2dac72882e81ac5dc6572a9e77
-size 42859
+oid sha256:026cde07bd625e7457af44ef19c4865f6bad8fc7c8ddfcc43c7a6dbdd4acf467
+size 33651
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_4_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_4_de.png
index feacf82d89..0b411260ec 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_4_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e71f2781efd689a0c57613cf03fec734474128ae444b8079d6124f8b9aa19fb
-size 45605
+oid sha256:0b41b171588b46f2b17fe366d311da43653c43dc1eccf539c7f02c12d1c7a21f
+size 45688
diff --git a/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_8_de.png b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_8_de.png
new file mode 100644
index 0000000000..cba542a991
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.error_ErrorView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e77e5930c00c3389179fc5a60a6a2d173223adaf742a53b6900ab96ab0af88a
+size 22202
diff --git a/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_de.png
new file mode 100644
index 0000000000..f79c47c87a
--- /dev/null
+++ b/screenshots/de/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8dcfd0a6965522ddc3d1a0571176eb6889bbf15a390ea7d4348f002ec9696d5
+size 33189
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_de.png
index 1ea459175f..0e9606c453 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91215fa6820bbe0d6da772de2720cde77bc731f28954d067c6a6a0d95709f624
-size 19238
+oid sha256:748da581859b8b1a05a2b5703c17b31f6725d26713053063dc825b425b4d4131
+size 19317
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_de.png
index 45ed4366dc..7127f05f27 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:419f4edd8b097ca40f68d5012c5b0c0e6c1301b6efcd01b13ce0c8e7a13996c6
-size 25430
+oid sha256:446b2dbace2a10eb7332886ce7fa83f992c5314f3a66fd402a13200e9f0f06b2
+size 25489
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_de.png
index a9af23935f..c5645b1b44 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e40215a3f06166fa78319875ca074876e41e19a9155794f4d0b68a132045a276
-size 27975
+oid sha256:84da7365709446471e67dedd9f733786989f56fa1d3fe83ea5ec02344076983f
+size 28966
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_de.png
index e172ea6f3d..f466ac0135 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1684330a9b215bb22fbefe2e59d456c9cbc31e75e01828c67a256b0a02b667f
-size 25956
+oid sha256:a7b92adb8584cf31853a01bda52aacab97df832360399adbf63980ebb612ce76
+size 26029
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_de.png
index 4b15ed217c..2fdab6284a 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e96f99f81040aa3214a1acd937d25299d080ca0191258562cb08f78fbdeff7e
-size 26188
+oid sha256:cde54cd972be78cb89278b4382d7b71297bdeddb0a16503211ed0342ad059a2b
+size 26237
diff --git a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_de.png b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_de.png
index 75f85cba2e..fbda7d633d 100644
--- a/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_de.png
+++ b/screenshots/de/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:759da98dca2f26b5a7e87954fceba866e7fb526dc36587b62cb3d01f3ba29b53
-size 34992
+oid sha256:76c3bacabeab51017a076a58ff61176ec45fff9711b86471cf1e6752692a201a
+size 35056
diff --git a/screenshots/de/features.location.api.internal_StaticMapPlaceholder_Day_0_de.png b/screenshots/de/features.location.api.internal_StaticMapPlaceholder_Day_0_de.png
index f122f99f74..a9ddf2b614 100644
--- a/screenshots/de/features.location.api.internal_StaticMapPlaceholder_Day_0_de.png
+++ b/screenshots/de/features.location.api.internal_StaticMapPlaceholder_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:212f8d1b300b7c1a4e4c3087018e81261b562fea9cf1fc1f2ef4a5443e3fc91d
-size 440154
+oid sha256:5ac712ad4762c520a1e10cd11f65e112ce0d09d6cdaffbe99ef00a03748991dc
+size 295885
diff --git a/screenshots/de/features.location.api_LiveLocationSharingBanner_Day_0_de.png b/screenshots/de/features.location.api_LiveLocationSharingBanner_Day_0_de.png
new file mode 100644
index 0000000000..f889a65156
--- /dev/null
+++ b/screenshots/de/features.location.api_LiveLocationSharingBanner_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efd6cb8498b29f79769b3287a062ee1ddad3c34195aa5d653b8e28e4e6f973bc
+size 10767
diff --git a/screenshots/de/features.location.api_RenderingMapsNotSupportedDialog_Day_0_de.png b/screenshots/de/features.location.api_RenderingMapsNotSupportedDialog_Day_0_de.png
new file mode 100644
index 0000000000..06c4be2c81
--- /dev/null
+++ b/screenshots/de/features.location.api_RenderingMapsNotSupportedDialog_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3065603f9b067f0ddc89a7b8dc24921afd031f4658f6ac11de8feb0c4bf26b62
+size 23910
diff --git a/screenshots/de/features.location.impl.send_SendLocationView_Day_0_de.png b/screenshots/de/features.location.impl.send_SendLocationView_Day_0_de.png
deleted file mode 100644
index 787f11c872..0000000000
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6be1e5c5f4abfdae4e8c8e059ab6bd23808d014c76a029762f3bc213935322aa
-size 19235
diff --git a/screenshots/de/features.location.impl.send_SendLocationView_Day_1_de.png b/screenshots/de/features.location.impl.send_SendLocationView_Day_1_de.png
deleted file mode 100644
index cf4202ecdb..0000000000
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9666da59d98a5c1ea6c786d42d5f7ecdfacef41f795dd9481c8b207f00e5e92f
-size 37893
diff --git a/screenshots/de/features.location.impl.send_SendLocationView_Day_2_de.png b/screenshots/de/features.location.impl.send_SendLocationView_Day_2_de.png
deleted file mode 100644
index 43685df0a7..0000000000
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1db33582d79aee02c96c99e1c42149f91d5bc7a62d1b095428262b03619e1c4f
-size 34219
diff --git a/screenshots/de/features.location.impl.send_SendLocationView_Day_3_de.png b/screenshots/de/features.location.impl.send_SendLocationView_Day_3_de.png
deleted file mode 100644
index 787f11c872..0000000000
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6be1e5c5f4abfdae4e8c8e059ab6bd23808d014c76a029762f3bc213935322aa
-size 19235
diff --git a/screenshots/de/features.location.impl.send_SendLocationView_Day_4_de.png b/screenshots/de/features.location.impl.send_SendLocationView_Day_4_de.png
deleted file mode 100644
index eddcfdc5a4..0000000000
--- a/screenshots/de/features.location.impl.send_SendLocationView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdbfd52bef468588d3655706a06c78d7c9fe6dab354a832b85236574d77af112
-size 19444
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_0_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_0_de.png
new file mode 100644
index 0000000000..26a2d11771
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e80b99b89c442b8126cf80c8497b524b03012075763dd34f646fa1f7850a5a25
+size 19956
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_1_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_1_de.png
new file mode 100644
index 0000000000..e1f4b27424
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94bc010e69f70262da8f693185bbb4e5ab65c1443ffb04409aad4b4ac6d6977d
+size 38635
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_2_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_2_de.png
new file mode 100644
index 0000000000..5b33246329
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9fcdaa31d82e5e677b39ccea11767febe8d51789d410e0934b07ce27ab4033f
+size 35151
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_3_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_3_de.png
new file mode 100644
index 0000000000..8381a894f4
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ad541415245d6e6ca95514db2aa053691d8d2c8193cf0268be67cc74b1af4ea
+size 32928
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_4_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_4_de.png
new file mode 100644
index 0000000000..26a2d11771
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e80b99b89c442b8126cf80c8497b524b03012075763dd34f646fa1f7850a5a25
+size 19956
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_5_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_5_de.png
new file mode 100644
index 0000000000..18dc2c74b7
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6edd90a847c7fc84c25545313f90ec41b8769d4a9b758476725f7ec5255fc167
+size 21838
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_6_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_6_de.png
new file mode 100644
index 0000000000..bb93cfc575
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1342bc5c63e6fa38797d1867b5006ebc91cfa926d189e4ff9060f84efd8146ca
+size 26114
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_7_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_7_de.png
new file mode 100644
index 0000000000..0663eceb1d
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b08870ebcd6da6372363b0af0334524a4288db7242cdb5a377512ef9aa728a66
+size 38883
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_8_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_8_de.png
new file mode 100644
index 0000000000..bf8a621fe1
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a5606179cc7dacc1d0bc86ff0f38a7654cebeb7c428575e2da51d4af0ba12b9
+size 43384
diff --git a/screenshots/de/features.location.impl.share_ShareLocationView_Day_9_de.png b/screenshots/de/features.location.impl.share_ShareLocationView_Day_9_de.png
new file mode 100644
index 0000000000..d8b464213f
--- /dev/null
+++ b/screenshots/de/features.location.impl.share_ShareLocationView_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1ab182dfc2b45c80972722b1963a75c29175c1d09369fafb96c7b0ea04bf08a
+size 21171
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_0_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_0_de.png
index 1e8329391e..d52980f113 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_0_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7023f8cfa5fcaf68d44790813287382df6b5f496e1c6bc3025f5e6f280b82f85
-size 11123
+oid sha256:1e8cb1edecba35913251d57d6eaa9d48149f7b2a26c180978c0ae34d3d354d97
+size 19693
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_1_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_1_de.png
index 85da5bc99a..7793479410 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_1_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4976c47e82967168892ef6a0125210b437aa5a2bd80f6100979a60ca365c259e
-size 32420
+oid sha256:5f66385d2afa0a3a4c68418c58b65bb9f073512842d6b601ac9ba7170a70f3d7
+size 20266
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_2_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_2_de.png
index 53aa498533..cf15f3c0ff 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_2_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1befcf4a87a8aa3c925e55d3ae8776627bad230cff5e09f6c8d33172749be313
-size 28793
+oid sha256:a93c8f459e118b5e97802055c076a31c260a8d1b9b863dec4464d79b5ece62db
+size 16650
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_3_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_3_de.png
index 1e8329391e..03f56a96b1 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_3_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7023f8cfa5fcaf68d44790813287382df6b5f496e1c6bc3025f5e6f280b82f85
-size 11123
+oid sha256:534b3512dd38f27f313bbd8655667f3ecc104c5095e140f63b2e124277886d07
+size 40599
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_4_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_4_de.png
index 91776aecf1..3b8f513f0b 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_4_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32b1ab1cc6703376e1649d5b4b0288b142d954d7cbe02fd966a523e2c7b01f43
-size 11254
+oid sha256:af69b59202b1e21069e13e444017d8e25ec467d8cbe5899448d74700dc1a765d
+size 37091
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_5_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_5_de.png
index 5b2e833a43..6a87af5d60 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_5_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46d118957b387eff49efd968202186592087e32e01859b3c84f0f90b730e835a
-size 14832
+oid sha256:da8a5e9159c4817b5c500d721e378e51d1f3ed6bea5468b54e4e66db1969c292
+size 34873
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_6_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_6_de.png
index 9942a70172..0c68797fef 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_6_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef794ae82eaeda53e7300b4c935d9ce7f4487b204ee78020bd4f518f816f7880
-size 23288
+oid sha256:6fe56f20ce5792f9dd60bf0ae08fa5c5c78fbb7a5f1a80eb2fe973716be69c00
+size 19831
diff --git a/screenshots/de/features.location.impl.show_ShowLocationView_Day_7_de.png b/screenshots/de/features.location.impl.show_ShowLocationView_Day_7_de.png
index 02f54e7e52..a49023fb61 100644
--- a/screenshots/de/features.location.impl.show_ShowLocationView_Day_7_de.png
+++ b/screenshots/de/features.location.impl.show_ShowLocationView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d525359e7d0a5dc0dac54f05acf77dba55528bc3cfd614c047bccdd670267b67
-size 25989
+oid sha256:fa435ee5d684b82c66c7207e0bcdc2d608a634e02d534530cccf8abd0f40f784
+size 21292
diff --git a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_de.png b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_de.png
index 901899b6aa..9ea51fc8de 100644
--- a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_de.png
+++ b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f79feaab47702a7875ffd06557bd90bb36792195fa1643f8614162ae49e57316
-size 19094
+oid sha256:73eff278a1d56a54cc068a145b73d792e0e40c7bc6db926df2db1c23229ef5a7
+size 19145
diff --git a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_de.png b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_de.png
index 3df5f3c6a9..25429f5f83 100644
--- a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_de.png
+++ b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51a45136541e3bc31adb410303f8244c8ac75cea055d673e94eded52bc867445
-size 21317
+oid sha256:0e9079d17f328a1b1bc24c3d85f9c0db5d76a1a8a5937bcbadaa092cb0b71f6e
+size 21325
diff --git a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_de.png b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_de.png
index abf9afbd2f..69eb1f4aeb 100644
--- a/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_de.png
+++ b/screenshots/de/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52921866cbcc80363f8bf8d3fb57a94fcdac7910d0dd56d83c9d6feb9912aaab
-size 32648
+oid sha256:8ff4b516f4282d6a78164c011332a4dd9dc1d0fe5f21ef7b5d574503d271eb90
+size 32624
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_de.png
new file mode 100644
index 0000000000..4bc3702d4b
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bce43aafc388033e057078e19b68f609f8f40a9c81b6a236a6e9735df6cb24f4
+size 34798
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_de.png
new file mode 100644
index 0000000000..92b3009a33
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8304689ab13c57ecbef0d34863d2f5d0178d04656ba8371ac41c8c8adf1771f9
+size 35106
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_de.png
new file mode 100644
index 0000000000..2a985393c6
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fef8dac7418c2ee8655e7ee488b4c1dc2765fdfc3fcee86685c9059c48254770
+size 22796
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_de.png
index d9b37fcbb6..1378a04aa5 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e9040a7720257db29bcc71a9466bfe081c832878f88baf52bdbbed390505a1b
-size 37170
+oid sha256:8ace865ac209e2dee5944ea526d1fd8337236ae81c43f90635dbd9b2db905780
+size 38535
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_de.png
index 48c92bc715..5294d06956 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1adfeeb7e91aae96124e3062f20c029df73cef9e68bee2149155e1aa0fb7dfa7
-size 33956
+oid sha256:dc388c605c1c09710b6e979aa2ec6110964c9ef3020b7e8c3e7bfaf839a48133
+size 35383
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_de.png
index b33b0c2150..36c7aca115 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d9f3c98a0e112c49b365f20fb5c4403b6c2073f62072c457f5e7df9e4c979c3
-size 23555
+oid sha256:e3cf2430c703ec8c38d0fa11bd486f8aa960822246338ada3e0bc4fa2c846b7d
+size 24074
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_de.png
new file mode 100644
index 0000000000..048facf45b
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b4ead892d27f2eb5fd7c9319e3c954ab2ae57c68180e08b30c07741c53cadda
+size 35383
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_de.png
new file mode 100644
index 0000000000..af1fe3af55
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b481b2bafe288542d25c301aa568fdbd9d63170b1c59b01fdacacc69d0395b3
+size 17352
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_0_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_0_de.png
index 44b295fbb3..bde4a6cba7 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_0_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c0f9f0948da8553e64cbd3dd8643420dbbe0b2ee0655ef09b4d4869495f8f67
-size 38036
+oid sha256:4c764d8bd6dbf39c937b45eaa6a24b048ab9db1528494503494c02b6fcdf1523
+size 38035
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_10_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_10_de.png
new file mode 100644
index 0000000000..1d4a0bcf29
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29c3399d104ced9fdbfc5be3dd9792fa5b3a42174a3cb81fcee11ac099a80055
+size 38394
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_1_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_1_de.png
index 3b324af20f..2ec1d65aaf 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_1_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53f201aeace81ee0564d41542bfc8ea904d71527746ead6cbd6e9faddf29e699
-size 38421
+oid sha256:b047b01f0573eff0ae7798afbbed1df7e52c754df8d5a7744958eed939179443
+size 38422
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_2_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_2_de.png
index 0343205abb..b6dd30b9a3 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_2_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15200b3f62fbd9b0ecab51560faa4696f384daf7463a407445b2191f94c13645
-size 38695
+oid sha256:962d90cd71c5ed7ea19ad08bb641f197466defb85840ff7ed30d49656eee1b06
+size 38679
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_3_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_3_de.png
index 13ba4da40c..06011700ab 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_3_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:059452488e08fcb9f35afe0db8805665417108ed0593561251f648b91eb7c3ff
-size 43688
+oid sha256:ca9d69de30e7fa7008263c78f5586814d109ab8c043a19ed687f9327b955e03e
+size 45033
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_4_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_4_de.png
index 2b7542cc53..ba059493a7 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_4_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30358430cd572face46c5d6e060fe0b93947670aa4c4caa091f8a50521ae36a7
-size 35467
+oid sha256:902411746e402c8c5e82393ba854d40a17f60b0ff5ab13ce3b8928449bf92fa4
+size 35471
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_5_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_5_de.png
index 6297eded9b..e9d66d7ee5 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_5_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b3ed6ddd42ca136fdb7ad0f18d03e112594c0d9de93264bc2659e1b3a4e1e75
-size 40614
+oid sha256:41a80abb68a227320c18a797f73efe0fe9dc0ebed50fe8f6523c433fc566e6df
+size 41989
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_6_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_6_de.png
index ded859b551..759b17db50 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_6_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b6828f3878d95a0357b399072acce35b073767fdbbfea90fe9eca73f60af802
-size 31600
+oid sha256:93caba67729429e85bfe4a26846a1ea1c122f1b1aa7e0622dc11bdecb2741cd8
+size 31032
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_7_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_7_de.png
index 2840a40c3b..1fed050403 100644
--- a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_7_de.png
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91a83c3de10fea2e5edf3d96bc9ecc1fd81000ec957970696bca6c13d4d9dca3
-size 31820
+oid sha256:fc5e9086a7896b21d7a46fbad3ee5962be125fdd5f9609603dfe6f1779395c7a
+size 31798
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_8_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_8_de.png
new file mode 100644
index 0000000000..2e062dad91
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3cbbc047bbdfa813c4bb984a469370b33d8ceb44b1e57e2a40cf84c7b20f7a1
+size 41492
diff --git a/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_9_de.png b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_9_de.png
new file mode 100644
index 0000000000..9968deee8e
--- /dev/null
+++ b/screenshots/de/features.lockscreen.impl.unlock_PinUnlockView_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcfcf26c1c2cb4e33e6709232f535331ce00fdde22455940e7b02b4dc727ecb2
+size 32938
diff --git a/screenshots/de/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_de.png b/screenshots/de/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_de.png
index 4d4ea2f91b..dddd616aee 100644
--- a/screenshots/de/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1ce3c32dbdbaf44d7e2dc92687c66212538b89bfebfb0eb5e7b7dd768dd0ebc
-size 6983
+oid sha256:0abc6cf5caded1e0feed221cab79a46b7e718ddb584c3483bc23ce8ddccae909
+size 7035
diff --git a/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_5_de.png b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_5_de.png
index c6a8d72619..ec9de6ee4e 100644
--- a/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_5_de.png
+++ b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c3b505df79be2829a102e9a0249fc23c5f5de1e7fa19570a1fd1e5ab7f9aaee
-size 30819
+oid sha256:228c78854193cffdf1a0a22a80eb742b01dcef195192196f7b63c32f3d0666e8
+size 30823
diff --git a/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_6_de.png b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_6_de.png
new file mode 100644
index 0000000000..b6a959750e
--- /dev/null
+++ b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fed6d5214bd9c5115a1434ee0d22b483bbbc98bffe3a38b74e1b154ba58daad
+size 33314
diff --git a/screenshots/de/features.login.impl.login_LoginModeView_Day_5_de.png b/screenshots/de/features.login.impl.login_LoginModeView_Day_5_de.png
index c6a8d72619..ec9de6ee4e 100644
--- a/screenshots/de/features.login.impl.login_LoginModeView_Day_5_de.png
+++ b/screenshots/de/features.login.impl.login_LoginModeView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c3b505df79be2829a102e9a0249fc23c5f5de1e7fa19570a1fd1e5ab7f9aaee
-size 30819
+oid sha256:228c78854193cffdf1a0a22a80eb742b01dcef195192196f7b63c32f3d0666e8
+size 30823
diff --git a/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_de.png b/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_de.png
index 6d5ff2fb19..6f7d6a890e 100644
--- a/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30d254a28c96235d956b694cae9e698a73c86b2c750e458efc88e08fc4d18a58
-size 55417
+oid sha256:af547cb5fc2383ebd6171d2833b481c0969e273f144e24bd121e07678fbd54ab
+size 55044
diff --git a/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_de.png b/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_de.png
index d7180b80b0..5fe846ac85 100644
--- a/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cca634095d7d739fde70368cc0115c6041734cd8346006acbd5f377b9b91a5d
-size 52531
+oid sha256:90815365dfcf8173bc6793920eaeb200b8fc0d07a395bd13d8f3606578de5c85
+size 52318
diff --git a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_de.png b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_de.png
index 795eb7f26a..860b8ce02d 100644
--- a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d187b6625c1faa80e8586ee0eafdf204f8409a2ac7c2e04fb56397482d928cf
-size 22145
+oid sha256:da20d1d3458a85ae1fb27923cbb5bf338bfc3386d1725dc8222836bb3984b49d
+size 22169
diff --git a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_de.png b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_de.png
index 7de0dea136..cc70955112 100644
--- a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7ba030dbe6187462882c8f850bce242f7fe0e3fda7e84dc4d89f72509f03a26
-size 23032
+oid sha256:d722df4ed5bcb4eb50d360c0170f9ad786c7652ea5f4316d15800d8e2ecb2af7
+size 23058
diff --git a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_de.png b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_de.png
index ecb67acfc5..b9d19b2899 100644
--- a/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a89d26ff170ac81964f27ab8c43772afb295446c2c1d7281f8ac4fe6bfddbf35
-size 23650
+oid sha256:a0bc78928bf5d2f228f0f81ad96b5d87a317aa69c19ad6690bc1decf4f51539d
+size 23680
diff --git a/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_de.png b/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_de.png
new file mode 100644
index 0000000000..6c4b3efc05
--- /dev/null
+++ b/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54dd4604f24579447336a906c9cad8b7f0d27f2b30770a136709d2ea964a8ecb
+size 78928
diff --git a/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_de.png b/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_de.png
new file mode 100644
index 0000000000..68e2995e17
--- /dev/null
+++ b/screenshots/de/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7209ac29981ac25c206497fee6acacdf6fb8cbb1d0592b57ad343aa2bc8e4bbe
+size 75196
diff --git a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_de.png b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_de.png
index fc2a26b90e..7cd0b44e91 100644
--- a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88d4448dbf7fad8cf6ec5075babdf09b5f46401a259a6ef3f9b380a4a3de0240
-size 38712
+oid sha256:ac1d614f172213fb336f22ae114bbadc0560824276ecc6fb97904eaee2b1f0c3
+size 38783
diff --git a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_de.png b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_de.png
index 77a79c8e8f..3fdbf2fe1c 100644
--- a/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06d30166f29f5335460e6cbaabc81d7cdf38b7043b1767f51976386fe2e35347
-size 39568
+oid sha256:f96859710af78fb5578821e553eae9c1b5111c35535d6ea2920b59ff63b573eb
+size 39638
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_0_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_0_de.png
index 2a450d1a6b..613d3f3187 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe3adc472fa03a75aed60fb611319ab155bc6d9bf60c1da9a5b65cab0821d3de
-size 314324
+oid sha256:1cc00314a0e4c77304c8721bb65bcd792d8efbbd6c275ef41ea2729055f196b1
+size 315719
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_1_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_1_de.png
index bf73067a10..b771b4915e 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add9881336231b639b38b183a7b8d382204fd4dc8e173a145c6ee1f1e815fa0e
-size 309781
+oid sha256:c289148733adcab13f0a58a4b7405d01e9a2a97d9942cb86e8790c609cc667ce
+size 310987
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_2_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_2_de.png
index 5b4bd40afa..40c0db72d8 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:959ec8deb13aa0af9982855037afbc8a97e13b4aa2396c3d69c897514e24eb70
-size 312815
+oid sha256:c92e79c2203992171fcb7f89e7f2474dc4637e1a32d12c3d3a0391b82be2acc9
+size 313974
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_3_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_3_de.png
index c9d282055d..2f1bfa0312 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_3_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f546d4756c41db91f70e668de0cd6902edae4953396d0577121b48660f258348
-size 307243
+oid sha256:321008e9dc350a67fa56bc3c3b11d3556107be9475f7195bbf31547adb8703ca
+size 308360
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_4_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_4_de.png
index 3a859fe640..1f79459486 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_4_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd6115c0f4cf6d99439c2246036cefb4720ae52311f43eb89f41872290d9f77f
-size 307698
+oid sha256:4504fba00287a8c95d204f21681182ff88427fd97f5cc18f5c0bf8728bc131a5
+size 308826
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_5_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_5_de.png
index 56d446fd5c..1c53fc44b0 100644
--- a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_5_de.png
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2115ee0514c103d1ea7b271dcff34297a284fd7007422be5c36df362a1a06c30
-size 317095
+oid sha256:c2617d02d1c5e2b5f6e1d456bb2306f1cda05639f206b7ad7503bc8a4da0a4b9
+size 318509
diff --git a/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_8_de.png b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_8_de.png
new file mode 100644
index 0000000000..529e3e8ddd
--- /dev/null
+++ b/screenshots/de/features.login.impl.screens.onboarding_OnBoardingView_Day_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:336844a35b925383f7b0c621339f0f6d9b0e81b7a85d18e688d0dd279ffba965
+size 317025
diff --git a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_de.png b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_de.png
index 50663c9d70..7848b3de7f 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8153b9a20bb2cda60b59abb617f527b165f54fee15235384b580de74b2ae31aa
-size 37912
+oid sha256:7ead8637651c4d0e3c0f6e78c596c4781d00ecb493bdf54ac96670b55ff541c2
+size 38217
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_de.png
index 92ffd71139..308abe5a72 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf9aea8bd7c9f6d7eb7f31a71ec412ae0f143c60bc6834a1f2ad99e538d87875
-size 33758
+oid sha256:a1e6cd137958c6f3cd9ddad7cdf9dcd35c9b9963cdab164c232ebefa50b7a81b
+size 33815
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_de.png
index 3e1a99aec0..da94eb9d22 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de35cb70fa0076e5c1d0ab35cdae0b48cac90aa0c0223538276054e69768fd2a
-size 42776
+oid sha256:3eeb6eb4ff66c0558d2abc960a8bffc757d6a8fd043f9c4eee4667176de38617
+size 43485
diff --git a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_de.png b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_de.png
index 11011887f3..49aa77efd2 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a4508363f01ad58b30503ff92236349b619feaa5716524438a2f52f033d71e6
-size 26225
+oid sha256:e1c0c74a437c19c02f04c6de9898fc8fcce98ebdd0161f97d9973d6bf091db58
+size 27056
diff --git a/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_de.png b/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_de.png
index e55f0530fd..4119ae071b 100644
--- a/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_de.png
+++ b/screenshots/de/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f27bdc5b6fc21700a4f8512230084f1131d9804eb7cd4366d61f90deaf55bb60
-size 56835
+oid sha256:b742d5311fc1961bc9a5a61658e77fdf1ab3f83b5fb93e0a4fedd7f50a3faacb
+size 56999
diff --git a/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_de.png b/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_de.png
index c3966f7b8f..a5492d7f3b 100644
--- a/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_de.png
+++ b/screenshots/de/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92c6387df06a280ad6467b8a819c3e7435fafc0a3ea440b090e240e952b552cb
-size 59255
+oid sha256:1482aa508f02e9e4db7a91e5cf69f3d6f9cf5b2f30ec76ca8c5b76a9428e76cd
+size 59401
diff --git a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_1_de.png b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_1_de.png
index cce900f9c8..f284b228db 100644
--- a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_1_de.png
+++ b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea70291958f6daa69da86f4479eb3c1c5398a6dc23ee8eb935ee2bf29e938861
-size 19022
+oid sha256:a89135e74bc17ed75126152bc1430e46c066549b42022995e19eb2e834ec2702
+size 27232
diff --git a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_2_de.png b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_2_de.png
index 7ff2a4608d..3d3ad6e858 100644
--- a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_2_de.png
+++ b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d8127471c3c6f14883bec221a6ce637ccdf733582caef4497689a59462299cf
-size 9489
+oid sha256:3cd4d7561202538ac0cea1953f038c397e355bd478b5a2eb2d59a3670c135938
+size 10949
diff --git a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_3_de.png b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_3_de.png
index de80fa70ba..51d3b483b4 100644
--- a/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_3_de.png
+++ b/screenshots/de/features.logout.impl.direct_DefaultDirectLogoutView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cabdd1c4ad7e6256c232e10950f0d7c23410af2a5e91cf729265da0af6af8672
-size 20656
+oid sha256:67e1b58ec1118afb4dc8985f22df74e103313db8239d4b3650cd9052a258645b
+size 22445
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_0_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_0_de.png
index a6428f063d..c19097e89a 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_0_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f7c52ed254e4c25516714274000fe41f00820cd2df2b8232628ce43cf5e95c4
-size 90825
+oid sha256:392e090f14a98249b1cf3cf4acf180a817c41dbc8b4320ad5b8a2b4636ba0f14
+size 86883
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_1_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_1_de.png
index 55443656e3..c84f36df47 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_1_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea581062b4d0e6bf40089463632c4ed6dc3e5d1fa81667148f50e39a7763d76d
-size 90544
+oid sha256:2488a2d453b8a8cd086e531e1c49ac2d41186713b85c1aba3df73cf6c7a5f1e8
+size 86605
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_2_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_2_de.png
index d95fa85ab0..8dd9a8233d 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_2_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e49596da984aafededd2ffe2c850ca3bea516e56f55e4e72cd5cedfcf6b4c4ef
-size 79081
+oid sha256:f0870cc34ef448fc914f7f4a688781bacaca59edad593509ee5cb333fdcf4acd
+size 73713
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
index 64e7962bbb..50752acb56 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09fb626761ab736d5ea66e3883e215d0a1ec1a89155036eeed1775e9cdaf5ff1
-size 69761
+oid sha256:844f24409611ccc30b514427c72cd057ed838a1b4ba058a4c6dd941858908e65
+size 66529
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_4_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_4_de.png
index ecb40a0d36..e20e0c63c8 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_4_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45f01d0a582bdf3ecbf34bc6c6c32f29d1cf83a182e12e3df1b80da6574ff836
-size 61047
+oid sha256:cf40d60799deb62643ca650deb1a5b5e18f5d26ebca7927064c51a0f3a8b771a
+size 57890
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_0_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_0_de.png
index 8da7ace03d..6483c00de2 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_0_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0acf2aa6b64219b503f168f51c61d89781ade323346a70df5fc55937f8573d25
-size 11407
+oid sha256:e9d61733ee67c899170d1aa57fec8e9b7b24c3f3b629cbcd48e2a16199f2bab3
+size 16988
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_10_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_10_de.png
index a2fc5098f0..e689072a9b 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_10_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:398ba71b5da9adf840da5fede416b5faaa712809dffebcb4e878929ceb634256
-size 30936
+oid sha256:72d2376c919a9d0fabe5324ac08659d23968e35a28636b76ba06cb5a45b713c4
+size 33299
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_11_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_11_de.png
index 70b7056d37..91e1a4ebbe 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_11_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f4f342e83f6d444c17c7c24b9371820c0e08352f649aa0b13a431fa70d8d8d4
-size 36160
+oid sha256:60070d82ca0753ca6d98e6ed84715a3dce70c7ccd8cb317e7504035e15c7347b
+size 38499
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_1_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_1_de.png
index 894daf596a..7354b5bf41 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_1_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f731b09dcfd8f2eff8958f2a294c9f8f969301c290d118fcb9446a7414652b9
-size 47022
+oid sha256:08fa6f2925434cc451adb7296041af54941b7b9e126887bd529692fa208060ae
+size 69544
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_2_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_2_de.png
index a4346a5c07..2d49c3747a 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_2_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:467e3b44603d9f9e62af61c2247224aa9fcb27ed0074da1884b94e7666a93bec
-size 32548
+oid sha256:5691fc1410a02d9526f73ab0e619056761909d9b65284decc089f4477e0b2acc
+size 34918
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_3_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_3_de.png
index 894daf596a..7354b5bf41 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_3_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f731b09dcfd8f2eff8958f2a294c9f8f969301c290d118fcb9446a7414652b9
-size 47022
+oid sha256:08fa6f2925434cc451adb7296041af54941b7b9e126887bd529692fa208060ae
+size 69544
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_4_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_4_de.png
index 02b28888b1..57162dc8af 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_4_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eae66522bc3d44a9b54e5dc8c6abb9b2f18eded3f1ddccbb6cc3a167c4b4e53c
-size 25861
+oid sha256:390cb6ad3a2918bf8a52641d6084829d8dc9ee518058765e04fa863e6a955b0b
+size 38436
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_5_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_5_de.png
index 2511e03e32..b9b5c516aa 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_5_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ab576bdeb5aa0dd38c748de53c1d7cc406d2ac857506483f04cd93acd51ba3a
-size 17087
+oid sha256:e34bac390005bfaab9f3c173c693c05390725f1b59033515ca3558dd1b551566
+size 22457
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_6_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_6_de.png
index 650d435f5c..d80e6d6b42 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_6_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7fea817934002a4e7343199a281c2ce08e3b299e23efed82e4f1f68ab94f977
-size 27206
+oid sha256:366028bdd1b02cf2f83977e01b4c8b0344950b5943874a193238ca180773b534
+size 33522
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_7_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_7_de.png
index 49d605924a..ed1172e6ae 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_7_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a2b1dc530bc95a778be29a331fe765b80b79ecd3690afd58e296aa27f398279
-size 40887
+oid sha256:fadcc1a9018cca35bd08be7f7f4d670e55ec362c15c0ef89625988da6be95ca9
+size 47451
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_8_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_8_de.png
index 958d6e6583..dd9ecc5fed 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_8_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92f34785ad838bbadaa40c4ab3a602fc2644673f7df4ce320227558b57042ec1
-size 41545
+oid sha256:652613c8509079b395d964c0290272a09b6a9bf4ca02c18d6edcae0b43e06d16
+size 61053
diff --git a/screenshots/de/features.logout.impl_LogoutView_Day_9_de.png b/screenshots/de/features.logout.impl_LogoutView_Day_9_de.png
index aa8d8cc60d..dd9ecc5fed 100644
--- a/screenshots/de/features.logout.impl_LogoutView_Day_9_de.png
+++ b/screenshots/de/features.logout.impl_LogoutView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d8075c75345069f27546f566c039bc4d5632dacdf220a63b38a64fe88507340
-size 39385
+oid sha256:652613c8509079b395d964c0290272a09b6a9bf4ca02c18d6edcae0b43e06d16
+size 61053
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_10_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_10_de.png
index 8df559390e..b45f9735e9 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_10_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5758b86295a5cd92cd103992ee601c762b876fec28a4380c793a6c054993513b
-size 35016
+oid sha256:ec2f3efaf97bcc35ec40f04a2196ff6c194a9481847e10354aab7a84ffe44cb6
+size 35651
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_11_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_11_de.png
index 044901ea5b..9c4b79d103 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_11_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ce01cf6c3d326ad4208fa9832cab3e56164f791f59833b1f73d6f29e531dab8
-size 54709
+oid sha256:2958036448d7d58899dbfbda756a9d426bce315ef5b435d79396a9a80784940a
+size 55178
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_12_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_12_de.png
index a7ba678616..7844abdf8c 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_12_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c52f77e77180d8e15b67abefac41b54107397fd489440d5aafdc4079d0100b8
-size 55075
+oid sha256:2d217bc76203d0dbbda69a567502a0ef2966408422ddea258b1171a72d32c382
+size 55460
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_2_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_2_de.png
index 220ebf1ac9..4c23a8e276 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29ac70d223cc1f1c3a63c21431864f60bd6e199de574e1a2cded10bcaac11a8d
-size 46842
+oid sha256:ca13fadfa2beebca49b47539556a7b65f9ad1e79b73af5d1682c743899c7563b
+size 47402
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_3_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_3_de.png
index 5150bb2206..8a481ed3cc 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f04c852c210a027d1792d7512aa9ecc3a6913d3ba9d18d8680df991f8050f57d
-size 51086
+oid sha256:606c1a9e29d01dd48463dbd2002f4778c1343e06ddf61c6587ac2212d292fc17
+size 51296
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_4_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_4_de.png
index 3c5ff4c7c5..db7d125d2e 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0d6742849583dc21500d5dba09bf535f71a5bcd070cd129305c1dffd817d8b5
-size 49443
+oid sha256:553c3b8caf077981aeabe99175f5626737347f5ddf8eb983f6453f18d52f28f2
+size 50050
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_5_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_5_de.png
index ef8273806a..8f8b6a4d85 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_5_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbf746337b88e848b7e99e526efe2ba468d28fd1536970ddc4e02e0d946e026d
-size 45151
+oid sha256:efb40271c1a53965bc57d1a43517d1043df44bb3df97042b0255f66e96a01a28
+size 45325
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_6_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_6_de.png
index b75f0d76b6..7ca56941ca 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_6_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63b5fdd8b50485c835ce04e61b3c21d2f6d306d73c98675d1368772f4ca74c1d
-size 49708
+oid sha256:918feb5ac03bee1e4b7fd833d1d6c5614aea5356cccd6655fb43152a5d9629fe
+size 50302
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_7_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_7_de.png
index 0d842f530c..3f72616816 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_7_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d7e27bf9c1e2fa0bd86fbf986ced9f21ceabddae14c00086b691f182aa7ec5b
-size 45918
+oid sha256:323c2ce83c77f3a68c6543f6c9882639ee33004fb9fd5717f2e1e2b7db68dc81
+size 46073
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_8_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_8_de.png
index b6587618ec..e69c8dc756 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_8_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61af5729e24ee0b15af8df2bd641411ac8f17a5b7f9a76899c6d05f328dbd05
-size 48879
+oid sha256:438227f1c69e12a7f4e661820e1bd8ae49b2849ff6fc4fcab3850f3c17b67239
+size 49412
diff --git a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_9_de.png b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_9_de.png
index e41b40ead2..439f7d1e9e 100644
--- a/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_9_de.png
+++ b/screenshots/de/features.messages.impl.actionlist_ActionListViewContent_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f83a10070d130542d0783c8a39f588b869ec265b9c0026afaeccc0b7b50602e4
-size 38159
+oid sha256:bce484eb6c854e78da2d354728de6b4f4f74d5f75ea452174ac9f5343be448bf
+size 38679
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_de.png
new file mode 100644
index 0000000000..210020e06e
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99d5cf65c968619f2a99f382e2de07d08022f0325349f86571c5766d17fff9e0
+size 327894
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_de.png
new file mode 100644
index 0000000000..3ee21f4b12
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82b816075c7ca6898da2c295740f6828a15a16062e944f01a4401ac0b84f6008
+size 282325
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_de.png
new file mode 100644
index 0000000000..7aeafb4481
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11222c39d8ef830649fdd0b35c95b31b4d934c0c2667674ef7d659d9a3320b52
+size 255483
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_de.png
new file mode 100644
index 0000000000..2c62689a45
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc3d7320da4451c862f1083981d628a4df4115e95f9e88db7e0d1910f9890eba
+size 276670
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_de.png
new file mode 100644
index 0000000000..1ba1a3158a
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b23a3fd19bb6057dc13f61525a4589a3d1dd66a97818c4229d4db35cb6f56faa
+size 250779
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_de.png
new file mode 100644
index 0000000000..3f3fa22933
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:028b3249d8d63cdf799ac1e0ab530e4a46140c53adf8b83a05153d03d030d4e6
+size 310168
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_de.png
new file mode 100644
index 0000000000..aaedf662af
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24b6a36a3efa0127a099081ef711fa804879ddca347849580e80c2a147c7f4c9
+size 282515
diff --git a/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_de.png b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_de.png
new file mode 100644
index 0000000000..5b2ff9626b
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7138b55da8a0a0a3ed2c049ec84d01fa298223a3b6ffe391fad7a7e3a3a3beb2
+size 282778
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_de.png
new file mode 100644
index 0000000000..ddd7968542
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13d5e217d05992d797a34ec634e7900ab48cceddc02f169ad21ddaebbd985417
+size 344738
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_de.png
index dff61b2c88..486830b06a 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec1b6c85754dd2f0ba4b67a86ab8688df6c6471a53e508198b1d3af630d179ca
-size 400952
+oid sha256:ec642dfd92ffcd3ba4a9ed06518481935c4e38342622c4c5c74efdd68a4e7190
+size 403979
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_de.png
index 4ce254bb81..77e3ac9d5b 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af9841032d9faebbee6f759259ef14b0d4cca3424ac110e1dfd1d3357768e436
-size 399354
+oid sha256:45e5a33dc04d65050fd9098727f262dca526d5f55f2c64ecd235e9ae97aa8767
+size 402313
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_de.png
index 77d7c16046..7700d70b06 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e82d2a12ee66397f1c114ae4836a8e513db4f1d87c1fc4501bc85efbb1e63f83
-size 62736
+oid sha256:608236a6a1864f0036fb0d2bcd85d7269557dc3453876495585573471d08d2de
+size 65085
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_de.png
index dff61b2c88..486830b06a 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec1b6c85754dd2f0ba4b67a86ab8688df6c6471a53e508198b1d3af630d179ca
-size 400952
+oid sha256:ec642dfd92ffcd3ba4a9ed06518481935c4e38342622c4c5c74efdd68a4e7190
+size 403979
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_de.png
index 0c7eeacfb6..c9b90482e3 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65925352e2e25b708f04c1adbdf5ec70a515a980776887a35351a8cd94ec94a8
-size 62591
+oid sha256:116502f69435e6d7a5fe9fe9a2a604fcca36d1c6e1e09836595769cf8e8022d9
+size 64937
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_de.png
index 041a34fe20..a1609b8144 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9392073a8a6600cae209985e789fa081496a2c5cedb772f835a73b05c49570aa
-size 67711
+oid sha256:4d3ecea8217faca0d45acfa0a04023efff0124ad0563857ec4ce81e826033f74
+size 70311
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_de.png
index 8313f647f2..a10d3f58f7 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb34a1ace20c04dd99090ef68d17924f3a24a475d1ce5d376969d18df95d315c
-size 71910
+oid sha256:f350e78ea3bba4a80d22af4df58b8a6e415a68fe56770027c9da95da0cab0973
+size 327790
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_de.png
index f9b27b26a9..f609ffd014 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3c995ea0668250953302992ddf3e535247dc5e972fd737313b5d352349839e6
-size 407904
+oid sha256:fd092ba5b859abc14b18702a613aa4b7bbfad43c2e91e294ad876edbcc5f9960
+size 74489
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_de.png
index d2e6e0ccb9..ed5e8cf442 100644
--- a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_de.png
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:957d2be646cba8c187cf6583e4598b72b6449ac745eceb88b8cbe647e71ae236
-size 88554
+oid sha256:5ae9aeabad16587e233b815e60c76856f30f7296562a2b4abb1149a8490435ee
+size 410888
diff --git a/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_de.png b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_de.png
new file mode 100644
index 0000000000..50674e05be
--- /dev/null
+++ b/screenshots/de/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a927ba77b12465d718d8b09ed12c4c04b18c2d9474d242a2c1a8bbea5cf3b226
+size 90934
diff --git a/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_de.png b/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_de.png
index 59a1f9a9cc..9b2462e1d3 100644
--- a/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f66fe5b25e3de0a28bfdeb0d45de675407af34e2767b59a8bf75cfc225e9dd5a
-size 25446
+oid sha256:c40eb122d941ba96cdccf2c97659fce4f5599c88f7aff0ef3e5d084abd0fb241
+size 27341
diff --git a/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_de.png b/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_de.png
index b957f75c10..56e8ed31c9 100644
--- a/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1930f51ff9b9d39cd9ea9a0addfcea9c5114b4f9e2449a57040deac0576f0498
-size 29491
+oid sha256:8b3f371d99fff430a018e02a3d64ff0e88fa615db43a3c48a66975fb00145970
+size 29875
diff --git a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_de.png b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_de.png
index b46483bee6..80e1c0e9f0 100644
--- a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0d3451e07ddc21d22d59ab932075b0b957f7a51903f373922193ade95afb43b
-size 54648
+oid sha256:58932b4453c81582a8f3bd4e47a4dc37355bc65ce23413715d240212e44c5dbc
+size 54567
diff --git a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_de.png b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_de.png
index fe5e6a62f3..70f452b628 100644
--- a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ad8ffbf4727694e35b4104a0329443e4087ebfd780a15c0b2680d14fb50376d
-size 65291
+oid sha256:f199bc84eb10342e677b22e60c1b74bd9c1fe0b9842c474961e601c23c9d67ad
+size 66719
diff --git a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_de.png b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_de.png
index 6d95e18da8..80ad7b4e48 100644
--- a/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92c919777810db1c4d31897b44b3b35cf70ba6f244061f1539eb5efd4f20ede3
-size 66922
+oid sha256:743455d5509d5e81ee5eb4012a03c5ae8c2002750d57f5d379435e590adb2990
+size 67544
diff --git a/screenshots/de/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_de.png b/screenshots/de/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_de.png
index 057548a09c..3cc4095b60 100644
--- a/screenshots/de/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fd7dc09638aef0559bd4b1c75800648d9f37c67d96fde244eb064a4374c67e8
-size 21574
+oid sha256:b3084eacd8a6112e5ea6398d953209cb60ed3f4c864e6d526dd3af440b33f8f8
+size 40876
diff --git a/screenshots/de/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_de.png b/screenshots/de/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_de.png
deleted file mode 100644
index 0ef8f31754..0000000000
--- a/screenshots/de/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38522e07ec0c1e856ed94599090255f7ab3b032ac8edd824553b21da3eb50192
-size 26139
diff --git a/screenshots/de/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_de.png b/screenshots/de/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_de.png
new file mode 100644
index 0000000000..ee70305497
--- /dev/null
+++ b/screenshots/de/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a4f6b58fa98326481361ddf06120893f1ed6e10c21263370a75c3df40c3989d
+size 28885
diff --git a/screenshots/de/features.messages.impl.messagecomposer_MessageComposerView_Day_0_de.png b/screenshots/de/features.messages.impl.messagecomposer_MessageComposerView_Day_0_de.png
index ae43fa0476..ea8e6ae90c 100644
--- a/screenshots/de/features.messages.impl.messagecomposer_MessageComposerView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.messagecomposer_MessageComposerView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eaef8876d48f81ff763ad24c6f4ae7aa2dd56e8968d75f2a1751c09805fd792
-size 18168
+oid sha256:1e07d15bb95f7385596d7f454620a282277f8ca42e258728d6dbc17b5da84f59
+size 18045
diff --git a/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_de.png b/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_de.png
index 373deaec9e..a640a49901 100644
--- a/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f46be589910edf184bfbdcac39a30dbf8c9427d56e533424b6cd073200462397
-size 8834
+oid sha256:11ad85f440ba20e5b4b6974d572d05190cadb61f0a2fd42be84485d1d8a4f303
+size 8839
diff --git a/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_de.png b/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_de.png
index 28a7af0d75..f5f1422e11 100644
--- a/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:091a782f3149093463760e480ffa95ee3fa1f614fe75d9388902a173e4cdf9bb
-size 12542
+oid sha256:69a2947d8075a162184ea21059d2c3dd702a62fff1aa4d7a69d22c40d1b72145
+size 12549
diff --git a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_de.png b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_de.png
index 68dcee55c3..6d9b506ac7 100644
--- a/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4b1981984e8edde71723dd40849471b514d101b3d545b0a6132bea1cda0358f
-size 43592
+oid sha256:cc44a5bef33ae51161dee412b729baf328b188976156d7eeb7677039ad60b7cd
+size 42147
diff --git a/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_de.png
deleted file mode 100644
index 06e44d2a95..0000000000
--- a/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ebae117696015fb8582ba579ca087bfdab8c13554c4519bd72f4f18452792c7
-size 22244
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_de.png
new file mode 100644
index 0000000000..12bd190dd1
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce15ca9f89274620728715e3448ce671e2253f4fed22a44035460e9a3709ca0b
+size 647404
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_de.png
index 0fa4f15cf4..cae13d102e 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ba15459015c981b063966fecfabb28af7b2bbf25d16412439f0f35e6d6694c
-size 12924
+oid sha256:0b5196548e23ad3308c3517c2764dafe73b620115d1721cd4eaa1967e795a174
+size 14262
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_de.png
index af84cc0319..1c168e3cfe 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:579709deae308329674cf4d47805485699f42c67e6b6779b78e95f45437aab4d
-size 26045
+oid sha256:e78774044b40b63565ef540b6c1fae9fd97c105ffcc049e524e8a80d88435b50
+size 27225
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_de.png
new file mode 100644
index 0000000000..2a6974b789
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42743cf803a9acb5dac130af3de4fa08f78847567ce6aee1ec5596a96ed09e6c
+size 197869
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_de.png
new file mode 100644
index 0000000000..a8d7c0385c
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dd0fa202f0d1ec868537a2726df10013072fe9cec7bce4c947ab13f39e683dc
+size 122366
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_de.png
new file mode 100644
index 0000000000..abdfda2abe
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1be36834af38c01a6c6153d1f6a65bb89713edb4c2641e2f2944d33b119e4bbc
+size 197468
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_de.png
new file mode 100644
index 0000000000..9fc7fac5f8
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62abb24d710f2bbcd5965887318ac1c1ed7af2aa7ead64fa8557781e3c03ba9d
+size 21189
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_de.png
index 236409c967..04dde37923 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d83ed47c66eb0437193de92c356668ad479dd7cd3f97e864f121fdd01b3abac
-size 48319
+oid sha256:b2fa0d69002c82ea536b1d7c6d46a93bf53bb484b1f995929661af4b1b5d77d8
+size 48271
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_de.png
index 3c80b38276..afe7a74f31 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a7d35ee4b53fa88a65380c38a39b8b512fa155d380458dda00fe48ead065fe1
-size 50606
+oid sha256:baf37ce8445ef13163eea35baad0c0e08a70d0cc03e9b8021407ae1b376ca95b
+size 50574
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_de.png
index 25a5c7d18e..e38faafccd 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31bfafa9a3c71609932ae9de739529b6dfeb1038392cee97638311fc490c0015
-size 52029
+oid sha256:29af094f63268254fd2c67417ab4e4c129961edf2ba7076f4a8ab9a28bf19ad9
+size 51952
diff --git a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_de.png
index 34073d7f96..2c874ba817 100644
--- a/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1dce19e15e65b860ae2b8a1799ddfe49d4643582659530f7e6e900eb23a80ed
-size 52380
+oid sha256:1241bde9ac9922970e2b8d1ff473e2bcc7a676057e5e62d26cdb1994b0100322
+size 52304
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_de.png
index 3d6777c3ef..6608cb71fb 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50d81c9637b36a3839f3841a4d1f65488f39bf16a52f0020271d338287a28497
-size 6612
+oid sha256:96ebb1034e9c1cde970b8d08a105680635094cb29bc7a93283efde4dc7479f38
+size 7508
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_de.png
index 48bbc48ce6..7bb4340051 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa8c5988aed0f6fe5410a0d41d830219b8410affceec47550c99266d117229be
-size 12075
+oid sha256:426fc2459594895f93aa5bf927d4eba6fe669fe64929b989e6eb24d0306253dc
+size 12990
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_de.png
index 15d7ce090b..e29010bb94 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1a516032bb42e6cc8ff2b6156e2ef51b3594175ff0f930c60746f1ecbdd3747
-size 17551
+oid sha256:4417893ca77c6184649bc67c9506399a13970c212a6eeb266248d8715e976ce4
+size 18371
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_de.png
index 29e9875fc6..72f9ddf029 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91bcbed96e60b91add3e54ecd8c49d8400da22d140e729163fdf7e0ab0ce390c
-size 22475
+oid sha256:bf8906ea32496154c8c975b29704a43a41bb14aaa968cf0689804dbed99b85b0
+size 23691
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_de.png
index d5a93418bd..039ed716a3 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4f1126706d818d83b1c98981f86cf16e598faee83d41144a92b050d6da697a6
-size 26822
+oid sha256:8d224cfd3ea545b5c2309e3df31176ac71b2c1ed499891a258867d38aa3e33e0
+size 28713
diff --git a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_de.png b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_de.png
index ac9fe882de..6782f4eb5c 100644
--- a/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4b5c7ad54feda5ffcd065e6c1ac204ecc52388808abb41dac8b95aaf72a6d51
-size 32198
+oid sha256:b56716874cfc93e2273065b05252d931f78c689b7e5f555fe57e4b812e0209b8
+size 33393
diff --git a/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_de.png
index f7ae17e756..0701db921c 100644
--- a/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38261034a3b8d7bbb53b34a50b92de88ff790bc2547065d44786a2e650789139
-size 4347
+oid sha256:19dc73c912a6f3375c0f2b7bc9e3c75481fa7107515a1655e314db070b775425
+size 4344
diff --git a/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_de.png
index 67fec85a88..b3f6706cda 100644
--- a/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68d468cf24f004f75b5f0d0ab21e4576941749b32a6780b074fce5ba6e7e06c0
-size 56172
+oid sha256:29fb6c5ccbc3fc1196fbccc4ce18d10668ae47733ecfcc454354ff231cac0f10
+size 56030
diff --git a/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_de.png
new file mode 100644
index 0000000000..b32e163fcd
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e00ddf0daef5c64cb855328d22b1a53786b47bff6f19d24bde3d877b3b24b8c
+size 59757
diff --git a/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_de.png b/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_de.png
new file mode 100644
index 0000000000..3943014962
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_ActiveCallTimelineItemView_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9623e7f442cddf1ced46e6417a5402076463570065e02380b66bd78588d5ed3a
+size 50867
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_de.png
index 72c99d1da9..3ece744fcb 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b10f43a24d80689ee7c929eb5c530b544891cb0dce63ab9bbb4618f999fbd3cd
-size 6226
+oid sha256:cbc7e8874d0a3c25aa0e6036c1ffc365c5407d79b011e5321821691315e98d3a
+size 6223
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_de.png
index c9a5dda40a..b6f95124eb 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60f89baf13d98c9060d9346883cc72b23308442604eb589bbfe1d6ba5e180db5
-size 57070
+oid sha256:a2d68bc8db6190fbd5205fdaa386c250ae3a2014804a5372052d851a313a6ef1
+size 47808
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_de.png
new file mode 100644
index 0000000000..6b064426a0
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6de442459a257ad7c5478d0dccdea61876b3b742e0fbec623b96c307abf3eb9
+size 54875
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_de.png
index ac8ba29d96..7a936dbc60 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe8e088ca91657f0d834b77169905afb29f610c8abc04ccedad4ce408216c032
-size 37992
+oid sha256:b5646e1e203737e229787944dd524377f51fe1478507c9a6dd19916716526404
+size 38381
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_de.png
index bc903778fd..36358041e6 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:023e811a9fa6157440eb00ca584988273efc2f37ed3804208bf5aae8b9136673
-size 364436
+oid sha256:4f44887b6c1d8c3de4e1bc4ae42f3999b99db906062ba95df22c88a2951f10d1
+size 364996
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_de.png
index 628521bd47..dd1594478c 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6257478d8e46e942ca037b1aa178477e188edb9777d67a3e7560929d6aba8880
-size 370034
+oid sha256:335e62d5380a9f6eba40017ed5f8bcfde6bacc7aaf29995852bf2c9c38960a09
+size 370563
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_de.png
new file mode 100644
index 0000000000..94428abb56
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36d7cf2510d546d2b330b1d1b1674ce58df0558c547e443794a1e7b2222add87
+size 347897
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_de.png
new file mode 100644
index 0000000000..7ddac02717
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4ac79f3b8fb4e231244bd96b244a4f2526d6ed28d558f9d50734d83bbb74992
+size 363909
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_de.png
new file mode 100644
index 0000000000..67490ba700
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4431e2d9f30123949ea5676ce60f642234adcf9b5a33f2acc3f80ebf6609a66
+size 369730
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_de.png
new file mode 100644
index 0000000000..c4943b892c
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c410e853089cc2c4a2c48a00dd9a8babc8095aed72bb4625057444710559c6c
+size 368129
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_de.png
new file mode 100644
index 0000000000..68f8148879
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ca8cf82aa8ab1bdad56a27584b27789402aeb7ad8fadd038280a376fb75a72c
+size 345094
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_de.png
new file mode 100644
index 0000000000..cececc229a
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0c6dafaa41849af00d5097a85bd88e3a054a0a9e41c0466a08e6ff8dd6102b2
+size 356857
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_de.png
index 792aceaf60..6f4a81b5bb 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc5e553875d40920c9a9066c25ba6094238a7894aeb26ab144ee4cd9083f1754
-size 363641
+oid sha256:6b6a749b9aefbf37b9bb4d9edcbf91f857acc395344a58439079268c73eb173f
+size 364271
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_de.png
new file mode 100644
index 0000000000..133fd3903f
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:426d1c844a8c88281c5fa4c61916d93278fdfd38f8cdf2dc54bf1a821f2de3eb
+size 397167
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_de.png
new file mode 100644
index 0000000000..9fcf389708
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9daeee1aaa04247da3c8bb5aaae9947aab1ed2d2057995e53d6ebdb63e5cd356
+size 355848
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_de.png
index 0053487297..bce9fe091c 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1fb4257bed537387bda20ecb17ded43f4f9edfa1c3280b58fdd8a3dc9c91819
-size 365658
+oid sha256:caf04029d097a3fcd937ecee55381b15353ca70b180629f3cc6b35dcde671c45
+size 366135
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_de.png
new file mode 100644
index 0000000000..b10f9741b9
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ec1b0244dab22414c6719b3309426e13128d0c70fb67dc66cd8a60d42521fd0
+size 355411
diff --git a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_de.png b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_de.png
index c4357e38dc..cefd1decbc 100644
--- a/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_de.png
+++ b/screenshots/de/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d9c7c8dcd575bf6376edd385e32b489ff322944a323df989a30e8779fc59f25
-size 56604
+oid sha256:aa9709734259b3aeae5cda5fd0cc9553ef741fa3712b5ff39fc27d1690219d3d
+size 56460
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_de.png b/screenshots/de/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_de.png
index cae7c17e53..3062308e8d 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5d32513f0719f9221b026b97b429919fdf18401ba00c01cf535688afe626a11
-size 37370
+oid sha256:6483f92e760dca0d653b1e9f36cb06c1b29fb701683c66c948c125ac827d33d1
+size 37372
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_0_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_0_de.png
index d943fa3931..cda283f1fc 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ce84c70d73ebc3582466e6006229d8f67b8fc7b906fad90fa9be9bb19bf506f
-size 50253
+oid sha256:598a8bcb37545d3c83ac69046e58ce26d461e8f9269990408f73c839ff5e1e16
+size 49217
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_10_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_10_de.png
new file mode 100644
index 0000000000..14d74e57d1
--- /dev/null
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_10_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71a258a6539c326fc6f35351bcd784764109b576f865f31417ddab3c55ba1454
+size 86602
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_11_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_11_de.png
index ff53dce724..a95c21081c 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_11_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ebbbddf29df78c6a6b37f931052cac67ea7ae1c875e2d75fa6ae8aa1683971b
-size 87348
+oid sha256:51690868d5930e021d45b1d4f447cfde6fcbb2f320416b3cae5fe55483f5c341
+size 50721
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_12_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_12_de.png
index 23715fd683..c1a3515674 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_12_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0914e81c505541a4f000240469e746964c5f476a7884403616015fab62f23663
-size 51743
+oid sha256:4bc359cde481814e09a7c0918a3d5f377b0ca96798ee038581380b1cbcba4b88
+size 62431
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_13_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_13_de.png
index 44e66cdc1e..b536053f62 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_13_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa15ce3aa51c83819e6fbdf235e6f732b0db187ea49344279b01614efd9ff6a3
-size 63456
+oid sha256:74fed26d5bafd17821dc61836a9302bfc759db0107ef19da8b009818332891e2
+size 47073
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_14_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_14_de.png
index 04e605318e..5a6904ef5a 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_14_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:961a9289be61a16372087c645302e4043d71f73c4440e24473941a9a6aa41daa
-size 48104
+oid sha256:4459b9fa2ac7562450259a5e8c014ab249b8750aa8de791c7e4edbbd5172528d
+size 71108
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_15_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_15_de.png
index e6bbd0bdff..6c490a5681 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_15_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb03835fff5c4d27009fd19af5494b71501445184f6cb984e39fa175e430fbbc
-size 72082
+oid sha256:77cd41e2d6902aa727ee5213a28fb46339c6c50f957655a365e3baa2414a8e60
+size 56792
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_16_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_16_de.png
index 7169b684d9..350b3ddf02 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_16_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9bb51eda6e69e8cd532a3adebbd33267580fdccc904c91e741cb2e8026f0b79
-size 57796
+oid sha256:0552b0c6ceb44e7f7fc02f4cb8046227a4cb9bafaedb1ac6b258e1b422601dc7
+size 63621
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_17_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_17_de.png
index c3563a3472..4168e1659a 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_17_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_17_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b88d255f070df4fad03371c64ce31e080a35999352a6a87cc10f83d8d5da99c
-size 64506
+oid sha256:878106a56c776eb874a45b437de9f8c0927f0a780c292ffcd3f9f36646b0cfbd
+size 69216
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_1_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_1_de.png
index 7903997156..7f586108f8 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e9bf77f3d736fdd106c9e5143a0e80a016cd4d5aac1dacaf5d7a4bfb91d3b0e
-size 71973
+oid sha256:766c0c2b712d3f056c49b01caf8f4bbbfd5333d6fc74d78ab15c77b2e346a629
+size 70985
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_4_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_4_de.png
index f63e3636a0..4bea9b9924 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_4_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b28fefedd7a34cb758217de7b240b536abf6f485bd256fd718ebc181df45e15b
-size 70537
+oid sha256:1fae2619d733f6a70870f65375dd7447001f354c23ff8549ac7b81c26c652e0c
+size 64852
diff --git a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_6_de.png b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_6_de.png
index a624c779b4..986d70ca02 100644
--- a/screenshots/de/features.messages.impl.timeline_TimelineView_Day_6_de.png
+++ b/screenshots/de/features.messages.impl.timeline_TimelineView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa1490b35cdd22c0b01db869e8bad73195481fa2a2e7e61eb289e3f51bfc6200
-size 73417
+oid sha256:0aa831f247faf488c08b52fd4ad8327d31a8e43fd5800837ceb26e338109b98f
+size 69141
diff --git a/screenshots/de/features.messages.impl.topbars_MessagesViewTopBar_Day_0_de.png b/screenshots/de/features.messages.impl.topbars_MessagesViewTopBar_Day_0_de.png
index 6d76726db9..482d46958a 100644
--- a/screenshots/de/features.messages.impl.topbars_MessagesViewTopBar_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.topbars_MessagesViewTopBar_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d61417b446f42bf388970c65e8df1f8ceaf87d457c55cc1cdbdc60d2ebe0b5a5
-size 54834
+oid sha256:b9c76bcdde54ab7ce54ac32bc54ccfdbb07ecbc06c0924e1de296e161f08179c
+size 64743
diff --git a/screenshots/de/features.messages.impl.topbars_ThreadTopBar_Day_0_de.png b/screenshots/de/features.messages.impl.topbars_ThreadTopBar_Day_0_de.png
index 800b5dac71..ddf65dd3f6 100644
--- a/screenshots/de/features.messages.impl.topbars_ThreadTopBar_Day_0_de.png
+++ b/screenshots/de/features.messages.impl.topbars_ThreadTopBar_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d33bc741fdb4b81e5b15e46c5248d0b8627f552314d02a0795c3eee24cc2b8c
-size 32788
+oid sha256:cca92a56b93e76b181f8eaa54bad7d9102b452de9df115e239160f50da45e843
+size 33118
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_0_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_0_de.png
index b355228561..2169108b6a 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_0_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da02621bac48d9f9d7349dfc02244dcbc698442f1a8975d2c9b9d8e2d9c64fab
-size 56650
+oid sha256:863d0f7143afbcb73208708b0c3dce663a1d8f61375be6eb1a7492db3d4dd319
+size 55922
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_10_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_10_de.png
index b3df3736a3..c4032cf79e 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_10_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddcd24501a9e91f4a42cbffd60693a93d2dd0c2bf28e469b1b4ea460e2630d17
-size 67293
+oid sha256:e05bd647e42856eb414da2ce27b1a86a4d110ee26fb74d6c445da87595357f91
+size 50789
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_11_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_11_de.png
new file mode 100644
index 0000000000..8b581b4305
--- /dev/null
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b33243d95e6c67be43deef8957507f45bc414d567bb9e30248fcdf1c70010a9
+size 68125
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_1_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_1_de.png
index 80bd625605..5f24ba6d45 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_1_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26faad6c5e6bb011b3df1eb723558c22383eab2b2ac53e906349807afe1ac7a5
-size 41131
+oid sha256:c100900785c0c11cd69b60da9ed3909f135b876d0546722f707febd24e796256
+size 42510
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_2_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_2_de.png
index 8adc642f5b..df2cb30789 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_2_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4256d5f9b4e2eaa1133e80cb406077b3c936748b7ded0b8a5d236b8cd0333e6
-size 59686
+oid sha256:32e140ac0594359e4002ee9ff48ca357624bbf0e05a5c786b0415ce0728cd447
+size 58987
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_3_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_3_de.png
index 47d2038cb4..bbdfa31595 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_3_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b7c1a47a6a122af432404385fe938f3da344c1c1aeeca3a6d4faae95c377470
-size 55932
+oid sha256:074d5b065f8b241dae63459003f0bf584c4438d988c3a37120ca841a18df5554
+size 55874
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_4_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_4_de.png
index e451952b98..e96ade4870 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_4_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0db0d106c3ebdafc7242ae1f0ebbe9211b035fa6d75b6b092a926052420aa920
-size 54067
+oid sha256:45987e3267c869b82157fd50dbd9e302db2979a23d1f27e56f192ba99c17fe06
+size 53451
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_5_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_5_de.png
index 2997d59585..b8f567f755 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_5_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba00ca1bb5a5abe1f58944b3d73d85d78b797126aa76873efa03bfff3df0b8ca
-size 60458
+oid sha256:946da5862ccc26ab6d19628130c19ef21e576e0d94cbe92fdc67eee3d0e1d332
+size 60376
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_6_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_6_de.png
index 8e7a228bc5..d56f545423 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_6_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c96790b440ae277d655e935d5b88725b1e1d42dd7d13dda89c958e9a96b7002e
-size 48006
+oid sha256:ec8bc3bca6ebb38164361af648346fce98254913b191fd6aeb7a5bbcc7c0f0e6
+size 47930
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_7_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_7_de.png
index fcb59350b1..4e8a6bc030 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_7_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0ba9fbfdf7e5c21c9461a103c5e552d8585ccfc152507ca701c5a8ff28fee49
-size 59958
+oid sha256:aaad087eef1f82067b7345ae3114c9a5ee27b10ba37c0dd06b85bf6c3886f56c
+size 59237
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_8_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_8_de.png
index b713fac540..b3f0f2fea4 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_8_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e08f56a74a85de1d5e792dbc17a409f95c0a72df49b3c2538814442fdd63d4a9
-size 65018
+oid sha256:22e5597cab58568048c5be1d8a0efc7f9efce5b304d0b043614f37ef63a7e2b9
+size 57161
diff --git a/screenshots/de/features.messages.impl_MessagesView_Day_9_de.png b/screenshots/de/features.messages.impl_MessagesView_Day_9_de.png
index 76cb8f4e26..8544991eb9 100644
--- a/screenshots/de/features.messages.impl_MessagesView_Day_9_de.png
+++ b/screenshots/de/features.messages.impl_MessagesView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f263db2048cf39ed38c4895b5f76e6bc9c9d0fb8de09a745a324c47e695b1c1
-size 51533
+oid sha256:38781af0edcaf2072fabb3f1edc783fef4a674f66ee15ba787851ff4e8fa4a23
+size 64456
diff --git a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_de.png
index e0b6b5510c..8c4b6af1e0 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acffa3d209c390caa581e5afdf4d31ef5556e96eeac1d136cb7f24a9bc9996d3
-size 22234
+oid sha256:bb05198bc007e836b105f9139f7deeba673cd2a7664c53a85e25e5fbec2d2052
+size 22188
diff --git a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_de.png
index 4780df6550..11b6cab54f 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8387c3a65fcf21312934adcb97c85f18e2764deb774c38821d360eed2f97101e
-size 21960
+oid sha256:b73aa1594f1e0f6ef0903ba7bf69e48f50b6904511828213fd2462a75b670894
+size 21912
diff --git a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_de.png
index dd7fd4540b..132504aee7 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbc74888e9ddb1123ebb9e6d1f0851b55cd68b69b3bf284ff41d5e8f394e6999
-size 22042
+oid sha256:fa73db75c4d6bbc88359aeb8348eceb2a7775290218a1a761dd0e993427b6435
+size 21992
diff --git a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_de.png
index 702cedc003..46f744276e 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed21a6bc055bfc7964bd0268cf4597350786e5c58c869d0fe47d3938f41e5af4
-size 21995
+oid sha256:7ef4b1d40c17d7e949d051c275cac81db5f231214499ca6f8f40d36b7cbc3e32
+size 21952
diff --git a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_de.png
index 2ae2780a01..9d8e17945f 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebef4dd474d40bd93a5448a851ea8d1400bd14e9bc625d091ef2265764a6f01f
-size 21880
+oid sha256:ce03160f5c2c13b3516f75d64ec311331d1a99d7c72c2112843b25332d2de042
+size 21841
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_de.png
index 9b8bd6aba7..b4f5edc8ab 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80411a8f91e1cbfce66887dce4cca84155199e2f2aba492526665952a09ce9a7
-size 52353
+oid sha256:525984fd154320f88445fde7298b1509a86eb8691e5a9a8cf4c58d8fda9b01ec
+size 52272
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_de.png
index 7e89601827..014cb01e47 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3fcef9ae6c81f5f063c230a57f3b4dcbb5c6f1e4d08df176df9712dbe209e8
-size 48711
+oid sha256:b00f990de2e706b44b81ce25cbe63eca682a8336931079f5b3d06c8fee57a14d
+size 48644
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreator_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreator_Day_0_de.png
index 25a5c7d18e..e38faafccd 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewCreator_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewCreator_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31bfafa9a3c71609932ae9de739529b6dfeb1038392cee97638311fc490c0015
-size 52029
+oid sha256:29af094f63268254fd2c67417ab4e4c129961edf2ba7076f4a8ab9a28bf19ad9
+size 51952
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_de.png
index 236409c967..04dde37923 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d83ed47c66eb0437193de92c356668ad479dd7cd3f97e864f121fdd01b3abac
-size 48319
+oid sha256:b2fa0d69002c82ea536b1d7c6d46a93bf53bb484b1f995929661af4b1b5d77d8
+size 48271
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewEnded_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewEnded_Day_0_de.png
index 7e89601827..014cb01e47 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewEnded_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewEnded_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3fcef9ae6c81f5f063c230a57f3b4dcbb5c6f1e4d08df176df9712dbe209e8
-size 48711
+oid sha256:b00f990de2e706b44b81ce25cbe63eca682a8336931079f5b3d06c8fee57a14d
+size 48644
diff --git a/screenshots/de/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_de.png b/screenshots/de/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_de.png
index 9dc06851c0..69fd570f47 100644
--- a/screenshots/de/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_de.png
+++ b/screenshots/de/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:543af353f726b5e68f22303bd580ad2a827affad3618140dc7ee87c12ee0d9a3
-size 46153
+oid sha256:fa2bd8a0567d05208a570830dfeea3a3f123bfe7d310c777c9f4a36d942d4583
+size 46081
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_0_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_0_de.png
index e2a4e320c3..aa6f300abb 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_0_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97fc60499c5f669bfbc200fc859e8a39ac0815ad281f7fbfcec656259ef1d30f
-size 39066
+oid sha256:ed6d994b119d688999501ebd52c97003b4501f0b4013ab51a75b0f20b24075c6
+size 38914
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_1_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_1_de.png
index 31603b0b30..4e493c9379 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_1_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b443e0ceed54e76337bc86cd278efe22e46516659f611abb5ba166a83eccc1a
-size 41925
+oid sha256:c874ff8f546368fd02b97675058578c0915739a8d0419df4d9f7c57fde325acf
+size 41638
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_2_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_2_de.png
index bded534a61..9bc140b2bc 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_2_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78b18d7bf93b1efa40e0746b32e3a8228e49a063d49628c7e18f1ae7288e2dbc
-size 42104
+oid sha256:317e4ac99bafec3256906621758d7f2122e3fa9f751f60aa825d4a14641f3b5f
+size 42146
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_3_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_3_de.png
index 2e504e332f..d015e20463 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_3_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cdb9a9e2a5af6b2cd8a43e07b79d0925b317210f85c714a1b26b529870752b5
-size 49372
+oid sha256:26e47150797605d5233f2d9043b325a3e674b62f68f0aac172588c3f24385f52
+size 49345
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_6_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_6_de.png
index 1d952fc98b..cfa660cfca 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_6_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30d0bef4cb216aef676fd88b4e12c76c6d1198c24a5f47c46b5398363fd1dc62
-size 42706
+oid sha256:a3f339d9122bc91e2838c7cbf8bee8f7cc50ff75540d5337834969531e6f8584
+size 42507
diff --git a/screenshots/de/features.poll.impl.create_CreatePollView_Day_7_de.png b/screenshots/de/features.poll.impl.create_CreatePollView_Day_7_de.png
index f24a053b60..45eccdfdcb 100644
--- a/screenshots/de/features.poll.impl.create_CreatePollView_Day_7_de.png
+++ b/screenshots/de/features.poll.impl.create_CreatePollView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f66184e6357282ff5b9688dfdcfaa3da2a26971a99b3258448647559e1a0d495
-size 40408
+oid sha256:d6075dc5472b55e47a0156ff75649f8360b791006dc3313d4a067749037c39db
+size 40318
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_0_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_0_de.png
index 7731d6380c..a51cb6cf8c 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_0_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d3cc301b373d6261bc57f91ff1f83485268f23add4864b75471b8879fd2b7cf
-size 59648
+oid sha256:d33aaff7f6b61e202d114f91b3c4bbdc9e7554910b1d7bfa8aa463f508927b65
+size 59530
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
index eea3b79e31..9cdf321360 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26284504e5cafc2c5bcdbc804a0712d4644fa2184751b76b6762c75c8b6d1cc9
-size 63811
+oid sha256:c2f1237015fe09c45636a00b3bb5991e6b1c544ab129cdf0f720db881e0f2f50
+size 63697
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_de.png
new file mode 100644
index 0000000000..9f2744b09a
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:024657931956e21eb6decfa8a39a213fc621d0f4c694bcbbd56d013d49bda838
+size 61364
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_de.png
new file mode 100644
index 0000000000..c3522b0cb7
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ec9e46a3360cd996a219151fda05f38248af4bfe3f2a39d0becf74d840f5478
+size 61231
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_de.png
new file mode 100644
index 0000000000..269c6bff1e
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:038b8dfdb5996d6da4b460a5ebe3b2f4aad5549a894babc583bcf15ffc549264
+size 61225
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_de.png
new file mode 100644
index 0000000000..ab55a3a8c3
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49b2f7bc8675304be3d71d144584b7e7ace735c187093749cc2b94a7af091bef
+size 61229
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_de.png
new file mode 100644
index 0000000000..b874052a4c
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23d2a782811171fa55a0861450a667edcd2d22784ee3711bd00674f178144a4c
+size 61120
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_de.png
new file mode 100644
index 0000000000..ceed65f824
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16644a82af1efbf83460df01b14d85d1c2d16fa2e1a9bc4d1a591082adfb6167
+size 61366
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_de.png
new file mode 100644
index 0000000000..a7498d2de5
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b6c34ba3d6d833137c1faccbaab4ab32b844af05a6ffbd136b6582c16aebec4
+size 60891
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_de.png
new file mode 100644
index 0000000000..6d227268fa
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:114543bb1fb1985f0dbc2d78044e4f606eab3e30a6d99d83c5c0985fdc6bcaba
+size 60458
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_de.png
new file mode 100644
index 0000000000..32702f443b
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74261b09ccbe64e4a3902e907e22391bab3264f43f1f449d43955cb4326d5912
+size 63797
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_de.png
index 0bf95ba4b1..740cd2486b 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:030671a61e231a9c87a221e20e63bac8add5f0a3fe4aa967313af45196151c64
-size 51196
+oid sha256:81240edb02f00691d55f343e53d3af922bbfedb32e60f757a62ae8b2f43230c9
+size 58356
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_de.png
index 8ece7cdeaa..e67d492f0e 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c813fcb2b9cf76749d9233d5cb66e643e185ac3248eab4c4fdd71f4c7fab7ba4
-size 51057
+oid sha256:822b20a349d75de5c1f7000d394f3e32b62dc419bf157dec025ef56ecf3d7f80
+size 58218
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_de.png
index 89c8b5a536..f4f9d96dd6 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66feb2ac420379ece0b85ffe53d5a25a8d11cbe27133313dd9e679d582c384fc
-size 51052
+oid sha256:03d5a02197f9ad9157752533aa9ed1c2659a0b2967c3007b6f2b2f2d2b7a98d8
+size 58210
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_de.png
index cff6d2b2f4..87337d55fe 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fd601997ff6e5af28e70c25c7c8c2a61c37e47e736b955b1510ac67e3a05034
-size 51064
+oid sha256:49569410e3b6e1d009e87d7d652f9bcc2c7d4c77e1e5ca86be7fe9dfed9c3c1b
+size 58222
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_de.png
index fba8ff45f9..0cec2ab3a9 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b089d766841cc1ce24ea03d3d91b59d0f2ea1789aee3a9d06ece551c862d1ce
-size 50901
+oid sha256:8ab6c693d3cd149dea1f9e8ba95c09710aa52c8869a866412651862680c9bd4b
+size 58083
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_de.png
index fb27f001cd..3252e63243 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b38f2502dd31806ffab41547b66b9987de66c4e899b0df59c068d08ed4350b6
-size 51198
+oid sha256:f30a0a38f20c9ead24ec669fbf7d25713d1e41b1de99d4358bfbc36f34146d5b
+size 58356
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_de.png
index 0429803048..37272bf3ef 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ce5af26d03b80ad7bb0190b6b1dcdbdba4f7a666c442109da58f05c07505aad
-size 50867
+oid sha256:c4f03d366950465820c07b24eb401614d122d244c1c782993f679d61d234418f
+size 57924
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_de.png
index 27f6862b8c..70b5f0ccc9 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:536cbfdce1cfdecdbf076f0747c50f2db7e3a88dda54c0708d4b7388c9efbf30
-size 50402
+oid sha256:b787733f83c3c7d7f3ee8d144f4aa3f0c5a9f7985854d5b427e8ac4fe26781ab
+size 57654
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_de.png
index 0d41a18697..856754abf5 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20285a2d5b10f74f927f8459a2d92180b7f86bc266c95889b5d017679b622462
-size 58368
+oid sha256:43dae2fb98ed0f6fc1f4d67d1c5bf2a8d0e45e5c3ba217af0dd31c7d2ea48528
+size 60496
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_de.png
index ab828c858a..cfb15dff1a 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ff37f653ce34795f7d054e1d552c161c83fe85b6c80c6925953440a75fd4ea4
-size 53181
+oid sha256:0335d534e1ee34920b9f5adf79ba614d03ac62fe352a1c9da57c79f2f74b87d8
+size 60698
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_de.png
index 6583fc352d..f14eb96ef4 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d69ff7dc1c3efb334b8a03dbd796cde640aecac07a10adb910519810bddefed
-size 53065
+oid sha256:d3d773c0c42aa2070fb201fc25f4b456692543ff85085693f9003b839b31df26
+size 60584
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_de.png
index 1080a3e297..6da04e5146 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:827f3291c252fa8a5b938ca7a38a76d0d58e1969607f2c5514d06264e10a1ddd
-size 53078
+oid sha256:0cccc5f8efaf4ec7dcd2c0f5f21cf3141ee0a5d6884aee64b4396ac0da883d0e
+size 60596
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_de.png
index 1b77b7d963..119cdecbbb 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb8636f0a7dbad6b32346cad952b5447a79b96d3db0e5da876fca7a78ced91c2
-size 53072
+oid sha256:bb801d3af2f9343662380f6df93c9dedfe513c6c842edc91608b6b7c0f9b6b27
+size 60594
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_de.png
index 3048b141f6..8c3bd9e91e 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24dfd7e781f8b035045ca075b607676a2a4cbc0ef882c1f527252d85339a738e
-size 52922
+oid sha256:a428f83ae44b904269e7f1a8dd38854c3d99142bca7b14309c8de2484ba5269b
+size 60524
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_de.png
index 8ebc7b90cd..6588f7c6fe 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:640ecec1abd4992b962a9ab8ce68d4c5a3accfde9116b93af4d55d8365c35307
-size 53187
+oid sha256:11abff30b2a9035a3c619ed46ef056133e90af2e67e2febe82969f5d8f4d21e5
+size 60699
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_de.png
index c1dda2d9d5..1e610fb222 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc3da8b4380809f5f9724d98ba4eceb86ea9d6a7df54c4a2117d187550b46597
-size 52800
+oid sha256:beac41fbdfcdcb78f0693e0a4f247ae43fd29ee11f6fd8e1854c93beb2152d5b
+size 60295
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_de.png
index 419eec6b72..68442d924a 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c03b9b002d3d5a42c6a5662301e8feda20f734a299dbd753b4fa797023ad697f
-size 52372
+oid sha256:05215baa5484072411d171d01d34def469a96740764782b2625f36b22c77daef
+size 59999
diff --git a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_de.png b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_de.png
index 75634a5633..763d414677 100644
--- a/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_de.png
+++ b/screenshots/de/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7abc46138c98086dab38fc368d56e06ea6a434bfe61b0023a665b40e66f0aa53
-size 60801
+oid sha256:851e30212320b7398100b5bdf712467538f9d58bd50724239d3ff013c596e6b8
+size 62968
diff --git a/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_de.png b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_de.png
new file mode 100644
index 0000000000..daea1e22ae
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efd05a781d752f681f06ec085b7a352eda4d6a4db9107fc633f5aa187262c304
+size 59147
diff --git a/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_de.png b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_de.png
new file mode 100644
index 0000000000..da2ad18fe4
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7ccab9e3dfa3913fa9fb0ba2b2d234c136f9a06fa9daf212919e2bf417f1465
+size 56274
diff --git a/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_de.png b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_de.png
new file mode 100644
index 0000000000..fec5646925
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6f9541fcb93dabd9e48738da4a4ce12d5fb64c58cfb40c800567f8c59c8a1c9
+size 53689
diff --git a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_0_de.png b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_0_de.png
index ee2c10a62c..3a0ebcaa2f 100644
--- a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf136b30186c020c761496b14baa482a01a786eacd1e335e59bfe991fbe4d6b2
-size 49391
+oid sha256:4a85070e2115cf92ea89f969ca6aa726a2e209bf9c0e8c131f54e261442313ee
+size 56390
diff --git a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_1_de.png b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_1_de.png
index fc82156d3e..0c9bcdc2d6 100644
--- a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c2553146562f2e8a6ee5144cb06d482a4928fd3e155aef90ca25cda9a99267d
-size 44282
+oid sha256:04b4c9f15f880e5b82741ddadb2cded1f9d51c5acb96157042b711c152087713
+size 47422
diff --git a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_2_de.png b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_2_de.png
index 063b8ba357..3a0ebcaa2f 100644
--- a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_2_de.png
+++ b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30c484fe8b370b96c3515bc1232ebb24495763b7b47c53d08d24fcebac62770e
-size 46996
+oid sha256:4a85070e2115cf92ea89f969ca6aa726a2e209bf9c0e8c131f54e261442313ee
+size 56390
diff --git a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_3_de.png b/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_3_de.png
deleted file mode 100644
index ee2c10a62c..0000000000
--- a/screenshots/de/features.preferences.impl.developer_DeveloperSettingsView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf136b30186c020c761496b14baa482a01a786eacd1e335e59bfe991fbe4d6b2
-size 49391
diff --git a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_de.png b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_de.png
index 01b5e92f74..64c764a8aa 100644
--- a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:035755520b2ac1f0745b100e4bf7ee51b9823e05e7baedf42667997822540ddf
-size 50092
+oid sha256:469e3ce9d6ad2997c4611ee981f104207a2f492d727877383923a8d80c2824f8
+size 50096
diff --git a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_de.png b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_de.png
index 7009bfc863..b1207d5499 100644
--- a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b75989caba4bf09c4646ae6edaa66c74b3c294d09ba27a01bec69281fb1a7529
-size 50826
+oid sha256:5fc7f93f7c419f911b3d5b6b306b4eaf0cd64b84f21696dfa30373b0393d69b3
+size 50859
diff --git a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_de.png b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_de.png
index 2b36d7deda..77d5dad1cb 100644
--- a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_de.png
+++ b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d93e743327459fd9a32cab57bd726539c39f08dee888be875336c9df07b7319
-size 41726
+oid sha256:abcc97de678f492673a85941f66e1ad1fd98cc5faa2457105c6cecdf41ae6341
+size 41942
diff --git a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_de.png b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_de.png
index b9207f45b9..8f6beaa251 100644
--- a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_de.png
+++ b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdb85156d682764c02fdb14c06e22236620f411f34ff042a7df358d6a2ef7030
-size 41012
+oid sha256:9f7127ce6ea3bc311e5385cdc6aecfd5cd48d60bb1d1562e7167326f87dcf38f
+size 41153
diff --git a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_de.png b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_de.png
index 1d1a4d4079..f6955a4d3c 100644
--- a/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_de.png
+++ b/screenshots/de/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48efeb0a54eecc4cdcd17a9f13f94e884272a79c7cc46df6dc791e143ca10959
-size 69223
+oid sha256:2500b1577de3fec5fe17f441a92aaa8a52137d08a85548f03bde41e273d5aaed
+size 69248
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_0_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_0_de.png
index 446b8185f5..078e7d0f20 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26f2620aa348febb2db9ebe379a964b76220819f7165fa7a5be5e2a38c2534a2
-size 67183
+oid sha256:6f1404b8d9cf2a4074117a0dd5f7c600bde096f1b3061e9ba86f76d316b56a07
+size 64370
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_12_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_12_de.png
index dd3a3472ec..e6af8d3a74 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_12_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2290982a0712c88d4128e3a81b1c327f817c124f03f083db9562512855a4f5d
-size 71473
+oid sha256:7fbbeedd76ea3453a747c860561d9c5951026ad49f44e67d56d6ad8ddf5ec208
+size 71632
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_14_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_14_de.png
new file mode 100644
index 0000000000..ed49db01f0
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_14_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:989614879ae7f0104235f3547394e4491581b081f1bf091645376487a09d00ee
+size 53148
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_15_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_15_de.png
new file mode 100644
index 0000000000..55c801e0d2
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_15_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc6663f6bb621600ffdfe327317f80e859216fa3071914ea2210af3803c747bf
+size 51729
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_16_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_16_de.png
new file mode 100644
index 0000000000..3cc9288d94
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_16_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd73a2f4882661074626c99dc53bc3fc7cf52550ad2817a60dc366a078dede4a
+size 52964
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_17_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_17_de.png
new file mode 100644
index 0000000000..81ca5e31d8
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_17_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1de536f73fde823cf3ba37a12ae778f5ddfd2c0ba408823c92c6b197a51a5969
+size 52880
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_18_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_18_de.png
new file mode 100644
index 0000000000..b2643af43a
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_18_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b43ae79cdc8523d93a55a53098d7cea5d60003d954ae1f87bb30c5a2af66308
+size 48869
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_19_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_19_de.png
new file mode 100644
index 0000000000..fbccf3bdba
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_19_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4123b4b31046f99612585b7132f1ccea6c69a34c3bdce671b56dc8d23585493f
+size 44900
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_1_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_1_de.png
index e0fac995a2..81ca5e31d8 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9ebab37f3d289cd684d616961b2f4b993a851a34bb8d41ce889443ce51c4c5f
-size 53981
+oid sha256:1de536f73fde823cf3ba37a12ae778f5ddfd2c0ba408823c92c6b197a51a5969
+size 52880
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_20_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_20_de.png
new file mode 100644
index 0000000000..3a78ffad51
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_20_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dfc412406efc35555095baf1b3bc408b211789e3d4ddc3e0e2f7ceb0e9176a0
+size 46489
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_2_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_2_de.png
index 286ee2d3e3..884d3d5322 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_2_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d578725c9ef0c37be7115017fe1b7f7da41c02a54f932ee389d4683f2ec3f524
-size 48465
+oid sha256:297dfd25bb5b2cc0a1164febbb71623dd534f8ddb8614c50d50743c9ef417de1
+size 47530
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_3_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_3_de.png
index 8428aafe61..a434f64c54 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_3_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e949b9fc728afe5da33073a5273aebe797a7c45a68fc6049e9292d0a256adad7
-size 49632
+oid sha256:bc7d4a5537f9c3f87be21f2a2b48dab2568285cdc15c6ac6443b8d0696fb29e3
+size 48558
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_4_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_4_de.png
index 8428aafe61..a434f64c54 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_4_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e949b9fc728afe5da33073a5273aebe797a7c45a68fc6049e9292d0a256adad7
-size 49632
+oid sha256:bc7d4a5537f9c3f87be21f2a2b48dab2568285cdc15c6ac6443b8d0696fb29e3
+size 48558
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_5_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_5_de.png
index e0fac995a2..81ca5e31d8 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_5_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9ebab37f3d289cd684d616961b2f4b993a851a34bb8d41ce889443ce51c4c5f
-size 53981
+oid sha256:1de536f73fde823cf3ba37a12ae778f5ddfd2c0ba408823c92c6b197a51a5969
+size 52880
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_6_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_6_de.png
index b107216acc..0a43e1b84f 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_6_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23548dc4c9b3ede93580ce56989ff05d4317605aaa584744f73a5897d0cd6c51
-size 46743
+oid sha256:936871dfc521b9b18b12cd52c97d1b67fae39226fb0b065b13f20a061c9a842d
+size 45847
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_7_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_7_de.png
index 058db215b6..a20e7a834f 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_7_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a284cc8503c3cd6227afbd593d36e6f9a9eeadbd323b5cf66d77e3b5eeb6681
-size 51713
+oid sha256:2a7701285cddc1f66a569d60dd4799cf35ca070e920f95a2463d4f48d81430ff
+size 50861
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_8_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_8_de.png
index e0fac995a2..81ca5e31d8 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_8_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9ebab37f3d289cd684d616961b2f4b993a851a34bb8d41ce889443ce51c4c5f
-size 53981
+oid sha256:1de536f73fde823cf3ba37a12ae778f5ddfd2c0ba408823c92c6b197a51a5969
+size 52880
diff --git a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_9_de.png b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_9_de.png
index e0fac995a2..81ca5e31d8 100644
--- a/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_9_de.png
+++ b/screenshots/de/features.preferences.impl.notifications_NotificationSettingsView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9ebab37f3d289cd684d616961b2f4b993a851a34bb8d41ce889443ce51c4c5f
-size 53981
+oid sha256:1de536f73fde823cf3ba37a12ae778f5ddfd2c0ba408823c92c6b197a51a5969
+size 52880
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_0_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_0_de.png
index ecad978eea..1e32baa819 100644
--- a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_0_de.png
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d57b5854a0156811f11b23a51f347387183507d95da7b68a94f9ac211ec7f36
-size 42003
+oid sha256:1586c25251df5634a3fcfc572b1926875213fa1af7e456490e064650b13e99cd
+size 44059
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_1_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_1_de.png
index 78e516e447..565e2fde0d 100644
--- a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_1_de.png
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ef5f886b293e35592e5c41b8e84a21995982ed56ade44f0e4dadd83767202df
-size 41800
+oid sha256:ffd7acae43a61f98605e7f8a6de3e00f8432e8ab42974e2d0e0f3d37550c8ab3
+size 29907
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_2_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_2_de.png
new file mode 100644
index 0000000000..8ba326f935
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ada78ec8fb22e50de9f0ef54fce8f8d5f6ab23948b9cb32334dc8034bc7aad6
+size 40880
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_3_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_3_de.png
new file mode 100644
index 0000000000..411cc0b223
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff0bc0d1615172e9120e42415b2b660042507234a5ee783a226f4a274c4e9b44
+size 30945
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_4_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_4_de.png
new file mode 100644
index 0000000000..82fc1769ff
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98087aa1557fcaa46245813d37424d28696d83220d1187d4b5dc4cee1727010c
+size 32167
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_5_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_5_de.png
new file mode 100644
index 0000000000..cf40424682
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93ff2a28aa016436780474d98042223d0d9e72f877003c0f476b3755ab6e92ad
+size 33739
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_6_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_6_de.png
new file mode 100644
index 0000000000..7d1e4fb3ba
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewDark_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe73ab4a3aae2660068503f2fcdb5aad12c20d0ce3ff202036cf820929a649c5
+size 20954
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_0_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_0_de.png
index 247fa79f85..5296434550 100644
--- a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_0_de.png
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc5c25affd9692e0c48c8160a444d98771ba5d725554024ffa0bcdbf00e49b9c
-size 43020
+oid sha256:a8e596b8e70ff79e8dbeed82f6053e03eef3073907bd26929c34f0022f3fbd65
+size 45634
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_1_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_1_de.png
index 2346a013bb..2a6d57344e 100644
--- a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_1_de.png
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7edf11d971f30998917d1ff9b3fcce43aef543a96289eea074be8d3a9eb37fab
-size 43077
+oid sha256:2693253d4c1cf72c36f8f75fb823f2b1e173ffdf3c3c7ba9f1e688de6d8c26e8
+size 30987
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_2_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_2_de.png
new file mode 100644
index 0000000000..fab99fdd74
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9519a47ab91235acb3cfc3f361dc01ac7fc0361aedcf7b4a9aaae3419468edb7
+size 41934
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_3_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_3_de.png
new file mode 100644
index 0000000000..06ad4f1cfb
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a39b5c91cb8e9b75a2935cca6561e83570eebd917873dc87b596c43f2d0716f0
+size 31932
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_4_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_4_de.png
new file mode 100644
index 0000000000..1d51c3caa5
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe34b39b3bd4bd5a9d78f1cd2165de9334fde9544f6abc8b40862af14b33e470
+size 33277
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_5_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_5_de.png
new file mode 100644
index 0000000000..883a5ef83f
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3b12da7a34e250eb3669edcf2d1fafccd059ecf133e388bfcec581437201c97
+size 34957
diff --git a/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_6_de.png b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_6_de.png
new file mode 100644
index 0000000000..7c853c2348
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.root_PreferencesRootViewLight_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e32c86006cae6c771bd03d7360083882cb0673370af3f8c070406718b5cee39f
+size 21351
diff --git a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_de.png b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_de.png
index f085e23212..9fc37666a6 100644
--- a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c823b266179d70fc5b6b3a3b1e0654536d1971fbe615f9db99fc8203049bf5b
-size 23526
+oid sha256:2fc98a42e6af1c52bcd185592680871187a5cc942de9eaac694c0209f50a0c64
+size 22678
diff --git a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_de.png b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_de.png
index 52c0695203..2144c61e2d 100644
--- a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_de.png
+++ b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6c6e0585e05d474d7797176d1f8222654d1eea1522bf508b353bf6b5694eaed
-size 65127
+oid sha256:6f493c136e7284783a35253f88a752ed973d628786e7c0db037a8c3a577ef8a3
+size 69694
diff --git a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_de.png b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_de.png
index 293b43a7e4..0e09e3da59 100644
--- a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_de.png
+++ b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06b30b3ffe792671b4a68044fb8b4c0deb9f1a0c0e121f166e2e4c50430f6c98
-size 35065
+oid sha256:f1394337ff80f74e9f4b6c5c2c947db462677f2957e0b73d2e919aabb6d2fc99
+size 34412
diff --git a/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_de.png b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_de.png
new file mode 100644
index 0000000000..717c042d39
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d14d6b601dc1b0e75cfb8a981d50be84038a544a83837cc5ea5ce2b415ff6226
+size 20879
diff --git a/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_5_de.png b/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_5_de.png
new file mode 100644
index 0000000000..d31716420a
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_5_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81741b929111f37c1b062e205b8d36259807a8aadb024848f03a5e4b8562f63d
+size 13056
diff --git a/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_6_de.png b/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_6_de.png
new file mode 100644
index 0000000000..9c02c0eb7a
--- /dev/null
+++ b/screenshots/de/features.preferences.impl.userstatus_UserStatusView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49bd134a83cb0c6b9b839e6145004a07bbfea3bd984f9288442a1c5cf29e0d84
+size 11846
diff --git a/screenshots/de/features.rageshake.api.crash_CrashDetectionView_Day_0_de.png b/screenshots/de/features.rageshake.api.crash_CrashDetectionView_Day_0_de.png
index 29240c9037..6fe8d49af7 100644
--- a/screenshots/de/features.rageshake.api.crash_CrashDetectionView_Day_0_de.png
+++ b/screenshots/de/features.rageshake.api.crash_CrashDetectionView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d34090b6d2a05946f81c205b40dba420f49c19063b8f4bf2d0f55afe31886e7
-size 24441
+oid sha256:225e3ea78d7f1bf3bb9c2c56c128bdb6994b22df3f7c010837ef37bbcdc34997
+size 25170
diff --git a/screenshots/de/features.rageshake.api.detection_RageshakeDialogContent_Day_0_de.png b/screenshots/de/features.rageshake.api.detection_RageshakeDialogContent_Day_0_de.png
index 39aa8e9965..c78691eca9 100644
--- a/screenshots/de/features.rageshake.api.detection_RageshakeDialogContent_Day_0_de.png
+++ b/screenshots/de/features.rageshake.api.detection_RageshakeDialogContent_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2e6807ba4b85c71cca8aebaf34a22c836c6d53ebf8caaa42790594d3066956c
-size 27850
+oid sha256:7546c33148ccc5d46e112c2488c6aecce925a9a0d729cc9c029c9dac2578e2a7
+size 28753
diff --git a/screenshots/de/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_de.png b/screenshots/de/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_de.png
index 4e69e6226c..92e0cba9ae 100644
--- a/screenshots/de/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_de.png
+++ b/screenshots/de/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b601bd80631b10503580d5dded81cc29647bc02da02576cb420921aea3177dd2
-size 20136
+oid sha256:84dbbb41148ae5962843a1ef337ecaa0b8d5fed1f1b0c40fe9e7b1b12af80afa
+size 20076
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png
index 42885de40c..416a90558c 100644
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f935cbeb516a345549877793ed1e0e5d82b0b1b81b65d54f028d8ee30a3eeb7c
-size 50075
+oid sha256:4d747bd7c8ff2fe4ddbfbaf7dc58adbda51b6eeb790cf9b9886a695bacc598e5
+size 55304
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png
index afb28a7513..402f60a833 100644
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54c0d5db8026616d766d1ceb94fbac1c3588be1ac3baa38e05ef4f665aa9419f
-size 115721
+oid sha256:9aa99577ce3172b8c8067efa3494c541a409c6e3d021b84209ae77f192cac31f
+size 115625
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png
index 4b03d29ff9..3e53f7bbba 100644
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8efca7b9be49bd84f809fac58de983e6126714914250ce4b0dcb96a56125bb7
-size 46915
+oid sha256:7e89127359e73a5ae2002906732958f071c989a587a091cead3859378d02aa87
+size 52421
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png
index 42885de40c..416a90558c 100644
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f935cbeb516a345549877793ed1e0e5d82b0b1b81b65d54f028d8ee30a3eeb7c
-size 50075
+oid sha256:4d747bd7c8ff2fe4ddbfbaf7dc58adbda51b6eeb790cf9b9886a695bacc598e5
+size 55304
diff --git a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png
index 473b887d73..70642b4911 100644
--- a/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png
+++ b/screenshots/de/features.rageshake.impl.bugreport_BugReportViewDay_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3d7c97667774e00e618be65e63423d9d62c8b30dfe95cddad1d5dc62255e38c
-size 39638
+oid sha256:ac3cf799c382dac09ec91c857cfbbf15148863cc66921bee326d76f3700ba168
+size 44154
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_de.png
index a0f75cd738..cdaffc1a49 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e8caaa7abe0756779ff2fc479a8642a135a697b7081d0765d0ea8b23091bd95
-size 56826
+oid sha256:d03e7f9d66b93e98bd4c76669d42ae28a5b70fc7a675c252b77eca422b8afa4f
+size 56809
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_de.png
index 3497888ca6..900983a6d9 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57cde12fdeba9556f2060e220703f7505d2e23d02215cf1fc5a92eaba24b0628
-size 55135
+oid sha256:d24e1c49ba19e2d095b2bd4dfd4999a36620bf881520249a5db5c76c4753fb94
+size 55180
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_de.png
index a66b84a19d..0a1c88d294 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beff4f5e0fb5d44354cc8e3804d86213d3a21bf4d689f2363960cd7e22fee44f
-size 56667
+oid sha256:ce1b25f6e6dab11a22e038c2e1561d88c09f75a4d961a279bf485163015adaaa
+size 56651
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_de.png
index a575cd3638..d7687aa81f 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45934c98831269dd7eb1b798647cb145faf5590b3740936146c1cd513cf6e907
-size 50243
+oid sha256:68f712db6d7db3c628acfec73233f2bd9704b86aa0993787e941ef5d5b1e2cae
+size 50354
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_de.png
index d3003c3e88..784bb3cbcc 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c9859b4d53d54adb5dd12213bef1b6a50d4e0862ce5c0deda752a5779b18b6c
-size 47676
+oid sha256:d56ec5babe852f439f172f8548d4cb03b3fa60b0e5ea21e9afd5fb6abb38b0e8
+size 47972
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_de.png
index 892907a12a..2e8b0be837 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ceb9e1948ff34962548c21adf3892715cedaf50d3bbafc2dc9015a9e96331d7
-size 56658
+oid sha256:a24f3c88154b22392a93e7ee473e5f3e55dd501e328179477bf4e3e4026f6b47
+size 56934
diff --git a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_de.png b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_de.png
index 256d632422..05574dec84 100644
--- a/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8312152f57b9d6a37ab33f426d1881a5c1e36c4457a89e4b4f06c5b1105d8cc3
-size 58109
+oid sha256:8248854c81134542e7ba7d34882fb0bc9728b10d8872e86cc0ac6599a04fba97
+size 57987
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_de.png
index 0c347055ba..328b85823d 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96cecbe1b351347b6eff86293a80ffbf143600fcbe3ed238c61b2347b8879411
-size 52376
+oid sha256:817b59bc4317f89f141e341b1c866ab195f34b1120f69c85804cef1b18b178ea
+size 52296
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_de.png
index 18794908b1..044814a52c 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:745935d5abff334391b1e588178e1c1b14a3ee0572c0ac1124958834929363ae
-size 54870
+oid sha256:ec2116368a69a68c118470138f97f9be4995b5d7b2b58dc85bc70ff48c879b82
+size 54846
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_de.png
index 93afdaa467..75f5513426 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ba2a125fe3a0d178de0b10794fa36183aeba355281919b453d7d66626abc6d8
-size 54882
+oid sha256:1745e6ef8dcf256f34c0ad441c5fc6a1732bd792a3341293a1124985c8ca358a
+size 54858
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
index 2092f34632..a3b8460ded 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97be53a837124736da9064a51783a8a39f793460b520b6fac35fb05cf7571b4d
-size 65428
+oid sha256:ecfec111e21ba2c98edc3746bf844490fc7c64fd3b39a3ec176c42095aee4bdc
+size 65643
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_de.png
index 7a05054cd0..30fdcb59a6 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b021c5c11bd6bfe0527db0ec4d1c387245af705775317f423026f59afb7104fc
-size 71218
+oid sha256:61e5c4c759fe08c919a2de146b39ca5762281197c06d1d1ba8b2e0db45fb2a64
+size 70562
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_de.png
index d745128db1..25117e4af3 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdcb5fb7c63dfed91d7b1319ab7ae9ded40d3f7a4aae9b9e49e22c7fc2b6b127
-size 64824
+oid sha256:8472cbf44919672c8406bca52f9a2256e2414a2e827b3b167b03222558631fe7
+size 64700
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_de.png
index 6c38c5cce3..e41cf2a965 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0ef695696bbe691990ded32cd6009c42b189afe437218155c09a2135e25dacd
-size 64652
+oid sha256:4237263a8d328c51203cabcc3714f88799ba219979294d01b2bfd45b5fc127f6
+size 64527
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_de.png
index 426f20e7c1..17e65d6333 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:068211f1259ed0d3ae2dee3db6c399baa2d94bb7a5a53fddacfc8efd87988d05
-size 58601
+oid sha256:9ef732aee7d4a81cd4e50d8eb006f98a56e7cb1e11f6eb8a35ead4f6a5cc01cb
+size 58443
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_de.png
index 1d339102fb..b0df582d6f 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbf48859a2a9443f5ff5cf061a0c68f8b9e9d9e27626faf439f0b7005537345a
-size 61178
+oid sha256:6b5badeee7216296f286422014e6b84c5acb6473d21390312f029ff8b666e0a8
+size 61192
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_de.png
index a54355414a..0422f0c5e8 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:761687db6cf908b4dd8d4fda6db683a864d61abbe91f64c2ab87369ce5f2ec97
-size 65487
+oid sha256:772e74f99812853139c120b28ce56cfffa5d22f25b3e9f6fea7e229766574b06
+size 65428
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_de.png
index 89e5409ee4..fedf2b87e4 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db7912e6566d4eabfc8673f0d2f7c5340259b26ed4ea3cfacc76f21dfa7552a1
-size 55075
+oid sha256:a8201fa17fa46021b640a2792ffab61189036288112076d58fa17a596bbfbf66
+size 55001
diff --git a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_de.png b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_de.png
index 6c38c5cce3..e41cf2a965 100644
--- a/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0ef695696bbe691990ded32cd6009c42b189afe437218155c09a2135e25dacd
-size 64652
+oid sha256:4237263a8d328c51203cabcc3714f88799ba219979294d01b2bfd45b5fc127f6
+size 64527
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_de.png
index 9359c3833b..be4e082882 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1942a4d7fd419e1703f7050bea511b57fb11799f83dc023b0ba31151c4ebb7c
-size 31670
+oid sha256:699a1cf4c54ab25a11dd198316403879870759c1972a98919da02cd2a982b2bb
+size 31597
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_de.png
index 07ad48c32d..185799c671 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:552ee8af61138f3bea47fd478be899418d55b3477a179e17f278393e244cccd4
-size 33767
+oid sha256:865f1e58cfcbf1de8efde943e16a4a3f7b8f800d013432c61fc63f17f4fb2da8
+size 33682
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_de.png
index 4a3fc2a3ad..e2e4faccd3 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd8aea477b02dec08fcbc09e10849a3786b0cd6d16f725e562b94dfbce04245c
-size 30137
+oid sha256:b196ba5482799666ee1bd9000de4c40895f7405cea38f9018eb45da3afc4c455
+size 30363
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_de.png
index b271b405f7..a15d3951ed 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c740bbb8e53f1df984a46c86f468f42632ae55659fdd0fcbb19dbc6caf1de5b
-size 28490
+oid sha256:fb7aa2178a4aaac88562276bb85879ac05bf57321460102c7b4598d69ed6388c
+size 28540
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_de.png
index 29aaf37520..4d2146e323 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18c6aa596af711ce96e196f63cd2b9d10a7e5edfeb37a74c6e70202a5692a162
-size 43002
+oid sha256:39d9e350f2fff99f89123c5899230d29fdfee85208bd611c5fc313a5d1c69098
+size 43051
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_de.png
index 4a3fc2a3ad..e2e4faccd3 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd8aea477b02dec08fcbc09e10849a3786b0cd6d16f725e562b94dfbce04245c
-size 30137
+oid sha256:b196ba5482799666ee1bd9000de4c40895f7405cea38f9018eb45da3afc4c455
+size 30363
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_de.png
index aef5118d3d..9a8abbfd94 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d008b8e9bf69f7b98b03189bdc3557cef24b2a0f5c8a4ef3ee964d08537ba974
-size 27959
+oid sha256:7d3c850336f4ffd9bd3e9f7da36e1b6ce85d5a308687a66623a3be79569ce45c
+size 28009
diff --git a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_de.png b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_de.png
index 17fc76ae48..cc535a7d40 100644
--- a/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_de.png
+++ b/screenshots/de/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4e9e8fa10f638c2b68b67d3598522bb1689873cf93fbc388fedef3d05ad4b3d
-size 29801
+oid sha256:c28d3688d90167323b819b20ccdf27a1049f51750b66cfad162baa974e0c591e
+size 29710
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_de.png
index db3bddd540..36dbf6b80a 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dbfbce290df1e1d1dedf38e7e642fceb44e00837413de97bf454df71c9459e9
-size 47635
+oid sha256:e46f6eeaabf4f20e9baac0c7c9468548c3368ffdac418eab9ba63710fcf29ab0
+size 47203
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_de.png
index d0e56a6e30..96fb67684d 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2711e8dccd0a317264b86c9801dab196381be9c88b12796aa4af43bff93355f2
-size 49346
+oid sha256:a97165e24d2d7e8aa3f66e63a21a510c87b6b530484779b58de684b62fc3417d
+size 49588
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_de.png
index ec9d76a63c..1345662657 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9481de4eeacf6b7a067450ba5e6dbb6b3e05e1f1b561ce71e7873fb0efe6ca04
-size 40534
+oid sha256:b013298feee179a8533e62c9c8f526dee39cee0f523310fc69d134ee83ed2be0
+size 40249
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_de.png
index 49af1493fa..d7b3e00503 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf1854518f5e3e3fb4c8e439d927a3f7d2f0617d22f2e684c09240920ef5e64f
-size 42350
+oid sha256:8bbf2ca23feca4f9fd0d4ab60a58ff53bea0bc6328bdf520d7e637f6fa411ebd
+size 42411
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_de.png
index ec9d76a63c..1345662657 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9481de4eeacf6b7a067450ba5e6dbb6b3e05e1f1b561ce71e7873fb0efe6ca04
-size 40534
+oid sha256:b013298feee179a8533e62c9c8f526dee39cee0f523310fc69d134ee83ed2be0
+size 40249
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_de.png
index 49af1493fa..d7b3e00503 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf1854518f5e3e3fb4c8e439d927a3f7d2f0617d22f2e684c09240920ef5e64f
-size 42350
+oid sha256:8bbf2ca23feca4f9fd0d4ab60a58ff53bea0bc6328bdf520d7e637f6fa411ebd
+size 42411
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_de.png
index db3bddd540..36dbf6b80a 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dbfbce290df1e1d1dedf38e7e642fceb44e00837413de97bf454df71c9459e9
-size 47635
+oid sha256:e46f6eeaabf4f20e9baac0c7c9468548c3368ffdac418eab9ba63710fcf29ab0
+size 47203
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png
index c2ae0556f5..99644efa4e 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ba073d0fe9e1119e008a086fda234bc3451df4685a4d4704cf8721244f92e10
-size 46184
+oid sha256:363d934e082e4480345a2e1838870ae4ab92dec1d2bb0b903f4ab29e5a18d22a
+size 46089
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png
index 6d58ebeeb9..ad5ae8c3a1 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:723d8bdb06037c0098aa35fa2a8300a9ecee7367b5ee608bef7216dac4f46d91
-size 44761
+oid sha256:a09efd65da8dce165f383ee3c571d53ad15dece7028eb9e8eb094345795e6bf9
+size 44201
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png
index dc74aeddda..83a9cb117a 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9864cca2481e1f2f02ee625fbd47f3a182fa997cc917bc842ed893c1d2eaa151
-size 43560
+oid sha256:220f22926eeaa4d31a923dafa081fe3983a311bf04e15856d045b4ddbf729da0
+size 43561
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png
index 2630d505bb..48b674bc28 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1aca90256973d9614b6dbbeb665b782ebf3c59922c3fd569552d58d8437f54d8
-size 45347
+oid sha256:1466afc2fed907b70544cccc00f5fb83dbaeb9d69e2b7986c3e9691628341af1
+size 44536
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png
index dca83692da..69ebc6840f 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb22c1fa6e30e4fa2f9500fd33f3aa44bab2c2a1eb1374b306a216a808c96192
-size 45260
+oid sha256:b065415e13e1bdf44a9c27ba4568e6eb0d62d1b770f1b7feba2f584de937c331
+size 44468
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png
index ad0dceff1c..269cfaa786 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d933933bb693c3e227a750d5db76afc227df9ee4932823c6aafe99ec98e6dc1
-size 45838
+oid sha256:d626fda5fdf1243976def39beaa67831011ca74f430128879b24a6e1dbd44efa
+size 45907
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png
index 82316c99e6..1ea68f73ff 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a6f8f86d9a770a893949c7bc1762e3e05c6940be58708f5ac7a1704ca84debf
-size 46369
+oid sha256:1edd626d24da35091f60dcd5136a27b2c4987e03d7ee6d4045bf001c4f12bcb4
+size 46268
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png
index b70917c986..657a684d80 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5978469c7701bfcdb1c4f5af0279ccd712c1c9a7ac17d26751659d0bd72fc7b
-size 45626
+oid sha256:ef2477e8b1a2b73694a22e7a67e580f91bb40572b4f41ded6c3022d246e5d35f
+size 44766
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png
index a6ac629dd2..b48969d333 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_17_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b81a4f9a425c64ff9d3bbe5f61fc9abf46d0c4d5f746aa8b35140dd7ad568a6
-size 44844
+oid sha256:5d67193aad54d160409572884fb43eb96eb6ce150995dd587f700a1e5f73fc63
+size 44174
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png
index 6d2de679d3..e8868e88f5 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_18_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8608f7c43d21b688f60f7416f144df912fb7f8852949cd9fdc6752b47f9f0338
-size 42918
+oid sha256:94dc77f27194f5f34ac1948226738dd5b82da88be6e75a1888f19681c81df36a
+size 42836
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png
index b1448746d5..85b576cd06 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_19_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a9bba827ce7181ac459aa41f933bcb1513a8adec101b89a7557b4759f1740fe
-size 42871
+oid sha256:e7c3a3647df677fbe63d0923c6b740f83fc5585a904c3b8e07c47e7ce7ffe4e4
+size 42837
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
index 956fc80005..4e90a09ff7 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:941b9293c96017d16e5964bf13f5b6b7954af6588a8dce2a8f731bcc3efe0321
-size 41743
+oid sha256:db268adf22086200cc8ebf46850f0239e8b33e1a79d1c120753a6bbd935dea39
+size 40583
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_20_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_20_de.png
index cdf129e144..9cb5a90004 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_20_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_20_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dc02ed20454ffade7a393956c0dcbb6f15a7d7012c0322cc43291580ffdc99f
-size 47790
+oid sha256:0e86a20df92ed28a90a8b3ba4fe1aa4bdd493bade93e6737a6f6b26430a56f5c
+size 44681
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_21_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_21_de.png
index 4392889de4..cca4cae93c 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_21_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_21_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eca6cd07f5eab788aeb07a35fb23c8f4ffc316aa9dbd1b48efdf00d16e6b4093
-size 47567
+oid sha256:7366b272601654b4f5651cb82aaad1be08aca0cffd96a504aa857e1e4dcbe1aa
+size 44629
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_22_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_22_de.png
index 9f391af648..13b0440eb3 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_22_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_22_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:450d628e5540ec8234d6c3aa33cd657ff51a56b5518004eef628eab92328b616
-size 47221
+oid sha256:a3dca96ed406e04375095792789c9e657c5d1f8e98b877c6e991d0cba70d2f33
+size 44273
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
index e53d7fab40..bb76416135 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6411a8af9386bfca9b171e16b60231bc51c0a7ed92ff462918a1342251ea65e0
-size 39459
+oid sha256:103056e52d308e044579a0e26e074f69fdadff1239ed10fbcde3088f39d26afd
+size 38417
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png
index cee674d4a0..7e2d491a37 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:731fc476ed64dcf665ccc999072be646b04b58d7e440ba96e38cddf6953f08a4
-size 45410
+oid sha256:678517d61e34de5732c3409563415fc1bc2ea8bc8571435d5adfd8cb4dd798d2
+size 34196
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
index 8cdd7726b9..05dbd24049 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53aea24a421f5c5bdb2b4b0cdaa3b73f45c2747abc2d547c52b35234bf1944ae
-size 44602
+oid sha256:45cbf2e3e00fca851864b324f349f28e63a91c01d912cc2406fba054bc325f35
+size 43053
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png
index f9a596640a..4c21775d11 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fbb251010c11e7cf41cd9d772628eec858e2eb7eb102f0d07a177f25d7e0e42
-size 42559
+oid sha256:ca1edb157db2e40136ccc898c55e88d26144f2d183030f485143d760ec1663bb
+size 42543
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png
index 346aa30d3d..5ecc77ae3d 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a898591cee5b687baf9ec6d1c4fa1c0de34b99e45ddc1541de15d468c1ea1b1
-size 45985
+oid sha256:9a93a0c0243537989282dd01b26246efc5fa73cc44096364a7429f962f9c83cb
+size 35001
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png
index 39f289f1e2..cdf3a551aa 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07d62137742d97ebd6f1ca605f8239808d063db2a5af5a217fafa9156a7d8906
-size 46085
+oid sha256:e3a7897bdef6291441de8e06969f5c2781a52b5df1dcb7a0a78ca154183eca67
+size 45153
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png
index 064953e54c..3f8a788b0e 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bbc17b6609505a390fe0baae91706366deeb8bbb41bfe8493e98e23a1753c28
-size 45479
+oid sha256:1a4e562634358362eb15165f6c3b00a66e35e187e433442a06b8f5bfbf997a34
+size 44726
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
index 77fe390317..4c432f0485 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f9836b0fdd3bda742e2b4c7aa7f724f1d6dbefb748d4ed31ba6912ab6600f2b
-size 44166
+oid sha256:e171f751b3ac646550ed0d03c30af5c1a87c40bd61966109961d45e3560ea0c8
+size 43448
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png
index 6fd394851a..bc26f4154f 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f006c30451416d0a41c3d902f7c9dad8b4d404326e623534ac7a09fe5b2699f4
-size 47231
+oid sha256:f9a73947904a394eeef3844d70fb954d6afe99b475070e2ffd3f4d1871350fff
+size 47776
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png
index 3346f21554..fcead70d3d 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28e1fe354a3305ad933daa95a65611335357ceb6599484e85ee4d3ce2f019e79
-size 45747
+oid sha256:9863915e647a1e379bd36a26118a27b008c91a8be834e0654c8f07f2397154b2
+size 45670
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png
index 8028d785f4..ce77255472 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f7d823c76b57b8d37cd86bf6dde6e61092dadeb03f65e0fdb3d9d0e7b016513
-size 44564
+oid sha256:390e616bd74652cd799f44c306979cabf8e597dfa345a12ef70b734d360301e4
+size 45110
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png
index eba1696597..ac1f951a2b 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15ec7bd1f0e7baa884e7e89aadc485a7ab02d80fdc2957c5ae10ad6369f3bbab
-size 46376
+oid sha256:72f99b9e99f58972a241871c96b88b5a6b7c63e7936f312cc82a96e83b9df927
+size 46051
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png
index c9813ac9c7..04725afc93 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1818053ea53eb07fb96a27350bb0e59c8b696dc0a34ae16f7b814743d377f06a
-size 46272
+oid sha256:aaf5e26cfae6c4151d88535e3306f763cb236662a348a93486dc8d27b3844db5
+size 45997
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png
index aebb284744..de3387c174 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:966dd5700a19d89bb8192b153f381387e80094dab940fa876a4c4eafa73c23df
-size 46776
+oid sha256:bc26686b6aa746ced27166c9a78c757351898a91440690dce39219338cd08387
+size 47558
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png
index 74cd663399..611ac1df4c 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ba4a4082698d5aba2e36ed11e50df97b59c2d85e09b53b1e3d534e2dc97c34e
-size 47377
+oid sha256:f3a7a3b94a0113f857083b257f5212080bea2ca6a8c45d81fa766d9be08159d4
+size 47988
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png
index 03fa90e4ca..6e9d79062c 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d258cc980ddde7603d07c1d0ede66eb05a61215e8a9f7591083f44e3fac48ce3
-size 46652
+oid sha256:2a2a4f87070ff794d5d9b2801b00a953a2293b8ac53306f600c8fce034bccf93
+size 46309
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png
index 31d3ff96f5..ebbeac3f02 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_17_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e1cd8ae0035eb0cda747eac54bd11e3d95b8f006e10c05752209b0aff5062e1
-size 46149
+oid sha256:079136ab2f084134091d7b80e6fae5f3b4cc0bf7f15f77fba37ca2bf02f5368d
+size 45831
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png
index f8dfb9f0c9..cadbd5e21b 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_18_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc96bea99a5bf31bb0f742383cba458f14baf150845a47e1d14681c806c2021c
-size 43913
+oid sha256:728d64a173548cf520b424c58cf0782efa1c7059e232d01442cdeae872bc31fd
+size 44529
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png
index 16ce3617ac..295a526d1c 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_19_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b6d30a4661310b3de30ed34c55bbe37af245ccd0c363cf2b5fea7c66f058e4a
-size 43792
+oid sha256:a34deaf4c5e1fd72f16157623bba5a6196b198d7af8f4279810a2a530f249e73
+size 44486
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
index 6de030abb8..28b72b85c4 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5327a706c81ac518776c5ad183bf601c14c97ea7bebc9b7c52cd04a2919e40ed
-size 42899
+oid sha256:8d1e0669e1bc2e8bf3ef3ad78bc5ad0d115c5ed190c324c97c50fb57c441b1c4
+size 42034
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_20_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_20_de.png
index bb4aea59b1..b2b4a832b3 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_20_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_20_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f989780ab77db2fe17b0e7c52f8d73ad9de1c336bb02b4dc29140a4cda55cd58
-size 48860
+oid sha256:670017dec6822b218b58b7ff1e9a77820bdbcb83ef8d016fdc86dc6d8424dcfb
+size 46236
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_21_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_21_de.png
index 84672b20a9..b3f8165b4f 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_21_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_21_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb5e80f50cfcf6e6eac762a3bde89bf474931ac8a10c951d480f354f6bf81875
-size 48581
+oid sha256:b01fe8e863b1291d80276cbc69e90942531120ed4a55e75200537974b9c10222
+size 46175
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_22_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_22_de.png
index c8ed3fd3a9..4ef7cdce2d 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_22_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_22_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aadbf1e409f2837387ea390c82ec8bf16a979e995d01bc0250cdf9d4bc7c881f
-size 48252
+oid sha256:da295c263d2e5c5ad03114a1187f2a3839ea094a4669d81798dc44b2a9d8c639
+size 45770
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
index 83868afa29..74ac704623 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ffc68081fe2c9c391f71635a160559d4827f5ce69589d799ed499612e77260f
-size 40469
+oid sha256:287e77c80a50f52c8f6379cb307ec87cf0ae85814229ce0794ec4485260c8b12
+size 39846
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png
index 7daf7e374e..f960fcc707 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2fe91f0d2dc898b39893d1efb70a827197e59af026fe53badbd4b1dd9a7ad11
-size 46398
+oid sha256:44272f5f1893abacabb50b6094580b3897ca8612f06ef48064f1da455b1a1359
+size 35524
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
index 69515bc17a..8587822a8a 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3388b6b6f46a7c90f3c45568e22d7d795f91a8a5e3fc9fabe7acfdd99013f868
-size 45606
+oid sha256:65816f3925fecc5b5f5eac06bc706c3270347103d06ad16a3c9a61cbf6a55b1b
+size 44616
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png
index de53328c9b..0169436da7 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8cec2bc057e632943ba3aa42fa427ad6f6e766682903d620067ab5c8437ef21
-size 43449
+oid sha256:3b9f8b1f0b98267b2dba7918487ee7bfc432c93bb8cfab45280a014857529fcf
+size 44188
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png
index 6620a09ccd..fbbe4280ea 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a84cc9c31168887d8924044df0e558b4aeac360a52426027be5b5c1a020f116
-size 47082
+oid sha256:a482b0a589b8e5fd0474e76e1292c607b3fd9232caa69ddfc4602f4eb29ba730
+size 36629
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png
index e1ed2068e2..baae5fb1a5 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65b9e404e0cbc2315d595febce884f11034ef7119ca76ae9dccbab4d2248bc96
-size 47259
+oid sha256:9db70150e020948a92cab255b0c1b923c11f0d7f6de99d8ddd262128e9b78f6f
+size 46812
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png
index b0c9775ea3..f0085f5849 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36cb6dee1515ad0239cd87969649d39ca53b528651565ce9f49461c6f7f12198
-size 46633
+oid sha256:116e23d25566ec356b2c4bae654217a1e5a38150f424f45fce91a5b4b9cc61c4
+size 46294
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
index 472623e81b..a7bb6cef72 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6436222472999c9ce19fdab8e5ee9d10dbf846b2764a366826cb4150c0dd426
-size 45170
+oid sha256:0cffffdfe22cb238c6a667e4092450e27c53597f4296e35b732764e6f5b484b5
+size 44833
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png
index 547b9ac6d2..8c69f2926a 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c96373fa4553adb41fd650ddd7794addd57a2c007152bcd24a33a2677f692aa
-size 29729
+oid sha256:efc41570c6e1c04f96a4226b629a55fbc979555cddc20e62659b57e9e9a516c6
+size 29702
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png
index 830a59bc98..f3f3f717c5 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5acabb4f45503b9c685510dfae0ebffee07b6383d7471edc74a462bab952ed56
-size 24105
+oid sha256:420cffbe21d04b2e274cd5c6d24076f05a21081701a60925f7efe0aa64f82839
+size 24097
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png
index d4f4218c6f..e963ada9fb 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1331106fd5cdb17e1a64517582e2017942bd30981e35c9104ed9691dad6f535
-size 30220
+oid sha256:2284ea6f41d947283f997d48c2532119c1562b606bdbf730bdba4755e67c28e8
+size 30135
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png
index b9ce13764e..f1100ff0ed 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a0fae6a3d68c058cfe4cc4d0a7c395129262050f4c423dff5734318b6d5a5d9
-size 52439
+oid sha256:582e106bc388c89ad644b2899390e82e5740004061aec622b6b97aa1bac12f85
+size 49429
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png
index 845659c354..0888d9e355 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fb81d71260f2ac8568d8505f4ebfec1ad97e8001a94db6815e9dde859a38e30
-size 48491
+oid sha256:cca14f96f4ba493ce291f9f982d47a84d6eea3090e774bc4f2b1df63472db696
+size 76461
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png
index 43681f14c0..b54c41f267 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d3e9968441f6189ec0e234c34178f7802ea4da778000338da3506ee428182ef
-size 29869
+oid sha256:45bd842b590d153fd7c727b08e34f69c73fba0f2c73530f7726efae1386b37c5
+size 29846
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png
index a2a0734703..5e4641cef0 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1067316ebeedc49b187fec61da538e07431612d5b38efcf8f7360023d4c34c1
-size 27968
+oid sha256:4a1d1b889880d3e4065b7de036c7e6a26f6817dd6268df957d948ff06aaa8c7e
+size 27881
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png
index 698dc47f17..9f16c22be6 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f1cb7f8790e0bd8ca61e137494db81295d6bf3fd6eec0f04983178a17c2bbe6
-size 25608
+oid sha256:45c2edc8bc542bd02c26c696c339855f8176afa349f7097f35cd9b5d6a45ca43
+size 25889
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png
index 528eed4126..440f2a693a 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91592dced46d59ecbd6edb157ddb5325fb6a8a495a9434c2d878763f317dd104
-size 30930
+oid sha256:2f74a6693ce54a06ddb795f4787252cc35ae457eeb71330e2c3522aad64c55ee
+size 30928
diff --git a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png
index 3f716d49eb..13f81454c3 100644
--- a/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png
+++ b/screenshots/de/features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6d39446fb8d8889b01bb411d92022fcf80e04efa89fd9bee7c071de791f8213
-size 32436
+oid sha256:dc4d09a07b88320eaa41e006cd67c56a7e6d5459f15e0471b00b0cebf73f95c5
+size 32558
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_de.png
index 5781478873..9a73c54042 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a78ad12392ea4d4e9e54ffbc786a6e3eec73294e088f5403db88af5269a6b003
-size 18523
+oid sha256:dfe598362f7bd9dd246c73cc98ac5ed34fe77e94467de94509fa0cbea9ab571b
+size 21313
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_de.png
index 819491fece..87471ed32e 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5dc117e18612891f202c6bc093e4a2063632ee974939606af6eb09ee36deba9e
-size 22172
+oid sha256:86dc7f757c0f38fee531f5cc857626f5ffd993b1ff7c8830a4cdbfba4c37e501
+size 24945
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_de.png
index ad63075b13..a2ac18ab71 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc3534d406c3ef468e9af1b86d8d09998fd173aa1f63627412053f4e4d76bbcd
-size 27625
+oid sha256:58a0fbc9a1cbd6bfdb5d53d06d971fb36c666e48c14920ac10403223d87b1f4a
+size 30185
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_de.png
index d5df6b6df0..1fbc980d1a 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1d10f6ddd38cffdf7f8ba188790f6115b18b95de401ce08ba4530f249f99410
-size 28109
+oid sha256:2ea689d5607d180e37a9acdccaf3653ce20002ae1108fb6742a0624b3eb05af5
+size 30666
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_de.png
index 6d6878395b..5d00c96c9b 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0666fc8348e5f33b265d2345973aa529ca12e464535331c71244cf3a17c94cf
-size 33570
+oid sha256:b3face6ab5952fafe521e1df418eb1ea14746107b78c993c992f188f4f0b5ee6
+size 33690
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_de.png
index 56c4a02de7..f23adb562c 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24bc5b3a5be02a4dabe2a4c1a773206dc7f991ea99e6b5d2c1b8e99f69055611
-size 31547
+oid sha256:290e8fd9f8b7ee1532d050dbfb0c888870c12f88e9c8c60a3de54b1caad3e453
+size 31655
diff --git a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png
index 7cc591adbc..c9f77b1c8c 100644
--- a/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png
+++ b/screenshots/de/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cedc1ead4632facdffa78ae83a0636d08e92013184587f346d13cbc4f98fd29
-size 35997
+oid sha256:19fe1682689050cce7831aa90f339175248ba578ac68fc7e1913b3eebece61f8
+size 36059
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
index 6224a55c6d..8478c19fda 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71815785672b31d061a25b3980ecb368c54d1e7259533fd1989819ae3c922e2a
-size 74688
+oid sha256:e697b923e1e387be4bd8d3a8de0482c9be4a670192f29bb3c5529ff211e9e442
+size 71612
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
index 6224a55c6d..8478c19fda 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71815785672b31d061a25b3980ecb368c54d1e7259533fd1989819ae3c922e2a
-size 74688
+oid sha256:e697b923e1e387be4bd8d3a8de0482c9be4a670192f29bb3c5529ff211e9e442
+size 71612
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
index 4147e93eef..9462258aaf 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a47734fb0be5195c915373f922ed2fb87f3d89c5c517fefd0fea00cad76bbca4
-size 75418
+oid sha256:4fb4462ae1261dc77869d984152bac7bd810c92a82782c36e2bcc448d3aa6459
+size 72336
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
index f8fa0ef3e5..73080a8c95 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4c12cdd10cc2fb443c4dc248ab03740fd68cb8a2f8021225bee5010dd5e8438
-size 45465
+oid sha256:eb86dfe02f725547da2b90a4f9390db134f1f27e8c0253a33ae47ed9feb36cee
+size 45289
diff --git a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_de.png b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_de.png
index 510ef4cff5..3841e9a8c1 100644
--- a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f8be955697c172685ed1abacf1466e6d16be50a127d60fcdd07ffe863a2b280
-size 30422
+oid sha256:f8a25adefb463d3415cf792c55c2357d0654c9837d9d8c85473337e4da57df30
+size 31673
diff --git a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_de.png b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_de.png
index c14394e142..44731d0b48 100644
--- a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00bd106c1e653a8a9e2c25766c7c7fc3aff62ad7cab95f1c64e7f8a943ccf76b
-size 29594
+oid sha256:ad35b8e920b273ea94cdcd4e0e3ea4bac5e5d9fda31148c06fe32655b9946b8b
+size 30437
diff --git a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_de.png b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_de.png
index c14394e142..44731d0b48 100644
--- a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00bd106c1e653a8a9e2c25766c7c7fc3aff62ad7cab95f1c64e7f8a943ccf76b
-size 29594
+oid sha256:ad35b8e920b273ea94cdcd4e0e3ea4bac5e5d9fda31148c06fe32655b9946b8b
+size 30437
diff --git a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_de.png b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_de.png
index 9fc30c087b..1031c440de 100644
--- a/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:486e225305ef358a4209a7702e80be03d76a6da4cca3f99106d8b0c652e5f9d0
-size 44032
+oid sha256:6df694b16f3474dee2429f9ccf5279bdfbbe23d102911e633937e7f7ef12538c
+size 45374
diff --git a/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_de.png b/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_de.png
index d3fc6cd00f..0b6f65c0a8 100644
--- a/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:828cac2a145d0a4c9f4a585abce862c07ec8f5a96413210c0d3f347b0bc63f8c
-size 69449
+oid sha256:89e37a5045fdc07b873fd0eda7f3f15a7b61b12f2372a3e2af4e343c3ecb1b38
+size 66427
diff --git a/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_de.png b/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_de.png
index b686bc6fa0..5e1b0b263e 100644
--- a/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:711929ee9ee4f29008113163b4eac4646bd73ae0e32ec614caa6dd72827aefa6
-size 49781
+oid sha256:8b0f235103342097a27a35a3074159605b07ac1832ed00fded323802ae48c1ba
+size 51740
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_0_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_0_de.png
index 69691a898d..f437eb6ae7 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ba5eceb0adc4b9feb3834f967dac81f1e2b6766934f6aadd54f3be011a98f6b
-size 43156
+oid sha256:f9a36e73dae1d3829c3575f0490df31c502e9535faefba3c0f1f9d0ce71a3d22
+size 40449
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_10_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_10_de.png
index 69691a898d..f437eb6ae7 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_10_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ba5eceb0adc4b9feb3834f967dac81f1e2b6766934f6aadd54f3be011a98f6b
-size 43156
+oid sha256:f9a36e73dae1d3829c3575f0490df31c502e9535faefba3c0f1f9d0ce71a3d22
+size 40449
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_11_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_11_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_11_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_12_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_12_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_12_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_13_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_13_de.png
index 2add9f0e02..71b79e0b69 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_13_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_13_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb7e2b92bd620115488d20e501f4040a042907dcf93d24fc77ce5a9fc178b83d
-size 70404
+oid sha256:af8b41d7e76c06bce4ad9420c6f2876ed61fc3e4d558e3b3e089f3ca5603b459
+size 67837
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_14_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_14_de.png
index 51dccd31d9..fb8b09020a 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_14_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8944a90ad9e5cd283b9a46547ffed79b932fc0fba9caa51a5d2e91021d302bd
-size 66333
+oid sha256:923386ffe1a9737066c590a1d666439942cdc4177831a22e615633334503811d
+size 73363
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_15_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_15_de.png
index 7a1dbd9583..804b76f295 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_15_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:587ae11b72d16310df68b70367a7c1dba8611dd252be29c9e403d7dfb216f43b
-size 56498
+oid sha256:80c069fb357ca634c17251356dfed57884f7b50490a027d6f6254fb1c5b68330
+size 54504
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_16_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_16_de.png
index 2f90072e8c..7b474bc71d 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_16_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54130f6586c04b3eca992f3b3ab08772c3a8dc838800dc0847aaa30fad664021
-size 68285
+oid sha256:dd3eee57a5934460aa6cb061a32bda34b96146b230e874122e17e473e6a49ebc
+size 65886
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_17_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_17_de.png
index 81fccd7025..acc9ca2eae 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_17_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_17_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be67cbcb3279bb0d0849ee037d4f5310d7c8e56e87906838c0c0588da19ff6ce
-size 52661
+oid sha256:d00a9f39c51db7e3bcb3230b29d6b4b86cd2c538057f4a2d471e463eae7ecd8a
+size 51204
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_1_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_1_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_2_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_2_de.png
index cdc5c1bd63..5b59fc55b3 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e065760677d14694ab6444762666f2d3af5fe8069cdbb08fdd9ddd3b5d53207
-size 44405
+oid sha256:e4538e4994ff46b67cfc376469f152b2c8725131ba555328c8fd2b8233018fbc
+size 41721
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_3_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_3_de.png
index 0c892f4de1..6c964087de 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7e3df55da07e3d081934df198f12cefed4599acc8eb8b3db25907cc5062e430
-size 45029
+oid sha256:4b9bab52cbb4226177052e55217ba518706af204f4550ae9d1986d05d0cc401b
+size 42318
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_4_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_4_de.png
index 69691a898d..f437eb6ae7 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_4_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ba5eceb0adc4b9feb3834f967dac81f1e2b6766934f6aadd54f3be011a98f6b
-size 43156
+oid sha256:f9a36e73dae1d3829c3575f0490df31c502e9535faefba3c0f1f9d0ce71a3d22
+size 40449
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_5_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_5_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_5_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_6_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_6_de.png
index 079249afcb..ef70e07494 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_6_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba49338dbd77ebbfc82d555433e03c9ed222355ac8d716dac5b1677811e55e6a
-size 41844
+oid sha256:f8a1e425850742521751919d5f0df63f27035c9a7d7bf7d442cda12dcfe451f7
+size 39619
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_7_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_7_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_7_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_8_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_8_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_8_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_9_de.png b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_9_de.png
index e20d4f0a54..8ac3eaa191 100644
--- a/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_9_de.png
+++ b/screenshots/de/features.securebackup.impl.root_SecureBackupRootView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b39a9cbacf1e86133a1031a105dec92a910a364f4758de3d48a8c63db232430
-size 44028
+oid sha256:1851a2e559c42ec1508e3020d1b56c467b3098eeac4e47d22daae3591a711fff
+size 41332
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_de.png
index fd27a4660d..700a209aba 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0ff3fab68e7412f4007b2fbed67268f114064097e3256d051b235cee3350296
-size 50172
+oid sha256:4c89bb4bfe847f0a71ec7b74627b21f9e20245472d16ba413416eb3705d5859d
+size 50721
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_de.png
index 13bedfc6b3..742c8b1be9 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:deaffb7054cdb7dff2437f94f19bbb7a135e468d205fd87df9fd24a863483008
-size 46802
+oid sha256:785114ab0576fe9a69fcffa7dff1252ea660345a5706949e461878859dde0c33
+size 47362
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_de.png
index 1292c01a4f..894b66623c 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90ec71c1f37b2cadc100c3ad14fc03aa1abb76881834a97c9d7db9deef49456f
-size 40043
+oid sha256:ada44308165eefb690684726100507bc2c20e1d363a3555f7d8975c6645e0536
+size 40144
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_de.png
index cdf64c352d..62f0a77598 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73542eae97679631df08f0e505ada9a12325ca5544eae4d37dc5c0a0ea4c4939
-size 62398
+oid sha256:1ae69f5a8fc884a2ca02d8c84e9342b9633512de78348a0bb2d661d5735e708a
+size 63185
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_de.png
index 55345f0018..3fc33a270d 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12537f5ebb752dd40f9ed048bc30669f78e8fdffd3bba3c4c4c7f34e8aee1f6c
-size 59311
+oid sha256:6930558f6c4cda30d6a83fa320a7a17d4c45db0bfb2e9bf21b13701d047e76a2
+size 59611
diff --git a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_de.png b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_de.png
index 217548fbb0..388cb2f945 100644
--- a/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_de.png
+++ b/screenshots/de/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cfdcaac6e0f1eaa0bd95e26fbdebc698dd90cd0570bc757755ea8bc8d66f82e
-size 42170
+oid sha256:57dc90ddefeb2743ef616ddd11e5a9cb3847d714e2f452e2e58f7d7cc02c3422
+size 41780
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png
index b9e27d64de..58d6c1f136 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f91b5e9e379a6053f2dc204edf67dcdbc3aaea7b0ef055360cb8e1c749a862d
-size 28994
+oid sha256:9ba6580e7b5cf07c6dbd067ec863dcb485a3fbc7d03d93dbffd8a6c2d337b058
+size 29129
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png
index 2ee8c1d373..2dd817a0d9 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beaf80641fe9918dc76626709feaf7e4f20445fde61ca26dd867eb77960d39e6
-size 61646
+oid sha256:054a9b89b6c4007b839e53190b10938a7dc5947badad88876be243e1386628a3
+size 61787
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png
index 2ee8c1d373..2dd817a0d9 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beaf80641fe9918dc76626709feaf7e4f20445fde61ca26dd867eb77960d39e6
-size 61646
+oid sha256:054a9b89b6c4007b839e53190b10938a7dc5947badad88876be243e1386628a3
+size 61787
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png
index 08a5405021..cc0df3adc9 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81a6bbb9b125f32ddf968b39589a50f5c86f57e0ce74f64c4bfdeeb0a15d1044
-size 56320
+oid sha256:4ffea6362670777720ad844d424ca9fa8ca9a3a79f26adbdaad1b28adbfe18d6
+size 56453
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png
index a4810cfa49..84155f40e1 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:732945a494e17c01ba15eb2d125c451dd24fe0d372e4f8c326870c00cd5919a9
-size 63468
+oid sha256:323f616c91310b48da0170fddb7c7ad68edff7ffda48e933cf20e9728b8057b1
+size 63607
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png
index a4810cfa49..84155f40e1 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:732945a494e17c01ba15eb2d125c451dd24fe0d372e4f8c326870c00cd5919a9
-size 63468
+oid sha256:323f616c91310b48da0170fddb7c7ad68edff7ffda48e933cf20e9728b8057b1
+size 63607
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png
index 6052cc869e..fbd2710432 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f50dff310fa256e245c367ff86925b5836a01c15c291693fc63cbd252218e98
-size 30303
+oid sha256:b6e6da70984ea50474cf4f12c78ca8a4df196e92bdb77bb9ccebb4e00ff986cc
+size 30460
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png
index d1472d9bce..d016666d26 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1b686819cafac3ef2b162303af90ee7a3235d9710bbfbd32b55eb32795344ed
-size 63939
+oid sha256:b3c2270c8ff1643956b0ab4fcd066dd4509b0fa175ae8652e83bde5c1c3aaa33
+size 64089
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png
index d1472d9bce..d016666d26 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1b686819cafac3ef2b162303af90ee7a3235d9710bbfbd32b55eb32795344ed
-size 63939
+oid sha256:b3c2270c8ff1643956b0ab4fcd066dd4509b0fa175ae8652e83bde5c1c3aaa33
+size 64089
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png
index e478d3dfd5..f434d2afca 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cb8223671b7e668dd25586e72d06eda531b8f73e25f2a0c8f58c8a20e2bed69
-size 58885
+oid sha256:16423874fda81c259bc18949f550ccd0cd2f56aff89304fda784d51d02e175b4
+size 59036
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png
index ca3ca6fb08..eab0ec0568 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ecec81c744dea2ba5adcf8154ef01a817066e7efeeb815e97db0b387078d3ab
-size 65933
+oid sha256:f7fb8ec382a876de47b2c1fb89de638bd1b6fd44e088e7fed4eef09c59f8eade
+size 66082
diff --git a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png
index ca3ca6fb08..eab0ec0568 100644
--- a/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png
+++ b/screenshots/de/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ecec81c744dea2ba5adcf8154ef01a817066e7efeeb815e97db0b387078d3ab
-size 65933
+oid sha256:f7fb8ec382a876de47b2c1fb89de638bd1b6fd44e088e7fed4eef09c59f8eade
+size 66082
diff --git a/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_0_de.png b/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_0_de.png
index 51aae98e87..1ffc68233a 100644
--- a/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_0_de.png
+++ b/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f227026b935e504faee7bc02ec3c6d15fb6527fba2fb45f487f828bf70493d8
-size 43527
+oid sha256:a6b99e3e1da0674aa6aaac2133cd473ed3b8db9b6ba69bff1e64956d83d68515
+size 43418
diff --git a/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_4_de.png b/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_4_de.png
index 9594f63be7..0b0daa881e 100644
--- a/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_4_de.png
+++ b/screenshots/de/features.space.impl.addroom_AddRoomToSpaceView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:650f369a7dd427fbd039dfbb0c396514947fd393b81dc39e1f336a7d4c2a0579
-size 47729
+oid sha256:ea62f1044cc3b7ceaef32b5ffec837437f1275e65a3823147427286b3728cdeb
+size 47776
diff --git a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_10_de.png b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_10_de.png
index 379896cbeb..94df28a991 100644
--- a/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_10_de.png
+++ b/screenshots/de/features.space.impl.leave_LeaveSpaceView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:860a35adb3a3ed607050890e3a7c246a952162ab06de7a64c7d19dad27cbe94f
-size 31909
+oid sha256:a35bd47b1c72dc9bd8df40ae31737fa86826f29fa895b8516d156261bd678fec
+size 37731
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_0_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_0_de.png
index 1b0d3b202d..6fdf9dde5b 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_0_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae0a43f1e5cd9dac74a4bd9783d7dcec09acd8d972b5ab24f6f7b1afd55d0db1
-size 50203
+oid sha256:8321ad726880f5dc67bc29d68d24b5e8c868f868ef603d39718a0345571db485
+size 50014
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_1_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_1_de.png
index 853875b8ee..5750b88b53 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_1_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59af40c662f9dce190b7dea5b7ec52e69c6d7cc20d70ee9ea605ed730923f216
-size 50362
+oid sha256:75e6e31a59cef9f8629a6e04af3cbe605ae55390bf9c257f03ec22392c92425a
+size 51075
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_2_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_2_de.png
index e1425f18f5..e401943ba4 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_2_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e648d7ad31cd4369f8230685a9e4a87b87116a9187502d2c224412d722d8bc75
-size 52276
+oid sha256:f182c31190dbad4f38d2ceafcf57b55c5c588502962cd8a33ec3e24256fbfadb
+size 52230
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_3_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_3_de.png
index c46b7d0dc5..78c6aaa1e3 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_3_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7683c2be445f411fb2f5c408db5ffa6e40ff562c9cee757ce16b36e0643aed0
-size 61299
+oid sha256:c8755ce084a21ffc75645ae66e3b2ad1f4bd2c162a5fa8998a7afb6da59a1c04
+size 60608
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_4_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_4_de.png
index a02909f45b..a606451f90 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_4_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0cb890656c62a8c0b5004a905d6614e89d6c395632b168f49047443c4853e62
-size 61924
+oid sha256:8398f4e62d4e360f74ad19322930d3b9316c30341e8d33043e15c436962e535f
+size 61207
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_5_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_5_de.png
index 8e0058a639..3185b50681 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_5_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:208b78836148e8403ecfbaca6b3f14bbcec1756cb13ea0fbc00cdbb6c970659b
-size 57796
+oid sha256:6aae5a7b6a524f389f3323fcac496efe946c6282254b941513a0bcec5493cf25
+size 56971
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_6_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_6_de.png
index bb7279e63f..860f86bacc 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_6_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:559df2e03be1e673f1bd3d8232d173fba53cd2f90f5db3dbfaa7198bac9c1f9c
-size 33506
+oid sha256:8145f5bea2f63ac23c0cdf5f1b5275d8c0542670b6926c313cec6419e24995ce
+size 32947
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_7_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_7_de.png
index f41021a302..31535d21a9 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_7_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63d47784152edf52001321e94d57a9724647c33c1b3cb960b3ad7bf399963a39
-size 34019
+oid sha256:df47252dac646104a5e25f1063888786d88548fcca87fb4fb7309642cc088fe7
+size 33581
diff --git a/screenshots/de/features.space.impl.root_SpaceView_Day_8_de.png b/screenshots/de/features.space.impl.root_SpaceView_Day_8_de.png
index 624b13fff5..6e6bf0ff61 100644
--- a/screenshots/de/features.space.impl.root_SpaceView_Day_8_de.png
+++ b/screenshots/de/features.space.impl.root_SpaceView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f71d4b804cada9b0a6ca00a91a423095f8c1f2b15908b6a63e9250a079268407
-size 52373
+oid sha256:f9441c13f504ac70b19e1646c63a1672fa49bf59ec177675f38db08f34049d56
+size 52208
diff --git a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_0_de.png b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_0_de.png
index 1d4e73cad0..e77553c02d 100644
--- a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_0_de.png
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c199ffcaeeeca1bf620d301dfb41e33cc024495d9fac98d03fbb9d21eea3f3dc
-size 23553
+oid sha256:867cddfa670bb04a5db6928710d438befa512a26c4cd2d3d71744fc8a6b629e6
+size 23576
diff --git a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_1_de.png b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_1_de.png
index 2f509e46a7..160e7704ec 100644
--- a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_1_de.png
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9b6545ea37304c28bc34236d0a0cb7b3abb82aafe4a08bc8fe88d16497019d4
-size 20055
+oid sha256:86b689b81d1043afbf10df9a9ed9e181ea97681795ef59397d6106f429f960f7
+size 20071
diff --git a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_2_de.png b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_2_de.png
index e880bf7960..899c718a96 100644
--- a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_2_de.png
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e7855002b56830821f23af09cd2140e85ed287e58e03d3d43a917d8157e9e32
-size 28416
+oid sha256:4b6e5a3b33f21c5028c15064c031c05ae0d43da0779ca5f77a73f858e2a76370
+size 28343
diff --git a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_3_de.png b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_3_de.png
index 1cc6696667..705098ae3d 100644
--- a/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_3_de.png
+++ b/screenshots/de/features.space.impl.settings_SpaceSettingsView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:412b32d3f78e6c8104cbc2c21191c7be9f1403bfcf36aeba19ae2652a5437d6a
-size 28715
+oid sha256:71a2130fdf175df319ac8350ab5abb4ab019a9f6d0036c61c1eedd4cbec41e7f
+size 28836
diff --git a/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png b/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png
index 34d3e5d494..a79a7476b8 100644
--- a/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png
+++ b/screenshots/de/features.startchat.impl.components_SearchMultipleUsersResultItem_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:993191e7db24d10111a3b7c22c0e192e28e9a3e170edb57de14ec205de73cf15
-size 95383
+oid sha256:b2fb0b82618f1737d62753c53cb0d8e53f78378fc615350e9a39305af6a5d666
+size 90023
diff --git a/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png b/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png
index 8d1aac76c6..200f6a08cc 100644
--- a/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png
+++ b/screenshots/de/features.startchat.impl.components_SearchSingleUserResultItem_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93b60fdeb5bd6fbf7f3ab3eca81f2109b02101bec9a8c812ceb02ac8d19840e2
-size 51866
+oid sha256:6593037282e1c8fe5714903bae79c0ec1a5abb3ac029605124bd54e5f84faf04
+size 48947
diff --git a/screenshots/de/features.startchat.impl.components_UserListView_Day_9_de.png b/screenshots/de/features.startchat.impl.components_UserListView_Day_9_de.png
index a16bd08759..dc9a4453af 100644
--- a/screenshots/de/features.startchat.impl.components_UserListView_Day_9_de.png
+++ b/screenshots/de/features.startchat.impl.components_UserListView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d50d07da749a495a9eb57c29ad4d53286d0262b080aff11b9a9d4fac6d56f61
-size 37642
+oid sha256:0a32ec6615d3673e47eafb02da5d5d5ae58572bff5b627852f022f21533eb1c3
+size 37667
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_0_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_0_de.png
index 502b87bbdb..1230b616fd 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_0_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7884a15f505913ba13dcd99320b1b9d26cbf1e8f15eb051e65d8fbedc1a828c
-size 27673
+oid sha256:fa14bce431debf9d9a64c4a47bed9d89730fb21d480af186dc2ac53a9e52f1af
+size 31785
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_1_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_1_de.png
index 33479d694d..14b7d796bc 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_1_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cea006dcb900e70cc9f4be90b9144e340768e7d23d90932c99422eaf8ea96fb
-size 21203
+oid sha256:0f4fe803d3318a31919099958d793ecb4f5eae7109596712de23c89e6c982ea4
+size 20145
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_2_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_2_de.png
index e4c6ad93ff..358883997e 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_2_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41ddc90c4f22013037b7786f2b91e35dd2db7329d43f12cb72f8cd1474e89d3c
-size 31725
+oid sha256:a99cb9da94e1ea3050ccb1e9c32380fde1b5e55ea806c4c2aa5f7bc8c5d0b0fd
+size 30750
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_3_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_3_de.png
index 3e3fcc2526..fc81f7c584 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_3_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a17fadc85a373556a338cd4c9ceaf35432b1853e06641237e6d3f4bf7cd0979
-size 51495
+oid sha256:af238ae63b675069702e65b52c1e4b272294aa0a2c971a3394a67535ee89e45c
+size 51165
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_4_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_4_de.png
index 75e7c2f592..3bbed27e43 100644
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_4_de.png
+++ b/screenshots/de/features.startchat.impl.root_StartChatView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44855b0887ce9ccd5a0302c8d11ba6bf556badaefd33f897c5635d49cb44a99e
-size 45071
+oid sha256:26cbf2c908b89e8cd2daa1a35cfd58dcea951e03a2ecc2334af7d8241d038254
+size 41339
diff --git a/screenshots/de/features.startchat.impl.root_StartChatView_Day_5_de.png b/screenshots/de/features.startchat.impl.root_StartChatView_Day_5_de.png
deleted file mode 100644
index 1230b616fd..0000000000
--- a/screenshots/de/features.startchat.impl.root_StartChatView_Day_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa14bce431debf9d9a64c4a47bed9d89730fb21d480af186dc2ac53a9e52f1af
-size 31785
diff --git a/screenshots/de/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_de.png b/screenshots/de/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_de.png
index f7f4fe51a0..290790c30a 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9d20be83c90e8e0a54f59bd7b16cc914b080cb15cfc31b682d43724c3e3ad33
-size 25315
+oid sha256:933ab3d2d152a647cbea97b7068bb8186546849aab52857c62e08d763b7628e7
+size 27998
diff --git a/screenshots/de/features.userprofile.shared_UserProfileHeaderSection_Day_0_de.png b/screenshots/de/features.userprofile.shared_UserProfileHeaderSection_Day_0_de.png
index aba971c8a4..e2b8c8b44d 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileHeaderSection_Day_0_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileHeaderSection_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f20ceee8793c045bcad1c1f3ce30d6aa36ba5e688c8f8b14161849bc0bedff01
-size 15889
+oid sha256:b93e9986c445dd4e829a2a2be58c3954e0109b0839b63c96a12b44a093330c46
+size 18693
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_0_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_0_de.png
index 9090925f4b..de068ab838 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_0_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abe095cffd60110dd69f4e51ac32b946975edfd97707ab315c9e500985b6e77b
-size 25031
+oid sha256:502e23453f027c8a8e18f9fc50fb5b596cb76c7774b18dc2544fc595bd4dee44
+size 25319
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_1_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_1_de.png
index f3f7d04cd6..9ee694d882 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_1_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3083279a82da9a4aeeeeccb7357cd05dfc9cb9cb72ebb1b8ca6c0bb9fa4b4a8a
-size 23110
+oid sha256:dc85789059bf1bbd1a5c6b2079bf306fc3929ca1f229e1caca9ab27798b0ed20
+size 23039
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_2_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_2_de.png
index 2a37678990..72efdb5c37 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_2_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeea0d322e256f499ddda7dc6cd40c2163f75ac7b9755d75289dde47f28b7c3a
-size 25016
+oid sha256:54696ddbbe7ab2f428e0d4ea0748f0ede19eb399629edfc98b0918630dadbadb
+size 25383
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_3_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_3_de.png
index dadd6c7bc4..c1f6f71e64 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_3_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f97f9ef5fe8deb7506d1f284b7fc9901dead7ed9a1d022752951330f7154ebe
-size 43225
+oid sha256:0a37972f22a3a7b3bfd5ea412ee564c5cd8f748dea0e1430bddc09d74132fd08
+size 43226
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_4_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_4_de.png
index 5a4d3aa025..da387221dc 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_4_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a805d5b4c448dd24f58e3ef03c69e3d5cd37fd9f4950765c0c16d22ad868884
-size 37105
+oid sha256:6dee381ca12861805ab1839d6832299283415b113af9269e4f26d7eb9343cb2b
+size 38945
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_5_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_5_de.png
index c7bfa31dae..4486c3ea11 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_5_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a73316a4090908c2c8db15fa408e132f3fc7308c898311008f59ff62fdb94801
-size 23050
+oid sha256:f18660504a7a2fe385f2fd261b3c61ded83a8e6afac834821aeb47c54524e7f8
+size 23356
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_6_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_6_de.png
index 707d4b7704..61f5ac6ca4 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_6_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77109f43aa631a92f46c3daacf9e9eb724442bcb07608a1664cc46101785f453
-size 25112
+oid sha256:b581cdf88386d4c375cb7883a09bdb8072133ed7047a73377f98f05d040443d3
+size 24954
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_7_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_7_de.png
index 43c62ed709..b0478fe610 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_7_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab60966d00eabc8d73dc60185b6d36b5905cdb42204f5259c94a25e704877c5a
-size 27868
+oid sha256:6d0c4cc915f588e0b08dd3d51aae1d30ec97567bf44309a227cc9ff4b247e0a8
+size 28150
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_8_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_8_de.png
index ebf998ba32..56b138ad9c 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_8_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa5d7bb68d549eab01750a043f0c844cf9ff2609e813fa6be5170f7e47da04f4
-size 36872
+oid sha256:6e76fe613e8d078dd5d2dd3287f85c20bc4aea485fa5bd32f158082281e83535
+size 35838
diff --git a/screenshots/de/features.userprofile.shared_UserProfileView_Day_9_de.png b/screenshots/de/features.userprofile.shared_UserProfileView_Day_9_de.png
index dfa9eaa2f2..9182b7c53a 100644
--- a/screenshots/de/features.userprofile.shared_UserProfileView_Day_9_de.png
+++ b/screenshots/de/features.userprofile.shared_UserProfileView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:540458fc3c97157112560ac44278c57989fd7db20f2cd1779f2a99b1f666f7d2
-size 33938
+oid sha256:d5effc46b5c1f11c7bd490362b34e29275a9611f87cced34dd12d34c062a224b
+size 34517
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_de.png
index fc2d5b8229..4cfccb8015 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6d6cb69eb5d310ca7dae9127015fb3443325b16322c94958c4bf947fcc70514
-size 29438
+oid sha256:00d1fe85f79d7d25867287c50e50f2d0b37b52fe93c4cee70b17da485c912639
+size 30380
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_de.png
index ce7583ad06..ce9e73fd68 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84fb184c49d26ad7636588885daf3c9169209975a5b0e2f1c9ffcea6a3875683
-size 43302
+oid sha256:70c06787bdb7614fb66fb9c16a9703fc572500cbd4b7ba48d806b6c6bb68b649
+size 44169
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_de.png
index 95995db201..5c5957c19b 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2087ce92d6d532a71a1dcc3f0824a34107316030e25ce58d46696675ddd6f264
-size 42907
+oid sha256:9bcad1fdaeb5596e17cddad4498d58208eccb7dcf38efdc7434bf82badffb5ea
+size 43767
diff --git a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_de.png b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_de.png
index 673bb92edb..d617ad8f81 100644
--- a/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_de.png
+++ b/screenshots/de/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3966e491e38c1c3a81faee839282b66260a1444c8878f03e6ce121941ffacb72
-size 36710
+oid sha256:37b686d30cc5cd2bf73ee82736cdcb0dfa5cac04401a7ad9d271b191296d8094
+size 36911
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_de.png
index 8097e382a9..e162b54b55 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:404f9bfbe1e9587bc02b51eefa787b0356ca187412ce0c389f22673ee6539216
-size 27359
+oid sha256:d4063825212138532e706d4dd74426d5932c3fcd9c4ea1be0227282850d615be
+size 26930
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_de.png
index 275f38c3f5..92cb2eb9ad 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2e955575444e16c332ab1e22cc121566a4f8744b8e0a01c69c5f3a9ce8ba033
-size 29507
+oid sha256:11264ae11e2fb4d6a82982c9d9e64723700bd5a885d9e4351a8da4bf768a2135
+size 30041
diff --git a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_de.png b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_de.png
index 673bb92edb..d617ad8f81 100644
--- a/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_de.png
+++ b/screenshots/de/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3966e491e38c1c3a81faee839282b66260a1444c8878f03e6ce121941ffacb72
-size 36710
+oid sha256:37b686d30cc5cd2bf73ee82736cdcb0dfa5cac04401a7ad9d271b191296d8094
+size 36911
diff --git a/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_1_de.png b/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_1_de.png
index 42d3d9d22f..1d177e34e0 100644
--- a/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_1_de.png
+++ b/screenshots/de/libraries.accountselect.impl_AccountSelectView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83e0a2711e2a46a879d76a7ae6f13b7d294d0080de40f192d3fbb731f6314549
-size 43057
+oid sha256:f9ad7dc0a69f56e7b71e8b2e17b28f404605325c70405ed3e8846f0baba71037
+size 42320
diff --git a/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_de.png b/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_de.png
index 030533ecdc..1b51febed4 100644
--- a/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7a87b58fe4bc087197b3639fb2e31fd884c45b0fae9dc3e57657fe7d3299360
-size 31013
+oid sha256:913cc4e9cfc3b519dc0b8827a889da93b31b8520edc86f186cd760263cc27538
+size 30995
diff --git a/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_de.png b/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_de.png
index ba00c135ae..a50eac7fc1 100644
--- a/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77ec7e6ad8dc1a9030d09b259221360ee3cd838e512b93f2ff165ec1eab7ed49
+oid sha256:02d340df0a979691166b315aeb152c0249a90058865824aceeb2165ffd73de2c
 size 31446
diff --git a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_de.png b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_de.png
index e8a6cb04c3..b49effb11c 100644
--- a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d45be0f3300cc450129a656e28dd131c66e84fa36bf692a69441867d42ad562
-size 34110
+oid sha256:08deed13b615f02c6aad8882d31bf7ab96e19ea307f1c8be46f1e974577111be
+size 51485
diff --git a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_de.png b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_de.png
index 18a8311f9c..fab11f5752 100644
--- a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f3d837f5d0d5899f0a20b71dd8f39c1bc304bbebfb1b34e48f7b2feab805133
-size 25895
+oid sha256:f943d5d123ad9fdf2fec6efd264c0244d3812322d95b260aa991f9623b0a8272
+size 26303
diff --git a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_de.png b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_de.png
index ca4eb19234..8ee210f067 100644
--- a/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_de.png
+++ b/screenshots/de/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:070a29bc9f0e4a9148348eba4ed164be33f0a238b892caee66343ad43c16a6cb
-size 25601
+oid sha256:367a4f93f0da8e225e687dd38e0e105d01daf8ca7ba70ec43244f635d20b67ba
+size 25875
diff --git a/screenshots/de/libraries.emoji.impl.picker_EmojiPickerView_Day_0_de.png b/screenshots/de/libraries.emoji.impl.picker_EmojiPickerView_Day_0_de.png
new file mode 100644
index 0000000000..11c34216cf
--- /dev/null
+++ b/screenshots/de/libraries.emoji.impl.picker_EmojiPickerView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4016cf931ff30a3678c696c6962d0695f123aa1c7065697aab93e801a7505f8
+size 21517
diff --git a/screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png b/screenshots/de/libraries.emoji.impl.picker_EmojiPickerView_Day_1_de.png
similarity index 100%
rename from screenshots/de/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_de.png
rename to screenshots/de/libraries.emoji.impl.picker_EmojiPickerView_Day_1_de.png
diff --git a/screenshots/de/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_de.png
index 4263d29577..6515e1941b 100644
--- a/screenshots/de/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff83b8d841c355dcac18d1ba0c7a66d0927e23be66bfabe8bc791e6f2ff3db22
-size 14008
+oid sha256:3a1b49fdd3b81f6d54a46418077c056cd800fc302b728a2990ef5d4d3d5346a8
+size 14087
diff --git a/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png b/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png
index 88e163b840..b016c4441b 100644
--- a/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_CheckableUnresolvedUserRow_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4d6fb36f1340276b3f525505e8a51245f63a1fbe8637ad33c9c3c2ef793679d
-size 114204
+oid sha256:aa04bafc9c372c51d65404c7ac1f46f291c2b16dc41ac57ae38984ad3d5e122d
+size 108049
diff --git a/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_de.png
index 74fca61a42..46c9400c15 100644
--- a/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9da4a0d12b26e2bf2bc3c6a0b032d462ccce782ee6ed5a62c7c32a7c2d4e0a2
-size 28400
+oid sha256:21afb343518b65bbc7680a20773f22cfd64c3ba49dd8ffd79ff014cb5736bea2
+size 27903
diff --git a/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_de.png b/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_de.png
index a1c8e06dda..6d22e26217 100644
--- a/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc315b17a2234172e3701606c1409b6ab1d551cc58e42ac7db80b2e76a852c69
-size 26784
+oid sha256:f313eb3ee7bee0318926978f3afc04770ace66afceb46642815639a81b56ab91
+size 38713
diff --git a/screenshots/de/libraries.matrix.ui.components_OrganizationHeader_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_OrganizationHeader_Day_0_de.png
index ac7f62e753..8c65dbd7b3 100644
--- a/screenshots/de/libraries.matrix.ui.components_OrganizationHeader_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_OrganizationHeader_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df1613037f5b06b6cf9886056977d2ca269bbb09729d9aecdba9915c77cbed78
-size 41954
+oid sha256:0a8a0630b584a45d35879c3d729921abe6d810245cbf19ed74fec7d24c702d40
+size 41390
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_de.png
index a46fd0d98c..07b95441bd 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d26f94621d75228ea9bdee2abc8616b378a64cf8b63b7fb043f32fdef61082e3
-size 18046
+oid sha256:fcf290de055889a30b6859a0815655b07ee96e600e241ad18af768ba7d0691a2
+size 17777
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceHeaderView_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceHeaderView_Day_0_de.png
new file mode 100644
index 0000000000..7e57514e60
--- /dev/null
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceHeaderView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ef090ea6ebf5245e8542ab2f5419b0b16656bb19080246558022ad10c201871
+size 63969
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceInfoRow_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceInfoRow_Day_0_de.png
index 90d4f208c7..8063fd08e9 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceInfoRow_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceInfoRow_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1472df8a860358e2193de329ca363a85cede2c65dc51b7182545152f9caa036c
-size 20165
+oid sha256:6c54bdbee226f0b32754e7bc8822dd6a722d096b8b0bea671b7b3f7e63e13cb2
+size 18810
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_de.png
index d8a2dd91e3..f18a0304a6 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c68172fc235ff99b618910a4312d650da867b4fe6cd91d5a650e4b9ed2360948
-size 14914
+oid sha256:6918b0eb0b7aebabf8017ea3f4d6facd7ee40ed10e4ef5def22209df9d722296
+size 14681
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_de.png
index befe1594c0..a3e8f0b16d 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b736f4d8865b2607f549ede17418fe9ea86e523608ce7c98b97dd846d7cb9c3
-size 14543
+oid sha256:2c1c0f9b6a4bec22adf1e39e2293f7dd5b119b6e48f6a3b9c8901d7f8207bef8
+size 14304
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_de.png
index f7488f52f5..f89e8cf1c5 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7d0c9d5ec4e405c9abe3f708359a1d0305d06643e7862b69a44111b91adee29
-size 10236
+oid sha256:f02b4fe30d6ab57d618c925d3a110b5ca8f299717032b1380d91437acda62b7b
+size 11633
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_de.png
index 11578a4a99..db8c3a14ee 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f448d9d670a8120f3ffbc11a8fbedbcfcaf2ac7ae9487d27222ed949654e2029
-size 20577
+oid sha256:c7d114b3db4b9c915b07000f679b99b96a3dc823e8a000da40445ffb91b9a001
+size 20341
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_de.png
index f48b52f0f0..dcd39d5329 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1daf71801da8ef47d3ee5184391e896f574486b4512d3700552fa4dbb4fb475
-size 20267
+oid sha256:a77b495523c1a7cf42f0a12ace13a897e080368317d76e40a2997d5b8d3b7fa6
+size 20033
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_de.png
index 130ecb8da2..060ad3df9d 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:069b8f17330883e7161292ea46765d2c81c56fe8e3cef4a8a1a89968640f7c8e
-size 14176
+oid sha256:ab8ef2ba28427bcd185c6055edf92b4fa187df547c52cf392d8b37c2375e47b7
+size 13943
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_de.png
index 7cba4e51b9..7a2ce37094 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec2674db1e325e8009a9dbce9e012462a0508cadce19ca56e4b73cb295b0bc33
-size 33581
+oid sha256:deff81d4c14688464b56db5c40de2c533f7cae759a6771cc09560ef7f521d4e7
+size 33333
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_de.png
index 9951601678..8a727c7381 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6dccd98617c8fb11df558e4d2c152e9e012f471a102edf1774f2c5f5a0e32c5
-size 38513
+oid sha256:90703a90d1914820f1ebe396b80c57a87c85298fb66c092536b16e9b209ae291
+size 38296
diff --git a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_de.png b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_de.png
index 4dff07dca5..6aee76799c 100644
--- a/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90cd3c57526f2da48edcbbdcf354453e19bad5310052b46150f3ac55953a1f67
-size 10743
+oid sha256:1dde928940515398c089e258787afca156fd1dceb9b80559c339e94e97864f12
+size 12052
diff --git a/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png b/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png
index 250826b00d..25ad5c2356 100644
--- a/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png
+++ b/screenshots/de/libraries.matrix.ui.components_UnresolvedUserRow_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7179346d56f1c4772169e344f1e5f01b42a5cbb86093dc6e14728f970f5fc6b
-size 72739
+oid sha256:76955fb8324747c81687727bbced594f00d2c2610d91474123ecd6ced14394a4
+size 70297
diff --git a/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_de.png b/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_de.png
index 6a40ec4ecd..a0198d4d9e 100644
--- a/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_de.png
+++ b/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d350923703149b79d86d1029b1f415eb0e90b69165956ae44a23acfba203aa0
-size 8839
+oid sha256:de86d0d2cfcb6c2fcdc1fa3ea89a31ccbdbeaad7068fb29992c2989e2f3cec20
+size 8789
diff --git a/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_de.png b/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_de.png
index 97b55075c1..6e431b335b 100644
--- a/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_de.png
+++ b/screenshots/de/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83fe63b22d68a39a7d404ee2f6074c7adcab79f16e11655d08a37ac3065be59a
-size 9327
+oid sha256:4d2cd5afa60a792cc025b6eb580556162b06f03e0bd15b1dad8fa5294ce49e17
+size 9315
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_de.png
index b14856438a..55774e1975 100644
--- a/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c50e2f2892deb269aab50da2ac188df46cf00a4d1c242ea748cff4fed06058a
-size 35461
+oid sha256:c5af78c7459ce08692bcb56684731f1c6cfd4e57c9d51616c0790e05da7f93ef
+size 35402
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_de.png
new file mode 100644
index 0000000000..1e041d2614
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fae6f5291c4986f2b2e1ea03b0ddf8c46aa242d3a0a3450102832ab88aaea6da
+size 47581
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_de.png
index b62f148452..65b515536b 100644
--- a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3ab3bf722f90727b238a6d6a51c75ce40b1074343e30dd714c3dc86977e9c6c
-size 45120
+oid sha256:aa0b269eebc66e7eabe746ed5ef0084d3bffad2917b68b923c115bbe8fa27ac2
+size 46267
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_de.png
new file mode 100644
index 0000000000..334f0f6adf
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d554025c1de34290ba025e749aa9a545b856dc82861741c5ca0376c3a30fa09a
+size 44157
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_de.png
new file mode 100644
index 0000000000..d002c262a0
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:387e0c1758216fe412a0cd17e452841c972e9ddc02abd460104b034c54b15780
+size 51554
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_de.png
new file mode 100644
index 0000000000..4bcc26f8f4
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:650813d92f195938bb1765e17e293a3cd0987f7724e073e7bc193ca68b964b62
+size 33222
diff --git a/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_de.png b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_de.png
new file mode 100644
index 0000000000..d4340ee6a1
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0174293973cb765e2ba4d2c638ada5d59c94e406b4c2994dcc693a5787b1a821
+size 45643
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_de.png
index 77330acb1d..579473fada 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9948daea87ec366d0d0224ea6071a00d77e2d440c923f700b8128d62b52550e
-size 528896
+oid sha256:0741d04a3d5adf30805104e3b12db362d1ad09ff885bd5240c1f8eac5fb496d7
+size 449334
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_de.png
index 66cbed83df..90caeae1ab 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32cb860aab7664826061dedd491f544975da24fee715b94380e6704b36ffdedb
-size 33857
+oid sha256:16f6352ea69f3a8ba5b907e585d0558d7822e9cce9216ae043ba10cbf7244768
+size 50489
diff --git a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_de.png b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_de.png
index 9ac592fc55..65b515536b 100644
--- a/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fced21fbe2a7c8d0fcdaea9c06c063dd747080fcf7cc35f42257cba68bd0cedc
-size 45022
+oid sha256:aa0b269eebc66e7eabe746ed5ef0084d3bffad2917b68b923c115bbe8fa27ac2
+size 46267
diff --git a/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_de.png b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_de.png
new file mode 100644
index 0000000000..b45beedb7e
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0a4907f2ebf197b1cec1715ac6682d21b7b1d0a80eb5d05108f1971b648126f
+size 12445
diff --git a/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_de.png b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_de.png
new file mode 100644
index 0000000000..9541983cee
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e0d9c3194ce7ac6096be5007d9e4d3b8e3fc6784c0389b1d14a288b48677304
+size 13776
diff --git a/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_de.png b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_de.png
new file mode 100644
index 0000000000..d1207e09a2
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f42dca3f4cdeb760ea11c3edcb8751518e7e42a423ffbafaf12cc97d9cd4861
+size 14965
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_de.png
new file mode 100644
index 0000000000..b81a3c6a5c
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73a6a48d04d86e9d5e9e546681863c32f651e6dc9af6d7f042e7e36b7fd98997
+size 28178
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_de.png
new file mode 100644
index 0000000000..189dc5c26e
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:762de4ead1258ac712f31b91586597f78487653c5ab3fbf14c7f92835e38a544
+size 30733
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_de.png
new file mode 100644
index 0000000000..8ffa83e0e9
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6e4532edfb990b61d5fc6c30e5e054ef9de9c417ab39ed9b8a87d7936e0536e
+size 8242
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_de.png
new file mode 100644
index 0000000000..bf7e3395f8
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cb73f72e0e28fd731dceeabf2a1f2b03e194f59445e7b7b0757ef1674d3849f
+size 199972
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_de.png
new file mode 100644
index 0000000000..f32eb72acc
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71c33fbcc25360bbd32e1d895405ae1d338bbae4c815d4d216dea9038077a05d
+size 198457
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_de.png
new file mode 100644
index 0000000000..090a403022
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ef79c13235d94887d873c42faa9b09c901efaeae7602336c81fcf7c62955ea5
+size 198916
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_11_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_11_de.png
index 0f7abca2b0..e9ea5765e7 100644
--- a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_11_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:013e99fac97e20013d15d780a9f9b39663fe9979378c923c2ccb29443f087212
-size 43323
+oid sha256:86eb21eb729bda52ab36c8320e78a1ec8e9732edaf285c1c978614bb74a4537d
+size 45015
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_12_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_12_de.png
index 8c73c6097e..6c364f2a44 100644
--- a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_12_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_12_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:732355669f5a2e1382aca0c4c39eff4416259551f7f5e6da9a43c07f6420e9ab
-size 35037
+oid sha256:91045491d147d4543f3918f7862426fe5eac5f5012d581d9dc03648f48298120
+size 35572
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_2_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_2_de.png
index b83d3f8641..24779ec32a 100644
--- a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_2_de.png
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acdf6d5164b6af3932a9ea1ff8c7a1fb8a97e3829ef1cf8e27cd691fb4b0b7ea
-size 46192
+oid sha256:f18aabd71856df14464096c7679850ef59a501ccb72c451606e8929abe8e8493
+size 46656
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_6_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_6_de.png
new file mode 100644
index 0000000000..80d843ceda
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebf8c21f8967a2bce2ef74ac896497e6732f8bbab5c895bc3d33e760791ea570
+size 126353
diff --git a/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_7_de.png b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_7_de.png
new file mode 100644
index 0000000000..fdc521ed19
--- /dev/null
+++ b/screenshots/de/libraries.mediaviewer.impl.viewer_MediaViewerView_7_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:783d90aa7ae58d39a2495c7728827f8ac3b91609b36a867a1dc6c49611ba886e
+size 126735
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_2_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_2_de.png
index 8472e864c5..56e31eaa37 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_2_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70b539e1b76e95f5995cb46527a54610c9b801e7b5c2685bd8de18cffa636e53
-size 32365
+oid sha256:f7fc9c7fb214f190f701921db8d9aecab6d2e5b33f16b4f181074cf08b02f871
+size 30282
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_3_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_3_de.png
index c4244e92a8..724051d10b 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_3_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b90045bcd7d3521e20a1afb830cab6b8f76b2619a18f72cfcb2cf27ee2c87e99
-size 30436
+oid sha256:1e59b9b27891785f5ae3cca5ffba87f48d7220ca8a6158b704dbe934c4fe570c
+size 28373
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_4_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_4_de.png
index 318c929115..3331a2941b 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_4_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a42d28677c2048f08418fc4ad462e8610838824964aa15e96c4c92b34d48d77c
-size 34757
+oid sha256:caae8a49c1ab004622594d40af22069fc76df184406e02afb91c5896692f79c5
+size 32519
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_5_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_5_de.png
index 84d2ab414d..9781177371 100644
--- a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_5_de.png
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd908dc6c37c3de2cd500251bf72fc45f626e91fa272d5626bce9c5009789a41
-size 30074
+oid sha256:2926289b827b4de6d15430973a2b2da6e22188316a51e0f7f5749f6d267fcec0
+size 27989
diff --git a/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_6_de.png b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_6_de.png
new file mode 100644
index 0000000000..8e1faa170c
--- /dev/null
+++ b/screenshots/de/libraries.roomselect.impl_RoomSelectView_Day_6_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1173c3f4034d600041a4a222d52493870805a850748e8e30a9fc2fcdcdd44d23
+size 32165
diff --git a/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png b/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png
index 3d58de2aa2..70d18cca11 100644
--- a/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57dbf5af4c4e2eb8a753887c40d3bc8c4f315062a7b2a74c9bceba8d754c970d
-size 21086
+oid sha256:fce3a984f4e7f561b404928c649b56d836ab4e99d2eb937e45af0635cc2a82c2
+size 20999
diff --git a/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png b/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png
index cc6bf7ea12..fec1852b42 100644
--- a/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7515c7be72796a399518d0229c4c656e8bbaa759f5710782926b393e65a0dfec
-size 52291
+oid sha256:ffd8d4f4c76df4929ea331802d71c6cc00b844889ae8bd82eb757e5c6add157c
+size 51911
diff --git a/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png
index 5ffe8738ed..36dded1577 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerAddCaption_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17b1cc7c68f7f692d819b05cf2ed01454b2dfdf33d847dcabdfe3823aa2858d5
-size 58106
+oid sha256:5848b7a8e25540ae61754ab06825ee3a4e03b5714491ca9b52f90b65a9c8223c
+size 57420
diff --git a/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png
index 8efd9aae7f..2788ab858a 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerCaption_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cafd41a70160f81c647bb908e030609bd50003a54a89e1c7a58e5a7c6b20feda
-size 43321
+oid sha256:988e6682f03cdcdf6834add69188e7c7f4b2833680e7808c4a9e3158c80fe0d4
+size 42772
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png
index 15e163db41..6ccee24175 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerEditCaption_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4c0e08d0814afded19cccab71e3e25f93bafbb23e285a2d9885b55db95513b3
-size 56085
+oid sha256:998bfd0f79d61ffaebb77619acc52a6eb20d1afe8e383ade200fb7cb366f3e05
+size 55388
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png
index 566e8a69fe..64325c919d 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a28623ac9a17d8d707a92b229e106836cbc04de108598f573e8ec8e89e3d997
-size 65096
+oid sha256:e3d694f2381da38dbf032db3fabf889b78a464002b132798554d39d56c908d10
+size 64795
diff --git a/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png
index cc6bf7ea12..04a63bfc30 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerEdit_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7515c7be72796a399518d0229c4c656e8bbaa759f5710782926b393e65a0dfec
-size 52291
+oid sha256:b90c8c258147fa5ba7bb8d6851161248193c6ea6f05209c52ea2fc8bc31f43e1
+size 52050
diff --git a/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png
index 42a444fa21..857bf537bc 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0616572000748e8483c377e64439159e00d5a836459d4208122b08b261346d29
-size 63305
+oid sha256:85d0dcc807d02f2f1d6711e0b48694e1c9292b9c5bfd14f361bbdbc0cc982611
+size 63258
diff --git a/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png
index ee39ef7d5c..0938ae98ae 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerFormatting_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52b4ac22573e9ce47198277607cab5a5b9deec09e2adc88b92fac9a46ce22b7f
-size 50963
+oid sha256:1a6f9dc7ca20c6ad863a8cdfb81e16de5d7943e1ccf49fd09173de61eb126a6a
+size 50955
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png
index d3d070cca3..23921e4eba 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dd776bc6cc47e98bb697fd45118580d809504af449e66f8e6233e239746635e
-size 73608
+oid sha256:8fd803c53ba9e0c50ea107b3faa0e960a4499aeac9bddd6588312f35f9ed13e7
+size 73181
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png
index e0068535e0..0d9af37769 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b318e520274fa61235bb3078a8e43f50f00cb3e995691f7c250aafcff34adf6
-size 60221
+oid sha256:938eb455f5d185fd3f89a45096356103fe6062ae18e17bd73f02b84ee06d1e7d
+size 59607
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png
index c78fd312b6..e922643412 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4265b64af0d85d26fee18c5840c78dc248dca6c0188f7d05599a17533bbf7c56
-size 73032
+oid sha256:2b0840a07a87b78e8d00497f932c41d7eceea0fd931d970d074469b3c741bc55
+size 72707
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png
index f3f25e7b89..587e316692 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0046b0b393a115565f40ef8e3d56e44b2f0e60bac1c58f460c5b0ccc51c0758
-size 81592
+oid sha256:c642b990169a6a1c543e308f1cac8ad73a3e9eecc7f075ae24ea1d03d89e3219
+size 83423
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png
index 92ee2953f2..4e8012dd20 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a67d6255f9b0f17dfc39655a9006d616e5a000edde5c43675f9c05edbd61eb8e
-size 62741
+oid sha256:57b818508094e0de0f1a94d98ab8ba0443c6f7d854d12ed855aa98073b239a17
+size 62304
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png
index 3d9ecdc028..b062fff206 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bafc0bc7aa73c3d984e01b4d94a1f2a50a2457add0b202b89bec0acd5f8a66f
-size 61646
+oid sha256:ed2d4bc63f4731050a69ece5d58af7f6d37e806c6c47a3187a5660963372b6e9
+size 61204
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png
index 34d58521be..c4676d7f32 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1afc95b901ad97456215f1a2f8fde7fe35f5837032b906eea6053f14814d4218
-size 67238
+oid sha256:598cdca898f332471f0e0063dfc4b01e3ac423054be47dbc631a54f52f147bb9
+size 66874
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png
index 7696ab1dd2..f7c935f14d 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:455dc658af36e11e5175585c6965731b4493428596fb5ef0b77b6b89abd007e4
-size 90662
+oid sha256:8f5827c02a5da3f6a94ed607f0af72abeff684647a550bf097168d15ef4e60cd
+size 89976
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png
index 409f5c23b0..6238b05f23 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4514e0bd54db4822486ed0d762768f186cfb24611fd6a8161567b17bd20462a
-size 61057
+oid sha256:99a4b449378b6b61df662f43e1e32417e8d1ecf7f76eab7fcb0f7609ef06aa4e
+size 60521
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png
index c20f81e2a3..31affa15cd 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6408e9a851a3976291270c08a6cc3ec30a8b1148f2034b6fa7c5bc8a66111b40
-size 62277
+oid sha256:81bcc9d662794e79998ee4a1e680abd65ee4333c1fbf597e6200d2cab9de484b
+size 60598
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png
index a874dc1806..84404e8803 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8911a8ec35fb8ff3ecb5fc3eec7503ed53d5643c19c2726044ae02569aa374fa
-size 69866
+oid sha256:9738bf5f3078b76d3780e762556995256f6ad5a27643b487568fef7d8ea44778
+size 69214
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png
index e2a8343fef..d6ec8b12c5 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fa428a419c4693a3bf3039aaaf81968ffbb1d330208170efd60f9e02768f20e
-size 60619
+oid sha256:acf8890ae98690403941192c7b4e2a541c299bce6a78129f84ee1fae0ae0226c
+size 60068
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png
index ec8d9ddde3..23459160a0 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b18c02b0e05fe86aca68378a112e698958780e30891c5c0a3e7f316ffd00f657
-size 72919
+oid sha256:00cf527f8c7b4666daae1874431bc4e4ed23acd2dc194c1eff4cb0d8776e5c01
+size 72220
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png
index 495d5b4fff..67fe7d0095 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_10_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef6a20ea4f3d4b64b294566b242ea8f6021d1a7f54555d6cdbc90f3ed41bf6df
-size 56467
+oid sha256:7e368d4bed293ab020355ad99c7ec8aeaa29cc8d49e789c23c9a2c5020bb8fbd
+size 56060
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png
index 45025e9fb0..d492a13bfa 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_11_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eceb56163d5b3a4398fc7711b76b2b09cf98be3006c0f2469011b233cb2751a8
-size 71145
+oid sha256:f74eedd9e5ff22d3b2689fc3a794c74f0c1b36eb79941098a34f84ccc25e23c3
+size 70527
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png
index 876f0759f5..5719875b39 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f88e186b6a2c7bb78a7d0a3244324fb873616f72ab77b7cbe71354671241025
-size 82466
+oid sha256:86ca47745f52ce69247f231c10321e852be493922f300786167262944c6e4589
+size 84162
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png
index a95036ff4a..1cfa5959ad 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:669073bf986640f0602b24c8f203f6272eeb83d57c9fb6e88757364b0bdd55a6
-size 59507
+oid sha256:cb74b0cc66cf73d64dad42b8bfd36e31c081d5e17425d44a966786b30e736cf7
+size 59206
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png
index 592cf9b318..f25038075a 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:586b85f5d172f37e9fc0f90317b31826844a6ee598cc1835df72d398e1c57caf
-size 58625
+oid sha256:40c72b83b4bdebeef1012e4503471979e4c665eeb34f2300250fbc777a1dfae6
+size 58210
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png
index 256f3f11be..27c85c1f18 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f11d0c70af70619812455a42dcf01c9f891f727868c276975003aeb3bf8f97e
-size 66007
+oid sha256:7ddc4b824eb3e6d1576d82b20f674be3d02937d5652ff2ca2acdddf4be3e842e
+size 65967
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png
index 0fb81544f4..821efef0ef 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:503b031ed7f21cb022b5e1d41ed83baa8998469e5140008f349bd755b2e76416
-size 101507
+oid sha256:6ef123f742c10b05079f64fdd39425420eabe963beb30e42d3ddf5fc494b1210
+size 101189
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png
index 8193b57db1..2df6b6f26c 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26bc4f2e52ed22162d4c8a720f4d0b2793b3d97e45d3463616b3b21b0c4638af
-size 57853
+oid sha256:394bbe03228817a62d63d2bab5eddc3890c77f71cb8d071b640d9de9a260f281
+size 57389
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png
index 92082e6e30..2bee54c74d 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_7_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cca5604149f542ec66a1be21a9ee8220405c49e40e7f974d83d6c60d7133e4bb
-size 59690
+oid sha256:d77ca9b7f40967b9255236c28e810dd7df515afe8d3ea32213c183048707d172
+size 57259
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png
index 030c42869a..e13695ee39 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_8_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fcd11760900caeb73940f5618b5c33b54827e9e4a25e2f95ebc1e0200b7cd49
-size 68033
+oid sha256:092c6b66d3a324f0f55c549b1a06859eeeea220db76f3f800dc2d1c7cde0d537
+size 67693
diff --git a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png
index 29186b70be..cfffdc9727 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerReply_Day_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3be967e3c38366b75f13003171dce8d03886814d9b8663768d28876672f041e5
-size 57219
+oid sha256:04e5fbe07c868e8032b734706244f5b24b91c070c0b04abfcd0e65f0599c22e5
+size 56780
diff --git a/screenshots/de/libraries.textcomposer_TextComposerScaledDensityWithReply_de.png b/screenshots/de/libraries.textcomposer_TextComposerScaledDensityWithReply_de.png
new file mode 100644
index 0000000000..b598ca869d
--- /dev/null
+++ b/screenshots/de/libraries.textcomposer_TextComposerScaledDensityWithReply_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dc96d71b7356682ff66e6b0c2b4780a7c29df451c100391889e019490ccfcda
+size 16822
diff --git a/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png
index 5b616e7a55..5264638d0c 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6964f7b2f51a7d928d49038d1ed48b4576163c329564e4bd928c32cb9ed6648
-size 55506
+oid sha256:dfef826337bf428fb835513db14caa4d78056ced5fe44e2a4ea5905a9beabe10
+size 54880
diff --git a/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png
index 5fce0aa30e..84ff4beabf 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerSimple_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7636fa5e1fb1ef1e5972f7c973ca0282c87e6624fb150abd7f9198083c39fc29
-size 43642
+oid sha256:713ff7ecd0b47ccd2be58034e404b4e4a2ba02c51a0043d4de25f736ca8eb314
+size 43363
diff --git a/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png b/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png
index 40b883d797..53278df302 100644
--- a/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png
+++ b/screenshots/de/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b00a37e1fa846df8f8cf0d98be84b1a261fcb7b5b5cafdfe5a9726e7fc66b7d
-size 36435
+oid sha256:b5be22c3549f187e9cd86b84d977b70b5fc393c8ecfea7d7b8669956a6b55e82
+size 35732
diff --git a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_de.png b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_de.png
index 4e8aac17c6..73d93c43cd 100644
--- a/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_de.png
+++ b/screenshots/de/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:182141c01e8cd78a23f41d76c2d0c6bfb769722d243506c0463f2a5a968f8911
+oid sha256:b2acebb0b920c95403fd872f8cdfdb45bf0fcd5cba75600971c32569c65bb8d1
 size 44559
diff --git a/screenshots/de/services.apperror.impl_AppErrorView_Day_0_de.png b/screenshots/de/services.apperror.api_AppErrorView_Day_0_de.png
similarity index 100%
rename from screenshots/de/services.apperror.impl_AppErrorView_Day_0_de.png
rename to screenshots/de/services.apperror.api_AppErrorView_Day_0_de.png
diff --git a/screenshots/html/data.js b/screenshots/html/data.js
index 62bb50771b..d9e43a5274 100644
--- a/screenshots/html/data.js
+++ b/screenshots/html/data.js
@@ -1,87 +1,109 @@
 // Generated file, do not edit
 export const screenshots = [
 ["en","en-dark","de",],
-["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20532,],
+["features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en","features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en",20658,],
+["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20658,],
 ["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en",0,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20532,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20532,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20532,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20532,],
-["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20532,],
-["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20532,],
-["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20532,],
-["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20532,],
-["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20532,],
-["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20532,],
-["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20532,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20658,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20658,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20658,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20658,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_5_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_5_en",20658,],
+["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20658,],
+["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20658,],
+["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20658,],
+["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20658,],
+["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20658,],
+["features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en","features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en",20658,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_0_en","features.login.impl.accountprovider_AccountProviderView_Night_0_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_1_en","features.login.impl.accountprovider_AccountProviderView_Night_1_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_2_en","features.login.impl.accountprovider_AccountProviderView_Night_2_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_3_en","features.login.impl.accountprovider_AccountProviderView_Night_3_en",0,],
-["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20532,],
-["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20532,],
+["libraries.accountselect.impl_AccountSelectView_Day_0_en","libraries.accountselect.impl_AccountSelectView_Night_0_en",20658,],
+["libraries.accountselect.impl_AccountSelectView_Day_1_en","libraries.accountselect.impl_AccountSelectView_Night_1_en",20658,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_0_en","features.messages.impl.actionlist_ActionListViewContent_Night_0_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20532,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20658,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_1_en","features.messages.impl.actionlist_ActionListViewContent_Night_1_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20532,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20532,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20532,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20532,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20532,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_0_en","features.space.impl.addroom_AddRoomToSpaceView_Night_0_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_1_en","features.space.impl.addroom_AddRoomToSpaceView_Night_1_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_2_en","features.space.impl.addroom_AddRoomToSpaceView_Night_2_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_3_en","features.space.impl.addroom_AddRoomToSpaceView_Night_3_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_4_en","features.space.impl.addroom_AddRoomToSpaceView_Night_4_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_5_en","features.space.impl.addroom_AddRoomToSpaceView_Night_5_en",20532,],
-["features.space.impl.addroom_AddRoomToSpaceView_Day_6_en","features.space.impl.addroom_AddRoomToSpaceView_Night_6_en",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20532,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20532,],
-["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20532,],
-["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20532,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20658,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20658,],
+["features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_en","features.messages.impl.timeline.components_ActiveCallTimelineItemView_Night_0_en",20661,],
+["features.messages.impl.timeline.components_ActiveCallTimelineItemView_en","",20661,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20658,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20658,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20658,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_0_en","features.space.impl.addroom_AddRoomToSpaceView_Night_0_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_1_en","features.space.impl.addroom_AddRoomToSpaceView_Night_1_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_2_en","features.space.impl.addroom_AddRoomToSpaceView_Night_2_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_3_en","features.space.impl.addroom_AddRoomToSpaceView_Night_3_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_4_en","features.space.impl.addroom_AddRoomToSpaceView_Night_4_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_5_en","features.space.impl.addroom_AddRoomToSpaceView_Night_5_en",20658,],
+["features.space.impl.addroom_AddRoomToSpaceView_Day_6_en","features.space.impl.addroom_AddRoomToSpaceView_Night_6_en",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en","",20658,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en","",20658,],
+["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20658,],
+["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20658,],
 ["libraries.designsystem.theme.components_AllIcons_Icons_en","",0,],
-["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20532,],
-["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20532,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20532,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20532,],
-["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20532,],
+["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20658,],
+["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20658,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20658,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20658,],
+["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20658,],
 ["libraries.designsystem.components_Announcement_Day_0_en","libraries.designsystem.components_Announcement_Night_0_en",0,],
-["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20532,],
+["features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_en","features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Night_0_en",20658,],
+["features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_en","features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_0_en",20658,],
+["features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_en","features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_1_en",20658,],
+["services.apperror.api_AppErrorView_Day_0_en","services.apperror.api_AppErrorView_Night_0_en",20658,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_0_en","libraries.designsystem.components.async_AsyncActionView_Night_0_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20532,],
+["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20658,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_2_en","libraries.designsystem.components.async_AsyncActionView_Night_2_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20532,],
+["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20658,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_4_en","libraries.designsystem.components.async_AsyncActionView_Night_4_en",0,],
-["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20532,],
+["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20658,],
 ["libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncIndicatorLoading_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorLoading_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncLoading_Day_0_en","libraries.designsystem.components.async_AsyncLoading_Night_0_en",0,],
-["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20532,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_en","",20658,],
+["features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_en","",20658,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_1_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_1_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en",0,],
@@ -91,19 +113,22 @@ export const screenshots = [
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_6_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_6_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en",0,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en","",20532,],
-["features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en","",20532,],
+["features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_en","features.messages.impl.messagecomposer_AttachmentsBottomSheet_Night_0_en",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en","",20658,],
+["features.messages.impl.attachments.preview_AttachmentsPreviewView_9_en","",20658,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en",0,],
-["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20532,],
+["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20658,],
 ["libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en","",0,],
 ["libraries.matrix.ui.components_AvatarPickerSizes_Day_0_en","libraries.matrix.ui.components_AvatarPickerSizes_Night_0_en",0,],
 ["libraries.matrix.ui.components_AvatarPickerViewRtl_Day_0_en","libraries.matrix.ui.components_AvatarPickerViewRtl_Night_0_en",0,],
@@ -133,22 +158,22 @@ export const screenshots = [
 ["libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradientDisabled_Night_0_en",0,],
 ["libraries.designsystem.modifiers_BackgroundVerticalGradient_Day_0_en","libraries.designsystem.modifiers_BackgroundVerticalGradient_Night_0_en",0,],
 ["libraries.designsystem.components_Badge_Day_0_en","libraries.designsystem.components_Badge_Night_0_en",0,],
-["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20532,],
+["features.home.impl.components_BatteryOptimizationBanner_Day_0_en","features.home.impl.components_BatteryOptimizationBanner_Night_0_en",20658,],
 ["libraries.designsystem.atomic.atoms_BetaLabel_Day_0_en","libraries.designsystem.atomic.atoms_BetaLabel_Night_0_en",0,],
 ["libraries.designsystem.components_BigIcon_Day_0_en","libraries.designsystem.components_BigIcon_Night_0_en",0,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20532,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20532,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20658,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20658,],
 ["libraries.designsystem.theme.components_BottomSheetDragHandle_Day_0_en","libraries.designsystem.theme.components_BottomSheetDragHandle_Night_0_en",0,],
-["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20532,],
-["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20532,],
-["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20532,],
-["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20532,],
-["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20532,],
+["features.rageshake.impl.bugreport_BugReportViewDay_0_en","",20658,],
+["features.rageshake.impl.bugreport_BugReportViewDay_1_en","",20658,],
+["features.rageshake.impl.bugreport_BugReportViewDay_2_en","",20658,],
+["features.rageshake.impl.bugreport_BugReportViewDay_3_en","",20658,],
+["features.rageshake.impl.bugreport_BugReportViewDay_4_en","",20658,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_0_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_1_en","",0,],
 ["features.rageshake.impl.bugreport_BugReportViewNight_2_en","",0,],
@@ -159,141 +184,142 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_CallMenuItem_Day_0_en","features.messages.impl.timeline.components_CallMenuItem_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_1_en","features.messages.impl.timeline.components_CallMenuItem_Night_1_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",0,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20532,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",20532,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20658,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",20658,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_5_en","features.messages.impl.timeline.components_CallMenuItem_Night_5_en",0,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_6_en","features.messages.impl.timeline.components_CallMenuItem_Night_6_en",20532,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_6_en","features.messages.impl.timeline.components_CallMenuItem_Night_6_en",20658,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_7_en","features.messages.impl.timeline.components_CallMenuItem_Night_7_en",0,],
 ["features.call.impl.ui_CallScreenView_Day_0_en","features.call.impl.ui_CallScreenView_Night_0_en",0,],
-["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20532,],
-["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20532,],
-["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20532,],
-["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20532,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20532,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20532,],
+["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20658,],
+["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20658,],
+["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20658,],
+["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20658,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20658,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_0_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_0_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en",20658,],
 ["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en",0,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20532,],
-["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en",20532,],
-["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en",20532,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en",20658,],
+["features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en","features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en",20658,],
+["features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en","features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en",20658,],
 ["features.login.impl.changeserver_ChangeServerView_Day_0_en","features.login.impl.changeserver_ChangeServerView_Night_0_en",0,],
-["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20532,],
-["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20532,],
-["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20532,],
-["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20532,],
-["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20532,],
+["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20658,],
+["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20658,],
+["features.login.impl.changeserver_ChangeServerView_Day_3_en","features.login.impl.changeserver_ChangeServerView_Night_3_en",20658,],
+["features.login.impl.changeserver_ChangeServerView_Day_4_en","features.login.impl.changeserver_ChangeServerView_Night_4_en",20658,],
+["features.login.impl.changeserver_ChangeServerView_Day_5_en","features.login.impl.changeserver_ChangeServerView_Night_5_en",20658,],
+["features.login.impl.changeserver_ChangeServerView_Day_6_en","features.login.impl.changeserver_ChangeServerView_Night_6_en",20658,],
 ["libraries.matrix.ui.components_CheckableResolvedUserRow_en","",0,],
-["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20532,],
+["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20658,],
 ["libraries.designsystem.theme.components_Checkboxes_Toggles_en","",0,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20532,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20532,],
-["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20532,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20532,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20532,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20532,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20532,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20532,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en",20658,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en",20658,],
+["features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en","features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en",20658,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20658,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20658,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20658,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20658,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_4_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_4_en",20658,],
 ["libraries.designsystem.theme.components_CircularProgressIndicator_Progress_Indicators_en","",0,],
 ["libraries.designsystem.components_ClickableLinkText_Text_en","",0,],
+["features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_en","features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Night_0_en",20658,],
 ["libraries.designsystem.theme_ColorAliases_Day_0_en","libraries.designsystem.theme_ColorAliases_Night_0_en",0,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20532,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20532,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20532,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20532,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20532,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20532,],
-["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20532,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20658,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20658,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_2_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_2_en",20658,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_3_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_3_en",20658,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_4_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_4_en",20658,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_5_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_5_en",20658,],
+["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20658,],
 ["libraries.textcomposer_ComposerModeView_Day_1_en","libraries.textcomposer_ComposerModeView_Night_1_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_2_en","libraries.textcomposer_ComposerModeView_Night_2_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_3_en","libraries.textcomposer_ComposerModeView_Night_3_en",0,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en","",20532,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en","",20532,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20532,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20532,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20532,],
-["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20532,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en","",20658,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en","",20658,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20658,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20658,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20658,],
+["features.home.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.home.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20658,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialog_Day_0_en","libraries.designsystem.components.dialogs_ConfirmationDialog_Night_0_en",0,],
 ["features.networkmonitor.api.ui_ConnectivityIndicator_Day_0_en","features.networkmonitor.api.ui_ConnectivityIndicator_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en","libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en",0,],
-["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20532,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20532,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20532,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20532,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20532,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20532,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20532,],
-["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20532,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20532,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20532,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20532,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20532,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20532,],
+["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20658,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20658,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20658,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20658,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20658,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20658,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20658,],
+["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20658,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20658,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20658,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20658,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20658,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20658,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_1_en",0,],
-["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20532,],
-["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20532,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20532,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20532,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20532,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20532,],
-["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20532,],
+["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20658,],
+["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20658,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20658,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20658,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20658,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20658,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20658,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_0_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_0_en",0,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20532,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20532,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20532,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20658,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20658,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20658,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_4_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_4_en",0,],
-["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20532,],
+["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20658,],
 ["features.licenses.impl.details_DependenciesDetailsView_Day_0_en","features.licenses.impl.details_DependenciesDetailsView_Night_0_en",0,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20532,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20532,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20532,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20532,],
-["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en",20532,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20532,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20532,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20532,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_3_en","features.preferences.impl.developer_DeveloperSettingsView_Night_3_en",20532,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20658,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20658,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20658,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20658,],
+["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en","features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en",20658,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20658,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20658,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20658,],
 ["libraries.designsystem.theme.components_DialogWithDestructiveButton_Dialog_with_destructive_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithOnlyMessageAndOkButton_Dialog_with_only_message_and_ok_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithThirdButton_Dialog_with_third_button_Dialogs_en","",0,],
@@ -302,54 +328,55 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_DialogWithVeryLongTitleAndIcon_Dialog_with_a_very_long_title_and_icon_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithVeryLongTitle_Dialog_with_a_very_long_title_Dialogs_en","",0,],
 ["features.messages.impl.messagecomposer_DisabledComposerView_Day_0_en","features.messages.impl.messagecomposer_DisabledComposerView_Night_0_en",0,],
-["libraries.designsystem.components.avatar_DmAvatarsRtl_Avatars_en","",0,],
-["libraries.designsystem.components.avatar_DmAvatars_Avatars_en","",0,],
 ["libraries.designsystem.text_DpScale_0_75f__en","",0,],
 ["libraries.designsystem.text_DpScale_1_0f__en","",0,],
 ["libraries.designsystem.text_DpScale_1_5f__en","",0,],
 ["libraries.designsystem.theme.components_DropdownMenuItem_Menus_en","",0,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20532,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20532,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20532,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20532,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20532,],
-["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en",20532,],
-["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en",20532,],
-["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en",20532,],
-["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en",20532,],
-["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en",20532,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20532,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20532,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en",20532,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20658,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20658,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20658,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20658,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20658,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_0_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_0_en",20658,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_1_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_1_en",20658,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_2_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_2_en",20658,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_3_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_3_en",20658,],
+["features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Day_4_en","features.securityandprivacy.impl.editroomaddress_EditRoomAddressView_Night_4_en",20658,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20658,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_1_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_1_en",20658,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_2_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_2_en",20658,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_3_en",20658,],
 ["libraries.matrix.ui.components_EditableOrgAvatarRtl_Day_0_en","libraries.matrix.ui.components_EditableOrgAvatarRtl_Night_0_en",0,],
 ["libraries.matrix.ui.components_EditableOrgAvatar_Day_0_en","libraries.matrix.ui.components_EditableOrgAvatar_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomLargeNoBlurShadow_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomLargeNoBlurShadow_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomLarge_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomLarge_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMediumNoBlurShadow_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Night_0_en",0,],
-["features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en","features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en",0,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en",20532,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en",20532,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en",0,],
-["features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en","features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en",0,],
+["libraries.emoji.impl.picker_EmojiItemWithPopup_Day_0_en","libraries.emoji.impl.picker_EmojiItemWithPopup_Night_0_en",0,],
+["libraries.emoji.impl.picker_EmojiItem_Day_0_en","libraries.emoji.impl.picker_EmojiItem_Night_0_en",0,],
+["libraries.emoji.impl.picker_EmojiPickerView_Day_0_en","libraries.emoji.impl.picker_EmojiPickerView_Night_0_en",20661,],
+["libraries.emoji.impl.picker_EmojiPickerView_Day_1_en","libraries.emoji.impl.picker_EmojiPickerView_Night_1_en",20661,],
+["libraries.emoji.impl.picker_EmojiPickerView_Day_2_en","libraries.emoji.impl.picker_EmojiPickerView_Night_2_en",0,],
+["libraries.emoji.impl.picker_EmojiPickerView_Day_3_en","libraries.emoji.impl.picker_EmojiPickerView_Night_3_en",0,],
 ["libraries.ui.common.nodes_EmptyView_Day_0_en","libraries.ui.common.nodes_EmptyView_Night_0_en",0,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en",20532,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en",20532,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en",20532,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en",20532,],
-["features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en",20532,],
-["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20532,],
-["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20532,],
-["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_0_en","features.linknewdevice.impl.screens.error_ErrorView_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_1_en","features.linknewdevice.impl.screens.error_ErrorView_Night_1_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_2_en","features.linknewdevice.impl.screens.error_ErrorView_Night_2_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_3_en","features.linknewdevice.impl.screens.error_ErrorView_Night_3_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_4_en","features.linknewdevice.impl.screens.error_ErrorView_Night_4_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_5_en","features.linknewdevice.impl.screens.error_ErrorView_Night_5_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_6_en","features.linknewdevice.impl.screens.error_ErrorView_Night_6_en",20532,],
-["features.linknewdevice.impl.screens.error_ErrorView_Day_7_en","features.linknewdevice.impl.screens.error_ErrorView_Night_7_en",20532,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en",20658,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en",20658,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en",20658,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en",20658,],
+["features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en","features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en",20658,],
+["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20658,],
+["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20658,],
+["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_0_en","features.linknewdevice.impl.screens.error_ErrorView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_1_en","features.linknewdevice.impl.screens.error_ErrorView_Night_1_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_2_en","features.linknewdevice.impl.screens.error_ErrorView_Night_2_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_3_en","features.linknewdevice.impl.screens.error_ErrorView_Night_3_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_4_en","features.linknewdevice.impl.screens.error_ErrorView_Night_4_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_5_en","features.linknewdevice.impl.screens.error_ErrorView_Night_5_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_6_en","features.linknewdevice.impl.screens.error_ErrorView_Night_6_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_7_en","features.linknewdevice.impl.screens.error_ErrorView_Night_7_en",20658,],
+["features.linknewdevice.impl.screens.error_ErrorView_Day_8_en","features.linknewdevice.impl.screens.error_ErrorView_Night_8_en",20658,],
 ["features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en","features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en",0,],
 ["libraries.designsystem.components_ExpandableBottomSheetLayout_en","",0,],
 ["libraries.featureflag.ui_FeatureListView_Day_0_en","libraries.featureflag.ui_FeatureListView_Night_0_en",0,],
@@ -366,50 +393,52 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_FilledTextFieldValueLight_TextFields_en","",0,],
 ["libraries.designsystem.theme.components_FilledTextFieldValueTextFieldDark_TextFields_en","",0,],
 ["libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en","",0,],
+["features.messages.impl.timeline.components_FloatingDateBadge_Day_0_en","features.messages.impl.timeline.components_FloatingDateBadge_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en","libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en",0,],
 ["features.messages.impl.timeline.focus_FocusRequestStateView_Day_0_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_0_en",0,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20532,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20532,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20532,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20658,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20658,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20658,],
 ["features.messages.impl.timeline.components_FocusedEvent_Day_0_en","features.messages.impl.timeline.components_FocusedEvent_Night_0_en",0,],
 ["libraries.textcomposer.components_FormattingOption_Day_0_en","libraries.textcomposer.components_FormattingOption_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_0_en","features.forward.impl_ForwardMessagesView_Night_0_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_1_en","features.forward.impl_ForwardMessagesView_Night_1_en",0,],
 ["features.forward.impl_ForwardMessagesView_Day_2_en","features.forward.impl_ForwardMessagesView_Night_2_en",0,],
-["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20532,],
-["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20532,],
+["features.forward.impl_ForwardMessagesView_Day_3_en","features.forward.impl_ForwardMessagesView_Night_3_en",20658,],
+["features.home.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.home.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20658,],
+["features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_0_en","features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_0_en",0,],
+["features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_en","features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_1_en",20658,],
 ["libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en",0,],
 ["libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en",0,],
 ["features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en","features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_HeaderFooterPage_Day_0_en","libraries.designsystem.atomic.pages_HeaderFooterPage_Night_0_en",0,],
-["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20532,],
-["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20532,],
-["features.home.impl.spaces_HomeSpacesView_Day_2_en","features.home.impl.spaces_HomeSpacesView_Night_2_en",20532,],
-["features.home.impl.spaces_HomeSpacesView_Day_3_en","features.home.impl.spaces_HomeSpacesView_Night_3_en",20532,],
-["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20532,],
-["features.home.impl.components_HomeTopBarSpaceFiltersSelected_Day_0_en","features.home.impl.components_HomeTopBarSpaceFiltersSelected_Night_0_en",20532,],
+["features.home.impl.spaces_HomeSpacesView_Day_0_en","features.home.impl.spaces_HomeSpacesView_Night_0_en",20658,],
+["features.home.impl.spaces_HomeSpacesView_Day_1_en","features.home.impl.spaces_HomeSpacesView_Night_1_en",20658,],
+["features.home.impl.spaces_HomeSpacesView_Day_2_en","features.home.impl.spaces_HomeSpacesView_Night_2_en",20658,],
+["features.home.impl.components_HomeTopBarMultiAccount_Day_0_en","features.home.impl.components_HomeTopBarMultiAccount_Night_0_en",20658,],
+["features.home.impl.components_HomeTopBarSpaceFiltersSelected_Day_0_en","features.home.impl.components_HomeTopBarSpaceFiltersSelected_Night_0_en",20658,],
 ["features.home.impl.components_HomeTopBarSpaces_Day_0_en","features.home.impl.components_HomeTopBarSpaces_Night_0_en",0,],
-["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20532,],
-["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20532,],
+["features.home.impl.components_HomeTopBarWithIndicator_Day_0_en","features.home.impl.components_HomeTopBarWithIndicator_Night_0_en",20658,],
+["features.home.impl.components_HomeTopBar_Day_0_en","features.home.impl.components_HomeTopBar_Night_0_en",20658,],
 ["features.home.impl_HomeViewA11y_en","",0,],
-["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20532,],
-["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20532,],
+["features.home.impl_HomeView_Day_0_en","features.home.impl_HomeView_Night_0_en",20658,],
+["features.home.impl_HomeView_Day_10_en","features.home.impl_HomeView_Night_10_en",20658,],
 ["features.home.impl_HomeView_Day_11_en","features.home.impl_HomeView_Night_11_en",0,],
 ["features.home.impl_HomeView_Day_12_en","features.home.impl_HomeView_Night_12_en",0,],
-["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20532,],
-["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20532,],
-["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20532,],
-["features.home.impl_HomeView_Day_16_en","features.home.impl_HomeView_Night_16_en",20532,],
-["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20532,],
-["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20532,],
-["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20532,],
-["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20532,],
-["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20532,],
-["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20532,],
-["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20532,],
-["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20532,],
-["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20532,],
+["features.home.impl_HomeView_Day_13_en","features.home.impl_HomeView_Night_13_en",20658,],
+["features.home.impl_HomeView_Day_14_en","features.home.impl_HomeView_Night_14_en",20658,],
+["features.home.impl_HomeView_Day_15_en","features.home.impl_HomeView_Night_15_en",20658,],
+["features.home.impl_HomeView_Day_16_en","features.home.impl_HomeView_Night_16_en",20658,],
+["features.home.impl_HomeView_Day_1_en","features.home.impl_HomeView_Night_1_en",20658,],
+["features.home.impl_HomeView_Day_2_en","features.home.impl_HomeView_Night_2_en",20658,],
+["features.home.impl_HomeView_Day_3_en","features.home.impl_HomeView_Night_3_en",20658,],
+["features.home.impl_HomeView_Day_4_en","features.home.impl_HomeView_Night_4_en",20658,],
+["features.home.impl_HomeView_Day_5_en","features.home.impl_HomeView_Night_5_en",20658,],
+["features.home.impl_HomeView_Day_6_en","features.home.impl_HomeView_Night_6_en",20658,],
+["features.home.impl_HomeView_Day_7_en","features.home.impl_HomeView_Night_7_en",20658,],
+["features.home.impl_HomeView_Day_8_en","features.home.impl_HomeView_Night_8_en",20658,],
+["features.home.impl_HomeView_Day_9_en","features.home.impl_HomeView_Night_9_en",20658,],
 ["libraries.designsystem.theme.components_HorizontalDivider_Dividers_en","",0,],
 ["libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en","libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en",0,],
 ["libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en","libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en",0,],
@@ -424,8 +453,8 @@ export const screenshots = [
 ["appicon.enterprise_Icon_en","",0,],
 ["libraries.designsystem.icons_IconsOther_Day_0_en","libraries.designsystem.icons_IconsOther_Night_0_en",0,],
 ["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_0_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_0_en",0,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20532,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20532,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20658,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20658,],
 ["libraries.mediaviewer.impl.gallery.ui_ImageItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_ImageItemView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en",0,],
@@ -433,117 +462,118 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20532,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20658,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20532,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20658,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en",0,],
-["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20532,],
-["features.call.impl.ui_IncomingCallScreen_Day_1_en","features.call.impl.ui_IncomingCallScreen_Night_1_en",20532,],
+["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20658,],
+["features.call.impl.ui_IncomingCallScreen_Day_1_en","features.call.impl.ui_IncomingCallScreen_Night_1_en",20658,],
 ["features.verifysession.impl.incoming_IncomingVerificationViewA11y_en","",0,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20532,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20532,],
-["libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en","libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en",0,],
-["libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en","libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en",0,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20658,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20658,],
 ["libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Day_0_en","libraries.matrix.ui.media_InitialsAvatarBitmapGenerator_Night_0_en",0,],
-["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20532,],
-["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20532,],
-["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20532,],
+["features.call.impl.ui_InvalidAudioDeviceDialog_Day_0_en","features.call.impl.ui_InvalidAudioDeviceDialog_Night_0_en",20658,],
+["libraries.matrix.ui.media.contentvalidation_InvalidContentView_Day_0_en","libraries.matrix.ui.media.contentvalidation_InvalidContentView_Night_0_en",0,],
+["features.invitepeople.impl_InvitePeopleView_Day_0_en","features.invitepeople.impl_InvitePeopleView_Night_0_en",20658,],
+["features.invitepeople.impl_InvitePeopleView_Day_10_en","features.invitepeople.impl_InvitePeopleView_Night_10_en",20658,],
+["features.invitepeople.impl_InvitePeopleView_Day_11_en","features.invitepeople.impl_InvitePeopleView_Night_11_en",0,],
+["features.invitepeople.impl_InvitePeopleView_Day_1_en","features.invitepeople.impl_InvitePeopleView_Night_1_en",20658,],
 ["features.invitepeople.impl_InvitePeopleView_Day_2_en","features.invitepeople.impl_InvitePeopleView_Night_2_en",0,],
 ["features.invitepeople.impl_InvitePeopleView_Day_3_en","features.invitepeople.impl_InvitePeopleView_Night_3_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20532,],
-["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20532,],
-["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20532,],
-["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20532,],
+["features.invitepeople.impl_InvitePeopleView_Day_4_en","features.invitepeople.impl_InvitePeopleView_Night_4_en",20658,],
+["features.invitepeople.impl_InvitePeopleView_Day_5_en","features.invitepeople.impl_InvitePeopleView_Night_5_en",20658,],
+["features.invitepeople.impl_InvitePeopleView_Day_6_en","features.invitepeople.impl_InvitePeopleView_Night_6_en",20658,],
+["features.invitepeople.impl_InvitePeopleView_Day_7_en","features.invitepeople.impl_InvitePeopleView_Night_7_en",20658,],
 ["features.invitepeople.impl_InvitePeopleView_Day_8_en","features.invitepeople.impl_InvitePeopleView_Night_8_en",0,],
-["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20532,],
-["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20532,],
-["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20532,],
+["features.invitepeople.impl_InvitePeopleView_Day_9_en","features.invitepeople.impl_InvitePeopleView_Night_9_en",20658,],
+["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20658,],
+["features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20658,],
 ["features.joinroom.impl_JoinRoomView_Day_0_en","features.joinroom.impl_JoinRoomView_Night_0_en",0,],
-["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20532,],
-["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20532,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20532,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20532,],
+["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20658,],
+["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20658,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20658,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20658,],
 ["libraries.designsystem.components_LabelledCheckbox_Toggles_en","",0,],
-["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20532,],
-["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20532,],
+["features.preferences.impl.labs_LabsView_Day_0_en","features.preferences.impl.labs_LabsView_Night_0_en",20658,],
+["features.preferences.impl.labs_LabsView_Day_1_en","features.preferences.impl.labs_LabsView_Night_1_en",20658,],
 ["features.leaveroom.impl_LeaveRoomView_Day_0_en","features.leaveroom.impl_LeaveRoomView_Night_0_en",0,],
-["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20532,],
-["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_10_en","features.space.impl.leave_LeaveSpaceView_Night_10_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20532,],
-["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20532,],
+["features.leaveroom.impl_LeaveRoomView_Day_1_en","features.leaveroom.impl_LeaveRoomView_Night_1_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_2_en","features.leaveroom.impl_LeaveRoomView_Night_2_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_3_en","features.leaveroom.impl_LeaveRoomView_Night_3_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_4_en","features.leaveroom.impl_LeaveRoomView_Night_4_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_5_en","features.leaveroom.impl_LeaveRoomView_Night_5_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_6_en","features.leaveroom.impl_LeaveRoomView_Night_6_en",20658,],
+["features.leaveroom.impl_LeaveRoomView_Day_7_en","features.leaveroom.impl_LeaveRoomView_Night_7_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_0_en","features.space.impl.leave_LeaveSpaceView_Night_0_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_10_en","features.space.impl.leave_LeaveSpaceView_Night_10_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_1_en","features.space.impl.leave_LeaveSpaceView_Night_1_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_2_en","features.space.impl.leave_LeaveSpaceView_Night_2_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_3_en","features.space.impl.leave_LeaveSpaceView_Night_3_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_4_en","features.space.impl.leave_LeaveSpaceView_Night_4_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_5_en","features.space.impl.leave_LeaveSpaceView_Night_5_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_6_en","features.space.impl.leave_LeaveSpaceView_Night_6_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_7_en","features.space.impl.leave_LeaveSpaceView_Night_7_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_8_en","features.space.impl.leave_LeaveSpaceView_Night_8_en",20658,],
+["features.space.impl.leave_LeaveSpaceView_Day_9_en","features.space.impl.leave_LeaveSpaceView_Night_9_en",20658,],
 ["libraries.designsystem.background_LightGradientBackground_Day_0_en","libraries.designsystem.background_LightGradientBackground_Night_0_en",0,],
 ["libraries.designsystem.theme.components_LinearProgressIndicator_Progress_Indicators_en","",0,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en",20532,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en",20532,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en",20532,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en",20532,],
-["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en",20532,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en",20658,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_2_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_2_en",20658,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en",20658,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en",20658,],
+["features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en","features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en",20658,],
 ["features.messages.impl.link_LinkView_Day_0_en","features.messages.impl.link_LinkView_Night_0_en",0,],
-["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20532,],
+["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20658,],
 ["libraries.designsystem.components.dialogs_ListDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ListDialog_Day_0_en","libraries.designsystem.components.dialogs_ListDialog_Night_0_en",0,],
 ["libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en","",0,],
@@ -596,92 +626,140 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_ListSupportingTextLargePadding_List_supporting_text_-_large_padding_List_sections_en","",0,],
 ["libraries.designsystem.theme.components_ListSupportingTextNoPadding_List_supporting_text_-_no_padding_List_sections_en","",0,],
 ["libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en","",0,],
+["features.location.api_LiveLocationSharingBanner_Day_0_en","features.location.api_LiveLocationSharingBanner_Night_0_en",20658,],
 ["libraries.textcomposer.components_LiveWaveformView_Day_0_en","libraries.textcomposer.components_LiveWaveformView_Night_0_en",0,],
 ["appnav.room.joined_LoadingRoomNodeView_Day_0_en","appnav.room.joined_LoadingRoomNodeView_Night_0_en",0,],
-["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20532,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20532,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20532,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20532,],
+["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20658,],
+["libraries.designsystem.components_LocationPin_Day_0_en","libraries.designsystem.components_LocationPin_Night_0_en",0,],
+["features.location.impl.common.ui_LocationShareRow_Day_0_en","features.location.impl.common.ui_LocationShareRow_Night_0_en",0,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20658,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20658,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20658,],
 ["appnav.loggedin_LoggedInView_Day_0_en","appnav.loggedin_LoggedInView_Night_0_en",0,],
-["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20532,],
-["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20532,],
-["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20532,],
-["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20532,],
-["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20532,],
-["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20532,],
-["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20532,],
-["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20532,],
-["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20532,],
-["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20532,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20532,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20532,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20532,],
-["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20532,],
-["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20532,],
-["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20532,],
-["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20532,],
-["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20532,],
-["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20532,],
-["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20532,],
-["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20532,],
-["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20532,],
-["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20532,],
-["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20532,],
-["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20532,],
+["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20658,],
+["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20658,],
+["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20658,],
+["appnav.loggedin_LoggedInView_Day_4_en","appnav.loggedin_LoggedInView_Night_4_en",20658,],
+["appnav.loggedin_LoggedInView_Day_5_en","appnav.loggedin_LoggedInView_Night_5_en",20658,],
+["features.login.impl.login_LoginModeView_Day_0_en","features.login.impl.login_LoginModeView_Night_0_en",20658,],
+["features.login.impl.login_LoginModeView_Day_1_en","features.login.impl.login_LoginModeView_Night_1_en",20658,],
+["features.login.impl.login_LoginModeView_Day_2_en","features.login.impl.login_LoginModeView_Night_2_en",20658,],
+["features.login.impl.login_LoginModeView_Day_3_en","features.login.impl.login_LoginModeView_Night_3_en",20658,],
+["features.login.impl.login_LoginModeView_Day_4_en","features.login.impl.login_LoginModeView_Night_4_en",20658,],
+["features.login.impl.login_LoginModeView_Day_5_en","features.login.impl.login_LoginModeView_Night_5_en",20658,],
+["features.login.impl.login_LoginModeView_Day_6_en","features.login.impl.login_LoginModeView_Night_6_en",20658,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20658,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20658,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20658,],
+["features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_en","features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_0_en",20658,],
+["features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_en","features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_1_en",20658,],
+["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20658,],
+["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20658,],
+["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20658,],
+["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20658,],
+["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20658,],
+["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20658,],
+["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20658,],
+["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20658,],
+["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20658,],
+["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20658,],
+["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20658,],
+["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20658,],
 ["libraries.designsystem.components.button_MainActionButton_Buttons_en","",0,],
-["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en",20532,],
-["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en",20532,],
-["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en",20532,],
-["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20532,],
+["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en",20658,],
+["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en",20658,],
+["features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en","features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en",20658,],
+["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20658,],
 ["libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en","libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutralWrapping_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNeutral_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomPositive_Night_0_en",0,],
-["libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Day_0_en","libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Night_0_en",0,],
 ["libraries.matrix.ui.components_MatrixUserHeader_Day_0_en","libraries.matrix.ui.components_MatrixUserHeader_Night_0_en",0,],
 ["libraries.matrix.ui.components_MatrixUserHeader_Day_1_en","libraries.matrix.ui.components_MatrixUserHeader_Night_1_en",0,],
+["libraries.matrix.ui.components_MatrixUserHeader_Day_2_en","libraries.matrix.ui.components_MatrixUserHeader_Night_2_en",0,],
 ["libraries.matrix.ui.components_MatrixUserRow_Day_0_en","libraries.matrix.ui.components_MatrixUserRow_Night_0_en",0,],
 ["libraries.matrix.ui.components_MatrixUserRow_Day_1_en","libraries.matrix.ui.components_MatrixUserRow_Night_1_en",0,],
+["libraries.matrix.ui.components_MatrixUserRow_Day_2_en","libraries.matrix.ui.components_MatrixUserRow_Night_2_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en",0,],
-["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20532,],
-["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20532,],
-["libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en",0,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20532,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20532,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_1_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_1_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_2_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_3_en",20658,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_4_en",20658,],
+["libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en",20658,],
+["libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_1_en",20658,],
+["libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_2_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20658,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20658,],
 ["libraries.mediaviewer.impl.local.image_MediaImageView_Day_0_en","libraries.mediaviewer.impl.local.image_MediaImageView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_2_en",0,],
 ["libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en","libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_0_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_10_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_13_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_15_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_16_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_17_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_18_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_19_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_1_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_20_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_21_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_22_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_23_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_24_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_3_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_4_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_5_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_8_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_9_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_0_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_10_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20532,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20532,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20658,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_13_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20532,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20658,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_15_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_16_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_17_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_18_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_19_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_1_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20532,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_20_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_21_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_22_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_23_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_24_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20658,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_3_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_4_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_5_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_6_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_7_en","",0,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_6_en","",20658,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_7_en","",20658,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_8_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_9_en","",0,],
 ["libraries.designsystem.theme.components_MediumTopAppBar_App_Bars_en","",0,],
@@ -690,7 +768,7 @@ export const screenshots = [
 ["libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en","libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en",0,],
 ["libraries.designsystem.theme.components.previews_Menu_Menus_en","",0,],
 ["features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en","features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en",0,],
-["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20532,],
+["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_0_en","features.messages.impl.timeline.components_MessageEventBubble_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_1_en","features.messages.impl.timeline.components_MessageEventBubble_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_2_en","features.messages.impl.timeline.components_MessageEventBubble_Night_2_en",0,],
@@ -699,7 +777,7 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_5_en","features.messages.impl.timeline.components_MessageEventBubble_Night_5_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_6_en","features.messages.impl.timeline.components_MessageEventBubble_Night_6_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_7_en","features.messages.impl.timeline.components_MessageEventBubble_Night_7_en",0,],
-["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20532,],
+["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_MessageStateEventContainer_Day_0_en","features.messages.impl.timeline.components_MessageStateEventContainer_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonExtra_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonExtra_Night_0_en",0,],
@@ -708,140 +786,157 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_2_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_2_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_3_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_3_en",0,],
 ["features.messages.impl_MessagesViewA11y_en","",0,],
-["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20532,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20532,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20532,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20532,],
-["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20532,],
-["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20532,],
-["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20532,],
-["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20532,],
-["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20532,],
-["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20532,],
-["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20532,],
-["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20532,],
-["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20532,],
-["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20532,],
-["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20532,],
+["features.messages.impl.topbars_MessagesViewTopBar_Day_0_en","features.messages.impl.topbars_MessagesViewTopBar_Night_0_en",20658,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20658,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20658,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20658,],
+["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20658,],
+["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20658,],
+["features.messages.impl_MessagesView_Day_11_en","features.messages.impl_MessagesView_Night_11_en",20658,],
+["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20658,],
+["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20658,],
+["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20658,],
+["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20658,],
+["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20658,],
+["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20658,],
+["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20658,],
+["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20658,],
+["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20658,],
 ["features.migration.impl_MigrationView_Day_0_en","features.migration.impl_MigrationView_Night_0_en",0,],
-["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20532,],
+["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20658,],
+["features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Day_0_en","features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Night_0_en",0,],
 ["libraries.designsystem.theme.components_ModalBottomSheetDark_Bottom_Sheets_en","",0,],
 ["libraries.designsystem.theme.components_ModalBottomSheetLight_Bottom_Sheets_en","",0,],
 ["appicon.element_MonochromeIcon_en","",0,],
-["features.preferences.impl.root_MultiAccountSection_Day_0_en","features.preferences.impl.root_MultiAccountSection_Night_0_en",0,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelectedTrailingContent_Multiple_selection_List_item_-_selection_in_trailing_content_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelected_Multiple_selection_List_item_-_selection_in_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItem_Multiple_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_NavigationBar_App_Bars_en","",0,],
-["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20532,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20532,],
-["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20532,],
+["features.home.impl.components_NewNotificationSoundBanner_Day_0_en","features.home.impl.components_NewNotificationSoundBanner_Night_0_en",20658,],
+["libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Day_0_en","libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Night_0_en",0,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_14_en","features.preferences.impl.notifications_NotificationSettingsView_Night_14_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_15_en","features.preferences.impl.notifications_NotificationSettingsView_Night_15_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_16_en","features.preferences.impl.notifications_NotificationSettingsView_Night_16_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_17_en","features.preferences.impl.notifications_NotificationSettingsView_Night_17_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_18_en","features.preferences.impl.notifications_NotificationSettingsView_Night_18_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_19_en","features.preferences.impl.notifications_NotificationSettingsView_Night_19_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_20_en","features.preferences.impl.notifications_NotificationSettingsView_Night_20_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20658,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20658,],
+["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20658,],
 ["features.linknewdevice.impl.screens.number.component_NumberTextField_Day_0_en","features.linknewdevice.impl.screens.number.component_NumberTextField_Night_0_en",0,],
 ["libraries.designsystem.atomic.pages_OnBoardingPage_Day_0_en","libraries.designsystem.atomic.pages_OnBoardingPage_Night_0_en",0,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20532,],
-["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20532,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_0_en","features.login.impl.screens.onboarding_OnBoardingView_Night_0_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_1_en","features.login.impl.screens.onboarding_OnBoardingView_Night_1_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_2_en","features.login.impl.screens.onboarding_OnBoardingView_Night_2_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_3_en","features.login.impl.screens.onboarding_OnBoardingView_Night_3_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_4_en","features.login.impl.screens.onboarding_OnBoardingView_Night_4_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_5_en","features.login.impl.screens.onboarding_OnBoardingView_Night_5_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_6_en","features.login.impl.screens.onboarding_OnBoardingView_Night_6_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_7_en","features.login.impl.screens.onboarding_OnBoardingView_Night_7_en",20658,],
+["features.login.impl.screens.onboarding_OnBoardingView_Day_8_en","features.login.impl.screens.onboarding_OnBoardingView_Night_8_en",20658,],
 ["libraries.designsystem.background_OnboardingBackground_Day_0_en","libraries.designsystem.background_OnboardingBackground_Night_0_en",0,],
-["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20532,],
+["libraries.matrix.ui.components_OrganizationHeader_Day_0_en","libraries.matrix.ui.components_OrganizationHeader_Night_0_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_0_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_0_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en",20658,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_12_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_12_en",0,],
 ["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_13_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_13_en",0,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20532,],
-["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20532,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_4_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_4_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_5_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_5_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_7_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_7_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_8_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_8_en",20658,],
+["features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en","features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en",20658,],
 ["libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonSmall_Buttons_en","",0,],
-["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20532,],
-["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20532,],
-["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20532,],
-["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20532,],
-["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20532,],
-["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20532,],
+["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20658,],
+["features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Day_0_en","features.rolesandpermissions.impl.roles_PendingMemberRowWithLongName_Night_0_en",20658,],
+["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20658,],
+["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20658,],
+["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20658,],
+["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20658,],
 ["features.lockscreen.impl.components_PinEntryTextField_Day_0_en","features.lockscreen.impl.components_PinEntryTextField_Night_0_en",0,],
-["libraries.designsystem.components_PinIcon_Day_0_en","libraries.designsystem.components_PinIcon_Night_0_en",0,],
 ["features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en","features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en",0,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20532,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20532,],
+["features.lockscreen.impl.unlock_PinUnlockViewCompact_0_en","",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewCompact_1_en","",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_10_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_8_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_9_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_10_en","features.lockscreen.impl.unlock_PinUnlockView_Night_10_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_8_en","features.lockscreen.impl.unlock_PinUnlockView_Night_8_en",20658,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_9_en","features.lockscreen.impl.unlock_PinUnlockView_Night_9_en",20658,],
 ["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_0_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_0_en",0,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20532,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20532,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20532,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20532,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20532,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20532,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20658,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20658,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20658,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20658,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20658,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20658,],
 ["libraries.designsystem.atomic.atoms_PlaceholderAtom_Day_0_en","libraries.designsystem.atomic.atoms_PlaceholderAtom_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_PlaybackSpeedButton_Day_0_en","libraries.designsystem.atomic.atoms_PlaybackSpeedButton_Night_0_en",0,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20532,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20658,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en",0,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en",0,],
-["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20532,],
-["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20532,],
-["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20532,],
-["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20532,],
-["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20532,],
-["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20532,],
-["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20532,],
+["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20658,],
+["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20658,],
+["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20658,],
+["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20658,],
+["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20658,],
+["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20658,],
+["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20658,],
 ["features.poll.api.pollcontent_PollTitleView_Day_0_en","features.poll.api.pollcontent_PollTitleView_Night_0_en",0,],
 ["libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en","",0,],
@@ -855,215 +950,231 @@ export const screenshots = [
 ["libraries.designsystem.components.preferences_PreferenceRow_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en","",0,],
-["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20532,],
-["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20532,],
-["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20532,],
-["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20532,],
+["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_2_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_3_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_4_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_5_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewDark_6_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_2_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_3_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_4_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_5_en","",20658,],
+["features.preferences.impl.root_PreferencesRootViewLight_6_en","",20658,],
 ["features.messages.impl.timeline.components.event_ProgressButton_Day_0_en","features.messages.impl.timeline.components.event_ProgressButton_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20532,],
-["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20532,],
+["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20658,],
+["libraries.designsystem.components_ProgressDialogWithContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithContent_Night_0_en",20658,],
 ["libraries.designsystem.components_ProgressDialogWithTextAndContent_Day_0_en","libraries.designsystem.components_ProgressDialogWithTextAndContent_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20532,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20532,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20532,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20532,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20532,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20532,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20532,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20532,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20532,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20532,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20532,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20532,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20532,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20532,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20532,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20532,],
+["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20658,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20658,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20658,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20658,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20658,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20658,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20658,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20658,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_3_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_3_en",20658,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20658,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20658,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20658,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20658,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20658,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_4_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_4_en",20658,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_5_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_5_en",20658,],
 ["libraries.qrcode_QrCodeView_en","",0,],
 ["libraries.designsystem.theme.components_RadioButton_Toggles_en","",0,],
-["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20532,],
-["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20532,],
+["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20658,],
+["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20658,],
 ["features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Day_0_en","features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Night_0_en",0,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20532,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20532,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20532,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20532,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20532,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20532,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20532,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20658,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20658,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20658,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20658,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20658,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_14_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_14_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20658,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20658,],
 ["libraries.designsystem.atomic.atoms_RedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_RedIndicatorAtom_Night_0_en",0,],
+["features.location.api_RenderingMapsNotSupportedDialog_Day_0_en","features.location.api_RenderingMapsNotSupportedDialog_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en","features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en",0,],
-["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20532,],
-["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20532,],
-["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20532,],
-["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20532,],
-["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20532,],
-["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20532,],
-["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20532,],
-["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20532,],
-["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20532,],
-["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20532,],
-["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20532,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20532,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20532,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20532,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20532,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20532,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20532,],
+["libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Day_0_en","libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Night_0_en",0,],
+["libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Day_0_en","libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Night_0_en",0,],
+["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20658,],
+["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20658,],
+["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20658,],
+["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20658,],
+["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20658,],
+["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20658,],
+["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20658,],
+["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20658,],
+["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20658,],
+["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20658,],
+["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20658,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20658,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20658,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20658,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20658,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20658,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20658,],
 ["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_0_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_0_en",0,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20532,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20532,],
-["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20532,],
-["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20532,],
-["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20532,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20658,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20658,],
+["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20658,],
+["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en",20658,],
+["features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en","features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en",20658,],
 ["libraries.matrix.ui.room.address_RoomAddressField_Day_0_en","libraries.matrix.ui.room.address_RoomAddressField_Night_0_en",0,],
 ["features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en",0,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20532,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20532,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20658,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20658,],
 ["features.roomdetails.impl_RoomDetailsA11y_en","",0,],
-["features.roomdetails.impl_RoomDetailsDark_0_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_10_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_11_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_12_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_13_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_14_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_15_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_16_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_17_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_18_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_19_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_1_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_20_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_21_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_22_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_2_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_3_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_4_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_5_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_6_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_7_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_8_en","",20532,],
-["features.roomdetails.impl_RoomDetailsDark_9_en","",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en",20532,],
-["features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en",20532,],
-["features.roomdetails.impl_RoomDetails_0_en","",20532,],
-["features.roomdetails.impl_RoomDetails_10_en","",20532,],
-["features.roomdetails.impl_RoomDetails_11_en","",20532,],
-["features.roomdetails.impl_RoomDetails_12_en","",20532,],
-["features.roomdetails.impl_RoomDetails_13_en","",20532,],
-["features.roomdetails.impl_RoomDetails_14_en","",20532,],
-["features.roomdetails.impl_RoomDetails_15_en","",20532,],
-["features.roomdetails.impl_RoomDetails_16_en","",20532,],
-["features.roomdetails.impl_RoomDetails_17_en","",20532,],
-["features.roomdetails.impl_RoomDetails_18_en","",20532,],
-["features.roomdetails.impl_RoomDetails_19_en","",20532,],
-["features.roomdetails.impl_RoomDetails_1_en","",20532,],
-["features.roomdetails.impl_RoomDetails_20_en","",20532,],
-["features.roomdetails.impl_RoomDetails_21_en","",20532,],
-["features.roomdetails.impl_RoomDetails_22_en","",20532,],
-["features.roomdetails.impl_RoomDetails_2_en","",20532,],
-["features.roomdetails.impl_RoomDetails_3_en","",20532,],
-["features.roomdetails.impl_RoomDetails_4_en","",20532,],
-["features.roomdetails.impl_RoomDetails_5_en","",20532,],
-["features.roomdetails.impl_RoomDetails_6_en","",20532,],
-["features.roomdetails.impl_RoomDetails_7_en","",20532,],
-["features.roomdetails.impl_RoomDetails_8_en","",20532,],
-["features.roomdetails.impl_RoomDetails_9_en","",20532,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20532,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20532,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20532,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20532,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20532,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20532,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20532,],
-["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20532,],
-["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20532,],
+["features.roomdetails.impl_RoomDetailsDark_0_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_10_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_11_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_12_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_13_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_14_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_15_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_16_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_17_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_18_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_19_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_1_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_20_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_21_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_22_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_2_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_3_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_4_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_5_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_6_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_7_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_8_en","",20658,],
+["features.roomdetails.impl_RoomDetailsDark_9_en","",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_0_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_0_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_1_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_1_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_2_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_2_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_3_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_3_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_4_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_4_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_5_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_5_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_6_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_6_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_7_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_7_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_8_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_8_en",20658,],
+["features.roomdetailsedit.impl_RoomDetailsEditView_Day_9_en","features.roomdetailsedit.impl_RoomDetailsEditView_Night_9_en",20658,],
+["features.roomdetails.impl_RoomDetails_0_en","",20658,],
+["features.roomdetails.impl_RoomDetails_10_en","",20658,],
+["features.roomdetails.impl_RoomDetails_11_en","",20658,],
+["features.roomdetails.impl_RoomDetails_12_en","",20658,],
+["features.roomdetails.impl_RoomDetails_13_en","",20658,],
+["features.roomdetails.impl_RoomDetails_14_en","",20658,],
+["features.roomdetails.impl_RoomDetails_15_en","",20658,],
+["features.roomdetails.impl_RoomDetails_16_en","",20658,],
+["features.roomdetails.impl_RoomDetails_17_en","",20658,],
+["features.roomdetails.impl_RoomDetails_18_en","",20658,],
+["features.roomdetails.impl_RoomDetails_19_en","",20658,],
+["features.roomdetails.impl_RoomDetails_1_en","",20658,],
+["features.roomdetails.impl_RoomDetails_20_en","",20658,],
+["features.roomdetails.impl_RoomDetails_21_en","",20658,],
+["features.roomdetails.impl_RoomDetails_22_en","",20658,],
+["features.roomdetails.impl_RoomDetails_2_en","",20658,],
+["features.roomdetails.impl_RoomDetails_3_en","",20658,],
+["features.roomdetails.impl_RoomDetails_4_en","",20658,],
+["features.roomdetails.impl_RoomDetails_5_en","",20658,],
+["features.roomdetails.impl_RoomDetails_6_en","",20658,],
+["features.roomdetails.impl_RoomDetails_7_en","",20658,],
+["features.roomdetails.impl_RoomDetails_8_en","",20658,],
+["features.roomdetails.impl_RoomDetails_9_en","",20658,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20658,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20658,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20658,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20658,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20658,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20658,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20658,],
+["features.home.impl.components_RoomListContentView_Day_0_en","features.home.impl.components_RoomListContentView_Night_0_en",20658,],
+["features.home.impl.components_RoomListContentView_Day_1_en","features.home.impl.components_RoomListContentView_Night_1_en",20658,],
 ["features.home.impl.components_RoomListContentView_Day_2_en","features.home.impl.components_RoomListContentView_Night_2_en",0,],
-["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20532,],
-["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20532,],
-["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20532,],
-["features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en",20532,],
-["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20532,],
-["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20532,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en",20532,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en",20532,],
-["features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en","features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en",20532,],
+["features.home.impl.components_RoomListContentView_Day_3_en","features.home.impl.components_RoomListContentView_Night_3_en",20658,],
+["features.home.impl.components_RoomListContentView_Day_4_en","features.home.impl.components_RoomListContentView_Night_4_en",20658,],
+["features.home.impl.components_RoomListContentView_Day_5_en","features.home.impl.components_RoomListContentView_Night_5_en",20658,],
+["features.home.impl.roomlist_RoomListContextMenu_Day_0_en","features.home.impl.roomlist_RoomListContextMenu_Night_0_en",20658,],
+["features.home.impl.roomlist_RoomListContextMenu_Day_1_en","features.home.impl.roomlist_RoomListContextMenu_Night_1_en",20658,],
+["features.home.impl.roomlist_RoomListContextMenu_Day_2_en","features.home.impl.roomlist_RoomListContextMenu_Night_2_en",20658,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_en","features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_0_en",20658,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_en","features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_1_en",20658,],
+["features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_en","features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_2_en",20658,],
+["features.home.impl.filters_RoomListFiltersView_Day_0_en","features.home.impl.filters_RoomListFiltersView_Night_0_en",20658,],
+["features.home.impl.filters_RoomListFiltersView_Day_1_en","features.home.impl.filters_RoomListFiltersView_Night_1_en",20658,],
 ["features.home.impl.search_RoomListSearchContent_Day_0_en","features.home.impl.search_RoomListSearchContent_Night_0_en",0,],
-["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20532,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20532,],
-["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20532,],
+["features.home.impl.search_RoomListSearchContent_Day_1_en","features.home.impl.search_RoomListSearchContent_Night_1_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20658,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en",20658,],
+["features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en",20658,],
 ["features.roommembermoderation.impl_RoomMemberModerationView_Day_9_en","features.roommembermoderation.impl_RoomMemberModerationView_Night_9_en",0,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20532,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20532,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20658,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20658,],
 ["libraries.designsystem.atomic.atoms_RoomPreviewAliasAtom_Day_0_en","libraries.designsystem.atomic.atoms_RoomPreviewAliasAtom_Night_0_en",0,],
-["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20532,],
-["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20532,],
-["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20532,],
-["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20532,],
-["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20532,],
-["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20532,],
+["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20658,],
+["libraries.roomselect.impl_RoomSelectView_Day_6_en","libraries.roomselect.impl_RoomSelectView_Night_6_en",20658,],
 ["features.home.impl.components_RoomSummaryPlaceholderRow_Day_0_en","features.home.impl.components_RoomSummaryPlaceholderRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_0_en","features.home.impl.components_RoomSummaryRow_Night_0_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_10_en","features.home.impl.components_RoomSummaryRow_Night_10_en",0,],
@@ -1086,16 +1197,17 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_26_en","features.home.impl.components_RoomSummaryRow_Night_26_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_27_en","features.home.impl.components_RoomSummaryRow_Night_27_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_28_en","features.home.impl.components_RoomSummaryRow_Night_28_en",0,],
-["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20532,],
-["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20532,],
+["features.home.impl.components_RoomSummaryRow_Day_29_en","features.home.impl.components_RoomSummaryRow_Night_29_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_2_en","features.home.impl.components_RoomSummaryRow_Night_2_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_30_en","features.home.impl.components_RoomSummaryRow_Night_30_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_31_en","features.home.impl.components_RoomSummaryRow_Night_31_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_32_en","features.home.impl.components_RoomSummaryRow_Night_32_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_33_en","features.home.impl.components_RoomSummaryRow_Night_33_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_34_en","features.home.impl.components_RoomSummaryRow_Night_34_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_35_en","features.home.impl.components_RoomSummaryRow_Night_35_en",20658,],
 ["features.home.impl.components_RoomSummaryRow_Day_36_en","features.home.impl.components_RoomSummaryRow_Night_36_en",0,],
-["features.home.impl.components_RoomSummaryRow_Day_37_en","features.home.impl.components_RoomSummaryRow_Night_37_en",20532,],
+["features.home.impl.components_RoomSummaryRow_Day_37_en","features.home.impl.components_RoomSummaryRow_Night_37_en",20658,],
+["features.home.impl.components_RoomSummaryRow_Day_38_en","features.home.impl.components_RoomSummaryRow_Night_38_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_3_en","features.home.impl.components_RoomSummaryRow_Night_3_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_4_en","features.home.impl.components_RoomSummaryRow_Night_4_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_5_en","features.home.impl.components_RoomSummaryRow_Night_5_en",0,],
@@ -1103,118 +1215,119 @@ export const screenshots = [
 ["features.home.impl.components_RoomSummaryRow_Day_7_en","features.home.impl.components_RoomSummaryRow_Night_7_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_8_en","features.home.impl.components_RoomSummaryRow_Night_8_en",0,],
 ["features.home.impl.components_RoomSummaryRow_Day_9_en","features.home.impl.components_RoomSummaryRow_Night_9_en",0,],
-["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20532,],
-["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20532,],
-["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20532,],
+["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20658,],
+["features.login.impl.screens.classic.root_RootView_Day_0_en","features.login.impl.screens.classic.root_RootView_Night_0_en",0,],
+["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20658,],
+["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20658,],
 ["appicon.enterprise_RoundIcon_en","",0,],
 ["appicon.element_RoundIcon_en","",0,],
 ["libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en","libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en",0,],
-["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20532,],
-["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en",20532,],
-["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en",20532,],
-["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en",20532,],
-["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en",20532,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20532,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20532,],
+["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20658,],
+["libraries.designsystem.components.dialogs_SaveChangesDialog_Day_0_en","libraries.designsystem.components.dialogs_SaveChangesDialog_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_0_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_1_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_1_en",20658,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_2_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_2_en",20658,],
+["features.linknewdevice.impl.screens.scan_ScanQrCodeView_Day_3_en","features.linknewdevice.impl.screens.scan_ScanQrCodeView_Night_3_en",20658,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20658,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20658,],
 ["libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en","",0,],
-["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20532,],
+["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20658,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarInactive_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchFieldsDark_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchFieldsLight_Search_views_en","",0,],
-["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20532,],
-["features.startchat.impl.components_SearchSingleUserResultItem_en","",20532,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20532,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20532,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20532,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20532,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20532,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20532,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20532,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20532,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20532,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20532,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en","",20532,],
-["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en","",20532,],
-["features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en","features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en",20532,],
+["features.startchat.impl.components_SearchMultipleUsersResultItem_en","",20658,],
+["features.startchat.impl.components_SearchSingleUserResultItem_en","",20658,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20658,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20658,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20658,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20658,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20658,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20658,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20658,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20658,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_4_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_4_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20658,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20658,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en","",20658,],
+["features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en","",20658,],
+["features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en","features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en",20658,],
 ["libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_SelectedIndicatorAtom_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_0_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoomRtl_Day_1_en","libraries.matrix.ui.components_SelectedRoomRtl_Night_1_en",0,],
@@ -1228,11 +1341,6 @@ export const screenshots = [
 ["libraries.matrix.ui.components_SelectedUser_Day_1_en","libraries.matrix.ui.components_SelectedUser_Night_1_en",0,],
 ["libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en","libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en",0,],
 ["libraries.textcomposer.components_SendButtonIcon_Day_0_en","libraries.textcomposer.components_SendButtonIcon_Night_0_en",0,],
-["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20532,],
-["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20532,],
-["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20532,],
-["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20532,],
-["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20532,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_0_en","libraries.matrix.ui.messages.sender_SenderName_Night_0_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_1_en","libraries.matrix.ui.messages.sender_SenderName_Night_1_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_2_en","libraries.matrix.ui.messages.sender_SenderName_Night_2_en",0,],
@@ -1242,28 +1350,39 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.sender_SenderName_Day_6_en","libraries.matrix.ui.messages.sender_SenderName_Night_6_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_7_en","libraries.matrix.ui.messages.sender_SenderName_Night_7_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_8_en","libraries.matrix.ui.messages.sender_SenderName_Night_8_en",0,],
-["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20532,],
-["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20532,],
-["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20532,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20532,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20532,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20532,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20532,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20532,],
+["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20658,],
+["features.home.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.home.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20658,],
+["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20658,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20658,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20658,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20658,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20658,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_0_en","features.location.impl.share_ShareLocationView_Night_0_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_1_en","features.location.impl.share_ShareLocationView_Night_1_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_2_en","features.location.impl.share_ShareLocationView_Night_2_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_3_en","features.location.impl.share_ShareLocationView_Night_3_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_4_en","features.location.impl.share_ShareLocationView_Night_4_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_5_en","features.location.impl.share_ShareLocationView_Night_5_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_6_en","features.location.impl.share_ShareLocationView_Night_6_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_7_en","features.location.impl.share_ShareLocationView_Night_7_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_8_en","features.location.impl.share_ShareLocationView_Night_8_en",20658,],
+["features.location.impl.share_ShareLocationView_Day_9_en","features.location.impl.share_ShareLocationView_Night_9_en",20658,],
 ["features.share.impl_ShareView_Day_0_en","features.share.impl_ShareView_Night_0_en",0,],
 ["features.share.impl_ShareView_Day_1_en","features.share.impl_ShareView_Night_1_en",0,],
 ["features.share.impl_ShareView_Day_2_en","features.share.impl_ShareView_Night_2_en",0,],
-["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20532,],
-["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20532,],
-["features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en","features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en",20532,],
-["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20532,],
+["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20658,],
+["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20658,],
+["features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en","features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en",20658,],
+["features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_en","features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_1_en",20658,],
+["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20658,],
 ["libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en","libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en",0,],
@@ -1272,108 +1391,108 @@ export const screenshots = [
 ["libraries.designsystem.components.list_SingleSelectionListItemSelectedInTrailingContent_Single_selection_List_item_-_selection_in_trailing_content_List_items_en","",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItemUnselectedWithSupportingText_Single_selection_List_item_-_no_selection,_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItem_Single_selection_List_item_-_no_selection_List_items_en","",0,],
+["libraries.emoji.impl.picker_SkinTonePicker_Day_0_en","libraries.emoji.impl.picker_SkinTonePicker_Night_0_en",0,],
 ["libraries.designsystem.theme.components_Sliders_Sliders_en","",0,],
-["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20532,],
+["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20658,],
 ["libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLine_Snackbar_with_action_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithAction_Snackbar_with_action_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_Snackbar_Snackbar_Snackbars_en","",0,],
-["features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en","features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en",20532,],
 ["libraries.designsystem.components.avatar.internal_SpaceAvatar_Avatars_en","",0,],
-["features.home.impl.spacefilters_SpaceFiltersView_Day_0_en","features.home.impl.spacefilters_SpaceFiltersView_Night_0_en",20532,],
-["features.home.impl.spacefilters_SpaceFiltersView_Day_1_en","features.home.impl.spacefilters_SpaceFiltersView_Night_1_en",20532,],
-["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20532,],
-["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",0,],
-["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20532,],
+["features.home.impl.spacefilters_SpaceFiltersView_Day_0_en","features.home.impl.spacefilters_SpaceFiltersView_Night_0_en",20658,],
+["features.home.impl.spacefilters_SpaceFiltersView_Day_1_en","features.home.impl.spacefilters_SpaceFiltersView_Night_1_en",20658,],
+["libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en",20658,],
+["libraries.matrix.ui.components_SpaceHeaderView_Day_0_en","libraries.matrix.ui.components_SpaceHeaderView_Night_0_en",20658,],
+["libraries.matrix.ui.components_SpaceInfoRow_Day_0_en","libraries.matrix.ui.components_SpaceInfoRow_Night_0_en",20658,],
 ["libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Day_0_en","libraries.matrix.ui.components_SpaceMembersViewNoHeroes_Night_0_en",0,],
 ["libraries.matrix.ui.components_SpaceMembersView_Day_0_en","libraries.matrix.ui.components_SpaceMembersView_Night_0_en",0,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20532,],
-["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20532,],
-["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20532,],
-["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20532,],
-["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20532,],
-["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20532,],
-["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20532,],
-["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20532,],
-["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20532,],
-["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20532,],
-["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20532,],
-["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20532,],
-["features.space.impl.root_SpaceView_Day_6_en","features.space.impl.root_SpaceView_Night_6_en",20532,],
-["features.space.impl.root_SpaceView_Day_7_en","features.space.impl.root_SpaceView_Night_7_en",20532,],
-["features.space.impl.root_SpaceView_Day_8_en","features.space.impl.root_SpaceView_Night_8_en",20532,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_0_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_0_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en",20658,],
+["libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en","libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en",20658,],
+["features.space.impl.settings_SpaceSettingsView_Day_0_en","features.space.impl.settings_SpaceSettingsView_Night_0_en",20658,],
+["features.space.impl.settings_SpaceSettingsView_Day_1_en","features.space.impl.settings_SpaceSettingsView_Night_1_en",20658,],
+["features.space.impl.settings_SpaceSettingsView_Day_2_en","features.space.impl.settings_SpaceSettingsView_Night_2_en",20658,],
+["features.space.impl.settings_SpaceSettingsView_Day_3_en","features.space.impl.settings_SpaceSettingsView_Night_3_en",20658,],
+["features.space.impl.root_SpaceView_Day_0_en","features.space.impl.root_SpaceView_Night_0_en",20658,],
+["features.space.impl.root_SpaceView_Day_1_en","features.space.impl.root_SpaceView_Night_1_en",20658,],
+["features.space.impl.root_SpaceView_Day_2_en","features.space.impl.root_SpaceView_Night_2_en",20658,],
+["features.space.impl.root_SpaceView_Day_3_en","features.space.impl.root_SpaceView_Night_3_en",20658,],
+["features.space.impl.root_SpaceView_Day_4_en","features.space.impl.root_SpaceView_Night_4_en",20658,],
+["features.space.impl.root_SpaceView_Day_5_en","features.space.impl.root_SpaceView_Night_5_en",20658,],
+["features.space.impl.root_SpaceView_Day_6_en","features.space.impl.root_SpaceView_Night_6_en",20658,],
+["features.space.impl.root_SpaceView_Day_7_en","features.space.impl.root_SpaceView_Night_7_en",20658,],
+["features.space.impl.root_SpaceView_Day_8_en","features.space.impl.root_SpaceView_Night_8_en",20658,],
 ["libraries.designsystem.modifiers_SquareSizeModifierInsideSquare_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeHeight_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeWidth_en","",0,],
-["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20532,],
-["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20532,],
-["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20532,],
-["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20532,],
-["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20532,],
-["features.startchat.impl.root_StartChatView_Day_5_en","features.startchat.impl.root_StartChatView_Night_5_en",20532,],
-["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20532,],
+["features.startchat.impl.root_StartChatView_Day_0_en","features.startchat.impl.root_StartChatView_Night_0_en",20658,],
+["features.startchat.impl.root_StartChatView_Day_1_en","features.startchat.impl.root_StartChatView_Night_1_en",20658,],
+["features.startchat.impl.root_StartChatView_Day_2_en","features.startchat.impl.root_StartChatView_Night_2_en",20658,],
+["features.startchat.impl.root_StartChatView_Day_3_en","features.startchat.impl.root_StartChatView_Night_3_en",20658,],
+["features.startchat.impl.root_StartChatView_Day_4_en","features.startchat.impl.root_StartChatView_Night_4_en",20658,],
+["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20658,],
 ["features.location.api_StaticMapView_Day_0_en","features.location.api_StaticMapView_Night_0_en",0,],
-["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20532,],
+["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20658,],
 ["libraries.designsystem.atomic.pages_SunsetPage_Day_0_en","libraries.designsystem.atomic.pages_SunsetPage_Night_0_en",0,],
 ["libraries.designsystem.components.button_SuperButton_Day_0_en","libraries.designsystem.components.button_SuperButton_Night_0_en",0,],
 ["libraries.designsystem.theme.components_Surface_en","",0,],
 ["libraries.designsystem.theme.components_Switch_Toggles_en","",0,],
-["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20532,],
+["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20658,],
 ["libraries.designsystem.components.avatar.internal_TextAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonSmall_Buttons_en","",0,],
-["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20532,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20532,],
-["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20532,],
-["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20532,],
-["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20532,],
+["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20658,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20658,],
+["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20658,],
+["libraries.textcomposer_TextComposerScaledDensityWithReply_en","",20658,],
+["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20658,],
+["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20658,],
 ["libraries.textcomposer_TextComposerVoice_Day_0_en","libraries.textcomposer_TextComposerVoice_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextDark_Text_en","",0,],
-["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20532,],
-["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20532,],
+["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20658,],
+["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20658,],
 ["libraries.designsystem.components.list_TextFieldListItemEmpty_Text_field_List_item_-_empty_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItemTextFieldValue_Text_field_List_item_-_textfieldvalue_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItem_Text_field_List_item_-_text_List_items_en","",0,],
@@ -1385,99 +1504,126 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_3_en","libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_3_en",0,],
 ["libraries.textcomposer.components_TextFormatting_Day_0_en","libraries.textcomposer.components_TextFormatting_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextLight_Text_en","",0,],
-["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20532,],
-["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20532,],
-["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20532,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20532,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20532,],
+["features.messages.impl.threads.list_ThreadListItemRow_Day_0_en","features.messages.impl.threads.list_ThreadListItemRow_Night_0_en",0,],
+["features.messages.impl.timeline.components_ThreadSummaryView_Day_0_en","features.messages.impl.timeline.components_ThreadSummaryView_Night_0_en",20658,],
+["features.messages.impl.topbars_ThreadTopBar_Day_0_en","features.messages.impl.topbars_ThreadTopBar_Night_0_en",20658,],
+["features.messages.impl.threads.list_ThreadsListView_Day_0_en","features.messages.impl.threads.list_ThreadsListView_Night_0_en",0,],
+["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20658,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20658,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20658,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_0_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_1_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20532,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20532,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20658,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20658,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_7_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_7_en",0,],
-["features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Day_0_en","features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Night_0_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_0_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_1_en",0,],
+["features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Day_0_en","features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20658,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_1_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20532,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en","",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_en","",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowShield_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowShield_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_1_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_2_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_3_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_4_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_5_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_6_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_7_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_8_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en",20661,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en",20661,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en",0,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en",20661,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en",20661,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithThreadSummary_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20532,],
+["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20658,],
+["features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Day_0_en","features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Night_0_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_0_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_1_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_2_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_3_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_4_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_5_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_6_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_7_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_8_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_9_en","features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_9_en",0,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20532,],
+["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20658,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20532,],
+["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_2_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_3_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_4_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20532,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20658,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en",0,],
-["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20532,],
+["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20658,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en",0,],
@@ -1486,10 +1632,16 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_5_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_5_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_6_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_6_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_7_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_7_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20532,],
-["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20532,],
+["features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Day_0_en","features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Night_0_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20658,],
+["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Day_0_en","features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Day_0_en","features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Day_0_en","features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Day_0_en","features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemStateEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemStateEventRow_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStateView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStateView_Night_0_en",0,],
+["features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_2_en",0,],
@@ -1502,12 +1654,15 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_4_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_5_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20532,],
-["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20532,],
+["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20658,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20658,],
+["features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_3_en",0,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_4_en",0,],
+["features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Day_0_en","features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVoiceViewUnified_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_10_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_10_en",0,],
@@ -1525,90 +1680,100 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_8_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en","features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en",0,],
-["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_10_en","features.messages.impl.timeline_TimelineView_Night_10_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20532,],
-["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20532,],
+["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20658,],
+["features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en","features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en",0,],
+["features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en","features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en",0,],
+["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_10_en","features.messages.impl.timeline_TimelineView_Night_10_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20658,],
+["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20658,],
 ["features.messages.impl.timeline_TimelineView_Day_2_en","features.messages.impl.timeline_TimelineView_Night_2_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_3_en","features.messages.impl.timeline_TimelineView_Night_3_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20532,],
+["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20658,],
 ["features.messages.impl.timeline_TimelineView_Day_5_en","features.messages.impl.timeline_TimelineView_Night_5_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20532,],
+["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20658,],
 ["features.messages.impl.timeline_TimelineView_Day_7_en","features.messages.impl.timeline_TimelineView_Night_7_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_9_en","features.messages.impl.timeline_TimelineView_Night_9_en",0,],
 ["libraries.designsystem.components.avatar.internal_TombstonedRoomAvatar_Avatars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBarStr_App_Bars_en","",0,],
 ["libraries.designsystem.theme.components_TopAppBar_App_Bars_en","",0,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20532,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20532,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20658,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20658,],
 ["features.messages.impl.typing_TypingNotificationView_Day_0_en","features.messages.impl.typing_TypingNotificationView_Night_0_en",0,],
-["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20532,],
-["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20532,],
-["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20532,],
-["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20532,],
-["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20532,],
-["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20532,],
+["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20658,],
+["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20658,],
+["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20658,],
+["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20658,],
+["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20658,],
+["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20658,],
 ["features.messages.impl.typing_TypingNotificationView_Day_7_en","features.messages.impl.typing_TypingNotificationView_Night_7_en",0,],
 ["features.messages.impl.typing_TypingNotificationView_Day_8_en","features.messages.impl.typing_TypingNotificationView_Night_8_en",0,],
 ["libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en",0,],
-["libraries.matrix.ui.components_UnresolvedUserRow_en","",20532,],
+["libraries.matrix.ui.components_UnresolvedUserRow_en","",20658,],
 ["libraries.designsystem.components.avatar.internal_UserAvatarColors_Day_0_en","libraries.designsystem.components.avatar.internal_UserAvatarColors_Night_0_en",0,],
-["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20532,],
-["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20532,],
-["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20532,],
-["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20532,],
+["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20658,],
+["features.startchat.impl.components_UserListView_Day_0_en","features.startchat.impl.components_UserListView_Night_0_en",20658,],
+["features.startchat.impl.components_UserListView_Day_1_en","features.startchat.impl.components_UserListView_Night_1_en",20658,],
+["features.startchat.impl.components_UserListView_Day_2_en","features.startchat.impl.components_UserListView_Night_2_en",20658,],
 ["features.startchat.impl.components_UserListView_Day_3_en","features.startchat.impl.components_UserListView_Night_3_en",0,],
 ["features.startchat.impl.components_UserListView_Day_4_en","features.startchat.impl.components_UserListView_Night_4_en",0,],
 ["features.startchat.impl.components_UserListView_Day_5_en","features.startchat.impl.components_UserListView_Night_5_en",0,],
 ["features.startchat.impl.components_UserListView_Day_6_en","features.startchat.impl.components_UserListView_Night_6_en",0,],
-["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20532,],
+["features.startchat.impl.components_UserListView_Day_7_en","features.startchat.impl.components_UserListView_Night_7_en",20658,],
 ["features.startchat.impl.components_UserListView_Day_8_en","features.startchat.impl.components_UserListView_Night_8_en",0,],
-["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20532,],
+["features.startchat.impl.components_UserListView_Day_9_en","features.startchat.impl.components_UserListView_Night_9_en",20658,],
 ["features.preferences.impl.user_UserPreferences_Day_0_en","features.preferences.impl.user_UserPreferences_Night_0_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_1_en","features.preferences.impl.user_UserPreferences_Night_1_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_2_en","features.preferences.impl.user_UserPreferences_Night_2_en",0,],
-["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20532,],
-["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20532,],
-["features.userprofile.shared_UserProfileMainActionsSection_Day_0_en","features.userprofile.shared_UserProfileMainActionsSection_Night_0_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20532,],
-["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20532,],
+["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20658,],
+["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20658,],
+["features.userprofile.shared_UserProfileMainActionsSection_Day_0_en","features.userprofile.shared_UserProfileMainActionsSection_Night_0_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20658,],
+["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20658,],
+["features.preferences.impl.userstatus_UserStatusView_Day_0_en","features.preferences.impl.userstatus_UserStatusView_Night_0_en",0,],
+["features.preferences.impl.userstatus_UserStatusView_Day_1_en","features.preferences.impl.userstatus_UserStatusView_Night_1_en",0,],
+["features.preferences.impl.userstatus_UserStatusView_Day_2_en","features.preferences.impl.userstatus_UserStatusView_Night_2_en",0,],
+["features.preferences.impl.userstatus_UserStatusView_Day_3_en","features.preferences.impl.userstatus_UserStatusView_Night_3_en",0,],
+["features.preferences.impl.userstatus_UserStatusView_Day_4_en","features.preferences.impl.userstatus_UserStatusView_Night_4_en",0,],
+["features.preferences.impl.userstatus_UserStatusView_Day_5_en","features.preferences.impl.userstatus_UserStatusView_Night_5_en",20658,],
+["features.preferences.impl.userstatus_UserStatusView_Day_6_en","features.preferences.impl.userstatus_UserStatusView_Night_6_en",20658,],
 ["features.verifysession.impl.ui_VerificationUserProfileContent_Day_0_en","features.verifysession.impl.ui_VerificationUserProfileContent_Night_0_en",0,],
 ["libraries.designsystem.ruler_VerticalRuler_Day_0_en","libraries.designsystem.ruler_VerticalRuler_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en",0,],
-["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20532,],
-["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20532,],
+["features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en","features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en",20658,],
+["features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en","features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en",20658,],
 ["features.viewfolder.impl.file_ViewFileView_Day_0_en","features.viewfolder.impl.file_ViewFileView_Night_0_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_1_en","features.viewfolder.impl.file_ViewFileView_Night_1_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_2_en","features.viewfolder.impl.file_ViewFileView_Night_2_en",0,],
-["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20532,],
+["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20658,],
 ["features.viewfolder.impl.file_ViewFileView_Day_4_en","features.viewfolder.impl.file_ViewFileView_Night_4_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_5_en","features.viewfolder.impl.file_ViewFileView_Night_5_en",0,],
 ["features.viewfolder.impl.folder_ViewFolderView_Day_0_en","features.viewfolder.impl.folder_ViewFolderView_Night_0_en",0,],
 ["features.viewfolder.impl.folder_ViewFolderView_Day_1_en","features.viewfolder.impl.folder_ViewFolderView_Night_1_en",0,],
+["libraries.designsystem.components.visuallist_VisualListItem_Day_0_en","libraries.designsystem.components.visuallist_VisualListItem_Night_0_en",0,],
+["libraries.designsystem.components.visuallist_VisualList_Day_0_en","libraries.designsystem.components.visuallist_VisualList_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_0_en","libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_1_en","libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_1_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_2_en","libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_2_en",0,],
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt
index 92f79da7f9..81add882a5 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt
@@ -7,9 +7,12 @@
 
 package io.element.android.services.analytics.api
 
+import androidx.annotation.Discouraged
+
 /**
  * Represents an analytics span in the Rust SDK.
  */
+@Discouraged("This component can cause crashes of the app when using debug builds of the Rust SDK.")
 interface AnalyticsSdkSpan {
     /** Enters the span and starts collecting metrics. */
     fun enter()
diff --git a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
index 8c29f11197..846d5ce5b1 100644
--- a/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
+++ b/services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
@@ -8,6 +8,7 @@
 
 package io.element.android.services.analytics.api
 
+import androidx.annotation.Discouraged
 import io.element.android.services.analyticsproviders.api.AnalyticsProvider
 import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
 import io.element.android.services.analyticsproviders.api.trackers.AnalyticsTracker
@@ -74,6 +75,7 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
     fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
 
     /** Enter a span inside the Rust SDK tracing system. If a [parentTraceId] is provided, the SDK trace will be added as a child of that trace. */
+    @Discouraged("This method can cause crashes of the app when using debug builds of the Rust SDK.")
     fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan
 }
 
@@ -116,6 +118,7 @@ fun AnalyticsService.finishLongRunningTransaction(
     } ?: false
 }
 
+@Discouraged("This method can cause crashes of the app when using debug builds of the Rust SDK.")
 inline fun <T> AnalyticsService.inBridgeSdkSpan(parentTraceId: String?, block: (AnalyticsSdkSpan) -> T): T {
     val span = enterSdkSpan(name = null, parentTraceId = parentTraceId)
     return try {
diff --git a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
index e596bc35a5..8659fc9634 100644
--- a/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
+++ b/services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/watchers/DefaultAnalyticsColdStartWatcher.kt
@@ -56,8 +56,9 @@ class DefaultAnalyticsColdStartWatcher(
 
     override fun onRoomListVisible() {
         if (isColdStart.getAndSet(false)) {
-            Timber.d("Room list is visible, finishing cold start check")
-            analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStart)
+            analyticsService.finishLongRunningTransaction(AnalyticsLongRunningTransaction.ColdStart) {
+                Timber.d("Room list is visible, finishing cold start check after ${it.duration}")
+            }
         }
     }
 }
diff --git a/services/analyticsproviders/sentry/build.gradle.kts b/services/analyticsproviders/sentry/build.gradle.kts
index 02dde35ef4..3350df864b 100644
--- a/services/analyticsproviders/sentry/build.gradle.kts
+++ b/services/analyticsproviders/sentry/build.gradle.kts
@@ -50,6 +50,8 @@ setupDependencyInjection()
 
 dependencies {
     implementation(libs.sentry)
+    implementation(libs.coroutines.core)
+    implementation(libs.androidx.annotationjvm)
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
     implementation(projects.libraries.matrix.api)
diff --git a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt
index 0843c97a78..4e4f08b632 100644
--- a/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt
+++ b/services/analyticsproviders/sentry/src/main/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProvider.kt
@@ -33,7 +33,6 @@ import io.sentry.Sentry
 import io.sentry.SentryOptions
 import io.sentry.android.core.SentryAndroid
 import io.sentry.protocol.SentryTransaction
-import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 
 @ContributesIntoSet(AppScope::class)
@@ -132,7 +131,7 @@ class SentryAnalyticsProvider(
         if (sessionId != null) {
             // This runs in a separate thread, so although using `runBlocking` is not great, at least it shouldn't freeze the app
             // Also, the method is fairly quick, so the blocking shouldn't take longer than a few ms
-            val databaseSizes = runBlocking { getDatabaseSizesUseCase(sessionId) }.getOrNull()
+            val databaseSizes = getDatabaseSizesUseCase(sessionId).getOrNull()
 
             databaseSizes?.stateStore?.let { transaction.setExtra(AnalyticsUserData.STATE_STORE_SIZE, it.into(ByteUnit.MB)) }
             databaseSizes?.eventCacheStore?.let { transaction.setExtra(AnalyticsUserData.EVENT_CACHE_SIZE, it.into(ByteUnit.MB)) }
diff --git a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
index a8dc9f3086..ae1ac82dda 100644
--- a/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
+++ b/services/analyticsproviders/sentry/src/test/kotlin/io/element/android/services/analyticsproviders/sentry/SentryAnalyticsProviderTest.kt
@@ -9,7 +9,6 @@
 
 package io.element.android.services.analyticsproviders.sentry
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.itf.VectorAnalyticsEvent
@@ -27,15 +26,14 @@ import io.element.android.services.analyticsproviders.api.AnalyticsUserData
 import io.element.android.services.appnavstate.api.AppNavigationState
 import io.element.android.services.appnavstate.api.NavigationState
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
+import io.element.android.tests.testutils.robolectric.RobolectricTest
 import io.sentry.Sentry
 import io.sentry.SentryTracer
 import io.sentry.protocol.SentryId
 import io.sentry.protocol.SentryTransaction
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
-class SentryAnalyticsProviderTest {
+class SentryAnalyticsProviderTest : RobolectricTest() {
     @Test
     fun `init enables Sentry if DSN is present`() {
         createSentryAnalyticsProvider().run {
diff --git a/services/apperror/api/build.gradle.kts b/services/apperror/api/build.gradle.kts
index c0893bd7e8..62d3501655 100644
--- a/services/apperror/api/build.gradle.kts
+++ b/services/apperror/api/build.gradle.kts
@@ -16,4 +16,5 @@ android {
 
 dependencies {
     implementation(libs.coroutines.core)
+    implementation(projects.libraries.designsystem)
 }
diff --git a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorView.kt
similarity index 86%
rename from services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt
rename to services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorView.kt
index 3794234c79..5a2a5110f5 100644
--- a/services/apperror/impl/src/main/kotlin/io/element/android/services/apperror/impl/AppErrorView.kt
+++ b/services/apperror/api/src/main/kotlin/io/element/android/services/apperror/api/AppErrorView.kt
@@ -6,14 +6,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.services.apperror.impl
+package io.element.android.services.apperror.api
 
 import androidx.compose.runtime.Composable
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.services.apperror.api.AppErrorState
-import io.element.android.services.apperror.api.aAppErrorState
 
 @Composable
 fun AppErrorView(
diff --git a/services/apperror/impl/build.gradle.kts b/services/apperror/impl/build.gradle.kts
index b72b54c198..75440dc5a3 100644
--- a/services/apperror/impl/build.gradle.kts
+++ b/services/apperror/impl/build.gradle.kts
@@ -10,7 +10,7 @@ import extension.testCommonDependencies
  */
 
 plugins {
-    id("io.element.android-compose-library")
+    id("io.element.android-library")
 }
 
 setupDependencyInjection()
@@ -22,8 +22,6 @@ android {
 dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.di)
-    implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.uiStrings)
     implementation(projects.services.toolbox.api)
 
     implementation(libs.coroutines.core)
diff --git a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppForegroundStateService.kt b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppForegroundStateService.kt
index d6effec06f..33c2ee133b 100644
--- a/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppForegroundStateService.kt
+++ b/services/appnavstate/api/src/main/kotlin/io/element/android/services/appnavstate/api/AppForegroundStateService.kt
@@ -34,6 +34,8 @@ interface AppForegroundStateService {
      */
     val isSyncingNotificationEvent: StateFlow<Boolean>
 
+    val isSharingLiveLocation: StateFlow<Boolean>
+
     /**
      * Start observing the foreground state.
      */
@@ -53,4 +55,6 @@ interface AppForegroundStateService {
      * Update the active state for the syncing notification event flow.
      */
     fun updateIsSyncingNotificationEvent(isSyncingNotificationEvent: Boolean)
+
+    fun updateIsSharingLiveLocation(isSharingLiveLocation: Boolean)
 }
diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppForegroundStateService.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppForegroundStateService.kt
index c9fa31caca..9dd37af732 100644
--- a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppForegroundStateService.kt
+++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppForegroundStateService.kt
@@ -20,6 +20,8 @@ class DefaultAppForegroundStateService : AppForegroundStateService {
     override val isSyncingNotificationEvent = MutableStateFlow(false)
     override val hasRingingCall = MutableStateFlow(false)
 
+    override val isSharingLiveLocation = MutableStateFlow<Boolean>(false)
+
     private val appLifecycle: Lifecycle by lazy { ProcessLifecycleOwner.get().lifecycle }
 
     override fun startObservingForeground() {
@@ -38,6 +40,10 @@ class DefaultAppForegroundStateService : AppForegroundStateService {
         this.isSyncingNotificationEvent.value = isSyncingNotificationEvent
     }
 
+    override fun updateIsSharingLiveLocation(isSharingLiveLocation: Boolean) {
+        this.isSharingLiveLocation.value = isSharingLiveLocation
+    }
+
     private val lifecycleObserver = LifecycleEventObserver { _, _ -> isInForeground.value = getCurrentState() }
 
     private fun getCurrentState(): Boolean = appLifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)
diff --git a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeActiveRoomsHolder.kt b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeActiveRoomsHolder.kt
new file mode 100644
index 0000000000..7561932fc2
--- /dev/null
+++ b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeActiveRoomsHolder.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.services.appnavstate.test
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.services.appnavstate.api.ActiveRoomsHolder
+
+class FakeActiveRoomsHolder : ActiveRoomsHolder {
+    private var room: JoinedRoom? = null
+
+    override fun addRoom(room: JoinedRoom) {
+        this.room = room
+    }
+
+    override fun getActiveRoom(sessionId: SessionId): JoinedRoom? {
+        return room
+    }
+
+    override fun getActiveRoomMatching(sessionId: SessionId, roomId: RoomId): JoinedRoom? {
+        return null
+    }
+
+    override fun removeRoom(sessionId: SessionId, roomId: RoomId) {
+        room = null
+    }
+
+    override fun clear(sessionId: SessionId) {
+    }
+}
diff --git a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppForegroundStateService.kt b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppForegroundStateService.kt
index a61733cc22..9174b92684 100644
--- a/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppForegroundStateService.kt
+++ b/services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/FakeAppForegroundStateService.kt
@@ -16,12 +16,15 @@ class FakeAppForegroundStateService(
     initialIsInCallValue: Boolean = false,
     initialIsSyncingNotificationEventValue: Boolean = false,
     initialHasRingingCall: Boolean = false,
+    initialIsSharingLiveLocation: Boolean = false,
 ) : AppForegroundStateService {
     override val isInForeground = MutableStateFlow(initialForegroundValue)
     override val isInCall = MutableStateFlow(initialIsInCallValue)
     override val isSyncingNotificationEvent = MutableStateFlow(initialIsSyncingNotificationEventValue)
     override val hasRingingCall = MutableStateFlow(initialHasRingingCall)
 
+    override val isSharingLiveLocation = MutableStateFlow<Boolean>(initialIsSharingLiveLocation)
+
     override fun startObservingForeground() {
         // No-op
     }
@@ -41,4 +44,8 @@ class FakeAppForegroundStateService(
     override fun updateHasRingingCall(hasRingingCall: Boolean) {
         this.hasRingingCall.value = hasRingingCall
     }
+
+    override fun updateIsSharingLiveLocation(isSharingLiveLocation: Boolean) {
+        this.isSharingLiveLocation.value = isSharingLiveLocation
+    }
 }
diff --git a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/strings/StringProvider.kt b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/strings/StringProvider.kt
index 9a8ff23eb5..4570e09921 100644
--- a/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/strings/StringProvider.kt
+++ b/services/toolbox/api/src/main/kotlin/io/element/android/services/toolbox/api/strings/StringProvider.kt
@@ -34,5 +34,30 @@ interface StringProvider {
      * stripped of styled text information.
      */
     fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String
+
+    /**
+     * Returns a localized formatted string from the application's package's
+     * default string table, substituting the format arguments as defined in
+     * [java.util.Formatter] and [java.lang.String.format], based on the given quantity.
+     */
     fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String
+
+    /**
+     * Similar to [getQuantityString] but with separate resource ids for singular and plural values.
+     * Useful when we want to use different strings for singular and plural forms but not mentioning the actual quantity in the string.
+     * In this case, we cannot use getQuantityString, because some locales have more than two plural forms, and require the quantity to
+     * be part of the resulting strings.
+     * @param resIdForOne Resource id for the case when [quantity] is 1.
+     * @param resIdForOthers Resource id for the other cases ([quantity] is not 1).
+     * @param quantity The quantity to determine whether to use singular or plural form. Must be greater than or equal to 1.
+     * @param formatArgs The format arguments that will be used for substitution in the resulting string. Will be applied to either
+     * the singular or plural string depending on the quantity.
+     * @return The localized string corresponding to the given quantity.
+     */
+    fun getSimpleQuantityString(
+        @StringRes resIdForOne: Int,
+        @StringRes resIdForOthers: Int,
+        quantity: Int,
+        vararg formatArgs: Any?,
+    ): String
 }
diff --git a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt
index b095348c41..b0e14c1db9 100644
--- a/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt
+++ b/services/toolbox/impl/src/main/kotlin/io/element/android/services/toolbox/impl/strings/AndroidStringProvider.kt
@@ -28,4 +28,14 @@ class AndroidStringProvider(private val resources: Resources) : StringProvider {
     override fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {
         return resources.getQuantityString(resId, quantity, *formatArgs)
     }
+
+    override fun getSimpleQuantityString(
+        resIdForOne: Int,
+        resIdForOthers: Int,
+        quantity: Int,
+        vararg formatArgs: Any?,
+    ): String {
+        val resId = if (quantity == 1) resIdForOne else resIdForOthers
+        return resources.getString(resId, *formatArgs)
+    }
 }
diff --git a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/strings/FakeStringProvider.kt b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/strings/FakeStringProvider.kt
index c2867dca3b..0412a8a03a 100644
--- a/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/strings/FakeStringProvider.kt
+++ b/services/toolbox/test/src/main/kotlin/io/element/android/services/toolbox/test/strings/FakeStringProvider.kt
@@ -28,4 +28,14 @@ class FakeStringProvider(
         lastResIdParam = resId
         return defaultResult + " ($quantity) " + formatArgs.joinToString()
     }
+
+    override fun getSimpleQuantityString(
+        resIdForOne: Int,
+        resIdForOthers: Int,
+        quantity: Int,
+        vararg formatArgs: Any?,
+    ): String {
+        lastResIdParam = if (quantity == 1) resIdForOne else resIdForOthers
+        return defaultResult + " ($quantity) " + formatArgs.joinToString()
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c7b608465..db03a32f18 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,6 +21,8 @@ dependencyResolutionManagement {
             url = uri("https://www.jitpack.io")
             content {
                 includeModule("com.github.matrix-org", "matrix-analytics-events")
+                // Required transitively by androidx.media3:media3-exoplayer-midi for MIDI playback.
+                includeModule("com.github.philburk", "jsyn")
             }
         }
         google()
diff --git a/tests/konsist/build.gradle.kts b/tests/konsist/build.gradle.kts
index 5558b1a564..ccd354db89 100644
--- a/tests/konsist/build.gradle.kts
+++ b/tests/konsist/build.gradle.kts
@@ -29,6 +29,11 @@ dependencies {
 // - Add every single module as a dependency of this one.
 // - Move the Konsist tests to the `app` module, but the `app` module does not need to know about Konsist.
 tasks.withType<Test>().configureEach {
+    // Disable parallel tests: every time we run a test class in parallel a new JVM is started, and the `KoScope` contents can't be shared between them.
+    // This scope can take 1-2min to load, so having several instances of this happening is a terrible idea.
+    // It's actually faster to run the tests sequentially, at least locally.
+    maxParallelForks = 1
+
     val isNotCheckTask = gradle.startParameter.taskNames.any { it.contains("check", ignoreCase = true).not() }
     outputs.upToDateWhen { isNotCheckTask }
 }
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistArchitectureTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistArchitectureTest.kt
index fe303f360c..c0e62482fa 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistArchitectureTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistArchitectureTest.kt
@@ -34,6 +34,7 @@ class KonsistArchitectureTest {
             .classes()
             .withNameEndingWith("State")
             .withoutName(
+                "NoopContentValidationState",
                 "CameraPositionState",
                 "CustomSheetState",
             )
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index 631def9f75..93b3200acc 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -140,7 +140,10 @@ class KonsistClassNameTest {
         Konsist.scopeFromProject()
             .classes()
             .withNameEndingWith("Impl")
-            .withoutName("MediaUploadHandlerImpl")
+            .withoutName(
+                "MediaUploadHandlerImpl",
+                "GalleryMediaUploadHandlerImpl",
+            )
             .assertEmpty(additionalMessage = "Class implementing interface should have name not end with 'Impl' but start with 'Default'")
     }
 
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFieldTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFieldTest.kt
deleted file mode 100644
index bfbe76d358..0000000000
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistFieldTest.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2025 Element Creations Ltd.
- * Copyright 2023-2025 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.tests.konsist
-
-import com.lemonappdev.konsist.api.Konsist
-import com.lemonappdev.konsist.api.ext.list.properties
-import com.lemonappdev.konsist.api.verify.assertFalse
-import org.junit.Test
-
-class KonsistFieldTest {
-    @Test
-    fun `no field should have 'm' prefix`() {
-        Konsist
-            .scopeFromProject()
-            .classes()
-            .properties()
-            .assertFalse {
-                val secondCharacterIsUppercase = it.name.getOrNull(1)?.isUpperCase() ?: false
-                it.name.startsWith('m') && secondCharacterIsUppercase
-            }
-    }
-}
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistLicenseTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistLicenseTest.kt
index f47621da0e..e7f82292a4 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistLicenseTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistLicenseTest.kt
@@ -48,6 +48,7 @@ class KonsistLicenseTest {
             .files
             .filter {
                 it.moduleName.startsWith("enterprise").not() &&
+                    it.moduleName != "libraries/rustls-tls" &&
                     it.nameWithExtension != "locales.kt" &&
                     it.name.startsWith("Template ").not()
             }
@@ -78,6 +79,7 @@ class KonsistLicenseTest {
             .scopeFromProject()
             .files
             .filter {
+                it.moduleName.endsWith("rustls-tls").not() &&
                 it.nameWithExtension != "locales.kt" &&
                 it.nameWithExtension != "KonsistLicenseTest.kt" &&
                     it.name.startsWith("Template ").not()
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistParameterNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistParameterNameTest.kt
index f202148464..752acb2864 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistParameterNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistParameterNameTest.kt
@@ -19,7 +19,7 @@ class KonsistParameterNameTest {
         Konsist.scopeFromProject()
             .functions()
             .withParameter { parameter ->
-                parameter.name.endsWith("Press")
+                parameter.name.endsWith("Press") && !parameter.name.endsWith("LongPress")
             }
             .assertEmpty(additionalMessage = "Please rename the parameter, for instance from 'onBackPress' to 'onBackClick'.")
     }
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
index ff05970ca4..e2a387eede 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt
@@ -11,6 +11,7 @@ package io.element.android.tests.konsist
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import com.google.common.truth.Truth.assertThat
 import com.lemonappdev.konsist.api.Konsist
+import com.lemonappdev.konsist.api.declaration.KoFunctionDeclaration
 import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
 import com.lemonappdev.konsist.api.ext.list.withName
 import com.lemonappdev.konsist.api.ext.list.withNameEndingWith
@@ -30,7 +31,8 @@ class KonsistPreviewTest {
             .assertTrue {
                 it.hasNameEndingWith("Preview") &&
                     it.hasNameEndingWith("LightPreview").not() &&
-                    it.hasNameEndingWith("DarkPreview").not()
+                    it.hasNameEndingWith("DarkPreview").not() &&
+                    it.hasNameEndingWith("BlackPreview").not()
             }
     }
 
@@ -60,6 +62,8 @@ class KonsistPreviewTest {
             .scopeFromProject()
             .functions()
             .withAllAnnotationsOf(PreviewsDayNight::class)
+            // We can't check Enterprise previews because they are in a different repo, and they aren't present for FOSS
+            .withoutEnterpriseFunctions()
             .assertTrue {
                 it.text.contains("ElementPreview") ||
                     it.text.contains("ElementTimelineItemPreview")
@@ -86,6 +90,7 @@ class KonsistPreviewTest {
         "BackgroundVerticalGradientDisabledPreview",
         "BackgroundVerticalGradientPreview",
         "ColorAliasesPreview",
+        "EmojiItemWithPopupPreview",
         "FocusedEventPreview",
         "GradientFloatingActionButtonCircleShapePreview",
         "HeaderFooterPageScrollablePreview",
@@ -143,22 +148,36 @@ class KonsistPreviewTest {
         "TextComposerVoiceNotEncryptedPreview",
         "TextComposerVoicePreview",
         "TextFieldDialogWithErrorPreview",
-        "TimelineImageWithCaptionRowPreview",
+        "TimelineItemAttachmentsViewScanningContentFailedPreview",
+        "TimelineItemAudioViewScanningContentPreview",
         "TimelineItemEventRowForDirectRoomPreview",
         "TimelineItemEventRowShieldPreview",
         "TimelineItemEventRowTimestampPreview",
         "TimelineItemEventRowUtdPreview",
+        "TimelineItemEventRowWithGalleryPreview",
         "TimelineItemEventRowWithManyReactionsPreview",
         "TimelineItemEventRowWithRRPreview",
         "TimelineItemEventRowWithReplyPreview",
         "TimelineItemEventRowWithThreadSummaryPreview",
+        "TimelineItemFileViewScanningContentPreview",
+        "TimelineItemGalleryViewScanningContentFailedPreview",
         "TimelineItemGroupedEventsRowContentCollapsePreview",
         "TimelineItemGroupedEventsRowContentExpandedPreview",
         "TimelineItemImageViewHideMediaContentPreview",
+        "TimelineItemImageViewScanningContentPreview",
+        "TimelineItemRedactedMessagesGroupPreview",
+        "TimelineItemScanningContentFailedPreview",
+        "TimelineItemScanningContentNotFoundPreview",
+        "TimelineItemScanningContentWithInvalidRepliesPreview",
+        "TimelineItemScanningContentWithRepliesFailedPreview",
+        "TimelineItemStickerViewScanningContentPreview",
         "TimelineItemVideoViewHideMediaContentPreview",
+        "TimelineItemVideoViewScanningContentPreview",
+        "TimelineItemVoiceViewScanningContentPreview",
         "TimelineItemVoiceViewUnifiedPreview",
-        "TimelineVideoWithCaptionRowPreview",
         "TimelineViewMessageShieldPreview",
+        "TimelineViewWithReadMarkerBothIndicatorsPreview",
+        "TimelineViewWithReadMarkerJumpToUnreadIndicatorOnlyPreview",
         "UserAvatarColorsPreview",
         "UserProfileHeaderSectionWithVerificationViolationPreview",
         "VoiceItemViewPlayPreview",
@@ -171,7 +190,8 @@ class KonsistPreviewTest {
 
     @Test
     fun `previewNameExceptions only contains existing functions`() {
-        val names = previewNameExceptions.toMutableSet()
+        val names = previewNameExceptions
+            .toMutableSet()
         Konsist
             .scopeFromProject()
             .functions()
@@ -192,6 +212,8 @@ class KonsistPreviewTest {
             .functions()
             .withAllAnnotationsOf(PreviewsDayNight::class)
             .withoutName(previewNameExceptions)
+            // We can't check Enterprise previews because they are in a different repo, and they aren't present for FOSS
+            .withoutEnterpriseFunctions()
             .assertTrue(
                 additionalMessage = "Functions for Preview should be named like this: <ViewUnderPreview>Preview. " +
                     "Exception can be added to the test, for multiple Previews of the same view",
@@ -219,3 +241,7 @@ class KonsistPreviewTest {
             )
     }
 }
+
+private fun List<KoFunctionDeclaration>.withoutEnterpriseFunctions() = filter { function ->
+    function.packagee?.hasNameStartingWith("io.element.android.enterprise") != true
+}
diff --git a/tests/testutils/build.gradle.kts b/tests/testutils/build.gradle.kts
index 4acb06305f..848777464c 100644
--- a/tests/testutils/build.gradle.kts
+++ b/tests/testutils/build.gradle.kts
@@ -20,6 +20,7 @@ android {
 dependencies {
     implementation(libs.test.junit)
     implementation(libs.test.truth)
+    implementation(libs.test.robolectric)
     implementation(libs.coroutines.test)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureNeverCalled.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureNeverCalled.kt
index 7c3d4ec600..f910285b52 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureNeverCalled.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureNeverCalled.kt
@@ -45,3 +45,9 @@ class EnsureNeverCalledWithThreeParams<T, U, V> : (T, U, V) -> Unit {
         lambdaError("Should not be called and is called with $p1, $p2 and $p3")
     }
 }
+
+class EnsureNeverCalledWithThreeParamsAndResult<T, U, V, R> : (T, U, V) -> R {
+    override fun invoke(p1: T, p2: U, p3: V): R {
+        lambdaError("Should not be called and is called with $p1, $p2 and $p3")
+    }
+}
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt
index 75d91c4a88..93df350c44 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/InstrumentationStringProvider.kt
@@ -24,4 +24,9 @@ class InstrumentationStringProvider : StringProvider {
     override fun getQuantityString(resId: Int, quantity: Int, vararg formatArgs: Any?): String {
         return resource.getQuantityString(resId, quantity, *formatArgs)
     }
+
+    override fun getSimpleQuantityString(resIdForOne: Int, resIdForOthers: Int, quantity: Int, vararg formatArgs: Any?): String {
+        val resId = if (quantity == 1) resIdForOne else resIdForOthers
+        return resource.getString(resId, *formatArgs)
+    }
 }
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/RobolectricDispatcherCleaner.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/RobolectricDispatcherCleaner.kt
index 12cfe44b44..d7ce9e2d28 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/RobolectricDispatcherCleaner.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/RobolectricDispatcherCleaner.kt
@@ -6,15 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.tests.testutils
 
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import io.element.android.libraries.designsystem.utils.LocalUiTestMode
 import org.junit.Assert.assertFalse
-import org.junit.rules.TestRule
 import kotlin.coroutines.CoroutineContext
 
 object RobolectricDispatcherCleaner {
@@ -52,7 +54,7 @@ object RobolectricDispatcherCleaner {
     }
 }
 
-fun <R : TestRule, A : ComponentActivity> AndroidComposeTestRule<R, A>.setSafeContent(
+fun AndroidComposeUiTest<ComponentActivity>.setSafeContent(
     clearAndroidUiDispatcher: Boolean = false,
     content: @Composable () -> Unit,
 ) {
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
index 6502882d7d..232116b385 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
@@ -6,12 +6,17 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+@file:OptIn(ExperimentalTestApi::class)
+
 package io.element.android.tests.testutils
 
 import androidx.activity.ComponentActivity
 import androidx.annotation.StringRes
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasClickAction
 import androidx.compose.ui.test.hasContentDescription
@@ -26,17 +31,25 @@ import org.junit.rules.TestRule
 
 val trueMatcher = SemanticsMatcher("true matcher") { true }
 
-fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.clickOn(
+fun AndroidComposeUiTest<ComponentActivity>.clickOn(
     @StringRes res: Int,
     inDialog: Boolean = false,
 ) {
-    val text = activity.getString(res)
+    val text = activity!!.getString(res)
     onNode(
         hasText(text) and hasClickAction() and if (inDialog) hasAnyAncestor(isDialog()) else trueMatcher
     )
         .performClick()
 }
 
+/**
+ * Press the back button in the app bar.
+ */
+fun AndroidComposeUiTest<ComponentActivity>.pressBack() {
+    val text = activity!!.getString(CommonStrings.action_back)
+    onNode(hasContentDescription(text)).performClick()
+}
+
 /**
  * Press the back button in the app bar.
  */
@@ -45,6 +58,13 @@ fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.pressBack() {
     onNode(hasContentDescription(text)).performClick()
 }
 
+/**
+ * Press the back key.
+ */
+fun AndroidComposeUiTest<ComponentActivity>.pressBackKey() {
+    activity!!.onBackPressedDispatcher.onBackPressed()
+}
+
 /**
  * Press the back key.
  */
@@ -56,7 +76,12 @@ fun SemanticsNodeInteractionsProvider.pressTag(tag: String) {
     onNode(hasTestTag(tag)).performClick()
 }
 
-fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.assertNoNodeWithText(@StringRes res: Int) {
-    val text = activity.getString(res)
+fun AndroidComposeUiTest<ComponentActivity>.assertNoNodeWithText(@StringRes res: Int) {
+    val text = activity!!.getString(res)
     onNodeWithText(text).assertDoesNotExist()
 }
+
+fun AndroidComposeUiTest<ComponentActivity>.assertNodeWithTextIsDisplayed(@StringRes res: Int) {
+    val text = activity!!.getString(res)
+    onNodeWithText(text).assertIsDisplayed()
+}
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTest.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTest.kt
new file mode 100644
index 0000000000..cf5f584f7e
--- /dev/null
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTest.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.tests.testutils.robolectric
+
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/**
+ * Base class for all Robolectric tests.
+ *
+ * It is now configured to run by default on Android API 36,
+ * waiting for Robolectric to support API 37.
+ */
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [36])
+open class RobolectricTest
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTestParameter.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTestParameter.kt
new file mode 100644
index 0000000000..e8866d5685
--- /dev/null
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/robolectric/RobolectricTestParameter.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.tests.testutils.robolectric
+
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestParameterInjector
+import org.robolectric.annotation.Config
+
+/**
+ * Base class for all Robolectric tests with parameter injector.
+ *
+ * It is now configured to run by default on Android API 36,
+ * waiting for Robolectric to support API 37.
+ */
+@RunWith(RobolectricTestParameterInjector::class)
+@Config(sdk = [36])
+open class RobolectricTestParameter
diff --git a/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
index 0b088b5de0..971783cd63 100644
--- a/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
+++ b/tests/uitests/src/test/kotlin/base/ScreenshotTest.kt
@@ -22,8 +22,12 @@ import app.cash.paparazzi.DeviceConfig
 import app.cash.paparazzi.Paparazzi
 import app.cash.paparazzi.RenderExtension
 import app.cash.paparazzi.TestName
+import com.android.resources.Density.DEFAULT_DENSITY
 import com.android.resources.NightMode
+import com.android.resources.ScreenOrientation
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.matrix.ui.media.contentvalidation.LocalEventContentValidationState
+import io.element.android.libraries.matrix.ui.media.contentvalidation.NoopEventContentValidationCache
 import sergio.sastre.composable.preview.scanner.android.AndroidPreviewInfo
 import sergio.sastre.composable.preview.scanner.core.preview.ComposablePreview
 import java.util.Locale
@@ -41,17 +45,19 @@ object ScreenshotTest {
         Locale.setDefault(locale)
 
         paparazzi.fixScreenshotName(preview, localeStr)
+
         paparazzi.snapshot {
             CompositionLocalProvider(
                 LocalInspectionMode provides true,
                 LocalDensity provides Density(
                     density = LocalDensity.current.density,
-                    fontScale = 1.0f,
+                    fontScale = preview.previewInfo.fontScale,
                 ),
                 LocalConfiguration provides Configuration().apply {
                     setLocales(LocaleList(locale))
                     uiMode = preview.previewInfo.uiMode
                 },
+                LocalEventContentValidationState provides NoopEventContentValidationCache(),
             ) {
                 ElementTheme {
                     Box(
@@ -120,17 +126,22 @@ object PaparazziPreviewRule {
         deviceConfig: DeviceConfig = ScreenshotTest.defaultDeviceConfig,
         renderExtensions: Set<RenderExtension> = setOf(),
     ): Paparazzi {
-        val densityScale = deviceConfig.density.dpiValue / 160f
+        val densityScale = deviceConfig.density.dpiValue.toFloat() / DEFAULT_DENSITY
+        val customScreenWidth = preview.previewInfo.widthDp.takeIf { it >= 0 }?.let { it * densityScale }?.toInt()
         val customScreenHeight = preview.previewInfo.heightDp.takeIf { it >= 0 }?.let { it * densityScale }?.toInt()
+        val isLandscape = preview.previewInfo.device.contains("landscape")
         return Paparazzi(
             deviceConfig = deviceConfig.copy(
+                screenWidth = customScreenWidth ?: deviceConfig.screenWidth,
+                screenHeight = customScreenHeight ?: deviceConfig.screenHeight,
                 nightMode = when (preview.previewInfo.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) {
                     true -> NightMode.NIGHT
                     false -> NightMode.NOTNIGHT
                 },
                 locale = locale,
                 softButtons = false,
-                screenHeight = customScreenHeight ?: deviceConfig.screenHeight,
+                orientation = if (isLandscape) ScreenOrientation.LANDSCAPE else ScreenOrientation.PORTRAIT,
+                fontScale = preview.previewInfo.fontScale,
             ),
             maxPercentDifference = 0.01,
             renderExtensions = renderExtensions,
diff --git a/tests/uitests/src/test/kotlin/ui/LayoutLibErrorFilterStatement.kt b/tests/uitests/src/test/kotlin/ui/LayoutLibErrorFilterStatement.kt
new file mode 100644
index 0000000000..9f91f30816
--- /dev/null
+++ b/tests/uitests/src/test/kotlin/ui/LayoutLibErrorFilterStatement.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package ui
+
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Workaround for Paparazzi 2.0.0-alpha05 / LayoutLib 16.2.1 bug where
+ * HandlerThread_Delegate calls Thread.setPosixNicenessInternal which doesn't exist on JVM.
+ * Tracked in https://github.com/cashapp/paparazzi/issues/2342 — fixed in layoutlib 16.2.3.
+ * Remove this workaround once Paparazzi ships with layoutlib >= 16.2.3.
+ *
+ * Paparazzi's PaparazziLogger collects background thread errors and re-throws them via
+ * assertNoErrors(). This Statement wrapper catches the known NoSuchMethodError so the test
+ * can pass despite the LayoutLib bug.
+ */
+class LayoutLibErrorFilterStatement : TestRule {
+    override fun apply(base: Statement, description: Description): Statement {
+        return object : Statement() {
+            @Throws(Throwable::class)
+            override fun evaluate() {
+                try {
+                    base.evaluate()
+                } catch (e: NoSuchMethodError) {
+                    if (e.message?.contains("setPosixNicenessInternal") != true) throw e
+                } catch (npe: NullPointerException) {
+                    // Also catch this error on `HorizontalFloatingToolbarPreview` and `HorizontalFloatingToolbarNoFabPreview`
+                    if (npe.message?.contains("""Cannot invoke "java.util.ArrayList.size()" because "childrenList" is null""") != true) throw npe
+                }
+            }
+        }
+    }
+}
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt b/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
index 6f8fe2f506..f420110f31 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewA11yTest.kt
@@ -29,7 +29,10 @@ class PreviewA11yTest(
     @TestParameter(valuesProvider = ComposableA11yPreviewProvider::class)
     val preview: ComposablePreview<AndroidPreviewInfo>,
 ) {
-    @get:Rule
+    @get:Rule(order = 0)
+    val layoutLibErrorFilterStatement = LayoutLibErrorFilterStatement()
+
+    @get:Rule(order = 1)
     val paparazziRule = PaparazziPreviewRule.createFor(
         preview = preview,
         locale = "en",
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
index efb1a82cba..17632c212d 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard1Test.kt
@@ -28,7 +28,10 @@ class PreviewShard1Test(
     @TestParameter(valuesProvider = Shard1ComposablePreviewProvider::class)
     val preview: ComposablePreview<AndroidPreviewInfo>,
 ) {
-    @get:Rule
+    @get:Rule(order = 0)
+    val layoutLibErrorFilterStatement = LayoutLibErrorFilterStatement()
+
+    @get:Rule(order = 1)
     val paparazziRule = PaparazziPreviewRule.createFor(preview, locale = "en")
 
     @Test
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
index c3312bad3b..cec2b028ac 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard2Test.kt
@@ -28,7 +28,10 @@ class PreviewShard2Test(
     @TestParameter(valuesProvider = Shard2ComposablePreviewProvider::class)
     val preview: ComposablePreview<AndroidPreviewInfo>,
 ) {
-    @get:Rule
+    @get:Rule(order = 0)
+    val layoutLibErrorFilterStatement = LayoutLibErrorFilterStatement()
+
+    @get:Rule(order = 1)
     val paparazziRule = PaparazziPreviewRule.createFor(preview, locale = "en")
 
     @Test
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
index d4508fb821..c752d0b321 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard3Test.kt
@@ -28,7 +28,10 @@ class PreviewShard3Test(
     @TestParameter(valuesProvider = Shard3ComposablePreviewProvider::class)
     val preview: ComposablePreview<AndroidPreviewInfo>,
 ) {
-    @get:Rule
+    @get:Rule(order = 0)
+    val layoutLibErrorFilterStatement = LayoutLibErrorFilterStatement()
+
+    @get:Rule(order = 1)
     val paparazziRule = PaparazziPreviewRule.createFor(preview, locale = "en")
 
     @Test
diff --git a/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt b/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
index c0e3b807b7..55881de079 100644
--- a/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
+++ b/tests/uitests/src/test/kotlin/ui/PreviewShard4Test.kt
@@ -28,7 +28,10 @@ class PreviewShard4Test(
     @TestParameter(valuesProvider = Shard4ComposablePreviewProvider::class)
     val preview: ComposablePreview<AndroidPreviewInfo>,
 ) {
-    @get:Rule
+    @get:Rule(order = 0)
+    val layoutLibErrorFilterStatement = LayoutLibErrorFilterStatement()
+
+    @get:Rule(order = 1)
     val paparazziRule = PaparazziPreviewRule.createFor(preview, locale = "en")
 
     @Test
diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_4_en.png
new file mode 100644
index 0000000000..5adfe35003
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:965cd4692e88a413e5e0a83e16a190386e8f199716fdd7288f4e05b8c623a8b2
+size 33756
diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_5_en.png
new file mode 100644
index 0000000000..bf9aed6830
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:771c01d4563687aff208b0f279c9fb98192b0cd2b2ba56d43627f6c785e92b90
+size 32956
diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_4_en.png
new file mode 100644
index 0000000000..75fdd8172d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f2d01f11bcca2ba3465b6308f7368797c6fd9712bf90f4e9493b30dbece8277
+size 31907
diff --git a/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_5_en.png
new file mode 100644
index 0000000000..28fd0cfc21
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/appnav.loggedin_LoggedInView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:484173d52fcb0acff42f62d28f88cd544e205bde49370ccc8230c30b193e1959
+size 31173
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png
index 8ab5f8a44a..559c023aa7 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d225730fee6fae0d93396a6c47dcd7abd86ba8902ac521c96e05fa36f619bbd
-size 25840
+oid sha256:ba67fa9a541371f84cdc16dcc0c069e0cfda486c2b21dbb885cee7e0d9b6b005
+size 26924
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png
index e2037ca626..788daaf8df 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f27f94a461f5b4bc5289ac41691e3736a73ddcbb9e1f2a1d0c9390a0ce5cb44b
-size 27919
+oid sha256:00f8ec369fa64c6bbd97b37a5b53481438e74abdb5d366d32e3acae29460659c
+size 29075
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png
index 9df8fe1585..6ac6642b35 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:708a157d8a7cb5da2b2ea52c12f9b10c172ec380dfcec09583adfe2ea4af3d74
-size 24610
+oid sha256:0a38ade8b9a5e3ce85fbe63ae76d2e856ac46c6cdc012a4952cb191fcbe8979f
+size 25577
diff --git a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png
index 00e1659da8..5451e763d5 100644
--- a/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/appnav.root_RootView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:260ea7d9f891afdea78a6d546138cbad7586fe2210058d3774d549c9918c2ccd
-size 26529
+oid sha256:1ae9d78458ea0b9d4b258be0620698abb699bcbc70275d98adfd992d8d50ec59
+size 27541
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en.png
index b1cdddd1f8..6c79d26f2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:449c07469b107a598ffbaaeaa930dc241a1706312b3a6a29fa77763a595259d2
-size 22118
+oid sha256:e8c7f586a1b8910608ba6ba901eef916b8c38e847dc81794b5bfc9add309212a
+size 21990
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en.png
index 63fb55cdcd..645b6e3e13 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b525a67f606797b724e42d79584b5c009ba5ef5dfcfbc021d3ae20eedc773080
-size 18349
+oid sha256:45ebd24e0d99af06a52f5ed28612ad503bbc21319b5f5653daf90bfb14788294
+size 18218
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en.png
index bce9dad828..c5ce753a6b 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58bc951d97f1fe3034c78d65e1b338c1f001df85b748d15ad2744b35111a8e2f
-size 20878
+oid sha256:55b00fc31fe9e9f44c2cb2c46cb66e31e8e4f91fa987d09420d1d2ce4d57342d
+size 20898
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en.png
index 4b22aad74e..cbb74018ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b79b9cf687d2de94f45e7131bb9862e23a96780f140f50a0a1bf6fe9c6a2ee4
-size 17283
+oid sha256:0eae3d32d4208a9959a9a7e7ac733d273722003af13ea7c59337f2b8289a4bb2
+size 17319
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png
index cf887d2057..de47dcabf4 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44caa90be72f8ff87f5e7c9a4fa7ff18254e09e0ff8086b6cd69c6c4827f3b1a
-size 82510
+oid sha256:58f84b7eb0039b81f7bf1a879042095ecbd99412d48cdd8072df1486ca9d78a5
+size 81677
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_1_en.png
index e4710507e8..7329a2e799 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5657c3ce5c5928c082fde832939637cb6201d8299d31360df160a37ed70eab90
-size 81391
+oid sha256:e7f402ad83c4032217f22048b59de363ab1a1a19c1c4fb81ec8fd3402698c4d8
+size 79607
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png
index b241662e21..7419f8df30 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6cbfa0e9218e49009e13af0d2ebffc826770f17745b6b22c18a6650bc817391
-size 75776
+oid sha256:08c97bcb1ad81d7aab93c619bebaac4ec9ca860b2e71ae2648ebfab41cbdeca8
+size 74832
diff --git a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_1_en.png
index 9533025b72..b15f5ca22e 100644
--- a/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.analytics.impl_AnalyticsOptInView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a1cbb9cd3f47cfb7710cf50718e9987e2479d61b006e45a4d8fd005b963df93
-size 73987
+oid sha256:fa8c26e98e9cefb8e33902615f5b18c1931e0816d4a047715ef6cad2229b10dc
+size 72245
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_0_en.png
new file mode 100644
index 0000000000..1b6fb4bab8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96a867cb12498cbdc97957bee07855dfaa13602baddaf933aff2b666ef4c7650
+size 3642
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_en.png
new file mode 100644
index 0000000000..05fa99ba62
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33e4ea9bc6269d6ac5ce7ff6a76cdd1011e0f3dff96b920714b7f97d1aa1bf12
+size 62540
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_0_en.png
new file mode 100644
index 0000000000..d6fd8eeb70
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bb36ccd718f3fec5b04f1bc812dc7718b5ea7fa4619c8b031466297a8d016fd
+size 3659
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_1_en.png
new file mode 100644
index 0000000000..77cac5fc57
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.announcement.impl.fullscreen_FullscreenAnnouncementView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e0406e368a19e1bc445b70c3b14128ed7c8bc02bd0e5da9c53611714e627a05
+size 61706
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en.png
deleted file mode 100644
index d8b961c49b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:219cb8f4e6eb3231b70758b3e749ea035ef46178520e7133659d378f8399f153
-size 59974
diff --git a/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en.png
deleted file mode 100644
index d0a711bd4c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.announcement.impl.spaces_SpaceAnnouncementView_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71085b7d41122d58311cfac1b0660d36b76b364253e0a5053456ad4a1a91c3dc
-size 58788
diff --git a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png
index b5e7419267..b45afb67bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48fa7b1415694f0a7ebb3de458edee8792f5643f681cc25627560f2e3d8ba491
-size 16331
+oid sha256:49731638f35e9c7583ece7122e3690728f3d4183a65e2e49cd270d02fb93ac70
+size 15950
diff --git a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png
index 1c8ce2991d..14fd900451 100644
--- a/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.call.impl.ui_CallScreenView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebf559265b2cd4ebba7c5439b759365ed8d31532988bda5d8c76bb7c8d76dd68
-size 14892
+oid sha256:11a77776662896532ef2999e3b90aa93b3459bf9b7a5f461c06ccb3743612aab
+size 14738
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png
index 13a1a88a4c..7d2eb3802f 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf9aa6f47084124e7c774ae78bc98404d960805bb1338784f3641251e33ac7c6
-size 29426
+oid sha256:f6eab283d68f0665e8f2440ca6bbf28be81aa6e05cdbecba8ba3bd25d156c39e
+size 28811
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png
index 2e3058ac63..8a1ccf243b 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d40447ece02c06d429d52138550c73e559f89dfd99f6dff7a92cfc3103f2dbe
-size 34093
+oid sha256:768236582fdd9dd6b5d47ef07aa8012c868cd20e088bb0fae6cb7ac31f48f825
+size 33916
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png
index a581a42dfd..7b8acf97b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:654d8e0acd3b3bbfb856414b5e5ca5615f3febacd8bebaa9af5a1e4d96c5d035
-size 41543
+oid sha256:f5f0104589a04033362967c35c178679be41495023c4e8d805963fc029c85c97
+size 41077
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png
index 33c4f82363..d8e8cbf4ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea98589cd86e69ae6d57566b205b4dab70f5f4b5c8b0fee09c7e690cafa7f914
-size 42514
+oid sha256:ad30892b0048bc25e6ca453e39ff41f62c5778a0822e4a9b217bfbe37e357496
+size 42066
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png
index 7600487323..7b4ef034f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37ffab3c3805f0bdafaca9035af6e4f706286f45a05a761ba7e7c160d45463c1
-size 44226
+oid sha256:edc28162aefdb6f67d7d0a3ab47b21154feb7f475ad37db308441aeec038bfab
+size 43773
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png
index a581a42dfd..7b8acf97b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:654d8e0acd3b3bbfb856414b5e5ca5615f3febacd8bebaa9af5a1e4d96c5d035
-size 41543
+oid sha256:f5f0104589a04033362967c35c178679be41495023c4e8d805963fc029c85c97
+size 41077
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en.png
index 05a54538a4..6d642b316b 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c20f293ba37e9af3e9f045de2ff1746af5e265d5dcf5bce5dc396da5c29387a6
-size 42482
+oid sha256:546428cfa1a64bd9ff21b6ac6df60767767872d831036acaada91058b038ef21
+size 42046
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en.png
index 5ff5af29b1..e22cdef4ef 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fea7e63fd1d31db6500c4b110b9c05190da7b7201e1029177f8b5a61e728e100
-size 37458
+oid sha256:7c2eb3358fbcdefbc1dfdf7faf2c0f63002a54b6b44011723d01a2f857ac6236
+size 36903
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en.png
index e51dd98b4f..7f3b7eb4f9 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edc093b514b7e648d176a17b0c368fbed82e9c46d3f584fdb9c6094a6e5aba55
-size 40420
+oid sha256:6dde01d87247739630285247d0a642eb0e14ce728b49f466b39c50bde81e0cdf
+size 39514
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png
index 4dd2b02ce3..cecdbb82ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e4dfa9c766681c750383863450aff0052f3083d495fcea1be74446ceed1cc4b
-size 30462
+oid sha256:ceb4402440bb956a8c1f6c7224c8b0e895651de7e6ca4f15e6e0d7e216f397bf
+size 29864
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png
index 79155ebbfd..bf1b9fedf2 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49309d3b55bf7a4313ab100d54f2d13b741b5bace7fec7d03e8e30765d8e100b
-size 35329
+oid sha256:d72f23869b29a5d9c7993443795785350251eba495df062adb4c0612b42b0a7c
+size 35262
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png
index 5baf7f75b8..2604908cbd 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea38acc7ef6fb8307b83453eae80ec7c3154a80d0591c4f1fc1a87aa581a7926
-size 43124
+oid sha256:629c2c1d830ef1afcb07d5b633a91b9a776a2112e1731183d44033d6ff4ed00f
+size 42798
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png
index 920269d44d..81341995b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fd71e26763fb648a7b6ac898f2b354056354d1deee3d3712786a0c36e0cf476
-size 44168
+oid sha256:13c6d5a6a47b77bfa58c88cf2cf468debf8c4f1b40194bfb705e981be770eaf1
+size 43858
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png
index 65bd6527c1..658e6be5b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d355371ce78c9a78900a6d76899289844c687b794c2afe127580a7c50b25935
-size 45949
+oid sha256:444800a03628241725a962f7c40a8807bd756fa8f615e10577d4412899cfa74b
+size 45663
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png
index 5baf7f75b8..2604908cbd 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea38acc7ef6fb8307b83453eae80ec7c3154a80d0591c4f1fc1a87aa581a7926
-size 43124
+oid sha256:629c2c1d830ef1afcb07d5b633a91b9a776a2112e1731183d44033d6ff4ed00f
+size 42798
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en.png
index 875f4a71a3..286faada56 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c73b89404caa0fda5233c7dfed5810276a5cb1c1efd5843484b80c7f859b99a
-size 44209
+oid sha256:a8442460c022c1b4d8081fca23a9b6d70b0bac96810619de5fc57c141fcc76ed
+size 43884
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en.png
index 27b3f41f26..f4dd48ad86 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:005c6520e884641ca1ca4e1248627937806328fc4ae527b811c65ee933a5616e
-size 38889
+oid sha256:efdc694c1db28b7535f77ea63fb07e622f5861ced3fb1870e56423cc8a5acf71
+size 38403
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en.png
index c29181ca85..f751e292cc 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fac6f85109de1b6beb4cff51a91dec8e34ed8ed50820829b63584226e611d5d
-size 42064
+oid sha256:a14129b063873056a02ea2ca0e106b92e70ef1b140f254a22ba93a1f3201dfa1
+size 41154
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en.png
index bb0f9f27c8..31f52bcadf 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74d0d16d8ca722625e8dc729705bcb46ad012d6fc697fedfbe939d5f04cc6aa2
-size 25356
+oid sha256:d6d94a22d60b496f6cf2df617aad08495dc3951fb9ccdf8db700454fe61f3b43
+size 25453
diff --git a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en.png
index 3ec5e87c5f..2df57544ae 100644
--- a/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.createroom.impl.configureroom_SelectParentSpaceBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcfd9bf65ee0ac3c4509eee17c0a1932781978b12f374964e0279b93728d087d
-size 24819
+oid sha256:1486b365029b44eb985725adb236afd5eca2a5e72886b0ad2d4d7d3a15d3c9c8
+size 24750
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
index 934cf82e03..c6103fdd16 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:501543b209eb2f4a28d0368ae49ef9703a6dff8af67194412b3efe51ea140146
-size 41455
+oid sha256:1da296f6409e018bf6e36d4bf8d0183327e2da1730008721476397a3398a2e13
+size 41382
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_2_en.png
index adab865ffd..cc54eeeef0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:152c46640d6bef83fb6c2950a9f54e81314fbe912133cd852f53392ff87dde2f
-size 13749
+oid sha256:b3fdd076498f0a2cc41104b6098005a9418e7eb16863e6c9040e0a49d6dc3922
+size 13739
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
index 273750675e..1f93f01826 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:422607aface1a2f436431ea431111f5a003cf75e4eac4d2e27687b45e10c0c05
-size 59476
+oid sha256:7456163ece98c73691a5147e3c7b183189a545389699bb9fe33a8ce68bb125e3
+size 59685
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
index d05a334223..73c8da0c71 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8f87cd003427ebc919ccf0a5679849eddb210231257d1c78af202ff761425cd
-size 41145
+oid sha256:bbfb4004f0c9b017a86096d9a45c1793ef32d5117f6a17c59a41920264e95399
+size 41099
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_2_en.png
index fa444dd818..bbca53db2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac359458a55030fda5714e1e513fd5e45a837df48f6234c6d61fcd3c783e4b76
-size 13310
+oid sha256:7afac8b6173f573544b987363e1ecf5fe2251ac23182128bcf2c27e290253dc2
+size 13319
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
index a80c52a517..f293dd7cfd 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b56cf113f934b6e882a21e25596cfba606fdbc7cab1853bf37d365f192d47908
-size 58581
+oid sha256:683568f509c83c24f506924e7a715f6ff9530d3f6ae28e041436288a510785cf
+size 58742
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png
new file mode 100644
index 0000000000..473fd3f275
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26071a6b16f4446526f6abf28274580eb0f385bd0e74f4f2b0479da5f5d4f6f2
+size 12914
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png
new file mode 100644
index 0000000000..14c08f0b62
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ddef7c50d6a791c6a32bae8506a999b198bc601b70b6ffb5e5e7a8d5a2f1543
+size 12869
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_0_en.png
new file mode 100644
index 0000000000..203c950423
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4739a2af7edbcee37c1d0d568ab701e4f6d46dcd8d50a326f6aa0403c632271
+size 23912
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_1_en.png
new file mode 100644
index 0000000000..d107812a40
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2699fdbde0b82a22c1955946afce1ef33da7c56653c30beaa2743e4becb9b212
+size 23799
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_2_en.png
new file mode 100644
index 0000000000..9a850795cb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:512620de41fd3ce49cf4275982d5f30de2d6de224cdcabb5767afab8687918de
+size 25856
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_0_en.png
new file mode 100644
index 0000000000..886f4611c9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d680e9989168e0fe25bb41f97c074fb3adddb166c620a06c1675e303f67299a3
+size 22086
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_1_en.png
new file mode 100644
index 0000000000..f21401bcce
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb46a663675e6f439d65199cece8453340d6191ba55068cfcd6a00063ed2d7e3
+size 21993
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_2_en.png
new file mode 100644
index 0000000000..43045a8f55
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListContextMenu_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1c1c34117cf6c519c1aae87246a44155b175799a036baf258c479a54f916b2d
+size 23933
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en.png
deleted file mode 100644
index 70e3f6ae06..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22e3dce5359ba6dd21bd1c17e4421b8341c51809843394c95a3d80db7a235309
-size 25774
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en.png
deleted file mode 100644
index ddea584902..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenuContent_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:671a0a0ce5571cb460fba789b58ec1e38b63b26ba61c1daeb5cccb986eb424b4
-size 24768
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_en.png
new file mode 100644
index 0000000000..686013e622
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a58c642983f209f2c4bb01ee0239c11edab299f48129800cbd41fe7a9032ad4
+size 26854
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_en.png
new file mode 100644
index 0000000000..278dfc4ae5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43837ff4703be9631370b56097bd36006bce98d23f17db629742c957ce945e5a
+size 42390
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_en.png
new file mode 100644
index 0000000000..63a523b4ae
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b3025b589185d8d276bd3a809d8d94700268be1aec951fd02ff37072cef4998
+size 27431
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_0_en.png
new file mode 100644
index 0000000000..d6392b8c0f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d7acb04225299d448edf35ad1f420ceafcabc7759a8f7d94ce11eca70781f79
+size 25339
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_1_en.png
new file mode 100644
index 0000000000..bf799e5042
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56b210d5d8dc06de139735ca34f2b5a4e5e7d0db395dc2dbe7b1c9d479d8858d
+size 40405
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_2_en.png
new file mode 100644
index 0000000000..27a4cd57b0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListDeclineInviteMenu_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ff47c937641549f63948d114510644aad02723a55e752587a1037752a2b3972
+size 25966
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en.png
deleted file mode 100644
index 9b17990dbe..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a81e2f9d2c3834004b49b925025478b886c065a12dc850f1c42733e457630b97
-size 22442
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en.png
deleted file mode 100644
index 5b45fb30de..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3348885402696e4b8005740a452384223f60a64c524c32713cfbd9b3041e494
-size 22297
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en.png
deleted file mode 100644
index 1ec1abe309..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1a54d3171418082d8bdf442bb34c6b149e2707963f88dd7ea7cbff401534fc0
-size 23856
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en.png
deleted file mode 100644
index e5a42fb07f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ea756319eeb2d9ab6ad2425498a7a9902acada24c3ab359f880b5934f2511e5
-size 21384
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en.png
deleted file mode 100644
index 2388eb323d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c75bbb8425fa4b01f9d0d9398d93785f2a149f4abb820dadbfadf17bf4a6673e
-size 21077
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en.png
deleted file mode 100644
index 356ee32526..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.roomlist_RoomListModalBottomSheetContent_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99defb3eb8530142a74c083d4f4ec2e592d465b3d2cf869e1710031ad6a805c9
-size 23136
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_0_en.png
index 54f8482510..81deb50d77 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d12f0060a972296de175c7e8ea7900e3710366cb97a5a9b58065f456ddb201ba
-size 32062
+oid sha256:720bc9c24ee9e17a79ff9588420558b9c57ac0e50c39ec2729bd1974fbd2187f
+size 31947
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_1_en.png
index 1a19b6d735..28c72b6ca2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1edcd2abb480c46a6c10369fe05ba6e7764b0fe4f94690239dba36b4e13989ff
-size 18465
+oid sha256:62d389c95049ac094d227083eeeddf36d82654e5f84a2fb92e9a62ec72db23e6
+size 18357
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_0_en.png
index 08c65d9bc7..e361719a8b 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b3d3a5a7255368a0722a024ae72b8f864556e9da5dfd6204b8cea3504bd22a9
-size 30645
+oid sha256:19fffb5f139f9b0af134eb108b0b19238010a18ae32e87ae673b8b1aa8f6d246
+size 30488
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_1_en.png
index 168113e84c..4ca69dee85 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spacefilters_SpaceFiltersView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8a451f8da02325bf3dd0815fa2fb76d55fb7baaa4e602b82339bd79f22bfb9a
-size 17497
+oid sha256:28d6a11ab288b0750b6eef0e1f2488d4a150aebb5dd3184a66c4af14f3685c71
+size 17340
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
index 526bd69d4e..c69cba2125 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35c1709b912da1102a50aaa4f8470cbf05a75b03669aec51b90354ccb2b09ba9
-size 85336
+oid sha256:09c0613d19abd7673223bc5eac12b4e87c73e66e7ff9d437c5f97ae8bcaf9303
+size 85239
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
index de86c4285d..bd9fa30de2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d69d687090971ab7e9b87f959521109fbed48413ef217e1be3da8d7d985038b
-size 38751
+oid sha256:df0dc04b3946a58dda5c3499d965ab23cd3c172eedcb8a23461201c2aca95934
+size 38713
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_2_en.png
index de86c4285d..03d7d97186 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d69d687090971ab7e9b87f959521109fbed48413ef217e1be3da8d7d985038b
-size 38751
+oid sha256:ecd79d3f8c4efbb54efa6a5b8dee79274ae9957b01146025dab42a45fc328fc0
+size 24740
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_3_en.png
deleted file mode 100644
index 03d7d97186..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ecd79d3f8c4efbb54efa6a5b8dee79274ae9957b01146025dab42a45fc328fc0
-size 24740
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
index 0b5629c139..8ec9b1585e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f60372df2ed22a4c52624e16324f7da1f6000eafdd519f84d42a29acec016ee
-size 83600
+oid sha256:e28f120a919db7c7a0ced5ca0d56239197785a0ecfbd37af0c5dacb5f8316c1f
+size 83583
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
index 07e9ef1e28..72e173c493 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2a6a7f3188eb9635ade7c0bbc2239257cfbe3166f4a6fb7917a1e5578f51d9e
-size 37436
+oid sha256:cc37ee6efade5947d0fdc25f6925cf45ba55442eb3fb715f942178513a00e8fc
+size 37416
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_2_en.png
index 07e9ef1e28..049aa93a8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2a6a7f3188eb9635ade7c0bbc2239257cfbe3166f4a6fb7917a1e5578f51d9e
-size 37436
+oid sha256:0fd37517b8913e2bac3275f717aa15bed18055a7525e0404b25b43cb8bd8422d
+size 23840
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_3_en.png
deleted file mode 100644
index 049aa93a8a..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fd37517b8913e2bac3275f717aa15bed18055a7525e0404b25b43cb8bd8422d
-size 23840
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
index 1bec9cf123..344bd350d6 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f2357a181fcea22deb153e4d4c570421354cbc74f3e272a6e94c7795cf29c4c
-size 144183
+oid sha256:b5dde8ed5c776f4701f24dd7d411dd78f48adab261efad71e961c845e24d12f3
+size 144367
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
index 3a262e8d47..b5f80f2faf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
-size 67756
+oid sha256:8247dedc9811f2b325568973a2b714cd4b46322bcd0bf89af0e662518fa77747
+size 67694
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
index 6eed7b2e94..f2a69ea475 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2339985aba8128dd562491d6575b92338be2338c090d978f553a1e50b44b24f6
-size 32073
+oid sha256:6b493bc5151f15d6ba91bfb0c27b41f3abcf13ee7d511aa59db171cecdbd95f3
+size 31958
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
index 4feecf5107..f4dff45422 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8c5c2fed11674afda7ec3a838d749a4f688a2979f934970d2b2d3ff7a837f89
-size 94736
+oid sha256:1a33681fe064d5e12f53273bfd9262af8c7b902e237cb8d0641573b0645e291c
+size 94687
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
index da72b71928..bdad242551 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b54ba16e7e2413dd994bedcc31e5ffdf6c291487ccc5ae17178d2572a4fb0ea
-size 87282
+oid sha256:022954bdca89572b74bc70f6d91820e99eef8826409c0a06e6145a5c3ec8eaf4
+size 87268
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
index 3a262e8d47..b5f80f2faf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
-size 67756
+oid sha256:8247dedc9811f2b325568973a2b714cd4b46322bcd0bf89af0e662518fa77747
+size 67694
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
index 3a262e8d47..b5f80f2faf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
-size 67756
+oid sha256:8247dedc9811f2b325568973a2b714cd4b46322bcd0bf89af0e662518fa77747
+size 67694
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
index 5c05d6e633..e01335907a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69fd2195c4d0203b602ba91b822c5e9dc0e902b77dcf1352daabaf91aaea1768
-size 65301
+oid sha256:25e5ac35ddf79fdc78c21dbd031f506da04caac7bdd53f279c88fd4574f72a82
+size 64644
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
index c33ecadd3d..fe41a54fcc 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e64f044d19a709056de64976c6902baba7821885f35cd88873d5462fd52c3e4c
-size 57343
+oid sha256:8c1245da0a4cf56aba8e102e7f297996ed58fc8c50165288dea11ca86fbc0dcc
+size 57235
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
index 3a262e8d47..b5f80f2faf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96ce82255e49c97179a216124ccfcbc6726a8053acef767041ba44304e7f4735
-size 67756
+oid sha256:8247dedc9811f2b325568973a2b714cd4b46322bcd0bf89af0e662518fa77747
+size 67694
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
index 99940a4489..0894037dc4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e74b9b1819bf778ddb397a40113f71b2eb0ada0dcb26af85dab26bbc53ed079
-size 54210
+oid sha256:e389bce27c241cc13f60c247fea578fa4cd1ecc7448c9bf3ac3af1179e693216
+size 54701
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
index 2532044b27..c4630c3e45 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4e56509b4f10e97283d25432edd7be4b511987f0879acc3026ac16dab25b75c
-size 54012
+oid sha256:5d56802b3e6dd21b20c4e92d47d9b880085f499feac855a46af601a5eb0bfc2f
+size 54510
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
index 0baf9cf023..ce7b5ea699 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe76cc652842cce967d975fae7a387f5cff118153b345bda452d5dbc618b22f8
-size 52255
+oid sha256:ef1246daff44b29ee4c2b50538a3a948c2593749c70e15e053b8258a377c5756
+size 52745
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
index 36b337448b..b6779aca93 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcd14b5720ecc9a80f6f2cc7133d6c8695096b9c90d3504380464c46c91048c8
-size 87131
+oid sha256:0769e243dc60de52c16df23a86eb62167bb60cb756d113f88b9b476c025e402b
+size 87117
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
index 63ff6e0ae9..fe171e26b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
-size 62676
+oid sha256:8a7b2a6ccb43dc572140e2ce658967cd273d1122bf0216269a648920099a68d0
+size 62572
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
index ad828b778a..f36b5c2f83 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14d762574470814f5b37cc05a2167d546f92460bd016206e71ba43026d00f9cc
-size 26743
+oid sha256:6c3fb8ae530989e5a6d6e4193fbac4d4356af34076b684b782a0f8fec31226f1
+size 26657
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
index 5af2cae9e7..48b07fc9bd 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41252714e511c1c63b43edd35c2f443a7a791a2b2f29885efc1f2384764edac3
-size 88578
+oid sha256:5d302be6dbaef08b501f4f33d3e01338e068767702a7018bd5bb24ade6eee2cb
+size 88558
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
index 280257f53d..5cb7d766cd 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e841a58c50c98444bcc48316654ee5c664cf845e3c38f4bd02e80ce8d3c9366
-size 81261
+oid sha256:6be5cd35eec917bf1c96d03079df8235d0bc7b52159f54c8a177a64f648e58c2
+size 81212
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
index 63ff6e0ae9..fe171e26b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
-size 62676
+oid sha256:8a7b2a6ccb43dc572140e2ce658967cd273d1122bf0216269a648920099a68d0
+size 62572
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
index 63ff6e0ae9..fe171e26b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
-size 62676
+oid sha256:8a7b2a6ccb43dc572140e2ce658967cd273d1122bf0216269a648920099a68d0
+size 62572
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
index a709ce6a75..89c4934dd9 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c10e44c82a7412fd51a651a69b9c643a7b1eafcc4251227009e44a47e9649bb5
-size 60656
+oid sha256:8172ca867a8c2e827ead36a22cefe967a5b57c69cae6d5aca1c941e4dd2ba16f
+size 60160
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
index c2dc739e38..390c9f6818 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d923c6e3503af723269dbe5c03f1024e7e3fb6ba746fb979f7735c0ad3b8e32
-size 52322
+oid sha256:13740b4fc4cbd24075606e45bf070a8fbb762d298857bc071399def91dda7175
+size 52189
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
index 63ff6e0ae9..fe171e26b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8518ca0e40ddff8b8f8cd1960a5cc8c4419a7f7381459f2bca782df80cb0094
-size 62676
+oid sha256:8a7b2a6ccb43dc572140e2ce658967cd273d1122bf0216269a648920099a68d0
+size 62572
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
index ead9ed0d6d..0950a6881e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2d17c9021392f93fc022ce0ba4305f0739acaeab3ebfd51b7d3294ace365807
-size 51156
+oid sha256:842d5e0a5cc1102a2e320b43ea5ffda6cf63e94acdbf42adc39edaa1fb355812
+size 51742
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
index 33f2b46a34..b29ccd3a11 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:286af36457c34621e10b91226b13c5a9fde77af6b63827d39a0a95697972d4ab
-size 50896
+oid sha256:82b75ce20a535cf1062c4b3ad86d08dc9044cf58d8035a5fdc68c48119157aae
+size 51477
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
index 733a66bb38..1b1e2edb98 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34a5fe14ee5ede42d962e657e4338f58f56e79e0f9a3f65ba24e37810a9c1250
-size 49205
+oid sha256:9bde8e9c5618ffc2b3019ce10db6fca44e4f23f3b987c222b7e838beb0dcb488
+size 49749
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
index a408245bae..1092dcd1b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b09c1c639b12b0521da9e4b403530d4bd33f6e79823903091870fba56477153
-size 81113
+oid sha256:bce0bc8590037705369735e83e576f0818f4528298b4b2face999c8802f855b9
+size 81081
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png
index bc93c4c316..a0ab0a2192 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95096ef9f55d57ea4774f8eaa91d92a01fd44eafd4670442d3db132ff843ede0
-size 21476
+oid sha256:62fee8e8966ff4df0d951aff1d13e8578c9c5a55e89c4407dcc8077c9b1b72af
+size 22249
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png
index d1c7598599..cce585fe3f 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b53f36378be4b4da2608210cb3134923c6f4bf565652c80a1b45cad8216d67da
-size 25485
+oid sha256:d3226560d55a9fde8175206c0ce21cb4cd90d900d357003496bf74b719281166
+size 26191
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png
index 54a3c425c1..6a278db2b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d549ca3000080a6d0c416d7a45d530da96c73184309048126be6304393bc74f9
-size 20082
+oid sha256:643f712799406118deb87af3fab34e8838878dc04e0935b4e54dafaaebd03479
+size 20895
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png
index 341bcca1a6..2b09d75bc9 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a61181eab30d30f56c5407bb42395a268ff80f7dd455ea04a468f92739e0a87f
-size 24194
+oid sha256:c2638b57f0f4ab1876429f096065d121122eaca0b9b06600281526dbf51d7791
+size 24843
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png
index e5e44ac954..f13a226074 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a223141e779ee6bd301e81dce129482275e5c4b52c4a9c9a32d528b306c1085
-size 32829
+oid sha256:cd743f58369fade101be3ff19ce0664b36b6144aa1983207dd0d3dcb80505f1d
+size 32637
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png
index ed1732dfc9..be2f400625 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8f8cc3e8ace247b45ecd3fbb642b638e1c8331e1c3d468b633fb20b9ab0ed6e
-size 37640
+oid sha256:d444171f25fcdb8e9b54ef8336a675a72360d9441c1efa73abeabc99818a64e5
+size 37404
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png
index a563739260..d63b6239d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b232debfb92c2591ad527b623dce2e8bd016c67f0369521f80b92790a4908d47
-size 33026
+oid sha256:0cad7840ce675bdaf24bc1891f579939213bb948f1a79530498b7cae5b3ba0e3
+size 32775
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png
index 00294db240..d793169c5f 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e148e67d31bb016e4a93469306c14a27e0c96156f89a223be6c9614bd7a1a5ef
-size 29882
+oid sha256:91a4203d7f5c0208f4d4c91cf7f7629e9119e0f0f923d0f30072ee888d2ca808
+size 29880
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png
index 9fc1544d6e..32346386ca 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:898f8f403f90e59cde88f07ccbf13ee15994996e877224ff853f22a13f6d9293
-size 34310
+oid sha256:c071220ed6ea68843ff7c9b5bcd815be6c9a1be439f2fa896448cc09e09376fa
+size 35369
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png
index 41e8cf0b11..0b176fa798 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9deff4d926422191a2572589768128d9479adc50b741b803c320ae25ce26aecb
-size 31481
+oid sha256:ba43cfd279d4a6cfb5fc2e6693aa5586da1c3c276c038b05d62482cca4606840
+size 31221
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png
index eb42ac27de..159204673e 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64cdb3d9cf74c557989d16a2e7ea9dc3534616a5470df8b1f511e541fe2b1409
-size 36088
+oid sha256:b57a073a480319df55c1109f775645c75d8bc899dd6c32c67a2c8111383cbab4
+size 35741
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png
index 1825517041..c7835214c5 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57b0249e9e6669a6ea592058a7c606f7cd127c927bccf33f167c745298d239e7
-size 31596
+oid sha256:cde30852bb9a8622515d19eeac4e05fce41e1b69c0d64c7d7a61b37b592f0197
+size 31284
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png
index 783a2460c6..3dbe9a5102 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6e7651c0e0ee202a7fe03faf3ea5c91e201b72979b87fc840f91e7d271d19fb
-size 28616
+oid sha256:e8925539930009f4a06c1d5ecb6fe0238273440af507987cc3d0cfafde6c994c
+size 28514
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png
index 146b0895e5..342c4dcd4f 100644
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a1829bef4e91622a6a4d0e5c6d566d51bd5dbfa6aa6531fd9dbb744ddd99a5b
-size 32137
+oid sha256:5ed6d2b34ad47c2daaaddaaa0f45fa44b710dc185b521c345aad3468bb5794e3
+size 33091
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_0_en.png
index b658085113..31e1e4049e 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:948478d8dd340d0cb5facf43af64d726587be6ebf07314b854cb562aab7a47e5
-size 37273
+oid sha256:673519b0fde86c46908d614cf116041c1bd27a81d5a87955febc33187398559b
+size 37304
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_10_en.png
new file mode 100644
index 0000000000..9a4dbeeee5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ec919634968a61656ff3668937cc49a6de659e265ca0e4a1a3c03533bbd9981
+size 54751
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_11_en.png
new file mode 100644
index 0000000000..35f633b3a1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:029b19808dd54b74ef30737242a10af31b80e579b313d001dd9fa377bc2cca58
+size 58319
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_1_en.png
index 52949fb4a2..ae37022419 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c81346eada72651d9400de736e56fc94330ffd014ab762a9abb1890bfab1f75
-size 50285
+oid sha256:6e77a040286b900514440d410ca2bf0ce826e0e1364ccae6e1c34d7f0204631d
+size 50615
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_9_en.png
index 52949fb4a2..ae37022419 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c81346eada72651d9400de736e56fc94330ffd014ab762a9abb1890bfab1f75
-size 50285
+oid sha256:6e77a040286b900514440d410ca2bf0ce826e0e1364ccae6e1c34d7f0204631d
+size 50615
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_0_en.png
index 6910d23bd0..e102a3934d 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:965946244a5a38f44fd34d4383448b3b92ce5481d2f992f7f72b69ded951c375
-size 37617
+oid sha256:06ab4c46d877199855b0901ec96adb74fe9ca3fc484c71a0fd472d388a7dafd0
+size 37518
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_10_en.png
new file mode 100644
index 0000000000..df970a313c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6855898359711e2d2bc80403e063ac8c51ad7e09bec9fae6ad5d765d9e3cd129
+size 52497
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_11_en.png
new file mode 100644
index 0000000000..1c50d23117
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eca54577cffddb66921623ede7ab39e017f5cd95e5049d6ad2763fa4f1f88ad4
+size 58133
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_1_en.png
index 5092d9cb3e..0a8f04940b 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:601916fd979efa36104cb252a76a523e25a86cdfdca1cbd4e6f35314ab977d26
-size 51358
+oid sha256:7aa0ca8af987ba61d12a52f8298ab344ef7f5464a1f33c55607e559919da5a31
+size 51764
diff --git a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_9_en.png
index 5092d9cb3e..0a8f04940b 100644
--- a/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.invitepeople.impl_InvitePeopleView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:601916fd979efa36104cb252a76a523e25a86cdfdca1cbd4e6f35314ab977d26
-size 51358
+oid sha256:7aa0ca8af987ba61d12a52f8298ab344ef7f5464a1f33c55607e559919da5a31
+size 51764
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
index 33110584a9..f0bfd0f2b4 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbdf9740221b82aaaf332c95e7299594f0b4fdd258b2e9c733133bdd4a01f692
-size 28378
+oid sha256:e82c6e4ff563e7ae870431528d9413ac915e16ca0151aa3c86ff5081bfc72478
+size 27563
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png
index d7e2d0a3f9..9a2a2a4a0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ccea3d95f047fffdada68e6ed02c359a552d5c2c2f6be488c96f759bc208f37
-size 52830
+oid sha256:1cb6be576055a020b5c5c6a996e5923490d6a36ad5ea8246cd6fca9707affda1
+size 52987
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
index 42ecbe8a68..438d96608d 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471abc7c54d0f90ad5a923bd21abbf0960bbb9cbbdb22313a779083baf61ab3f
-size 40671
+oid sha256:ae0b92a52a7f2c0533af7d7f0fbddc6497778e7c5dcedc3344a2ba60a6a948f8
+size 40439
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png
index e07bbc74b5..eead87f8f4 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f588a2d2299825159380a42df4acff302a8b50b7dbc3cb02e145b596ead20061
-size 51525
+oid sha256:7041e20c1d2b83b6ef199fda02f594c4406fb6061b1706d6530d36b3007bc582
+size 51574
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Day_0_en.png
index 2ba05b93f3..9845d87c24 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02c0097a56901f6a18065b7c666b2eb69ecfe76105a01f7b12ee2a17a3994374
-size 18533
+oid sha256:1bd83510626d7556e2e484730cd70ca9ee1a7256a3a10a0a6d75201fa3f46440
+size 18608
diff --git a/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Night_0_en.png
index 2a4fef5599..a2a0dbc4b3 100644
--- a/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.licenses.impl.details_DependenciesDetailsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1770ab8b9e7dce57b85b698c072567cfc36c2e2aff249c624c0a25d36343d215
-size 18287
+oid sha256:9471dcfd5548f4617988e14e31c55d0659b21f9cc8263e8a630fd8154c259ed9
+size 18321
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_en.png
new file mode 100644
index 0000000000..18b186ce98
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23d54e777c8c9ade84bec155e3aef42f5b1c13b98a23ea6ecbd956d0090b5ad3
+size 32186
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Night_0_en.png
new file mode 100644
index 0000000000..d1698e913f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.confirmation_CodeConfirmationView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bde248827b1c53b66c5ea7112af24cac43aea378266e3d7b7ad8a5fa2047258
+size 31261
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en.png
index b1fef99b4a..a83e8f7923 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b0acb8106154715ea852d54e6a8c06dec3ed367f14cd4a6eb7ea68baab11014
-size 43495
+oid sha256:3e6d5e199d232901dfddcfaf6d2821e0a9a7bf2b98db7dcfe4d8db40ba4176f4
+size 60579
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en.png
index 300ffa1122..51090926ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88609772b74d36b5bd1f0d192a6dd10e9c5c324e670b02932b6d2204c92cdfff
-size 42846
+oid sha256:aa0ea6f6fd6ed40abd3d6a1055a2f0d034208c518bd5841e5536cb9c83dd292d
+size 56366
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en.png
index 01618be617..4c26bd27c9 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8c70e27a0b88c40e6ea2a3e8b03ec3f5034eef8c25843f16677e75354eff1be
-size 42244
+oid sha256:80cc35d9eea08e8ce92a1025c3432f7e10821493896b1cd5156ae5382cdac14e
+size 58031
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en.png
index 638fb99be6..c59e81351c 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.desktop_DesktopNoticeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0b25c02e6c1c1d70e560c8d570d2a0224b2496ebcc1f782be03f247038a62f2
-size 40846
+oid sha256:9a3e89bd126e83ace147edacfa70b3ad8930d2485f3165f89e2b08ce7e94cf61
+size 53462
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_3_en.png
index 3832b8d087..ee619462ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe92b35b0fe2e5481eeb497f2ada1a639cb1a66f937b4245798edffea75b1f5c
-size 35932
+oid sha256:17c58ce74a1b198f8659636d180a98152bd66be212f381afd652f615bd847a7f
+size 28795
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_4_en.png
index 4821d3ab76..292e8f0ead 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f60e02e48d483fe8d6b2bdf46192ccc8911fad1e79c7ac1e0272824cc04d3d1c
-size 35648
+oid sha256:90e602edde377f866071ec78f391bb7cd0d9b59bec79be91d6a42108f604a32d
+size 35833
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_6_en.png
index 720026f561..6c9c87f774 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60333d74c8d940b32621defc5cdb3c3776b2980c137244dd34304365ee9ff447
-size 24158
+oid sha256:ced04df939214952c513aa8b4ef4c7a02dfe3bb3bce81f9ec6ea1827f639bf3f
+size 24471
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_7_en.png
index 0fcd59d198..429daba97a 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bec4c7d06dc2cc287d2165f588c6764e5314287119960947d7e24dbc19ce901
-size 23971
+oid sha256:018e6226239c439fc683eead0acb733d1e06eebad54b1a6c2b43d8cbd2e822cc
+size 24324
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_8_en.png
new file mode 100644
index 0000000000..14a6d77fe9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94e0cec5dac39083da711bdd30762eb84c794ecc41ab74f6dbe8cf5053402ea1
+size 22080
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_3_en.png
index 368e908499..21fe725606 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f6bc4bb2233067ab6d07e596f8d5ca294501a47a21451a1115aa46e238b31a5
-size 34996
+oid sha256:5493215960a23d305a2f9f26e39b307c735167583c20ac3fafb1b67e89aa1d12
+size 28124
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_4_en.png
index c9d622683c..51d6a1bc13 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:766e65cfceb2e9ff3895ecd5c2be2b80d7b2833b30a5c67a0075ef823bb77cc0
-size 34816
+oid sha256:31b97291b16fd0872891ad2341d95d34d8c0608f92e7a5e39b5f27d40769b111
+size 34955
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_6_en.png
index ab0b09c575..3bd50c5655 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd50a4cb9848602b08b853f4fa36314b981a858b98349d68decfcbd6f402d719
-size 23631
+oid sha256:43cf679fbb9a83f14209e61129afb8e7f18a60f9bc127bfcf4f5dff05c79598e
+size 24033
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_7_en.png
index 4194458de9..2a85b2cf7f 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e2de9b362092dbd08deadac70591d4682304c69981fe27cbbeae4f26233d4aa
-size 23444
+oid sha256:7ee6f9fbf05261efe52c247da3869c68c6e87f5132c52da72e56cf833ea6864d
+size 23833
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_8_en.png
new file mode 100644
index 0000000000..d36887d3e5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.error_ErrorView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:144ea7ed8bba7d5ded34b5e00d7f3f036c4dc882be0cf8a644817ffee4c531f7
+size 21429
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en.png
index 136812ccab..474a2b43a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11a877e3e4810777b7ddb15fa11b8410976142ee4fb5e9d4103f4248acf121cf
-size 29685
+oid sha256:cc0409c3e6c60994c81d83c429bbfb7ebc4ee53ac4114d1913b089a8068ca51e
+size 30046
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en.png
index e04f62d6aa..fab5d228a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471129545a85e702e8b59391f47630f128f80e819b042e91ee356684e4ae2438
-size 29680
+oid sha256:3670e0f777491b7f6101c3c1c3cc006e4848a8f6e481b9740fb42ee8807ccf9e
+size 30024
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en.png
index e5f8926345..764cb92eef 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a932c055ae0704cd62358c5442658c1cb059d7d3c0c56518de3e763c8eab3c52
-size 30355
+oid sha256:79b7dd684dcec4a06271eed34794e7546ba441ad2cc9796641ba570871e45cd3
+size 30659
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en.png
index a1d475ecdd..9a795c080c 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ca49fb335880670a3b71fdd1f2e2be50e9a5a6677d2e17e9534c9724d9d55b1
-size 30534
+oid sha256:29233a6bad671608f5e1a1d20b24b454cfd70f8a846e4d9572cc86b8c7da45a0
+size 30843
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en.png
index 116337e4be..58ae956b13 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be4f85040190c658d5734000e602b4cb43cb0a5ab2e2cea0a993959702c4722f
-size 33681
+oid sha256:5d30ae8d9d3b3820dc17d7aff3bd5c6794f5a267993a5dae4dc601278ccaaa5c
+size 33999
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en.png
index bf1561d23e..7ba887d858 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29d7aac2eaef7850cc9b0f5583d6c9a8aef230525d40011a9a7cb5401b681d03
-size 33409
+oid sha256:bf5b6e85e57aef0d52253dc7563bbe0aae3f38e4a65e2fdc8e0460bccf26b006
+size 33722
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en.png
index 99c888caba..a0404e5e72 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cb49a80d6ff771484743be2efc4900d053ccf84372614b98e9284d66d19056f
-size 28895
+oid sha256:e0c446ba7fc8e0c0c68732ba34058b41e04d8641dcdbc83255f9417706044c8c
+size 29067
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en.png
index 4415136e95..fedf612386 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68845451924a562238f2c75dced10697cae75171d976e19c0de927eacfdc3210
-size 28853
+oid sha256:da2778e384c9f749e888690660f496b4af93b7cff6f93c9fef346580a477e1cf
+size 29029
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en.png
index 13df6a6877..6faf2d1cba 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cc21d3fe55a5dba7b9e70d445877b07f0c88bee61fbd64f929a2321473ea8ad
-size 29581
+oid sha256:62c79d08701dad73ab3f5f7744cd2683febeb34cb8bab986685e0cd8bd33c0f6
+size 29773
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en.png
index 5e08ee2145..d4c10cf76f 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf6312a9e19892c9db949474cb9aa3b7572cc132d3d5474278abb3c4d91b7ab1
-size 29505
+oid sha256:fad2e4dbc822c79fbd8569dd8db7a5c08b335793aff6923129175bd4479cb218
+size 29744
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en.png
index e84f38285e..ff882fdaea 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f24e410e2715019c5fbba40a2f79750781e8db0f4b36c772cb7b37f0d3b0d26f
-size 32697
+oid sha256:7a85f79b0167efdc0277d05a41712c39d10115482242bb84a140c6647c28d85d
+size 32895
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en.png
index 16f85bba9f..1fbbba121f 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.number_EnterNumberView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd1e04c468c0daae10917f8e66a8e5a6ef8f72fa02f3ad4ca507b714dae7898d
-size 32449
+oid sha256:865d4c7ff07834027411a76767aaaa8aa0febf529b910eaa51e5de9bd8a776fa
+size 32641
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
index d9b4151b77..48598e410f 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f91ec4d46970dd80c97efc76361ce26b3e705b037b99bc032205ace3d2c8749
-size 31953
+oid sha256:5c79c83bde346bec65f67c34805407e46b351b2c91772c13e0a6c23ae09bf7e8
+size 30345
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_en.png
new file mode 100644
index 0000000000..da85b85089
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e666d896f715b1e6a165514acbe603fc879c0495a2d7215ac7cabe7a8d165e09
+size 30961
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
index fac34cc904..d22d7f98cf 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bbb94fdb717b2bcda3683d5833181c59d00e4c03a1860af66de6225c8df0756
-size 32482
+oid sha256:ff17ff66d5c92ab19ce8064e2e14326e9f2921c1b7313a3974547b2932cb7fb1
+size 32295
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_1_en.png
new file mode 100644
index 0000000000..05d8692fb0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a7786eecdd8f9f8ee2c7edb0d76a2fc09a960f6ca457445b35dc428539e5be6
+size 30102
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en.png
index d6faf7dd8f..fb88b5b2a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b4a99e2ea65816e35ec8fb1cf40d8aafebb6fd5ae688911d7d009dda15cd0f9
-size 18123
+oid sha256:0ec014c00a19fb280f4e2047d873f1698eedde51a765948bd2652079921588a7
+size 18264
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en.png
index db46722b7b..9bf1f8609c 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfbe2c73c732d671278ed411d76915d04d6e7ffce130c2a6dbe30ea43628e231
-size 24247
+oid sha256:ba8f1717d752a93cdda51a6ee5e8bac043a4572aadc4d1c0dba2bfe80e6c55db
+size 24372
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en.png
index c0703e447a..139ae28bda 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9168cc32d47f15de0ce961d841d872181b8aadf5151d4b5fd4d305c87cdda75
-size 21597
+oid sha256:7bc87f28234d11c58f5b43a7f87ee4e5a5d631e5a41ba11756c057a2a5eea1ff
+size 21745
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en.png
index 457e334ac2..a36301f230 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96448542138570c8615e24dd3b26be55145570c64ac9d410bbc4dac36280c345
-size 23769
+oid sha256:c97be1636f039afaab65c1b6858c439fcf47e6643681a886fd9c24ab6c7b0901
+size 23901
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en.png
index 4621b6c95e..78e7e0d1bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:672e617ab62c72127a4c57bed6da8ba4710cfc24ca455ea6edc765d7a424a0f3
-size 33766
+oid sha256:90ca0d9059538259cd19e7e75f6adc11f21b3a1cc77aec8d5efaf3d55abf8505
+size 34006
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en.png
index 52e64e87c3..e6153a4a2d 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:451565c6881885b51de299c2d71e77f78a62e68f96a75bc859050e64b87ef79e
-size 17372
+oid sha256:1cd2061366439af2139a1ace15557ecdd8aa91c0d2f1e0adfc76a7d63e17133c
+size 17615
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en.png
index 5610b70d00..03c7fd3b0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:def1de8d3a76255e72e0d65dbbf6364f77c2764e2ac99b32a0145174cf0f3a28
-size 23244
+oid sha256:541b4cd380fee2f2a445fe25a1171492c865b10980dd79de70f42b0f3dc120c4
+size 23475
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en.png
index 3784bbcac7..3cc9326747 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bd9567f7a504590da66993a2da6771c1a4157bc37301510f6d91d62efed7c16
-size 20745
+oid sha256:b71e2ba137ec1ffc65c07fc836074f7fa0ef310fb81a15db905db819ea29dd0e
+size 20980
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en.png
index e511df48c7..d6bb6bcc8d 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d662774653bcec6246ac6529ec98bcff77b02e4a6a8ef42ed0a640fed3770dff
-size 22698
+oid sha256:de97697d988d0cc25626c7e31f153a7dca6987215edbe2e42ec16367ea9b4b3c
+size 22952
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en.png
index d35cdd7397..59789476b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.root_LinkNewDeviceRootView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee6a0cf330b30e4fdc7cb8b4268251850f2f112e1ad0ce4af1166341f04a0638
-size 32103
+oid sha256:9b3a92c98a93b1d9e7f127a13c664c7275e26030d59a0ebcd3641428d9a21683
+size 32303
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Day_0_en.png
index dc7182b71e..aee573a6fc 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c2adbbce73e57c601821ea9b511913b3df0efbdd3d42643fabe0d39655e04e6
-size 438908
+oid sha256:855f37c9ca2dc6ddc9a699e42a1a3c784c26911552174735f46f31ad2588e977
+size 295172
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Night_0_en.png
index 41f55afa15..b8ff9c5b98 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.api.internal_StaticMapPlaceholder_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3baf32fc12535ffe246264dfe1f20db1fddddb970f86953e9877251dc3f74d3d
-size 173356
+oid sha256:e99b3d1c62e4907f55beefa2414ff6324c62133ab723c13b68c906331e8ee072
+size 118086
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Day_0_en.png
new file mode 100644
index 0000000000..c431ee02e9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaf113646fa3a8ffd57528d3e97eec05a8d80b99a3bbd7770266353dbe6abd64
+size 10217
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Night_0_en.png
new file mode 100644
index 0000000000..e3a3776919
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_LiveLocationSharingBanner_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53d9deec2a6295fe0155ce2986463a3b598436c0515ef87e0905c62c25970420
+size 9647
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Day_0_en.png
new file mode 100644
index 0000000000..cf35ad0fa8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f64455657f0f8a5ac7eec71ee206721a79b25dacf470d105a0e6497e570204a
+size 23954
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Night_0_en.png
new file mode 100644
index 0000000000..41cdb80dc8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_RenderingMapsNotSupportedDialog_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43bd5f04f170372b120fa2223c632d6a969c45b6d4fe61b161a7109318f9941f
+size 22658
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Day_0_en.png
index 1735586b26..0473be6edd 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:359960ea4b7be5ff9d766565007291f8585223052483736e17d4532c5f8af0c6
-size 252728
+oid sha256:69ffc87be8fc643d3cd553eb86140a9654ccac92d205b93e428d8631f2a770a3
+size 408053
diff --git a/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Night_0_en.png
index b18c069686..7b248fd2a1 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.api_StaticMapView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b775500b1fdc6294d94dcb1f07f74c515c3eae31bc55d0faacfd86ff7bd1da3
-size 105526
+oid sha256:7b2af9381e91c470a87d5585fd211b1f1ffdc4d56876285f73765a5ccd5ce72c
+size 147867
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Day_0_en.png
index e48b3cd8ab..afd74655d9 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2550638ee12b4181cea31caff0b5838a9cdb3a180c01d1188bc7c2726051b863
-size 16578
+oid sha256:c9ebf3725fa875994cf1a15b30e2d4d533c2a9281f0f7d5d9f83f8685ba384d1
+size 18637
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Night_0_en.png
index 0f17f6d6a1..30fad74bc6 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.common.ui_LocationShareRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c880e4d01495868b3f0689d20d3cbf2050d6261be936421343bc1ac210aabeec
-size 15959
+oid sha256:65c321199578618012d27afe478c0eaf6a67c44101e7d1d1c51a4c6c1fa9b93a
+size 17897
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
index 898a010ddf..33ef3511ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db105243ef507c209c756015cf41a23150259cbe7ab3be6d233590fa9257b0e5
-size 20528
+oid sha256:8f03643af6b4643c0fbfee2d98138aa0350d0fb541de0a8a627570030a8f3812
+size 20466
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
index 8957a012f2..b1bdcee7a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d950639a9cc9961210b449e5c975b6f6bc890a47f4977eeaaa19b837458f66e
-size 36475
+oid sha256:f53a6b803268437c30350857951422dc1723a38922db4441a97bcb926a0e63ff
+size 38724
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
index bf25a07679..b597367206 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a52d39cb27572c49ab64b1534ead353687d83870b5d5cfe7158859925b4717f3
-size 34926
+oid sha256:77ce52ef94d449d8eb37a8d84b297800a1663bc38dc27e2ea87e6f7da373195b
+size 37222
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
index 3f99f935c9..56bc529007 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccb0deee31506379cfa76f8d39d37639b6b1f03d7eb2e7d5e8c6ceff300b1978
-size 30397
+oid sha256:76c4f1674cda818e0684869050fbad2cb31c02146726d1ee5e57481940218d29
+size 30363
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
index 898a010ddf..33ef3511ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db105243ef507c209c756015cf41a23150259cbe7ab3be6d233590fa9257b0e5
-size 20528
+oid sha256:8f03643af6b4643c0fbfee2d98138aa0350d0fb541de0a8a627570030a8f3812
+size 20466
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
index 69aea3df2a..be619b419b 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ba1418b5d42a56db47e7cc574cedb886c75d9cf22828341bd954a4f1845670e
-size 17925
+oid sha256:fc017e7707b83549cda8c06ffe8466596372132ba0b58dd91cfb20c451b6a417
+size 22303
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
index cce7a48382..201c56516e 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a97492422d54a6d6666c1ade693dc9b63bc9ca07c17d6c1f787c081984c09f68
-size 42470
+oid sha256:2f5ca554e1ae330865af0d267934d8d1c6dfe42cc3958db3b15b13d376e8721c
+size 26667
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png
new file mode 100644
index 0000000000..3d4aa9edc5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd18d8bb6e61f616451439dff8690afc7473461c87adf11bb9870319d8e06fc4
+size 38447
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png
new file mode 100644
index 0000000000..fb4db2984e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8c9a2dd2c3677281b6486af6a0b8a5405dc59bff0390b6ce1bca1cc63d88b0d
+size 42546
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png
new file mode 100644
index 0000000000..d194937309
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebeb2f14074a9bc91dc892bfa056c9c67e83a64c64d645c77d312d64895e3815
+size 21611
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
index dbd4836467..70de0a28d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3260d344a065f1710aff1450dbdaaa0bd1fbd963d5304167124d845c46be433
-size 19903
+oid sha256:dc9a8778869e47b9874c4300cac52045c4be5fac6590acbaa719a065249ed3f5
+size 19856
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
index bf0e1594e1..d9f4faabc7 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:001bcd1755e837c0c05e493f964ee5c71fba81e811bdaf91effba257743bdacb
-size 34836
+oid sha256:124381cc86542b2704b619e798f62f58dc7f3b95ab8a1c4eec3fa4b849462f9e
+size 34867
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
index 11be8ba550..432cbde734 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38d253d8b3aa1c4599aa6b6f5982b7ef0c87ea7346aba13054a7891197b7c000
-size 33268
+oid sha256:f373df8ce07aa19d467d43306f5a8d6c78915e4e166e08e39bb39cb303b5faec
+size 33305
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
index 2c8c53dc1e..317a87e2e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8901e7adb15ff01e9c696729f1abc52c5fc8666bca030f449f8caf5a22615f53
-size 29196
+oid sha256:ebbeb66a3f67e48668cadb96069f50feba5f4346119ea62c9dfd83ffd621b7b2
+size 31182
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
index dbd4836467..70de0a28d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3260d344a065f1710aff1450dbdaaa0bd1fbd963d5304167124d845c46be433
-size 19903
+oid sha256:dc9a8778869e47b9874c4300cac52045c4be5fac6590acbaa719a065249ed3f5
+size 19856
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
index 060f25819e..d261494eb8 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d786937d790e13b53a5de8ae3321e5aa8744a979a3a99ecc36def6b7dbf6cf60
-size 17237
+oid sha256:8a3d7220c216b6fee2384ba2cb263903a8cfa45f3f97302c722188a4a827c575
+size 21630
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
index 541b2a97e1..56ef074549 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:038e12f3caeef6ac8d5389b7cdc68138e089dcac335d0a5904adc55c9bcb7b1c
-size 40642
+oid sha256:24b8f832cbaa9aaad66187255adcefbb2d7c4407b911c2675a261b6f480aa277
+size 25858
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png
new file mode 100644
index 0000000000..e66ccc603d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e31aa9639a3805e3644fadbb01ab3503aedee068655920555a4817ae38b6376
+size 40312
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png
new file mode 100644
index 0000000000..f2f4d7c766
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77e1a15b548d944e57b7d71229c28692e32ad9340d04ec0c43c52dafe16e3ae1
+size 44172
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png
new file mode 100644
index 0000000000..dcf2ab131b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cab8ea5b016f20de07dd0134836c42f9fd51562837fe4da2be8a8d38ca1f95f8
+size 19914
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_1_en.png
index ff0295d9ac..65720f93f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37ccae030071cc4801538dc5c753a6148ce7e465442edcc89877353b7f5675cb
-size 37572
+oid sha256:ba0285628cb8f18c5d666e6727b213d3c7674d1782a7364c7b72ff906ad57eff
+size 19684
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_2_en.png
index 6f440d71d6..26571d8a30 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f57485d56fd4d02731f797762d931c4d738c8693539da612e33403693cd4b08
-size 35976
+oid sha256:ed64e57bea072d5bdf232133c365db043f117e35ef180aa12c9b05bff40a1a92
+size 16437
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_3_en.png
index 964ad077b5..ff0295d9ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c882f3f9ed18a64ecfa253284bf1dbdad5d38f524258b6463521d5185c1c32a7
-size 31530
+oid sha256:37ccae030071cc4801538dc5c753a6148ce7e465442edcc89877353b7f5675cb
+size 37572
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_4_en.png
index 46226555db..6f440d71d6 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdf7b194a075902ab9434e272865293535ef39370fbb9cb172b3cf8774850c73
-size 19104
+oid sha256:5f57485d56fd4d02731f797762d931c4d738c8693539da612e33403693cd4b08
+size 35976
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_5_en.png
index ceb1513af6..964ad077b5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8988c700db517eef71d7f42c8e21ac819f51c92fb88c0c25cb400be7a5326c22
-size 19228
+oid sha256:c882f3f9ed18a64ecfa253284bf1dbdad5d38f524258b6463521d5185c1c32a7
+size 31530
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_6_en.png
new file mode 100644
index 0000000000..ceb1513af6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8988c700db517eef71d7f42c8e21ac819f51c92fb88c0c25cb400be7a5326c22
+size 19228
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_7_en.png
new file mode 100644
index 0000000000..e01e90f7d0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dea2fa898a6f9b921eca0931d7380814b31ba858b88c90ba1fbab6332b4c8ebb
+size 20722
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_1_en.png
index 6c424a1ffe..4e96ed69ce 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a62d7b4716f97f73dddd22fc3ecad30ef159da186ff2f2029772f4574a4f474
-size 36084
+oid sha256:4356f7de986f803b890d3bc95afdefd01e9eb42d775836c647a6d9fafe3bcc4a
+size 19189
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_2_en.png
index 72196c0b11..cfa358b892 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10d95b146c51895a0e9e816cf56aa216dfbf77e74ae3da10f9c3fa94468ba9ed
-size 34500
+oid sha256:0ce9e4f5911a6dfd35655f362d122f95690a651d7c05e5ef6c4ea0621be2e628
+size 15783
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_3_en.png
index da90a76ab1..6c424a1ffe 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64236eda401891b7a04c9240ed2b9b077b8c08b182b76f454cf0a4376daa740a
-size 30345
+oid sha256:6a62d7b4716f97f73dddd22fc3ecad30ef159da186ff2f2029772f4574a4f474
+size 36084
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_4_en.png
index eed60f472d..72196c0b11 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da601c01dd487f9c66f78ada91954398e1dcdf699f1ba4f6d8f7661f7b8cc4b7
-size 18715
+oid sha256:10d95b146c51895a0e9e816cf56aa216dfbf77e74ae3da10f9c3fa94468ba9ed
+size 34500
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_5_en.png
index d3ee3b9e22..da90a76ab1 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca86fd5eea8c05a52fee801e1ca61c2e4e205ad9874e06d69b1d1f674585f87b
-size 18842
+oid sha256:64236eda401891b7a04c9240ed2b9b077b8c08b182b76f454cf0a4376daa740a
+size 30345
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_6_en.png
new file mode 100644
index 0000000000..d3ee3b9e22
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca86fd5eea8c05a52fee801e1ca61c2e4e205ad9874e06d69b1d1f674585f87b
+size 18842
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_7_en.png
new file mode 100644
index 0000000000..547e7ba364
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.show_ShowLocationView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9f64bc6bb5956459f8943c05bbf0aa6ee9e97e3103713f34d49c013f86376a9
+size 18878
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
index 3ab1c052d2..3a22d6959f 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76bb68d4ee420ec14a8c9372225c91407ab452479e0897c374721eb834dc6ba0
-size 9920
+oid sha256:2046f1225b2f58812502196f4b7d1c7a4d87f740b32e40dd82762fade1c42ea2
+size 16167
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
index 18a2ab9466..10223f5bf6 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d72cda6587357da35dd5a22ff595dd0f9500dac14cf731a348e209bb17ed7b56
-size 9979
+oid sha256:62384687c273cb57dbd25bfaa558d83e3efc527fc4dfff4aca8bf85ab1ce9e4b
+size 16446
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en.png
index 515976516f..2bdc65953a 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ee51d6f3454f52bc4afe5d90245b853fb621b097afb1a2588a91e4d9dd69133
-size 16590
+oid sha256:4615061f43638296af16cf7e515b4a99652fa864e8660774572191bf5ba14745
+size 16573
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en.png
index 5081175acc..9f6fb3ec3e 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:164b662bc38dc07e7995879b2ed0c9ef685498d1082e27d8d28d372809a6afe2
-size 18886
+oid sha256:7c6ac7dd26d008a0aff402f8c19a099aa632c94db957ed64db39209e5b9aeaae
+size 18865
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en.png
index 5eb1b68db4..15becdb71b 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e872428460462ac33f00c6cd903ce7345ac9afd9a3d02b37d763d129f7ff304c
-size 28572
+oid sha256:b3e38957ec880adb0826805b16ce17ca02c4d4b4144beecf5fefe38e2474844b
+size 28597
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en.png
index 5c9f60137a..8dd432427a 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:919a87e26608070d11faf06fca878643fd4090fb708f8b8e2127b8f49b6d4efa
-size 15970
+oid sha256:987d10d47bb3b3ccfd089cbec88ea893c394753cfab98cd20fa5960cede5610f
+size 16025
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en.png
index 24649e54f0..d2a6609e57 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:641d43a9325286e3d7facb4fe0e53a13fc89c3394c702699b2b5ed7db534bbee
-size 18237
+oid sha256:ad2296982cfe78d9dda44ebfa67069db317ff09db1aade04c6ff1115ff0c2372
+size 18118
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en.png
index ab6d3a7fcd..6ca5b70c41 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c981543a80612ff3460bf4460b552218f8453a9b8981c57e41d9c89fe7e550f4
-size 27138
+oid sha256:1e86e29e9af95e444c8e78f4ff5289eca8c00817ee723b32c0a01e295b3e467e
+size 27117
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_en.png
new file mode 100644
index 0000000000..10076e1c68
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7790ba46051ba39863f057bc53c937f513f91b6094094b2b449794d7de3aa875
+size 32833
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_en.png
new file mode 100644
index 0000000000..eeddc7261f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewCompact_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc7032e0d69a44d8ab2d3187183eb77cc28d7a5669fd7e56ee99d4f90ee05d62
+size 33137
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_en.png
new file mode 100644
index 0000000000..0dd66f5feb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25ca16b3574c5cf850e06099312d4af294561c8c9833742a0b3902bc3b35cb39
+size 20669
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_en.png
new file mode 100644
index 0000000000..5669a59d24
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8665179304ccd2e0acf517ddcf369c4daae51c41732ee1b9618e3bedf38aeffc
+size 31643
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_en.png
new file mode 100644
index 0000000000..265044a0b2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14300f3af0bc8c003ce94868665547ad439826b47cf416f1a062ffa4a1d7e793
+size 15782
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_10_en.png
new file mode 100644
index 0000000000..e03c2f9cc3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e58621f378a1abac78c5bdfb6a31675c1f762f53434f28b869ac8c7b6f9ad8ad
+size 20109
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_8_en.png
new file mode 100644
index 0000000000..ff95140047
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88354d222679723cadfb76d2c4928fad78e17fec13514c0e4712e6f877b1a0c7
+size 29627
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_9_en.png
new file mode 100644
index 0000000000..4bc9f6653b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d505c4b2323dfc67c1b7e119960ede5b97b52d6c453610cdbb01efd485730aa5
+size 15369
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_0_en.png
index dd05b7e17f..88034ab8ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:011c3caceeb03e9162c5e60dd71d53212971e13b7a6b58692feb901ac13b79e1
-size 35844
+oid sha256:131578839b180f129a15d080c5580f255f52536dc3a6b595bee27574e8be0e66
+size 35847
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_10_en.png
new file mode 100644
index 0000000000..adb9484e70
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a60781d3bc38ed6c2ed830464f447d509f88a9767b81dea3acbd29ea21b5c0f6
+size 36212
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_1_en.png
index 680f363dca..8a66c7b727 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aef835a050377afd05e6a517107586160a86fce4f32344fd92d00a08b4a2c660
-size 36250
+oid sha256:3d6fdf4c5e49a9f29d10f8500cd0b0ac080cfed3e3776510ffd8ec8413be2a40
+size 36251
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_2_en.png
index 8e99b487cf..73267ca9c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f36922d058b19410a38456a9e29760f9b890c1fc0549b3aba2a0e76d3dc64c54
-size 37079
+oid sha256:0b3753087c932d0cc83277959546c7d288592853479eb3f718bb552bd4f87995
+size 37073
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_3_en.png
index 6a8ae3dc0d..74eb3256e7 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a90bdec84019b24913e647f61a5223d9283a8e9604e8446032acce2a71b6da21
-size 40871
+oid sha256:01a4a3a8a4552e068adb3c45f71479120506ff5f84b0938d44174e03b271c9f5
+size 40867
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_4_en.png
index 0af4ff0fcf..aafb60d1a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec435ce434370cb5ca711458b955e8843872b01675234eab15cad4ab6e08dc38
-size 33542
+oid sha256:93d813e1f76cf2576be1063b4ea91474014fe57eefab1e277c277c19f44b0900
+size 33549
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_5_en.png
index 3bc7a1d72e..d2b52d0095 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:412549704d3c5007a46b3b3a115a7cb7f89a687f427436236d4b51efa09c9bad
-size 38247
+oid sha256:17bca98e4f7c0a17a9a990ec968634eabd2b774c561a43fa6a0be0ad0697c8a5
+size 38240
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_6_en.png
index e8ad13d33f..0654018b0a 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3f4d74da073c904db3f7ddd9a5be9e49161c64b0210fbc2c09dd755d2fadacc
-size 29238
+oid sha256:00757d73357d0f1cf217cdec35c514a519af008514f2d4d8e2c3b540a84d7950
+size 29218
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_7_en.png
index 9dd19fc627..346d6053b4 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98252e4f345d6b34e37a8b065cb570f85b5678f6d81b36ef96ca3c5df9433a23
-size 29804
+oid sha256:cb8ee0599cbd6774b6ce9fe48ef532e93f07b1e726799482a1c265ca5a6733a2
+size 29778
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_8_en.png
new file mode 100644
index 0000000000..4a24e4d762
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e142a576df4b442c3e10a6347510ff8a8e243cada0bba35ee94ceaef6a349995
+size 37700
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_9_en.png
new file mode 100644
index 0000000000..4d65f3c480
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d39b8e5898470ee8802bb15ae0433bcdde60b982e88ac823f5d5baaec40a641
+size 31436
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_0_en.png
index 9d1bd22ef5..08a43fe01b 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e87b9820e45b16a13d2f9fb0a470b5f57abf0e45f48d16e5049c4abca04e94ea
-size 34629
+oid sha256:df7a30ab0bc53d84bd7c0848795c7b1e55140b1c40162f16fa54ac6495730de7
+size 34642
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_10_en.png
new file mode 100644
index 0000000000..1831605a28
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d115c0f6d4c705dce1062aa2dbb026980df5efed8d8b2500774e6f75cbe366f
+size 34987
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_1_en.png
index bf74b3022e..b8f5c8a44b 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74e88064bd3817c79443b6ed2df9b68e9e455d7bef2d94590854ce0d937e2107
-size 34997
+oid sha256:a2ec9d1e862444773b670c51f0ae18093fcb4a3900403ac041389b9d7b70eb36
+size 35010
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_2_en.png
index d5087096c0..4b25422e6b 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23d3ded6d54724df9d03d382e12b58fc23970c354de52dc90cb0b13b66c9c614
-size 35729
+oid sha256:b7d2a247664c21d28a5554a3a720cf1de59a31ad58474b0d78e3e845b04e22be
+size 35731
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_3_en.png
index 7a4a9fac87..7276bf4f44 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de86916ae6798afbc59dae5075a5f678010e6bff78a91cd06d40a7cc19187e83
-size 38344
+oid sha256:b732e81b6e9691182e441d1c83906f62dcfe93a41d871ff0f8b7a27bd9a0b817
+size 38366
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_4_en.png
index 22553fcf66..7ff75baf69 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94ed59c67dacb5066006189c0daf6d55704495ecffd145d69ea3ba968ffda246
-size 32467
+oid sha256:66e164942227a9209a928fbd0eba211818f0c53b25ca65886fe95ef1c0bc4cfc
+size 32482
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_5_en.png
index d807d65d99..a19beaca81 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:daadf3522ac14a9ad2d0d5d497e6e688e69cc1e2ff824eaa5a0002adef1a980c
-size 35888
+oid sha256:97bb8124c590e9e4f33203853abbb41aa672871e03c548209ada0ee39e97a824
+size 35913
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_6_en.png
index 913655b87d..8c62f0546b 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d090ac1696261be94b5073faf8e7864fc36ffa378bbf22e62e201cca4e7da3c1
-size 27869
+oid sha256:d8dfd1e4ab4eac0b6208bd33332e5b2537bae6dc74d6ba8f0654c1c995b65519
+size 27894
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_7_en.png
index 9de7f9b9b3..c90256c1d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d98c1f00e81a318d5df078cb91f88b1a16fe01bf37b835d9c8b976045d4b3023
-size 27860
+oid sha256:d7c66a024081eff6dfe43f72087651351290c66fe8cd6a3f1d98f31f7800ca8b
+size 27894
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_8_en.png
new file mode 100644
index 0000000000..8080cdb8a0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71d30a04330bc8d5c6332c2f741ace766f6942d40a4641362088ca4819a79366
+size 35413
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_9_en.png
new file mode 100644
index 0000000000..aee389854a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.unlock_PinUnlockView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bd95ec6a8977e259b568d824b9ea70915d93b53ac81df333e799c8aa62edd37
+size 30322
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en.png
index f35d541afc..c9bf9e3c1c 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b768e63862ed7f9c355a907b80bc144d012e66c012438ffdfc65652a8d6318bd
-size 5992
+oid sha256:0990301d92d4862054ba5e54103dac359df37997242498766854d7bb13431657
+size 6068
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en.png
index e82d91a78f..fb829c4873 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderOtherView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7945b3bcbe86c2adf888c89f23e0cfb76f5ac30d3f37408ad376af35f5b5fd3
-size 5920
+oid sha256:3022b2b813d9a3f77b0ba72706f0fb870a1c3f7b4a8efc90e611b66b6e9bdf8e
+size 5926
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_0_en.png
index 747a677a5d..0b20380cd5 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8217f8ca87864ecc8184ac665adfa31c461b42ec4313c349363b824dc6138235
-size 17795
+oid sha256:49371b85e60a5e0465c0ba1537293f6c071962c498579bd71b42763671c8dc01
+size 18148
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_1_en.png
index bc7a9c237c..cbe30336d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6e6e4c1b666db69ae67b0ae4bc84756e490c02cf7c3e261c2897637f90d642e
-size 7681
+oid sha256:78ef17d2f96d5544ecc8213fe1b7f78ddf263557855901f00f152a0b543c1a6f
+size 7746
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png
index f902686235..447de4de32 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce2b95b979aa2406bcca270b49131aa24b11b325333cf3827e93df03758a3d85
-size 6839
+oid sha256:ce777b1c6895caacc21adf4f6c10c71f75a2c6d31a617afe1c7f49d10c5141b3
+size 6929
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png
index 7b111f303d..ae99061ada 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5cce43ca6b6dcfc1461164145279bb8e4bb1f3d2d2976a8ed22edb030fc50e0
-size 5713
+oid sha256:f49c89cde78d8d8971d5866f3cef2fef51bc36d1844b0364c950dc2afb188c5b
+size 5707
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_0_en.png
index 345e7d769d..359e866105 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de7f8d4bcf900c38e3a8f16f317a9a16c352977f2dbe9213937f09f1990a54be
-size 17004
+oid sha256:759f68aae091a43f54d597e386a5503692f99ed9c3908450dfadf59999047d01
+size 17272
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_1_en.png
index c0c462a052..3f58435f8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83bbd72e29e24256bfd907334f8603f56c306eaba520f03d21ca5bc6388047dc
-size 7395
+oid sha256:0591f839e4605cbc51746f9d479a0bfc37e078178e6b2d1395db07dc8a7e1261
+size 7382
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png
index 2963e20187..abcf602e31 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c72a00088338657055c29bfd64e8ea11b47d4875ebaf7ac8ba45b02b31d16109
-size 6617
+oid sha256:a57866d169c69ba68365ef8cfd4739ec95f8a8aecf4805ec68b2f247f3f698dd
+size 6627
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png
index 6856a2501c..fe5123f403 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.accountprovider_AccountProviderView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af5e1cbfd118b6eef4ab55eff57e2f735d0d8280846e57e1106228dbff575e6b
-size 5594
+oid sha256:db8eda0daf8e2038c2c69ff945e686a9e5ff271d8dc4f30987f14f7acb22ae85
+size 5625
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_5_en.png
index 16668cae13..c4a683e701 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d62d11d8d8ccbbbbe811f157ecc20f31096a017f4acb36061a29e2aaefbd3e8
-size 25132
+oid sha256:44e078c64ab932a6e9ce2d429efb5f44556d4a923f4949e75dd2bd99591c4533
+size 25242
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_6_en.png
new file mode 100644
index 0000000000..e088efa40f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b59f57c2a7f8577ce253d6ae4818c56c832def259895d728cb877af7dd9c36d
+size 33388
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_5_en.png
index 20a22487c4..2a6cbdf049 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6d0f6746f6ccea9db09a6d351e5aae7d10d4d623edf00059bfece647731c2e5
-size 23959
+oid sha256:a2d413d264af067d4e03743cd50be879c91796a3f0907f40cefcdc6b0e466897
+size 24020
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_6_en.png
new file mode 100644
index 0000000000..1bf7390d71
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f3a6c27cd65f81167b9e1a5037a4eed1c2cc58fbc17f2397b1ae09fb4144e72
+size 31813
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_5_en.png
index 16668cae13..c4a683e701 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d62d11d8d8ccbbbbe811f157ecc20f31096a017f4acb36061a29e2aaefbd3e8
-size 25132
+oid sha256:44e078c64ab932a6e9ce2d429efb5f44556d4a923f4949e75dd2bd99591c4533
+size 25242
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_5_en.png
index 20a22487c4..2a6cbdf049 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.login_LoginModeView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6d0f6746f6ccea9db09a6d351e5aae7d10d4d623edf00059bfece647731c2e5
-size 23959
+oid sha256:a2d413d264af067d4e03743cd50be879c91796a3f0907f40cefcdc6b0e466897
+size 24020
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en.png
index 415cd8ef36..23858ce575 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8dd6bc040641b68274f838a02bb0bc7750d35814bd8717c332ce6c4b4bbab47
-size 47001
+oid sha256:c7544e2566517e8692a1cccd4607bc2ab0f2767bbe9e5b39eb439d7695ad2ce5
+size 46905
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en.png
index fe703a5bb2..9b505f3cf9 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8213893828ba44ae9ea6777204e922c11e584cf428ff29fe98e809292a34b3c3
-size 44816
+oid sha256:b5dbf45467305e83f302fd626a2c0adcd27eac6aeea8b7a83efdb6e728d974da
+size 44703
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en.png
index cceff9bd6e..815986cbc3 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75f10457c010805b854c02d3cf7744e1b8c2081d6d33cc9315123ce51cc9c3cb
-size 45934
+oid sha256:41907de78c86fca804af2af7dd351db6a1ab87515e71bb906ffa2219ad4f5879
+size 45880
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en.png
index 21020974de..f08662715a 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f224eab6216782450b3075d6d63f8bda4764683d86ab683696bfae71d062e41
-size 43678
+oid sha256:62581b532695d10a42432dfcb37249c28c2bd617ecb49d7f3a8224855b78ae55
+size 43600
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en.png
index 0bd68821e3..7869ed3dc5 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12ec8a85ff40410c93a3f5dc974b95d1d138712f2cc6f81fc18b9bb7a7e1af3b
-size 22486
+oid sha256:8098b9ff6c4d08d8cc61bc51e391a5a17e9791d7236d2d7cf652a6b855c87b97
+size 22501
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en.png
index 5801447ff5..c1f55034ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:929b3c6c51c3ca37e6d00dbf9e1f3024c009cd0123e845293fde23b1cfe4f9ba
-size 23459
+oid sha256:94878580a4ffff7c4d437eba1c62184aa61435420d6c85488fefc53e33e1e150
+size 23497
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en.png
index 96ca1664f8..a960bff528 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7dfafac3676b9cb89886b4c1c3b2384dd7f75652a1c013889dacf7d5ecb8773
-size 23974
+oid sha256:31cee1e647c74c67740320180af54509e466ad162ed56894695b038ccbe35103
+size 24017
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en.png
index aad9addcfa..fc8aeb2409 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b8b39f7e59e23e9be33e5b25375403e622935e709bae3c7669c80a350d19d25
-size 21998
+oid sha256:8bdca1cc8a99976a8c4a297192650a496a4347dc27c73d1950f693be1cf2cabf
+size 22005
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en.png
index c78ea7e982..aa2b293c3b 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbd62f37c69fa71c52442494efa24ab2d9b56c96dd9ba0d9e35a04917dcfb8e1
-size 22895
+oid sha256:604243eb5409e170a760cda08fca1662b7694c6920f7b18da8d4c4f9d60ffe9a
+size 22915
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en.png
index d62536a9c0..1f6dce1201 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.chooseaccountprovider_ChooseAccountProviderView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:906f38a6ea86f1794e86ff4a4f20bf620f280114e234ab35db7165644b8665fc
-size 23403
+oid sha256:5d3bb32677abc81ffcb892839c5609f27637a9ea8081460d3f95751a03f125aa
+size 23426
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_en.png
new file mode 100644
index 0000000000..adbcd16ec1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d861dd7397c0e15091e022d956c1955d86529fa0cc39e08c3c645d91e5023e0e
+size 77677
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_en.png
new file mode 100644
index 0000000000..df7c95510d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0acaebca757642346f3381601f044a55d02749575150364e232f772ba0167e1
+size 73811
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_0_en.png
new file mode 100644
index 0000000000..7bed006a97
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54c841ffefb3d053bb74e6f88a9aa7cff5d39b4854c92de3b507552a9a4226bc
+size 68693
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_1_en.png
new file mode 100644
index 0000000000..94a1749517
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.loginwithclassic_LoginWithClassicView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eba1f4395b4c32e7edead84b1e22957cc8f973121207d7000419a8f4c314f5b8
+size 65936
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Day_0_en.png
new file mode 100644
index 0000000000..ac8d5e8611
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d70106c0e4d800aa34faa380d79b65ac29c6bc43e41cf874f31517f138e252f9
+size 60126
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Night_0_en.png
new file mode 100644
index 0000000000..4d93016dd4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.missingkeybackup_MissingKeyBackupView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75670dcefa55cf863d2c0dd608704d465b5c9ac74f4798b3503ce9a2d8e74417
+size 58518
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Day_0_en.png
new file mode 100644
index 0000000000..e3e5480add
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72e73b036458ee32e207f711cf6656fe7646b23d3d9e096e62932c828dd53189
+size 5244
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Night_0_en.png
new file mode 100644
index 0000000000..6582264383
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.classic.root_RootView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:518818c549548b6304d2960242ce7251bb609fa439928539a7556c33223ca8ba
+size 5251
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_0_en.png
index 3436cbf43f..7471641cf7 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81507775dafb6d842b65a66f2982ae7816ffca1f9e96b912af85bb0c50002e28
-size 310974
+oid sha256:d774f17a24d0270c5cb8419dddef5c9e77ba0fa26c8b87e8131387b262a844c7
+size 312065
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_1_en.png
index 4a367a49cf..bbe1617319 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cab598df1a80c51051338f60a2c7a5cfccd9b8288225f54271586aba15d22cb
-size 305113
+oid sha256:73d531b662c5ee7371306d2da90cb349b742b3e9e955696d0e7ba4dda435aba4
+size 306772
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_2_en.png
index 99a5a54fae..20e76088ef 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9ab8bdb21369e9342fb173ba2656d54e3617bffab16113635b35bc99d47e2c7
-size 308609
+oid sha256:12eb9a70791bfca39057aedf11abdf10da3970fd7405ca3ece1a0fa3d67529df
+size 310310
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_3_en.png
index 2448f1f0dc..4cb810de6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:238fdee61834dda91ffd837f5e4a347387635e107897a444331df5ab2939027e
-size 303967
+oid sha256:47a450cc178bd56240ee5eabf1259cfb43986f9bcd2fbf5e4e54c54b845a401f
+size 305482
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_4_en.png
index 8c7866c018..2268ec40ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9238fe3e6c1cfd42171274979243bdf2cb6faccd7e871a479f635c90b180f51
-size 304533
+oid sha256:c05e6d1bcc7c807895bb77a361ca399ce9db24457d5b0802697bebdcee71f53f
+size 306019
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_5_en.png
index 46919a4d13..415d0cc542 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebae03319afc453b93df8b2d93f386fd9113dc3cbd20c63778f5b508895ecda5
-size 313101
+oid sha256:4bcae33b6171c0deb02af46618a5b00b30d3dac4495657e0e1bf2f0b1c03d7e1
+size 314201
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_8_en.png
new file mode 100644
index 0000000000..f976341370
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac09917f10fdcab0f54dc23bcf6189c8db3a0ed47bcf6f8db549cfa19409b2cf
+size 313453
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_0_en.png
index 73f9752ecf..0a0b4afeaf 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c14a3ae87a82f7dbed4af6bd355abe604b335abf1004ad3bcb787088512ba697
-size 391109
+oid sha256:4c9cccb5ed04a6de52ae035fb9b83747919509ebbc7c4460a37d39751c9ca389
+size 392252
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_1_en.png
index 71f05d8fe5..6f499209b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec2d91d4731bd62a711a565a6882d77ba6ecb1261e0cabe3ef436d57655a267d
-size 377944
+oid sha256:c1d280175bb5ec48d9400a42664fe00e15c0f4486802c2d9e48e8cb2b2ecb345
+size 379460
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_2_en.png
index 9b5650a22c..44928a9a74 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4aace29676743e516388ff9dd32ff2a953b07275edf72f76f0ad7aaf8d60e45
-size 381186
+oid sha256:3f6e1ae050b534c4b9bc8c8848dde8bab3ef49ea81132d19329e243050175439
+size 382668
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_3_en.png
index 8b5843bb89..31ad76d4ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5400be8c794a8a538683f1e0c1161cd516c4834edd8f139d0fe7f64279295c8
-size 361782
+oid sha256:2eb90fb042e21f10d37f8b3b19782572ccb91b2c3a551637627d919286d8bf66
+size 363642
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_4_en.png
index 24e8c84884..c94eaa8c71 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71654cce259c93af99e655285a481f8cb1648841a908553779fcc9b5fa0c53b2
-size 362262
+oid sha256:4a44c03264570519c99172075992e9c3bedd3a6be211b56f05837c6e0ddd8e94
+size 364135
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_5_en.png
index 3964454684..b42a999e84 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb971b62230078e00c1ba9c04d8b18d1419c1665c4f8f092daf111a739e1d269
-size 393095
+oid sha256:aea3574fcb361509f2c8c035fb5e5f7ebd7cafcf5e91197347f2ed24f3e45a84
+size 394253
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_8_en.png
new file mode 100644
index 0000000000..e8013b18ab
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.onboarding_OnBoardingView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13f5758d4b51dfb31dc028f17b3f847d6779339aaae5fdee3a1856daff1c7328
+size 393429
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en.png
index 878e97a06e..048c9beb26 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbcf2216fe8f2653d44df345c157eb66f54ff8767c210bfeab5719d6d70230a8
-size 31686
+oid sha256:647163b31578572c9bf4a63a1d110f732fc3b0c41c3991651996608d6265c536
+size 31960
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en.png
index 05edb58b0f..d27a10bf39 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:324b1392f40bb408b6469e656e774f5b1f7cbd9bb6557ec7a2587a971b548ccc
-size 31288
+oid sha256:6e447151f2a7aaf9052130d5b915e9aea8180880c66fa51afb06d212079a0ced
+size 31159
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en.png
index 096b521d75..4b7e849116 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1075e98dac6a50a282a39dfd5855833080becd377e1bf3f9db8fb20104bda80d
-size 33479
+oid sha256:e215ffdf8ba90e3f7a047d25206dfef4a08d25137ee2e4d3e5c16f254282927c
+size 33371
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en.png
index e738c998a3..276d9919f7 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f55c2e968f464ba9593dc8841a0e633c2f0a75cb3f85857aa3b4b716770629e
-size 30831
+oid sha256:76613fd85c3211bd2c96e50f2d481d2d994aad20368713c1da309d0147ce1101
+size 31015
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en.png
index ae7ffe2dd4..c1da84be8e 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8484c5300a8da5b120a24513b29bdd697dd3edd7d6b7c91e5925aa55c6290fd
-size 30366
+oid sha256:5f32133324f20fc97c3473ca6ea3b1705d3b0beab5bed11af9199e4f5b9ab124
+size 30410
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en.png
index 1cf5572c4e..e06e5ccaaa 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b87fe16a96a8c34b49aab481f65c3223fd098360048b7dcd1ee8bef85fdf378
-size 32650
+oid sha256:00556b6c310f63b548bc1a88b3b882a93412a2a7dacff008862faeb2ad572eb3
+size 32671
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en.png
index 98039ad35b..d13b526c94 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:647b5d2512180674b14a93903de4ee0539720dc1ddc7eaadec23940aa8b3befa
-size 35934
+oid sha256:c95c7e7f68133f25bca9c33246983cdd1b448ca822b1221eba54c171c8f2e051
+size 35898
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en.png
index 9751c25cb4..aa8c5c7858 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:010a03fc52fb0ec9b39701d75ef26c7f23ba6195e7d3e0c4e2b7e03518425b57
-size 24287
+oid sha256:b4b6b193a6c9bd9188cde36056a512ebe10f9b24d07a33926b51876712b453b2
+size 24468
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en.png
index 0fcd59d198..429daba97a 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bec4c7d06dc2cc287d2165f588c6764e5314287119960947d7e24dbc19ce901
-size 23971
+oid sha256:018e6226239c439fc683eead0acb733d1e06eebad54b1a6c2b43d8cbd2e822cc
+size 24324
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en.png
index ce263c7d02..0fc27b0af4 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb22d79ff43ce9a1931537880829cf5d2c13aafe3c06136c80703f2599d676cf
-size 35000
+oid sha256:ecc5f3820395a67eee396556344663844fb97dc843cda96b2545c954d133795f
+size 35118
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en.png
index 2c4de61a77..fb5e9a7448 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3c16c9a89228f83eaaa7f9bdd7c0e36a333efb541738bd38411f9f853e20103
-size 23797
+oid sha256:dc0360e2705f3e029c1f8cabf91787a98f7d7b67e6d1f003c54ca4ffd52d08be
+size 23961
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en.png
index 4194458de9..2a85b2cf7f 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e2de9b362092dbd08deadac70591d4682304c69981fe27cbbeae4f26233d4aa
-size 23444
+oid sha256:7ee6f9fbf05261efe52c247da3869c68c6e87f5132c52da72e56cf833ea6864d
+size 23833
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png
index a1b5d1bb59..afd2b2cbe5 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:919595acfee379e3aaee66a3abba61515e8bee35a9fe0250a8a227f772109864
-size 49693
+oid sha256:94014619417d8c530dc80316c9aca36dc08997f516890d7199b24afa46e71c86
+size 50004
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png
index 665a36ad0a..f86302a8ee 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:079ef0792efb31fbd773beb77a95bfa713213f8f5428ea1c12060094deac5442
-size 48620
+oid sha256:0a3d3c574589f06729b58775ca37bab9711c5566adff366d4a0196eaa7e10ab7
+size 47410
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png
index 32d07be159..3ee9db165b 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17cd489adfd7a417a6972f8e36a61ecb2bcaf2a045d33e4d2236004271d4d9ff
-size 48317
+oid sha256:277665230a31e1a47489a5124efa6dcaf51a5a442f0e6d4dfb510ff4896c9bd0
+size 48738
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png
index 9ad4c83991..ba4e6885b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:215e1dbc213d493ee6e24712aa93c9a103f1148a3ea2858ff185dfdc7084ea3b
-size 46546
+oid sha256:2044881fe3e54179333fc0b125972b2b410a4d3657faa10769b964e8ae0d2643
+size 45278
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en.png
index b7c62995ee..583a7beb59 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e3385b54a474c6d722106abe9c20eae3895eb6bddbadccf7a1112ce88f87b39
-size 50304
+oid sha256:bd5189b1079f9011162ff7ba2c9211fbfff543db892b86ea3b57ec78495d2019
+size 50344
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en.png
index b450aea25a..1be9bd5d99 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1ef764e86a5133cdfcd2595fef41da81b1eb8bca427c7cda9a5145d3d6e30ee
-size 49302
+oid sha256:96742102f57f2e58027e3402ea01c91ee1eab6010dc46ef8ff8ee3175264a628
+size 49259
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_0_en.png
index 05df1938e8..f33238c0bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e186c2798642148ef8e1f02a23600a594378ca094f6e11adc46c74ef421e8a8b
-size 77187
+oid sha256:a7ba4c8ec5ec0774719d367b806ee354b6c5c5efbfc9f81601adcb36df8e2da5
+size 75666
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_1_en.png
index b59547825f..16c7a686c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ca225207ee507d079b91b41a2335ad021eba3dc5d84744fd6c131cfd4b0951c
-size 75708
+oid sha256:5ff27a760ef37c3693fe6550b827acca665d7fb2a97bf2e17188e05aeb6285a4
+size 74223
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_2_en.png
index ddcbf9d296..bd536b0151 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b70a67dc7317be9e3c14d05d5c83efb09bbef086e8e77ef9d8e243f8cf3e359
-size 61058
+oid sha256:4aea7bd9cadb8f8257937a8862723924403a3370392671b2c75b141b5a95f92b
+size 57352
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_3_en.png
index 05da4b6f40..bf557992f2 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fd997ceab36234f4c66871bdf8809caaef106b2108b24718441e8af61a70e8c
-size 55414
+oid sha256:4322e97f3fed1a2c755a2792a7db605c09e7a6f86d0dc92592d321ae89815449
+size 54252
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_4_en.png
index 20d502fe90..a72861461d 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0a2a4ab19d5f32e5945d55d7eae9d8db198e7f5951051d35ee703e60f63b679
-size 52432
+oid sha256:e97bfb8bf9e75c1be132e168723ce0379c227761eb6011c94a9d365f05dc0f65
+size 51348
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_0_en.png
index 7b87a30db3..11a8b04d28 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4ce88cb56905fcdcdb511fe54edd4f0f8bb579e6de9a7bfcce5629937b192d0
-size 75027
+oid sha256:45e7c6b9ab1dd2fba672bd14de62ae3693bc4b3c80720b1ef93093f94eb9ebaa
+size 73773
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_1_en.png
index 1c8ac57c29..2edfe77bd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45b95831771832d69d8e5b8dbb1224fa66f3790f6d8beb546f57087db0600906
-size 73382
+oid sha256:e2aa6d286790eff5de61060bfe7520bb026ba17701e4d5261c859b355bac7395
+size 72185
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_2_en.png
index fd3f6b8b68..2be87ea69e 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87154a19bb45a01d125c6bf4a1e6a9f0a35842989cdaca07387956fa372b9357
-size 57952
+oid sha256:b02a689cae30bac692094061faf2b79bbd8b291807c15f5e6c49bde4cb9084a0
+size 54205
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_3_en.png
index 3083916d7b..559cba60a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1c45208ce974f2c8bf8fdb45653b2a1e604d646d1d5f4ae302b3e8739dbfa59
-size 52893
+oid sha256:a8072a440ef18aad57d5e7fb9f07e0c98f44740a7183f2ae8b521d772a9fa1bd
+size 52001
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_4_en.png
index 29f5b5d345..fb2e6bc4ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_AccountDeactivationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83822e71afc34ccfe3c9c2aec30f480cfc01eb51e92db21216d457be00de24c0
-size 49460
+oid sha256:ffe0581ceacf19a704a2a1f3af01fd65518f35f4cc3bee730e281dc0f41d9cc5
+size 48453
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_10_en.png
index d996699f1a..da7923cf50 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31e32566506ef9c6d34b144663b308a53f893b810960c50e394271ed5dc02fc0
-size 28564
+oid sha256:b1c09cbb0217a1fb844828590e7827c27a2e9a99ecf5aed225f4d1bd0e413c8d
+size 29343
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_11_en.png
index 9df382c0db..68b16e509f 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6e129a426f95432f31ecb5776ae24e5fed7a3025217c70831dcab30ac270fc3
-size 33329
+oid sha256:6ee66772b20b9c1cacf1f9387c173f8170d0c132d6caddfbd389d254b2ae7aa5
+size 33977
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_1_en.png
index 68d54d002a..56510ac1e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2eb71eb5d1cac83a03abbdc6ac670cb96993da8825ab224b43e593ae4b6ee8f
-size 53719
+oid sha256:3eed90dbcc789f3db882d61a31924668a42cf78e00cd634192a5bfb831f67190
+size 53659
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_2_en.png
index f71897a57b..3bc29fbe6e 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71e7b0aba9acb702371ed0eacd6d86735d47d02dfadc67e55079a454c9c8733f
-size 30242
+oid sha256:228a9ed83c86a160fe494254ec654fc0bf1d6923e78f5de2b4057d386e25b333
+size 30750
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_3_en.png
index 68d54d002a..56510ac1e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2eb71eb5d1cac83a03abbdc6ac670cb96993da8825ab224b43e593ae4b6ee8f
-size 53719
+oid sha256:3eed90dbcc789f3db882d61a31924668a42cf78e00cd634192a5bfb831f67190
+size 53659
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_7_en.png
index c34ec228cd..bdad7df7bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1c6a823d353aa2f63633bce1d0336239196f26136b532718fdf2c49c183fbe9
-size 38014
+oid sha256:64c4173147686886d5021cdaf6480644a5a520f81392ca84aa7ab5d705211bc7
+size 38682
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_8_en.png
index 651a16265f..f52aac7f1c 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:359b8ffc79afd24ba68c2e7c13ba551e9d63c72b787e530667cd5de5c16782f6
-size 48002
+oid sha256:c6c73dd018eb82fe9e54ffbe38dcc491938da69791f4ff32081b2dac7549a4b2
+size 47958
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_9_en.png
index 651a16265f..f52aac7f1c 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:359b8ffc79afd24ba68c2e7c13ba551e9d63c72b787e530667cd5de5c16782f6
-size 48002
+oid sha256:c6c73dd018eb82fe9e54ffbe38dcc491938da69791f4ff32081b2dac7549a4b2
+size 47958
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_10_en.png
index 12fa559ca5..4d2c26d91d 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84d3be38de70c774b36592543eb5636029b08f9a847566dea4f90979ec9be97c
-size 27529
+oid sha256:0b0e1f00b98e463a97c9334da018ba944414526f771aa4ceaea18ab192a36863
+size 28080
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_11_en.png
index 543aa41952..a650636f24 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93f49929a2e696bfa8a8938107d3263dcda514f34c8b5eeb6315267126d138d0
-size 32095
+oid sha256:87e337a40741a5c7bdcb2015b8f82282ae69e1eff98e30641a02314660ecbd73
+size 32583
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_1_en.png
index 53bf92ea9c..62596baf31 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4701f103d24353378826f66e6d602b0bdf43904ef6b28ee03d25af4a1062411
-size 51650
+oid sha256:66a0dc249d2df7e52a6a5f7cb3f1a94be011164eaf23d365f548b99f093d3d14
+size 51681
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_2_en.png
index 68647ba764..f97ba2a853 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2223132d7446121d8bd37b3561fc24ce056aeffc8828b197a2be8c92ce64cd27
-size 29197
+oid sha256:aba88e94521e05328079fb2ac0b06fd97987f81694b3378f02c19a20bfae2572
+size 29636
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_3_en.png
index 53bf92ea9c..62596baf31 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4701f103d24353378826f66e6d602b0bdf43904ef6b28ee03d25af4a1062411
-size 51650
+oid sha256:66a0dc249d2df7e52a6a5f7cb3f1a94be011164eaf23d365f548b99f093d3d14
+size 51681
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_7_en.png
index d233b2890d..17526d949c 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aa9c94a5f9c324a3229a5db951411fba6759aee18987d61f6ffc6d74ac79a60
-size 36665
+oid sha256:fd6d4b2d03d0e86a22c48f89f05c83b0e7622f4b6fc2a946ace1ef33e66b2e9a
+size 37183
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_8_en.png
index 084de2c14a..bf33b63f8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a952926d397cab2a689e3f4096de103bbb3075f27dbe45fff311a153ab1c9ace
-size 46181
+oid sha256:d8f9a50b522d34a29ec48fcef545a0880ff0f43d464f1874c3486adb9c79e202
+size 46251
diff --git a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_9_en.png
index 084de2c14a..bf33b63f8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.logout.impl_LogoutView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a952926d397cab2a689e3f4096de103bbb3075f27dbe45fff311a153ab1c9ace
-size 46181
+oid sha256:d8f9a50b522d34a29ec48fcef545a0880ff0f43d464f1874c3486adb9c79e202
+size 46251
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png
index 3783974c39..1a1c8228d7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9912a8d83fd78d27fa6b01fd9034a03e50bc598f10330681c51fc776d5541bce
-size 29420
+oid sha256:aaca5e5ea01adce1d1e78ab73e3703e29b7a82a9e309cd1d8a80a8539cc67163
+size 29602
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png
index f594f885e0..0ff68a9d59 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab09bad33db524c5bf21815b0573cce94a5a04a3cb1a7c5eac08788a6fd43bc6
-size 48565
+oid sha256:044400f56b5fefddf626b5ee496f7c5fbccf5a56f9ab47263f207a44266fff53
+size 48926
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png
index 336b672698..c8cead9a23 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:028dc1af0a32614235945f29b86fc75f7e4101115ca6bb24a8519d9b540e3446
-size 50076
+oid sha256:5843d766400222c5b30bec007192ec3ca1bb6bb421cb3f2b0492c1701b5a9852
+size 50384
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png
index 5a7092ba16..5e35219478 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:050194b3070ce4e062b419467c0429b4ec025bda070dbf9499ebf22094d930e1
-size 43582
+oid sha256:2743840a5dad5a37db350283fc40b4a082e942e4ee6c8152009a3afeed980cb0
+size 43739
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png
index 8888dbdfcb..e4a190a4a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:979969357697032a7b7e5e715f42434cee98e6ad6eed439baf79ca0b972cef42
-size 46476
+oid sha256:dbd46893f0ed5a3c5807178c0282731de6695e5c87723201d99bd3feb208718e
+size 46634
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png
index f1b598d66b..b9fb489a76 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6ca9ef59f9e436190c1342dcc0376c88bf46c8b6b2f84b6a487d3bf998e94bc
-size 44877
+oid sha256:c147b3396799a5a4dbd71522454380494c86a49c8acee1be560af0ba494fdfbe
+size 45283
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png
index d70c672fda..edfae4ce1d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb661596edcdda0d2a5f57c72a396624ab6f4291d07c0224cdcdeba67fa48071
-size 41955
+oid sha256:069fd3884dea316670d1f22a8b6eb30420ae2bdd09f9d33f424e050fc0d52bc5
+size 42293
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png
index cb1af3bb6e..72cc38ddd2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:834245a21eb2bb644b5d9afda81346c37a3a6121d20d5c14c562b100cc5b913c
-size 45046
+oid sha256:4472c465d39756f0c6ea58e4c97a39fffead7322d579def901598932118a01ec
+size 45582
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png
index 8b6616fc18..d10f654956 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bb9f6d15e6556e692a6d879202bf6036d9cf1b353f317b911cc7ca379c2a90e
-size 43190
+oid sha256:7cd5d4be951dadc03b1b1b6e2b15f288c990a4059935e354aab3091c91789c12
+size 43521
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png
index 02318d8ce5..3efc886759 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e01aa32704fb8d1f2b7f4325f94635b345ce3117e384923e8132a68b566d8968
-size 44964
+oid sha256:68a86112f1f7f7adc3895ec09e8348ffc6d3fbaa10aab5d6e6e6bd1365b004d3
+size 45340
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png
index 9b0b7bfe4f..a3c19e4ad9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45eb96b553465eaccc2e5081bb8b867a8cd2d4e5ed1ce66767828bfb3b7fc0fc
-size 34176
+oid sha256:b1e67ede55ba894773a6cf56a8e759747d79e15629918eafcbed25ffe6d6cc35
+size 34398
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png
index 6170e24768..e80741a6c8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9a6d982e6a414650a917da3e66b2155f8b6ce3285ca4fefd4afcd0df7f6184c
-size 28432
+oid sha256:4f9b6ee6c09a8753981689538174c865dc01a1a884c8a324657b53023327ecd1
+size 29075
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png
index cb440db48d..a16f485a23 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06180ecb1a875d6d007a528730d53d4913c733d8b1218ee69daa3df557130806
-size 47781
+oid sha256:fda686dc8d75058000196c2a8d3737ad700762dfcaf4174aeabd430f7b97f5b5
+size 48165
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png
index dba9e6d4c8..d29ecb1732 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:670bbfdc5ae48ba97911716db461ab391a57e94764508eae88c594b68e96e826
-size 49278
+oid sha256:d2ad5169a7bc3a1ce9a1482b785587860bc0c0305edc383385b9503010e95ae1
+size 49666
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png
index dfccd98a28..7815919796 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0d0257a4d2eed51e9c18f3afbe0e39fffb7440e0ce749eec8959c9b4e5e063a
-size 42723
+oid sha256:be191160f2e61430865dbaa7e94467e9fd90c77c860f89c8fea7d5f2a07b4182
+size 43260
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png
index 4022cb1368..6290b6aaf6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05e6093a0a7e2387c2c06270416e53c0654353cd1e348829c31f1377c618374f
-size 45875
+oid sha256:77947501c39a4a366deb2636d673846ea1f2601c4e16ef6a4ceef73e78bafc86
+size 46037
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png
index 7f7642064e..412682e4e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b021dfc67025bf99ca1b6ad8b28afcb29611716635a57f4c3e2b250515f63da6
-size 44357
+oid sha256:618dedf4ad81c11f17043d96ac95bdd2445ff6d5803f6bd8268ca62be1672b70
+size 44854
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png
index dc562de97b..039a376442 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:199ae1aa490d6b7c3e4e0a2c4efedc5fd8f9140d18be74baf9b67023f9bc2165
-size 40888
+oid sha256:2f20655dc5e33874f4600386f53bd4aa282d96247abfcc3f4700dc296170f6ac
+size 41521
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png
index e79cd5a5d5..17e6be53d2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b5a85043479aff4f13fe1b2e86ad4700410dd9c57219659c0b2cf93acfdc6a2
-size 44679
+oid sha256:264784675f8343f021e232fb4b5d38d58cd5798cdd0148cf2d2b152a0fc90a88
+size 45139
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png
index 4825735975..832b4fa20d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bcf537c2f4d01fef81785ddc0b8f5133e2bc1966e6837e239ccfc0a06f14d18
-size 42111
+oid sha256:24d22e617e969936f7bec26264a1a5d3413d6a1f3a9eedff2cbc10c3c4fd30ef
+size 42680
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png
index 225a8b94d7..6a36064e62 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f27444a111e07658820b19dcc780219ea80b2ea5d01495ecee1255c0e84650e
-size 44507
+oid sha256:f67a0f388fd32fb835087e65247238fcef473ac86f583ced3934ec84c7918ca0
+size 44926
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png
index 46c4f1942e..3a77f315aa 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.actionlist_ActionListViewContent_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbe4516b52f897a4f91d229f3a0f1bcd3a867d9494ac894d11452bcdf9407f2c
-size 33013
+oid sha256:5630290ef710919bd98f98c5122e21c2f62615680d967aee5b5770d47d3074d6
+size 33555
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_en.png
new file mode 100644
index 0000000000..148289d4dd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b64ae2fd2462ec3b62750084f47ec29c984ef4279a465b926c9d36e23834092e
+size 328321
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_en.png
new file mode 100644
index 0000000000..21d03570b7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:864883e9220a4d653d2d6b555ace89c77891a1ade04cd2f49d89c8bb765c6774
+size 282733
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
new file mode 100644
index 0000000000..3192cf2a5e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1885bbe8b0ea497ac20d7bcdd0c6a93ba0533e898378d35e1cafdc8c9924fd56
+size 279984
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_en.png
new file mode 100644
index 0000000000..1857dc249d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e95d7091485a2e5bb3ca8966c8fa93f21e2e5fd2d939e7582224ebf32c05b619
+size 277160
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_en.png
new file mode 100644
index 0000000000..25a72fa80f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ce3085cf45a94e014c9ea79a46d47741fb098853ac81e7531fdbfe32e8d6f5a
+size 251213
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
new file mode 100644
index 0000000000..f899ad5d43
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ca032575e4ebd75a2ebc5a4cb9f966e48cdfa56f4ff42d6d9309fa3577a1adb
+size 310609
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_en.png
new file mode 100644
index 0000000000..374a59ce84
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:846467c023fb2f6a091c6d350927c2891ddcd164dace189d157a8570339e2d92
+size 282932
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_en.png
new file mode 100644
index 0000000000..b7cd1d9387
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91472488cf265e9ba62a8b6690fa34ced41ebbf7a4668424c02464086aaf9f9c
+size 283181
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_en.png
new file mode 100644
index 0000000000..bce4dd0969
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewGalleryView_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed2c757e43dd8b25eb10acf32223168d10231ab2c9a9019ffe6b4eec6d656087
+size 343464
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en.png
index 9b77a1b471..91c617002c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54298b08251d3bd32c451dbb2076a40f20254f78806c30c0647f1bf062f3df7a
-size 399342
+oid sha256:14ad2df78cdd8422279c413e9ed2f709636d09cf04b3ee4ada5b6b53e8e42c8f
+size 402328
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en.png
index 27d8600ab5..74b24f7194 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02bb9e9de3b0ef480cedbed50483bdd3a899497ecc40ead72491106c6f6b6611
-size 399030
+oid sha256:45ade3f4baaf0b91300a6829fbe42818d754ccca64b1b090195ee40eee744ee9
+size 401973
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en.png
index 76e98b4314..f229a2a82e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e8aabdc6d15c46ee59ba0e9d2b3b3f19500801c96501b39732d7f9f95e9130f
-size 59204
+oid sha256:4ee2ee54c694a45316bbdcfba7038391fe808f5292356748e9e66f46135a9ae8
+size 61457
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en.png
index 9b77a1b471..91c617002c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54298b08251d3bd32c451dbb2076a40f20254f78806c30c0647f1bf062f3df7a
-size 399342
+oid sha256:14ad2df78cdd8422279c413e9ed2f709636d09cf04b3ee4ada5b6b53e8e42c8f
+size 402328
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en.png
index 3204029c4a..09e08632b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eba0f1d35c5456b58a09ca8370c93f0d1959e8e9aa503501cc49ecfaf198522
-size 59075
+oid sha256:44c7b0e86781ff6112c3be5b575b548c5ae6e9530f6f27a070ebb008d606a20c
+size 61326
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en.png
index 394e42e69b..171ada1369 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e078891f5a377bf42cb787f436dcb7471de959db0c4d3afa5d7cacee20b2bf15
-size 86126
+oid sha256:c6e4dd5eae99a0454d6918b65baa3ca36c2266abfd9fb37dda961268e55827a9
+size 88994
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en.png
index 50341180e4..ea4995ba89 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a56951545b00dc74fd7780648bb2a508176c47df6a2ce6920f2b8a63d15f58a5
-size 72675
+oid sha256:0c6a5c845db0d9ffef0074062cea67134bdabbe91fd1826b2236a0f92e4a6dff
+size 328222
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en.png
index 8f18c5dace..c21cab9cb2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0008cd2827cf805678958567bbce2ca86640a5f27e95ebf1c9cdbc0b86edfd0
-size 405032
+oid sha256:58ba9fd5edd2aa366b62a0a8880b6a3f6f7142861180c4109ba4904c43101433
+size 75343
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en.png
index 43c6183fdc..42cf04b201 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b08c65638e961e2fa5f194e93c3a63ead0976b13c1b9821850c3ee865eac0a8
-size 82767
+oid sha256:43a670de0512321ca3e1b5bf0c967c6bd8504df542781c4973c8806b8b95abe9
+size 408029
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_en.png
new file mode 100644
index 0000000000..be44dec713
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_AttachmentsPreviewView_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:255631b62a27bc1cc4524da4984fc444c77b10343d3a89899671962fad3a4487
+size 84738
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en.png
index 0d75fa1607..9bcae59ced 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea3552c26293d18148ff986df8b492193976e79c84bf5e121041b18e42d81327
-size 56085
+oid sha256:48cdf39c2d520bed76877a316a56509024d8a5a0f03791a68a27003f25f30cf4
+size 55554
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en.png
index 8aeb6b5b39..057576a742 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview_VideoQualitySelectorDialog_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e913c012011504cbce8e67cb0f1d0cc91430275e7b94f4f2dc1ef332c2c714f4
-size 53884
+oid sha256:b917d4400405c7617cb55a9b45d009ccdbe23eb1685ddb693facf8722e138518
+size 53570
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
index 5f51b27f5e..693a36b7dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3274314ab9e39c23a6b9d66adf80ac8bb7b364ce60a300f96582374a18bc821f
-size 54590
+oid sha256:3dbb8ef39b6a7a0c2f576d8bd101aa97c89da696f23e6d5836846494471c01a1
+size 55799
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
index e1f6ee6430..b1850a50a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e27c7c51fe07cca51b92a601aa9c58deab609bfa5e82f8f6f88eaab6ae59ec3
-size 64307
+oid sha256:f1dd0da147212e13a6c0ad5ad8f85ce55666c444076c238ea27eba5605cfab1f
+size 56909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
index bd3b0196d6..0f6de1b844 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f7f7415abbe51858f938e16ad03c6aab983fb3d5e2a53a028bae3c031446646
-size 67848
+oid sha256:28512b0fda0b71b98eab03cee15c9d3163825b1a3545670cfa277ddd5434c87a
+size 58417
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
index f4d51ccc61..6c774d4cec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a8f5aaaa7ebb0e61b07867590d99a8791c5d04cad1ce0f334d23dce6f26c6e6
-size 67276
+oid sha256:6ed6a5f1a2055e19a6b8fb0af4738845bd2184f755c323022c52154cdfa07e05
+size 60909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
index 93622cedfe..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87193a7c9eb9d40234970e5f5be02e80f2b3ffe91e2c9ca6afd58b8bccdd5911
-size 55075
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en.png
index 6e14838915..064bc60974 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31e730519a460ebc21ebee0d24c429ea22bceb164bd99080fe23b2c1c010577f
-size 22488
+oid sha256:8cb541e97832b6dfc8190c017f4bd8fef3f952fadaa13dc0622a52e22ba664cb
+size 41970
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en.png
index b83a34aa0d..bd64300ada 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:426d109d550f6298f9375c4a8406210b7d2c52a590678e5c21d4a0ac2864202d
-size 22560
+oid sha256:955ec27126825710b2829fe2447773ccaabd0f4415c92195853bbafcc8b2c1ea
+size 41552
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en.png
deleted file mode 100644
index 303a32a04d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36926eca7b934f7794ddd73e7929861d8837e9ac51341520c883043dc53d1927
-size 25026
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en.png
deleted file mode 100644
index 32c4015a76..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:493ed64dc981851887506ce33cdd063a107c8d5e6376027e7949a248b88e2a42
-size 24167
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_en.png
new file mode 100644
index 0000000000..ef4bacc4c1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07c4f0c0a8bd6f9336ba543f464f3e2ac74ac8b6358a111a0afce774f7e82514
+size 27089
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Night_0_en.png
new file mode 100644
index 0000000000..ef6e9a6ab0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_AttachmentsBottomSheet_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:297822719354940351d5086b15b4ac9b0351db5dae69fd71d29c7bbe873cc31b
+size 25558
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Day_0_en.png
index 6a73efb364..1f93d989e2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fc58451a493906def731f8002457a7c88de57c4024d38aab0feb8bf9704491c
-size 18847
+oid sha256:a3da06e8a768fb3d1987fd4dea324439f15149ab101ee7644b94d0bee98f4b4f
+size 18891
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Night_0_en.png
index 3a89d35440..71446fdc34 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.messagecomposer_MessageComposerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75a0673b17799b239c2ca2719b6ec08abe4c4fdfabe3cc0ccda5c51a7a1db880
-size 17712
+oid sha256:9a14656ec0cce306c1057f56df52122c5fd2ca2525c9803e47b5845cde361c2c
+size 17705
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en.png
index 4f9bf2657a..08d14f0832 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:839c24d04f7008a3b33be3624c71f19f01554a78903cc5d8e5337ab90d0fc41b
-size 8268
+oid sha256:76632bda4afa1bc900b1174fe68a09a3d757d6f3227b4f541e0198219875c90c
+size 8275
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en.png
index e34031a1df..85f179f48d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:032efe4da3ebda3dcc92a6027604822dabf6062073c4e556242e755adf38e717
-size 11803
+oid sha256:b40de4a02b67814007f201cea9383e8ab30f2b7b56fb1efcdd2348ee207f4815
+size 11814
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en.png
index c0f07d1314..b3f7f2dcf8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a448f6810521acc7d85904ba71ee4a3153d2eeb2c40d132b889eda774e0a6fdf
-size 7956
+oid sha256:04473b9423b916f25920837e07b2b22ba495daa5d4f2de4070b70d3dd571072c
+size 7975
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en.png
index b643773964..8f4a2e1437 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:effa92f7695f9643efeebf929db6fdac31bd608a449ab306511897e8b2197b82
-size 10939
+oid sha256:7cf8f0f420c2eb69bc6a56e9238fb720d6fada2c250ae7b2dbdb8f431dfd9668
+size 10944
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en.png
index ac1b698ddd..8a295a919c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70b06a4411aaf9fccb7dbb68878ee4a01b0987fe592a1aef6fe474dd555dbd0b
-size 42536
+oid sha256:e28b5fb8181f780a372aa944291ef23349f4acc3460786ee152d8e281e85b866
+size 41993
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en.png
index fc55c74f1c..14e06bbe27 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ed9d6c254ac362f84b9be0761f0bbd7aecb14343a131d54da4b2be0ad033f87
-size 41165
+oid sha256:d20f6311164e291ae60542c2316cb4d438058322fca1b0db0980f0579874f9c6
+size 40650
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Day_0_en.png
new file mode 100644
index 0000000000..ac6836af2b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c523f3a502600b837c07ecd5804831da2d9aba5a74886b7001affbb90169112a
+size 12455
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Night_0_en.png
new file mode 100644
index 0000000000..05f2571669
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadListItemRow_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:528c2f3183a153b9129606806fc457265819ececd71cf5021d1d843970c0b774
+size 12366
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Day_0_en.png
new file mode 100644
index 0000000000..2810ad22fd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bd5c5c53110eec56892fa6f93ae8727104d7eafef03e669181e0465096bad94
+size 64980
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Night_0_en.png
new file mode 100644
index 0000000000..ccb7dee9ed
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.threads.list_ThreadsListView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3354fc31ed4408c4b53b63f04b6faf3c590308b9c45e5a18538b0a9cdf7961b
+size 66453
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en.png
deleted file mode 100644
index 17cde624d8..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32ffbdb36ba2e20996cedee703e483176417b347feda12bbe5f13b10acae5c59
-size 22485
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en.png
deleted file mode 100644
index bae1f806eb..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40f902994ddc44bc216dfaf2a1238e85b0e1e297f8f9731795b7b874df3f6b7a
-size 21612
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en.png
deleted file mode 100644
index 9ccf324c94..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f11b581b1b7b5b0098390067f1f227537a0d30687002e429937797e3cad57392
-size 7457
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en.png
deleted file mode 100644
index 1a1e717c8c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c90af9a0afef94b7a960f5fc6b399412b05d6814d5da9ac920ff191f29ed05e3
-size 7477
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
new file mode 100644
index 0000000000..12bd190dd1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce15ca9f89274620728715e3448ce671e2253f4fed22a44035460e9a3709ca0b
+size 647404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
new file mode 100644
index 0000000000..160d58f9ec
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4e7b28b78cfbcbb6abf00317eea945859ac6465cecf81a3ad15801b0de721e4
+size 646216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Day_0_en.png
deleted file mode 100644
index fc985de87d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f358da2b9b0521c14e525bcb2bd41c29c96aacaf5f007546e6d362bde2ee3fb
-size 612526
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Night_0_en.png
deleted file mode 100644
index 176ebfa36b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineImageWithCaptionRow_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a867dda82242d2b13bd4bc84a9f1c9b8b7b99c030e19a6cce39b2f828b517f3
-size 611488
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_0_en.png
new file mode 100644
index 0000000000..59219a4d99
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb3b4e2147056056ad80681a4738aaf8e16407c14af12a1fd556431ff732f54e
+size 15377
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_1_en.png
new file mode 100644
index 0000000000..7577f6934f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e8d673869b3fd1d6be2b95c79c8a12e94732f74f28b51a38e40c166a9eae4f6
+size 39466
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_0_en.png
new file mode 100644
index 0000000000..6c7d35be62
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75fce2e957c6ba2da818557c4d02c4f96cca05541a02d51b36b72017a88f81fe
+size 14743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_1_en.png
new file mode 100644
index 0000000000..6db39b19c9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAttachmentsListView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99672a8ee0d4d22f0d15a74d4e3c8923b762116ecd2e741fd09c184963737e11
+size 38609
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_0_en.png
index c056ddecb1..e76e0db72d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcd8208f3737b5b5949af591d2417d16f2da18609f3770201f2e87577b250b2e
-size 8947
+oid sha256:45b2370c78dd907e5bf7c5df18b98df636e1099cd1de5b54923f7beb9bd17ccc
+size 8680
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_1_en.png
index 775c2483f8..429d9d0355 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d114f04976fbce895cc53c2c57df8af1e968067d4ed451c4a11b00ea008e14e
-size 11127
+oid sha256:cbbbc103c2a7b5e8d942e0af113568c28dd62863ba0cd1dfb7a5dc9de56b3760
+size 10863
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en.png
index 4854996fc2..c45bb0c16b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36487e20168db4594c519e4a6901b18d0e10604aaf10f07f9aa95d44647bdbd6
-size 20287
+oid sha256:f758005da7c969bef056ccf52d27a099e3bc5e900643e50990be430d640edfce
+size 20031
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en.png
deleted file mode 100644
index a27104d999..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3576dad3e0443c638112c329854fc4d8818f2045dd2e17fe3a0ccbe9a9b1394d
-size 11048
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en.png
deleted file mode 100644
index c2273c12ee..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b4dde4370b8bd6d2bcd8d3c9a877595661ee1b1296dec0f73b041fb556a3921
-size 21282
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_0_en.png
index 7fed1167fe..ee33147a2f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc2da3562566b433c6fc5dba185c13127f86890b26644e41d9b5c88f1d130fb3
-size 8671
+oid sha256:3c5351b6f9f14198aec7bb4bd6353b43bbf9f487e192a5c927791756dc354ad9
+size 8431
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_1_en.png
index c74490bfdf..802d8b0445 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0870cf3f791d9a1f5203e4d81c01fa986a03a5fa44589befa9f8163c834637e3
-size 10799
+oid sha256:92feff534e8ae02d574f5bddc927bf642e3199dc4f2d89a584d087058d18fc01
+size 10565
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en.png
index e3f7918645..013938783e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2031bd6ed35ec1de5a17d1f85aa52c4cb62278e56f1ec5df48c0afe2ddcade38
-size 19216
+oid sha256:2dee0c45a8848f8771bcb0b60f368ccfef29beb7528c227a1a9f07c71a0457dc
+size 18940
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en.png
deleted file mode 100644
index 6ddee33e8c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9cac5229b5129b2bc21cae8ead0e7d19b58922056064f28bf0f59074b4e21e6
-size 10742
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en.png
deleted file mode 100644
index 826b4193f0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b693ccea2549b9140beacbf2ffaa8ce409ae7c7f2f9cea0050e56527c2c03fe
-size 20380
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en.png
index 357520ad31..6e88f8cb19 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:043671b3e2176b35ab9519be38ed5711f3eee99a8583583c6fde11f58250aa48
-size 8251
+oid sha256:e155260fd46cf1550c823e2b0a51f3f6529acfd131fc73a7e66dcaca24f3449e
+size 7934
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en.png
index 36d8c49114..65beb3b8f8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd96a7daf5c19176ef997fbc80a75c3eeb19d470519ae1d57027b5f388736b1c
-size 10526
+oid sha256:49a670d25e379b2385ae14a814cd4aca9a0bdff00c3d62d31b146139c2d0edbe
+size 10210
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en.png
index 317cdaa271..33772989e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bba55beec2451cdd8eb5237e85ccaf37d98ff86435015ce019f8ef2f131fe31c
-size 20520
+oid sha256:d633e28eea9674914bb018b113313c2e3aed6463e2de5901243f5432087a3c1f
+size 20237
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en.png
deleted file mode 100644
index adf5f2263f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:207dd1bfa213f3153cf2096d6e961d4c1048664fb2bbaea546af843bb96769a4
-size 10349
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en.png
deleted file mode 100644
index a2ec73f85d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15a00a56cdb8156a78905fffd95dc5196f4267768a60a08416417322ec6c9801
-size 20640
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en.png
index c7503a4391..4441c3db6b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1b8818e2f1e5f822b9560ec30297460bab89f05d94e36a989aaee4277ae1216
-size 8071
+oid sha256:555333bf67a1f4460c0f0d71393c03914fc67cfe6f4e5161468aec1d95e587e2
+size 7803
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en.png
index 6a70eee4fa..2755d2b93d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f3bbd229376c0f2731f93cda00e4580c45971e4ac07bac7b2578d45b48ba079
-size 10220
+oid sha256:36009b81c172786ab1d87834b05550af706b355f8d044d364b1f15e58097c8c7
+size 9945
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en.png
index febf7e36c2..5c5063083a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2e3ff1bf09d9e616862c74ef29f07c280bf07af8355eb282e51745e0f6927bb
-size 19380
+oid sha256:d40a8265e7bffd24954d6fa3194c8c8c65b600518c23d6089b540adabcb751e5
+size 19141
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en.png
deleted file mode 100644
index 5e1065d2b2..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0aadd6c4d503ebf0224a941c798363e3302018fcc9e726bc31808ab7c5381504
-size 10130
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en.png
deleted file mode 100644
index a9fcd11f7e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f44732ffe4caa44b3fb62bac8a6da3e15a7917f0918314d0f1407b08c8b72da
-size 19820
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_0_en.png
new file mode 100644
index 0000000000..1cedae7a21
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3055caaede7c8a66712d4b91f82924e8ce360aba73c65b0174eaf5c881182ed6
+size 362018
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_1_en.png
new file mode 100644
index 0000000000..27e0ff2c99
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85f7b816d7dcc1a825b0cdeadfb210809beea7142fe26a9e87ea4ef86015e2e3
+size 191317
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_2_en.png
new file mode 100644
index 0000000000..1b523f9e94
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c675d5b6ea5bd2b5d1bc780cce41ecc179e4e2a2c1f0518069295d4d7b6d1d2
+size 380356
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_3_en.png
new file mode 100644
index 0000000000..1b523f9e94
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c675d5b6ea5bd2b5d1bc780cce41ecc179e4e2a2c1f0518069295d4d7b6d1d2
+size 380356
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_4_en.png
new file mode 100644
index 0000000000..1b523f9e94
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c675d5b6ea5bd2b5d1bc780cce41ecc179e4e2a2c1f0518069295d4d7b6d1d2
+size 380356
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_5_en.png
new file mode 100644
index 0000000000..e169c383a0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f1d54f890b8e463ffb2a7b7a0b39f1ff9525fee74ef5884171e3d29bd47540f
+size 349978
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_6_en.png
new file mode 100644
index 0000000000..0bc2983ce1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0141d829cc2e45571ab9d83b4bb186d4ec98c8d190bf133ff81846b94208e029
+size 367771
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_7_en.png
new file mode 100644
index 0000000000..0bc2983ce1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0141d829cc2e45571ab9d83b4bb186d4ec98c8d190bf133ff81846b94208e029
+size 367771
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_8_en.png
new file mode 100644
index 0000000000..0a7fb286f1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c27d90e1fda73f23de789341fb7023501e7a9f1080a2b8f684f3f0e923a1e618
+size 314293
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_9_en.png
new file mode 100644
index 0000000000..6182255ade
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Day_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2515f92e88a09887126a4c479a9ce803d8ead7e6d01b1bee196b0354e06df836
+size 305941
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_0_en.png
new file mode 100644
index 0000000000..2fa6580120
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:960a42eae929b92bfe78c8efa697a42f05457ec3ec8ef7fedfc97d09187a7795
+size 357766
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_1_en.png
new file mode 100644
index 0000000000..f94ac769f4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aafd40abe6880abadb610293cc06a38a1c7e995302019336e4ff33192d9cb4c
+size 191195
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_2_en.png
new file mode 100644
index 0000000000..01dad74894
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0d656a13c24c54c13e119da73f14e0523dce0ee76a9197783043ad5bca07b57
+size 380109
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_3_en.png
new file mode 100644
index 0000000000..01dad74894
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0d656a13c24c54c13e119da73f14e0523dce0ee76a9197783043ad5bca07b57
+size 380109
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_4_en.png
new file mode 100644
index 0000000000..01dad74894
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0d656a13c24c54c13e119da73f14e0523dce0ee76a9197783043ad5bca07b57
+size 380109
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_5_en.png
new file mode 100644
index 0000000000..71d008600c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:595438b4666929726f244b5f53fce3507bd6aa0fc87b10ea9706ae893a849a7f
+size 348050
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_6_en.png
new file mode 100644
index 0000000000..50c642af70
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dd15a5434b1282d154bf10b74e8b4cab4671845f5e1a6111d86629a554f93bd
+size 367628
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_7_en.png
new file mode 100644
index 0000000000..50c642af70
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dd15a5434b1282d154bf10b74e8b4cab4671845f5e1a6111d86629a554f93bd
+size 367628
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_8_en.png
new file mode 100644
index 0000000000..c272bf13da
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8e5cba748f3505bd3d34c74189c9bf1605a2cbb5fe534a3e2ce7d6df64065d2
+size 311163
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_9_en.png
new file mode 100644
index 0000000000..cf02780154
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemGalleryView_Night_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:460ad18856a9b9afefb8e8d8544f7362396a3755d0d51622c1449f2b4f62812d
+size 299907
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en.png
index 57b0b89912..90adfc34e0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2dea1019d3de891dd47d0d5e3b1deefeb0938be82afb72b0dc77c1f14596553
-size 144841
+oid sha256:2ae9812763faa89524be29c0b796479c51092e570d31667bfbb7209e901dca83
+size 225821
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en.png
index 57b0b89912..eb605cdf3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2dea1019d3de891dd47d0d5e3b1deefeb0938be82afb72b0dc77c1f14596553
-size 144841
+oid sha256:ab6262a03bbe7e4ff33ad1c0655652b58a78cbf6aa0a2e4a8f794f7b347cfff7
+size 197616
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_en.png
index 57b0b89912..c6a916891b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2dea1019d3de891dd47d0d5e3b1deefeb0938be82afb72b0dc77c1f14596553
-size 144841
+oid sha256:459141f4442bade537f755d56fe0b4569980a26b92f23409c477802462084b3c
+size 122118
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_en.png
new file mode 100644
index 0000000000..7a2c4252a6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a8c03a738592d5ad555e1cbd07b5169edc45de18044dee9139dd15763d58468
+size 197204
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_en.png
new file mode 100644
index 0000000000..40384d68cf
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f0cac0a30818ae7a2e1439d403654052bad931c8ba136bdaf37f16272a0b858
+size 20160
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en.png
index 74add72a23..179d838b9b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9305cafe7cca68c9307577533f3b489566c669cbd4fc08c724c8f492bbd75573
-size 58482
+oid sha256:d761883dee687ae4917949d64b5f6fe13daf1d54ce8ee05785967c4906078560
+size 80994
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en.png
index 74add72a23..12c1e7fdd5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9305cafe7cca68c9307577533f3b489566c669cbd4fc08c724c8f492bbd75573
-size 58482
+oid sha256:848201daee4c16c24dd6d29f6244ac24d197832c43168bb5d76245ebdaf0d643
+size 73421
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_2_en.png
index 74add72a23..140a3c3446 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9305cafe7cca68c9307577533f3b489566c669cbd4fc08c724c8f492bbd75573
-size 58482
+oid sha256:c5a9f9104c9544e32ab0ab67ce03dcbef51e8613c1444aec866ff9bf60f6d241
+size 41683
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_3_en.png
new file mode 100644
index 0000000000..78bc8c65d4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa9d77577784fe54259902d90d447ca253de22c2a9f8e62d767456a5d52179f5
+size 73006
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_4_en.png
new file mode 100644
index 0000000000..01b3bc1f3f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09893d3f2bfa2c1f5b99368c21d070ea1aa460d576722410fc2ca85c4eab238c
+size 15361
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en.png
index 804455160e..276c82c9ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ebc7039d4c3db7d0a7cf36b7cb317576b9eebac16bd29fc542193ddc78a3467
-size 46843
+oid sha256:35741e180e6c07b452c485099c11473e80ac308ae81d3620fcd8e3bd1385f977
+size 46801
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en.png
index e913391bce..1b0aa01151 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beac2c2c811c1fe6e8a1ec28fe7b17e9ea4dd6641d9c79d0b7c18ad3ec36a508
-size 48920
+oid sha256:9172fb348403a2f590f2a3fd522a9113e5a9e1fd06fae07a82a453067c5c87f7
+size 48876
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en.png
index a73ab70bbe..7072bbc0fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:737a2a37bd4b753981d719e70c366688a92ebfca62e53a1e60ae81a073c40f14
-size 48858
+oid sha256:b3e60938f89fe4e56acec088683232dcce2b13deaf55111ef3e049857dfe2585
+size 48824
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en.png
index 05d46d854c..1ed803b334 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:087de5e8ccb4d69ec2c1f12aa7c64876228c3d54256852c7b01a4944a7f34e83
-size 48929
+oid sha256:997f60386b4fcbd305aa76c71c95d50860ebb276e6977c8e9ad8d3b49ffd5d24
+size 48896
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en.png
index cdf797ba54..85edbd5662 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:effa17c9dc842c49c1b67be244f0c8c53e859fe80dab54a373d7536ce3898e7e
-size 45498
+oid sha256:9b64a00c01448b8935985343ae33912c80dd84ea2329717b8addfc07dd6ef012
+size 45403
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en.png
index 8e1812e454..6fc78b1598 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2b5f85b44464923de745354cd0aa028d94e235b8797207e82d8651a4281db87
-size 47662
+oid sha256:e4bb7cd6b419bf262fb959ef7062d842a9f58f84d85e4a928f11187ba692f739
+size 47590
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en.png
index 1f3b56bcd9..1909c9455b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffda5057a816628a946e6441a90c47a469233a61d3c8da11d39797b8f44adfff
-size 47649
+oid sha256:2aef02a3fbb01e4dc03179914298aa169800e2f866d678ea8fa53a492e5e451d
+size 47577
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en.png
index b733eaa9e9..69a497b6f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbd2c72e13e300bf3f223518f82f3573d70916ad0a274a94cf62eb4220770c75
-size 47741
+oid sha256:be08acaff0ebacc3a4158489c7bb7ce944c8f0b9246ef6d37bd58f5ce7519a94
+size 47670
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_4_en.png
new file mode 100644
index 0000000000..9238837c39
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb6b6a0c8d9891776097e0e5448c017dd9a943fe30b99735300d5107ff29ff47
+size 274673
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_4_en.png
new file mode 100644
index 0000000000..9238837c39
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb6b6a0c8d9891776097e0e5448c017dd9a943fe30b99735300d5107ff29ff47
+size 274673
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en.png
deleted file mode 100644
index 80857358e7..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54e71f45db31e8664c42f8c05feb91ae839589e00cb89d12088c15c85fb9f25f
-size 607824
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en.png
deleted file mode 100644
index 18319e718f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a2a57f5547f98b9ac2d8bf7195a1e4b49e03834e8866c6cc76660a6a3b16e74
-size 606823
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en.png
index c4f6062ddb..c3e5011041 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cab01f0ee35ce1c02d2cca172b90c34c27f088bfcd63075c27afe514c335b2b
-size 5830
+oid sha256:5cd23b8ab206543d9632589c9c6e3ae157846cbbeef683d187f0fb8a7475b27d
+size 6698
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en.png
index a3923a042d..4dcdb1b9ae 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d3decc8bb6e090f11f074cd681d710fe3dbdb1670a257757d40b7d1f1bb5f03
-size 11305
+oid sha256:b161e07f504adbb140c80945cf9cd5b31dad4edeeb86d1b683fef4f02148a110
+size 12178
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en.png
index 18a104b1cf..63b599fe61 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c57aa1289587a7646f1b594a44cb738425f3dc6fa057f4e48b34960ce7162af1
-size 16754
+oid sha256:df393203d4535dd63962cae667253c00c19dc4b6e25c887619ff5e833066f4ba
+size 17596
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en.png
index 0399d3d3cd..584992b643 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0fa280febb13f2df22a930ee56f1a9f92bbb2782a83ec2f5768160176445fc5
-size 21849
+oid sha256:6f4886f895d90cbd175fab866329841b45a13890b923ee7928673698d320b60f
+size 22940
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en.png
index 33160b2925..659db847cc 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5e6b78ae1507cba5face18a6209f535b3e8643bcbcaa5913e368d8516845e43
-size 26063
+oid sha256:541e50bba5a4dd70015bbc5410d8d8c9b0cd194ab119918f64baf73cefdd618d
+size 27956
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en.png
index 82624c2964..3fe4168506 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38c4292a4bfd69b485f4d072fb627d457c50e675c2b13534ac3f75d62a3fc38e
-size 31445
+oid sha256:2023632334cfbd15b399fce33cb5ac04135f371d6cb09669fd66f97bc86e8fae
+size 32655
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en.png
index 3ada2b31f2..15ae66d08f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d49f4b65797a915e6e2858d12d044f9745442ea9d68cd502db10589e7ffe99b
-size 5623
+oid sha256:d7580ba96fcc879011f591ac4bacd16d3c7cdc7db51f39cc7989c7c4dffdaa69
+size 5937
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en.png
index dc71af5d74..584bac4e93 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:988621910e3cf4792d9f23a69f2ec42ee46ef4fdaf6248a6ffd18f919ff433dc
-size 10936
+oid sha256:eaf905401acff2b0000abc9c7a13b8034c55d12e355908dded5b1a24fe573fb8
+size 11366
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en.png
index 90eebf14a2..43aaf422f2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b87ff2c70860a5d2c5f8a987440ff97ebbb97b03c5726948e00e7adcd3e38111
-size 16087
+oid sha256:e6dc3ec6b43eda48a6d96af60aa983c2a8c42d4da81ef48dc2bd783309de8316
+size 16469
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en.png
index ed84f96464..6382583d2d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:909bbf2ef3308f5b92a2598b32480175a2e179d6c6ec99f749594d85e9762e2e
-size 21317
+oid sha256:fa666b0e8ec6d77820c31ebeed2ba9fc9868d07e56eb77ff079b5cd2b2840224
+size 21836
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en.png
index ebc463a73c..e9321c5510 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cefa811e8c4df8643fa53a715a2509e1af9090928947538c7dd212e6fa7a791d
-size 26152
+oid sha256:e260c421c187424b8d139e75351aa3e654fcf28975aebc4bbcefd8f77c2d21d6
+size 27082
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en.png
index 7e05f9660d..db2b180cfd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c126c9ee9b6039dc05b6c8133fd5879062aee404b1a9ab2104765ba676d909f6
-size 31526
+oid sha256:48537a0e326d7cf1fc36060fd2831bfa3b237806a79b492368471de25f331a58
+size 32174
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en.png
index ab421633db..284d163b99 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35e02daa2a1f36463d5d0acdabd2b8ebbd972ea93d171daf628b643fdc995f3d
-size 4653
+oid sha256:bb2ac7a95a8c022d73bc542e379762e82f3bf29ec92ba28c9c6db5ef75892862
+size 4650
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en.png
index 33472fbe19..4b55a4723c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f5e23c5ccacb8edab5d86a1bafc482af9adfd734ea845585ef4f7c4ba52297b
-size 4365
+oid sha256:ded635195c57d4b20a2aa8925adc2df072ee0da7c4faae0f360f16c2a6eb0600
+size 4361
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en.png
index 5815548686..8d62522c1e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abc1526f441c218d39e44ef3f146d4fee3bbb0628c4ece25fb2ae4ef7e4100b0
-size 48820
+oid sha256:13573edc4f14581b14a0238a66b6fdc040ccc02d49cd670c5e0ec1eb78b61bed
+size 48621
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en.png
index e01465633c..c61ea59d37 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20c52bb8f44c186d3104d457c5de9c0597d99f0a5be37a9d8680fb4be35d422f
-size 53777
+oid sha256:d3153640c7d5f5be8bc66424cce167c44f48497bf5d91a25963a1e2d5e506d6f
+size 53643
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_en.png
new file mode 100644
index 0000000000..947dc86c51
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c24d5387bfc751396e258d4c53ac84547fb9f18f00d12e506fb747b1867aa4b
+size 59223
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Night_0_en.png
new file mode 100644
index 0000000000..c19b613595
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da8763d8164555fb531238f70df3565831fca93208b44e737b8da13711bda1c3
+size 59450
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_en.png
new file mode 100644
index 0000000000..38d7dcda9e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_ActiveCallTimelineItemView_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:757bf94f152cd24e33871165b57f3bd5c0e5e3d0666009b0be8a344c3b24599f
+size 50275
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Day_0_en.png
new file mode 100644
index 0000000000..73693b6b51
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8109af7397a43f24a27b7c988f7b6bd23e555df038ff9a272068707796a60962
+size 8465
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Night_0_en.png
new file mode 100644
index 0000000000..042d482550
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FloatingDateBadge_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25ba3336d226da0fb5956750b02f389c59b81c93e6150d8fb17d5195fd161204
+size 7705
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en.png
index 2faf0a5bb2..e1f1510b5d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ef807d846ee06add8438e81ece8570cf688742268af87b6985551c3cb2a0faf
+oid sha256:4bb4d59085cc26a284e1bd9c2e6fb7e982a1b32eae5f46282a4dde93b5d5ba1f
 size 5735
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en.png
index fdbb4a4aae..b09b378502 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46b2bf1b4ed49f02ab2ff5218ad6bf2a7e0184e022af60d4cbeb8599646975c8
-size 5670
+oid sha256:e6cf51de97f040b1028bc32d167f7c4acdbd2717c3222e1a1d97929d666cacc0
+size 5669
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Day_0_en.png
new file mode 100644
index 0000000000..d74b5966ce
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83f9f85cb577045fe9d4afa99cdd6dcf1f3a9b5f807f4827162cf89fbe9c9d34
+size 49577
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Night_0_en.png
new file mode 100644
index 0000000000..80333ddfa6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAttachmentsViewScanningContentFailed_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2599a49b27b529dc534fabe818a308ee23943ca4525d34ec38145b3d554a55a9
+size 49087
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..4cefab49f4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86e1ca5c57fe2522dde2ac9037b1eb808cd2afff4e83bbc6def1c5cec6eb1208
+size 16510
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..48b2f2b047
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemAudioViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad421c54c0bd3e25ebf07d9a005cb050ed62fef9c19e1a5c01f54f0f3cf2931b
+size 16818
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en.png
index 2a713b1b39..510521faa5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:155ad78cfadaab78089293eca38ab8c404f227e38c451dddbbe3c59cccb82bc5
-size 51391
+oid sha256:aeaeef2348e2844e300c83b257027468ff51977bcfa2d6c540f8c882d2624826
+size 44173
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en.png
index 77fd3bfa80..5dcea94a33 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b54d16054565d3ba0280ff704c350227a03db0fad93750ad6d41f6e67f605f3
-size 51582
+oid sha256:4a6c9b24bfc9159fc70b6431f106836031c69cf5308674c20d88c1570f15d105
+size 43144
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
index 70cad36fb8..0435f55de6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6ff9fab1ba47c6980973ab630452ba495c48c8a3a8a729165d8e4b349829610
-size 378850
+oid sha256:ff839731834d7d0c94fa9a2c412014ddbaeaa053c5af1c8cbd00a3f3a583f364
+size 379511
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
index 63c81718ec..9cbd5c1d95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f89057d77318350e25c3f77f805d94b0565c6da49d75c5a4ea5f720bc940639
-size 377421
+oid sha256:d0e170b4bea262de612bf3374d475fcd25470ff91b7554d20809c51857a78cec
+size 377963
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en.png
index 592d4b0e0d..a0b392a659 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87b78e2a06bf592ac538eecfdca70a9c5ec51f69e397623edcdcad8daaa9bfe8
-size 293405
+oid sha256:495951c4763e1c3015a88964683d384b84dbfce1b9569630d81ff8578a7d13e2
+size 293410
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en.png
index a84752536c..97826e6a68 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bccf822697a9710752ce5323c8b6481d7080d9eba7579d9679f451818ab71a6
-size 293202
+oid sha256:25d4838bf2587c2ccfffe83d53d556ec35ee7691e6eff91689d41dfcd538a324
+size 293209
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_en.png
new file mode 100644
index 0000000000..4762972963
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowRtlContent_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9e6d26823bf16cb281760fa157685edcfef3937dc7b13a7bd22387d77fc6b9b
+size 54561
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Day_0_en.png
index 4faa1f828a..90e9e72d8f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6982eb3368779c8e7fa602059d9af4119f450f9f2f7f384b0e1251080d286c1
-size 377103
+oid sha256:7684bb50d0012a7175957d0bbac28f68856573cea37f45697ef3b81235f1eafb
+size 377102
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Night_0_en.png
index 14d9ae5907..c7a8f44df4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowShield_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add275ce7641fbeba7acca740b2d0d6df0ed06c1c3c5cbcd05a1ca474b086ccf
-size 375878
+oid sha256:f6677e0cda28bab1973cc767606eedf86eae3a1ae111b552c6f284eae4fb2de2
+size 375875
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_0_en.png
new file mode 100644
index 0000000000..2deb3aeb0d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19708f245fe36dc51fffc9f628ba973d34dfa17ffb001ba763f21795b869c384
+size 723818
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_1_en.png
new file mode 100644
index 0000000000..b42850242b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36b99a288e36e90703a09459fbbf626c4bd08e25a98857cfb5cd75f2dbc4afa7
+size 764986
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_2_en.png
new file mode 100644
index 0000000000..ea80da0650
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50b831358465da4fd2a49de0e6029a33561bbf28530b281171690f8d25f98774
+size 744903
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_3_en.png
new file mode 100644
index 0000000000..fa21d48f59
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1fe348faa8c8adae205de19041a2e4fc3c1a82bc741c0fabf90df5da0aed206
+size 624607
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_4_en.png
new file mode 100644
index 0000000000..3adce58276
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8d89b94128b47958bafdef99b338fc5bfd3586f73fdc2b665308fe0a9be8fd0
+size 719641
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_5_en.png
new file mode 100644
index 0000000000..632aee5c4e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0782326696849e56e4fde44a2cd36197f3d1d3e08ca1f942f2ed00a4b41da400
+size 48247
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_6_en.png
new file mode 100644
index 0000000000..a736afce19
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f84c2d5963f9fc81c10f53f336c2edc1ed5b176b9c294ef22548ec17c3e0fab
+size 103104
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_7_en.png
new file mode 100644
index 0000000000..ab7e249fae
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df2867676c67b8c9db0a96de915886444242313ae1333a4a1fcc6a5d11a39050
+size 76255
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_8_en.png
new file mode 100644
index 0000000000..8657eb4117
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41d765ad4383ab40232716a22e202fc8a2fcd59b9a3a44f417631f4d880806b4
+size 38890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_0_en.png
new file mode 100644
index 0000000000..4f52d626f9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b26b7c4b25da7fed6311db1c79fc885ed7c237d48b305691afed0e4dc8c22cb
+size 721899
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_1_en.png
new file mode 100644
index 0000000000..65441d23c3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7d74b2eee87465a649e0459c42cd2db2038da51e18e8782b74db542926284fe
+size 763800
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_2_en.png
new file mode 100644
index 0000000000..4a107c909b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6c375796b1058179fd449279249217538b51688ac7bdf517ff431fe92f772b1
+size 743275
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_3_en.png
new file mode 100644
index 0000000000..cc52531a72
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec0b2e34ba1d5c05ee11aaabfddf3e4627eeb671242a44aa1a9368c1c378bba1
+size 618352
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_4_en.png
new file mode 100644
index 0000000000..349a26729e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed41ea8189fb20c22a011694372d3acb6df8f4c81e01b1a03ec0eb56120934fe
+size 706216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_5_en.png
new file mode 100644
index 0000000000..a11cab2edc
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25b3cbef7e304a3135bd8a49af18465fa79f35ebfdcf4de867163874b31887e8
+size 47739
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_6_en.png
new file mode 100644
index 0000000000..81218bc9e5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6605daf6c22d2461e82df7e37bd25a70e5c2728047fc4dd971107f977c44525
+size 102080
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_7_en.png
new file mode 100644
index 0000000000..baf457824d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b7f7fa2ac9f05d539033679c63e5ea242d4b943ac3259371b4591757ea1c68b
+size 75647
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_8_en.png
new file mode 100644
index 0000000000..c4d02de93e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithGallery_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ff7894525ac8a1582baec5a5466912dfc32a627e58ed969b7acb881fcfee087
+size 38346
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
index 3545243654..1f0fdabe6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df9a19fd97818a42de31abad719e3970c6f43ff5a5c9da18178d56055a77bff4
-size 364535
+oid sha256:b8bb5a6de6601da8d7fe59f110a054577e2e25dae4bb449f60c04e7d7a1b9551
+size 365073
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
index 60c7cb350d..86018764ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1841032c1263db6fa60fb623f22dfe403ad0b84feaaa805f22ee4ab4c0a38003
-size 369676
+oid sha256:8344427a0fe87cbf0883ff53a9ee4dcf90976a7011f6618d85961df48b2c53a9
+size 370228
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
index 6b0aacceea..058a3992c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d1104ad18d9f1f3d1fdd8d06b1ad770e83683ffab1178cdfa39287ecc9cad2c
-size 362744
+oid sha256:00fe1e676086766a3eac3e4457eff52c989789fc5d8d0df2624c019ed25ce9af
+size 363322
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
index 5632e96cc3..c6d4541184 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e338bf938a51a33a938bf56a7586f40027e6315a7274081d69ca1b7d90f4ac2
-size 367989
+oid sha256:c00e504593d8eb61b598f05f46ee4d591757975a80c0b4227b240847d2cd4868
+size 368510
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
index af596ec8bf..84d9d4e5c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc00bc0d3b8e39def6e436041ae33c7347590bd7db5593e971be1097fcea61d0
-size 352831
+oid sha256:7c609a633ab23eae5729ecb57a17a385bac65e81cbf0180c01e0847f1028039e
+size 347890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
index 0f49e8038e..7ddac02717 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7b737239c280a29096ed2e6baa119c0aa9ca43be19fc0dee4954421b1fd9676
-size 362812
+oid sha256:a4ac79f3b8fb4e231244bd96b244a4f2526d6ed28d558f9d50734d83bbb74992
+size 363909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
index 89e08bb36a..bac23aab98 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25c2bd1012f42aca6e26e507227a5c2124d467e1f5a53f904771d3ee04ea135c
-size 351416
+oid sha256:e30686c7c037ef102717e0316543faf4d3ed2671c21eca96a667150daab380d6
+size 346614
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
index 29b0433aee..4e17de6908 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a460c547938ad02671120449143521416d7aa749933b9de383426eb0739dfc3
-size 360735
+oid sha256:c1e15400fa2c5ee6087316501445c551a3932b65e16de31e68acc5efbd16a559
+size 361603
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
index 32287d297f..01d4dca84b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcc2ff819cc5ffc150733fb1d35d5c33980f3a02b64ba22ce1ff18937a6060ac
-size 369227
+oid sha256:ef2bf449671b652cb152b3baab92ab100eab77a54229ab49daeab156f2f484d0
+size 369724
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
index 422d500669..f0dfbc3321 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e0a453b674c183397bd7d73989c6076b117b77b76530ae950a880e1695b81a1
-size 354134
+oid sha256:f7a6302320bd1e4258e03487539bf46b0b12781dfc8a22b3f9f267017a6146fa
+size 354751
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
index abae0a9fc1..e38cf03ad6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:188123a9bb96d0ef73bb155dc3483bf9b62beff19c09476290c2e41deb037539
-size 367454
+oid sha256:41a0e404dea7f52359b24b3ec3926b1405429b165cfed44c63b3922ea6d3cb46
+size 368114
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
index f6cbf9e1e0..68f8148879 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a18bd271f6b62f41b4444db47ed670556aebc35ae04fab5d7469584a693b355b
-size 344427
+oid sha256:6ca8cf82aa8ab1bdad56a27584b27789402aeb7ad8fadd038280a376fb75a72c
+size 345094
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
index f85a41dda7..8aa2cca147 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec95fa651eb1c0d4177a39cdb2edfa341836ef7f950e00859330092bd3377ec8
-size 356956
+oid sha256:02ecb903124273e24151ea2088f6b99144f7dcadba00a582b6210dd23835b5c9
+size 357743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
index ec431d5dcc..b5032c29b3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab3cd83565ad087a616318e19bf61543a6b147526f5cf954ccbe9a74697e7b0f
-size 356246
+oid sha256:dce23463c335d01eb67293cfcede5d85e96ab2ba035cc9a188d42e8e6866bc63
+size 356831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
index 15dd124ae3..a332744358 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba66f3cf4dd43a7142313ded0ba4250a161f0ee81b69e49479af6cc6386782af
-size 363963
+oid sha256:588967869cbd25ed8b82aff5618175660a8a9e45a5a861b1c7867cf1913f575b
+size 364646
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
index 3299e1b955..133fd3903f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba8724c2426d9cde19b8b447adae49fa84b15dda972f2ea5ee14ec8753c5fb70
-size 396669
+oid sha256:426d1c844a8c88281c5fa4c61916d93278fdfd38f8cdf2dc54bf1a821f2de3eb
+size 397167
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
index bb57c7a9a4..0041a870b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a98bbc32b55663fb92f37d8137ced36796f8be9e6597df307cc5e70dc3c77548
-size 355533
+oid sha256:a2bd77c08be705c66225f16c29fd6826decd92b41922d0f8ffc0d1a63d8c59d2
+size 356193
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
index e0be9f97b2..f67906a37c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c43a1fc9e46f5aa0cb3c7b16138eab590f3851bc2931d49a07e1ddd298b835da
-size 354924
+oid sha256:ffa68c8398d789444151855496e5df4ffa03218a383db6ea46fd4f979829b823
+size 355831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
index bf6cbaadcb..6e83d6491d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d7b628cc474a421869207c8ffd86e46c193da3e1fe8ea115fb12574528da933
-size 364172
+oid sha256:34152c742abc486a48234e22101833bc163cf11979890d06aac41e68e3c404d0
+size 364846
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
index cf0a527c3d..b10f9741b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:531d5e33349addf7274516915d58c7b71ee6f02c7775dcfdbdd5aac22054ef1e
-size 354717
+oid sha256:3ec1b0244dab22414c6719b3309426e13128d0c70fb67dc66cd8a60d42521fd0
+size 355411
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
index dfe3285500..77abe20982 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3573fe8bc2e46dd8ec7a1802461e25fe81f4997028f22da10588f786523a8a0
-size 367332
+oid sha256:5c3d87862c6d7fc88d0f23cd54c5b9f77028992fdd7c282a195b964dd17e85ac
+size 367855
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
index 13940f7bbe..1d34761a9b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab71afb3d5dc8091553a5691ad0ec6f29f054111f4f753a4b4e1ce69804a5295
-size 352399
+oid sha256:f7d9b5fc0ff5d7828ad6f4dc0c9bd9520b4920553da97ed7b4e030ee844c0208
+size 353054
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
index 0024d09ff8..5243218ae3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dd9be6a617150efa3e26eed31adc31a91a9daf698ab1a1e720d98e946f00696
-size 365708
+oid sha256:9a85db2f5958db867578663533f204b2e803372d470da890fd8056ffed0cf46c
+size 366254
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
index 6e5f39b2aa..b6d1f07279 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:036665adb2b62bc19fac69180a6d9f3774831daa65993cadb49f9e0db67c50a8
-size 342324
+oid sha256:4bee12a6bdb18fea5ac6997671bfcb903296da7278cf69b2456330066ca31dfb
+size 342870
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
index 5c6c6874d5..ceca184bd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0894fc410211b804f62d3cbaf717443b3f91661bb3adc0b317d94bdd020ea2ad
-size 355530
+oid sha256:8e82011a72f36889c53ab61ed2b9947c7fb5f868c9b7010904fc10f4ca587082
+size 356082
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
index 7cc5d83e7b..5cdad1df92 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7311e62cbf34246e18a8cad6dd9b66f79d5a97bee7a209cf436f27df77c31c4
-size 354658
+oid sha256:9e2d8caf5aaae7d3406c703288e491f328552f0acd18e56afd5265b4ceaf1cd1
+size 355272
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
index 50421fffa8..a431a9429a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad2e5231f8aa2ece0bcdf7cf11d01fc02054591bceb954db5bde776982b3a993
-size 362278
+oid sha256:93c2df04d65f6078ce3f7067fbae8a7317ec42ed0fc013dee962a3953269f3b7
+size 362813
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
index f19ffbc4f7..0eb106f4a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fc2bb23a0d904e8b8a60e3911c5f39c1623816ab0ffc5282f794ac84dad55dd
-size 394921
+oid sha256:217ac95bf476c53d2dc6d3d0143b21312bf38b8ab86c8dfd4f9360582b584f9d
+size 395476
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
index 05df91e738..ae8495618a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15765ef6c94a2705d3c522d0bafc5494dcb182ec1fd096e4cfd2ead49f9e19ab
-size 353748
+oid sha256:08057fdc1e1184720b438ddd2a8753f00791baf2456cc30b45de8e6bdeb57e8e
+size 354404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
index e6f7683c55..9d617f6688 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6f679df9cbe470096c5f939a1781973586fd9afb2d76b634c4ccc47180c7afb
-size 353506
+oid sha256:dabad9dcd5b8f0d4bb964a0187ad7c94b023b04552dacd29a077daddfd48d550
+size 354052
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
index 38499a5838..1a8ea3e4e9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b9a9264b6637a35096b2f552a2dbe9f6fa6a078bb631c17bf1d207e10928f07
-size 362463
+oid sha256:66aba7b4271a990fac85b0bbc7cbdc371fa1e38a4da5bb4e2f62a80b21cb3a8f
+size 363012
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
index b590ba1a5e..c8306263a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b144eda9c14fe696ad81309441181008eddeeec7c6b4aa4cc3b2b7c702ae6539
-size 353091
+oid sha256:756f0cff90ddd61adce2f467c0384d74d430f6d51c091e4980e45bcc9ee6f0fd
+size 353705
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en.png
index 480ae88643..cacc88a34c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2476a6e3d5beff4360a349adb831e63fbc05962b57bb0f551ec784e28b9495d1
-size 411656
+oid sha256:789dbfa4886cacdaf5bab7bd6e501d0dd6e31af965b398d9f61d7e46c653a8c9
+size 411661
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en.png
index 75cdc28a3e..e85c9987f7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cb2e25a8f461fbb9ca9082bf94571daae1d2c886d2cd33ecea14f955eb959b2
+oid sha256:a740b9d1af8d48d5b9f9bd47abab34ed37037c7c2646d92a05af139435f23d27
 size 409955
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en.png
index 22654db502..c715905d3d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:341788fac989135f221178271ebdec2f18056780388f9413a3d3ed12904f28ea
-size 54429
+oid sha256:f7ca58c03dddd32c419bdb5419767f6d8f784256fa957c2599af8311265fa959
+size 54305
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..ddbd585aa4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:659b376f3030142fe61bd95e62c312b2272179fbed3d5fe07d9446c8d5b07594
+size 15423
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..3584a58631
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemFileViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a352a0d80264a2998ffe5c08665e752ef34b96a92430eb047badd786c0a8b7be
+size 15754
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Day_0_en.png
new file mode 100644
index 0000000000..3618ebc14e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59fe552df2e412f3850c248c9837e789e6b9cae2b659d3d9e53fb5abef187a16
+size 164976
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Night_0_en.png
new file mode 100644
index 0000000000..a6531edce0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemGalleryViewScanningContentFailed_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7942cb8112895b177dcef36a2ad9824bd5b380a6442f8bfd6d1bdf2f88b8b95
+size 164488
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..930a0ecf82
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9888d8f9f8b3ded76f601c7300c33c8d111aa926ed7bc0793fe3212710786656
+size 119693
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..e52ec14d2e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemImageViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c90a542bf2c396ec844e1e8b1763a94078f0139cbfdd1cd8ec7ab7e4e21f2b91
+size 120861
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Day_0_en.png
new file mode 100644
index 0000000000..b367521180
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a83859b4c8ef66b7d22008760b66af367affd8e6c1d7cdc099a122fea64f924
+size 7548
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Night_0_en.png
new file mode 100644
index 0000000000..52a7b44ea1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemRedactedMessagesGroup_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5d132c02fe441f9bc654ae5fad86e8409413869637f147a9853ceb8883d9f12
+size 7270
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Day_0_en.png
new file mode 100644
index 0000000000..282f372040
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9252417e89d51f89041e42a43a6685a8278832fa976b85bdc024e6cc5281857
+size 37983
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Night_0_en.png
new file mode 100644
index 0000000000..c065368538
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentFailed_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40441524640785b0a1ec20fef0c083fbd69105f48142e30a05ca7e1eae4b6c1e
+size 38889
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Day_0_en.png
new file mode 100644
index 0000000000..ba25b9ae46
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fb486b70a044bcb8f08ea66c0f1ed7059139f79c6bfc81fe18fb939ac9f0fc5
+size 34533
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Night_0_en.png
new file mode 100644
index 0000000000..2411217f76
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentNotFound_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf8e51b771605eeed282c03457918eccc0b98af6eadffbfe9c6459a472613f17
+size 35121
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Day_0_en.png
new file mode 100644
index 0000000000..0de3c37538
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5af2ef73b410ed9debbd981547300109a7b821e2d013f8d423c098d12051e8a
+size 67130
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Night_0_en.png
new file mode 100644
index 0000000000..942b61ed59
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithInvalidReplies_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c47105fc400a2abc58c1614e3071521445995914c85447a0cd408779640ed2ae
+size 67475
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Day_0_en.png
new file mode 100644
index 0000000000..8bc3d3bc38
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c7c357c58d519ef4eb2003b70a3ede6b00394be77c067867798e11597310133
+size 60757
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Night_0_en.png
new file mode 100644
index 0000000000..25a06ab957
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemScanningContentWithRepliesFailed_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9d2fe78d4e6bac6a9c66b56ef51be188d4d8a9b8cd38f8f253eb5c33e47fdcf
+size 61101
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..c867853a06
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09774478b8279b1603e5669eb20ff0eaffbcb055fa6c650f0a9beb15a0576c94
+size 146145
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..e87bb6e271
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemStickerViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b28e20d5b38ef952a949c1dd464d7eca42dd3d9b39e5afd6a91ad36e188676c
+size 145737
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..b683d83582
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:710c36047d9e1ca7c3d242cd53ac9232c536c36b3706ae22f49ab62e05e57a23
+size 284681
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..34d69603dc
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVideoViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:380a80cb0cfdd1c0ed2bb90793e640552323c9719b1914e10ca6be0abc8c9929
+size 283849
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Day_0_en.png
new file mode 100644
index 0000000000..2bfb17b0e1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9088ebdc55620f1829aa78d2b46aaa57413ed6925fdbf5c6f60bb2a1d7e4a062
+size 14265
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Night_0_en.png
new file mode 100644
index 0000000000..ac4ac1435f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemVoiceViewScanningContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:158974ba9eae0d43ac7a75702254dca08a081999a3f89dd1a53152aeb02636b0
+size 14739
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en.png
index 85e89d81ba..d8224a523d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1730ce48c314caff6efe29287609dcea9f8cc6eda235a4e1f0a0d210e36e4fe7
-size 37453
+oid sha256:1d3fd3cbe32073e9e58032baacec15591dcd1219d87e17048c7cad709402543d
+size 37455
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en.png
index 27da587a71..0ba4ceef7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78bcce34ea3a2a76333aa8f4e3bfb832507b49038c8e73a34c6ca70735db28bf
-size 35828
+oid sha256:8201b2412df88f9850a28129d354bc13f77397dc9156c598b0ae64e962e00653
+size 36134
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png
new file mode 100644
index 0000000000..4a73754a8e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ff35c533fef9ca6ddd0e0f31ae4f4d5673e7e90f6d52d9636bfa62a045d8ebf
+size 47952
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png
new file mode 100644
index 0000000000..6df8acbfd3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbcfc8e7f8fa55d007014f39be61a2d8a5a895ecb51f06d83b4f65c13302ebdd
+size 51087
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png
new file mode 100644
index 0000000000..e5528b303c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:990da337f293792e43768e9aa507581df18fac8b2b9dd01d7ad980e4239bec53
+size 47571
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png
new file mode 100644
index 0000000000..d6b7840b7b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:092e8d3ae1d219d48e3f696244cc83a53aa6402096ec6b7d817d3a115c6a28ac
+size 50750
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_0_en.png
index 77f5eb3cf5..5bc0436e67 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6852e8f7ab35f830864a94360450b7d4b78b16ce7cb75f2152757dabddf8868
-size 49599
+oid sha256:4f5ce420b36245b164131386d761cbcd003450a2f8d4789a5d5aa681e69f3a74
+size 48582
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_10_en.png
index ce251301d9..4febce3994 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:877e252ee1e0c35efef1854bf6c94783add9138148a9e910bc7908ee7228209b
-size 88375
+oid sha256:21c58efd51180d851fdba6c7ab8efa4c1777ef7339c0b8b249153b08cf6cc8f9
+size 87548
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_11_en.png
index 3907bdf959..5b74b9e857 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e157c0f0f115133f36dee9c1f1647fb8f00813a12783b18fa83c6972e92e037
-size 51116
+oid sha256:a97aa2dda9f95577c260015cc619c520d7cb363ce1f2daa1c790d4976cce43de
+size 50098
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_12_en.png
index 3ea50dcbe1..64f46855e9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00be45a05243c429344206d132d0fdbc6322c25c3c71dcab61f939070dd015d3
-size 63156
+oid sha256:fccf8ce1c5bb494b8a009390ea6dcaa0c6a17051d5f311f939006141f73a3251
+size 62124
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_13_en.png
index b9da99e5c2..4f01516eba 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a19d67b394c682e329bc232b0a36c5015dd73d09931b7e401c5d306f922f026
-size 47404
+oid sha256:7e269908cdd45a3996a1b04b8e477a75703bbf01cede83d773460f64f6f49871
+size 46378
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_14_en.png
index bd22123444..8d904ee1f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:205d1785959ccc932b6f307bbe8fc86466eeab2be83ce80b265cb54bf75cdfe3
-size 64392
+oid sha256:41adea47d3fdd76cc8dd49c1084b17544078ce3881e6b4e91cccf673efa3bef9
+size 63367
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_15_en.png
index cdd4607e18..4afbf06784 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4384708192ccd7ef69601ba4a37b491d1959f8ec84c3e70ceba148d716347952
-size 54368
+oid sha256:2a22c1ca92e494a08a5641bd8f34c9edd45129b8187af26764c4020c91df400f
+size 53373
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_16_en.png
index 32a9dd93d2..7571e9f52b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c3ebe62e38381e25e85c0be666ab6380811d2fbbea58461b917a0af4c6cb4d8
-size 64322
+oid sha256:788d2f17f3dfa8f4f63dc5a6454a4097a23ff984ec0985cf34ed3df146ba60ac
+size 63442
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_17_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_17_en.png
index b3255ab5b5..70999d766c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a87e01d7a14fa40b73c76af0e80c4f2b43ec8cd2f40cb82ef3e321d54f6f341
-size 374820
+oid sha256:6870f4b12402d309b61277bb6c1c79cf4f7184d364c9275f10679e2f656a9e06
+size 66225
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_1_en.png
index 2098c7e796..77e10c4bce 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3d8648d88afa54cc57ae97853e10d3c09e5f7a9e5eb34a1634cdd4fca11b6dd
-size 70959
+oid sha256:bd36b89a823c06f75546ecfc55474650931fa9b70700244a1c333a4cad221c4f
+size 69970
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_2_en.png
index 67aca77a8c..209a92fcb9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c94c770cbd1f41f0b50d0a64290c96e1a75bdcddbd0f850d097cd41e5f2a9cf5
-size 493537
+oid sha256:fc2fa4ca81add0b97d595a3ab69b4b9dd7296a0a92afec5c230d863df34db72d
+size 492920
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_3_en.png
index dde5ade114..2e4d309b9d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d73c338dce5b27c718cffbbf7cb1fe8f5b9d72f0d335afd81526849190d4941
-size 488704
+oid sha256:28afc0e4146fbb75e7109b0cc3f0beac4dabf2f69c4a9928d2389a6908be312f
+size 488121
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_4_en.png
index 482736f6a3..3472c572ef 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31b6fd539808d47a692e33948145732b530e465eed7356e3a47bf7da157dcb18
-size 66920
+oid sha256:4b7082e677feb1a1b9ddfdbf2f02a6ee214805ce21a17b88de7369f7b41f0ed1
+size 64370
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_5_en.png
index 44091f5537..828857e66c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea2bb433c696a382c2006381c987eae227b72a159d03d3e654397b00c909f203
-size 82141
+oid sha256:9c8148f10a526303a10cb7cb79487c94d53d4ef93fde817d8696fa6cd564ea83
+size 79960
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_6_en.png
index d56d0cb66a..6f934e18ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50307dd635bc606def8fe4b80068b7c209e17828718c7a5992127953226cd4e2
-size 71172
+oid sha256:c565dd13a3d3a40aeabf92c169f1d4afe0b324eb630890287237c5ea16f38071
+size 68671
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_7_en.png
index 72315f46c2..884b902c0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f0a63b3877b4ce2e7613164e9103a9ba935d64886ccb18646f51e0fd9750885
-size 100976
+oid sha256:faafdb864f31d90df887cb689e8166b6a8f09941391af8df6d47ffcf62d2ebbb
+size 98965
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_8_en.png
index b5a3d74b5c..63a4f0f7e1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bc3aff28b9187e987f4bf41bb81460234e4fbf1f5976de84c5f0126dfd28455
-size 54529
+oid sha256:886b3b82ebfa02b88dfbaf8a4627167ee4c6670fec6b223cf605a253d3fc5e97
+size 53683
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_9_en.png
index b3255ab5b5..c6563edb33 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a87e01d7a14fa40b73c76af0e80c4f2b43ec8cd2f40cb82ef3e321d54f6f341
-size 374820
+oid sha256:314e3df36d05e4faa6750214c7b44d685502700617d7a7c87c688beac9a91d95
+size 533638
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_0_en.png
index a93be896ec..57e72064fd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c62d43a36212da9b518269767f647493556a5082ccbd1cb3919b608687112405
-size 49392
+oid sha256:358d8aca9d2e08fc55b7afd10f9577462ac5ab1f9abe95523c2f21df12d12240
+size 49449
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_10_en.png
index 80dcc6a601..fce1f37b88 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e5dddb25a8a201e5334566c90a252111e0d8a65c9949e4f0b7d3d66b3a4103c
-size 83890
+oid sha256:acc9ef48e0d5c2bc08ca02f5415e7751357c2b3a6136440c3c7c323ab73b667c
+size 83771
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_11_en.png
index 7f114a43f2..fccd5d210e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f225e76a780b6a3eccc66c720f710564b82774250a3f229367b12cdb390928a4
-size 50876
+oid sha256:fa3a5b26a6d98948f69598cab12346ecc54edf72d131cafda69f68854e7d2741
+size 50937
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_12_en.png
index 161bc26f01..62b3892cd8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed0df44ce25f2a9f7e75d49c48a805f62bbf61f1f63ecee7f29e34f9bcae0e70
-size 61888
+oid sha256:42955e8bed36514ef57a3e53b579041d92c5f37edcd587431a8086fdf99dfca5
+size 61975
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_13_en.png
index d74c89c6aa..d0bd1ecf26 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eeddbe4e53cdf4453db6a7bd0257a52d46cfcac762da73319cf8735aedce481
-size 47422
+oid sha256:83ad6aad137696d06e00aa575d5cb35f96f0d90a61c1eab2a203958da2a73008
+size 47474
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_14_en.png
index 6ddd6f5648..8a8920e572 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:143ae0c737a60e42370c10cdb39c577b91a151fa69079843e740b9edc7c5fc67
-size 63288
+oid sha256:513cb5cca0f8bea0af4c6272faa93c9cc6bb39470a90af807f1f8ca7edd1fd37
+size 63374
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_15_en.png
index 1cff467cbe..ec6ef92b50 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4474b2c524768d2493b7ffd6c05b43f486c595c23f1ea641ba7704fad7181d0f
-size 53792
+oid sha256:104638ce62de3f283f4bbc1ee3967816b88d84a6969cfc0cdd3a50f716ad8096
+size 53876
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_16_en.png
index ba24c369e1..9f92d1622e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7e7905c6765db72a06c0dba835e34556377fb014476f0ebb2a68a6b93d05314
-size 64889
+oid sha256:ee37c77bae1dbf13fe3d22650828bcd4b636b9be847ae0bb23ecfed0ce037313
+size 64974
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_17_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_17_en.png
index fc5e6d8e98..6a1ef10cfe 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac7741cfc4ec1d8fd9c8c5bab7dc3dcc0ba79932b5a1ab325573b7dd3622c4c
-size 153022
+oid sha256:204bd19f811ab2da4068165b67e2260d0855332877140fd67631a6f9e89c0455
+size 55640
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_1_en.png
index 6c57315d3a..0fb34507a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1ebb6edcfa045967fd9d9a2b554b1e2bc1ef0e20680661c0af2d8530348ab72
-size 69388
+oid sha256:3ac772343aad8977a8618d69a50d97ff4d9818eb5869c3fc03e58e43f4b4abc1
+size 69473
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_2_en.png
index fa93db2f0d..461d9f4310 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c57dbc66342263c4ff1d47c18099dd2cc22b752f1b6bfc853566706dc0cf5110
-size 486435
+oid sha256:2fb3a106c42c8176321be45a2334b185c59ad7c12e3fa099b4c9ef0b4fc98c3f
+size 486526
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_3_en.png
index 150b2b0c87..ba28533f36 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d4fff1585f602d561a98bfbd907d3c7499e6717f488eee711e90f2b0f5df7b9
-size 481595
+oid sha256:17a7b359ec376b3fcd4bf4bd60d26a9b0ea5f6319d1da291006c1bf36d3f1b39
+size 481665
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_4_en.png
index 41d2ac5ad9..08368478be 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bfcf8909d3414e517357d82c203c5464071b3f673d7623d4f75b6c18f25e22e
-size 65742
+oid sha256:e49aa7b7b5245cc48851ceb9d43e2cfbf4df07e427baf071f81717e0ce454c62
+size 64186
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_5_en.png
index ecf72ec264..6190a8ede0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d3d27b7a366ac20b287f7587866dba06dc5667ba8cd3b6dc040d8ee7e3adb94
-size 80499
+oid sha256:434369f889778088c1612a304a4d7a50de90048eeb0506cd13345567cf0dd0b1
+size 79196
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_6_en.png
index 17f8b1974c..1ab4e96ddb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdf2031afb6d849812555f8b38f6b0f1f65aa959f3cc9e468fdeece65c150858
-size 69980
+oid sha256:91ab3270af1a376d76ea3457b9e083036ba009a95794fcbddcde62f5a6dbf2b1
+size 68637
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_7_en.png
index 780f2f9094..02d19f3878 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0034ff36f0d58e30ac75b36f0869dc27f617d9f1dfb1cf00b88c9bf32d23986
-size 98632
+oid sha256:9ea0d765a77d9682e376021a2c1c65b9a6bf00dbe69a0762b8c0abf9d0634880
+size 97456
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_8_en.png
index 67777f33f7..e7d088463b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24c430f5d40a0215e5c11348d40d2b9a50cf5bbc6639e5ebdb408004b0f3024c
-size 54499
+oid sha256:d02a19a7067b5ab4a6eddfdc50179e0457ff4e40f99746cd384bf5ef528f019b
+size 54581
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_9_en.png
index fc5e6d8e98..016a480809 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac7741cfc4ec1d8fd9c8c5bab7dc3dcc0ba79932b5a1ab325573b7dd3622c4c
-size 153022
+oid sha256:e6211f8de0d2ac250ea4318532c52bc5ba13e5f964a75424df0fc1c584f66f2a
+size 216195
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Day_0_en.png
index 8c023c5e17..bcbf444dd1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3136c95bc9134eba4cfdfe8d552473a54287c356bd3895291b9cd4ec11969d9c
-size 52706
+oid sha256:7faf196e521dd713a99a7ea22786a429c937884a25194ce4bbbd55bde12e8bdf
+size 62797
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Night_0_en.png
index 3b3133cf67..abd96c1fb9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_MessagesViewTopBar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6770e720477c2547f593c626cfe3bdafb9b7c78d0b66e910fb9eb1163730045f
-size 51707
+oid sha256:292167265d9c1135e545b911f7268d45a9a0195768fd09fc88c1eaf7a5c57b09
+size 62322
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Day_0_en.png
index d4bf4bc165..92a01e3e98 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:397966acb792f1a20a79cb865dbf38687244baa9dfa3bc6ceea74919446ca3e5
-size 32476
+oid sha256:8ff566d11223b1a330174a0200848442b510aa378603a79ec5017144f5b8979a
+size 32743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Night_0_en.png
index 58e0a3469c..744713a8c0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.topbars_ThreadTopBar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:434edcb217dd174b57435f1ff2f86cef8ae025ed7a058da229e1335fc0e00801
-size 31748
+oid sha256:1b866f67d78b4add03de052d0eb993e596bd8afd6a77f4cf27ff7dc7c17d8c51
+size 32263
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesViewA11y_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesViewA11y_en.png
index 51846a888b..f47e74ab7b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesViewA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesViewA11y_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba76e7df81874aa6549a5f8ca7987046a4b43a63852c83fece541dc319e839d6
-size 131727
+oid sha256:5823ae9a382421609200d569799505706180b94c6923f315caa81f8767ac58f8
+size 131340
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
index 3501707206..144411969f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b92c8a8283be1efed5faf6fb5f8a091f225dee38fd95e1a1b1914fa06661dc21
-size 56261
+oid sha256:84415250503d5e586af7b7504aaa915c1e24dec0a3d28446487c474c354e05c9
+size 55534
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
index a63b53d2c1..52e023ec49 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7fdd2e68114457368c5d19fe117b2d5a86a02ca475925c9fae0269ff92f5144
-size 66312
+oid sha256:c8420417cf8ba717747dead34b9646515f35eb94e1f71aa952b77c3ff433043e
+size 49684
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png
new file mode 100644
index 0000000000..adabb6dde5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b071ba6e99b68dcc75f5aaed3a879f2e30614c954b88c6dc05e1dfec57f1079
+size 65771
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
index ef8699b324..6c2a7e8460 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f21b1799dec6cb466378a748adb5227f76bd6cf611be694922ef63a951fdf692
-size 39910
+oid sha256:984536295516b542ec6aecf7d07baa3c6dfebbc66403b6d4258a6217616cec93
+size 39991
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
index f00e72d033..a1dc68a3d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d1a8746f4dc362d7d1caa424b18c09c3d2e14753e8d6599267d472a61e197df
-size 59137
+oid sha256:871d92a7565dd233ea87d53658be4e5202775def8e17fea8d386b8975c3b065e
+size 53868
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
index 58e652df1e..479d07ae5f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c89a2eeba5fa540b6ab6516da1d8dd7810ee0754149a8a7a07cbae2182d106f5
-size 55364
+oid sha256:0d4f03ac10bbb676d272dba906e758b25d633a1da1e249fe23ba825f8d2f4901
+size 55298
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
index 11901f4244..c90dc8d08f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:094f9dc069bfaa0a5b168d2ec41e0b3d9e9dceb135815cb0f07ba4cab9dca669
-size 54108
+oid sha256:e48a364a28a67d7d090faa23ef88b27dbd47f0a2f552857490728cb6952ce08b
+size 53454
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
index 6e06afc836..6c0a7b4edc 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:832b227fc82b946df042658d134f1c699c720d3e153576259fb145ec9d0c4c45
-size 58441
+oid sha256:f5aa22c3d79a392625ae231abc046f07f7cdabd91613d5e6f07aede5382aba9b
+size 60410
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
index 4c3689dedd..ac1d94a4dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b14de263a1f2356b3e84b2a633b0ed837bd160d04c1ec8eeb8c55176856e59ce
-size 48755
+oid sha256:be5b086ab6934bae88b39987bc51e709c5adb81bdd04fa028e97832c725fd68a
+size 50219
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
index 461d173e97..2209fcb54f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:407301c3ad51be44fcfcd804954a672e677ea1bc59af39e4269100acc4f720d7
-size 59368
+oid sha256:bd0de7412503e93c33cf92dde0cff38bb68555ef176080d913320af5e4942e7a
+size 58642
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
index b8d8a2cf4c..82ef5e7d6a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cb21bd5e7d348d1d07ca4b6a360f26a4735cc9760fdd7e3b4b1bcde32da6f08
-size 62655
+oid sha256:41c4bd5cd1bcbedd91de0a64967fb3f3e03b5f0937ae1ea1a93a7c4a1b24a4a0
+size 56262
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
index 284f92cb26..135d84dd90 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:473a4f7d9623a7351399d3fcf98e30adbd31feabb23efacda83fb68460b75e48
-size 50912
+oid sha256:4ff538a81d013fdc90dd7be466f710088eea93e081d23448b0731d301a4a3bb2
+size 60702
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
index 33ed4fd667..89fc6708d2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccf988123f7fcf7a2d6ad3914d3e1a30dcf99c49ada7fb7dbaaacb64d7f2250e
-size 55562
+oid sha256:89467c5b84d0a15210d4013013598d9994d3005a2299e44583d78355e6718ad8
+size 55538
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
index d2b5044048..17df34a50a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52441a5e250b027ddd40ee32754a63c6206762084f47ecfa7e057e2ac77e78a8
-size 69120
+oid sha256:6548f5bf1906e1dddcbcc03bb8f76b42e604075751ea8efbc3ead826bf4cfad7
+size 51258
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png
new file mode 100644
index 0000000000..b3109663f2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10bce6df962a5198f019f509b1cdb55e28195587de4b74742ddc29833f1333a4
+size 69216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
index 51a300b462..1ff5ace3e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84a6b1ef879f1a9be16526efdd546aa554e03ea74b0e8ec03178b2a860b752e5
-size 38089
+oid sha256:8d875f83a3a1977e2a2cf151dcf9d731108a8590eb3643eb057727421eb1e955
+size 38812
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
index eb13905340..f425dd2c4c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f988610da5b4feaa47eb9e5224f9b0d2d47633d9aa8fd45117fff75f5040680
-size 58673
+oid sha256:bd6dc088e16f722b36c2198d6a8611af87dec2451f94ca3c2b6880b97f709b98
+size 54095
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
index f926ca104f..b0cd5bc6d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1612a4b0e0df958cf99295ab318ed8260d5c12b705f65f5db4ab2341930564b8
-size 50518
+oid sha256:5e900ff75d02c9db4200e2032444dd7e2f8635973cca3389dd96d7d2bb734061
+size 50757
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
index bc016b9861..486d5da5c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7078a6ac34df84c959f6e2c206d818822a58493673749a3b89500a1ef1c0acf8
-size 52949
+oid sha256:e482603e6d03fffb57d4eb135edb6209c748c51b1f07e638a4ccf133b1b87a79
+size 52920
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
index eedb0c1ae8..5a877a59e1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f69563c42d5315b9e4203719128340fab045ea3473c494e1a1376fe4cbb3f0d8
-size 53521
+oid sha256:5a582219d3143acb08563193bf7106e1ee8f6612e359d0a192e9a2f67c6799e3
+size 55375
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
index ffae0459fc..0383bb8f95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:539799354ad5b383c308779b1278e879db4542d9d1c870c13a54a0ae927767fb
-size 44098
+oid sha256:7c88b3ed8cc69dee59d4d0a726a9e383d00f2815b6525315f7dcd96f9c25ec2a
+size 45618
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
index 1b03d639f8..952751a962 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c623703f53cbf1ae42e1d05af88e3c94e5b438cb96a3dc5cd234026b29bf0e0a
-size 58286
+oid sha256:ed13a2778b8ced86ee41d5460d274b42b714a87f59749e3b26bf75114ef40dd9
+size 58265
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
index 6e371532de..0f7fe2db38 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86273e812cbc6245527c3d1f138111ece99375aec0d68728882b656b01687bff
-size 64392
+oid sha256:a576d52b840730334a38046cf8b57993693fc760b4fbdc00376cb48b7268d76e
+size 55890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
index dbe5409ce1..4d6afdbbb1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba5ae56e80ca9f5d3e5e2e0d50a2cbda7870c6286f350764dac7817d533d6c18
-size 51735
+oid sha256:35069d4fae829d9afe479308dd72ad025fa011290d23133a231f4e70f601ee75
+size 62987
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en.png
index 175a0f2bd1..cf8d2098fc 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c864988e49824c3618904cf42363c1fe538800b1f84aad2c66ac654f62f434a6
-size 21829
+oid sha256:d9ca948d2f322152fb3d744352c516da3969464c58d200a9a86ca4e94a421782
+size 21779
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en.png
index 214d636e46..46eebf12ea 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:452d8bb3e6e0310e4c73144aad5a576786dc48e4070aaf63bb0c3e9da0159595
-size 21040
+oid sha256:c3659fdb2296ba5209f1dfb9715f5aa15b53e40950ae2ee874668382d48721bf
+size 20998
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en.png
index ab26a4d6e3..30bab8d633 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fdf37958fbaa5eb87b1ac06664e28d3aad4dcf49b2f778216caf469e00a6208
-size 21558
+oid sha256:c840fd342d8e0d20b467459ce55dd6efe5e8af7be63b5f04381f8b207bf0ea20
+size 21506
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en.png
index 7f82d27887..dc32bb8c39 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:449174be2973e6ead2b3ead2e0e17602c81d1e033d4748ca73c9d23fb85f786e
-size 20691
+oid sha256:cc466128c5ddf240505abbacbca4b64c4b5386c1f11c4b2490d7489173aaeade
+size 20652
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en.png
index c9f8004adf..a6c63537ca 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b905fa0c4db60d00f0b6ace10475938e7475f9a42485a196106ad775b0dce94
-size 21637
+oid sha256:b1280c50f1cef592973121e772c05767b3ad7dd73a69fdef767be3ff7ec0ca32
+size 21581
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en.png
index ae6a95dc6a..51329440f8 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75e459f015375792833cba105472ef353246726cbfe9558897b439a8f113d51f
-size 20793
+oid sha256:3a04a75d043d911aeb5378ee65ae711edd6d02366ea0965e3a6db4cad30b1327
+size 20747
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en.png
index 8830de49c7..c0026065b8 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12c33a0e0e3c2adc8c84d2abc6c454481ec5525bfe4335edb76f29b8e0c47530
-size 21886
+oid sha256:1e7d403a1598ffb8f4741e8c1d22ef5ecad8a00d341804a13408bbba15f20102
+size 21852
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en.png
index ea0c67b60e..0ae568111b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f0195e6a8ac94d80fc8fedabec7890c1759a9c8f0869c04f4091d04d6d458f0
-size 20909
+oid sha256:7cde74ada77b24ba095076aa7bb64a3c2f176a5d918366e047869fe8a014ec06
+size 20889
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en.png
index 30fac7b3f4..c12ce989e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:feb7baa6462360a9867bf933ecd58e8a93903319d8c481f08d5f5eff68327809
-size 21767
+oid sha256:224efbc64460928f67f36aafc136ed39c08af1821681f174575b439cf3f838fc
+size 21732
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en.png
index c04d74a07a..ab4515dc83 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:794736fcffb4b5b5738ec8572b7e05aa74fe02571a187d85a3cec8ded3385944
-size 20804
+oid sha256:327382d2c29eae52cabfd23c8cbaf918b476bbb4599b34c895ae2d8cedc97ae8
+size 20779
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en.png
index f44e0b112b..c8d2b45932 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ed073c0daa096dd650b271bc5956937147b03ed368c3ebe2bd6bef65a8ceb55
-size 19940
+oid sha256:8b006278f82e5532708959622bf2ea02a36a0958fd88fb17cf01e578ce6d041c
+size 19886
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en.png
index 74018e58c7..53cae5715b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e5ed9ed51f96eaf89818c5bc8eda71ad922b302b66167e325e75167fbf7830c
-size 19250
+oid sha256:a24f72385732af0d963bd4d4ba43f4b19e4cf884622ce492adc8773724698564
+size 19203
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en.png
index ac3c021439..1db5159272 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf3dd646cdb9edbb57f67004b27293be4c207468c951d21dcd38736d472c4572
-size 19671
+oid sha256:7871b48398cf6fb5b7879bd7fc6abdbc77610175bc1f65694263882074825b26
+size 19607
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en.png
index ffaa88b0c1..51821ae3bb 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fba79bbabd808008241427a7fb9b679e14cf421aba27cf07f858a22e8cde986
-size 18907
+oid sha256:3a454b9e5738339b8f41b777097a3a97cfdfddfde82abfe2f684baab7637fcb9
+size 18863
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en.png
index d0bf4cbe70..08887dc916 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:535f0ebc9954c43d6bbf5aef6b0a7e3f601f6b144ced1ab8849026fcd9b1d24e
-size 49054
+oid sha256:06bcc1250d5bd298072c9433f9bce37cd732fb978c3ff8cdcf5a19533a2af75a
+size 49012
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en.png
index 3ed6965647..16468c9693 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d7d8b78fa215494248859996d72763077d915be680ed07068195d9cf46aaab9
-size 47785
+oid sha256:029032fb1ab1f7b4a6f18d91093fbdb2c1c84b8ed60c1f66827028e538f2a04a
+size 47729
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en.png
index 63a0f51e47..337e63ea5b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e6432c3aa20c0d2ee9e070e3b2c076aaaae281af0bf222d26f762a91b5051ac
-size 47262
+oid sha256:b56a9d1d8e97f181c5e28644592246163aef7e8d340bb9bd40c710638f3fe15f
+size 47199
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en.png
index 2f538779d2..4aa852f6c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cc90d8a47ebb2be4d2191735dc8b672e350f65f514feba064442ee26712a7e2
-size 45634
+oid sha256:af665a28986ef9134cd09636deee127b26118fbb53d2a17aeac61b99949c8b49
+size 45575
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Day_0_en.png
index a73ab70bbe..7072bbc0fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:737a2a37bd4b753981d719e70c366688a92ebfca62e53a1e60ae81a073c40f14
-size 48858
+oid sha256:b3e60938f89fe4e56acec088683232dcce2b13deaf55111ef3e049857dfe2585
+size 48824
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Night_0_en.png
index 1f3b56bcd9..1909c9455b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewCreator_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffda5057a816628a946e6441a90c47a469233a61d3c8da11d39797b8f44adfff
-size 47649
+oid sha256:2aef02a3fbb01e4dc03179914298aa169800e2f866d678ea8fa53a492e5e451d
+size 47577
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en.png
index 804455160e..276c82c9ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ebc7039d4c3db7d0a7cf36b7cb317576b9eebac16bd29fc542193ddc78a3467
-size 46843
+oid sha256:35741e180e6c07b452c485099c11473e80ac308ae81d3620fcd8e3bd1385f977
+size 46801
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en.png
index cdf797ba54..85edbd5662 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:effa17c9dc842c49c1b67be244f0c8c53e859fe80dab54a373d7536ce3898e7e
-size 45498
+oid sha256:9b64a00c01448b8935985343ae33912c80dd84ea2329717b8addfc07dd6ef012
+size 45403
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Day_0_en.png
index 63a0f51e47..337e63ea5b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e6432c3aa20c0d2ee9e070e3b2c076aaaae281af0bf222d26f762a91b5051ac
-size 47262
+oid sha256:b56a9d1d8e97f181c5e28644592246163aef7e8d340bb9bd40c710638f3fe15f
+size 47199
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Night_0_en.png
index 2f538779d2..4aa852f6c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewEnded_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cc90d8a47ebb2be4d2191735dc8b672e350f65f514feba064442ee26712a7e2
-size 45634
+oid sha256:af665a28986ef9134cd09636deee127b26118fbb53d2a17aeac61b99949c8b49
+size 45575
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en.png
index 0fd343dd00..66c2cba60c 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4153f27072a59e50417c450d9c6c9a48022f58aebd4790ae4b7721fafeb06789
-size 44788
+oid sha256:79194c49b72f05396e3ecc9faf9041edaa2fd98bb0a154cb1baeaf3a95701d0d
+size 44715
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en.png
index bce5d3b342..f59f7fb149 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55a9bdd99147171bacf97a0aa1e9e4ef04cf09ff07d6785c3fed7b09c24acdbf
-size 43271
+oid sha256:bb8b80c458e9d6581e0a33651dcfa29ae0a0ab610913fa686a5719e4b887f7df
+size 43196
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_0_en.png
index c3fcb2f17b..671ccdaf1d 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:038ef6a808291c6c03fc9842333717a72d918b41dcefc30c3aa7e0e5690d6055
-size 31824
+oid sha256:d71e5d6bdf78f145e573181ba8fe5faccf8fc8121d1b0318affc786222166bdd
+size 31928
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_1_en.png
index e445e1c782..8d7a518c24 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb823650a3a78f45953cb968a30cc673ee0e5bfee8b646212b652f2b6f3ae48d
-size 36228
+oid sha256:e4d08ca16ac4ebe85c49387264490c076aa95ed0aa15f467acd0f6d07fa6fc01
+size 36340
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_2_en.png
index c08d1bdb2c..19847bbdc6 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:280db5d8836456fe0a1e0e080a1274dab4a42b735608a28198e3a40f59ef15c9
-size 37918
+oid sha256:30ff43a32b34192d49dbe9763fe7649c8fa5723c7f2b9ae6ed1531209d986378
+size 39885
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_3_en.png
index bb091e461e..c9a0b43e73 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6a1b401b0420d859936e6bfb65ecc42b8d3eaa600fddef9be911c756d78fbfc
-size 43897
+oid sha256:9a5efead7d85b19215a64ccdc9c1f6ddf66558a27358eb197aeae1aebbac71a2
+size 44019
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_4_en.png
index 67ad86e31b..0a38e03a15 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae2450611431109228d8e132bfc84fc854badc5889fab552c931d80d3e8c3038
-size 26522
+oid sha256:a447e022d725043ba4a44dd88e49b6b9c20ca03882badb664b371ca310982164
+size 26018
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_5_en.png
index 9d83a40154..948557114d 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:031a0e01b9f50db515ec679624f8061e3f9675958b03eec694d9610e2746210d
-size 115797
+oid sha256:b41e96ed731afce2b7a8924994d6ff38e5ff62ee1c4ec1f5ed0e535bae6e9284
+size 115996
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_6_en.png
index 4dabd8c886..ea57b81992 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ec17842ff19c481f860026ff97dfe46f0fb48b9ff85c2f95a03ddde8fec0b24
-size 32486
+oid sha256:3c2b6cae066cb50c3916a08009041d7b2a3335baa8e26e8a29d6bda75818000c
+size 32650
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_7_en.png
index ecbae20f54..b025ff46e1 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:007187362281fc7abc71f94ee8996f966d55a710f61988adb09ac73f988e3922
-size 33734
+oid sha256:f3c20f5f523433f9d750736f006780d943beb47622190bd91980391f2a0ec55d
+size 35996
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_0_en.png
index fddc69fad2..5833854bb3 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dd7f6bb021bce1532ef665c518fb12f45223e8fca3f90bf30d05c2d6d03d709
-size 30830
+oid sha256:cf48171815e7af7568af42d81c861cd6d66f413f16f76afbb5f472828ecf826b
+size 31053
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_1_en.png
index 882d4fedb0..1052f840ff 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01f7425cd0207c270e5b4d538b89d6258d71a8b60dc40da3438233bbe6fa1f75
-size 35092
+oid sha256:8f38b81f5df1f85f449bc22bd52d19f8dfda7413fd50a880dcf87af6b668a00b
+size 35195
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_2_en.png
index eadb4475c1..0dd50a54c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ae04292e7b83d8347c0f15e3c37cfa5803568474f03d8fff87c67fff272346a
-size 35835
+oid sha256:e7f6f50bb7b1621f01f21cfde24961080127715be540435a594c356712f10501
+size 37658
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_3_en.png
index 1fce182221..d07a35f70b 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:472d4808b40eb045946656cc6a32470e90afb3208ea6233ae4d0c99b464be520
-size 42596
+oid sha256:9f3557e5598202ef6d965405a4711bd93f4b7fbee5585b5cd3d4ba8f4307b1a4
+size 42713
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_4_en.png
index 50ac05a062..11dc7f1aa0 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de4afbbc0a45396043659314f2a8eeb4694c64b21f7ff344f0753b94a5e7ddea
-size 25915
+oid sha256:8972d37b3dc0a1f024e1853ba0ed6667bd58eba022a810ba7de837478710d3f8
+size 25333
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_5_en.png
index e542eaae07..30a11d78ce 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9360422defd28223480d6c42f75450b0b092907f65461b8056d04c73aa7480fc
-size 112589
+oid sha256:8c75de675ce72010a888c459c173f82b5d782d8cb18a4648abdc88864222cbef
+size 112649
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_6_en.png
index a386a003ce..69a97d0dbb 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5684d574033abdd23b7831dd8c8006e012f392b2c3dfb786519362f26a194a5
-size 31460
+oid sha256:0fbf59e6846ba24941ae9278abf6fa80af208ca5eaea2bd2b65b3c9954f11992
+size 31662
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_7_en.png
index 9c0a1b0bcd..93a9905735 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.create_CreatePollView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6acd80c3b53ad3b077fa0075a3702e9778430ec51966ed3c50039acadbf97a4d
-size 31465
+oid sha256:9954304cc948652c3c63378ac77aeaba623398b72eab6bb90d23b15850fe278c
+size 33522
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_0_en.png
index a3c90658fb..65585d6b92 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:505d223578e9311861dbf7a20e1becb36148b9180a687feea7232ec717792f86
-size 56650
+oid sha256:b47d1d3babb5c9b59e975ececb12829df9f2e576ef1487daba8905360260bf6e
+size 56521
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_1_en.png
index 8c8397bf39..b92844eb05 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ef271dffed2d6e32bc61d4c48d16e339f1acaea5862ee25c602c06f1b9bc956
-size 60668
+oid sha256:5faffc0ee9d5b5f3780c4eba1464d83108e65bc175e4659770ef0266d0883285
+size 60548
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_0_en.png
index af1499cc0b..281ef07c0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:184281a9d2f2a14431d4e6b50a9e876a75b75a202c8e7f598d0f60ad5218008d
-size 54967
+oid sha256:1e9e1fe808bb06c2864a9ec68879ec7940cc049761e23947d3691f339deac6fa
+size 54874
diff --git a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_1_en.png
index a34af749c5..5aa99c7164 100644
--- a/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.poll.impl.history_PollHistoryView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74ab54160b7f732840b0ddf950a6efb0708d9227a72b0c03e798c83f828cbd0e
-size 58794
+oid sha256:5daf469c7f8615c9b3167246027e6f2e366f4bb9a984d5603559fd00467274f1
+size 58706
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_en.png
new file mode 100644
index 0000000000..23ba289315
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d74f05d69143cde114ee981ea2c49b6ebfcab5994c2451fb3ef936b477786a3
+size 60801
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_en.png
new file mode 100644
index 0000000000..325a77149f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7538e11f392e425d056c000022a32ee4a88b1ec33be0e0ba68cab3a84a69c39
+size 60649
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_en.png
new file mode 100644
index 0000000000..436907f546
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:635ce47036453925a6303816797c6dc3d5d613e6dd3bcf10c1ba2428813195a6
+size 60634
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_en.png
new file mode 100644
index 0000000000..2c761ac5df
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:780efd313de655f8211c324c521c88bf009082ae517cbf83cd6d3650dc2f1759
+size 60630
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_en.png
new file mode 100644
index 0000000000..e2859b19f1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0b1b2c6612ccfe175cc658ae81157e177549977c3c075d419bdc46c21e6064c
+size 60542
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_en.png
new file mode 100644
index 0000000000..9d17505333
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8cf10c47f698c6dfba261d49c315abe2e79650bb9f652b8d6b726bfe0196d25
+size 60800
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_en.png
new file mode 100644
index 0000000000..660d893e14
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16afd1f8b974fa81d03b0ca352b75d7a8b25c6df66273dd4862c56fd8b4a539c
+size 60313
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_en.png
new file mode 100644
index 0000000000..a52819a016
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bf6211cd7511a26a9c07f8a137c0f794fbb0ad647014aa34728bf2e2b157f0f
+size 59837
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_en.png
new file mode 100644
index 0000000000..aab0590d07
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewBlack_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b913ccace51348544dc7cba2ff7913d72a085cbbe9f4d36af80f6d18e0a79a92
+size 62940
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en.png
index 9feee4d98d..851e05c237 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b832525da2a7744eff8165c842652bfff4742b728b000b1c8ef8be81bca75efe
-size 47052
+oid sha256:d4579db3ec0ed0574eddd69f3b1ac4e6476e293c4e7480f1486dec2ed40df51f
+size 57777
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en.png
index 9a4a40c0e9..56ee8e3a6a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ae8264008b6396f31332263472c910b492fffdb9dbf7d0186b44a272476c02c
-size 46903
+oid sha256:394b0cd46ec85848f8698adb1ac655098ad8dddd363065b65246b86d5732003e
+size 57665
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en.png
index fa74fd4b96..0f00adcb5f 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4842f6e88df23ae0050f0052ebe9581d6c19ac5e29a0c553716012713fbb00aa
-size 46901
+oid sha256:8db8320be4c77860ce16ea4b6581ccd12e6f212e5442809f2763555fdd8f311a
+size 57657
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en.png
index 5f9af21b6e..abbecb8244 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7888dbb0ed5460c54796a6b2c232945bd4449e57feda4aed89ddce097a3c35b
-size 46911
+oid sha256:4c45307433a68ab63ee9d4f4f471ab47053f57f01afb4ae1e470864c1b506401
+size 57644
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en.png
index fe34c6d5c1..41d001d1d9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:215745acc9dc0c86e239acf614c94f1cd46e96cf1b6dd7cdca514d7a4a82f835
-size 46742
+oid sha256:013c2991242bd82401b085036bf09641d5b8b628a125856d90de8c2c574efb02
+size 57525
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en.png
index 9df6b272e4..d5ae542c1e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5d099940f91cb3e520f6eb6cbbc075bc57817f3e46e3f9fb169a36b408388f1
-size 47046
+oid sha256:333b0d9b7f45e5951a3ccf13c97b065fbab112e10fcd1b995c0943ed74e5331a
+size 57781
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en.png
index f56d4e2115..0cec5b249c 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce9c49a9d136d3bae5fb366fc47d3f48f8fabbe6963d0e53166dc1a5ec4cbc20
-size 46695
+oid sha256:48e4aa772d1c791e4b2974a545fd9e92bb6a317228c5f1e589b34bf190bda30c
+size 57394
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en.png
index f19645feef..8f06be615b 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed86c0b3137dcd650d7ba65d7ec009146234b4e0b983b1ab8b56974000698201
-size 46242
+oid sha256:fbbd85619bf152f00d60770186e26346d12559077cb5f45f2dea41ed02199876
+size 57017
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en.png
index 2b725b9e8f..f31a68d2dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbdf230e73c3fd93787030d6f5eac65b6a8131bf2eccb07fcd8474f191b87b06
-size 52563
+oid sha256:37f61e0097c9e7035d1bd90742110ca1a3e76462b97ba7a1773191bfe4b7ee20
+size 59681
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en.png
index f9a16c247a..5e929bd32f 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d57215dd58ace85ad235fb7f95ef592bfddd3c21afbf183bb5d31fbf772b69a
-size 48900
+oid sha256:158cd1d7554871d70548dec2e79cad874abe111bd967d03d507ee450988230cc
+size 60220
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en.png
index e662b2dfbe..d33b24c987 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32926b81da50838d883edfd157e7d12cc3d43991556f87e61702b74e693ab6da
-size 48798
+oid sha256:c65c540551e253bdfee59cc6f07d408f835f22f7b053f256d33f42b12323c372
+size 60097
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en.png
index 5ac95223f9..3f8976c0da 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0594480e59710892e480a83c1352a501504ae1bafb4c5c6b672c7dc62b3e75e1
-size 48801
+oid sha256:845fcc8fa7fa20a6d77868d4bf2216b5e9714a6daeabf328dd15347a4db4f217
+size 60108
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en.png
index ca2e552c10..eb887daa79 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba828796a14ee9e82e01e98a89067649a7f3438a2fcc8e3ce5f69e12e86f86b0
-size 48777
+oid sha256:0c5013e9d0ed2a044f108ffafb8729b0f167a8aaa9cf59426e961b76837357db
+size 60080
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en.png
index 6f741da48f..3578d846f1 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ebb88fa29993c785e6ca82543e7eeafefe365c0018a4f22852b988dc35db4a5
-size 48716
+oid sha256:9919bc3968a379acd74c3fdcca21eb98c55087863a15bd8d3f9724997a63da32
+size 60018
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en.png
index 1a12af9468..e780e0bdde 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2521e5352ee6030f7a0fd8304b19f6a7a95fb6364d43f412eeef03799c8c0f76
-size 48901
+oid sha256:6a3360ae07479ba0080854789da043ec5e71f34dbf3ddeeaf772dbae4cf37fcc
+size 60215
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en.png
index 962991ff8f..8db8b5a5f4 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dfcf074e7fa4813218f4bf9e472f706c5581e6fc5c1f7ea1eb9ec422172190f
-size 48713
+oid sha256:b77866f774bd2e68234739fad4826fa2a9d1f56378c51fcb14dca7e25a17c409
+size 59866
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en.png
index 8917220310..aafd282654 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3195a1871862ce32cdcf068608a565c56e794ff66f14473d5f6355918db79b6
-size 48402
+oid sha256:d82dcdcfa60cca28a540a0ad60a19cf3e78f396100db32a7f804512a6f5ffcb8
+size 59511
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en.png
index 5fc76943b5..163d5733e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_AdvancedSettingsViewLight_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f71219202890afcd4f43b5f57cb4d555b723df48f71848b64c8db415067d1d4b
-size 55044
+oid sha256:e2cc817cc4983c3851c3063706e40b682a4a630525a5f42fe6cc6fd8d4c74bde
+size 62293
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en.png
index 9c4bb9c6a8..8a3deba85e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef458f82d89cd8f82aa4a2e1e00a055a1657b93254218c777b1d7d54f0760b75
-size 49194
+oid sha256:004a9020036620444baccec4da133ace1842251cd42c00ddd184d7cadc65c695
+size 49086
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en.png
index 3059612924..38041cbd9c 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.advanced_VideoQualitySelectorDialog_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efeef999ff57dd7f5dda390e886c15cf88d8d2a509f5db739553a377548dfa5f
-size 47014
+oid sha256:f64dad8aa8d115a5962044f52164c254b5adc73568375ef5cb2e30e00f622dd0
+size 47042
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en.png
index e24a0a4e98..5b7314b783 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a33905ae2f0a1b7292a412ad67cec8e85dbc6f8cba52504a0f6b215b50469c5b
-size 24412
+oid sha256:200cbb1255804398e0c9861151efa426d0ff6aa78eafb5eefc7dcae309f1b611
+size 24348
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en.png
index 8a459e6a1a..765cd276ad 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b393a8ead69368886383c71bccf03b67d86c6406a92a17589e97bc8a97c781b
-size 23825
+oid sha256:d765e1ce49d658c5656db89023e3419aa603ff77ab8e7fda8b7ff9eff69ad86e
+size 23862
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
index 2af459c158..7cca911c45 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a95d4b7ebca92c4e0467f3ecd9acdaf7f6257604d190f5d088a9a25e87d637
-size 55305
+oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
+size 52770
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_en.png
new file mode 100644
index 0000000000..2be985840a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:404eda8a26f6529bf242b61e032464f83c28ac59d70a661a58706073ab20f205
+size 56334
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Night_0_en.png
new file mode 100644
index 0000000000..567820dae3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsPage_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b10df9bc9a6ca83ff2c319d0fb079a72f31e7c100ec3064ee3c55112167b4bc
+size 54777
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_en.png
new file mode 100644
index 0000000000..de0fa6e0e2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04c59063b1e836e74dba617c481b02a8c7b65fd31056b8f564207fe6aaae7d0d
+size 53725
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_en.png
new file mode 100644
index 0000000000..071738a0b3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d79170fbf028315b32f7e53b838f796bccadfcb58a259d33acf33f5f0ab0c05d
+size 52312
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_0_en.png
new file mode 100644
index 0000000000..d49ee5fc5f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24ef78fded0540a8f1f011e7d9560e20eb60e14300d98249cd7bc593aa89f33c
+size 52237
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_1_en.png
new file mode 100644
index 0000000000..fb78a2052a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer.appsettings_AppDeveloperSettingsView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2510779bd901b0108ae43650ef3d04d6465d16e65cd580a0426fca4f25b4bb85
+size 50885
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png
index 4026c0e658..e35130df8e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e24299f25ffd7095887bb52214c25de8de2cf0380b374d11f65d78c86f49dae1
-size 45507
+oid sha256:0d195d113274b9bad1a8c9b5cea3e6a58959ae095eefa053580c4e6f5f63d4c6
+size 54210
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png
index dd9d30850a..bd067f4024 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d84781b107e2f25bdc88cbfe84a1933dd20bf4c1dd372cb69f136f36df2607c0
-size 41951
+oid sha256:7799d21ba75505afdee0a66670187504db8a88654080988495dc6539f8226674
+size 45049
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png
index dff4e9fa71..e35130df8e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:577c00e6e45e1da5ac1b1deee380d7a087b1f32e077f8e5b9430497bf6f7012e
-size 44083
+oid sha256:0d195d113274b9bad1a8c9b5cea3e6a58959ae095eefa053580c4e6f5f63d4c6
+size 54210
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_3_en.png
deleted file mode 100644
index 4026c0e658..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e24299f25ffd7095887bb52214c25de8de2cf0380b374d11f65d78c86f49dae1
-size 45507
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png
index c8188fbaaa..8c81df12d9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9750c0ae52dce1ba63c1cff7a22a3e3c75c15b5a556ba7fff49815b55836372b
-size 44198
+oid sha256:bcbf831c6e9f91f8d13f7b52144139cc0edc59d0211f88872ccff5329c8530bb
+size 52303
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png
index d3c89a0735..ef928d9114 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31a3e5f9abaed21c87052ef7642dc8456d75580b79988ebe271f09d1381e9a03
-size 40820
+oid sha256:f29226ca1b03c83919ef0efa82b43883d3efe95efdee8616d29542ce9a892e66
+size 43527
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png
index 5bfd54ce11..8c81df12d9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7aab145e8ca2cd9de64a145c7966420a474b3500016a46100dad798f33acba9
-size 42792
+oid sha256:bcbf831c6e9f91f8d13f7b52144139cc0edc59d0211f88872ccff5329c8530bb
+size 52303
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_3_en.png
deleted file mode 100644
index c8188fbaaa..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.developer_DeveloperSettingsView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9750c0ae52dce1ba63c1cff7a22a3e3c75c15b5a556ba7fff49815b55836372b
-size 44198
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_0_en.png
index b3cf869f20..90b6fe2b0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e01807f33eb3d754c10197b20f02f8322fe7bc144276a4ea8952ba5baee7d4e
-size 42952
+oid sha256:c7e2fa5b5a1de2753eefe71b3a19add3ef5d96679256e48ee1a7a13e01c025e1
+size 42941
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_1_en.png
index 3fa84f4c8c..bb5ee61d4b 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bfdd77de93896a106f1a471ce520509241b53f85688600469b19a55baa7c88b
-size 37166
+oid sha256:e812a3ba15595e57158bd1c1bb0983b0dc5ff3f1a9f81b0e86c551b2cb2a5c17
+size 37212
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_0_en.png
index 1036232a2e..a09f157c85 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20cb76deb9b51ed92c2a7e4d6f7d43e5414e91a3fb6d084ba1ca50250478bde5
-size 41724
+oid sha256:0e4a3bd1b987f437886ea74b0c7decb25836b44af5e58a7a70a4eeb9f46638e6
+size 41684
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_1_en.png
index 6b104086f1..d19e2c0e1e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.labs_LabsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7af4d6a4118d34317fa4d0052749f9f02fd2c02898142eafbcd90110b4b52d4
-size 35365
+oid sha256:7b28f8b1050272e3d3bd112a2c6c22799e70e29688f97fef99aebae260a08a77
+size 35509
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en.png
index df8657de3b..31b414f07a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a573de9b093c38946eba2d8bfdccc4c448277646731f283938f2847756fad1de
-size 34171
+oid sha256:24c511b7b1ee590bb117bff9fede56c2468462267f50a93bec0b4f1b795c81ad
+size 32144
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en.png
index 9658070812..8d266d069e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eecfb5438fcd1529fcebdd49fc697e6dc5d61823dce05ff2a6d808b44e1c9c4
-size 32911
+oid sha256:657f5d5d887fe1aad3bb1e0dda911e861a4cb160c570678ee89b870591e3bb8c
+size 31054
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en.png
index 7bf37a76f8..3c35726947 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5171c9f08d2249562d83d9967deb84cbb59bfe9613df27097ab342890405ad6
-size 42377
+oid sha256:4a3c3d421a0adb5f1b5d9a26e80a18ea97a19c7dfb4b0cb586b45ea647f4f448
+size 40300
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en.png
index 2ba28bb753..860bf42b76 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7b61c67d3fe6366874f7a0048c6e82c66f607fef586fcf0b43b48b1724fc602
-size 42230
+oid sha256:8f243a0dfacc2583e1812ed1eb310568da7b149258322fbc971cd0aff3104ca1
+size 40153
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en.png
index f49c317324..0f6a2b7ef6 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9654dec6e7d312d9e1d0189e928ec01de8aa86c7d9b8c8a3ebc5ebadfd3588ef
-size 35493
+oid sha256:5acb5ef7baf4b9616d7d83990473c07679605d626cbb2c3a165903804843b54f
+size 34254
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en.png
index 80c7478e20..115e2d80fc 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae1fc7261b3ea8adf68f2c9a7e88e91a77a816713ac5ec20dd65a32670d2d3d4
-size 37859
+oid sha256:c71cd007555bd0f503dc7e5723e4dbe40a5afc588f87e65e355798549182801e
+size 34812
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en.png
index 89a6d30f0b..05a24284e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27c60b1d1923b1546215255cf9dfb78091802b40abf7f831375a5e0a9d24cd25
-size 55685
+oid sha256:bf2664f828dd7b34784a0881bc7d7a75b4700628503fa20f224c18764645cb15
+size 53513
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en.png
index 90e3292e27..4493e2bb7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:156307f3934d6bf4fbc90b36bd6e1e7e516e1401b7253624af93de9801e4fc41
-size 41920
+oid sha256:3a2c654c7792514576de6547ca25f8f9b711952cc24b2ba2bb6c2af4149396dd
+size 39847
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en.png
index a595bbe51f..a8a51dc6a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b84aa300ecbcbc9fba740dd3dfbb90fffbc6fa463e40d009ddd5ae394b50c5ea
-size 41793
+oid sha256:167c78e2208f307947d806a1b9cc591b3d5c238acf8b1ab7e1805ad889944960
+size 39729
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en.png
index 2aa655fde2..11e0288e10 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac2d31aaac66c11e62d45074253efd95190804b5294d7837781912d61cf98a64
-size 34715
+oid sha256:fc1eeac19091108033918f03117169e6e10b8b07def17d597b7ccd81ab5368ec
+size 33642
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en.png
index 89459812cf..c595b64971 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05896ad1d86b38825fe1793cf83db364404d998585fa60b456061be2093d848e
-size 35660
+oid sha256:8be2c4e279ebb1c0b528e5abaa87d97a85e9f1d0cc689db0672e63ba5ed6f8c1
+size 32775
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en.png
index 9957d2032c..74e3b02b7b 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:adc28c6db29c01547a811d825b1c24b1db94a900631e74925edba372760aebd1
-size 54705
+oid sha256:ca6ae4eb2bd2d59d08e470e14f17c3cd18516fddd24f2e3bf448c49d40c28b00
+size 52553
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_0_en.png
index d927ea14b0..a1b3e577a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01999b61120bb58f8cfa56a2f5b1b5573d2755fc5be85d3929237d6a61244ab0
-size 54308
+oid sha256:e23e4be9343caa6fb668c7ee83fe44ba98401606c70f797f6fe8de197eceb717
+size 51191
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_12_en.png
index 41290c5db8..b371142844 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74890836fd7256b068ac02e78c83b20a3b1d22fe9e5d1bf6a939f7d6f03abe78
-size 58686
+oid sha256:f009853addec1d9f0297963a4743fcfcf3a100048685a8320bf92951693610e5
+size 59451
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_13_en.png
index 1bdb96a6ce..f8f1dec96a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3fb8607ad18d2654282478d02a20f416f87b880049c3835016cbcfcd9fc374f
-size 15161
+oid sha256:4e4c7d418d1176c8f6821e9021705c5ebd85399529c2e3bddc1b9084510da6d7
+size 15280
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_14_en.png
new file mode 100644
index 0000000000..d8a37a1b59
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46c6dec8bc599fe1e40f9ab9ee9a143b3529c7652fee6eac7ad88da6472eea87
+size 45382
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_15_en.png
new file mode 100644
index 0000000000..78a7817576
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e038c864bc264a148a6aa82e1c318c46a2f3eb97f43bfca2ec7adc4e12f8551d
+size 43943
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_16_en.png
new file mode 100644
index 0000000000..a721949951
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4397906ad8b87ad71d9a4903f791ab6b27a3fbcb440af6d925a2290fdc7e49f8
+size 47198
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_17_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_17_en.png
new file mode 100644
index 0000000000..209e84f315
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ef8ac012eb0de8dd249eaa79dc69dd4af6d97072e7ac6c9307dffbb893454ea
+size 45110
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_18_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_18_en.png
new file mode 100644
index 0000000000..453338e568
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f98a73792b1ec91ccbcacc4cf9a1c6de00ce03862f69ebc2cb77d17dbdbe1d7
+size 46627
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_19_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_19_en.png
new file mode 100644
index 0000000000..b995a6276b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:639484bfe7759754da026fea395f3afbf22b403c2abd408204253399fa40a1fe
+size 41177
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_1_en.png
index 4302a4c031..209e84f315 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52f7675544ba71ed73d2f4283287f46eaa0798d48993d7eb54fc28f87c89cf0e
-size 43466
+oid sha256:3ef8ac012eb0de8dd249eaa79dc69dd4af6d97072e7ac6c9307dffbb893454ea
+size 45110
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_20_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_20_en.png
new file mode 100644
index 0000000000..42574ef3f6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_20_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed13f05fe4352db182a58f1d2cc5c8af415236cf5ba4e6667879847187aa590c
+size 44386
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_2_en.png
index edcd62c95f..386a4d2071 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50cca191bf1c21a4d0f2765643712d0db6813dc23f2c4b70589ad65f2847b259
-size 40215
+oid sha256:a0260fe74d0464f6981c0fa1242728d1c8f214861c582ac50b188ed37f535510
+size 41637
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_3_en.png
index caf2a0b795..f738183dd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c13b82c858490228a4f5568b7489115d916af067a8cf2e01e22e44f56cd6c3e
-size 39566
+oid sha256:8cac68cdfc5b2a6c67300deba8b52bd15b19cf71daccef0e0f2c8b60a44f2bd4
+size 42607
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_4_en.png
index caf2a0b795..f738183dd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c13b82c858490228a4f5568b7489115d916af067a8cf2e01e22e44f56cd6c3e
-size 39566
+oid sha256:8cac68cdfc5b2a6c67300deba8b52bd15b19cf71daccef0e0f2c8b60a44f2bd4
+size 42607
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_5_en.png
index 4302a4c031..209e84f315 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52f7675544ba71ed73d2f4283287f46eaa0798d48993d7eb54fc28f87c89cf0e
-size 43466
+oid sha256:3ef8ac012eb0de8dd249eaa79dc69dd4af6d97072e7ac6c9307dffbb893454ea
+size 45110
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_6_en.png
index 5b314cc55a..01a4e9021b 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38839f3e1cc1ed7fd02695e1ad68e44692fc836ee3fad075ada9d500a94b2554
-size 39554
+oid sha256:45cb8f2ee0c044bea37e03498e1ccebb8b3410d98b70a8b66d9b0cc96cb76fe7
+size 41956
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_7_en.png
index b292bd42f5..3e9f191009 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fc4c290503b6ae3157cf4169b50a8e00bae953d87b2d319389e8ab3decb9ca3
-size 43856
+oid sha256:39cf206419a6496ace2f47cd581c7cf986dc9f75406c43c2d1bf90c681db2474
+size 45876
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_8_en.png
index 4302a4c031..209e84f315 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52f7675544ba71ed73d2f4283287f46eaa0798d48993d7eb54fc28f87c89cf0e
-size 43466
+oid sha256:3ef8ac012eb0de8dd249eaa79dc69dd4af6d97072e7ac6c9307dffbb893454ea
+size 45110
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_9_en.png
index 4302a4c031..209e84f315 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52f7675544ba71ed73d2f4283287f46eaa0798d48993d7eb54fc28f87c89cf0e
-size 43466
+oid sha256:3ef8ac012eb0de8dd249eaa79dc69dd4af6d97072e7ac6c9307dffbb893454ea
+size 45110
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_0_en.png
index 5c281630e3..f0e4049f27 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8a677a3dbb1cf6cbb306d3b1e4ba612469cba408815320361365d74e188cf74
-size 52703
+oid sha256:3ce468fdf47100eaefa88460fe723d759ca2b84a396a27168c4c4d8b0dc2c423
+size 49776
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_12_en.png
index 6beab389f6..ea40884b8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:684d9d7475db5d003772337aabe0834ecc95079105d0820f387654a7db1f5a37
-size 56947
+oid sha256:3c0c054620d2c52d997502723584cf53dcadc0b7ef228945fcfeacabafd83f6d
+size 57478
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_13_en.png
index a77632924b..ed61f3c490 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f644ae1d229a0114613e0dc9e9a26a3560916b40cac2faf65cc80fb2fe3e13a6
-size 14632
+oid sha256:e64ded1a76fbc2722da8ae5ef3802aa7fbe3364c13089982be0f8982376ad05e
+size 14766
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_14_en.png
new file mode 100644
index 0000000000..01cf356ced
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:702b994b902946d49ee8ee66c93c5e81711bebc53a54c94af31c3d4554089eca
+size 43666
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_15_en.png
new file mode 100644
index 0000000000..806f44b821
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5ffdee75b3a258c597ab62661c676ae90676fea913b4feddd912b860e49a3b3
+size 42294
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_16_en.png
new file mode 100644
index 0000000000..a46400bafd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6442852768dd251052e42c15517f9770b8f4848a5c2e2c4a241a32e6518769b0
+size 45221
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_17_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_17_en.png
new file mode 100644
index 0000000000..c7371790a9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:641d27aa03caee6023678d3985cb32819c6148e171706ade8fde351a52d21737
+size 43461
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_18_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_18_en.png
new file mode 100644
index 0000000000..be7830792e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82a42b7700901f74aa0118c596829125d21c37876b2a81720a31fc2357b5b024
+size 43998
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_19_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_19_en.png
new file mode 100644
index 0000000000..d8f5fe773b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f2bc8d60cc2f9bb905bc7cccc8e8c94c1473c50c64cbe9d5a80b63905645743
+size 38769
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_1_en.png
index 05b8276ace..c7371790a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d92a5ffd43eac457c3384cfc22b9b29fbf8c21532fc16892258140c557788bd2
-size 41872
+oid sha256:641d27aa03caee6023678d3985cb32819c6148e171706ade8fde351a52d21737
+size 43461
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_20_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_20_en.png
new file mode 100644
index 0000000000..45a8bebecf
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_20_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96c3d45f50259bcd2a6f368576d4c740c9201ccbeb9213da5f76c934074afdb4
+size 41822
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_2_en.png
index 56334c1e2e..655fed9a4a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd1599665f32844b4757a631542351303b7d4f4a34f32640ee9f60ad38089cab
-size 38707
+oid sha256:b032761ba73beef9a67190acf0d6f467997c7e31392e8fc54fc77b9d4fa4b0c0
+size 40097
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_3_en.png
index c7e3274c19..6e5287e579 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea8532bc891ce639c492ed7d6edaaadefc2b99dd3b68873a575858b03b6fcbfe
-size 36998
+oid sha256:8815346ccae3b712ed47f1770bde1a3dfc10abe1c8f42adb04fb0836a68720ff
+size 40099
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_4_en.png
index c7e3274c19..6e5287e579 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea8532bc891ce639c492ed7d6edaaadefc2b99dd3b68873a575858b03b6fcbfe
-size 36998
+oid sha256:8815346ccae3b712ed47f1770bde1a3dfc10abe1c8f42adb04fb0836a68720ff
+size 40099
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_5_en.png
index 05b8276ace..c7371790a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d92a5ffd43eac457c3384cfc22b9b29fbf8c21532fc16892258140c557788bd2
-size 41872
+oid sha256:641d27aa03caee6023678d3985cb32819c6148e171706ade8fde351a52d21737
+size 43461
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_6_en.png
index 1f3b3e2b91..8aadf3f98f 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68d4a4cd27afda0d23438451124ef997dadd116e1ea5db4b5a6af0045d95ba2b
-size 36998
+oid sha256:acbcf41d56b4f3a73908246abe0de6fd16c2f8971babe462c7495743c9cc0a73
+size 39450
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_7_en.png
index bbc69da0c3..7fe7019dfd 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:784b744139daa4216d4137aaaca3a4f1a86ef7297ce2996bb9e9eb78c8aa93fb
-size 41201
+oid sha256:5c9f4c003b2e7ffa3d527970e4e6c25be461a6b23582006d7bc3e5695ac35c00
+size 43273
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_8_en.png
index 05b8276ace..c7371790a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d92a5ffd43eac457c3384cfc22b9b29fbf8c21532fc16892258140c557788bd2
-size 41872
+oid sha256:641d27aa03caee6023678d3985cb32819c6148e171706ade8fde351a52d21737
+size 43461
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_9_en.png
index 05b8276ace..c7371790a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.notifications_NotificationSettingsView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d92a5ffd43eac457c3384cfc22b9b29fbf8c21532fc16892258140c557788bd2
-size 41872
+oid sha256:641d27aa03caee6023678d3985cb32819c6148e171706ade8fde351a52d21737
+size 43461
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Day_0_en.png
deleted file mode 100644
index 29b7fa324c..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df19ce5a967143e2cb6d1fe021663f72e36f20c32e912894a2fbad628f03c3e5
-size 53561
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Night_0_en.png
deleted file mode 100644
index 2ba5234dc6..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_MultiAccountSection_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fd24e865907b5c9240829710a910e445954bef9b8575f5115a52837e00d817f
-size 54591
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png
index bc97d5a5c7..f0f0bbf1b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:369c835c46e19d3e3171add57055624cf672a9d34109e6c831e0c1bce234c605
-size 39513
+oid sha256:2a778bf05dd64f37df2dd45437a4dc1e74199b4b9eca2d3e9078b5b956a16e20
+size 39556
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png
index c6b82b8385..6647fae806 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d9f6763de5b844eeace37bedb25b125976625394d69d7843eedb26319e926aa
-size 39316
+oid sha256:942e5c3db0b84fe8f3125e08dafda1c0b96cdeb332afcbf217f06742f5b29a58
+size 27374
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_2_en.png
new file mode 100644
index 0000000000..6e3ff8d5ba
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bf9154a844fe846d918f56bcacd30456973ee89f180650956c73b8837039341
+size 38530
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_3_en.png
new file mode 100644
index 0000000000..b03f86cd17
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d55a3fe4b9310220ca46db6e893017ed6f41864b48ebed8717074ec277b4765
+size 28817
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_4_en.png
new file mode 100644
index 0000000000..c17a10428d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d410ca5322fb3c7ee10d5a489bab118fcc7cba17cf825c8d38ef3c6fde26eb6e
+size 30004
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_5_en.png
new file mode 100644
index 0000000000..d14f6264d7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f00e1c36baf1a14ce1a4d67cff18a7a8ea3732c60df5eb0e7ebeb53934387bd
+size 32880
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_6_en.png
new file mode 100644
index 0000000000..c3a9a89399
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cc2c582bc6fc6a73a8eb8e873a57d85d88f984b283f889628139021cdc6b163
+size 20042
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png
index dccf28ff97..557538595c 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dce8486726293027aedcdd2e67d10a39a1a2c439ca67d81ae247b60119675ada
-size 40385
+oid sha256:a558ea1da4ab2adaaaffad9b47ce1d21bf27bbe82074927f823dddc05d6d80ed
+size 40741
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png
index 6f2381c6f4..e30896324c 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93ee581f59c79e03b9c9311765da4c828c5009d14e92f7cca9bbcee418fdfc63
-size 40442
+oid sha256:b91ad54980525e9977498e22e1428f3ca172ea1e88e7c508feb84d8521e9080c
+size 28423
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_2_en.png
new file mode 100644
index 0000000000..8869bfb466
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a6deb7ae2808f1cc361921d204ca4857cd085294c9df915acfbbf300fd198a7
+size 39425
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_3_en.png
new file mode 100644
index 0000000000..ab15791ad6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db61ad2899d3b56b7e1cbd43006b1ff03865b58e15d446a9886ffda5e35d954f
+size 29774
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_4_en.png
new file mode 100644
index 0000000000..2ca32d37ad
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a52b1bfdb0cec0e8568d23a804f90ca04fd5f5d3da6e1e513b1ec5c652ca0a1
+size 30894
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_5_en.png
new file mode 100644
index 0000000000..e5864fb5d5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e7f2cd3f6ac709ff1d37c5f212bb254a4bcbd07a71c750f0ef35cac7529d5d9
+size 34134
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_6_en.png
new file mode 100644
index 0000000000..2312bbcd77
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ebc219ac4bf4a804c9c8f26028374bb35264266b616db054218dcba0772197a
+size 20471
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_en.png
new file mode 100644
index 0000000000..8517440a90
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4dbcac95e6fd72ee2eb683a4f25d49f4d181be9b1386ec01670fb078bc46a52
+size 18966
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_3_en.png
new file mode 100644
index 0000000000..75ce9869d4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user.editprofile_EditUserProfileView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:901c40d524de6de6fd70cbfcfc8b1d86cc896734254452535a07830587adafcf
+size 18987
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_0_en.png
index 4c4d183956..03d5ad5880 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ccaa7f88a9e46bdc526bfe3d5c2163bf3d963c0661179db97f62559edfd3189
-size 11042
+oid sha256:0dfea70e781debf7a293aee2967c3da314101020698fee97d3551e25f5f378d0
+size 10655
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_1_en.png
index 0edaae43b6..3a1ad156a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f37e1587ba12f9b6326b5b7398982fc663ca913da8c0ee83dfbd5e9decbd4362
-size 10906
+oid sha256:33482ad6e5033800e911dab44d4ba5bec15cfa58749102c5da4e2c57a8e760e8
+size 9783
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_2_en.png
index 3a7abad03f..0a34d0b390 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b494ecdb4962772dd548339a4ac57be40b273b513697ed6d039d1c905617d54f
-size 4987
+oid sha256:b3ecf110c258f4ec5fd5d2a4126395e248d73d894afd54a0135dc710f680c0ee
+size 12395
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_0_en.png
index 741a708fe7..27f51b2778 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb0063babe7091368af6b5bc7e8929c54ea879bd78043d9128db2dcea9d79fa
-size 11191
+oid sha256:62e127900d00756ecc806eb9d8efb6a11cd9cdcecae6b4bab643b7306a06be2b
+size 10435
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_1_en.png
index c4e8dfdd29..81d4ceda60 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f34e63a88464ddc817d1ffe0324352199ae1821dfa846cceac129a656ece2eb6
-size 10911
+oid sha256:e39bc143f7ee45c47ff57bfb53a773d7df2ba14568a9368643d8bab9dbbf4955
+size 9675
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_2_en.png
index 17d1ff9d1b..58a30a7304 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.user_UserPreferences_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0618a9f769e15b4e682d763224cc1fe0abf62c58f3b9a6b4059153f8805671e
-size 4740
+oid sha256:6bc66cd4269ee462103e77bfa24723a740d8a91dc7e06ca808b8109e74d1784f
+size 12127
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_0_en.png
new file mode 100644
index 0000000000..a613668ed6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0981d742141f7b4f0153b897638a7bdd6b20359c051d7c2176a92ebe1f1eab76
+size 9221
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_1_en.png
new file mode 100644
index 0000000000..bc00108ade
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57d41ba2f1a644081c6bddcc7e1c27c9cbadb23bff3343e0e0d9deeb6a94bb23
+size 7123
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_2_en.png
new file mode 100644
index 0000000000..44dc0d0f19
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9681df4f4000ebca0642e8a4065d23f88981707ba146adc8cbf2757175cfed6
+size 7315
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_3_en.png
new file mode 100644
index 0000000000..61a7c2dad7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf6189630f111d84674843b3970193eefd31d96d9300f36308038313de78b83c
+size 28859
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_4_en.png
new file mode 100644
index 0000000000..f02e51135b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb7104ccbfcccc9f3afa027db521e8e2f11a015356d47e61e5ecfd173cd80004
+size 27295
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
new file mode 100644
index 0000000000..82f344f714
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d96eefa01a5de803b0cc9d9109c20df86eaff01b73ff24a91945b43d53d5d01
+size 11960
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
new file mode 100644
index 0000000000..fdd8fcd5a5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22678a2a8505e1d9d5bfcb44459b6fac69c11a4bf72fae09c48ffa2e54f5a110
+size 12128
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_0_en.png
new file mode 100644
index 0000000000..bcf819a97c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90cb31d24d16bc8e13c7e83f26330c9505eee02b91a5bf3ac7bf140fedfcc37d
+size 8749
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_1_en.png
new file mode 100644
index 0000000000..875d51031a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:771ec7723dd0b7546e7e73ac4f3f6217ab5d57366ff0309774fc483b02240320
+size 6720
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_2_en.png
new file mode 100644
index 0000000000..c96f456ac6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f65c054cc6876f86b6ae6689560581f2c29edcdc86fca992c30054b1f442afa
+size 7000
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_3_en.png
new file mode 100644
index 0000000000..1496ccac57
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c367199db97f227a82bd32292176ade0dcec1633d0383b591204b63ddaf1f48
+size 27660
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_4_en.png
new file mode 100644
index 0000000000..d04157ba03
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27efc2d19efbb978778dfbb7d87138fbbe7cb17525d03a565e4ec2523ae0a252
+size 26166
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
new file mode 100644
index 0000000000..f6e27475da
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ee89826c8aa2ac0371ed31959243f62bf9968806a7b27117cd7b4d849423a33
+size 11667
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
new file mode 100644
index 0000000000..b1bb69efb8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e27cb9e501ccbac54926f0252b4098867643a2d2683c5b267f86ad99edf6f5d7
+size 11817
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Day_0_en.png
index 1dcb5f4f8f..3c898e8ab5 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc7a2e36694227df123681799f09bb2ee3dae24258679557193ae69ecf4c2871
-size 24012
+oid sha256:17a23d0c9d2993b81edb72f19ba6ec03f24b79a2f732e7af6d3594c96503723c
+size 24978
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Night_0_en.png
index 65a0322a88..b3f17cafcb 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.crash_CrashDetectionView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18bbb07caa3cae740bb80297ced37fc3e8c92b48cd0935f716a86e0664737a75
-size 22815
+oid sha256:e2d914dbf6a309cffcba36f0affecf19287ad06c751f50b23a51e9df23bfd12e
+size 23859
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Day_0_en.png
index 77b4b1e222..b8fb7eb092 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31a1989c17263d25d5bde65a7b0399b58c9e77d320654ac9f0e65f0fe2410b15
-size 25882
+oid sha256:eea615f75cb1c3db04cffba9798f6662376f1c1db6825aa73c2db6f10192d23d
+size 26959
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Night_0_en.png
index d8fdf936f2..5bc6eeb700 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.detection_RageshakeDialogContent_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28f410c8068e0d7586af4c727ce5ba131e56387472f661b34841139e1e43cd3d
-size 24788
+oid sha256:56c84d3a772d03eb016807b886df9728a5fbaf07e3fc6dc2ce4353007aec405a
+size 25726
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en.png
index f59f8b6da0..6a56529d87 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d521236e5470339e854f490bbf4fc8e7ba355e3cc27e32145320df217be31d1
-size 18387
+oid sha256:9bb43ca503732f8929fe0bf1635aa67398a8655c7f62ea38ffe68b8655d0ed05
+size 18328
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en.png
index ce1568c007..f44041159d 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:322d3e0d5d7ca5aec1814e8e78eda2abf99ee178aeaeb9c4b9341ac35c92eb38
-size 14766
+oid sha256:1c2993725d56690edb632d5a5a8776cafbaddf98e213ec5e912c9ab7637c74bf
+size 14810
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en.png
index bd06c2643e..1c97cf62a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a1588effb798e95e7b312eaeac298317851afaec7ff16a79c27ea0778ccbbac
-size 17005
+oid sha256:2681516c21f3e51824152a6bb6b8f4d09db147546c938e99cb899841f1fe83fc
+size 17083
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en.png
index 197a3c53f5..cc47b174cc 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:606ad1faa861583d9e03a05f4aa9fd315389118700c062c7fd694492d2aafc95
-size 13902
+oid sha256:ffd643d1356b6317480b9852974df74a8675107aeaa7c28fbbe62920a2e0a2b6
+size 14034
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_0_en.png
index b81b524b86..e6d8d37d58 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a10513e98757e17cc3ffb8302807896839a78d036331e79bb207686f3f9db86
-size 47842
+oid sha256:2ee06b3d6ff72cd658c21eaf10ea1a4a459ef7ab6113cee3960e3c723ad0500b
+size 52998
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_1_en.png
index 0700c94bb7..a25517c78a 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05efb0fa45bb6440e75e9280b219cfdac83c372efe9e6d6254b4bbe516f8b998
-size 112842
+oid sha256:4b8487d6341b81be8ad31eb83d2392d9e1fc8b0c81c92060c96f31f99969f5b3
+size 116063
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_2_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_2_en.png
index 61e347497e..cd92d6fe7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:833d21633cb0f153b660112fcfd0923c588cd26b64005403a007d7782ecfe5d5
-size 45138
+oid sha256:0b177c4faaaa0429d4e8bb65dce19b40e0ede728535ad4ef7a4efec453b1c6be
+size 50502
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_3_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_3_en.png
index b81b524b86..e6d8d37d58 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a10513e98757e17cc3ffb8302807896839a78d036331e79bb207686f3f9db86
-size 47842
+oid sha256:2ee06b3d6ff72cd658c21eaf10ea1a4a459ef7ab6113cee3960e3c723ad0500b
+size 52998
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_4_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_4_en.png
index 948604dd84..20d1cfd900 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewDay_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebe22ec065cc6dff2133dcc573a82e003d9061ae0446c2d8c13f4e1fba1f3c19
-size 37056
+oid sha256:c7c8f25d1e220ee187bd700f3b0c24ac755dc254366be20b65fde360ae931f21
+size 41356
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_0_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_0_en.png
index 9b379990c3..e2f8fc3e17 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f647e92bf813ead7affcdb6ad07076fe9d739f6a4c0016b9787912f032e27476
-size 46567
+oid sha256:4b89802553136073e00a7c8690d0c49d8f29b09382dd5cc64c398149f310c3a0
+size 51344
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_1_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_1_en.png
index fcdfe6ba7d..189d3bf8e1 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdfbb9f70a97724a1b6687ad4f199efc2c9bcc5f29fe9475a17ee6e52e5ecf8e
-size 110829
+oid sha256:f458f949f23d4192319f838bb6fc18ec6dc38c1c81c717b1da08529ab082f697
+size 113760
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_2_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_2_en.png
index 6760c96a86..df8715912a 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cfab4886243e6c914f466f5f127ec0347b0ab30ee43fb95c7bc82d2b16325d5
-size 43727
+oid sha256:61a36c3c6c09a64d2a398bbda7e86dec8d5c891fa62f15fe489283e4b1222da8
+size 48884
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_3_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_3_en.png
index 9b379990c3..e2f8fc3e17 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f647e92bf813ead7affcdb6ad07076fe9d739f6a4c0016b9787912f032e27476
-size 46567
+oid sha256:4b89802553136073e00a7c8690d0c49d8f29b09382dd5cc64c398149f310c3a0
+size 51344
diff --git a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_4_en.png b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_4_en.png
index 6b7ad4a825..266d768ca5 100644
--- a/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rageshake.impl.bugreport_BugReportViewNight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c24515cc18b3c5cc52f2acfcee4faa65c02d8d5c8be847d4b1ec5671a858210
-size 35201
+oid sha256:291cea4b33973b675647b150525c8e7e17765d728a444ffb3cc175ec3342693e
+size 39521
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png
index db89a07778..1b62c5dac4 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e9ba4d2b0afd07b48ccae4c9f3c37c9fba1cddb330308d27b14771dabf1e2df
-size 30024
+oid sha256:751c7e0ce4cd5f20a6259f305d1d4c4de6fca84870e2a7086b4d66d4f58c27f7
+size 30074
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png
index e13d712ca1..329d9af3d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f088be4f5c6cce913ca1a12c161ab65334569ecc22405bba4c3a8764a39b6306
-size 29553
+oid sha256:2b7011041364d6046229a28e10a0895bc153eaaf78838d33e33cb83471a45bc7
+size 29715
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png
index 0c54ad27a5..b394d26672 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d049533611fa17c1b3fc2348127c5b0b6257875e3ebccc2e6df6f3a2c4a1b58c
-size 29706
+oid sha256:cf83676d72f74137b6203d88b02fba39e7da90ef116811084d793a48f1e7646b
+size 29805
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png
index 642733996e..76e4bc64bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef61d994eb7ff50e4e6b59c56b22ffe36342ba0ed53e6e8aa5f27f11dfe24269
-size 27112
+oid sha256:053ef557a5c2c9b1a4f18bed9fa0579f15240960672356a9d6bd524177683fcf
+size 27122
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png
index 769971670e..050949b9aa 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03839b91c2c72049520effd097cb1e531b721ccb77740000802e71d27cdcc43e
+oid sha256:b412044c11461abbaafba558cbc8e66f1c6702ad0d02eab0c01fd3ff4f64efb4
 size 32764
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png
index 76c1d6964a..4c4205b4c9 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:151338daed6b0987cec720910b552b5821a5a106a6c9e694e33d24e733b85263
-size 29300
+oid sha256:dd99953e28aba7f0644c14ca9ea55461b8d134af9f454859b9771ef145af0dbc
+size 29307
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png
index a9efcae346..70d20f038d 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edecc24faf75d472b94703fe5febb08cc01ee92a6960fd1b2cb050aa9377f451
-size 28838
+oid sha256:024e7a1c12fc99f5595ba26da3cacb95700ba6a9b65f4356115657c3dca7ea80
+size 28866
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png
index 504befb698..b0877ea947 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:436bdad5ca7e52553c7d29a97834d5eb7e5f8e4087dd8b3b2ab5b2cd23e31bb9
-size 28848
+oid sha256:f146ba2a4f0edc4b1b977a3eb8a389eca445aa206243c6d0d9cfd1d859685151
+size 28873
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png
index 4942eee6b3..d0988397b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84abd935a121596053a70ada6ca0b4a62dd467e0407f7f6e61f3cfee374abf3f
-size 25917
+oid sha256:2cc316a7902518202d5d215955f0c9463100d30634a2b7fb255988947a41af35
+size 25979
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png
index ed6e11f546..830b054018 100644
--- a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e7dacfcc9de18fdfee387a3ef9fa77fbb252917c974778be5adc80fe6c03502
-size 30671
+oid sha256:b2fe99fc52a7f75962df7515ab2440206496349553eb0a890c6d9bdaf118a7bc
+size 30640
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en.png
index 90974411fc..548f4fb92a 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42115371f725ac37b484d22a7ddc0c48c5a4246360779e75256cdf2e45c4badf
-size 49163
+oid sha256:d181933f188d7e5800899e6f97fababd50c3000a27aca63a2a11a5edcac8ad19
+size 49083
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en.png
index 4d1dbf68f7..0150967253 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:555849e00ac48ed8b4dbaf2dd19b990d281e6db2a4787f584f5a07a02ed85ee7
-size 47831
+oid sha256:f5238d0915551c987e2e01de6268fdc4085df411103fc0a69fbc6511201e2d12
+size 47789
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en.png
index 05be6036e3..ff7e8ea70b 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9b741585aec49860eadc2eb294d23f9bc275872176c45a3d0a465d3c6c85b6f
-size 49081
+oid sha256:4e112e30bd75e1768a436475a63b290ac8bdad3842ce8589aa65a7a12569ec7f
+size 49003
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en.png
index 4887d37e61..66eb55c0d0 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5914d8b0f98943fd8f059853623b5f9cfec889e28699d6025feddb29c67e8b3b
-size 44219
+oid sha256:9c01b62bf6bb7bd47b09660e311fee7db5fea13e09539b071ff87c29c8f0f8d8
+size 44288
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en.png
index 71fafafd14..4f46f9607e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ef05fd67b842ca7134da5a21306ff70768fc4a13676effeadf9cc86cb1ce04d
-size 43230
+oid sha256:19e197ad8ea83cd381f33df27444a59cae5788b31454fe34b0c93005f6f1d41d
+size 43436
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en.png
index 2ebe8074ab..29964f66aa 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d49ac650aeab172c3b5fdf7939ee459773e1135f7873abbc14502f5b33d3f8c8
-size 49989
+oid sha256:a10264258982ef82c3c5692b5aebcd56d25c87b96901f497c7c0ac4ce8c2c6c8
+size 50208
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en.png
index 27cf718290..df3882744a 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c4660b161de0a2daa06bcf7d931d97c1f29e8f2958b6b309df002adc180b45a
-size 48598
+oid sha256:dcbe7fd975d477c3d37722cd6b95941e30ab524804b1e8a013d65fbaf0031537
+size 48571
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en.png
index af4ca3b0b7..134ad1fcf2 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e351c0a3968472284aaf175fa3c36f23903727bf74621d26fc59c6979bb5314
-size 47950
+oid sha256:2d4d206671385a19afabe3ed60c4f34438c44fbfb0f950d3bbc91adad86aab66
+size 47849
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en.png
index 949acd5fc5..1c04ecef27 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98f9d2867796a2031b374d1cc05f4a8218bab0a2e44ab8eee5c6feb4eafdfe2e
-size 46638
+oid sha256:71ee36dc169d4f39e9015d8430aefba6785c625a5e5677a47ce71e7ed36c170e
+size 46480
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en.png
index d516119920..c09d6e14af 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50f74a2ef7c200d901155cc6936ace84193ebb0c801aa7ab938ccaaabe5ad8ac
-size 47855
+oid sha256:f94fc5c78b20b45bea71a91d0f9ad5ee3008e0e9dd4fe7adb72d6304940bb2bc
+size 47755
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en.png
index 2593ef8ee3..f149763a22 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eda97e80b8302323f57d07409ea2a83ef3ba8aade3b4e329bf0bbe8176c65c10
-size 42844
+oid sha256:3019ccb270aef63a7b33fdbf18b78801ea7e55baf8d303349591d15a55d89c54
+size 42933
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en.png
index e4296df2f3..e344afc5e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95a0b7d54697b6e7ee3bfaf97413991876938563008bbdf89dffe337f815afa2
-size 41202
+oid sha256:ff75cc80b45beea841511c179a1d75a4b859a3d1ea392bdbafd5d7db2dfa7865
+size 41282
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en.png
index fe283b6453..63ce660ab4 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2af2d6cbd32fe906d66773c0015383bfe28035d09e43939d3ee71ba516bb1e67
-size 47790
+oid sha256:16d0a0ce6760b8ffe6d346e5ec8e962f1dd1eab6589f05762c3d0b591b7eb3f8
+size 47868
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en.png
index 6dc2c3413e..6708a06368 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.permissions_ChangeRoomPermissionsView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a659ae5432a6b452476fb486486d5fb1e9bf28640f80b291a4193870106309
-size 47298
+oid sha256:1da041b4a7856026c22181a963f310e1208e6ac0337b44d639b2e35a3c0f659a
+size 47271
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en.png
index 031e824d00..1d74d53ef9 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b5330dd8afdb53538bccaad58a688798be1a97c2855f1766e8b5c50499f406c
-size 49560
+oid sha256:468f68d04c5a4f18f2458714117c69a5d464f997f8102592017fdc670ee9c304
+size 49547
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en.png
index 5405b2f535..253838d70c 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8199ec44477a9e8fcbc3507e609ca1bddcdd422e2d52429038e6289ea25066c7
-size 52137
+oid sha256:e8fb8640cc168b3337bf17f893179daf86eea29e0e9124e113ce98426a1a9ef9
+size 52090
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en.png
index 596aae0702..bdbba9f408 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:826b6ed7c407abee85fff8795ca41f3cdd78936e050787b62c4da3bac91911f3
-size 53762
+oid sha256:32ccdc2e065691bd4e557eb794ee98a313011f19a5a920099612521515b65a30
+size 53712
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
index ec0926fe98..716872f929 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cf9484430efe87465c5aaedd53d866c7479982c77dea9ff5f5c33b659557e30
-size 58423
+oid sha256:f4acc8042fe23f5a352b5d928aee2393b4952f1cb2a00b807b35a8c0fc98c827
+size 58592
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en.png
index 028a49cc90..2f262ba181 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9e6ac535c10c1cfb042419bd1f5af51b8d4a51b234ace59b6f2bece599c4451
-size 66724
+oid sha256:3e7d05b3314fe5478e451283b848e1bc0f1d9d5f420363606b38c6c06c381dc4
+size 66074
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en.png
index 03e7a81404..6d8014b510 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7418b3c08ffdcb58a7eee06eb86f9feafb0f02a0ff567d90833babef5f50a5c9
-size 60596
+oid sha256:de175424df113b1b0688509a23dd514679272c6641b64850ffd7072f2bdf458b
+size 60443
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en.png
index de2a58e79a..b916b4e68b 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fabf3e373947091f9b061cb1252769f9954a7394a39f98ce3c29665d46d7de9e
-size 60554
+oid sha256:521b6f5002e3dde3ec57b0ad89a9c2415966cca80997962de95333c9f7585420
+size 60404
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en.png
index 0f5dccae40..95aa10ca1f 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a4c600313b32c36153a90098f5da273d664aeaf6fc4de4b6be07b1e84a1f5b6
-size 54461
+oid sha256:e6cd97d0475b6dc1950d67be57a8cc9867d07c6428db828fd9a541118c8b3143
+size 54283
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en.png
index 83f543fcc5..61dc44978f 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80c77888856e76935dee1e7512991287321a856c72f722298ec83fe54b9832ea
-size 12367
+oid sha256:d261286b2d36c8e58290bef31d647214aad10dbac334b8151d8670239bf4e8f6
+size 12377
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en.png
index 3994e5b8c9..1658700b51 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba14e3f3a756cc227fb6ad1fbe4ffea174cdd6e56ec982cba86b6025d65c7b16
-size 56354
+oid sha256:e553ac2b5b35f694a35f56948196f6f10612904d758b749c5878ca4ee2e1ec07
+size 56360
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en.png
index 2bfbe443b6..af2737442f 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae2cd1fee72a1bd76862fe522fcc4afd942f763c677f37ec38198bb1223b593e
-size 60836
+oid sha256:a1cdfbb66bef6d51807cbcbb75e8277bc9475d41f8ce95c5ad8440fa17265131
+size 60727
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en.png
index 9ab5346177..f8b4c759b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28f0e05f1c37cfd0b47b231c213b9101f0cf4deddcdb0a3f600c105630b8100a
-size 52017
+oid sha256:06ab908e6115f3962b9fdd86df644af55ef731898da958e1041d6113ac46e4f3
+size 51947
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en.png
index de2a58e79a..b916b4e68b 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fabf3e373947091f9b061cb1252769f9954a7394a39f98ce3c29665d46d7de9e
-size 60554
+oid sha256:521b6f5002e3dde3ec57b0ad89a9c2415966cca80997962de95333c9f7585420
+size 60404
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en.png
index d8a24019cb..9ddacf0d4a 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:293daf287f9af7820b9117cc959eede1690df093d9e9e1b2008036b78c60ad13
-size 48712
+oid sha256:76cef9dd905c59735aee59b860360c12de6d0ff663cc0f40bb9a9f9b1fa19159
+size 48716
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en.png
index 6f4516aabf..020731c6fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97fcdf04d36ac5610abdc12ef2bdecc3c4ecbf122c7a829603a7ab1fa6d6fe93
-size 52821
+oid sha256:ceaeffcb2bd4239d61e3c4f51d15d60a43626938a949dd5004a57ae35891f426
+size 52649
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en.png
index 4e61663da4..97a84d0ce3 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0ff06a7d946dac97fcfbfa9a8ed9273915c3aee046e4dd5de5531d404d33ee2
-size 54457
+oid sha256:58768c1acb87ee8f74f077e84295d409713a54f6b91b37309c3fc189f913c513
+size 54298
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
index bcf0034ebf..07fe24d1fe 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3af0b02af1e4069d41d08256b252edc0bc6994bab9208144a46133f29ca0ac42
-size 56820
+oid sha256:e12b02d20a079766f858939c837878c6284ddc568d881585ca70321f6c4642f0
+size 56691
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en.png
index 94bae794fd..44d6f46631 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d284095602bcd3fee4f63b2071de9b64d6a4694077167ca7915317574107cba
-size 67211
+oid sha256:f1bd3c62483126552f1ac4ade2e19190ee9049c7aa05b3092fb0cc44d1d2c9db
+size 66663
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en.png
index 5b0252c2b1..da448e7437 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:881dadb37886ad8f1c2265466b38162941cbc0c4a5551f50ab7ac2f7db6b20d9
-size 61391
+oid sha256:b90f5e0c365d378fdbcccc0d8935b60a4b866ea2a7262ef5e5fe72316058e52d
+size 61226
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en.png
index 413b1cb404..3216eaa50f 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ca4d64ba665223ff81b990571d95e0ee4fac62d80452e713be7d3e0b7f36585
-size 61351
+oid sha256:4de200678e33f38d5787cf569f46b3c0f980705b827374cb3ee77d0f0636658a
+size 61190
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en.png
index ee55ce808c..6da554e6e1 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43feb55b7bd4078957549d4c998b9c5c83ae02ede6222e7fdff522bb40fbe0a1
-size 54900
+oid sha256:1fcbe996ab969856de2c37da875aedbd3550c9209f58bc4eaaba4ee5f9e6183b
+size 54697
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en.png
index d3810d3da0..d808d93986 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:278da63de530e59035f6db74d46c81f1d26aa73649da0806adf2050cd67ab20a
-size 12373
+oid sha256:2d7d643792fcae5b32dc2a14c738bb9f4a04c746adfc5d8abaa2aa1bae963a1e
+size 12379
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en.png
index 7cbaf82be0..7e9793abbc 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a41e7efce708581e0ab116737b59549b55f73cbacc8e1ff308332911d9042d8
-size 55462
+oid sha256:6ca4a8b7f73297d2130a0e7657b9abdfaeb47ce5e6c7da2c43105acf54be9952
+size 55449
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en.png
index c855eae4e1..43a93b06ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed511d35b0a0bd4b5d1fa1720d87ef540f95eb1c07e7909d3bf8c990a1a537af
-size 59290
+oid sha256:a116956e710f799768c2725247e4437d29876adfe92c584945bd1430e06aa7b7
+size 59210
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en.png
index d5fb1cf198..451d85f21e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fe5d748130431c697e11374acc7dcff18fa7d6d8c8b5aac522bec3d9f25cc93
-size 52078
+oid sha256:9d724dcb19dbe6b55cd5a0f0c5e9ba30b0e505be7d8466d5cda96412a1bc6c29
+size 52004
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en.png
index 413b1cb404..3216eaa50f 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.roles_ChangeRolesView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ca4d64ba665223ff81b990571d95e0ee4fac62d80452e713be7d3e0b7f36585
-size 61351
+oid sha256:4de200678e33f38d5787cf569f46b3c0f980705b827374cb3ee77d0f0636658a
+size 61190
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en.png
index ca58eeeb17..930f6f93fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b479f0c88766634a4c0522d6260f31a1bf2e9fc07018cfc2a4818eed19faf3bf
-size 28328
+oid sha256:7a1405e76c5a209a5fc4e6a510aef34df35f0feefb5a52dec7c7f884b0526bdb
+size 28353
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en.png
index ed38da4f4b..b86c175ca6 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d6796ceb09d9e063097266b12f5533ff425d6dc89b1fda2ede6e049f1fe8bde
-size 30164
+oid sha256:d655f0da7f5c2d7526f4b7d79bb18243a278722df3baf0500c71aab35ead3986
+size 30245
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en.png
index 7d384e609b..2d7c2ef3be 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab852889a65d07e3ddab54a50c7d989c7ed761fdb4dd855b7f10d452b7840ce9
-size 58187
+oid sha256:1c77cdf26831cfcee230c25c1c2c1236bd1306bbfddb8e796f04188590a78dc6
+size 58296
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en.png
index af2faee64c..8d0beacb00 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:230e766156de551fed6ec641e813a136c3bcbe1160828777623a2198eba194ab
-size 27747
+oid sha256:394c790fd526ab95ee76bb061a7d7dd8c60f35c008bac5f979112a0ccbbb61f2
+size 28084
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en.png
index f1032d7bac..73838da8a1 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea23ae24e9d7d7eba6cd75e009129a10e90311f2efddf0a4d5781b97d944184e
-size 26718
+oid sha256:07b56e0c758eaddab75599a80e0799d5fb35d0194bd5a2114e87183327db4091
+size 26785
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en.png
index 59b0916092..9429e7d7ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b124e86fcfb1c1fd6aa04200065bd90966a32ac0eb66aff71c5cd9e362660939
-size 36693
+oid sha256:a50df0a82ccc9cdc80c9a2bba0c19118d0a90d14fb8022574d6fa0c24913ab50
+size 36751
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en.png
index af2faee64c..8d0beacb00 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:230e766156de551fed6ec641e813a136c3bcbe1160828777623a2198eba194ab
-size 27747
+oid sha256:394c790fd526ab95ee76bb061a7d7dd8c60f35c008bac5f979112a0ccbbb61f2
+size 28084
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en.png
index 5c120513de..8ba18e2468 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c73af7aa4ee7b60969a0bfdfe77494ad6c8456f3108450605242e41f0e50f90
-size 27053
+oid sha256:133fce7270dd0faf6f4ace7e5b042402defce0169e7c6fd6c4eb7dd986681713
+size 27120
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en.png
index d14022b8d4..101a2ff478 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ec56279c2c0c390ffcf90798f121add48d1afd64e6cab96a5e0af6f61493d63
-size 26655
+oid sha256:911a229d577ccdbe861ec7d74dbf58835a8d7b4a471c6550326fa5bd060bdecc
+size 26636
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en.png
index 0471e73a55..684d79fe73 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1ed853f9fa3a58d4f1fbc6f028264029b76b53fd5a7baec1dd46f694766457a
-size 27456
+oid sha256:bca34f7d0bea1403894ea3997db129f8fb6321b2a0be099827121210075ca124
+size 27498
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en.png
index 6d29fc04e6..68a079b789 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6f34de05ed23c58362015cac39d28917b6735872c1d1521b43127a283078cff
-size 29121
+oid sha256:dfa892df2794c1a42f01e50d0dbf212b464d1b27959199a4b57da2054aad067a
+size 29153
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en.png
index 895f52fb18..6108e2dc1e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bd29696b70564a9f78cd98f957c671faaa450ffbb9aaba37885d50c729028e7
-size 55526
+oid sha256:620b76e7de46c7aeafa529eb4a793f96b75697570465431d015e4f7d479b0aab
+size 55602
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en.png
index 83bc1a6fd6..d0b459ef9e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:610649cb00a0818364c2dbd4ff70246886a82ab0d0b21d0dd8e82beb2da54981
-size 26677
+oid sha256:1037fc83c15315b619cb90af540b5a8ae009d2eb6957daa01162c7a64df2c991
+size 26869
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en.png
index defed0d920..5a200e1bc3 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d91747927961186377681a43a5190ca6923409781adf833d61e547ed133ac75e
-size 25179
+oid sha256:efba79db6336493bd133f59ffbec101eca8d1a4972c56d8435b595dd1efd51f3
+size 25163
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en.png
index b4c18aeeb7..48ac8b9e9c 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66016e7926dfd7db206c8695dc9bcc2ae0ee40700ad31f7c00f67d1ff425b761
-size 34479
+oid sha256:e2c34f18a2490abe8cb6949d48d8f5699b7d254ded7dbcb6155c0ac9d4a25411
+size 34422
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en.png
index 83bc1a6fd6..d0b459ef9e 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:610649cb00a0818364c2dbd4ff70246886a82ab0d0b21d0dd8e82beb2da54981
-size 26677
+oid sha256:1037fc83c15315b619cb90af540b5a8ae009d2eb6957daa01162c7a64df2c991
+size 26869
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en.png
index c05bf83229..26a7ffbd53 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28594fb95b9607e224279fb03d06961faa80618adafde5112283ae84a67daa7d
-size 25556
+oid sha256:9ee1c573eb7ca55e70f583e28709ffae78bf584fb731f8afdde7b73c04f18483
+size 25535
diff --git a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en.png
index f2fda142a6..5b48011bf0 100644
--- a/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.rolesandpermissions.impl.root_RolesAndPermissionsView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b5c5abd858c9b78a9f354e81977d9fe370dd511c242d75bd02385122101c766
-size 25826
+oid sha256:2b2890e06a07ee90b06dba3adde8d59753d0c53a90277c1f1f6c726f1c2bfd20
+size 25747
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
index b4a2bcaef5..9b6f6976b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec30fb3b59ee64c596f8b164a9845d797f1d5f60cfcc4a463bfd795d91308dbb
-size 29476
+oid sha256:cafffeebf11df13dd9bfca09a4ea57245cdf1440bd5499d7095197824884293f
+size 28632
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
index ab1896c7b3..54be022f26 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afb8299f98451448cca06d4356a7591fc05a0383fc8b3afe4690452215c0ee06
-size 28680
+oid sha256:734a534e4a15dcd5f5fbc5bd3ade8c1062b05fc876ddff7e4e0c71fb1dc824a8
+size 27975
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en.png
index 24aa702c79..3579ee64d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acb77b2b218774a4f19537af5658205f2ef8150355282d1e1d85e68888712144
-size 31578
+oid sha256:2b88578c9265674c4fe3973591aacae7ea83202d6753b98fb416903947077a3f
+size 31602
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en.png
index 0274af2d42..9a0737c008 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca592ac12d7cb8583962d8c0d5d99a57396ea807f830c4a727fae5ba077c3a1b
-size 35709
+oid sha256:b62e9ddbd1203a3463d91728f87506176fca85840c25db9169fed063f7eba9c3
+size 34772
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en.png
index 21f4043acd..d1c21e8f99 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42e732b8e2c65c05096fad71211c8cee185c20d25386544d7245211f10922d40
-size 30159
+oid sha256:e401b1f2d7cccff403e6eec79f60d5b9a7c04b465bc9779b4b23b04dd1afc9b5
+size 30213
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en.png
index b3082edc14..ac416513d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8ce8c575c2b6e313e6623e72b772a6ee5fa175a4bf69a1f17ff8628cdfede4f
-size 31489
+oid sha256:effcf70d68aa8ba7ee40896d8ca39951595afd7ad227c8ff384cf71a91d703b8
+size 31661
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en.png
index 21f4043acd..d1c21e8f99 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42e732b8e2c65c05096fad71211c8cee185c20d25386544d7245211f10922d40
-size 30159
+oid sha256:e401b1f2d7cccff403e6eec79f60d5b9a7c04b465bc9779b4b23b04dd1afc9b5
+size 30213
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en.png
index b3082edc14..ac416513d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8ce8c575c2b6e313e6623e72b772a6ee5fa175a4bf69a1f17ff8628cdfede4f
-size 31489
+oid sha256:effcf70d68aa8ba7ee40896d8ca39951595afd7ad227c8ff384cf71a91d703b8
+size 31661
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en.png
index 24aa702c79..3579ee64d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acb77b2b218774a4f19537af5658205f2ef8150355282d1e1d85e68888712144
-size 31578
+oid sha256:2b88578c9265674c4fe3973591aacae7ea83202d6753b98fb416903947077a3f
+size 31602
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en.png
index 653b7031b3..42ec11a9df 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dae1b0140dd927945df0e9abc143b15fce938747bb1d94759a9d6f198ebe20bf
-size 30598
+oid sha256:76b7d21acfa225b567e406d0caa329050d6cacd807d3eed5db869b8052567e7b
+size 30547
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en.png
index 57bff77a51..f0eb526ef6 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56c928d1868ec3ff1f251d532b532397f688949e8cd6705ef363651c88221019
-size 34350
+oid sha256:37c043231ce5736157d7a2396252dba0240068d602dcff03881a59db92febb54
+size 33545
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en.png
index d9b229a745..6587487aba 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1e1cb86dd8b566d3dc4dad42a30bb89de9fb6990d36572589ec5938e8411a6a
-size 28940
+oid sha256:12022efb64da10a3343488b5475cb8c7c5d121c217eaad1d141206dac1aba91f
+size 28976
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en.png
index cb74a59e91..25bf6acd7a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eaa802a8e16d04b622f861c84b2454bcd5da52d27497972490a4eb7d9970153
-size 29554
+oid sha256:927e3169b0ecf27385f8ba268d633fa2385793180f828e45f8fe388b616f5e2a
+size 29615
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en.png
index d9b229a745..6587487aba 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1e1cb86dd8b566d3dc4dad42a30bb89de9fb6990d36572589ec5938e8411a6a
-size 28940
+oid sha256:12022efb64da10a3343488b5475cb8c7c5d121c217eaad1d141206dac1aba91f
+size 28976
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en.png
index cb74a59e91..25bf6acd7a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eaa802a8e16d04b622f861c84b2454bcd5da52d27497972490a4eb7d9970153
-size 29554
+oid sha256:927e3169b0ecf27385f8ba268d633fa2385793180f828e45f8fe388b616f5e2a
+size 29615
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en.png
index 653b7031b3..42ec11a9df 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dae1b0140dd927945df0e9abc143b15fce938747bb1d94759a9d6f198ebe20bf
-size 30598
+oid sha256:76b7d21acfa225b567e406d0caa329050d6cacd807d3eed5db869b8052567e7b
+size 30547
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en.png
index 53af40cb76..2ce3f41d5c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8199a0e7db5d347e402400b5b87928a0f86e8995e2d359eb5dfcf53f7f7e3599
-size 22617
+oid sha256:6fa470f9ef32dae886e25183403882ead91f3138b3fcfcda91deea35e0832eb0
+size 21685
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en.png
index 50b3ff649e..a8e56aaecd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23b1936c894d405a52cd1db59430e60b74b2d47f2d5834be1b2a738d05445cbf
-size 21909
+oid sha256:7b122142624ed5f5f0cb655eacf8bb0367f363298e9bbc88a4ebfccb4d70770e
+size 21089
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsA11y_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsA11y_en.png
index 3df4b3886c..cda44203a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsA11y_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbbd62622843fbd1d8d35b63c7308eaed46b488e6b189e987983144e5395bd09
-size 78972
+oid sha256:104368b8327a971e2135d74461a7a471cedd4a88d09caa34bde132058f67a33a
+size 67491
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_0_en.png
index 44e3d87eb9..c9dc271f46 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31d18a5e250e531fd7b986690306366cf69eedcfdbaba28148e3edd1d36ae597
-size 42912
+oid sha256:d0e5b3a9c3d43c2007e0145afad49cdf97f163706f04b16a852ba107ac808533
+size 40173
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
index 449dbd7465..ac587ae11b 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a04a5aa9e35df5eb82a0a708b2b743bb83a1a9408fee91beff60d5a1ce2c6d5d
-size 41599
+oid sha256:98b54ec3c153035407f5769bb461fa00c13bba8ce8345f8253e3b8c0d9d062f9
+size 38338
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
index 279035fea1..a8dc78884d 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef69f889a28afe5704da86296ebf9916a7af1de751eb4c1ee4995ca3f70ea12d
-size 40737
+oid sha256:6d2c8756af09a88c8b68749e6f45a30d3408ff6f222e1c78888ea4f8a75e2e11
+size 38050
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
index 72f8640e83..24a1b6b746 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d4312936ba67965a8b35e714bbc3014214320311c5d077d33382ebb5aca5738
-size 42172
+oid sha256:878bc7688a46fe3e1dc82522b496d205b571b3e73334d6f277983836cde55fcb
+size 38687
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
index 7c1059539b..0097772a76 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b07f6c942ab083d94c22218010b4aa646cf03e87af41fbda89b16620f7b9752
-size 42079
+oid sha256:31c9782ec0ec1d00aec8c4e3c1ca5faf14a331b37de9df9e5396d07b21c6b76a
+size 38633
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_14_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_14_en.png
index d7691fa7e2..29ba5986be 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b6db26bd05f206661a5707a972cb6f843eef82c76e5e0035775625b4a6268a4
-size 42640
+oid sha256:9aec6fb2da24577e148b2b25d58151c29dd662b9e42252c5ec39aa45e889f8d2
+size 40044
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
index 9e68ee9859..20b8a5e619 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f77eba1f623f67eba427312523def9a45c41581dd4e047701b2c75f787fcffc
-size 43178
+oid sha256:4ab43948e7b58860945365c7a7d8bbf61f1edf7d6463296d57b94591b3c829a4
+size 40389
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
index c42d3ebe59..a66b4356bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a62965a57fea6665739d8e8b2fda9e15abf119ea59f6bbd5d7d8a269512064b9
-size 42421
+oid sha256:2c103a46031fae57a0a5ae0ba10631821146a3645ada35574f0eda8f70225e59
+size 38924
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_17_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_17_en.png
index 45da7b512e..17c187d067 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39780082d7826422d70902ac2b7859013c30b41d31f20aefc25ada8aeae196c2
-size 41684
+oid sha256:d0420ff1e4b928c67f7a4f9df441e7a3650e9e58baa81b8d212fc30c004595c2
+size 38328
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_18_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_18_en.png
index 029a2c3639..8cef9eae9a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5917028dda35add5ed6b32fa9017a9cdcdfb8d273d230aa6d529bebfbf0b95c8
-size 39646
+oid sha256:abf5bcaeb1e744ef9b65850b26b6788a241e356dccdf662b39c980300c42b0c4
+size 37433
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_19_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_19_en.png
index 55a953b2df..b3431e07be 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f65f298b3f14ecb0da53f03a20a5464a7f6ae138dfdf417ad936601a521fbb30
-size 39601
+oid sha256:e113c9991419e4d47e961192e8a60d216a89df73221a39aecca26f6aa54b252c
+size 37432
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
index 7f4cd39731..f5c01cc6c7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df3ceef42a59cc072e3aa21c89e9b90f0524ac422d1538804b6fcb8abf97752e
-size 38090
+oid sha256:210fbfea81564674e150061d1f42d7b0884c8a287e39628d68a2e0e5732e4608
+size 34503
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png
index 7cc47cba6d..48f398d3f3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c66ebe3c16933495fe33596036363f95e20654b6ef5ee822f594a34531ea640f
-size 45211
+oid sha256:a3bf201d346413a3008a727b1268c954403a6faad0a6bfee352146a12246599d
+size 39071
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png
index 8d4880b59f..08858f8634 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de5ccdad3e08ed4fd4330697ad6c7085d5553cb889b7b7c12879aaaa6b34c1de
-size 44953
+oid sha256:da6643aab9f173b7f0bc5df854193af6301dea202accabc501b7ec55489468ec
+size 38789
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png
index 52e66c38c8..688916d10a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e215296d864d34ceacaa53e7fec452643b63d72b253074eb50617bab50915ad1
-size 44670
+oid sha256:5fb4005e03fbf477dd1a3c01b557c1a16353d26e6bf900d5aeed92a8b9982c6d
+size 38685
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
index 23ccf2249a..5d5a97fede 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bf5c596196e64554117addd1247aa1e5be6e8095d85a595b1c2a6232ed483eb
-size 36591
+oid sha256:fec18f9b702a3093808914135b75a515ab241c9e1c1a1d96e8f3beb56e0be4e5
+size 31942
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
index 8a7f2e2d75..2c9b951ba3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0cc874a4ba2b8bd0f0b7e290d0ffc67e82d1222fd287360c3321143d5f87ad4
-size 42369
+oid sha256:5ab4165ec7f3a329691f7a20a6bc822ee11ac2ee209f582f013573ce25634f4a
+size 30748
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
index 36de539c48..b4001ab811 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6900db132e6b79de1c5ac986666af46e3f7ef65a9c4cc7d847dde6962eadd129
-size 41352
+oid sha256:5e7fbb7cd48300741b3bd390fd90208ca1d94a2123c011b1003d9e9197187cf9
+size 37319
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_5_en.png
index c5d81c75e3..b1680151d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7199817c8591ccf11241204af8a39d2ed1a60dfe238b06387749d57858cfa65
-size 39288
+oid sha256:51c762a3e1350e5dc2ac85157331809d564a710caf72df79e879738912a518e6
+size 37149
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
index 1e0b3070ee..b170d8a573 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fac98b00a99771b186e8146b98ab63602be7b4c5cc9febc3ca821c1d5cd6a1b
-size 42700
+oid sha256:80b5f6c01aa73f55b73a179448a225a199ad49973daf4220278f23efd2c5168b
+size 31458
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
index 4b9b30b2ba..b26335b2af 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed4073d3b427b2a314667f5118b571e5896f1439582b9209077ec9c62ee0e061
-size 43097
+oid sha256:398d83dc49923e014e81d565b9e4f3d2c2dd985c18e53856885c46c79df64e04
+size 39242
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
index 60200cea9a..8451d1d645 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c68c895b189a41c7edf8fee58202560ef47e0a98082ddc3a346546f4f1346de7
-size 42100
+oid sha256:e14f6fd5ec0f7abcab209743554ebbf66e125dc6b03001c22b06e1b8bd304129
+size 38710
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
index f9287533ca..c3a9c557ff 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1879c3d54dfed55e4bb46d967c9c8c5a4f95f4e31e884afde4c9c517f35402e
-size 42093
+oid sha256:08ac66c12bd42f5a1c5941d88f9f2a9dbfa98611b604a9100c143584a00658b2
+size 38824
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_0_en.png
index bb868da01c..c26999a9e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2b5dc5cd20ccfdb7e6a1accabf6e139ff343c16378af19232168f835b1c97df
-size 43650
+oid sha256:4656145e26d387b5c300c6520ff448f7eb113c5e51bffea66d70122c7348fadc
+size 41418
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
index 72803025b8..639290708a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9c7dce94908b2b0287c196f564c306a05306f058c71d75be3b298a45683bce4
-size 42321
+oid sha256:4da21ae4058d74a463725dc9bd4727f763fc75350691537c99cf24ab65ad2744
+size 39469
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
index 9d2b424654..e000fffbe5 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:743fcac827e8df7742127491722c3ce617a54c0b64fd3336f939994b45376966
-size 41470
+oid sha256:13562a00e6dbca6edd08b4627188f674d31208c6d034d662e639676c5d03a55a
+size 39493
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
index dd489b5147..6fe35cd494 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:671ae1ee2f065705b38063cb354c4bb4a63247e01e1101dd155515b46decb660
-size 42926
+oid sha256:8d4065fdb9814fd0cc088413d5d505021b4141f93dda271edc23be50c7b4fe68
+size 39797
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
index d5f14e286e..cddc0ee1b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f352ad92472cb8b152ef0660c7f66b55b956ec05bd11dbeb2c9aa543d0db2ca
-size 42849
+oid sha256:6b29fb74626b9720eb5ef4c8bbdc66c08bf670180ea4110a82de33038b8fd8b4
+size 39738
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_14_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_14_en.png
index cc8b1c74e1..8e89fb18b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5742ffdefde6a9e3f01ba021a75eea20599cc520fa4976aa45cf1c10e394f62b
-size 43367
+oid sha256:ea3c7900ce1590aecd57799d3e333db42f9d6b817995b8d2d358e785c1e671af
+size 41249
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
index c9db5d9a07..12eb9af146 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f6be8e586f9692013ce38c483c42fb23f8c135593e17a72f3be19381719fe6c
-size 43967
+oid sha256:7e97d75c02a333e0ba2b66abb364bdbf70db08ed92614d10c7f0c9ad38b20600
+size 41668
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
index 6b9fc92803..097574a7f9 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b4b470aa3f3650c26c6e1cf2491ffb7c3ea58db28dd00c0755a7f5727dc60f1
-size 43192
+oid sha256:d1ad34e9827d42c925371fe4d689d38ca5a7714963cfdcbeb4445e5f3707441a
+size 40046
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_17_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_17_en.png
index 12b5fd1b6d..1253d3ed6b 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:656c300cea79355aa3b35cd59666f8e35aa4c09d69dd422e816f256cbe6d420d
-size 42685
+oid sha256:3719fd40b9a47f2a600e504446652cb5aefcaedcadc75eee4038d5be741c2b8a
+size 39569
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_18_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_18_en.png
index 4c7d16ea22..9500bc2a82 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93fe116bc34f9cf8ee3da2317948a98405e36a6fb98a58b2046a049af435e913
-size 40373
+oid sha256:623eb89cb3130d4b171a1c13756b2901b592f76bac669ab1ecfc22a5ef037e83
+size 38897
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_19_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_19_en.png
index 33efb5e55e..5f0ac8dc44 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09f89c67652965407ea147aef158d0b3281850b95cca35f7aec207693bb0af62
-size 40242
+oid sha256:1a4e95467a96acf94a89411e4150f4d274a64dd936b44c2e9bd64b32d3adb77b
+size 38834
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
index 5e8f3baa0e..438fd30055 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04c7f8e85d58591c3dd6ade913b9fe0861ff7f774fdb4b46e63c9f86ef5a918a
-size 38959
+oid sha256:b27c755535ff88f7052c206d4a1e4d59a721fa769f0b21811a7d5e522d43bcfe
+size 35847
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png
index 9462f1336b..e6b60f74e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:389fcb65c5334f31b3d66731de2c65128d0a17e7380ca7c45be8a36023719732
-size 46097
+oid sha256:003b935e1147ed7f9d69bd8e5f88aae90b11cf3c6058bd43c80a2647d868bff3
+size 40153
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png
index f1f9639eae..bde34a8b45 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:567cefb525795b66704ccd1738bfe08247004814c947f6c60801588304c768c2
-size 45835
+oid sha256:563e48fa6b4521492974e2e7d16451521e9eca3c9586fcb148abbe8a358bb5cc
+size 39915
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png
index fb830369a5..79d3a74283 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f87512e18ca91237141d97ed03f4725a8a671268daf50f0a8049ee34bdc42a61
-size 45503
+oid sha256:1feb6b1a4aba58534355af7f93415fb16d7bfdcf1d64ab4b251f4eab232e85ab
+size 39804
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
index cb6e8c1f80..f22e044e67 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27918a9baa05b2cb8dee7219b6e19cc10be1421be190d1e35724d237270761af
-size 37382
+oid sha256:38b5a318b8fc33f4d9abb44f78e3d34e95fd7dd687fd4c5ac3b1b84a3ef2c391
+size 33189
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
index a64f6a2843..04e319681c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfd96490ce4509620efd7be72e6ecca219eafe73050417c0c3685339444457f1
-size 43060
+oid sha256:8917c0b2791679fb07b4ae34df225c9e6ec7cc9d1e2b548b406705176a27f370
+size 31873
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
index a8894c7eab..ee01bbdd1c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ee0a79abd45fc9573e64b6f06491f33dfca34ddd96c0dbd3d8cf7a9052b47be
-size 42072
+oid sha256:df2bb8ee19cba8f6e13862c4265174ba389e114281543dc876fcfa7fdbca513b
+size 38680
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_5_en.png
index cc81464baa..929ee183f7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7146d365a105c86eecc34027d2b824e90ca1615fcf77ca0f49ed920dbffe22d
-size 39903
+oid sha256:9dfa6b12b844c741cc6859c540f2036e9ea11b6875ce89e93ed466d61bb985cd
+size 38556
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
index 2f72417b73..d0383de612 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd455b5b492eb88bde4e985ca01ab97e23a337d7ac478782c09dbb10803960f2
-size 43430
+oid sha256:596d9499210d731ecaf3a99af047c1a40eab4da7f82c61b8ee31772e4fdf88a7
+size 32853
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
index 55d8ab9869..1f946de38f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:863c5db2d8fd863b057d0ddfe26bb3804d15126c2fdb58fc03c0087d79c6a3b3
-size 44056
+oid sha256:27f6afe2f5ae91fa063ab723faf245c78f14529317db13730cb14a4fdb28218c
+size 40454
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
index 83b9c7131d..05ce43121f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16b815f5ec48c101a7bde78cd5a4e30e825138f359e415699ef2b14e6ea23869
-size 42968
+oid sha256:c07b28bbf8c689a1e21a17304bda708e801823daaf70a33392999fde2490c6a1
+size 39884
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
index faf5081313..f081f3f170 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c47ff32beec1987fdb9f92ef6e5c9b7eca04ab20ebab576a2028225a595ba12
-size 42911
+oid sha256:ee7d773cf7cd5f717f776c5582661290478121ea812e28025209614130aed578
+size 39895
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
index b5ff7ebce2..a2dd2d7d0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49ecd29e87c23ac92f0b5775e95a1b46dda41bbd7bb52a5cbfbcf7cd039824c9
-size 17240
+oid sha256:87f838ca9caf6f047d7273ad18ccb4eb97ad593e3c3ea9ce337eacc00040c359
+size 19961
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
index ae186ece30..5c03fac730 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ac03bbed84ae266088d0e487e36ac30ddaac22bdaea6218423a8a41b77f4c5b
-size 20217
+oid sha256:2d145ee0ea1d6b4b17d45f2075d0f90c8fb0560c598601bd763f3c1f7b5df743
+size 22908
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
index 6311df6e6d..b23d5cc0ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d44e5119301f217903d1ca232f17ae54ba96da9a6878e668f603c57bcc23761
-size 22612
+oid sha256:e91236d2597589d5a29a1cf801bafe62d47060bfd77c1241ceadd031375652ba
+size 25179
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
index 90b562aa09..bdcdbe3e82 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:980b9744a36174bb8b080a431b277b544dfc045869102147fb9d1186e396b5e9
-size 22720
+oid sha256:b0c1bc8124c3b5271059aa05cee7da58efc91ae6fee9168bb843a16b08ebfe6e
+size 25254
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en.png
index 46dead6c87..eb96c3e39b 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e611504d154db3889c1a5900e6af392ca058462450d66f0dde762ab4a45e1b76
-size 29532
+oid sha256:06ca0aa653033b59313325ad508c5916e2fedf29ba6dd3a5f714e90d01f4bf7c
+size 29644
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en.png
index 9399857173..9b9542917a 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6135b24d94d7732342ec9353cdefb115ce5e9a799dfaee5d57b2e8e0a7ed631
-size 26505
+oid sha256:ebfb75986cd385e9837a24a5f279e07f0744bab5613fd7cbaf0a493d021c7699
+size 26606
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
index f8a1f24b34..5c597300e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1342b6427f5b2e3075ae3ccee60bf1d3b11afaccf3e152643d6ef2d65c21b54e
-size 9108
+oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
+size 3853
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en.png
index 8380d60ccd..18d1be85a7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bf31df95e781eae5530ed98ab9773f3e7d0f4fd4152226596b78328b88d69a8
-size 27223
+oid sha256:a58e6ed7f10d7014c9c3b55fbb769e04619313212449a8fc582501d2904d669f
+size 27315
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
index 1a59277355..1275815ede 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ebad5a2935050fa87c16c518323bdf3db4494fd8a14a5a03809e3e51f047b70
-size 16318
+oid sha256:f8899f724a37c3f852186528c2cf1a93d99ecc13b6a398b2f6f3a619255448d3
+size 19058
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
index 9e8644ac62..2b8e82d340 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b427494aa12528f795a49f27912b90ebb59392be0420fc27e3c4014a3599680
-size 19155
+oid sha256:21db73c6219186d201b2bde4f36aa9935842ea051fee3a38414776dc11a4a4dc
+size 21891
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
index 01b60a339f..e23546fa4f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d301576daafc3b86949208e281479183558d61cbadeb412007ee8436aa7eebb9
-size 21590
+oid sha256:f7ec286959c79eb80e22f4cc68c7aa10c15e0cd003dcdfe64af1877a1d805968
+size 24268
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
index b96d820784..ef970ab4dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc69bdbe8ac22e7d6470a8b547ba364e3421f6d61ccd0c364492dd860b1ce093
-size 21682
+oid sha256:4a47b9cf51e2da26d8e8085e7c539ff4ea8d396aebfabd5f168e2622b2c3b2dc
+size 24337
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en.png
index c5d3a63af7..2f5afc02b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:641f434040dfc9f040622fd0f17519d353f0bc45a17603ef837e53fad2b529c2
-size 27570
+oid sha256:793cff43740f6e477a255af566985d8bb7b0242d89484b3f0fc5cfec3b4a2af8
+size 27608
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
index 4ae7279fe7..d47bf90664 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:410a8596d4c70b9a3856d959d6d71ade8e831e8581ff410c9900957a93b3eb50
-size 8114
+oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
+size 3664
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en.png
index a06978178d..4a9b30b4cf 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d9c0f0c69bd55b5c9a925cb89587d959998a833c5927873b4ef358959ce4ece
-size 24944
+oid sha256:ad842be0c519bfd7713eb93df2a7216d159970aff1ea44725641c5db26f3ad6b
+size 24995
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en.png
index 4c39cde004..4964d7d1b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f17c5df90399b6de382af8111ba36b0ec072596f42103f76477692a801493799
-size 25515
+oid sha256:541b9ad607838fc9d44d6d3759d61df54c178257fe646366304d96ebda5f7e77
+size 25565
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png
index de42fdfe94..fd32767a41 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15f9aa77f9f8fe09a10e2e22b194f2ba505d56c9097db0872b317840c0fa84c4
-size 28661
+oid sha256:218a8bafb58855056ab07b05d45c87df482483c02a5144c0117c1159135e924a
+size 28637
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png
index 6ded082e3c..a3c91c139d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f1762442b6dcd37d5710437239055e7d40d2b741cacd1045a3eacd327fc12ee
-size 28053
+oid sha256:76f1e9db9260cb23bd80bce5f45bdf323a8d24cb87757d7a32f9c6e6b632913c
+size 27993
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png
index 6ded082e3c..a3c91c139d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f1762442b6dcd37d5710437239055e7d40d2b741cacd1045a3eacd327fc12ee
-size 28053
+oid sha256:76f1e9db9260cb23bd80bce5f45bdf323a8d24cb87757d7a32f9c6e6b632913c
+size 27993
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png
index 88df849ef5..6c8ad3018b 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea5df9ecebf686ac65c265d1b74e3a0a5169d1e308eaaf4f9c205a754d8bddcc
-size 40150
+oid sha256:4fda40268a68acf664e90a48391658b8dedb3d7f5d5e6b76d680ab25180d5a55
+size 40121
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png
index 58a01b25a3..4317869283 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06170ddb862b337c00d50a531caa1f673952cc0194cb38410d3aa7cc61d95c16
-size 27653
+oid sha256:6c8f9e633578f46a6b8126ea6dcbdb5c113dd0e1107fbc4d5b2206c2f5acfb1c
+size 27835
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png
index f346d344e0..eed9b50326 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc1a0fd307ba6ea9a9f578527bae5a074e5ad67035201d8aa7d85877ee697af5
-size 26690
+oid sha256:d55afb5f76aac3d1a8ff0f1c223502fc798dc0684f9d84df79256c41ca5ea1cc
+size 26706
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png
index f346d344e0..eed9b50326 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc1a0fd307ba6ea9a9f578527bae5a074e5ad67035201d8aa7d85877ee697af5
-size 26690
+oid sha256:d55afb5f76aac3d1a8ff0f1c223502fc798dc0684f9d84df79256c41ca5ea1cc
+size 26706
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png
index f38139bcf2..0b3c962498 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:763ddaf10dfed74dbef17deccfa7037d8b643e9b8654409ce96e8192ab5ee38c
-size 38418
+oid sha256:9410147c7a6a496fbd356b0dbc3b14998f20ddea6a2eeabb79b9600485285a80
+size 38628
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png
index 92bb8a2f0b..cfdc2465c2 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14b54f69d324aceef11b754a3b66def948a22697cda3e7584303b3a9e45c536f
-size 64169
+oid sha256:7db669adacaceb7521c6c29a6ffc4b5a96bcfe6de12b36ca37bb944a76999048
+size 70989
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png
index 16bb3b6d16..8d8f25cb28 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af9848cd44308df46cf42f3ed812f26e61740d52500b66b979cc03c378110524
-size 56130
+oid sha256:f241e93ac7db5568ec81fbfc23d2aaa8d1a6defa3280f3340b845ed7b554704d
+size 57897
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png
index 5a91d81f33..860275a09b 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:286b10d2c7cdaaf08373479de879b72dc674d4de1ecb62976ec6fcc53dc72289
-size 62825
+oid sha256:feb4a95d94bd3eb666a75ab9abbd314a2aaffbabf58ef6e48e400ad9fab1b147
+size 69123
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png
index e417c8c9cd..e387e49f85 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c064561c817ee9b305fe9064d976aa80f4047f8ea5e0cf74f0b186d370f2edaa
-size 54045
+oid sha256:e73307fb019a9ca043ece75bd5f34e0198e86e5caf3a82c2e1517e2d121ffda5
+size 55756
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png
index 1fe1e31cd9..3ca31399af 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38857c0fe6e6ff461ace5cec20fdf6d82caed44b0f554910fcc5dc4676e6748
-size 30468
+oid sha256:1175477d4879bd032110b82d123346bf49e1593a782afdd872aa45d4555c2d9c
+size 30473
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png
index 1fe1e31cd9..3ca31399af 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38857c0fe6e6ff461ace5cec20fdf6d82caed44b0f554910fcc5dc4676e6748
-size 30468
+oid sha256:1175477d4879bd032110b82d123346bf49e1593a782afdd872aa45d4555c2d9c
+size 30473
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png
index 709cd8354e..7c3d70782f 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9aebfcbfed290def2f0d9c04dabfd9ac0e3bbbacedcad9533660583080424519
-size 60014
+oid sha256:3eddc70823d0c9349a00f56c2baf0d2fb36c397202663b0709233c52d04468bc
+size 59804
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_14_en.png
index e12dbcd08d..e2406a4d70 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d35b333fd03b952f4edfa724382a489f3a84b7a010980dac6e9e9dd0f56bb69f
-size 60442
+oid sha256:04ea61e66ca5f3565ac3a048bfbd6f9c9491a754d9d910c7e010b374c5c21476
+size 60018
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_15_en.png
index 59c7730b5e..f8c7003292 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2da1bc59e3f504073ed1875640d8fb696653dd70587161e97d2b738c1c50a7e1
-size 40954
+oid sha256:e2eb4c69725f73786acd9d9e36c79c75f3ca4f9581b9fb67cd2a6ef6fbc23f25
+size 40811
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_16_en.png
index e31324db68..9bfc3e0838 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df2e1fb160f4fba1418c401a6323132ecbbb8718605704d475336547356aa609
-size 57377
+oid sha256:3eea1ff559477eafbce65907022c4881cb1a39f2e3f6da450593ad851f038159
+size 57430
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_17_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_17_en.png
index 00db7b8791..3d2ad0ba86 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2203bd270e716624b93f25adb37dd71afbf25a5590e72e65ed4e53827355f02
-size 38832
+oid sha256:b54b4e1fd75ad55a77ae3db7b0f73148ec6c93b2cfa3d5173ab23ad3624e2abb
+size 39956
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png
index 4d13452bf5..92c12ecee5 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87dab9cb3231c932913d446c9b60515a31394f7c2ea87093aff460a75d1f85f5
-size 31738
+oid sha256:11347cc627fcad16419322836451281f1ed74ff61a7a4feb25d717d3b75fd05e
+size 31698
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png
index 51a6988af7..c8454bf60e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06e4300605e15dcd7f921c2bf74ebae809432a0b723ce986d18b853144ef9de0
-size 30557
+oid sha256:ad5ae48cdcce852bea8a80f4d7f2f985b6f15db49ddfaba07055741c98af6579
+size 30575
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png
index 1fe1e31cd9..3ca31399af 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e38857c0fe6e6ff461ace5cec20fdf6d82caed44b0f554910fcc5dc4676e6748
-size 30468
+oid sha256:1175477d4879bd032110b82d123346bf49e1593a782afdd872aa45d4555c2d9c
+size 30473
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png
index c87102abd4..af58d6e586 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25a0537f0b46efc42176e30bfa3f9e789b0b53612fe6cf683270ad5c5b51399a
-size 32105
+oid sha256:b5184d4f5c699e80a07a5270bbc9c10b07c936ad654b6bbcba728c0e3d265473
+size 32031
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png
index 1174143a80..e3e025bc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf60051d705987828e0bc5c1cbf99b3a65c792fdcaa205376539c8461dfd1177
-size 31381
+oid sha256:83a4c517395facd11355794baf36564070a862fb81ddba98553d86e1148348a7
+size 31336
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png
index 5558390316..ef06f3a736 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da05500aaf5ed3adf5f1057ff3ac865c12a9dfde77791592425260f3578d1161
-size 29619
+oid sha256:ffa0c05495e46dd7162f46e3039e6e2814ee7b596abfc993b22f1e695fd2be59
+size 29802
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png
index 5558390316..ef06f3a736 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da05500aaf5ed3adf5f1057ff3ac865c12a9dfde77791592425260f3578d1161
-size 29619
+oid sha256:ffa0c05495e46dd7162f46e3039e6e2814ee7b596abfc993b22f1e695fd2be59
+size 29802
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png
index 6dc75b18b8..249eb3d6b2 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1dcd0009809a127c1018f6e942fc90baf78c7802c86fd384a273f51483a1706
-size 58048
+oid sha256:4f4df0625b26b89431c1f6a316a4bb4dc1dd15b699bcd8517bd787d7bb884b0c
+size 57969
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_14_en.png
index 18b9b26a65..44e3c6c6dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66e2230268a632877b50fefe34ddefcd6f9ff31a34b3107c420c36b12d7d0f83
-size 58539
+oid sha256:60bdc03eb85f9c17d9d329261786ebab4c65eb18dd1a1eef01d66ead65d81045
+size 58425
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_15_en.png
index 8b3123e8f2..f8927e3a29 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e4cd430376a28e6ca20082c328d1f15953b5ff54e00d99cd49078eec9e62a54
-size 39883
+oid sha256:6e8d19f9d6f4951dba75120b6b84bd5910c5c75681e554edcc51172768623993
+size 39652
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_16_en.png
index 77d0152a6f..a846e09ee8 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b69d7e7875b3b4c332d683b121902f88ad217641841f72cfa9e95a64eec53a5
-size 56252
+oid sha256:7081e97504108b32bc49d72765a55c9e7cc048221281b38d1b80562e4a93b7fb
+size 56305
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_17_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_17_en.png
index 792574e392..42e6aa4444 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45d4a147b71606727225be183a67b780dbd01a2c9301952c9dbd8d712da8b56a
-size 36418
+oid sha256:a472f0bb6c412bc3d7eff2a75493ce9bdf6a3bdf947358e5e1867e4d5d80772d
+size 37663
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png
index 5efbc25fe9..85a64c03be 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:227509f9ae8414add5f091cde3cc068aec0385674b09c5c985b1e0758bb759d9
-size 31010
+oid sha256:b1b791febf7e9a07b2bd28177fb5405f645af517782bede4d075eae846beb4eb
+size 30987
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png
index 89fb6f32c5..36c94e3426 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa32559c70491ea4bb7f315e493effe205792d8a7186e4ba8e484d31c109eae6
-size 29733
+oid sha256:8fdd5b8ac66ae699592b7de33f057ae4623b5a1a2c3999a8e8a7d63fbac7128e
+size 29874
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png
index 5558390316..ef06f3a736 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da05500aaf5ed3adf5f1057ff3ac865c12a9dfde77791592425260f3578d1161
-size 29619
+oid sha256:ffa0c05495e46dd7162f46e3039e6e2814ee7b596abfc993b22f1e695fd2be59
+size 29802
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png
index 3f191818d9..b44f602bcd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77d5c5c44ca5d5976300b5e580184cb414a3c1f8f49dec9cff50fc0ab6b749fc
-size 30226
+oid sha256:5096f4c8d78f2408c958f8894c1db75b028c9dd10243785d08ac156498383e2a
+size 30250
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png
index a720a81a0c..68f933cc2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.root_SecureBackupRootView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92252579b05080baf11b2b5ae7b761e1225f9648365800c30b50283e7fd5afa
-size 30497
+oid sha256:e7cffc393e87d7740682641a729a8082b6fdd97c274ee580654e2afeb3597a42
+size 30434
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en.png
index 21b17d8656..e1573dacb9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:562e8457321ec1afe9ca9a2111ee19815aa25401cd925c0bcc880a25db99e0c4
-size 42100
+oid sha256:01d03620cae8382ee41703d7553913fbd1e463fcd55fd661e9b99087e14bf6b1
+size 42162
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en.png
index c26e5c44c1..bea6d32d38 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4498edc796206821f346a2dfceb966f59f4b7adf513ae184c84d20b323ed0d67
-size 39800
+oid sha256:54d9e8714cbbc3785ccd25d6bff9c791d57acea007d6cb8774a4a5d61646b54f
+size 39857
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en.png
index e798d07cac..dd9010b013 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f3d6bcf6b603ea2e2a619f569960438337fe9e2ae9eea2657587cd211bbf278
-size 35444
+oid sha256:9f6ce15f59eba49738b9df2117764e760f2ddc06bd52f8386f6d78af307a4104
+size 34630
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en.png
index fa0b46361e..3264a61179 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9c17b8ca9966e4239e5c5fb9d9e5f0f061bd8d7fbf3bd9c76ce6473af537d05
-size 40962
+oid sha256:9a0a377b34502fb55b3ee72468533914de3c68df62531a6f40a41984c94d0047
+size 40996
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en.png
index 0072d95bed..6d6a189589 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e73375d44fcd158c7cc2cd0f97b49c8a0f2d523772cab58778ed7b31a8a0d5e
-size 38602
+oid sha256:433de908676d053d3728b8cfe03636d082691059dbe4c15b950483cfdc3e1ce8
+size 38634
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en.png
index b8629728ea..0d1e17b957 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cb10d8ef6b7c6fd25e772428e03755f1c731197660ed7123b79c56629f74583
-size 33086
+oid sha256:56030e621f122f288b00dc642cf5ab4a3a09100cdcb92e068d8fc0f47f9a5328
+size 32421
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en.png
index f3d5c2ec82..5c0a10cffc 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cef767ba47c98c5b693cfadef2ea0a260a35d3144c2dc26a3bb52bf632700d9c
-size 44141
+oid sha256:61b6259baf820caca8eb8a28052142c56ee88a952148e204c25a53f709b87fe4
+size 44542
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en.png
index 5c91aae383..599ce75592 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ef46c819c931938a4fd856bb2fc697c964d4445d6cf9f8b5e2f341f22805061
-size 42001
+oid sha256:2f246482f43b0298e8948925fda23d9c306f56b484d42eeedbca1cce2dfb6bb2
+size 42382
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en.png
index 214e107f12..224e1705c4 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de188fac87a59e6765360282655c081d7b93e7dfa47837b0c56dd77a9892ed03
-size 34616
+oid sha256:2ab51540f79f485e98b311210fc7d8b98ccb174b9e689587559878c245877f4a
+size 38492
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en.png
index 7f69976784..654f566376 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b53f00607190915bfb683c0bef1bd11f0804651fe6bf57bc9312afa20768a75
-size 42924
+oid sha256:b9962bf5c4f9870d51cd3eb3346bf0e2054c5f7e21111f57c7a7bb1938e81aab
+size 43211
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en.png
index 20dcda7f44..564035b900 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cd74bb51213ae932addc3dbaff2bd20d877a249c46ac5bb7656e03566189b38
-size 40748
+oid sha256:fbf5c303797332b7419e1529ddaa8d1f2f1cd6ed2086654880c7702fc3d62070
+size 40971
diff --git a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en.png
index 82f91a65d5..3d21f69991 100644
--- a/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup_SecureBackupSetupView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcad0014629c828846e05247a1ca0767c45906bc15378a00cb9d4e6cd7280dc1
-size 32380
+oid sha256:47fc45150924e2c1aacc86889824f7c0d7382af94ef420ff690871d75c7c3e23
+size 36212
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en.png
index eb8ccb31f9..b4b2825be1 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35b2b13201f62d5b413a7bd62dc9d7d47a36e1ae4cd68f90a95505c56f86a672
-size 49736
+oid sha256:e19cfcd28e8937b0b3536a2c7037c85ae0abc1c4bf71831a66cfbc1446f96324
+size 49460
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en.png
index eb8ccb31f9..06d1c8013b 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35b2b13201f62d5b413a7bd62dc9d7d47a36e1ae4cd68f90a95505c56f86a672
-size 49736
+oid sha256:14e55642b2e48c0e110b3574531f70198da4eda59fe628f466cffd1ae8433a18
+size 49479
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en.png
index 376a554a2f..9881a278a8 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1f5807dc27a391435d48dc107e1830d40520ef7ea7585f0bbc2f3580fa4a23b
-size 50362
+oid sha256:ddc2921acc17df274b389637ed597334ec70e320c6abebcf8a1a2127f9f959eb
+size 49959
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en.png
index 7c8f6b9795..50ad9ddc59 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b639d24cfa2c78304ac2d976d55344a83414cab584b48afdb83a20fab30516d6
-size 48430
+oid sha256:f2dd5ca149a11467d74b77c0f5dcde69196fd9e0ee0753a12edfcb41e37f07b0
+size 48076
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en.png
index 7c8f6b9795..4e6036d026 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b639d24cfa2c78304ac2d976d55344a83414cab584b48afdb83a20fab30516d6
-size 48430
+oid sha256:6c9dcc25981af2b2fc471260161a1dab970605dcf3de24a8198146c7fa1ec693
+size 48085
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en.png
index 51c7fc72bb..0fec265a70 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.manageauthorizedspaces_ManageAuthorizedSpacesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38251453ecf826ff41dd3267f20c807e9d2412fd1fbaae07abfa917d04435980
-size 48956
+oid sha256:f75f11c8ede2d6cfbd111e952787eaf9763dfac32b45b6f220a08676d435a247
+size 48507
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
index 32856638ab..c5396ba814 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5beafca9d7a67740fef1f02d9ed300ea3c8dac06263269e721289b04ae175a2
-size 38727
+oid sha256:f89d101821ddf9b7f39869821ea93cbba9ff0da550c5cd862e7e959add7c007e
+size 38692
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
index 912e229bb1..bffc2006c9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0864de8d1cbc19554f0199374daa5a540b102b4a42cc2e60370a5bb74fbcebb2
-size 19840
+oid sha256:72b986a9c460d2da27624fc46665e81445306345ca9e3c55a4a3d9e9674839e9
+size 19802
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
index d24f13c289..d80eb005d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f59de7148c1d7796dab19c666892a73545b54723a36a284f874447abfbcb228e
-size 39540
+oid sha256:c4c25c819690c34368c8f913ba70b2425269c2398de0af3ea73baa4d22b4e8cb
+size 39523
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
index 91a48946ba..16a92ef23a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63252e12d82b4033ff771063cccbcff2d5e0eb960656b40f7c1559b29d4b1e0d
-size 39242
+oid sha256:ee60ec157962d9393a683bd3935c582ef422d4e3c3c15d4cf56f954f10420c23
+size 39235
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
index ad57dad1d6..065e57f157 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e380a9c7a4d70f86842bdf86c2a87703538ee9674d985727757d493cc0b3ea05
-size 39522
+oid sha256:727167769e999840490f8e44b2e374c62136cf679ab61f3718994069114c5cf9
+size 39505
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
index 27e7c1f8e0..0201133c69 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:514a5f490ea2e497145e55139ae03c187055c5b33fdad8b8a73aabdae95550ab
-size 24879
+oid sha256:f91dc565672c381bd14043a11e8c8ec8c78da0a138ecaf16feb63ab33ee52d64
+size 24714
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
index c8f0d2b5d3..ed112a8c3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830921552127e9c76357f294ebe9e12883ba7bfb7a98169369eaedd9bf3e2cc3
-size 51434
+oid sha256:a234d800bbdd5af2756459d81bbae629f71d7f992bdce63c9716ca7094992376
+size 50626
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
index c8f0d2b5d3..ed112a8c3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:830921552127e9c76357f294ebe9e12883ba7bfb7a98169369eaedd9bf3e2cc3
-size 51434
+oid sha256:a234d800bbdd5af2756459d81bbae629f71d7f992bdce63c9716ca7094992376
+size 50626
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
index 4104cae0f1..4ee3d35678 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a288bb8b0da35579252cb58197df35c1e70a5c5b159ba0265ab527d7431d4fe
-size 40177
+oid sha256:04aea446fcdfeefd54ff057d67eebb486fe208356db5264c0b6fca500799cb04
+size 40160
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
index ad57dad1d6..065e57f157 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e380a9c7a4d70f86842bdf86c2a87703538ee9674d985727757d493cc0b3ea05
-size 39522
+oid sha256:727167769e999840490f8e44b2e374c62136cf679ab61f3718994069114c5cf9
+size 39505
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
index 42c6dab2c3..ba3de9d448 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe3b86c487db6c880d26f384be6a4cec2babc1d7b3af5613323db4a3bb3bd9aa
-size 39877
+oid sha256:e1c17074d23a1d97062bca30fab5a40cc70b6b59cac63e3aa0e39402ac1ec851
+size 39862
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
index fed921f1d5..6ac6af81a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdde10d6fec6cdc6da430eb4f8a63da36c96021180ff1f50ef7a528fbaa8f89a
-size 55481
+oid sha256:072998a03dd04c535439850f80313dbf4726422209c841cf684772912bb4c39b
+size 55455
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en.png
index f444a98a30..eb791ef631 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d6d77dce89d86bda6e4be7b93c7a0f5e5dbe84a482de8c562ceecddaa8107e9
-size 33498
+oid sha256:c2d715e94108a26be495dcccb59c3a23bb9e7ea58d352d78380d8fb530976655
+size 33697
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en.png
index 7fdd30512f..cf25250fb4 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e61e006cc266b148bd0c09468e79d9077b96edb5fc2aba02f0c102bcb7f052b5
-size 32108
+oid sha256:77347e91ddec13ab69083a2c4905107bd4240cc49c36f5d2168dec1faa1c9fc1
+size 32181
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en.png
index a29aab89e0..f7eb3efae9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:162df243c49c7a03d44b9d4acad882bab0156924e5ac65e021c0d9877ad574d9
-size 34342
+oid sha256:938aec48d565322ab5d33c206acfe6496ec16daf31fdd90600ee919a35bcdcf4
+size 34415
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en.png
index 252fe104ab..2f765435bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7df363d57b1ffd6cb31de77207478272657cfaa7c6599354d8533f32c3df71d5
-size 40749
+oid sha256:a21fbd162ef813ccde42e6be164432ebec9de097e8eba68cfd99efdc713ed1f4
+size 41002
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
index ed4c3eb1f0..a04d326424 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6866a3fa342a07d8b3caded1bca6069d170aba75da7b18f9dcfb79a53d0d593c
-size 55204
+oid sha256:47881831487dcf33c9fa43d97c418cd0ff9a417e684a38c555bda3887692912e
+size 55201
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
index 5eb1040a08..564dbf4a00 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f713f353e524afa10b8eb3133b0d8eaea7a1e77f6f34b31fa67f5b05bd4a3e88
-size 55704
+oid sha256:4e89f6b7533b11df6ceae1959bf0192a6cf73373a25cb17d12c7400e3c62d061
+size 55705
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
index 0129c9f065..b76f86ec63 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56bdd0ec5104c363983408ced699ba87d9297e723f7b7e6884c2f27d0487e443
-size 44088
+oid sha256:e2cc12036b90857acfc70b6932e74e823018c25052db0b7dfdd541ed74f8f8cc
+size 43891
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
index 0623be997c..da1e8361b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ead04dcf21ce07f7ec750f498048a6100487137cb781932da104b52e0ab3994
-size 58447
+oid sha256:3031fa39be2f1ed6f20065397d7483a09679f4f84ebb1367d339611ed3efaff4
+size 58557
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
index 0623be997c..da1e8361b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ead04dcf21ce07f7ec750f498048a6100487137cb781932da104b52e0ab3994
-size 58447
+oid sha256:3031fa39be2f1ed6f20065397d7483a09679f4f84ebb1367d339611ed3efaff4
+size 58557
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
index fd4f7cbf6e..52f30eb67a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e20e43dcf14088eeadae32f7d428de71d334f10dfe3ce43b5e8e42bebac152d
-size 56118
+oid sha256:064957a92b109305704f8d812dd8065cfffaa11df6fdbf5c9acc2a507f1bd2f3
+size 56094
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
index 5af2e09dde..cc6c805d0a 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:319ba9f6e74f0ca21654cde88cdb44662cf11181ae30e9455ccac048e0c52e1e
-size 55459
+oid sha256:f88447684350ceabd3d497430449dc3cd8925c588547b80dcfbc19a92a8796fd
+size 55435
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
index 6778e4a00a..120ba3ad7c 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewDark_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed5abf37daa0f363b029c07a9209ccea97555b2c31e01f1f9ec0588fbf6ffb69
-size 55822
+oid sha256:830f80abc95090f1062616c6c0f39c27a90fce554222117512929292eec7d284
+size 55811
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
index 84c7526b4a..48fc37e537 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88058a16e383e580f20f0c010c14d63e4712e007c4016be0f6fc029309482568
-size 40242
+oid sha256:e22e322cd647eb60e0da1010527ce044a79806859698994af703e9ce75e586db
+size 40283
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
index 3b2952e617..6416a4ab7e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeb28f7ee18c588132b611dccb17ed100d91dd0b588c48cbe290107018857025
-size 20440
+oid sha256:77cea40c4d040cebb98608bb60a8e3aebf35d327ec57c97ef451afdb44b17e77
+size 20473
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
index 6ddd3086fe..e4126fabd8 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd3ac37151e303598570455bc10206a58410100bd3db1437581181d1ca0c39fe
-size 40666
+oid sha256:d3f4e2cff9e9a7d0f8a4ecd84ca7e2c007adb14189aa0dcf2c3da76a21330f4e
+size 40703
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
index 324e6dbd51..4c6c01772f 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b15f07242602bb5e8c19ff3d821230122e1b331fbc0178ee4b3c2bcd6d270ce8
-size 40380
+oid sha256:f71e37f3f5d0b4bbd8c0234363dba9fd275bea3c9bc1b7afc1bbf585a14e0f4a
+size 40410
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
index 70c12f8dc8..3db5449204 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26162b442c3e569bb9ba359c5f3ac6f5563ac175fe78088ec31d89bd6a3ddf0e
-size 40662
+oid sha256:cdff4ce956589c96df7bf0e6f00b7a2f3f94c15b40bc1a812961515bef30070e
+size 40706
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
index 66e270de9c..4f4aac791e 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5a729790a34e95f9b3744cf88d4d5e3a7289c14669301e3a60841a972650eba
-size 25273
+oid sha256:0a2eb12c4e797abe3ab5f3db37079a841182268aed4c5e42d7516b7ff92c4b61
+size 25133
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
index ed1c17167d..44ed276e90 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f10cdc5541d9199788e7e75f76b46dd861970811ceaa6603fe827b3950c91eb
-size 52892
+oid sha256:97313311051f2decb6c535b38fbca76a6ce9af8943eaf2aed898cff2e2e90082
+size 51966
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
index ed1c17167d..44ed276e90 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f10cdc5541d9199788e7e75f76b46dd861970811ceaa6603fe827b3950c91eb
-size 52892
+oid sha256:97313311051f2decb6c535b38fbca76a6ce9af8943eaf2aed898cff2e2e90082
+size 51966
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
index 0368dcdd06..a286d3d73d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9e224c5fc2ea084f97818ba32574606782c92345ca5819c3d3235c1b1723980
-size 41383
+oid sha256:b4306c5615ffc1fc13618e9b1344dee4bb2968b808e283ab76a528f2cceb2aab
+size 41417
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
index 70c12f8dc8..3db5449204 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26162b442c3e569bb9ba359c5f3ac6f5563ac175fe78088ec31d89bd6a3ddf0e
-size 40662
+oid sha256:cdff4ce956589c96df7bf0e6f00b7a2f3f94c15b40bc1a812961515bef30070e
+size 40706
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
index 3bbe4b7683..07ea5601cd 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90b4895d4ccedf4adf6fc470698b194b315f51ccd547ef5b5c0ac4b945d3f757
-size 41125
+oid sha256:eaeaea007e904953f8a284dd04a9db581b69a24cf5a81e1777be9a20401fdcc0
+size 41141
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
index 32bd89a615..d357f1ecf9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ee7585b0c8ca85ea4dde61a2685a012a57b704675227835af2df95a389ed831
-size 57322
+oid sha256:a28782b448b87b412ccd7c12dd12ffb76db04adf867c1334fe0637a2c73b5094
+size 57366
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en.png
index 88a5481a2e..f20ff17ef8 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43d831a51115745c8b90c0966811a7a725ecdac4e75425bd9dab14e85d98ed54
-size 35043
+oid sha256:19d63cd8758188b15c418865204092ae9a5e99af6fb61c09c89ef87bf87f6c06
+size 35232
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en.png
index 36d63d5bee..ea91803e4d 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66ce52ce8cf7cea8fd6322167fb99790dd28c6a93a9db4923373a6ade9be530f
-size 34292
+oid sha256:dcd2b01ce2bc6c36d16117420fb0f3a70eb1527cc26da3db7260dcee4c0ac643
+size 34341
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en.png
index 38c5771f72..29127b5f84 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9ae1fe64156b3e12ef94a96f7c35f007f170f37c34ac823b562bcf77a63ee14
-size 36461
+oid sha256:fdd3a6ca1feb3caaabbae00b6b61553e5a332f97a62ae836a16404247812a7c5
+size 36506
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en.png
index cb969b5be1..232066b56c 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a106eb66716b317b7f66faaea09ec19272c18245fb3b82acfcdb07e308dbbf1
-size 42952
+oid sha256:d6df276867d4dffd59ae9a88bd518d13db3e44e9f5433c58847bc86da18d759e
+size 43201
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
index a33315a22a..5c81790881 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c08f7eeb22d7f6652a2bfe681913515f4c79855c8f0ade5649743f4ce440137b
-size 57028
+oid sha256:b054389ee0d5296760cb025b236d9a4ab5c0e96165e288d3cdac3f13430183ec
+size 57086
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
index 705e77f421..d50f5e46fa 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bf5fdeba61909591340e2fb84732002cc3526077e2e2c47d867293cb53add31
-size 57719
+oid sha256:c21118d9c455e6d9a967dd8d70e0a8cd7e9da6d3f7fdf5ce66d1044b0ac33cdb
+size 57746
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
index 2898a2f123..775296b390 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63c14cd8fe07bafcbd0374e8b4981b978509b6022d60ca38a37c3500e547accb
-size 45769
+oid sha256:a43e6c037debb33ee2d7eecb7e1732e63fa556a7a0e729d6b2f916813bd642f9
+size 45609
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
index 3e93b799b8..15e47d1450 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56d0dc43ba0e17d35ada6c37a73442a5f586a6cc411075f45ca42b72a7c30681
-size 60329
+oid sha256:803b04a9295b8500f95976eef56b2ce27de6444a9e9f2063e0e7838ba9ec0f26
+size 60522
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
index 3e93b799b8..15e47d1450 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56d0dc43ba0e17d35ada6c37a73442a5f586a6cc411075f45ca42b72a7c30681
-size 60329
+oid sha256:803b04a9295b8500f95976eef56b2ce27de6444a9e9f2063e0e7838ba9ec0f26
+size 60522
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
index cee811de8a..fb3fe908ff 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7cb0d4d4e44e53336748c6c7527180bcd852e4ca1b5c347e46e2ca64cb3bd6f
-size 58002
+oid sha256:2b3e332c18a339c20f77f592639dea6fbdfd7b3e7fdaf8901b83aceb7660b497
+size 58054
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
index 156fdc9aa9..f7219701b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37438de5c8d4b190f0e234907e35bd318201dec6e0bf6f96086ccf7dd5cfb406
-size 57316
+oid sha256:189defb47c6402f380d06da8c0ce162f0b90f78026bae8b1bbac886c3d65f0ae
+size 57366
diff --git a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
index feb995598b..c61835b8eb 100644
--- a/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.securityandprivacy.impl.root_SecurityAndPrivacyViewLight_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:889f976c8fb5a245e7855a69e3fe1c8619d68695d8bcccc59b38af49efd1ad38
-size 57750
+oid sha256:1cca6b3e7a2856bb4d49805e137e1a15d73c5d4b630716038f9f3fed63e1df21
+size 57769
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_0_en.png
index a5f2c81709..da0949de84 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba633616e0a212c5d527173132f1d53a8e9775b50e57a5a36890d9c718c6ec71
-size 37675
+oid sha256:e09f17baa9b6eba866855cb8f75ccde5c7d9db550f3cf0b8a15e29a1cb2a35d7
+size 37587
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_2_en.png
index d1aacd1904..6272999415 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eb30c10e1c6e8c1ff3ac3adbf6e5a95ff933f5fe7420b65aed34643b07a059b
-size 21227
+oid sha256:2375940852e1b63e0caaca5e74a82e9468d29277da42c97a7e367f002382de2c
+size 21212
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_4_en.png
index 7eae95af52..2f42c69aec 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b50240738139691f82a0a202e31c19c23f9a6102b405c36349429868dbca3df
-size 42037
+oid sha256:cafb5b13d10812171a262ec27676b8fcaf984202e809e3f1a83a4a97c541e717
+size 42153
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_0_en.png
index 6e9c334d4d..7aef200cad 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba6d622adcaaccf8c6cfb8a446ef0d350a55d749dd6687e6a46d7b0564a2bb1
-size 37680
+oid sha256:83bfa85a90ef732047fbe5330202a2d5a139499b893aa176f7b53f125cafdadc
+size 37552
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_2_en.png
index 433ab118c2..941975e910 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ece2a836b5ceb25847d40396239d029e7a4ecde52c294d8e2beb073ee154776
-size 21599
+oid sha256:f2a36e62ebb97b895f05c516351f609203cb5f1767d93486dcdd486aa1eb4d61
+size 21547
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_4_en.png
index 2008361428..cc5caef9a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.addroom_AddRoomToSpaceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b028d11caea922f209a19d3802ba9c7ce753a3146d7d77461e85c741f35d6dc
-size 42481
+oid sha256:a7a3e0e5dfa82460a00a2ebf768e9ed08caa89868252aa40dca401889e527c23
+size 42480
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
index bd95e60ce0..cf3ad87af2 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73608be44121b6125f14e3186ee533a5e479e30124e4276d342a25b476c00fb7
-size 46960
+oid sha256:5bf5bde86a7f7e873a6871d359f04f2139099724f9977601f5077b2590e97965
+size 46711
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
index 02756acf7b..a31ad79f82 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ea33f7c49c55c81f976111bf79bdee21eb58f3394c8135a0324f6a503dc6fad
-size 47044
+oid sha256:078079bf6b37471c7a16363c9d49f7deb5bd9d044ed0591ab86ac8a20800ba03
+size 46795
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
index cf42cff8c7..5f77c0fa62 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed108284075a1fc2523ac38d63dbff3176dbeb97942995d4b83aa4f0bc3de240
-size 48636
+oid sha256:d36b97324b3794ff1d01fc13e9e59afb010130d6e022dcc2d7cc9387a13a787e
+size 48387
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
index dc324f5b6f..5f67807828 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb31f13ac29f7ebbbe18d2314bfaccfd20f87c308edda618ba36a6f968e2fe33
-size 59929
+oid sha256:986cfe49b91c522cf3a85d0425c0677a6929c44dca1531923bff2c1766ce46ae
+size 59583
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
index 462cc991f4..bc27628ac1 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ddc1a68ff028108928942a2ceb6df4caa3ce4322bea836b409e9a7ddf991194
-size 60567
+oid sha256:8f8ef2430abd11b31b3e90976f85bd4578e667bd0acc0851544ee4d16358479d
+size 60237
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png
index 34300310ab..490c357afb 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0322da022d57cbd3b167f939d00bffdba69758c6508256f1251826cf5621b18b
-size 56970
+oid sha256:7228db8e07c808d0a8780ed06f04f22ff8f1d620327f9243b1dedd476cecb902
+size 56896
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_6_en.png
index b955245363..2eab6f67d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66b192f5717657395d5a5cbb9d5d409bdc8ed5df9afc010d5a619608a9e8b867
-size 32741
+oid sha256:9e74142d69c0223cfdb41d31321c997f9924a911b10961a85dec5d7a9b55f763
+size 32889
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_7_en.png
index 310ba5f663..71d817456f 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aecd8b25c698ed6c0b1682535657f196edd677bc0648ba0d42c1b109840fdf8
-size 33429
+oid sha256:335a04a4ba72df31e5daeede1a4e3a4a83c77c1317dc736bc29ba6722fc9ed86
+size 33573
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_8_en.png
index 386b14d431..826e4f3f05 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4d0e00d43b270c509920103f913609e784387b1c06e4cacf01dd106387b3ed1
-size 47806
+oid sha256:ee34f6503ca5de3a1f0e4bfb546605b3ab4fe2c710891733cbe16fb176cbef12
+size 47747
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
index f9e70f5c88..039776804a 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9b3bc80e39daf9809464a771089e431be993e8faba40431784990f61e7c2a4f
-size 45233
+oid sha256:d28be1c00397b6ac456ef93dab7b1da469a7665380ab2c326124efeef3a1c150
+size 45143
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
index e6e4b0cec0..6847911e3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa6f0b045b83a4bd8b1f2ff9727964ec82ce7781f575ee6c1e306eeecd7da63b
-size 45319
+oid sha256:81523eeba6cf9e4ea1e92cc819845bc95bbd76f9e977b462f2357fe1d2e3d335
+size 45230
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
index 3bd02250a2..763fae759e 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471ed0a332d92a41a82536c5ac2204909391730b811d44f54d8b308fb03447f9
-size 46791
+oid sha256:cdff40a4ce4b77a98818798c2b6ce3ad18ee5117f40c47c075b30d7006626f10
+size 46703
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
index 15f3619b7d..760d8a7533 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:325ef5fb725ea61c382eec96668b4fbfca9eee08e1503eb72e298b4d62d684e1
-size 58256
+oid sha256:1d331297c0912ffc278828cd00f886c926a71e59aadbee9fef994258ea56c822
+size 57757
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
index 51d1ddc9f5..058f822302 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd73b018c8fd459eab5849c942e4f992357abbb4d0e0ba1cc5847e0985ff335d
-size 58836
+oid sha256:8265b9acc3932df6f0e1eee5e85c2b16d13060c4164c3fbb5b1b0b598745770c
+size 58326
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png
index daaaf7a44b..5f5b2315e6 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57cd29c2032d425f94551a0fda528ec5dbaa467900f6235fb40aa6009ee22bec
-size 54897
+oid sha256:936cf07258d4a001b80b08df4b804c990b9e399bf8a5a544443beebf93caa298
+size 54825
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_6_en.png
index 28ae8f6a72..918bfffb69 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:053a96fd3fa0cc84d7c4eaa7464568ff89b6354b1c59a286a4f9a328f9744c8a
-size 31849
+oid sha256:f3c87dfc20c6a6ff08e6828d47670812af0cea19640cccb9a9e5a8ca1f61728e
+size 31957
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_7_en.png
index 3e9cdacb45..eadb187764 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb4de4018e0e43a9e2d858d14a36faaf9fa44208641fcd2779710e184d091ce9
-size 32371
+oid sha256:199acd884790b0eecd1333235561ad5dd2419c527e3245d58525d46ad7c51262
+size 32537
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_8_en.png
index 214301a8d4..926f10755d 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa8f3988277d095b3747da35db43b8ae1c854bdeef484c243ca415d728610535
-size 45173
+oid sha256:66d5ac09ac603108821e0f333866a8e0473d562deceb103cabb67c4988be2c72
+size 45107
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_0_en.png
index 4a332a8477..4fa687ff88 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6d6fb02ec741944efd1a9f994f096cb74cb43e90896934a815a7f3b0b75af06
-size 22085
+oid sha256:e8e2feebc67d2056d982bfbfc0130916603fbf4297015703053f439892d1df01
+size 22097
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_1_en.png
index 4425a314c4..7002bdcddc 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc1de1f9b7172a67649aff0c2fa2cfe2a63fbc46659a8ad2bcc5d417b3340e9b
-size 18415
+oid sha256:6328cb4da78e63430304b7bda55a3720970464592541dde3877bb658da812048
+size 18438
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_2_en.png
index 00f43cff0a..cbd0be7eda 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f26bbf2bbb816afe552d90b8acc3bce845fd7c51ace192693d0f92c5e5ea8985
-size 25939
+oid sha256:761637accfb56d5b97db590bb2a8a0cd70d4dde53fdbd1ad355541f6cf8e9827
+size 26022
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_3_en.png
index 7ea1b72ecf..6b4e7c1615 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d8e3ab098ffd7d1e3e2abe71d0f6003915e470c68830c40617ca28f4af1e59a
-size 26576
+oid sha256:0cecd46b3eb2ca4083eb44c73049a8b020415dd028130407653eb792dbde0316
+size 26586
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_0_en.png
index f1d2fea72b..d9e0d5d644 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8b74f059c7d27982d0f8d33e7b59a3a588d547f755d0bb352836fb55f57687c
-size 21495
+oid sha256:ddbb118c51dd205f4cec37f0fef07afce941457bd6e953d2ab9890e4f7ecbd7e
+size 21504
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_1_en.png
index aa024acf89..334dbe1080 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f9c84fe76cb723586c05febe97fd45068de975494be4b0aebaf518b18826765
-size 17809
+oid sha256:88867849fbc0420f0772e4a3907ab5f21da41125e24de9c4951db248cebcfb2c
+size 17827
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_2_en.png
index 2312f3fb08..6619b3df83 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9bcf5c92a8aaeb33c7d56709e8be38f6262a95b8bb07e4ff266685eab901b64
-size 25088
+oid sha256:75c5a38547242a6048e679059d2eda72af502be758d5daa29d53ac33a7c424f1
+size 25208
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_3_en.png
index ae049d944a..87364a0a84 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.settings_SpaceSettingsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be20525369f79cf4ebc5057f9cc46123bda55b923470e33712acab2f2a6841ac
-size 25700
+oid sha256:846062c957ac24c9ade2dc1a3014cca735918f695bee1601c3937a7323b3cd52
+size 25673
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchMultipleUsersResultItem_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchMultipleUsersResultItem_en.png
index cad7e55b37..fe1b0eaefc 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchMultipleUsersResultItem_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchMultipleUsersResultItem_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8af941ad8e5b553b82aad8b39abd8b4876d67b6906acf0ee8e4715673d8b35a
-size 81462
+oid sha256:bd072c509f967d275a644f545dd262f3dd20f08137bf807d33417ecc84376734
+size 76496
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchSingleUserResultItem_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchSingleUserResultItem_en.png
index b5e9457b1a..1b32cb5522 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchSingleUserResultItem_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_SearchSingleUserResultItem_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f776cecd5278761fe7904b63dd980804a6dc2d3e7acc37fb7ea71d6a1c1e63df
-size 42505
+oid sha256:e2055eb028a88a3b657919f4831c42ae394d473be2fe16a62300add6c636ff9e
+size 39914
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_5_en.png
index 6a5952ed17..ab57e18c5e 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7624e76ce5c2f4af5b79f0be0beb3475d12bb24bb2db0cb1ed0efa506a5dfdfe
-size 38153
+oid sha256:177b40d6be14bbf9c54722f8b6c0186b6b484a0435fcb43e888fe013a6f27a45
+size 38537
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_6_en.png
index 69f773c50e..757ee11ff6 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94adb63a8654181481e7f62652100cf0294f9c79c1555e2e078b1e27bb15f066
-size 52548
+oid sha256:998781e9e468edba5b1c5bfe6bed83c8c0dc49754d5bc965181a061abf031b94
+size 52304
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_9_en.png
index 850752a55e..b4545ab901 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a75b5ecd5a4747566d8a39ecc4cbbc3583e5abe6a78f9eb820ae0a8d7ee9e7ae
-size 37654
+oid sha256:32e7c3787719824d7921145dbe734db4ee4c733c81e7e236a30b0cea9c0c4867
+size 37675
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_5_en.png
index 80c43282b5..459ade084a 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba3e35a4ffc2bee9cb71dd997b9b431faec269a345d2e3f7e93357aa2f16ef2b
-size 38941
+oid sha256:bd727247ea40290f61c8ab9a9a1a4397985ebcfc77e31fc4b8efa8741cd671ae
+size 39343
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_6_en.png
index 90c20a973f..553160b7a3 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e908ed57e0b9b8072267b571b7ef0689f643ee30e40d26235184cd4bddde9be
-size 54034
+oid sha256:3bde94f2127ee00f5a6403f8fa246658269c59eb80542cb978d6a62928566eda
+size 53675
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_9_en.png
index ca5a3f8dcf..66aa1970ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.components_UserListView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0d318e399e0b3120ad74b409f0d53197c527f2d0e6d8396e301b7a70a9473af
-size 37592
+oid sha256:28f70212c98536a1887e5c2d3189ba080bc51528f433667789767562584c1006
+size 37493
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en.png
index 0880cea78c..625cb9e429 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f648cf1318c4b2bb46a626d6d444ba602bcd40bf21ade7aa1f0cfbc71b6b3661
-size 16863
+oid sha256:cbf6d4801f297bed6a78b2a7ea6fe3fc842dbf25b523600f4995071a26707e07
+size 18513
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en.png
index 5ae710e4df..27f8eb68a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30b6854ad7a74c42953bdf1a00f2106504ceede002fd944b66c82a086e512cdf
-size 15831
+oid sha256:b357a835c068cfacf4f304490eff060f5758750f407043f337fcff3e4c771398
+size 17471
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_0_en.png
index ad21975ebd..a95c48fec0 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2c745de02098d9e38f75fa7c34f436ad4f7770f4d0cbab03949e0f3c6bfc958
-size 25557
+oid sha256:1d22817145519d17475a09dbe9f5e3a71ec6b5ff9e917d7a92b06feb3ba865c9
+size 29049
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_1_en.png
index a2f44ea5a0..33fa7369ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b094f8d20b4b946abcd95bbb0c1d64a0190a5c651b6f434dbd9aef2857a315a7
-size 19991
+oid sha256:27249bb1a928cb325557c8aebf6de344b7cd7a16d3420e8711591f20a3eb36b1
+size 18947
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_2_en.png
index 5e3737d938..ac26997f26 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3fde1e89269c46ac8a6b4f0a05aad45bcc806f2a1b6108c09f7078209f7799c
-size 26574
+oid sha256:a5f0abeb2bfbae8fc6b864ea2e6a90b4ab3bcfd3b9f5fa4a06c6a314bd194a5f
+size 25660
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_3_en.png
index 815a4f9ed5..d0d1748a80 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76947cf0ea5358646af7726987bd3cd3c49694aceba9850bb0e60a63f3fe669d
-size 49542
+oid sha256:2f2bf708bff2bf2a2581c0eb0adfa63b38f0fd5f5fda214594049c2b40a98e09
+size 48731
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_4_en.png
index 920ac350fe..51f05258df 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf3add28f315b5f7de06dbdf5b6d5fb96552f648a95a620e50b65fa970de32dd
-size 41513
+oid sha256:4b372f9fd8570c977cd882f396004fe8fd0794ca3070a11394e0d6af6354987a
+size 38154
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_5_en.png
deleted file mode 100644
index a95c48fec0..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d22817145519d17475a09dbe9f5e3a71ec6b5ff9e917d7a92b06feb3ba865c9
-size 29049
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_0_en.png
index 8071ebd4ea..8e03ad6ce9 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4c1e564d2cdb6f6a61a02274d63e2610c9b75f7f53c36b473716bba2400798e
-size 24752
+oid sha256:bb277b825fefc001450c45a0786afce546f2e0cf7be878ed7bcf401c501c2431
+size 27988
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_1_en.png
index 5e457ea444..b37d6fa5d9 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f37ae64424323d6772fca7b43f175e8c02356833bed02bb9661acbfb102c194
-size 19358
+oid sha256:c5e6a562525d8ded0fddb365beaef933d2701bcd4548e589bffd54e1bd0a3b11
+size 18087
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_2_en.png
index 6fe0a0be87..4592dbb299 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d42e8795792b250696206f5f9fabcac3b7249b3709cf90d8f2503091769e5343
-size 25324
+oid sha256:e22f1f07193011c1db785e3827e73d05d8bf96fd12559e3d7a744b2b978b7bf4
+size 24196
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_3_en.png
index ef1431db80..7aea3012b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:884e301844c610497bf5b5d52445e8124e9eaafd591853a55ab72175096942ab
-size 49336
+oid sha256:de50204e7681fead39e7a8f298149b2657a3663197ddc1cfacce4389641f74f5
+size 48222
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_4_en.png
index 6b225ffae0..76810b5897 100644
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81be06688e135d746d30140e61aa168f0d7bfecad1a12e54d9d26e3eb55be0be
-size 39897
+oid sha256:a8a1a8fe51f741748817a0a1c497fc164d0e1e711ce458182a654b1fee8e5741
+size 36417
diff --git a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_5_en.png
deleted file mode 100644
index 8e03ad6ce9..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.startchat.impl.root_StartChatView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb277b825fefc001450c45a0786afce546f2e0cf7be878ed7bcf401c501c2431
-size 27988
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en.png
index a141a26bce..2a90fdd71b 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ceaeb4841d4d480fd66d1014dd0f1257fe7c40db3a66cf18f0ff71d7ef79b9d
-size 24170
+oid sha256:26a21536fcc98041b4c349498f126da520251e57b601f0f5943225c191d00910
+size 26241
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en.png
index ba0aee9b41..649da85f0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcba7790fd7f16a1f0db0dc248a8ce895534c1a5155b96f4877b2137ec5a6412
-size 23456
+oid sha256:84a13525255fc639f817d1ef8dacef0dcfd48c2d72bab309175f99ccd56a34cd
+size 25903
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Day_0_en.png
index cf5c451505..809e2624f6 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d09796f261ba9552fd94f595467a958ff7cf7113c3ca23117128cdf76f729e43
-size 15808
+oid sha256:326840103b3ad46a5d80c80c5cb58604d0c561dc484cdd505ae837ff4cf71bad
+size 18632
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Night_0_en.png
index 09475dd0ac..39e2b34bda 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileHeaderSection_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49216216b3078897afd41a04c3eea2d82cc89d13390c2f61ef8045b84ad69e6f
-size 15253
+oid sha256:dc027c17c7e4b41774ba20b39b38fd98fc7199b41ea7610ec01b184c4bf9ec99
+size 17925
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_0_en.png
index 1e86845bc2..76f78e88c8 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d705422db764094ca6e92ace3cb61eb7b855a9bc1fb37e840b8a886b5306e181
-size 23994
+oid sha256:d05e20da85581d94fff021469cd5e42b0cef9d77c038d1d50f7abb15f793b7fb
+size 24100
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_1_en.png
index 6f74640f03..9671c0ee0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:197ce66690463abeed16142edb0a212d5e49f2ef1df1233a3d6a0fd9d5153f2e
-size 21772
+oid sha256:d1377f09436d2724a7924fac070ff7c7b1489c561025bc02627bb42c3cc10438
+size 21822
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_2_en.png
index 7951440a2f..3abb30ae8e 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8185065602221f9bf675398d42c16f9e0c7ae65952b865689263878f43c545d
-size 24110
+oid sha256:6e091802351a5ed213f2dc60187a439a5afef998136fa508db42931764ac58af
+size 24284
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_3_en.png
index fca3f7ed9b..6e0d93663b 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f707615c108e66cda3ccac1f70f6b1f6909ac88f4e8c43b86062ac11d7ad3f27
-size 36171
+oid sha256:98da2250342ee964260c48a52acb366ea930cb65e967fb89ee94261562da2367
+size 36226
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_4_en.png
index 45e42c6ad0..518fcb41ce 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6a2a849c7335452fc79215f4fc1c50ca606d491879cd6ec6b265e4f443f665e
-size 27706
+oid sha256:01452418d8e609ba37ff44756835f26aed949d4b781c67efe6fd3983d93591bf
+size 28819
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_5_en.png
index 12563b1b76..a3f5ae86e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c3ff3444b2f720b09de118af05e1376001bf3cfe9be66acec4a68cecfe9ae6b
-size 22357
+oid sha256:9280e315c64dbb8e100f20bcbb2b8d68f90612a94df8b71878059321352f6156
+size 22447
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_6_en.png
index f7ee67c10a..3d03af0f9f 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3e9e3da0ba44d070fbc0e434be2c52dc0391eda581792b227587cb4d16997a2
-size 22945
+oid sha256:a05a107e16f30cf8fcb59fec83beed44b890560b6e5b7e1aeb1aafaa203ffd3d
+size 22389
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_7_en.png
index 1c84803007..6d71c066dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa809d53b1ad821c047fabc9b655e47150e201941e004d5b8f769a0ebe1a2b74
-size 26629
+oid sha256:d21e2e85db54d0074376e72a3ef1b91caec01c8e8c2d6d0b1f87034687440fe0
+size 26723
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_8_en.png
index d0d02d6321..805f752c50 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65446447e07a1a6cc08ed566e1aaea7a1209f1e1f5f752dec5e598819333761d
-size 34595
+oid sha256:5fa1c110fa0804eb0363cf6c9631ed5664a547e2213eb76c211b7d11194c64a0
+size 33532
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_9_en.png
index d30cff8678..7ecc9dfbec 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85b62859396f9c34ee7bbb4166d6f030474bd750b043c7bc1f14eb6e75e613d6
-size 32374
+oid sha256:fdeaf4edcfe9b8ddac1276c51cc668d1da9198359b8874c3928d899e9c0a7c07
+size 32336
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_0_en.png
index c3e2d149b3..c7e9da3fbe 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fb347c3b537220d85af8e6473dac0e7658b2104cc4a1746a8019265f8085947
-size 23379
+oid sha256:980c3503b30e3c421c664e90ed3d53a7f091fb9ae1c815bc678753c6c7c35957
+size 23488
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_1_en.png
index 95e144b3f3..edaffd4455 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7378680765db7cf811b1ba3c7901cb954765794cc741454bf31b4418c5f77da0
-size 21317
+oid sha256:1770b536c1f3ca83f226bc29efa7e909aaa6b05ea8cc8901821c73392b51a2d7
+size 21482
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_2_en.png
index 61d82d6084..bd4be11d2f 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2f2787f0aacfa36596b9fa0e25d990710870bf5ed25d831b47c5c71ac1d3de9
-size 23377
+oid sha256:d2b9f4f964f15396c3652fb709965069c097754332a5a4d7e4f3c61b71ba542a
+size 23573
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_3_en.png
index 0c63f7b2c5..8864b5e730 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d88762c47be041fa9978b987f3a1226c55d711e8eab1a68c7c1fed72bc4a0ac
-size 33925
+oid sha256:ff1f5ee1042b3012884fa67f993bd3d829befe5b97b0ef3392bce69f7c791dd6
+size 33994
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_4_en.png
index b7c5aa9fa2..1ef711b008 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24310edc91b912416a1c20240bfce6a5a14165fe9c77f2123a35a9148e2ea50c
-size 25833
+oid sha256:a51d1ef5ae6de13bec4829fe7643e5cd21c98551814edfa1d0a71eb8c104cf86
+size 27034
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_5_en.png
index 90376bc952..ab8718e0a6 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e7e43be60d1a545621d9d64ae3500980056f2c405c8d22629ab63e149aad224
-size 21816
+oid sha256:728c88405eced49102354f3b72643eb9c2b55ff9aebd50853523cb0f79407f11
+size 22041
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_6_en.png
index d945d1c6f8..3d24b36c71 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85a6cf5a532ecbcfc07cc4a6e3bfa2370f7a401c357aa1e251bb15f7cd8611ba
-size 21672
+oid sha256:ad3f942e972558c4ecefa887bfd97d5785c2c256feb2fef4fa6f32e0c68d6040
+size 21161
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_7_en.png
index 46417d9248..f8d55e6be8 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b6f0f76fd0bb0f6f8dc9532c801d86e7574e53a62e828400c2fcfcf5fe9fe29
-size 25880
+oid sha256:cbfd9a1ad8a72ab42eeaef6ea4a0f8a7a579b158bab29b05808170dfe5a0c728
+size 25986
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_8_en.png
index 844a7c3c54..c3527328e3 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e467732ff44f080bb1a698d4f6f2427480c5456980066ffd9ab6970b093c3d64
-size 33206
+oid sha256:2446d1ac74dceba5fc64507eea199773549dc65769aa8950fb88cdf411046abf
+size 31858
diff --git a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_9_en.png
index 2021017f88..cfdd735be0 100644
--- a/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.userprofile.shared_UserProfileView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c382fc5a53d664ce6fd78e1187be311cd8675a75a217992ad21bbc943139d8a0
-size 31438
+oid sha256:4d637d0ce849388c5b67770ab2d493c877f8f690bb735e5fa00815152f7da3a7
+size 31346
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en.png
index 59ce066fe9..3639cb1312 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e40914567317a9cbecd3638bf23cba6ffbaa9be24733909aa58cb8d84a64c463
-size 31169
+oid sha256:4c1298d7a7bef09a72be97f859448a877594088482de6e1fc2660e1a5dcb0869
+size 31354
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en.png
index 8315edcfd1..841dd9f1bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19e65122fd39fbf25050c9e982285fea34c4fec06647d713c8ea78c2c813ea5a
-size 30478
+oid sha256:621db291024ceaa9bba2bc3e71a68b6fc67dab8055ede0595f0519499324b483
+size 30644
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png
index 985c931a4c..9d1a89e07b 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c41e73e5672477877ad2fdf17f54373ccac938fe71b2d9b3e53a191b6c658ab
-size 26697
+oid sha256:917a2f98fd8feef075587d4176020e98aa6834d39423e29ddaf5f10244a6ffed
+size 25647
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png
index f2ee878314..ab703510df 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd79cc12515daa43485e6b412e0e98dd3bb9f90882d173c6b48a85de36977afe
-size 26164
+oid sha256:dddee8fbcb6e9ddead24c66b0e15b4e9fb1b5d8b56eba4dda369755769c2b92e
+size 25128
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en.png
index 59ce066fe9..3639cb1312 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e40914567317a9cbecd3638bf23cba6ffbaa9be24733909aa58cb8d84a64c463
-size 31169
+oid sha256:4c1298d7a7bef09a72be97f859448a877594088482de6e1fc2660e1a5dcb0869
+size 31354
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png
index ffb648a554..4ca95f531b 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8f9b413f870e28b65528fefcdd879f687ff6b485e57ffa3b53fac9dc5b8724d
-size 26036
+oid sha256:b1a4e54a3f7154294b772f647d9bebdb3a8ec149996a308fe7e6b610c0854a80
+size 25072
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png
index a826b396ca..54a166cff5 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1721ac66d58b99333061ee6148d5b242eea75eda7137076c4632a52a11720252
-size 25422
+oid sha256:d13b603195be9d91383818fbc0fa79ec533256305092c6c7433c4cc8e17d1fe5
+size 24446
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en.png
index 8315edcfd1..841dd9f1bc 100644
--- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19e65122fd39fbf25050c9e982285fea34c4fec06647d713c8ea78c2c813ea5a
-size 30478
+oid sha256:621db291024ceaa9bba2bc3e71a68b6fc67dab8055ede0595f0519499324b483
+size 30644
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_1_en.png
index 035b39c739..8ed8df62d0 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cdaf746151224c1889c60232b55cb8c9d8b3c07cd341b1bb8ad6fb7abff97ed
-size 9538
+oid sha256:501b8ac2a46e21bab7699dabcd256752e4a409f84fcdfd6ca8fcb4aa7188e4ef
+size 9711
diff --git a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_1_en.png
index 2a46e52aa3..fe85caeddf 100644
--- a/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.viewfolder.impl.folder_ViewFolderView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:072d91aa19fa0c5ec80ca565e1529988598cd54afcf6f593c6dcf17882170d0c
-size 9393
+oid sha256:eabc2b4dafa69c29ad216997303e48194afd958cddd9ec94f21ec7109304ad6a
+size 9555
diff --git a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_1_en.png
index 8d3858b48d..852737ca38 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b44e998e6777d291d1ece8dd0417b585627ad546376e0fc79fa6854d0ca55a8
-size 43011
+oid sha256:8c2e04e52d03cba2460f7a0799cda970bcc49bd45ed2cb2de3d39912c0af3a2d
+size 42267
diff --git a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_1_en.png
index 84cd91fc57..978e8ae5c8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.accountselect.impl_AccountSelectView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a49586145ab8dc1a11ff0212e3a38d865d39c929ec9c63083c9e2ed0e50ea6c
-size 43869
+oid sha256:db7080fcb2bcba0ae22264ff0cd0cc5a843b3d860d0809750d4927a0eb1a9a27
+size 43353
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en.png
deleted file mode 100644
index 39c95115b8..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7d9d8fed9ba46489e2e079fd8999bd0b4716192c68f4be9a109b998ee5c2f15
-size 11185
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en.png
deleted file mode 100644
index 549d8acbf1..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32284987439f0a1dd25daddc666348b48eb842ccf3c58d3be22f4c7973bc507f
-size 11014
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en.png
index 6bcc250b5c..e435ce728f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3874d6fa6ad92eac4ccfbbc2ea76cf8b1fbc869a725eb5e8131af52e78be7a4
-size 12427
+oid sha256:5d8630310d2c2f08aae23fe2e98b9b7b6dec253cbc0528804c999aa3d2d40658
+size 12439
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en.png
index 5eaa6da79f..d816e772f4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.pages_HeaderFooterPageScrollable_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60d3361163e9a846d0686e696ba25e35b6a8ca9b691d711ff0f5fdd3b1d5578d
-size 12091
+oid sha256:99e36471b02eedc24bf1a07ffc720fe18ca5482e7fc0f35316ab407fd485cb34
+size 12105
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en.png
index be83c1a4a5..ed8f933e05 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar.internal_AvatarCluster_Avatars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ed3c503d7aebfa335e7fd32e3b324acd6554d4bc64c4b943c20e2c9b01749a6
-size 59593
+oid sha256:117c38143692e2b556300ec2e004d778c7a0ebba898f835f6c42804ce51128f5
+size 59248
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatarsRtl_Avatars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatarsRtl_Avatars_en.png
deleted file mode 100644
index b96321378c..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatarsRtl_Avatars_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9dda468dafd8eb072ad7f3b731e55fbd1f8a4e11e8765f566b929b1d367fd0e0
-size 13693
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatars_Avatars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatars_Avatars_en.png
deleted file mode 100644
index 097602787d..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.avatar_DmAvatars_Avatars_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69e9858a04efe0160908bd0b85990dce8e983db33408ca58752bd4dc1eef6861
-size 13576
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Day_0_en.png
index f4959053a0..a14d3dcd4f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93573679718ae2a1f3a35474252405d7c6dfac545291f9ccd7a722ad4507aa73
-size 58491
+oid sha256:eccf518dddb9b946e435bf391e56d6c4ddb4b5a7784d5bb37255f6e41e115376
+size 58509
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Night_0_en.png
index ee5b8d78b9..e93b92458e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.button_SuperButton_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f50b0f7cd8c1e3ea5ac706f93d4dfc5854fb56004d14ecf687c99aaa06c79daa
-size 56908
+oid sha256:a6f1cb3bf4371adeaba17975c9f3d601bd021a29f4ec2c2fd9517d1a35fc61f9
+size 56982
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en.png
index 071581d869..372cbeef54 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialogContent_Dialogs_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e68131a1dbc3aea5bc096fb240f035dd7fa1907dfd1ada5f6f3f3a6bd3ba606
-size 37349
+oid sha256:1e6681255561c96b0ff17ab926dbb0c5666bac399044929898e029a16a429a66
+size 38322
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en.png
index 58df54c186..e741d18262 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4acaf30457978c09cdcd8582a6eda7ab82cc21eeb3fd7ffcd016033969efa32
-size 27587
+oid sha256:672240fb9bb51c4d6f67b6aea7755e7cb98af405601c3fda5456ea0dd4dc0ae0
+size 27615
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en.png
index 147ebba78b..4e36600fab 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_MultipleSelectionDialog_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a68b58db6c683e010806067aa531af1e6343bda0ee53a36c7767127c409df306
-size 26195
+oid sha256:72f1f9515f26927124f2cd90d3442819c5edaad8b2a84878286fa3d01ca01d4e
+size 26142
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en.png
index 4987933ce3..767cb5157e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec0a9180716520fdc61c9e0192d9bf85bbccdb94a107c4020c2ed8c6c70e56be
-size 18566
+oid sha256:cd253110c5030bac938211823bee88b46c13e4c8d4c384afd56e3fb395e020b7
+size 18668
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en.png
index cdd08c032d..840f8a1c17 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:098b138a40327f84a7476a9148c96475e629a7ee150f2e1615cad780f242bdad
-size 18921
+oid sha256:423056bab129f1376b61e0ff09e8c6e76e325d6c13ad4dc808538b6911d1b6d2
+size 18986
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en.png
index 9c826999db..beeb10153e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b43faf9b2fcd8f9bbecc372921b2734bf440e9745a8b90962ea9de052abae538
-size 17591
+oid sha256:8bf92f9aaf2d9b4d96c23293c36b1dd5fb46be41ea5d0605c90b67697e1f50a5
+size 17560
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en.png
index 071b8e84ff..f08195c813 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fb6f62b05652561db4287ae9da33364dbd03d80f377674539055958e098f6bf
-size 24840
+oid sha256:ca93aa09997467d8abb13ebe011128c17e0a8b6518a62350382cfbd71f196ce8
+size 24805
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en.png
index 32c07e7294..650452cf36 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:daa67933b6b932cd1efb72dae107877d8742b167969074aaafea04c4f826c892
-size 65167
+oid sha256:7af8326bf7f375409c40180a8dfb835a9ceefa5ea058766251e1205d2e9b9bfd
+size 68704
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDivider_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDivider_Preferences_en.png
index 31b672c5dc..c57939a437 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDivider_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDivider_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c85b1425ad016cf91918b845ae26b0d2867d8ee87ef2c234720d69350083232f
+oid sha256:4a1517ac6b95b00e5242bd15cf8cfefcb996a5bd16f1e464be852eceecb0c006
 size 3723
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDropdown_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDropdown_Preferences_en.png
index d061849688..6c1e30afe2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDropdown_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceDropdown_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66c00d723a56ef0e6a904e07d5b6d8ea537018b0098633339506afbb1697944a
-size 41149
+oid sha256:5d50217b9058d394d32a5e8ef07fdd0bfff058d315c0e69ee9109bcc47c23579
+size 40931
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Day_0_en.png
index 6e0970e7b2..c2a724427a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dd7f2e6cc58bdc6e3e0b837a95c71b6349acc7596316c13cc3ec03d302a3583
-size 22143
+oid sha256:38631edddc9eabfb83967abc240f0bb8957dd593d1d193e35c44931ccfbb499e
+size 22074
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Night_0_en.png
index b231fab335..6d0921261a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferencePage_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce795382500675c5f7b6aedea6c02353f91115e807fc3f6b3f8d9687dd69b74e
-size 21501
+oid sha256:e2631c3ffe70f5d2ee719415c9629b86b660e93abbc113b0062916ac8523665a
+size 21308
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en.png
index f519c20296..8de4d025b2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1d79f0f51dcdc17953355313fc16751c6615eb4cee88ae847e3e0733014ddda
-size 23626
+oid sha256:23c0c6aa38bebef3a9c89d6db2e73ee37eb5643ac6fcd70a3c1087819de12445
+size 23660
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en.png
index 31d1d66f92..456518d3f7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0b5366e81ed7d1238ec881cfd715e895fb2a6589b7b840ead83ba82dd5eb274
-size 35637
+oid sha256:a073d17826ab42c019f90c86631ec19fd4adefdd874ea62f89509daa48e8d3db
+size 35828
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualListItem_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualListItem_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualListItem_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualListItem_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Day_0_en.png
new file mode 100644
index 0000000000..ddbaaaee08
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa84713e216a9f9f153470d94886024b3ddead8aa0ccb5ca851cbac590ee2e6d
+size 10341
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Night_0_en.png
new file mode 100644
index 0000000000..3a2b980e3e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components.visuallist_VisualList_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd517f2b15ead6246fc42538a85663d7339c3d441e562b71be6016a9c2debe8f
+size 10207
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Day_0_en.png
index 8dda833412..c049cff102 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f3df9c9de000b15692b982c7d69f85ce3d03cab468c342773c88eff3b4fca65
-size 9082
+oid sha256:ca6415ca7f858146a4c00e2fa1d9602fd9f3d42c0c8ba9830e121769af80676a
+size 17255
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Night_0_en.png
index dac3588ed9..8074748111 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_LocationPin_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9767298a096be7fc78210245e6b806a72a6c1ad16d7335e0f89728bbcf08ebd4
-size 15884
+oid sha256:d89b754907f98ef1df2cf227ec535cdad91dc15e90b4915039be39d8b2ae2ebd
+size 16721
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en.png
index 8651620e23..3968564313 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12195a28876c3c90b0488edf00046f5b941faa8c7203e60f5ab9317dcbe35cf1
-size 25757
+oid sha256:8c25056de98a8d1ede49e5cbd2c233a167162302f42e2c659aa0e1695ce09375
+size 25642
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en.png
index 58efded42e..8687df4a7c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_SimpleModalBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6ab0c3e8353c2e3ce517065fb66c1fca10d58b96081c0dc7a44d59dd084cb3f
-size 24498
+oid sha256:7ffa5947893e59d3e534e070116a66e93e3c0163a76d7712b551177c2fea7bc0
+size 24314
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en.png
index 9a43a2f7c3..c2cc051da5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15974f532df8a3bebbedabf337889e3a5d71cf9d594389e00dd3e7ce62fc84f8
-size 30491
+oid sha256:6d15e20d75dbdcee96ac1fcaf1f32113a70f4a6764513cd43cfe107c435448a1
+size 30474
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en.png
index a31ba55583..db7e037964 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46f03028f5a3275c6b5a988de5dcae722effb383830f85fada87384ec6f5f1cb
-size 30854
+oid sha256:c807742a58a19dcc4d40ee9354a65bc4078f861fa1b6ad269363d22f10784cf9
+size 30875
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en.png
index 1cc489f067..bf5214a86c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5bd87fa02dda072996cb8b1c927bceca0a7dac0c790e82681b4c1e411523365
-size 32310
+oid sha256:bd3ed851b338dcf146956d4e8e20e21d9251f0db3568c053d67151ae7130b6bc
+size 47620
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en.png
index 9a38ed9e3c..c6ec33f16b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b456443ad681ee4edcbf5a605f9799062c5482f060506ec0f597056cef5510be
-size 24316
+oid sha256:3b264da66c8b9fd84cd489bb861469b40466d9a8f50c7192d79fed1ca6aa13e8
+size 24987
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en.png
index 393ac87bab..f6bb2f88bd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f60460469e16407dc671c08071a03553d2ffa81cde48bed19628f46b86cb778
-size 24033
+oid sha256:064c5e3b6b456607280127c44e4d62184365fe35a533fe584c123b3316907a99
+size 24683
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_AllIcons_Icons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_AllIcons_Icons_en.png
index e3cda24208..fa2208b50f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_AllIcons_Icons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_AllIcons_Icons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca6ffe10dd122a2c2df99160b4e318e591ef6d3b10b6173d36f6c9959a93277f
-size 114895
+oid sha256:de697fcf50bd244978da1143a80f872650a424c3e308fd2c4c66005f30cbf6c5
+size 118141
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DropdownMenuItem_Menus_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DropdownMenuItem_Menus_en.png
index 7a670bffea..5a9428a52e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DropdownMenuItem_Menus_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_DropdownMenuItem_Menus_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b46d08f9eff6321a3102cc9756b53a665702a32021365a2d2b8917446beb3efb
-size 23804
+oid sha256:71076c2b51e510c0a7bdb8d2e57196bdab02072964e82804fefd853b3eaabfc7
+size 23957
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalDivider_Dividers_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalDivider_Dividers_en.png
index b391c4321f..0cbd7da153 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalDivider_Dividers_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalDivider_Dividers_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c8372627f3897fb6caaa4a23fac112b4e2aa7a9d6fc8a6fe6a48752c5d06345
-size 3845
+oid sha256:57a530a13f053a775520527c3909e96aeb599521b42eff587061911a3e29ade5
+size 3851
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
index ee5c582240..58546b8522 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75de341f705bb22955f9399180519b65ad59c2e1917317d56e50ea4db78f35bc
-size 12102
+oid sha256:30357bf18792db5ab20085010251170a724ffe8c00313facd04ee704e806af64
+size 10982
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
index 687e0d436a..4da2a98aca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d57df7110371c9224e232b707d6a1b10ce14afcb56c803a78220792f2a0d4cf2
-size 11354
+oid sha256:ef0dc4d53daeb986f378b6e4d85928b4b6729336c89cf21e642c88c53688a3ab
+size 10292
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en.png
index 86cd39272d..7304cd8c35 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2107e822d312b25a19c1b062d7497bbad49cd0f2cacd65a3d08ef868609c438
-size 13331
+oid sha256:2e8c8d42a8a0f72c298abb282ee218a0dcd50bdc61419e32e66693e2d401ea62
+size 13369
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineBothIcons_List_item_(1_line)_-_Both_Icons_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineBothIcons_List_item_(1_line)_-_Both_Icons_List_items_en.png
index 1a16aae1fe..9600224209 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineBothIcons_List_item_(1_line)_-_Both_Icons_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineBothIcons_List_item_(1_line)_-_Both_Icons_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ed896e700fecc71d4b3d11697acbe8d971a49c0ae97e160544e7d392adaf298
-size 16731
+oid sha256:69d76d91f33c11facddf3be290020c9dcb12a48f7062a4c2731b48bdd97b7305
+size 16732
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
index 48d3dd62ed..2a4aef9a23 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdb9a27772fe8de617de84b37a8d4d729d9f45987aacd8859eba012ebbba3e1b
-size 10566
+oid sha256:eab65c8c1c62098b3abddfa7c5510de4b82f0957f959463f4c3b36b40835707a
+size 10527
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingIcon_List_item_(1_line)_-_Leading_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingIcon_List_item_(1_line)_-_Leading_Icon_List_items_en.png
index a6d755dc6d..af9353b354 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingIcon_List_item_(1_line)_-_Leading_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingIcon_List_item_(1_line)_-_Leading_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d55eaa95e367f77897ab2dd1d5a31c572ff3d3e5b0066f9a545917386a3083e
-size 13542
+oid sha256:92d8641e31136a7faa27314514b55837b9627214cf13524ca64d8d01458ccd3e
+size 13547
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
index e47d23ddba..400c0acd62 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3175fb068e7a1049efec3cb710052c1da33917b1ec86162b1c959439d72d0ef2
-size 13214
+oid sha256:9f8390d624ad20902ad183a794f28b76f3ac7ad299ac66a5f74e7d12c8e2adc0
+size 13164
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
index c2060478c3..4b24210ffa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b237a6a4a6cd367457a06ea102cda7239e5a7747068d9bce9cd7982fb14ffe50
-size 17440
+oid sha256:4f34772ee85bc9b55ab8c1ce4d833208882a4b9696f49000fb346dc85a968c99
+size 17296
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
index 971ad0d595..579f68c0b5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba6c487bc98a2ace5e275b51944c6ccb32c832b0279ce018f636559bdddbc1de
-size 10470
+oid sha256:b3b91e45fee56f0aef50a481918536399b5a15ec84e8a68390fa95b8f2daaf27
+size 10508
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
index 04205e28bf..579c69e716 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e28c242fec3e32c0a01e1830ba34b68afcc9886a234876407b1ace2d4688f4c
-size 13097
+oid sha256:00990e6afbb823ae7ece6d89abab7739664e260c3b9fd2882eec685ab1e577b2
+size 13069
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
index 4658d00c61..3e8540e03f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e558b303bd338b13ffc2b728161c7a6d756a362b6ee9c78cb5180aef878ace1
-size 17194
+oid sha256:6281271effbcc831bcf3e47fe547bddfef2b8a394c457f621bb8643b74cc9b29
+size 17059
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesBothIcons_List_item_(3_lines)_-_Both_Icons_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesBothIcons_List_item_(3_lines)_-_Both_Icons_List_items_en.png
index 7e8a091f5b..0dbd6895ea 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesBothIcons_List_item_(3_lines)_-_Both_Icons_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesBothIcons_List_item_(3_lines)_-_Both_Icons_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d986b1dcb8553060f66e78f5882ac2de519a59ed07d7ba600a2e25be7091dc8
-size 46805
+oid sha256:1113bafef8a52c986f84dd388abfea93d93eb4630536b6e36b1d8626b16131cb
+size 46718
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
index f48e6c8b84..6c256593f4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5a194e333f5941850ec59f1b632521acdc9e0d0786a74c1093b8cf08ce32cc9
-size 40887
+oid sha256:33193e1c2197250e9be9c58faf66c774feca32297d09ef3872b0e6611ebf2d04
+size 40965
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingIcon_List_item_(3_lines)_-_Leading_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingIcon_List_item_(3_lines)_-_Leading_Icon_List_items_en.png
index 877ee1dd0b..1403bc1fd7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingIcon_List_item_(3_lines)_-_Leading_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingIcon_List_item_(3_lines)_-_Leading_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86911fd851d25569259cc76db52c34f3ec4ebf9df6898bee13016f8f3d5638cd
-size 43840
+oid sha256:daa4ad5e65a0da81debb12f638c8ba3c65571c4fb8413594a8f0239d1f13fcc2
+size 43769
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
index f57544073f..c872436568 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84699e66aab169a83725db1069f8cf52e3f96720ed2252d3574a8d6895c5bf9e
-size 43143
+oid sha256:dc7bf60912a15c1663d02efa5211589990f50c76de061152b74eab4f9cf6add9
+size 43499
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
index 3929435593..603751f57b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe023e608e9ab7bdc4cf9821f508473f7f46bf22d3bdcc4a8bfe24db067ac61d
-size 46904
+oid sha256:c166c1bd12e387fb5820ca86534a83c5442af1893b93524df916db9fac2a6cde
+size 47085
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesSimple_List_item_(3_lines)_-_Simple_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesSimple_List_item_(3_lines)_-_Simple_List_items_en.png
index 7e15b2cf68..0f896c5e10 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesSimple_List_item_(3_lines)_-_Simple_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesSimple_List_item_(3_lines)_-_Simple_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:523f92ecce569d895a4a5da0c473d8e3e7d485594a2e3f2aa9a4dd4d35f281c0
-size 39710
+oid sha256:c71110d154b49ade0a4f01f2e8e3954959c19e76a99bf7777a934045e0cf074b
+size 39725
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
index 4c6065e04f..cb3eac70d6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80ffd692a9e9fdccb81c485e9d4aeb17fd79be445bb5abd114367a6718946bd2
-size 40705
+oid sha256:f6bffb6ab53a386f31957f40958873af7ff699e52939aa43444ebc425df5aa67
+size 40952
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingIcon_List_item_(3_lines)_-_Trailing_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingIcon_List_item_(3_lines)_-_Trailing_Icon_List_items_en.png
index 07daf303e2..2661373140 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingIcon_List_item_(3_lines)_-_Trailing_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingIcon_List_item_(3_lines)_-_Trailing_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b46f814d5f790381507af54c1e1d25ed5fed870243e9e1af27ca88f936470748
-size 43205
+oid sha256:d2daa67163a8b84cdb5afea72b217cd0db4dd57b32849aa99a26ccdb959b46c3
+size 43501
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
index c8999d5ef4..32603f10db 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3195751d8dc8ea8740fd9b6059461120e7580737893f38b02fe56e5295017caa
-size 43016
+oid sha256:a8f33707d9bdc37214928bba4903497e5a21dd4a68d4eb41bfecd6e58c425279
+size 43485
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
index 225838a112..c0e557bf31 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519c96175e4568585d76656e7993b5c548909d056a9f7a3df50ce4f35938cfd9
-size 46545
+oid sha256:e50872161403076d757b44ae88d2c2cb4eac985fcb2eb148ba3a8fe8ffccfc95
+size 46970
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIconsError_List_item_(2_lines)_-_Both_Icons_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIconsError_List_item_(2_lines)_-_Both_Icons_-_Error_List_items_en.png
index 4a8a371047..fb33e1867c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIconsError_List_item_(2_lines)_-_Both_Icons_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIconsError_List_item_(2_lines)_-_Both_Icons_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe703dadb9d9b908ce8950b5357634d6cb2798816c114d26004098578bed93c5
-size 33699
+oid sha256:832c81d4f2539b38da4d00abd43008cb5df9e35a66d5d700a3522517fce7834c
+size 33714
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIcons_List_item_(2_lines)_-_Both_Icons_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIcons_List_item_(2_lines)_-_Both_Icons_List_items_en.png
index 94f5e32a84..0f3debc5b4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIcons_List_item_(2_lines)_-_Both_Icons_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesBothIcons_List_item_(2_lines)_-_Both_Icons_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1742b69b9d2f41337b2e5a99c8797a239a673169a5a4d0ef953a4c94d4839647
-size 33947
+oid sha256:43b8825378da7852de8574a1edb6ed293f4dc3c5d099acf9a76c19205384c345
+size 33949
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
index 285440c5ac..7944fde674 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:310e2b99b30ab4805c514ebbc5007d4a0c729990e2109004b9e7849b4e3aa572
-size 29294
+oid sha256:c50173a2e61cb9600935277ee410896d57f47e67b10717e053198a6c811e4ebd
+size 30736
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
index a1d5ec721b..736ef9c857 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:475b563ced43038869519c975f6516df7febb5647ee0f07a8f69515f63a4e12a
-size 29450
+oid sha256:accc3af351d352f49e9353352b788c17b19cd21da8e251e2fb9c30e02c0e97e8
+size 30872
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIconError_List_item_(2_lines)_-_Leading_Icon_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIconError_List_item_(2_lines)_-_Leading_Icon_-_Error_List_items_en.png
index c676c49626..46ce34304f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIconError_List_item_(2_lines)_-_Leading_Icon_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIconError_List_item_(2_lines)_-_Leading_Icon_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:949224b62e358713c8199aae8b22686c391f21ddeb32510ab0881b3df477ead2
-size 33300
+oid sha256:348f1581c5ee5b3461e6ed47eba0162431935f25ac7fb2ae016de8b0a849e8f3
+size 33299
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIcon_List_item_(2_lines)_-_Leading_Icon_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIcon_List_item_(2_lines)_-_Leading_Icon_List_items_en.png
index ae4011fbb5..0ba07ae455 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIcon_List_item_(2_lines)_-_Leading_Icon_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingIcon_List_item_(2_lines)_-_Leading_Icon_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e53d366114c0839f98aff9a8e7197d90c8cfbe7ce3076329d24a82d8eebc43e
-size 33469
+oid sha256:67361da0c04c23fcd8282ad1d07a92db3419e2febed28a98f070ccb222932023
+size 33402
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
index fa63150bba..07989d0ffd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:179cf3b7c99383ce5368780e98ff47b335a47a47a6028d8edb03e35539690345
-size 31888
+oid sha256:cc177402db7806358a79b8254e7901028c824ecc050784f01322ef28e618c5a8
+size 33329
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
index cb874c0140..65a2cd9ecd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0955be0010892edd6e1f53080f1f23acf69595b468cfaafae0ef82d5c3b78cf
-size 31939
+oid sha256:bd16b89ff61b0c9391ef50797ec35dbf9dc019c7d9aeabd7134cb564eede3f8b
+size 33296
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
index 36d895a7e4..8e3fb14b19 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c49ed6e9c07d7d32e5a0f80e1c5452653304120fc3159f387df6ae310d77cab1
-size 35592
+oid sha256:7d7f4c91c5d24d78a3922f79f8d6a08d4529dab0c3c5aa290aa84c81406e7e38
+size 35669
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
index 9573748422..59e3d3e381 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a005b8170c0a0db3faa3b20ea5efefd1ca22e492ca9a895253add5df9fcce96
-size 35340
+oid sha256:5aca7ecb664085578f92b0651ece1a7d425f28ef2491d2da355d8989822f71ab
+size 35493
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
index 56581eab18..0af3327793 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:587703a28e4cfdf44bd22732f143bc7769858c6311c761fec541f319c36359a5
-size 29284
+oid sha256:21287343cefaa8c5a8476e3377de4dd0b2a6c7fe7c8d2003204fcee5f0f4d1da
+size 30696
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
index e5f49cddf1..5db106b200 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27cff500d92a1ecee970784ddcc48d923e447259487b0f38b3cfe1b55c4f2abc
-size 29275
+oid sha256:baa248f7e6d97c8a5c32bb5a63c73488e92cb7f207f7f7a8358db93f676fd2b6
+size 30644
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
index 0a439a45f1..3ad64127dd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7335f19b6c00c337357d436d4a6487da66a09a699880b62448d7b495dce67d91
-size 31891
+oid sha256:ad1d2df948eaa6991d431a7f47d96842b8dca5af0ea32ad068987ab5a7d170fb
+size 33236
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
index faac55c52c..93aa303fdc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd8f4feac4ee86560ef137ea27659dd23e8d7761fd25fd8ec0dfc524a9b6cf4d
-size 31736
+oid sha256:1143780e219e7c9d505bba2778bedf44c5876b291b397e4b5c04315c7cbd8420
+size 33036
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
index d468264e69..a9a8e372a0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9525e9b5b57bfe0f3b8d198596742c09a40717c9d48c6f3e5aeb336d3935b8eb
-size 35315
+oid sha256:1962ca64598660738313489d148291c23707c8ef9b2380eeea103a50d158bd05
+size 35579
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
index eb53d5021d..49307d7502 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2168e76fd0ec791e4574bc3033f50ce240cc478c32322b4c29d54bc208370729
-size 34983
+oid sha256:806016d99e43feb0f189ad6686e66e2bbff878a3272a4752f4e64fb696f87a58
+size 35263
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDescriptionAndDivider_List_section_header_with_description_and_divider_List_sections_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDescriptionAndDivider_List_section_header_with_description_and_divider_List_sections_en.png
index 24654229ff..4b6b96dbe3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDescriptionAndDivider_List_section_header_with_description_and_divider_List_sections_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDescriptionAndDivider_List_section_header_with_description_and_divider_List_sections_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56e81753c623450107b1f34eed6ef12473c3891c5d6f23e90fa1265369623b35
-size 25341
+oid sha256:3145a6b1b6b74831f0aea71fb002fa7fab97affa6f8bd9a2a62a22bbf4dd391f
+size 25114
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDivider_List_section_header_with_divider_List_sections_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDivider_List_section_header_with_divider_List_sections_en.png
index 88193307f2..ee77d862b5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDivider_List_section_header_with_divider_List_sections_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSectionHeaderWithDivider_List_section_header_with_divider_List_sections_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5abf26afbad167c6cc1f92a60b1eb73c0d2e1e5c1f354d66326990c7a729ee9a
-size 8610
+oid sha256:aea3fb4fabd829e27acda01561ee58dd885c8348d150ce05d128081e7f9f3517
+size 8582
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextLargePadding_List_supporting_text_-_large_padding_List_sections_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextLargePadding_List_supporting_text_-_large_padding_List_sections_en.png
index d8e3863b41..d0e5b8957b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextLargePadding_List_supporting_text_-_large_padding_List_sections_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextLargePadding_List_supporting_text_-_large_padding_List_sections_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f41ff26dbee0284f543aa5d37844bfb9348b2c5be2728ba08f3041c0538ca637
-size 26074
+oid sha256:94a47747149162a3a3b029274388cf6e7194900bb70a44efa7c0917dd932e9d6
+size 26014
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en.png
index cc5bc6da9d..318ed5911e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9df652b074ed8aa29c4aefeb73cd0324509e5a835eec8d22a7044237acf024c
-size 24955
+oid sha256:048e7130bba929b9bb9d272e80835f88d2a5e6c07b378f7854bc607cddfba8c1
+size 25009
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en.png
index 2317914c61..f3f0242a24 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4b18fc1dffd0b62b81d9e9ec5de8588919e27b18af178bfba474771cafd9800
-size 42717
+oid sha256:37f8e05e435b8d531c72a180ff87183dcec2aa319473bc540e19c9fdd0e5346a
+size 42673
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLarge_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLarge_Buttons_en.png
index c3d49d4149..fe4359f4bb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLarge_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonLarge_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7813a6da740ee5a83c56ac4883b2905582482b6d5d17254b30b895a242f85b60
-size 42752
+oid sha256:ffe628766efb7b932c82749546d5c9a6dd271a4ffe2cf162dbc36796538fce12
+size 42723
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en.png
index 2317914c61..f3f0242a24 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4b18fc1dffd0b62b81d9e9ec5de8588919e27b18af178bfba474771cafd9800
-size 42717
+oid sha256:37f8e05e435b8d531c72a180ff87183dcec2aa319473bc540e19c9fdd0e5346a
+size 42673
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMedium_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMedium_Buttons_en.png
index 9eacca6dce..c091d1d246 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMedium_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonMedium_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c081116bbbb293635b599ae4d4d25505cf442a0feae7fbded69f7772fec7d96f
-size 42850
+oid sha256:ff352e5d173cc05b74d4086e5412d467b378239fa7f75b3c17c11b7f024047c1
+size 42823
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonSmall_Buttons_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonSmall_Buttons_en.png
index f42bc48690..75c2412758 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonSmall_Buttons_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_TextButtonSmall_Buttons_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdfe5a8f3e42c503560f32835237ab0f340b0a82a9dea7945d6cf19ed1845c93
-size 42868
+oid sha256:8ce5baff8faa00bec873dd65a22415d9bdba0c69f68168fb893036684ce2b0dc
+size 42882
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Day_0_en.png
new file mode 100644
index 0000000000..912b90b537
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4746d11c30648f7c517b0880021e5a1dc6ed2819af6c800b081b0d842ac2c384
+size 5325
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Night_0_en.png
new file mode 100644
index 0000000000..9c425cec6e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItemWithPopup_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:290a2be6838445739b0181006f9fea87337a85cfed3573c153e9f503c66624a6
+size 4994
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Day_0_en.png
new file mode 100644
index 0000000000..3971eb1c25
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5d9248a5372da8d93013991d8487946f5a133987f75ae1aeccba9346b05d9ee
+size 15280
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Night_0_en.png
new file mode 100644
index 0000000000..de8d641791
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiItem_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b415e40a4169a1b4d321daba926b3f90871109ecf49db1e1be9ed929580c21c7
+size 14963
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_0_en.png
new file mode 100644
index 0000000000..e72de3579e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bef378cbf227e79cf7848222e33d874e51ec5e72e1eeb08b4830f1ce855be2f
+size 21752
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_1_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_2_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_3_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Day_3_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Day_3_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_0_en.png
new file mode 100644
index 0000000000..4ef1f61169
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:834b11c64ae5779f15f1242d97618285bf53f3184a6b64db10285237a8c2c7aa
+size 20923
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_1_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_2_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_2_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_2_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_3_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction.picker_EmojiPicker_Night_3_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_EmojiPickerView_Night_3_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Day_0_en.png
new file mode 100644
index 0000000000..de4d90383b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0e294bf94727e3599cc94a80668dba83742f1897c55bf7476bbb4b4fb4116c1
+size 18794
diff --git a/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Night_0_en.png
new file mode 100644
index 0000000000..9e526ca3cb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.emoji.impl.picker_SkinTonePicker_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ab6d6139c2e15334980c753f97feedc688285a9704650e47956df502cadb6ef
+size 18539
diff --git a/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Day_0_en.png
index 6f28f99373..5e2a90acd4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f458d172b2c970f57eade721a6176e68f3f8dc75ca7b0dd120e489a93ab5ed3
-size 17756
+oid sha256:d33f9436a29a17b45d79d07a61618ce04ce93eb41176e76fce8432483feb69f2
+size 17793
diff --git a/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Night_0_en.png
index ef3a3e502d..c0b5dc79a0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.featureflag.ui_FeatureListView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6c2d0b236e6d1bb6e31a7f6468a0dd232acfb955b3a495a899413aaebad4963
-size 16853
+oid sha256:3aba828982a3de86462bdc417d5c1e491681986d0a5d79ff5d87297b623c9764
+size 16921
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en.png
index f5d8e0173e..640aa3e259 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:368aec8db00c98f5e2b73763826f484c4ca395bfee9156cc7796029f57ceb907
-size 13464
+oid sha256:519b6260f7cedac5cf7a30a8f15bc35910f3b297b0381f5352330ace006ccca2
+size 13557
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en.png
index e16de72924..d67d1fd9bc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:707eaf1db064e542041746c1fff6f81a47e95a45579a9738f7f02573ce6db0f8
-size 12261
+oid sha256:c6184636ebed12ee93d3fe2ad53ec00bda5588d5a6baeb1cfd57bf634777f12b
+size 12299
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Day_0_en.png
index c4375fefcb..419371ac1f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:806e56c218a0ad1c69dd997089cc8362e30624377fdceffeefadc523c712203b
-size 173137
+oid sha256:90218efcddebe9896e2b2c937f4b408ffe07479f2ed5418ae3e070b718195cb7
+size 172920
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Night_0_en.png
index f946b46642..e1ec5c888f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerViewRtl_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e25f6630680dcdf1e685235fc551dd6ea853b0902f30234e5fb9d4050f584450
-size 169862
+oid sha256:22523ffcdecb0d1775ca08f3b2fd29c24eae32b7dbe2857dce5d70020c975101
+size 169627
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Day_0_en.png
index 7cea979d00..1d03fc7475 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8185dee1ad113c2b32a74de58c440abb366337accd1dea12047a85d323eff9eb
-size 171610
+oid sha256:39f937c61446d35ddc45f76aa53e612ac3855d00cbae475574c954926cda8250
+size 171084
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Night_0_en.png
index 7118f2310c..9ef00c806a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_AvatarPickerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a13dd8a9228c1526482f0c7fd5e0347c8fa4998849507b759a0c9548455adfe7
-size 167957
+oid sha256:f0cf40f1bb4d180e2cebeac0381cc38c714be19b57f9b0ea7d0e316a4ead531e
+size 167332
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableResolvedUserRow_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableResolvedUserRow_en.png
index 3aa2f3157d..32ed8ebc5e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableResolvedUserRow_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableResolvedUserRow_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a986526c80130e11a0ec9c6450e4cd77dc40ef4a09082a1c526eebabebf4c03
-size 49746
+oid sha256:ef82fb23d7da19f1c3f37c3fbd1472f138a8edb27c307072cebb3b2444c239ae
+size 46245
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableUnresolvedUserRow_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableUnresolvedUserRow_en.png
index 1ef0d7dd02..4655e07a84 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableUnresolvedUserRow_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CheckableUnresolvedUserRow_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2ca690a89bebaa351990cab34155afcfa7a0b9f02312757fcb933ba97ab9310
-size 101952
+oid sha256:24c890859cac9e93ac69ea6914902a185109e6c063c1187f64e3740307414e3a
+size 94973
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en.png
index c7e3599c58..a44cb090a7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb4d6bfb9c412de00a2b4956032dd42906b5451eb99e6ebb1880dc01f6b55af5
-size 26077
+oid sha256:06d26a7f7fa05f1844a93130ac8110c987e3d53d51da246cb474f770edd67413
+size 25541
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en.png
index acec20812f..2a2a9e5708 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c5a4487507334ec43c9d659f57f2ec0d86856d941f8b1b437c101b696a5b49d
-size 24223
+oid sha256:70bea7e1a7e3fcfa9029b61c2f1ce49c911bb7301b14e10d532334337dd50ac9
+size 38316
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en.png
index fe44b8941c..ec9d631693 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8c422787b67d477d3b7c8d5dee8879f33d47153dc93dd29bb3883e4ed863a41
-size 25232
+oid sha256:0d5a96a18c59042d9560ae657e91ed0cfc7667fd430fb3b1423fe88f18d63ceb
+size 24348
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en.png
index 0c60a3da07..a4b83c0500 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab0ba9a693ede4106d09170710f215bccfd82dbfbadfdafa5fb49fe39a03c25d
-size 23471
+oid sha256:f7d2e2efb9d44584e96986d8dcd69b100c75e64c2f4474e6f1e0852565d40410
+size 36571
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Day_0_en.png
deleted file mode 100644
index 3a7abad03f..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Day_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b494ecdb4962772dd548339a4ac57be40b273b513697ed6d039d1c905617d54f
-size 4987
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Night_0_en.png
deleted file mode 100644
index 17d1ff9d1b..0000000000
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeaderPlaceholder_Night_0_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0618a9f769e15b4e682d763224cc1fe0abf62c58f3b9a6b4059153f8805671e
-size 4740
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_0_en.png
index 4c4d183956..03d5ad5880 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ccaa7f88a9e46bdc526bfe3d5c2163bf3d963c0661179db97f62559edfd3189
-size 11042
+oid sha256:0dfea70e781debf7a293aee2967c3da314101020698fee97d3551e25f5f378d0
+size 10655
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_1_en.png
index 0edaae43b6..3a1ad156a2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f37e1587ba12f9b6326b5b7398982fc663ca913da8c0ee83dfbd5e9decbd4362
-size 10906
+oid sha256:33482ad6e5033800e911dab44d4ba5bec15cfa58749102c5da4e2c57a8e760e8
+size 9783
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_2_en.png
new file mode 100644
index 0000000000..0a34d0b390
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3ecf110c258f4ec5fd5d2a4126395e248d73d894afd54a0135dc710f680c0ee
+size 12395
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_0_en.png
index 741a708fe7..27f51b2778 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb0063babe7091368af6b5bc7e8929c54ea879bd78043d9128db2dcea9d79fa
-size 11191
+oid sha256:62e127900d00756ecc806eb9d8efb6a11cd9cdcecae6b4bab643b7306a06be2b
+size 10435
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_1_en.png
index c4e8dfdd29..81d4ceda60 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f34e63a88464ddc817d1ffe0324352199ae1821dfa846cceac129a656ece2eb6
-size 10911
+oid sha256:e39bc143f7ee45c47ff57bfb53a773d7df2ba14568a9368643d8bab9dbbf4955
+size 9675
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_2_en.png
new file mode 100644
index 0000000000..58a30a7304
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserHeader_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bc66cd4269ee462103e77bfa24723a740d8a91dc7e06ca808b8109e74d1784f
+size 12127
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_0_en.png
index 78e3e7db33..93e17f26b8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9aa5b37b57d1ef1f219e0c5213eab3eba3222bd0453988a5c708e15ba89d8fd4
-size 9772
+oid sha256:4c37d48eb1fde1eb67cb3130505414c97486d1b40b49be9a6c0770b0ff9e50da
+size 9277
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_1_en.png
index 10d4beffb9..5174fbe9bf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a992addeb8525c7df4be04514c82e22c8c1269d7c14aa25497efaac50e844a8
-size 9410
+oid sha256:00a060c5b66ee6febd8bfe145548aa3b2fa43ed0852e4224ab08a4641cfdc6b5
+size 8075
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_2_en.png
new file mode 100644
index 0000000000..181261b486
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e685aef8bc10159ba5cde38217382b3b33273bb04bf3c7e8dda392a0612d8a20
+size 10460
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_0_en.png
index af7347092d..d55e71d415 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e850f65631de21c8cb44965f66e8ffbf0b1eecf2ed6f91e6669f0dc89ec0e4b3
-size 9784
+oid sha256:4e283d48e8eb569f44576c158096ef0672146392411e2e768350ebaff9f71ee7
+size 9073
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_1_en.png
index 38dc8e36ba..fa48ce852e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07b7d5515f0ca6e6634e8ff4b53c73f48b1170fe8d2488c7a8863d1568c52cdf
-size 9420
+oid sha256:d23f245942d6353707c4252a05935b9d59a5a8ef380f351d0341b804413969ca
+size 8101
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_2_en.png
new file mode 100644
index 0000000000..a13027690a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_MatrixUserRow_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff742cfbc02f4a728a034e7cb3f161c98d706f5c05d8032cb8e3bb1d9e52a646
+size 10242
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Day_0_en.png
index 13b54d61f4..6fc398e5ba 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca4b2ddcebb957944522673d20aafb967ef118ac1a8564f33a0c8745f0f7caf5
-size 6268
+oid sha256:2a6797d1d45c1ef189dfffec805604b06dd7820976c834233a99fc803721b663
+size 6500
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Night_0_en.png
index 30475df2c4..b599a59788 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserCannotRemove_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d56cc64425872a2dc1c12ab7d2e0d9fe43e89586e6f5f1805684350281baa6b8
-size 6744
+oid sha256:acc4553e995907ecfaaf74c4e7bfdd9fd8ccf5cd6ba8396b25c110211c21975e
+size 6614
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Day_0_en.png
index 81b127dc0b..1d334393b1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:160abf1659329b6ddb61e9f3bbe9cc5cf4630242429093a8d2d579e0b6efd78d
-size 7687
+oid sha256:2f93df7decca6ced4efe9f739d6f877b2411be874c0cf011a146a66e0ee2fb69
+size 7790
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Night_0_en.png
index 7ad44c9fd2..efe44c5f81 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUserRtl_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39817cc9c0bcb7ae058201c8bb9e7f68529142161019a23296087cd952667473
-size 8143
+oid sha256:7a52a67692a0fefcb499af2f3e0670b663b1df657ecc7b61e58773db9ea6615f
+size 8057
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_0_en.png
index 08ebefd43b..230de5c2ef 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40efbe8c661131800679fcdf18870d05cbd24a7f62c7c1adb998f28cef3896ea
-size 7698
+oid sha256:b095f97e5ac7279fba15f7ea8dc1658c89e28e4f72b8f93b7c32a7b6d5bc4d23
+size 7807
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_0_en.png
index b7d94eec19..d45e2d4b35 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SelectedUser_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:774bf98c634fef1339d95e8eaf5f5219535766f41f2ee8b4c124107f381bf052
-size 8167
+oid sha256:5a0960b2353e902b04682818cf598fad7ff4ccee9e9fe7aec13ad556653b702c
+size 8091
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en.png
index e132d78fea..12fc229a83 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:928165a963ba3dadd278c8fee183fb5d6398b28369f28f782c9f08dbc69df52c
-size 14235
+oid sha256:ad303cbc4984982a5d3e6fe341c611483d76a3cd4bf15705864c5c20443f9b4d
+size 14226
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
index 25dae1f86b..82f7e36af6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ad5934da41af5f5f350adc3d5d754f1ed16e90546cb20a0874e3d069010167d
-size 10117
+oid sha256:aa985c9b0211cb12e617e8da73669777cf3a5ec5b77b79f232ccdc6e0cf55373
+size 11760
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
index e0fc1fbcd1..7983b2870c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5ca516e5f7bc8a2231b5fa7535a80b03eb6ff44b2d83e66163b010a1802fa7e
-size 32464
+oid sha256:ccc9c9c95b9a56bb6c453aea4b13be812b64ad5b7352f169a32208166ff70b9f
+size 32449
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png
index 491523e822..e38dfee86a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81de93c5c71bc1552dc93343bae9168ce35e0d4d4430a47311ff80b9cec6c3b6
-size 10633
+oid sha256:71bf90e818949065c7620bfa8e7148a8f9be295775e1b29cb251d2a00bd87853
+size 12173
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en.png
index 6241a64e5a..e427a47553 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97e41908816ae4f32eeb85f00125dcd7eb28810d9157441f535a228de3ff31bd
-size 13774
+oid sha256:70193284306460b8f9c333849c8d5e1b5b1e95c3ce446307ccff482c90c2d09a
+size 13775
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
index 7201e63c00..e3c16b4b40 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ec4038e9d1cd25d8ee27c54e10f9f3627bf6f8f4c83201b1bbc3fd73641f1d5
-size 10333
+oid sha256:68e990772361fd240fb20b664731613b5a2f187499f2db48e130673f16acb33b
+size 11575
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
index 9d3c84eb6a..90d6923e20 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cd30c16ff85d4140d25b738916948bf4180b49341b650886a318080c8697fd6
+oid sha256:0284751ecc89b295784fab1eb4a85e4615015ef915c9492a59ad8671f2805806
 size 31606
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png
index 308066382b..f4bcc684a7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2a837de06ec9369c5a39629579c237b4f394a586a2ce85a5c5e15d444c98314
-size 10323
+oid sha256:05e2b62d4484990cdd837ff233a654cd6aa8d82d1c3965351bba86bcfcc1e1d0
+size 11776
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_UnresolvedUserRow_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_UnresolvedUserRow_en.png
index 1e4ce1ae37..5d59b52717 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_UnresolvedUserRow_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_UnresolvedUserRow_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86d4aaa9a2ad499be90ed3a0d9a15fcd23cba4b40395aee53028168717c1fe9f
-size 54739
+oid sha256:8a2d52c8f8903881357cd0590d5c1bfb85997068eded3813aad1bec4f31d853a
+size 52452
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Day_0_en.png
new file mode 100644
index 0000000000..5fc8a42dda
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cdd3a8df3a9decf6e84d8deb8bbca28f844dc812a238d89f34239e546df9635e
+size 13015
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Night_0_en.png
new file mode 100644
index 0000000000..6223b491cd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_InvalidContentView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e475efcf0d4e56d6519007e6b6e7d671f4bb8c283c2b69336877aac3540eb284
+size 12679
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Day_0_en.png
new file mode 100644
index 0000000000..bcd1c40647
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14556f5fd93d2454921fbd67daeff65e954a74cde1ba842d93f89c6a006dec63
+size 11748
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Night_0_en.png
new file mode 100644
index 0000000000..ddfac119b8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.media.contentvalidation_NotFoundContentView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5527dba93897d9f0c6b3a002cdf5b3c1990ab5f8058a5ddf3c0d8aeaf10f7dae
+size 11397
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en.png
index fd8c973b2f..b2178a98a8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:831fd682ca73c8e76f63d6b504f1f48bb23a26f2c4b706764d9d10e3fd9408d7
-size 10345
+oid sha256:319efe6fe21e61125e9f935a13724ddab6ba6c8ae21c7d21bd70470c3a22989f
+size 10275
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en.png
index 57de8c7c5a..e19875f9b0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7a5321def638da7c0be09583cb2f1dfb426b72391101649499c50654b583ea7
-size 6047
+oid sha256:7732d4b601ddd133a4b3ae55cd89924a7b12fffaf2209039c92594176b6d4b7f
+size 6094
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_11_en.png
index fc75f53313..6e3ce81929 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96dd2df2b23af067aa88b042a8630ec90a3f97902a1633cb7549a602703129fe
-size 9958
+oid sha256:f20f580ef41bc793db8de7d68dc32ca40a4a1208888211bd7985401aeb8eb887
+size 9933
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en.png
index 86a1004473..c2427f09ce 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1fdb88a54b6d4b4cd63f82c378a130f5db142826ccb8639e76f50e3b0c40b591
-size 19131
+oid sha256:21ed68f52eb3491a6ac8afa8ea30a1b30b85d2d8e31b55435d4b54c50ba7fa22
+size 19086
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en.png
index c0a8409f4a..ce1aa75dbd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:910497ff71ac4339d7d74a5429adad2f433e3e013eba029bcdddf7a19d5dc7f7
-size 6995
+oid sha256:4c7b1a09703340606e5bbdd04b40639eb9a699eacfc13544c68cc023911b00ed
+size 7036
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en.png
index e674aec88f..b8be38269c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f63e794327c94cb5ac33a4c6aecfefecd33061d7dae11b0ec69f844d26760c5
-size 6751
+oid sha256:3f12bcd2d9f3f7886d18af3a2744d90ff404e31d76f5b639ceafa4a56def6b8a
+size 6742
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en.png
index fdf537d713..edb7b691b1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52dde3608560c4b9d72f77369bd118cc0afcdc975980e034717be191bd77ff87
-size 8879
+oid sha256:1bfa60a6f0c11fef5b2495d0c6eb7f8ee1307f1b0e26c5ca011ae42974f58a25
+size 8876
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en.png
index 6efcfde23c..26feb79b74 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31373ee4be724122839f9d9d7dbed0727a5f75a816f76edb962d107a281bc42
-size 17804
+oid sha256:3d2d4a34cc7b6dad27e647d8621611327ca44dac4e06a94275c8eb3e3255640c
+size 17483
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en.png
index b54cd19be0..cdfdcdef46 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d1ace89822dfcde7822bc2412787290d64094f6ee82afcd4247fa3bac36067e
-size 6464
+oid sha256:916fa670e5d86b765b01a4304ea57871875170f9d98d148f3c0a2aa2c4c5d32c
+size 6431
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en.png
index 10e2663ec0..bb4ce4a2ba 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:817085c720aa5106231462bdab94c3a4bded7ea64285e42123c2972fb1492c5d
-size 6416
+oid sha256:b4dd558d07a5c122615c6c733532d46db3989d4f1fa08a0df1dc78fd9079111d
+size 6439
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en.png
index 789e6ad754..7dada9cdd4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:936f352e9c70919e2f5d325dee2eb3048b625e77bbdc0ac1685d023c131a7cb2
-size 8977
+oid sha256:edfccd98d79cdd1f16c6d8068a54b752d29f52e7b5cead52addd24bff6be3e6d
+size 8966
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en.png
index 511ec6112b..6d0d14ef53 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd9e3f62c47e3cabeab49a3ffc6cc4ebde8c5baa03c5997dd9796a2eec3fd420
-size 6297
+oid sha256:6868dab8f078724ed45df7b8f391a205ea373bad58d80e33d8299e279e063a33
+size 6317
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en.png
index 38469923aa..095a3410bf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b6bf627769f2bbaa1c76142e7f17f5c7d5b8c3e1029cad3d498085d0764cfe6
-size 10035
+oid sha256:72cb0735391078279290f06c187c910d0929f3de2736aab5426ca3265f2088d0
+size 10018
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en.png
index 4de0e3dfbd..87fce6f844 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61171fff9c238017712540f8af20e75cbfb4a2a5e87419a43f3332bc38088f47
-size 6027
+oid sha256:93c0b838dcb60c3a5ccadfa4ef821a3478dfbc541edaae767f33ff25bb2841ca
+size 6018
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_11_en.png
index 5e3ac6761f..fbf2c4fed5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:672eb3e8dc52f074598d0425b039fb829649efc91c4eec741a836fd850c38b6f
-size 9740
+oid sha256:7b38b70e42547fde8c3a291b82d15aeeed46061a6d35d7ba1bc84e02f1772aef
+size 9708
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en.png
index 80762319f3..5d4b40749a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:361324daf490ded4331db68f8891b4fd3b36e6aa26b1436df3024aaad7c2e5d1
-size 18454
+oid sha256:ecd7d668dc9fe5442cad662bef3f27d854c11f3f186d35da9c8f8f59e976e584
+size 18424
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en.png
index 283f6b60a7..be2b979a76 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e4b543edb49c9d8cd38276ecc28d425a9baa50f2e87ca900586341d1275f52f
-size 6943
+oid sha256:3323b411015fe4cab91a492c33db0ded076d69a8327a91af956472f529662130
+size 6932
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en.png
index 43eed1e235..f96a9ea58c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c53797fb625f7aeca30c11204f29afa45f235f652a3af4d92efb9415e5578d1
-size 6692
+oid sha256:bf1ff1acd363de8d5055a10f389f4542798bfd8cd72502cc21caef193eff6671
+size 6672
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en.png
index d72c6927a5..d52f37416a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8243879f43ea8e6709b93292582748448e6a4ed55bd2d6e71aecb0788a2c98f4
-size 8697
+oid sha256:e0094eb0a7870ef9f703c10b90c0d03a9ac9e86c0a70875dc025e63c89e9ecbb
+size 8704
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en.png
index 6f652cf7d1..26cbd5d0e9 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd154b4458a13250e547b5d4d48cbc05901024abd1add7497087ccd6e1e2163e
-size 17601
+oid sha256:ed3dcc9061307803439cebfb2903a1778435e01cf6f0e0f35df89f82a1e9160f
+size 17325
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en.png
index e6aa19ef86..a934693a97 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48ae21d563c8a8b0793fcee2ca31e10e1d5f27a337d86fa6cebf40a33fff335c
-size 6370
+oid sha256:fa841c96088cb4dc2998254a75acb61399301b175f547e7ae69886709ae8b2f6
+size 6371
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en.png
index 4434ead741..1eb7e6614d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c1afc8b6bfa23e9ed73413078bd487c5557bc8c26717cef6c940cc6f0edf113
-size 6385
+oid sha256:c6d6286677b18af00e1a9b1198f0ae9aed929be74bbc122d051d867a51f373a6
+size 6358
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en.png
index 8220e6b24a..57ff1a49a7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8799ed0f6c481130b4f1e3b5ff2c47148e84d5d26aa94559643b82f6db5a3521
-size 8756
+oid sha256:d8c926148b9641484885d6ccabbb54966f5e67a2d9fca609005d8ed8ad7d15d3
+size 8747
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en.png
index 4df564660f..b6e3e269a1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:faa63783632a02ad15b8685d7666f3cd690d7e4507cb68bc1c3e2c04dda37af1
-size 6232
+oid sha256:63edce0142c410df6cace76df14e545b0b9c93eaacdf6707b01c2b16bb78a168
+size 6244
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Day_0_en.png
new file mode 100644
index 0000000000..939a1e2e3b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:369112147d73da7987e671e5c4ad60312946d6a2e580132c0618a343f1feec85
+size 13280
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Night_0_en.png
new file mode 100644
index 0000000000..41de211740
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToInvalidContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5375bd98bf7060ba1c522b6abb7cbcbd1a75beb6957f6049b11c87f81fb06536
+size 12691
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Day_0_en.png
new file mode 100644
index 0000000000..7f01c64831
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08ed7f23b4987ef02f10127bd124d05bad7fb786df99a096646ed8632c45fbc7
+size 12009
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Night_0_en.png
new file mode 100644
index 0000000000..3e040f8c1d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.messages.reply_ReplyToNotFoundContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:282f703a34243c3d4d0aa6ae09cb230ba376c8fa56a3a062ecfa730ea13e9ed6
+size 11414
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en.png
index 9b60b2ece6..0f252b1607 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08a9c400585956485c4a18bafa78ba4fa8eee8b98fce657077777686871041b5
-size 31010
+oid sha256:39eb057c5afa754f2a9f21789cc946901982efb7c29adadab3396680051d7a96
+size 30951
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_en.png
new file mode 100644
index 0000000000..ce070bb34c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48bd7238ff41e9ae218c1b2369a6841ba4462194db0522ae24d4a88e04cc032b
+size 43509
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en.png
index d913afbcbd..a3d08fe929 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e7825e195725479409a23b626771fe207debec55953c0869e5dd9bcae210dc7
-size 29529
+oid sha256:00948f7166eec146c6e7092b4b9562a12fb1fa5fbacb080256ade04e1d8cc1a8
+size 29385
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_1_en.png
new file mode 100644
index 0000000000..9df4a43aad
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12d4fff60ccddbbc45aa2ee15f7191a761e5b944ba990d0c7ec3d8d579b7c297
+size 41992
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png
index 595aae659f..155afe65c3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:684f94bece9c9cc117eef1cdad6fca99bb085158454a890592254f27c57e9b0e
-size 39715
+oid sha256:ae27391650004d4a072211f5bc30aea1dbb05ecf89bbeb9bdcbc2e11640ca470
+size 40365
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_en.png
new file mode 100644
index 0000000000..508d3f9668
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd2ea0586f7878797a56f85c66270dac87b14b22e61880aed33471a9f8a0d23f
+size 38328
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_en.png
new file mode 100644
index 0000000000..b60fb8b3ff
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a7fbdec9b1aeda6ab1d6038eaa46b39dde69a631d85d79cd7537c5745c320b1
+size 44760
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_en.png
new file mode 100644
index 0000000000..08414d12f8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:640f57346441f38bb5e46bf0feabfa570cf59b1a68225621a748415b9bd36a75
+size 30587
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_en.png
new file mode 100644
index 0000000000..c6294e1525
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cfc8cef1b56a9a442194a14616a520b9b1796f92b8f473ef429141135d3fbba
+size 40843
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png
index 847d2f35db..7962e6ddd6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:881a6235b66bd13269103bcc7070e389041652da49ecdba68c6caf151301b6c0
-size 38428
+oid sha256:314ec995682444953e0183a830bc0d56d66dc4121c2b25027c1f13b7a0790f03
+size 39322
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_1_en.png
new file mode 100644
index 0000000000..ec264a01a5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77069a6b3130927d6f9492d170d956d10c1e2394eecc01070a8f4ac2c0c99f24
+size 36970
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_2_en.png
new file mode 100644
index 0000000000..99bac276d5
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5bb7b5108819627ebd2c49e38838bbcef5c13671bb1f27b253a574c3cbdd9d2
+size 43660
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_3_en.png
new file mode 100644
index 0000000000..7dd7e76f03
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27e1ee018a732cf5583007910e3fae9301c734a25276131f74150b180ebcd049
+size 29039
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_4_en.png
new file mode 100644
index 0000000000..27ebeadc66
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbace206ad9b243d1a298e28384a375461a848e24d89614a1f6e24aae99a3be5
+size 39729
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en.png
index 48c6bff9ca..53a2ee8e73 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d81773c99f740992755d35fdeec1720267856c0b201f246cdb4d8442ca4e3063
-size 8301
+oid sha256:8ea61f7938c6ea421ed17a9453a4f678dcae62138132e10a4873a3a56376bf95
+size 32222
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en.png
index ab5e7492b0..ed60c9f00c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ee522d0d8f87577177bbb2e73382d9736178214c4834508f2e7bbccff6ebd9c
-size 13049
+oid sha256:665b0d9f8459e8ff5598c99be591ab37debac8b8ee43b1899c9031c5387063d1
+size 45468
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en.png
index 421815294d..fb38d3a0dc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69e9035843c450cd0fb45ed0e287ad6ff43fd58c12d6f27687e5f19527079563
-size 35318
+oid sha256:d8942307cebccfdab877b05e9b44280f55219973d5443856b5dcb9fcd04a7124
+size 81393
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en.png
index 3a0c862132..b148eee91b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1ae3ee5e7bddb2efe646024f04e051c37d46b24b12f75d861b0ed585ebe8355
-size 8078
+oid sha256:6da76c1b723b5c5a63ed9a712797a1cffe52748bca79e8670f519e920b206e9d
+size 30719
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en.png
index b902ce98ab..c97ab61e96 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8711ab77a43fb6ef26d7ae79bbfbd3d49ae11f4de9d444bfb8beca3b44dd0863
-size 12450
+oid sha256:069d0cbfc6f2d76b4a8076d81d1b17a5c44fbeac1fbfcc5a361c1c386ccff2b2
+size 43385
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en.png
index 68da14886e..c85c4e8fe1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d2e1ab9787c7168f6e7f6ebed884e1dcfe45f2304acb241c2fb0d63abc48468
-size 34388
+oid sha256:3bbdc92089ff3f1c99883c4e65841e20f6baa00f9a785eca29dcaae792ccd217
+size 78800
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_0_en.png
index 0b6cd8eb47..44b84ec681 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b645f3d06de7fed5673ac1b93df45a9e60ac9cb0829a132e413df9188d01cc38
-size 8937
+oid sha256:b63a1c5324150dd49b99adfcd417e8256bb3620b5adf7437540936a0d244bc95
+size 33298
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_1_en.png
index 66625704c3..ba18eb6000 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4019a4116933dc5fe984eb9be639e8a4196df05ad154a6a2ffc7dce4e3862ef
-size 13341
+oid sha256:4d09ab0c7863837aca7cb06c765f404dc5cc3ac0dfd17c50c321a9d3f1701879
+size 45841
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_2_en.png
index 5cb7302aa2..90610ad003 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a00cb76be6037667a3c43f708dba216275075c2b835d42e2063320c6267b18b9
-size 35952
+oid sha256:ee2a956897baaca40efdf0c5da43a64a3708e96ddf4c2e7f214bab03adee675e
+size 82208
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_0_en.png
index ef2fb3f45d..06efc78d97 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59b12c104b96d9c53d9d2ae4f369e3de2217776939f4dd83092e9488f03c050a
-size 8641
+oid sha256:0c87c27f51cbc2afd334f0ab4669844a7c0f204843d80fbc3cc36a8d63ccb353
+size 31702
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_1_en.png
index 78030e568c..015201c8df 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f92b128f85e00172b208f8bf0aa03c1160be64771945f488f5754ea0f0c15816
-size 12716
+oid sha256:0e6b52433616fd337dc531f7bf544565b904380427ee4e84c0c0a4ba3cc89473
+size 43825
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_2_en.png
index 19f3a00321..e6164a3746 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b9a57364c3cd404b3564c88b802d73e98f6d9f50728e16ab07a121a658b8d3c
-size 34927
+oid sha256:e33a8ad1b3d63141947cce850aef7920a5926652f5312dfdb5f50a7dea894cfd
+size 79673
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_0_en.png
index 3d0bbf58eb..4ed385037d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5b5c9b528a7b425b9181c2ee94024d09bb4c4477f7fe54e1d77c0a08c0d2c48
-size 9287
+oid sha256:4e8dc41535d17bd841d6e6fa9b7a0e6a5fdc7eeea7a6f3a1f5bad26750c451bf
+size 33990
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_1_en.png
index 7dc0750153..631bf2a709 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c3fd4ccd645308d061d8315c10a1c1da70a0e33032a50c40d3efe1b558cc9f3
-size 9839
+oid sha256:33462425386e2a7abd05457669a614b1aa229a18722f3616b7680a25411ab408
+size 34702
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_2_en.png
index 603298db3b..527f772844 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac9e0112568d7067b7c439d423c6c282ca35889a64fbe34d6f778e935ada9135
-size 9585
+oid sha256:8ea75008929fede12fea5aba65a4004de71c51b041c066cc37f22866a2cf9455
+size 34534
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_3_en.png
index b2012fab3b..6edbc1265b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70dbcc38e6353a77decb7eff90e0b2ee06b2d9f3c92a688efe09da308e5ca1dd
-size 9723
+oid sha256:2466a08e0ad20bdb9b5832ad526d2dba68151e47f92b3470ae59b1c4368bd2f4
+size 34858
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_4_en.png
index e147449055..04866de054 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ccaf6378995747cb914a89da7c4a74a60b43e3dd5e4e4ec4174069b0ab8d814
-size 9828
+oid sha256:68a8f8da32bf72c51a15a0095b0e5f24c6f06f4651082b1c420d14a52f1042a9
+size 35070
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_0_en.png
index 53d0a71144..7830e63421 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e599734b376ce6c8fe4989903288e2e26c0df2fd27c4f20afe9c5a2f8f33dfa0
-size 8719
+oid sha256:a125a23ba4fcee01370a7fcebc3b68612cf2e9d1099f4c6ec53de39627b2dedb
+size 31929
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_1_en.png
index bb8713cf6e..8c00f1833f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87d86e984ca7238676d5e642b1706894b91f6f12fc19ef5f0545ce6ad34342e2
-size 9344
+oid sha256:35a1543f06d7256636f26f5daf557c2b2ef41b9e287b227dda5233e4cd1f1365
+size 32766
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_2_en.png
index aff2001f4a..5d0eef018a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb88847548a4c520fe5fa7235161c2e437faf59ade57405447059f3f12590468
-size 9101
+oid sha256:2a58694d6bba215183b308cde0c7c97dda08369be56d5d4eaab832a61c968cb9
+size 32621
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_3_en.png
index 77fcada22d..fa61b70639 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3030f28baeae07c89e784624fd58fad8cb4441deb669fa91d94f847e566700d
-size 9200
+oid sha256:bc73b0110e564edf5cad792a9d6e329360103dcfd8c584c2617f8dd88fd7603a
+size 32825
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_4_en.png
index b3cbcc11bb..4f9f22125a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemViewPlay_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3fc0c77a58255fa4d5e5c45d3baeeeed7bed667c5d2b1df025b8805b9fd2b5c
-size 9318
+oid sha256:4eb6911bab641b66a799127486cc6d66e83be232bd4c39fe079d9fb2223bf742
+size 33037
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_0_en.png
index e2cddc5835..4b5365b6da 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aafa8d9dc782dd8829e3cc542a0247173b2b1f7f13f0d2083ac276b88e7708e0
-size 9348
+oid sha256:86d31efa2f03952372e98c700b14a078cb043195ca382df1b03b5e122e91ecac
+size 34056
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_1_en.png
index f5f65eb855..62071f235f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d49c7282b5ec080bafca160e1f257e812ff09ed18852be159dfccc7fc29a5cd5
-size 11663
+oid sha256:6eb6ad3ea6b0dc11e94f85f9348d5a345ca8b210fdde2a92520594985ee0b4c4
+size 42630
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_2_en.png
index d7df5420c1..cabef3d7ad 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae27b73bf52133e75c0685dc584f46c26cddccdf864b01bb242be41bfa589447
-size 36842
+oid sha256:3c034af8daa917ab2cebaa935b3cc671a6c2aad2d90c8bd5ccc9aa31326d2e44
+size 83743
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_3_en.png
index a6ba59d4d3..367286a5ca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26303598b3bdf1a7d977f8d54e9a36810a957d849d4662cd314df5a0f862ce85
-size 7642
+oid sha256:4480b8f55f3ccd5d6e78d014b964efb77727f9947867b08d3d8eac774bb0aa92
+size 30915
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_0_en.png
index 5982076411..c01698f39c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bc8b9d98e0fc0a2ec522c74988e9461e1e5598dd232362d209c7d8c10fd008f
-size 8785
+oid sha256:975b1dd40fe06055090bc81052757596bd7ccb1c2ddc85aea1b22a6d5975fd14
+size 31999
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_1_en.png
index d87fa0e77d..36c927d7e0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25a37d6659117fc81de7e7131c503089d9091ab25fa408ed4305fda13c926014
-size 10917
+oid sha256:988d206940cc9c746cd5b3d1a0df8c11e81d3e4e3e76477fdc520a986435d2ae
+size 40135
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_2_en.png
index 5fdc8077a7..406b599114 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cede06219d43d773b4e1ea81c7c81ee9c28c6e6d002687fd3133f9d7df4b9c0
-size 35125
+oid sha256:ab1bb90f13b14f91fdb17d7d6934f95995597ebbc0607ce500ea2219f6e9de56
+size 80340
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_3_en.png
index bc1bf1c7ad..64b81900c1 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery.ui_VoiceItemView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f924b3e7b7471c973719e2d33c3bd10f9bb63a4903df4e9ffcb5c9c1bd7e9ee
-size 7249
+oid sha256:dfac79dcfb2493a6028ab4fdf7d9f27129ef08399d7bc78ee7ec388c15feeffb
+size 29093
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en.png
index 68a850744e..d9f30b5a5e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5832d2a257dcf613420352d10c42e058ca9df0afa323f2a6bd91ab6596240e5a
-size 528252
+oid sha256:b5bb8fe5d28d0df28c25c633d5e37aa6245d69e754e3ec543d855fd4a64517fb
+size 448654
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en.png
index aa15a1f8f4..bf10ab2427 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91da9a2b01eccb0451288e153d01d159fe80e1b0b2c5d366d74622af564ecd33
-size 33157
+oid sha256:dd2e24e40cbf4a576c245538e3c0578c8bd3d7b44c9ff57efba5bb6f32358d0c
+size 49851
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png
index acc977cd8d..155afe65c3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9dd2d35e1c0a3b3a9576e35b8a5ad4a3d08441b8257bb48edd0a0816c9f24c68
-size 39634
+oid sha256:ae27391650004d4a072211f5bc30aea1dbb05ecf89bbeb9bdcbc2e11640ca470
+size 40365
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en.png
index c6267965cd..63afe83d3c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5fbccba6548b6101f50f3842310e591507321817b048ec9a7310203dcd868d9
-size 524645
+oid sha256:ece2446eaa8417ce67a32589fa2901a8e2c73b6475b46b1bfb895ee3aacb6937
+size 445037
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en.png
index c3f0453d99..670b03befa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d60dd5ae119c4c020177fe37f54a9a2c8f05ee1b9133d3f04c5eca125bb1f43b
-size 31703
+oid sha256:0aa19fc5903e5a35b3d8c218faa6acdae63c2fa7a45481b0ebd0cfdf7c8df0f6
+size 47550
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png
index 47027cdf92..7962e6ddd6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa2ca41cebe2e37843f74319a56f3c18103929f06765f0950cd1945440909e63
-size 38223
+oid sha256:314ec995682444953e0183a830bc0d56d66dc4121c2b25027c1f13b7a0790f03
+size 39322
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png
index 8ca8df6e8e..cdb602aae4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c7dea18de5eabe820fe8670cd09d7b68160a97f31e4f1c474c790d829854ef7
-size 25291
+oid sha256:2c2976543550c63540f3e4533685e342ef5775018a37f5e282bf889e42c199e6
+size 24955
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png
index e7f7345c31..37ecdb10ac 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98b39ded83aac1bb5befba6749c08a328b6855bcbd491c1a2f669c848ce72c31
-size 22982
+oid sha256:478c8ee2d55bb2a9f99b8d83c6e0eb0b316237ff1a60a6a735b5eb06f7ca083e
+size 23029
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en.png
index 086f166d79..148d707197 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f7aa184c28a4281a30a443b208bf3f64d9a0f85ad135ef50c999d40362c67d4
-size 24670
+oid sha256:c8eb14a3df5edff4af450b39224e6af6efce20f0734119835e6fbec210491412
+size 24251
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en.png
index 86ab39550c..e62cdf3ec4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e13b61fcb56fbd64064bc35628957cb68507efb7fdc25280d6dbf1e6477addc
-size 22637
+oid sha256:d684c9ed8b2c38cdf7017194ca656ca8da161ab0a40ef3270c6e3988d8e7f144
+size 22664
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en.png
index a094305aad..fcf2e1f03a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f520fc8eac5e100bc4e8b0bf0c84e615078dabbdf502411e6dca5a4d579cfcab
-size 12255
+oid sha256:71381d66fb321f01d6d874c025681489224626ad9700c0f15fe619f73f1a648e
+size 12532
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_en.png
new file mode 100644
index 0000000000..779d297fb6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb2ac4d88f51c8c1718a525a5abeccbe2bb19df75a100d504de0cb106ff3117c
+size 13857
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_en.png
new file mode 100644
index 0000000000..e3e7f9da05
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3eea2cd53364f9d0c85b803c8faa29f083f9db59123ba6e980a79bff7779402
+size 14113
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en.png
index 3692cfba78..b7daa3bf21 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79fd6fba99568650dcbdac47a0ecfda6faa2cd893ded73d5ac4cbf852b59bd63
-size 11889
+oid sha256:d834acd383dfe8da50426e28e267a1076e5634fc2f96e1e7593cb6a05988600f
+size 12074
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_1_en.png
new file mode 100644
index 0000000000..f2a9faa5ab
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a14ccc9724a15a7ae3f477a8cda366be345acf10b7a98ce63c4889bc1708844b
+size 13379
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_2_en.png
new file mode 100644
index 0000000000..bc3991b8ce
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.file_MediaFileView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26e4aa8610c1dede0d1b637072e773b5c46fef24bc436b9e7444e26f3ba9814c
+size 13689
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png
index 67fbefb086..ad12fe8923 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbd0574dba895e157ff5b69ab23f3b389d280538810b457d2860ae5d77331705
-size 8256
+oid sha256:2b55fce1bf0d6b764aaed8eed0fbc1416c5aa1c5b6160775a641dfa10addb227
+size 8231
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png
index 6b140844b0..db6b026090 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e87c0990dcaf2511a2a0573a04bf14c6a9a7d24e0291fed18aa3a9ea28da572
-size 7543
+oid sha256:4ca666990cb421602e21be0dbf4ec075e8d3e94f9835464923bd31d2414d9d57
+size 7594
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png
index de0bd78c7d..e40d0af8b2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ed14962b63afa972c68a53d2366b9f00906bab2f3436220bb28643fcb1d56cb
-size 7668
+oid sha256:01726f688e5149a460cb1004dff0c7700302a3fe7179829603625dd369b20e78
+size 7659
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en.png
index bded2caa96..65f3240329 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a50093fb47b3b17a2ccd1aeb2a10fb6b5d368add8f7d458e50f0cc8643128b7c
-size 8053
+oid sha256:8c30a496415f6c00f5ce3a01c775c78994992efd68b2548ecbb5b5ffac054cc1
+size 8041
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en.png
index 7030c0a8c4..039388acdc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a45336123e1eec5ea4b21c6932c1c11d6024685f736454e585a0fb6e6a85ccb2
-size 7701
+oid sha256:10f58df934f372a3b8c68c8e0c4ef61e5bfef242d65daa8f34f4999249bf9e8d
+size 7799
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_2_en.png
index 41449d52b8..f9f1b8195d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:174f9f97fbce115d36fc5124d3301bd148444acdf24bdc933b5a3fb0754c883d
-size 7545
+oid sha256:6d452b48ef65df5257eb708553d667bee46b9d83b1c29a07119c54e342cf1bc2
+size 7527
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_2_en.png
index 511027b648..99b5263e02 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94b71c47da614e247f1c9bbe6df50ae036c5587b964f4df460859927d4807d37
-size 6154
+oid sha256:db3ad4fbd7c140588ed40887455e3ee6b77968ca8682769826f0a447d867ac2f
+size 6115
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_2_en.png
index cf25daf7f0..2c843d2676 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5d66ac02ac2d39125c26406f70880f2b58f3ffb88569f19b0e5104a03293034
-size 6097
+oid sha256:8b91198bf6f1cc53e13eea6c7092142800760c7103349c37ca931d722a549616
+size 6064
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png
index 9b62306041..7d18f051ef 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed8342b56d749db4d862aaa82d5d312089494965c2879adf18e8fd0c94f8525f
-size 13476
+oid sha256:d5c4ad66332bc73642009c013cf99b4b67dfe22d34dfe9db5d30e18dbafa2f10
+size 8905
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en.png
index 72bd9cfb6c..ecef82ecca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04a62974dd81e0786127501b8778f9d302db38a27c984d1b403884942d43accd
-size 13209
+oid sha256:921ac0d2d3ced6fc6c21c3fa82c49a783bf1c1ecababbac8d07364c5ee5a2573
+size 8727
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_0_en.png
new file mode 100644
index 0000000000..9c0c4b40f2
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d834437c7049ec9d81331b382c4bf0cdbc603de8e403e0addf6a4947e815a6
+size 700141
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_10_en.png
new file mode 100644
index 0000000000..bcbfc91e12
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_10_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:398c2908d73fb30117ce917b25e930c578eaf2da5e0c41e126f262f129bda8cc
+size 699710
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_en.png
new file mode 100644
index 0000000000..c45563c143
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a9b7b0c427f40aa8f0a61025fdcfb8093c611e15ef10f22576545a64c6ec35c
+size 25286
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_en.png
new file mode 100644
index 0000000000..99f5bb1dae
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89da32776c436ca00045afb76f42c5f0e5c59f6d682d59a3204461b10ea95474
+size 26617
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_13_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_13_en.png
new file mode 100644
index 0000000000..9ca317cf9d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_13_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d265f0c3fe5bc7f5a6e6d6cfa022ba16ca770b65eeb9a742ba250ff55c4b066a
+size 207625
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_en.png
new file mode 100644
index 0000000000..71ca7c633d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_14_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47c2e2194283803c55553c0220400ed8991539f25b772e0dbdde6d5defa3d3d4
+size 7343
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_15_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_15_en.png
new file mode 100644
index 0000000000..4e8d03c6a4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_15_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1e56f491ccc4c9ab82dde36a8fca588bdf037fb59b70ea47ffe13a56e22f801
+size 4457
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_16_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_16_en.png
new file mode 100644
index 0000000000..f9fb733b8f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_16_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be416c0da077b81dbbe3c61c750bcaa3398150ac3444f1f9a365709d2ef647d0
+size 185717
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_17_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_17_en.png
new file mode 100644
index 0000000000..2e580e55a4
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e8ce597c240a7e72b6811537b6fd24e1bd38714db0ce074377ab3f16eaf0436
+size 656958
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_18_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_18_en.png
new file mode 100644
index 0000000000..db13b64ba8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a8582605ae13be4b4ee00b5e2156eb4fc939174744bd0ef467bb21eeffe8009
+size 679515
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_19_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_19_en.png
new file mode 100644
index 0000000000..59ad8d4de8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5a5a84faafc58b6315237373a413ddbbaddd9b2495bf842882d20243daf6d50
+size 680730
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_1_en.png
new file mode 100644
index 0000000000..806a046288
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06735917160f8f210909922ccf765b806c64586853fad685634a006fe59af974
+size 700189
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_20_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_20_en.png
new file mode 100644
index 0000000000..2f1f448778
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_20_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62493d73c48e90e4bd55142594de567fb1543496c97270fe29086ad7a686557a
+size 679273
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_21_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_21_en.png
new file mode 100644
index 0000000000..f71ddb8758
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_21_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d3b717ce973ff874713b965cfffbd505d939539172002e0f80f6675eb38d9f5
+size 680008
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_22_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_22_en.png
new file mode 100644
index 0000000000..96c74d1427
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_22_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efe53473954202132a757155217a3a7dd3c06b8f69da4437dd82757fca2110dd
+size 682749
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_23_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_23_en.png
new file mode 100644
index 0000000000..96ee2aa0dc
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_23_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa4e4a853c228493b0b2f65bfb903d471756ca669446cd62395fc0afa3ee47e8
+size 11997
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_24_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_24_en.png
new file mode 100644
index 0000000000..3620fdacf9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_24_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c23fdfa983bc6032756dfb80149f8f39643215eab97ddb8d9c843401262bfc6
+size 20022
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_en.png
new file mode 100644
index 0000000000..88e1c15416
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af91214346ed087a8cf936b9ddc5b78e8840a48f6dab6b856ad79abb5fef1ea0
+size 252778
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_3_en.png
new file mode 100644
index 0000000000..cc94e583b8
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d54b2bccd0f5feb6de0051d66310deee7a776b479c8982d634cf2ace2e153d0f
+size 679587
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_4_en.png
new file mode 100644
index 0000000000..e705db22de
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54e3011eb38f3c3e21cf64e4a9e0ee4d0c96bc0c2705975ae06dbe7422e03fdb
+size 212870
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_5_en.png
new file mode 100644
index 0000000000..8311ff7878
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fcaacd813136d9cb22d0542480fcef2be05cae7ec44c0c3683874086e1c7a4b
+size 184107
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_en.png
new file mode 100644
index 0000000000..7510665188
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3403da236e7e9e8a28001adcb0f5c188d79bdf83146b69e8094b37e02627b28
+size 197245
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_en.png
new file mode 100644
index 0000000000..d78b959356
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_7_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9f402d6f56e6b9eb8d46add584ef28bf88d4a6c16ae050b7773895faafa8d38
+size 197707
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_8_en.png
new file mode 100644
index 0000000000..698903e181
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3454f97fd3811411ea5cd941b3d1e37a0f5ab98b9ef7475fa2c903c2b6b089d1
+size 210375
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_9_en.png
new file mode 100644
index 0000000000..6f49e5ee89
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerViewLandscape_9_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9dadffc89e0a66b54a0e6b94006f392569e1907dda2c6d0b6134aad187ff84a
+size 210913
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png
index 03f85f5233..0b90eca670 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b5af8a5aae566e72e0223d40a5978ab191911c68739e417503d8fd5058f19e7
-size 389408
+oid sha256:f17669c1a3a65bafa5786ac23245117b6956d154a4ddea2e95de9070a5bff07e
+size 390004
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png
index 7aa5cf885d..db9cb01f26 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aec4a5e70320024eb053c56445c226758818550745f2d2ddfec16721e43b6d90
-size 388674
+oid sha256:2bd5c7a42aebb6c2ebce9a529bafb23145e5a3a1d10270385386ecde9ca03c19
+size 389486
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png
index 47027cdf92..7962e6ddd6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa2ca41cebe2e37843f74319a56f3c18103929f06765f0950cd1945440909e63
-size 38223
+oid sha256:314ec995682444953e0183a830bc0d56d66dc4121c2b25027c1f13b7a0790f03
+size 39322
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png
index 4094507bdd..c38069d18e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e53770850ee2e0d011ed91360a2c02abf80b27cc2cee66699331684637d469a
-size 30960
+oid sha256:4c9c5240346788914d7ab6a825c38f6fc2d6dba8bdc2879c2657cdafe3718b34
+size 31511
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png
index 89b6cfbfba..430511e490 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c7c09c4ff8e66c23d3cdf5c79ffe2d3305d569e3aa1e239dfbb981537e467cd
-size 133920
+oid sha256:d298f8dfd834c532f3607ee6d23600ad40b877ccb6fe08a8297ab094a457f20c
+size 134789
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_16_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_16_en.png
index 9836fe106f..7ff9c8a971 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df718693c63e4de07d17486a80103240f8f2d56a21aaf1a2b18a9237f105364d
-size 113630
+oid sha256:730cffc57e88440ec4607238b383e68aada1907e6f9829a3bdc4bf8a467c1788
+size 114080
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_17_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_17_en.png
new file mode 100644
index 0000000000..be398e06bf
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_17_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2adfc04e0f7999ba861bf931b853f068067387558e81464e99caba1c2445a3a7
+size 444811
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_18_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_18_en.png
new file mode 100644
index 0000000000..6788c98af6
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_18_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9fd18a67499a6a3d9d12dea3fd5bafa45ed2e380fa0658ec0da004e50d7b6c3
+size 398823
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_19_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_19_en.png
new file mode 100644
index 0000000000..86a3fd29f7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_19_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47f12ee4d355cda76dbe58bc3d6a6af64e0e076a973073ada1930195bcef0c23
+size 399533
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png
index 5b86c94b5b..aa35a1751a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0ed6080a007c98867a5c4f9b32570ab3042b34030b5210867110374064ee8fc
-size 389436
+oid sha256:9d8a4b42d3857ddaa1ea86d4ab3a872c5fa0014061b2a116895616bee25424d1
+size 390037
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_20_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_20_en.png
new file mode 100644
index 0000000000..3ceebdd6fc
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_20_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f65b6d5297d4c7c4904da07659bc8cdcb866418b787ce7a116b0b7bafef2690c
+size 399331
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_21_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_21_en.png
new file mode 100644
index 0000000000..3c6eb97e1f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_21_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b0009b38846b314925ab9a8ff6994fc99e156ada817a8798ba5550bd12eb8de
+size 399156
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_22_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_22_en.png
new file mode 100644
index 0000000000..7f27c3422a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_22_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c4d7f3fdbb0c331ef19f4481ab128b2515e6c7110b40ba2734efc44caa3620f
+size 404812
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_23_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_23_en.png
new file mode 100644
index 0000000000..e5ac12f739
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_23_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e85ebc527d837aa3eba64e14b39cf7d7bdc9e08eff6b1c473e5698f879ea0eb
+size 12389
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_24_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_24_en.png
new file mode 100644
index 0000000000..0193d6c61f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_24_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2d3fd5b70d90864b581d71b064a684f1dfbaa368464c32d259dc418a4ab77f5
+size 20821
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png
index eb7fa67df4..5663001649 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4feb42b25bd952a0305ad2b1c4cab9934586693d804336e1ba23e9b247f712c0
-size 94961
+oid sha256:1c4b715349adcfdf5c3cdd95844846170b43dc191801156b2e822f0eaeb92033
+size 95392
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png
index f55ed35a60..a737a9e582 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaf4fb4908967c6092de9be0d7ca33108f0f507605d7591395a08594763fb0fe
-size 396202
+oid sha256:9343d4b20f7e676ff52f8f48a046d70b8762c6901ea2d6cf254eb6e447397c4a
+size 398255
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
index 8a41530aee..f318a0eb96 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb6999796f9275adce6b5e05b362649cb738c759af649f7bbb9c0ff01548a579
-size 131776
+oid sha256:e0b66b9b49be0cf623679062eb5d7fc8e0c26523e228522927d26ebdbee9ac4a
+size 133376
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png
index fbddf16dfd..56e01cbc01 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04ba5da6b618ae3abf4ca06b4ae1baa13e46673b0be73ada2b15cefd79063122
-size 112146
+oid sha256:3aef5ebd6889b0fc8345db6aefeb6d2cc26a5a2349632dac2e258caa87c28b53
+size 112850
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png
index f13a902fe0..3bcf436edd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8273abc2f10e6c42a65fb6aef2e237d58b6e4d858df1f35be255b7030fb63c44
-size 123522
+oid sha256:9fe5efbf527ef99de18a44e05edb9654b5bc58c17a2fd2d05f57567fbe27ef2c
+size 125021
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png
index ce0848b5b3..347c05b83f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:456dc57223044ece1f4136dc01765e41a0b649c827ad6e6b08370e53a7015dbb
-size 14378
+oid sha256:203bb59909a9adb94eeb51d63d8199eedee93d2f1d257572e779af9ada9a8980
+size 125404
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png
index 06e1c13225..0f87d86340 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5fdeb06fb15486d2d4949a38da2f6eed5ef94a0386e9daaa83a6b00bec9e392
-size 137096
+oid sha256:9f3f46de75cee217874e2c57b390998136a19d32613ea33a2e303541a4fd165b
+size 136770
diff --git a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png
index dfe63cccae..b3740e9938 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.mediaviewer.impl.viewer_MediaViewerView_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b64a6f9fe548897b6b34961bc077718265acdb8f894d5d2d697d5409c633368
-size 137247
+oid sha256:039749e7d726be826927bf69a89e3676a3f60ee60a07e8754b4376a08584af0f
+size 137077
diff --git a/tests/uitests/src/test/snapshots/images/libraries.qrcode_QrCodeView_en.png b/tests/uitests/src/test/snapshots/images/libraries.qrcode_QrCodeView_en.png
index beec069b37..7eef6a2893 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.qrcode_QrCodeView_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.qrcode_QrCodeView_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c07e9a4ec69a889b003bee4293a610c9fe0fd0f83c10c0da01322e076e9c980d
-size 10750
+oid sha256:a8cba2cef4b9bfc962783765544df57930f62eea322078a10969487ce08e14be
+size 6401
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_2_en.png
index 051db89ece..88c43c729c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d06e84c695086a799c8377bcf48869675b98dcadd1b5320e685d775589ac40c7
-size 30950
+oid sha256:e9dd0c6858e4cd885d05aedfa92797c9aae6d56fb0b60268ed59793524121465
+size 28962
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_3_en.png
index ddde486abc..2e4c86a4c9 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3825e3c312d75a865545745ee00b64d8c2259e515dc45fad64236963e91f2427
-size 28999
+oid sha256:2f2601edb209c898a03dbbca33c963eb0ded0c8f1258f145d743b263e99b8418
+size 26945
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_4_en.png
index 821a37d7c0..4e53ef31de 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b0f7e2b97a343d0e1bedd9595a1057a03a4429c3fa72613451ac86a7146392a
-size 33382
+oid sha256:0ec941914c0e4a5d4dfe376a6f13b4330b46eac3fc1c31708ac0122a3e6c1038
+size 31129
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_5_en.png
index c19c6f4fbb..dd7e2b791c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cccff3215bc81e2a6491f3b0da3f4d8997179b54c698f962eb245f535e6cc9fc
-size 28655
+oid sha256:e3663eff19bb6c270af51109248836b8ee8da778538406ae2b67d10a56263d05
+size 26639
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_6_en.png
new file mode 100644
index 0000000000..57ea66e527
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6511dac276623acfccbdde7f8b3f79930107b5e386b8e60b3d3f5ec733a41202
+size 30781
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_2_en.png
index 97ff3939e2..5a6fe4a2c0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b38450dc7cc24e6f9a0db829aa11058d10ae45d433945afd534627534f362554
-size 30261
+oid sha256:014b95f94a6a0c7711146df291fb22a49fde5e98c8584bdb69f3cb4f0b626e36
+size 28375
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_3_en.png
index 1c3dfb9480..28efeca99a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1b36608e269c7572c93c6f10cddeaf42bfeba404c6699a6e050144bc28bc55e
-size 28569
+oid sha256:7cf02e53cfcc806cf02c04ecf275abc84265401e2a4e6ce4ebfa64e1c4e0f9d4
+size 26519
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_4_en.png
index c4689af159..5eaab7201a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96f198461d8d60d8610f337c3dbe90bebd8c98f32a4739310532d629ca336a1f
-size 33113
+oid sha256:ac935e780ea072953e6e15edb4a845605ca77776d6ad50c5782018ee5dd84d5e
+size 31120
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_5_en.png
index 5301142de1..736e9bc843 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12350783e27c09074bdaba2e74ac445b643ff6a13251c13a7cdf98999274325d
-size 27915
+oid sha256:52be506a4811614853b5c101907caddaeddde4a9147e0f6ac0a3ce31610a3612
+size 26020
diff --git a/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_6_en.png
new file mode 100644
index 0000000000..6c89cccb0c
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.roomselect.impl_RoomSelectView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a05353b7037ed03cdcdcd5821533d9cfd766e02260e9838eac8c7d86fc91e1a
+size 30328
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en.png
index 8808b06521..678b74ef59 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37903c21d648cbc2e761b32bc822bbe4099b8259e78e3a5b75f5677f2979c20e
-size 6208
+oid sha256:22ffc77f78c6453a8719f8112fbf9bc97b41bbf9b738f701764599b4b8aa50e2
+size 6342
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en.png
index 42b189e5be..7172c3fee2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17b8d1408828a857eda20d194c342bef45151a141d294ba8df756d9b860e6d98
-size 6008
+oid sha256:5a5b20dcdcda35f57296a96cf44ae67a0e9a7798a073eca0d49380d93e256606
+size 6133
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Day_0_en.png
index 627828a287..3acdc88bea 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e171ced0a7f9994d1e9addb093959fb455727d81912aecb377742541181535a
-size 35733
+oid sha256:c9e68f504334bf51de555c27936d2561f3def8c7920189512594b74ba9770105
+size 35720
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Night_0_en.png
index ee87ced6f5..ed7123fb14 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanThemeInTimeline_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba17ec26a4807e2cad64769b98140e2d77f133e39be72090a1f44ca143427833
-size 34106
+oid sha256:7523890541aefd0f65533247e0bb0b5c306946b19ab7d27cc8ff0d6e69e85478
+size 34166
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en.png
index 140398dcaa..aaabcd8f67 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8366d3c9ea45d6b7e24184b5ba9756cfcfe8a592ec19b107be1168b307840192
-size 49433
+oid sha256:cc5c6f3dc41efa8c969c70ad36c1c4ada0feaf279767d0e2165a5837f568e2e7
+size 49441
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en.png
index 0c0a38fbd5..508c21c942 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79cc95b3838f24e85a87d5f0116575ad74e2abc03b77a28464d7fa82fb357840
-size 47343
+oid sha256:d091d25da896e86e0851cd3d440f7b4b05dfaac6240d9639b06e9e362c20f5ca
+size 47304
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en.png
index d6c10c053a..619a252212 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f108e1a69cf971588cb8d344fe0d908b0f175619f5d81d9fb43946a3a337826e
-size 18521
+oid sha256:b18bd93355bca3cbecf9534ae91959204cdd84c399671ce56782c61e8e5c69b6
+size 18443
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en.png
index 6b176577d2..d990287ad7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b4897fe30d6fe2174a2272788b29e087ef63ec777886fd5ca556575137060b0
-size 17368
+oid sha256:1aecd66da70fbf9a065a813951e6e434d0191da0b1a4e7bf9b4f466116e8722d
+size 17159
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_1_en.png
index a5dfdf516a..e5602cc913 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e487991c578b7e3da4aa85c6b927716be10427c13db9ef65c2b784358f8f3eb4
-size 11276
+oid sha256:c9e491bd12948a77b277e16594ce6aea80e7eddf0e2a2efb27e87546f156525b
+size 10909
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_2_en.png
index face9cac29..bdf129ee4a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3434cec9678fed9ef856f82ba8c403ba4f910d2997d05b7c2ffa9c71e5e73d1
-size 18588
+oid sha256:63f992f8496bac188c746dfc000f3d62d9f88c08131110d5977159b72d61169a
+size 19669
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_3_en.png
index e10dd2f7f4..679685e936 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df36b9a00bc8cb59b12d679dfb6f64da43e77c7dd623fa60b6d4b29f7e00009b
-size 7936
+oid sha256:ee086e521812765d474d094157c0311f48e2a3feff3bf6756be06974114c020f
+size 7734
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_1_en.png
index ef2f8bf31d..e26ea57b89 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0e7a2ab84947138437d1cd523a1a00778b362c9bb48679d6d15f1c8f1e10f9d
-size 10841
+oid sha256:4532dceab59523019eb7e0ca944c3c50278ef91eea6d6dc194bda743b9511fdf
+size 10528
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_2_en.png
index d103fa0c98..60a8334d91 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f53060ab0874d769da5864efdb8f4cae2635fcaaffe95444094351941c904f80
-size 17941
+oid sha256:f644d1b6798c3761b0a16924a697cc653f31a090bab723177e40ec48131789a3
+size 19008
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_3_en.png
index 35d047c438..9ddb94878d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_ComposerModeView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13ac54e860b1fdc289a90b89f78ad898a87c0bdf402d9055872e9974dda1c94d
-size 7738
+oid sha256:bd1cd65b9fa83f0dc89331eee859ce08a3ac9444c815b4ddc572fd2953d38085
+size 7459
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en.png
index 37f723e839..96215547bb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0bcb9f9715c5ecf3007c2128f68e040512645c5db10db1adf6cd2bf118d50b5
-size 50279
+oid sha256:d1622f9765fda65985a369d6958f7a5993696dd629c0c1013c0a1647cfb7b562
+size 50109
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en.png
index 02237c1549..70d41498a8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02bc44adb506a0a8b71ef96d8f3d5b9ce0ad2ec7dc9cba27eca8e0bfcaf804c0
-size 48113
+oid sha256:a94de003f65d2fb30ab42e4ac60802707abf1358b0defed7598a3aad69992f40
+size 48136
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png
index c36a00cd27..c17cbfdb66 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b170b771205f42a4aaf6e23b1043cc2b7ca591cc940fc729f8c7ca62e1778ccc
-size 51327
+oid sha256:fdab4bea33337547250355c29991f45c118e8c2c05abdf69b1824475feced5d6
+size 51241
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png
index ed3fbcb332..ef9c49d6c5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerAddCaption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db1c5fb588286dd755213c2eadf23488ddaf9eac7e88585a339484511382cd4c
-size 49522
+oid sha256:0f92c594febc463911c8418deeff3b94e5a8ce4171461d812a0f4f527ab0cf8e
+size 49245
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png
index 4d6bf8bbf9..d5595c72ab 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:008f560c95d92128a7978478563d47bbf57bc0ed1d165f69c60f3d088a8b1798
-size 41741
+oid sha256:74806187f896f73b640c7401d5d0f53ec058ef788cf85d71859367057fa1ec1c
+size 41383
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png
index 44fd390226..94f878d9a4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerCaption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e8f94bfe6ac910599edd6d2a49ed0369e2304dc589cb574cbf095157e2ae507
-size 39148
+oid sha256:cefac2bbe8799850080d74b48e437320308d5e0c8f6435b113964293ffeedcc9
+size 39145
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png
index ea61e45a32..9ba3d99527 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5de0b9b9e57b29ea1db60e136654359a05373788ed2ced2036fb536ca20d74f5
-size 50358
+oid sha256:81d8acdb1158c3e5c19b5a602e3b9afe7643f1bb77d43f51d3f5c4327478a76a
+size 50282
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png
index fe3884483c..969e5b04bf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditCaption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc2fcfae3ff423b0c805a24f46e42a3321830a160f42e0d82026da1bef6cebcc
-size 48490
+oid sha256:c225ad12c5a32e2392606f9afacc6dbc37478a141d5485e4942012c6b22ad052
+size 48046
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en.png
index e4cd320317..a0192f0890 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f26a02838efca6a91ab005822913eb770e9cf06799653532905814f97848567
-size 60599
+oid sha256:3cfb1d8b7828692d5c318206770f9484822a1749b3e80a618b502811cf512d76
+size 60489
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en.png
index fb52919dd3..c745fa256a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:008f75cc5a2bceeba54406ff74c2e5541ebf7a39c00489afd941cfcc79e6ada9
-size 58085
+oid sha256:ca67409e4af247b43d8594d6351419cd12894485357596aff7b26745e2df009a
+size 57687
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Day_0_en.png
index 37f723e839..635e14be9e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0bcb9f9715c5ecf3007c2128f68e040512645c5db10db1adf6cd2bf118d50b5
-size 50279
+oid sha256:8b3a91d104a5949dde83ac38b3127afa342816c631a1e29d78e2ada1bcc906bb
+size 50150
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Night_0_en.png
index 02237c1549..573b6123ed 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerEdit_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02bc44adb506a0a8b71ef96d8f3d5b9ce0ad2ec7dc9cba27eca8e0bfcaf804c0
-size 48113
+oid sha256:69c281829fbca15261f196d2134f933b789ff444cd7bebc88d05cdbb7553357f
+size 48012
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en.png
index cf5d4dec00..d50fb01949 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dbcd0f76ceb070d1a7b3f9a22292b37c5bd9fa005915233db7bcb8f45d4ccef
-size 61775
+oid sha256:7af3da131c81a7e76319bfbf757c331dfb342d5c556a8d6eb4234e0779b156d2
+size 61830
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en.png
index d7cb6108b0..4074caa168 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:335853740399624113c6e83d2cbc411691eb74759bcdcc1575b7fa3d10ad4ef6
-size 58751
+oid sha256:023f50c3ecaaf2879d054c3a1bb825adbefbd30c611fe6400a1927180b63f75f
+size 58950
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Day_0_en.png
index d04df1d38c..fa1fad9c0e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8cf7ee8e457e03a2abad0419fb8466f3f43b85abeabf705dd7af412dc4e4d45
-size 51250
+oid sha256:e0f8b6bdab8df8b2c1aeb70da681964724e0c2adbe4ba0cc22029de944998291
+size 51221
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Night_0_en.png
index 9b53a68b10..022b7c0349 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerFormatting_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6db26883ef045ff984e8cbf6256a01b8221825efa29b82364187c6b4fcf9d2a
-size 48653
+oid sha256:112e5cb4d2cd8f5015ab01f2c2011ae8aeb60be274a239e8bad8953d96bd2c2f
+size 48537
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en.png
index 9a10ba343e..bdd255116a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ebbb431d291ee5dd9cdb626e5a14c234fd3ae2d1b8d8b969f2081c6b27440d7
-size 72150
+oid sha256:01d65375670bd50fdd58c2b105fecae6efb572df1a23e4d883361fba4ebd32af
+size 71628
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en.png
index 0808659fa8..e3d68e573f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ac337c3f7c15411f092cbf0e2da541ce27f45d3e6a0f0eaa68d76382765030d
-size 58752
+oid sha256:b0477ab88d07880dfef518acbeb6a020122797b4d1833bdf58f7a9a4342d93ad
+size 58002
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en.png
index 7fabc79733..1c308dc42c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95f41eb15d088c3b0dfc88d4f45a3cd094e6b649254db96dc791b37c0bd56823
-size 71559
+oid sha256:dd47b5f29485ade1aa9bbf1ef9f13b0be0b829f4b60f047bcdd616daa5044925
+size 71141
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en.png
index 250616700e..e5feb7324d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bb5cfce24bb00859ba0108dc22a2af4855088611a28bff59d200059c966c7f6
-size 80168
+oid sha256:1affca1d77e8929fe3abe279ae3bde06856313ef8dbcbe335905d50afc6493ac
+size 81821
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en.png
index ff20a49fb8..7df51fb255 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ff3edf3e7a06d78070eb60ac005811ef7a36a7e588ad7054908add73600de05
-size 61262
+oid sha256:658ff95ae679d89fcb1b093617a46f3555bf242d44781a15c2a34c9f5a1a0c81
+size 60697
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en.png
index 5f5af0a341..b566c6f449 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5eb7dc42fda918bdf0023209e1fcdedacd17e963d35d02130c909abed6582da6
-size 60178
+oid sha256:5238f56c1cf3437ea6a8cae67497c3a80acdfd0842e6ab970bf398b422b40ba6
+size 59601
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en.png
index 813344a666..acd556e96e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23cf73c95fec0934219c5c7921978189a5a12741a49255129774e3b0cde66a51
-size 67141
+oid sha256:de7995760d329c8425771d2d2fe461b817ae9b9e305275ca379cf95c1997d583
+size 66622
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en.png
index 454b45ec06..a65ca8b35c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c836e3db5e6debbf5961cf56d00ca38ffe7105c150a65b23cffda79a893b2c2
-size 89141
+oid sha256:4cf390d9a439b6df56e0ba58bef71fb7cc7abd4cd0a96f06307ea8d169ea9709
+size 88195
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en.png
index 4ea874b253..cec8a0b12a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:084829afc78b9072384d7c9d399e13a6246446705be78a07684c5c11497f5dd6
-size 59592
+oid sha256:4112021940576375c6c32c2a5fb04f165368cfc7eb6ebdd2abdb3aabeb1cb707
+size 58930
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en.png
index 35fc3774f7..26bbc77e27 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c8d2baecd4a076de262ce2bfc2f223c8e95adb33e1dd2e15c116674f8674735
-size 59533
+oid sha256:91daf1d41634ff04960ca66a0acfcf2a337dd8e470c7d1f8f4aeea5df11685ab
+size 58996
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png
index f7398ae396..a2bc71b494 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15256a6b4d1fe8e52080b9726cde401944cc6941f7527db1d18484c86ec88023
-size 66699
+oid sha256:236a64de0e67f91d2e3bc7e7442f99fd83f472a4be46c5f449d2e808ce4b6c43
+size 66132
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en.png
index fe65732853..738e779bad 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6712e76fb96f7830d48d4a1e276d42a20548a1bf425ce8049b55e413462741ed
-size 59161
+oid sha256:f7b9c8b0404e420411f22cab257c707ad1b0b50d9c42a35ff1253bcf753fd527
+size 58466
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en.png
index a839235a65..5236db62bf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbc055122bb58e8eb0b0972ca52e1cdb181ef3afd2357b80c2bc24e72dadc245
-size 69227
+oid sha256:9e664f8e6f1e135c0243001e46e41a38ad72a9628c4960445f334ef87498715d
+size 68511
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en.png
index b15f640a90..bc81f67b2b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b5c0b430384e644e82c84581d04a36483cf41dcf6dd625c0295ed95dfe3f034
-size 56269
+oid sha256:0043d71f6d17e9aa6392ff4ef28367e4f3cc9a5c637254b72adfd9c72cbfe3ad
+size 55233
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en.png
index 37bd4f7226..fc16867249 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:902a758672768adc02266bf0227aaf692e8f1d1aba91ba96be985caccdfffd22
-size 68668
+oid sha256:0e24b826fa1fa408e6820078f0bb47fede7cf5d2a2bfae55978739e47084c249
+size 68028
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en.png
index ce2458cb2f..08e8504449 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f777e7d5aca4d2c1a7d2ecc956bf1a354f330f24c5092559ba59f305473cb227
-size 77106
+oid sha256:15120e28f72ffbc1b035509b747d0137d56b6b0520341baad7f8ba090fb700b9
+size 78666
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en.png
index 8fafafadf8..df3b32b8d2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37f5275fabb3ec2cfa3efd533b52dbe4366888886881ad3a659b00aec867660e
-size 58728
+oid sha256:a55a88cef50cbfd1357f51e572093a84e056d0a93a12bd33fb25ba5f370e4615
+size 57901
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en.png
index 9e0f64a82f..d460968d64 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46ad6c535da1d483b62f8b573b329a55fb8b15e9319e3d112299d2ae7c507877
-size 57694
+oid sha256:6531f685230484610a5e12fade57ad8266c431b5a19f7b3eee77c15b75c96e38
+size 56848
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en.png
index 28d8e0a2e2..6dc48a0630 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf851692c986a98e8f7fe989bd691099a8e9cd75da3d7977e84cdc22bb8aff7e
-size 64468
+oid sha256:d193184265e4d575a34a6820bc77482a126aac0c43cfd0bc09152906ef6fa601
+size 63732
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en.png
index 9dff6bedcd..d0b1d953ff 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dad1c1d9ea123fb417553f399cbaa27525c0e4a20a214fb0f81144e5107aa90a
-size 85479
+oid sha256:62e37482c9ace9e4332df8aa650d12c7300a2cab05194b825184dc39dd926772
+size 84860
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en.png
index 8a42433377..c86ff3c07e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea6929e35c476530c462cd4d2ff77d294044e3a5fb2133fe77d91339093ef71f
-size 57134
+oid sha256:6c5edf80cef291b62f4c3f125e3c2e1073e5e6db40de4b826f83aece9ff55af8
+size 56221
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en.png
index 53d7cea25f..dab20f0c93 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a72d17f9c9abd2aaf9a074eee0955bbb3a2ffeb132f680abbfae0dee5d281a50
-size 57200
+oid sha256:5787b8a8b31173fae71bd513d84d02467d154917d4a2d2825424ca868c8bd101
+size 56171
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png
index 9bfed4fc61..523ffd0d50 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7c95c91b7c6b04f2851df6a64de1b10c7338a4d46921a90037fe50cd7d49262
-size 63957
+oid sha256:acf87ea3c8f6db07c1758861d3e4849295538c741393fda18759d7f66225cea0
+size 63155
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en.png
index a9c97db0ff..8b1d78f601 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:465cdce0b01b0044ab9b329629214171f39533f6219d0e7871176899c14df1c2
-size 56721
+oid sha256:25f1ebd9f70c477df9b1159fd92becf0d5ec9139c36c081faa6af862b388e42e
+size 55735
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_0_en.png
index c924d012b6..a7d1026e41 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5124db3fec69ba2ba44bd1ba2e3c7c7f861412637b62de2d4d741c7408ba111c
-size 73253
+oid sha256:3ac4707a32f7680319d1026d9dd6f56de74a95c4a4f990b0c1adf5280fa1a1c7
+size 72582
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_10_en.png
index 7e57b26400..319cf76ebc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10874b3704e42faf8d77661a635551e4e685be1e17cfc7e963633cec8040c9dd
-size 56785
+oid sha256:621b28e55b2a2a6894c4eed975c4aafccf25e77ece0db90621e639c9718adbfb
+size 56478
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_11_en.png
index 186f3dafc1..be729307b0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5f14eac2b49c3ba72ed9b9f6cab21c07a3c1b500e677c5353a5519ac9cb9077
-size 71491
+oid sha256:1f56ca941457d2e53a3659e516a7a27da56071820b221c251ff89a231185320a
+size 70911
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_1_en.png
index 33c260415e..568ba4e7b7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d9ee6fa66bcd2b8f897d2f357c995f0f8d0d2fbc44ab0e8122e0cff17f7f86a
-size 82796
+oid sha256:c718cd9d08c6ff483a2567ff6795803574a873091c5a1b984a08e1873e691c65
+size 84530
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_2_en.png
index c22d0bf38d..9a40df428f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d89ff053d51eb36a5045768ddb45763fbac67829ac256dd02661e8a8dec5c2ff
-size 59808
+oid sha256:7aa00fb0b59a871158c44cb67a4536aa2318e215add4fabf221726406e9f2781
+size 59617
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_3_en.png
index 643aaaae5a..a55b92e8b8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb61501a314ece736f32ec8cc5269e315f2cf3a575e7b0fb3f604c5ec81bec34
-size 58928
+oid sha256:3f4d668e7f9fa7d294cb1de945dd70bfd1b394f14159705ad37c0f55cae2c6e7
+size 58611
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_4_en.png
index 0bb7225a8b..35f2d39b79 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf792e65d65749463ccc1b0a9ea41663b91d105fdeda1ad5498b4448b4b03e6c
-size 66820
+oid sha256:22d2ab3ba2f9e04510e7ea7d185baaf305d12a3548956a695fd72c3d7e181d57
+size 66671
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_5_en.png
index 63b4246e64..437e1acae5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dababe75d96905a844b9ef72d03ec378b70549005951a654b3d792ebd138d40e
-size 101772
+oid sha256:890b7338df518463862560114113d64504383c01c2e6db6800c85c082637f496
+size 101548
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_6_en.png
index 32494f9b02..7562d7090b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b24c435152a26a2938a5774c91e819acdbd901c75b84997849f477ebb2ddc91
-size 58148
+oid sha256:5c30ee7afcc5cb4c1a405a026a4ce3b36e645b5b720b39531c1b8b979e6961ec
+size 57801
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_7_en.png
index 550543f30d..883800c68f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:add4c86c01e81b25f55aa6227533f6be9054f2cb4203cfd39ba6103494d3e640
-size 57748
+oid sha256:1f1e64891abde888d1ad06bfb24ad4ba1aafcc2eb7c9a573a1deb116761b4080
+size 57688
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png
index 8e397b024e..a5ed775376 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27c823be03e6721a4034cdc4827a4d3dd34ac3e9d567651a8ce125cef435b57e
-size 67151
+oid sha256:dc00781c5eafbbc1f574506b7948eb64d9784f6c69f8c0e29be5d120f39b366d
+size 66942
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_9_en.png
index f99d139fc0..4eac81e304 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:882ca19a5e503c3c1143631760dcd061c4fecf313d55f363e3a4c7b9c693ba85
-size 57530
+oid sha256:be145b0f36fb88eb76a15d90ebdd2edf89ec99c84112216ffdfd2bdae9a850af
+size 57204
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_0_en.png
index ba74211c85..06ba9eb873 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09d81b818719edccac051f7702d873a7e5464fe80244f8d6976648eecfd36b87
-size 70429
+oid sha256:9ddb88b02eaed6c732e11dd26e3f45506d037d4e113db171c9283a2fab4f9bd7
+size 69203
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_10_en.png
index fba3827ccd..d9e77e9bd4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9027508487f18ad1c74a48563bd9997aeb49f500f4b5f272e095afe0d38b37a
-size 53999
+oid sha256:1d456410474fb03e3a0bfcd2d737b2f0333e56d26c3eddd3515bcf8031a17d59
+size 53155
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_11_en.png
index c37fdc1ae2..5c44befebb 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d25030399d0eb11d36f75338749689386e00a5100b0d4e9f05f61da5c16ce82
-size 68635
+oid sha256:ebd0a8984dc9ced8ea84180862034c531bd2713dba6e35729d2686921a01b3d8
+size 67634
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_1_en.png
index a83a48693d..f3f6ee2ee8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44d6e39f26502a062f4d2bedbfde36e0010e2090c2a96438cca520a188b4e09d
-size 79673
+oid sha256:eb3bb205e9cf382961dc003ee33248a3dc87089060dffaadee6d2af3c842dd1a
+size 80952
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_2_en.png
index 31307b1de7..a438c1fdfe 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01358cf77f574e16c535b58428392a620b7a1b973f8135bcc7acc9cd12993686
-size 57325
+oid sha256:ee8618bb0da86007b0e50f957f7d941bd5f31332a021e36e7641f95d32dc2108
+size 56440
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_3_en.png
index d3c00bfc0a..132c4d7b5f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9209a8927ba2d25ce458f9acad040374d4818188959a654a52e62e81ba81da01
-size 56423
+oid sha256:b912c22474b75a78b951a071b9217e1fc25e2f2d49916a4724399fb898c4a4ef
+size 55462
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_4_en.png
index c293a6ffdc..9da26c1c14 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60211550a5c617e356a775fbd3daffccc06c4d2992e30bc7c38baa7a18babf37
-size 64104
+oid sha256:99e13306414846ce38775a5b681562f6e79d2e8d860310e4dda1d1fb3aaac60f
+size 63341
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_5_en.png
index d12a76713d..dab02cddf2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d4e115598bd789d164ea1374cc761cf8391a7db658a29207e2f221dac678b62
-size 98295
+oid sha256:92d0ab372ab8efb76da83c9e28fb5f2d6a4d202285f9fe0644d378d02f8e11ba
+size 97602
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_6_en.png
index 16c70226c5..e9c013be92 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4c0053dcd73fadacfc2ad73c8e57a60e3c5f2186f1f83c083d08cf542e977c0
-size 55536
+oid sha256:1579ecd04cfde9b62d85287014e519fbb04745d9253140e2cd9936f4a23dbe56
+size 54540
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_7_en.png
index 3c9852479c..9e0186982d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38370c8eaa97e996514e9020f1d7dd6e8d1f87a66d99448f71dd531c0a158d5c
-size 55352
+oid sha256:e11143794228c270b85db674577948d52161fe1c16c8ae8ff04870636ee58e4d
+size 54317
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png
index 0654617bd7..a53692356b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:947ddd34efb97e8baad91a1c2865105190a7be599327a271db0466f4a86bf092
-size 64326
+oid sha256:8c51275bdbf340dafbeac16ba6c946c5ea8fbd829a8b1ad45f9c2d1da0a28df9
+size 63540
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_9_en.png
index 33d2768e08..41f97a0155 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerReply_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a4c884e8173cc9e031faff3da8c18c9411f5e39c9a56ad82941a36a4bb8381a
-size 54795
+oid sha256:a99c944c69b41ce89be07fb0c183ef0588b4b0540c747dd40a1135ffcf8d1216
+size 53962
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerScaledDensityWithReply_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerScaledDensityWithReply_en.png
new file mode 100644
index 0000000000..cb6393e72b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerScaledDensityWithReply_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2508c7785b3dc7f2d2e0abd45c2556c8bbd9a3905179f1082fe66b296d7b4752
+size 17282
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en.png
index 032729bb26..0dfda89690 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a33faaf5ea09a1d4eb3298d135211bbddc6637fd0c435f4df16874a06f184142
-size 53823
+oid sha256:77f29e3b660aafe3093d502c415129fefb08b355c39b2c6f53ddf37107f3041d
+size 53424
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en.png
index dd156cd2c7..4550c1381e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c83a621b7bd32ab83639acc7471e9a58a2e591b6637fb09bb74c2186791ed61
-size 51273
+oid sha256:305043a2166b60160feeea6ec850050c3709f23a3c6c077851e1b09485dcdd55
+size 51126
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Day_0_en.png
index b163b855c4..41291fd5a3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c801a2ffb192267c9ade286bff5640e2fb03002491de90683f27342dcb692f5b
-size 43922
+oid sha256:385ad87d0aee7ae8df87eaf8992b347292ae4ec7a0f1e2ee9a64641a03e13b61
+size 43769
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Night_0_en.png
index 2ea71b91ae..ea322a5dc3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerSimple_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33f43f935a457a85584cf682cbaee153128f0a21808caa8f157e542dcb81ef92
-size 41473
+oid sha256:64c015418356283f177cb8d271c97b289170e48d59551a2c20e953247d93c8c4
+size 41623
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en.png
index e5c8277d21..466fc6d023 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b9ed5a39a881471e8b224edbcc45d46a20db0539e065c44a5eb0d56a24efc22
-size 34439
+oid sha256:08f1c0136f60903f2ef4d21aed359ec83235d73a65ea16f3ea0bc4a3e3f8d9e6
+size 34008
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en.png
index 242f4f2874..90a5145263 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:571383a1822fb9cd4eb629d28260556172ff40a8260c9d05278434b2383a11da
-size 32594
+oid sha256:94b7df69c90b93737b9eda490814932c00a7c1c441c1cadfc60196b58769200c
+size 32222
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Day_0_en.png
index 72c221feb6..138c59e513 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9036efabbf937551b240326a092f037398ee2a9586203cf1c05a0725200bf3bb
-size 24068
+oid sha256:84542c2e193aa926db19d6ec96f2b49e70954c300725d516b11694353239d9cf
+size 24153
diff --git a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Night_0_en.png
index 2ce6386e00..9f514b6a3e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.textcomposer_TextComposerVoice_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ebcd0a5c857202d82a3685551cde4af4abe48883b5b19296188d8130dba295f
-size 22622
+oid sha256:72ecb2b3959113e2f86db8cb0c59ad96f1661608b3fcc52b743a6086e31833ef
+size 22678
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en.png
index fd13ba4166..be602ba91f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:888f6261561d7df42578e39122b152238cfc75537c964fc5bed1d69383bb263f
-size 44064
+oid sha256:b8db643953d2fe589896b382a490a36961146bb0693fcbf39c108d3b6706eac1
+size 44063
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en.png
index e3bf16c7df..d53897b657 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9061f0465a3a62581721d7acb6024b5a5375cd9a9f40b1153a65fa9ce42795d
-size 42827
+oid sha256:17bc49574b4f43610c7c8269bd9fce440a2abc3d3396a4dcc62f133decad48b6
+size 42828
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en.png
index 5217f8a7aa..5150e7bcce 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26299451ca8645d878fe2944ed10829847387ef36a9d285edc1909d0f911b85e
-size 29951
+oid sha256:48f1432bab5cdb84b9dd3810f6ff84468fbc95c401cd07081f124021be8e8867
+size 29944
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en.png
index d9cb653d66..5e2fff9fd8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5a32aa30c91622e2b105813233684d2d9049d0780abd5e4860ef9255c4f6499
-size 19351
+oid sha256:ba26b31dd921f71497fafbcbe8b85fd872d4f3059acad1b870347010f8fe7429
+size 19342
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en.png
index 46a237b230..095e483609 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:332c6db171facb9a9d0bd75f3171acf41f2bc2be4ffbf81de36c1db39727ae3a
-size 24715
+oid sha256:47a8e4421730347371fde688689d6dc053d14a51a40a1b47d5f169d2ed23e654
+size 24685
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en.png
index da72e6415a..30d0ade815 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed54c3b733e4e7c5a8693e78dfb2919f61334b57373202f60b4ca31f7467f4e0
-size 29893
+oid sha256:48b2f97efca072dc2454308785997da48aea94b57d29a530c94cef36b7fb6992
+size 29964
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en.png
index 28f19433fe..869ef27e81 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e0485c0c571a858d185bbfc755719ce342375ce760817329ff8ee0bbce4e480
-size 24033
+oid sha256:0a55e4c56699e1cb36de4f2455c61853442c853fe814aec9a2e6e4fd63ba6c22
+size 23987
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en.png
index cb9051bf6e..c4d05374e8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c0db5ecd43e29ff15d822e19a2157e3bb9c0140529a3059ad8791d2c9cb7fbf
-size 35793
+oid sha256:0c97d537c38a97b9b33e4b3058863ea2637cf458651f8563fff8a0d87cc3de0f
+size 35937
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en.png
index 9d876a6388..2db3cca6cf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9afb3706fa4674f6c167c9774a065eaed1a28cc9fa8dd14b7b3160ca9f552124
-size 23853
+oid sha256:9684a28c8370d874fbef370e7111750f4a6ee6be2db21aa90abbd8ac1c0f7fed
+size 23894
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en.png
index eb2b2a7a53..478a2ec4a6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df1e95b668e2f543fe4ae8ad2e90d0ed32bb81f078e0adc9b86c13aa9e09f06a
-size 29125
+oid sha256:9514a1b5d8735f152833d90cf5b6f465257da30b1b8f30a8ec3051272acde1e7
+size 29121
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en.png
index e8c148a34b..3024407fe4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:031f652c50f9316d992eea1fd4c81d3528a8e11dce1721ef67f84cd4ba2f8a7e
-size 18948
+oid sha256:53a5d1ba3d9ddd7ca01fa3892ba7359a5d76a9c664a050e597fdc9ddba42b51b
+size 18950
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en.png
index d8795934a7..58b9a95475 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d057847a4e9e222451c9ee67e96e8b649494dd4817f0702508cc0d363950a49
-size 24084
+oid sha256:c0c6845c72b83dea15b1156c58fb5836d35290bf193591736343415bdfe502a1
+size 24117
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en.png
index 2258bf69f9..c569a6131b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74f39e9e49136645cb54afa375f4007dac9969c79c7a6009dd3694492e8fe483
-size 29118
+oid sha256:9e34ed2bf3dccdfc1965a4ee9194e7ea6a9898c47047ad0d85461aac26665e79
+size 29069
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en.png
index d5123adeac..fe591e8011 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64d7fda6250d39123b0085301d0de4d511b0308275d333c4f0c938d4f93e7b15
-size 23488
+oid sha256:0daedf93e28cc3bfe72866cdf0c3d0460bccf2af8e89a4fb626033c6f71cf093
+size 23515
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en.png
index 84ae4a8750..35733439ab 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e59c4ef7910585320833ba84afe5d80408f7e5279068ab00c4b0ac205a7003a
-size 34595
+oid sha256:25562f10c67c45c919e0cdb8b97e13ff3bf187ce593f91c941e70e3a6299bbb8
+size 34835
diff --git a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en.png
index 319b352851..ccb1327722 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ac6fc4e02e62ad0e1504724576d2a37d80a6f11929251ee15442aed22c30c17
-size 23354
+oid sha256:2ec7895c6e610e52927c24de153fc90fdbf39daba393d9fdecbc276d8c715856
+size 23315
diff --git a/tests/uitests/src/test/snapshots/images/services.apperror.impl_AppErrorView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/services.apperror.api_AppErrorView_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/services.apperror.impl_AppErrorView_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/services.apperror.api_AppErrorView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/services.apperror.impl_AppErrorView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/services.apperror.api_AppErrorView_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/services.apperror.impl_AppErrorView_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/services.apperror.api_AppErrorView_Night_0_en.png
diff --git a/tools/adb/callLinkCustomScheme.sh b/tools/adb/callLinkCustomScheme.sh
deleted file mode 100755
index 7e6c9f02d3..0000000000
--- a/tools/adb/callLinkCustomScheme.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# Copyright (c) 2025 Element Creations Ltd.
-# Copyright 2023-2024 New Vector Ltd.
-#
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
-# Please see LICENSE files in the repository root for full details.
-
-# Format is:
-# element://call?url=some-encoded-url
-# For instance
-# element://call?url=https%3A%2F%2Fcall.element.io%2FTestElementCall
-
-adb shell am start -a android.intent.action.VIEW -d element://call?url=https%3A%2F%2Fcall.element.io%2FTestElementCall
diff --git a/tools/adb/callLinkCustomScheme2.sh b/tools/adb/callLinkCustomScheme2.sh
deleted file mode 100755
index 43f427f22f..0000000000
--- a/tools/adb/callLinkCustomScheme2.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# Copyright (c) 2025 Element Creations Ltd.
-# Copyright 2023-2024 New Vector Ltd.
-#
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
-# Please see LICENSE files in the repository root for full details.
-
-# Format is:
-# io.element.call:/?url=some-encoded-url
-# For instance
-# io.element.call:/?url=https%3A%2F%2Fcall.element.io%2FTestElementCall
-
-adb shell am start -a android.intent.action.VIEW -d io.element.call:/?url=https%3A%2F%2Fcall.element.io%2FTestElementCall
diff --git a/tools/dependencies/checkDependencies.py b/tools/dependencies/checkDependencies.py
index 64ae6341e6..5cb1a4f70a 100755
--- a/tools/dependencies/checkDependencies.py
+++ b/tools/dependencies/checkDependencies.py
@@ -35,7 +35,7 @@ def checkThatModulesExist(dependencies):
             line = line.split(" ")
             for elem in line:
                 if ":" in elem:
-                    modules.add(elem)
+                    modules.add(elem.replace("'", ""))
     for module in modules:
         path = "." + module.replace(":", "/") + "/build.gradle.kts"
         if not os.path.exists(path):
@@ -51,12 +51,12 @@ def checkThatThereIsNoTestDependency(dependencies):
     currentProject = ""
     for line in dependencies:
         if line.startswith("+--- project "):
-            currentProject = line.split(" ")[2]
+            currentProject = line.split(" ")[2].replace("'", "")
         else:
             if ":test" in currentProject:
                 continue
             else:
-                subProject = line.split(" ")[-1]
+                subProject = line.split(" ")[-1].replace("'", "")
                 if subProject.endswith(":test") or ":tests:" in subProject and "detekt-rules" not in subProject:
                     error = "Error: '" + currentProject + "' depends on the test project '" + subProject + "'\n"
                     error += "    Please replace occurrence(s) of 'implementation(projects" + subProject.replace(":", ".") + ")'"
diff --git a/tools/detekt/detekt.yml b/tools/detekt/detekt.yml
index 552b46755e..79bfeb7250 100644
--- a/tools/detekt/detekt.yml
+++ b/tools/detekt/detekt.yml
@@ -150,7 +150,7 @@ exceptions:
   TooGenericExceptionCaught:
     active: false
   SwallowedException:
-    active: true
+    active: false
   ThrowingExceptionsWithoutMessageOrCause:
     active: true
   TooGenericExceptionThrown:
@@ -224,12 +224,28 @@ comments:
 Compose:
   CompositionLocalAllowlist:
     active: true
+    # You can optionally define a list of CompositionLocals that are allowed here
+    allowedCompositionLocals:
+      - LocalCompoundColors
+      - LocalEventContentValidationState
+      - LocalSnackbarDispatcher
+      - LocalCameraPositionState
+      - LocalMediaItemPresenterFactories
+      - LocalTimelineItemPresenterFactories
+      - LocalRoomMemberProfilesCache
+      - LocalMentionSpanUpdater
+      - LocalAnalyticsService
+      - LocalBuildMeta
+      - LocalUiTestMode
+      - LocalSdkIntVersionProvider
   CompositionLocalNaming:
     active: true
   ContentEmitterReturningValues:
     active: true
     # You can optionally add your own composables here
     # contentEmitters: MyComposable,MyOtherComposable
+  ModifierComposable:
+    active: true
   ModifierMissing:
     active: true
   ModifierReused:
@@ -252,6 +268,8 @@ Compose:
     active: true
   PreviewPublic:
     active: true
+    # You can optionally disable that only previews with @PreviewParameter are flagged
+    previewPublicOnlyIfParams: false
   RememberMissing:
     active: true
   UnstableCollections:
diff --git a/tools/localazy/checkForbiddenTerms.py b/tools/localazy/checkForbiddenTerms.py
index e190fcea68..48bf7030b8 100755
--- a/tools/localazy/checkForbiddenTerms.py
+++ b/tools/localazy/checkForbiddenTerms.py
@@ -31,6 +31,14 @@ forbiddenTerms = {
         # We explicitly want to mention Element Pro in these 2:
         "screen_change_server_error_element_pro_required_title",
         "screen_change_server_error_element_pro_required_message",
+        # Contains "Element Classic"
+        "screen_missing_key_backup_open_element_classic",
+        "screen_missing_key_backup_step_1",
+        # These are notification sound names
+        "screen_notification_settings_sound_element_default",
+        "screen_notification_settings_sound_element_fade",
+        # This contains the word 'element' in some languages
+        "screen_media_upload_preview_item_count",
     ]
 }
 
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index d3e44b7c08..8a7790be1e 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -163,13 +163,17 @@
         "screen_qr_code_login_connection_note_secure_state.*",
         "screen_qr_code_login_unknown_error_description",
         "screen_qr_code_login_invalid_scan_state_.*",
-        "screen_qr_code_login_no_camera_permission_state_.*"
+        "screen_qr_code_login_no_camera_permission_state_.*",
+        "screen_qr_code_login_device_code_.*",
+        "screen_qr_code_login_verify_code_loading"
       ]
     },
     {
       "name" : ":features:login:impl",
       "includeRegex" : [
         "screen_onboarding_.*",
+        "screen\\.onboarding\\..*",
+        "screen\\.missing_key_backup\\..*",
         "screen_login_.*",
         "screen_server_confirmation_.*",
         "screen_change_server_.*",
@@ -217,6 +221,7 @@
         "screen_notification_settings_mentions_only_disclaimer",
         "screen_room_change_.*",
         "screen_room_roles_.*",
+        "screen_roomlist_mark_as_.*",
         "screen\\.edit_room_address\\..*",
         "screen\\.security_and_privacy\\..*"
       ]
@@ -256,7 +261,6 @@
     {
       "name" : ":features:messages:impl",
       "includeRegex" : [
-        "emoji_picker_category_.*",
         "screen_report_content_.*",
         "screen_room_attachment.*",
         "screen_room_encrypted.*",
@@ -266,8 +270,10 @@
         "screen_room_message.*",
         "screen_room_retry.*",
         "screen_room_timeline.*",
+        "screen\\.room\\.timeline.*",
         "screen\\.room_timeline.*",
         "screen_room_typing.*",
+        "screen\\.image_edition\\..*",
         "screen\\.media_upload.*"
       ]
     },
@@ -311,6 +317,7 @@
         "screen_chat_backup_.*",
         "screen_key_backup_disable_.*",
         "screen_recovery_key_.*",
+        "screen\\.custom_recovery_key\\..*",
         "screen_create_new_recovery_key_.*",
         "screen_encryption_reset.*",
         "screen_reset_encryption.*",
@@ -322,11 +329,14 @@
       "includeRegex" : [
         "screen_advanced_settings_.*",
         "screen\\.advanced_settings\\..*",
+        "screen\\.settings\\..*",
         "screen_edit_profile_.*",
         "screen_notification_settings_.*",
+        "screen\\.notification_settings\\..*",
         "screen_blocked_users_.*",
         "full_screen_intent_banner_.*",
         "troubleshoot_notifications_entry_point_.*",
+        "theme\\..*",
         "screen\\.labs\\..*"
       ]
     },
@@ -416,6 +426,12 @@
         "screen\\.share_location\\..*",
         "screen\\.view_location\\..*"
       ]
+    },
+    {
+      "name" : ":libraries:emoji:impl",
+      "includeRegex" : [
+        "emoji_picker_.*"
+      ]
     }
   ]
 }
diff --git a/tools/localazy/downloadStrings.sh b/tools/localazy/downloadStrings.sh
index 5a60656f35..5560aa002d 100755
--- a/tools/localazy/downloadStrings.sh
+++ b/tools/localazy/downloadStrings.sh
@@ -8,23 +8,51 @@
 
 set -e
 
-if [[ $1 == "--all" ]]; then
+allFiles=0
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -a|--all)
+      allFiles=1
+      shift
+      ;;
+    -v|--verbose)
+      verbose=1
+      shift
+      ;;
+    *)
+      echo "Unknown option: $1"
+      exit 1
+      ;;
+  esac
+done
+
+if [[ $allFiles == 1 ]]; then
   echo "Note: I will update all the files."
-  allFiles=1
 else
   echo "Note: I will update only the English files."
-  allFiles=0
 fi
 
 echo "Generating the configuration file for localazy..."
 python3 ./tools/localazy/generateLocalazyConfig.py $allFiles
 
+# Search for existing string files first so we can remove them
+localazyXmlFiles=$(find . \
+  -type d \( -name build -o -name .git \) -prune -o \
+  -type f -path '*/src/*/res/values/localazy.xml' -print | sort)
+
+if [[ $allFiles == 1 ]]; then
+  translationXmlFiles=$(find . \
+      -type d \( -name build -o -name .git \) -prune -o \
+      -type f -path '*/src/*/res/values-*/translations.xml' -print | sort)
+fi
+
 echo "Deleting all existing localazy.xml files..."
-find . -name 'localazy.xml' -delete
+echo "$localazyXmlFiles" | xargs -L1 -P0 rm
 
 if [[ $allFiles == 1 ]]; then
   echo "Deleting all existing translations.xml files..."
-  find . -name 'translations.xml' -delete
+  echo "$translationXmlFiles" | xargs -L1 -P0 rm
 fi
 
 echo "Importing the strings..."
@@ -33,16 +61,72 @@ localazy download --config ./tools/localazy/localazy.json
 echo "Removing the generated config"
 rm ./tools/localazy/localazy.json
 
-echo "Formatting the resources files..."
-find . -name 'localazy.xml' -exec ./tools/localazy/formatXmlResourcesFile.py {} \;
+# Now list the newly generated files so we can format them and check for forbidden terms
+localazyXmlFiles=$(find . \
+  -type d \( -name build -o -name .git \) -prune -o \
+  -type f -path '*/src/*/res/values/localazy.xml' -print | sort)
+
 if [[ $allFiles == 1 ]]; then
-  find . -name 'translations.xml' -exec ./tools/localazy/formatXmlResourcesFile.py {} \;
+  translationXmlFiles=$(find . \
+      -type d \( -name build -o -name .git \) -prune -o \
+      -type f -path '*/src/*/res/values-*/translations.xml' -print | sort)
 fi
 
-echo "Checking forbidden terms..."
-find . -name 'localazy.xml' -exec ./tools/localazy/checkForbiddenTerms.py {} \;
+formatXmlFiles() {
+  local xml="$1"
+  if [[ $verbose == 1 ]]; then
+    echo "Formatting $xml"
+  fi
+  ./tools/localazy/formatXmlResourcesFile.py "$xml"
+}
+
+checkForbiddenTerms() {
+  set +e
+  local xml="$1"
+  if [[ $verbose == 1 ]]; then
+    echo "Checking forbidden terms in $xml"
+  fi
+  ./tools/localazy/checkForbiddenTerms.py "$xml"
+
+  # If the script finds a forbidden term, it will exit with a non-zero status code and interrupt the execution, but we don't want that.
+  # Instead we want to capture that exit code and write it to a global variable so we can check later if any forbidden terms were found.
+  status=$?
+  if [[ $status != 0 ]]; then
+    forbiddenTermsResult=$((forbiddenTermsResult || status))
+  fi
+}
+
+export -f formatXmlFiles
+export -f checkForbiddenTerms
+
+echo "Formatting the resources files..."
+
+echo "Formatting original localazy.xml files..."
+# Format the original localazy.xml files in parallel
+echo "$localazyXmlFiles" | xargs -L1 -P0 bash -c 'formatXmlFiles "$@"' _
+
 if [[ $allFiles == 1 ]]; then
-  find . -name 'translations.xml' -exec ./tools/localazy/checkForbiddenTerms.py {} \;
+  if [[ $verbose == 1 ]]; then
+    echo "Formatting translation files..."
+  fi
+
+  echo "$translationXmlFiles" | xargs -L1 -P0 bash -c 'formatXmlFiles "$@"' _
+fi
+
+# This stores whether any forbidden terms were found in any of the files. If any forbidden terms are found, this will be set to a non-zero value.
+export forbiddenTermsResult=0
+
+echo "Checking forbidden terms..."
+echo "$localazyXmlFiles" | xargs -L1 -P0 bash -c 'checkForbiddenTerms "$@"' _
+
+if [[ $allFiles == 1 ]]; then
+  echo "Checking forbidden terms in translation files..."
+  echo "$translationXmlFiles" | xargs -L1 -P0 bash -c 'checkForbiddenTerms "$@"' _
+fi
+
+if [[ $forbiddenTermsResult != 0 ]]; then
+  echo "Error: Forbidden terms found in the resources files. Please check the output above."
+  exit 1
 fi
 
 echo "Success!"
diff --git a/tools/manifest/aaptDump.sh b/tools/manifest/aaptDump.sh
new file mode 100755
index 0000000000..ac66b92593
--- /dev/null
+++ b/tools/manifest/aaptDump.sh
@@ -0,0 +1,13 @@
+#! /bin/bash
+
+# Copyright (c) 2026 Element Creations Ltd.
+#
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+# Please see LICENSE files in the repository root for full details.
+
+# Assemble Gplay Release
+./gradlew assembleGplayRelease
+
+# Dump information
+$ANDROID_HOME/build-tools/37.0.0/aapt dump badging ./app/build/outputs/apk/gplay/release/app-gplay-universal-release.apk \
+   > ./tools/manifest/gplay/release/aaptDump.txt
diff --git a/tools/manifest/gplay/release/aaptDump.txt b/tools/manifest/gplay/release/aaptDump.txt
new file mode 100644
index 0000000000..23f4acfb38
--- /dev/null
+++ b/tools/manifest/gplay/release/aaptDump.txt
@@ -0,0 +1,97 @@
+package: name='io.element.android.x' versionCode='202608000' versionName='26.08.0' platformBuildVersionName='17' platformBuildVersionCode='37' compileSdkVersion='37' compileSdkVersionCodename='17'
+sdkVersion:'24'
+targetSdkVersion:'37'
+uses-permission: name='android.permission.POST_NOTIFICATIONS'
+uses-permission: name='android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS'
+uses-permission: name='android.permission.REQUEST_INSTALL_PACKAGES'
+uses-permission: name='android.permission.RECORD_AUDIO'
+uses-permission: name='android.permission.ACCESS_COARSE_LOCATION'
+uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
+uses-permission: name='android.permission.FOREGROUND_SERVICE'
+uses-permission: name='android.permission.FOREGROUND_SERVICE_LOCATION'
+uses-permission: name='android.permission.INTERNET'
+uses-permission: name='android.permission.CAMERA'
+uses-permission: name='android.permission.MODIFY_AUDIO_SETTINGS'
+uses-permission: name='android.permission.WAKE_LOCK'
+uses-permission: name='android.permission.FOREGROUND_SERVICE_MICROPHONE'
+uses-permission: name='android.permission.USE_FULL_SCREEN_INTENT'
+uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
+uses-permission: name='android.permission.VIBRATE'
+uses-permission: name='android.permission.ACCESS_LOCAL_NETWORK'
+uses-permission: name='android.permission.ACCESS_WIFI_STATE'
+uses-permission: name='android.permission.USE_BIOMETRIC'
+uses-permission: name='android.permission.USE_FINGERPRINT'
+uses-permission: name='com.google.android.c2dm.permission.RECEIVE'
+uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
+uses-permission: name='io.element.android.x.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
+application-label:'Element X'
+application-label-be:'Element X'
+application-label-bg:'Element X'
+application-label-ca:'Element X'
+application-label-cs:'Element X'
+application-label-cy:'Element X'
+application-label-da:'Element X'
+application-label-de:'Element X'
+application-label-el:'Element X'
+application-label-en-US:'Element X'
+application-label-es:'Element X'
+application-label-et:'Element X'
+application-label-eu:'Element X'
+application-label-fa:'Element X'
+application-label-fi:'Element X'
+application-label-fr:'Element X'
+application-label-hr:'Element X'
+application-label-hu:'Element X'
+application-label-in:'Element X'
+application-label-it:'Element X'
+application-label-ja:'Element X'
+application-label-ka:'Element X'
+application-label-ko:'Element X'
+application-label-lt:'Element X'
+application-label-nb:'Element X'
+application-label-nl:'Element X'
+application-label-pl:'Element X'
+application-label-pt:'Element X'
+application-label-pt-BR:'Element X'
+application-label-ro:'Element X'
+application-label-ru:'Element X'
+application-label-sk:'Element X'
+application-label-sv:'Element X'
+application-label-tr:'Element X'
+application-label-uk:'Element X'
+application-label-ur:'Element X'
+application-label-uz:'Element X'
+application-label-vi:'Element X'
+application-label-zh:'Element X'
+application-label-zh-CN:'Element X'
+application-label-zh-TW:'Element X'
+application-icon-120:'res/BW.xml'
+application-icon-160:'res/BW.xml'
+application-icon-240:'res/BW.xml'
+application-icon-320:'res/BW.xml'
+application-icon-480:'res/BW.xml'
+application-icon-640:'res/BW.xml'
+application-icon-65534:'res/BW.xml'
+application-icon-65535:'res/BW.xml'
+application: label='Element X' icon='res/BW.xml'
+launchable-activity: name='io.element.android.x.MainActivity'  label='' icon=''
+uses-library-not-required:'androidx.window.extensions'
+uses-library-not-required:'androidx.window.sidecar'
+feature-group: label=''
+  uses-feature-not-required: name='android.hardware.camera'
+  uses-feature-not-required: name='android.hardware.microphone'
+  uses-feature-not-required: name='android.hardware.vulkan.version' version='4194307'
+  uses-feature-not-required: name='android.hardware.wifi'
+  uses-feature: name='android.hardware.faketouch'
+  uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'
+  uses-feature: name='android.hardware.location'
+  uses-implied-feature: name='android.hardware.location' reason='requested android.permission.ACCESS_COARSE_LOCATION permission, and requested android.permission.ACCESS_FINE_LOCATION permission'
+main
+other-activities
+other-receivers
+other-services
+supports-screens: 'small' 'normal' 'large' 'xlarge'
+supports-any-density: 'true'
+locales: '--_--' 'be' 'bg' 'ca' 'cs' 'cy' 'da' 'de' 'el' 'en-US' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'hr' 'hu' 'in' 'it' 'ja' 'ka' 'ko' 'lt' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'ro' 'ru' 'sk' 'sv' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh' 'zh-CN' 'zh-TW'
+densities: '120' '160' '240' '320' '480' '640' '65534' '65535'
+native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64'
diff --git a/tools/release/release.sh b/tools/release/release.sh
index 0934e6c714..83ccc6d258 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -151,12 +151,20 @@ sed "s/private const val versionMonth = .*/private const val versionMonth = ${ve
 sed "s/private const val versionReleaseNumber = .*/private const val versionReleaseNumber = ${versionReleaseNumber}/" ${versionsFileBak} > ${versionsFile}
 rm ${versionsFileBak}
 
+printf -v versionReleaseNumber2Digits "%02d" "${versionReleaseNumber}"
+versionCode="20${versionYear}${versionMonth}${versionReleaseNumber2Digits}0"
+
+# Update the file aaptDump.txt with the new version
+aaptDumpFile="./tools/manifest/gplay/release/aaptDump.txt"
+sed "s/versionCode='[0-9]*'/versionCode='${versionCode}'/" ${aaptDumpFile} > ${aaptDumpFile}.bak
+sed "s/versionName='[0-9]*\.[0-9]*\.[0-9]*'/versionName='${version}'/" ${aaptDumpFile}.bak > ${aaptDumpFile}
+rm ${aaptDumpFile}.bak
+
 git commit -a -m "Setting version for the release ${version}"
 
 printf "\n================================================================================\n"
 printf "Creating fastlane file...\n"
-printf -v versionReleaseNumber2Digits "%02d" "${versionReleaseNumber}"
-fastlaneFile="20${versionYear}${versionMonth}${versionReleaseNumber2Digits}0.txt"
+fastlaneFile="${versionCode}.txt"
 fastlanePathFile="./fastlane/metadata/android/en-US/changelogs/${fastlaneFile}"
 printf "Main changes in this version: bug fixes and improvements.\nFull changelog: https://github.com/element-hq/element-x-android/releases" > "${fastlanePathFile}"
 
diff --git a/tools/sdk/build-rust-sdk b/tools/sdk/build-rust-sdk
index ea1b80c469..91c6ed6e02 100755
--- a/tools/sdk/build-rust-sdk
+++ b/tools/sdk/build-rust-sdk
@@ -27,6 +27,7 @@ set -u
 
 buildLocal=0
 rustSdkPath="../matrix-rust-sdk/"
+kotlinComponentsPath="../matrix-rust-components-kotlin"
 rustSdkUrl="https://github.com/matrix-org/matrix-rust-sdk.git"
 rustSdkBranch="main"
 buildApp=1
@@ -38,10 +39,18 @@ default_arch="${default_arch/arm64/aarch64}"
 target_arch="${default_arch}"
 
 sdkArg=""
+update_components=1
 
 ## Argument parsing
 
-TEMP=$(getopt -o 'rs:b:at:h' --long 'remote,sdk:,branch:,build-app,target-arch,help' -- "$@")
+# Use GNU getopt (required for --long support on macOS)
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    GNU_GETOPT="$(brew --prefix gnu-getopt)/bin/getopt"
+else
+    GNU_GETOPT="getopt"
+fi
+
+TEMP=$("$GNU_GETOPT" -o 'rs:b:at:nh' --long 'remote,sdk:,branch:,build-app,target-arch:,no-update-components,help' -- "$@")
 
 if [ $? -ne 0 ]; then
     echo 'Terminating...' >&2
@@ -53,32 +62,37 @@ unset TEMP
 
 while true; do
     case "$1" in
-        'r'|'--remote')
+        '-r'|'--remote')
             buildLocal=1
             shift
             continue
         ;;
-        's'|'--sdk')
+        '-s'|'--sdk')
             sdkArg="$2"
             shift 2
             continue
         ;;
-        'b'|'--branch')
+        '-b'|'--branch')
             rustSdkBranch="$2"
             shift 2
             continue
         ;;
-        'a'|'--build-app')
+        '-a'|'--build-app')
             buildApp=0
             shift
             continue
         ;;
-        't'|'--target-arch')
+        '-t'|'--target-arch')
             target_arch="$2"
             shift 2
             continue
         ;;
-        'h'|'--help')
+        '-n'|'--no-update-components')
+            update_components=0
+            shift
+            continue
+        ;;
+        '-h'|'--help')
             cat << END
 SYNOPSIS
 
@@ -103,6 +117,9 @@ ARGUMENTS
     -t --target-arch
         The architecture for which to build the app. Defaults to the architecture of this machine (${default_arch}).
 
+    -n --no-update-components
+        Do not attempt to update matrix-rust-components-kotlin from git. It must already be cloned and up-to-date.
+
 EXAMPLES
 
     $0
@@ -187,21 +204,25 @@ cd "${elementPwd}"
 
 ## Clone matrix-rust-components-kotlin if needed
 
-if [ ! -d "../matrix-rust-components-kotlin" ]; then
-    printf "\nFolder ../matrix-rust-components-kotlin does not exist."
-    printf "Cloning the repository into ../matrix-rust-components-kotlin.\n\n"
-    git clone \
-        https://github.com/matrix-org/matrix-rust-components-kotlin.git \
-        ../matrix-rust-components-kotlin
+if [ "$update_components" == "1" ]; then
+    if [ ! -d "${kotlinComponentsPath}" ]; then
+        printf "\nFolder ${kotlinComponentsPath} does not exist."
+        printf "Cloning the repository into ${kotlinComponentsPath}.\n\n"
+        git clone \
+            https://github.com/matrix-org/matrix-rust-components-kotlin.git \
+            "${kotlinComponentsPath}"
+    fi
+
+    printf "\n## Resetting ${kotlinComponentsPath} to the latest main...\n\n"
+
+    cd "${kotlinComponentsPath}"
+    git reset --hard
+    git checkout main
+    git pull
+else
+    cd "${kotlinComponentsPath}"
 fi
 
-printf "\n## Resetting matrix-rust-components-kotlin to the latest main...\n\n"
-
-cd ../matrix-rust-components-kotlin
-git reset --hard
-git checkout main
-git pull
-
 ## Build the SDK
 
 printf "\n## Building the SDK for ${target_arch}...\n\n"
@@ -228,7 +249,7 @@ cp \
 
 if [ "${buildApp}" == "0" ]; then
     printf "\n## Building the application...\n\n"
-    ./gradlew assembleDebug
+    ./gradlew :app:assembleGplayDebug
 fi
 
 ## Clean remote checkout of SDK repo
diff --git a/tools/sdk/update-rustls b/tools/sdk/update-rustls
deleted file mode 100755
index d8ad883d69..0000000000
--- a/tools/sdk/update-rustls
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2026 Element Creations Ltd.
-#
-# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
-# Please see LICENSE files in the repository root for full details.
-
-set -e
-set -u
-
-VERSION=${1:-}
-if [ -n "$VERSION" ]; then
-  PACKAGE=rustls-platform-verifier-android==$VERSION
-else
-  PACKAGE=rustls-platform-verifier-android
-fi
-
-cargo install cargo-download
-mkdir -p tmp/rustls-platform-verifier-android
-cargo download $PACKAGE > tmp/rustls-platform-verifier-android/rustls-platform-verifier-android.gz
-ROOT=$(git rev-parse --show-toplevel)
-
-cd tmp/rustls-platform-verifier-android
-
-echo "Extracting rustls-platform-verifier-android.aar from \`rustls-platform-verifier-android.gz\`"
-
-tar -xzvf rustls-platform-verifier-android.gz &> /dev/null
-DIR=$(find . -type d -name "rustls-platform-verifier-android-*")
-AAR=$(find $DIR -type f -name "*.aar")
-cp $AAR $ROOT/libraries/matrix/impl/libs/rustls-platform-verifier-android.aar
-cd $ROOT
-rm -r tmp/rustls-platform-verifier-android
-
-echo "Updated rustls-platform-verifier-android.aar using \`$(basename $AAR)\`" > libraries/matrix/impl/libs/rustls-platform-verifier-android.aar.version
-cat libraries/matrix/impl/libs/rustls-platform-verifier-android.aar.version